Changeset 5481:603d51e78e41 in roaraudio

Timestamp:

04/23/12 13:05:59 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support to load plugins on win32 (pr0).

Files:

• ChangeLog (modified) (1 diff)
• libroar/roardl.c (modified) (7 diffs)

ChangeLog

@@ -15 +15 @@
         * Updated build options for RAT (pr0).
         * Work around bugs in win32 while using stdvios (pr0).
+        * Added support to load plugins on win32 (pr0).
 
 v. 1.0beta0 - Fri Mar 16 2012 19:39 CET

libroar/roardl.c

@@ -59 +59 @@
 #if defined(ROAR_HAVE_LIBDL)
  void * handle;
+#elif defined(ROAR_TARGET_WIN32)
+ HMODULE handle;
 #endif
 };
@@ -198 +200 @@
 
  ROAR_DBG("_roardl2ldl(lhandle=%p) = %p", lhandle, (void*)(lhandle->handle));
+ return lhandle->handle;
+}
+#elif defined(ROAR_TARGET_WIN32)
+static HMODULE _roardl2winhandle(struct roar_dl_lhandle * lhandle) {
+ if ( (void*)lhandle < (void*)128 ) {
+  return NULL;
+ }
  return lhandle->handle;
 }
@@ -383 +392 @@
    return NULL;
   }
+#elif defined(ROAR_TARGET_WIN32)
+  ret->handle = LoadLibrary(filename);
+
+  if ( ret->handle == NULL ) {
+   roar_mm_free(ret);
+   return NULL;
+  }
 #else
   roar_mm_free(ret);
@@ -399 +415 @@
    if ( ret->handle != NULL )
     dlclose(ret->handle);
+#elif defined(ROAR_TARGET_WIN32)
+   if ( ret->handle != NULL )
+    FreeLibrary(ret->handle);
 #endif
    roar_mm_free(ret);
@@ -453 +472 @@
   ret = dlclose(_roardl2ldl(lhandle));
  }
+#elif defined(ROAR_TARGET_WIN32)
+ if ( lhandle->handle == NULL ) {
+  ret = 0;
+ } else {
+  if ( FreeLibrary(_roardl2winhandle(lhandle)) ) {
+   ret = 0;
+  } else {
+   ret = -1;
+  }
+ }
 #else
  ret = -1;
@@ -482 +511 @@
 
  return ret;
+#elif defined(ROAR_TARGET_WIN32)
+ FARPROC ret = GetProcAddress(_roardl2winhandle(lhandle), sym);
+ return (void*)ret;
 #else
  ROAR_DBG("roar_dl_getsym(lhandle=%p, sym='%s', type=%i) = NULL // errno=NOSYS", lhandle, sym, type, ret);
@@ -611 +643 @@
  (void)lhandle;
  return dlerror();
+#elif defined(ROAR_TARGET_WIN32)
+ roar_err_from_errno();
+ return roar_error2str(roar_error);
 #else
  return NULL;