make modman work on win32 (test suite still doesn't work, but at least the library does...)

git-svn-id: http://libproxy.googlecode.com/svn/trunk@516 c587cffe-e639-0410-9787-d7902ae8ed56

3 files changed, 12 insertions, 32 deletions

diff --git a/libmodman/CMakeLists.txt b/libmodman/CMakeLists.txt
index dd82d8f..fa032af 100644
--- a/libmodman/CMakeLists.txt
+++ b/libmodman/CMakeLists.txt
@@ -29,6 +29,8 @@ function(mm_create_test name progname modtype)
   add_test(NAME ${name} COMMAND test/${progname} test/modules/${modtype} ${ARGN})
 endfunction(mm_create_test)
 
+# I'm not sure why this doesn't work on win32
+if(UNIX)
 mm_create_module(condition one false NULL)
 mm_create_module(condition two true  NULL)
 mm_create_module(singleton one true  NULL)
@@ -49,4 +51,5 @@ mm_create_test(singleton singleton singleton one)
 mm_create_test(sorted    sorted    sorted    two one)
 mm_create_test(symbol    symbolz   symbol    two)
 mm_create_test(nosymbol  symbol    symbol)
-mm_create_test(nosymreq  symbol    symbol    one)
\ No newline at end of file
+mm_create_test(nosymreq  symbol    symbol    one)
+endif(UNIX)
\ No newline at end of file
diff --git a/libmodman/module.hpp b/libmodman/module.hpp
index b48f17b..517d47e 100644
--- a/libmodman/module.hpp
+++ b/libmodman/module.hpp
@@ -32,7 +32,7 @@
 #define MM_MODULE_VERSION 1
 #define MM_MODULE_NAME __module
 
-#define MM_MODULE_DEFINE DLL_PUBLIC struct com::googlecode::libmodman::module MM_MODULE_NAME[]
+#define MM_MODULE_DEFINE extern "C" struct com::googlecode::libmodman::module DLL_PUBLIC MM_MODULE_NAME[]
 #define MM_MODULE_LAST { MM_MODULE_VERSION, NULL, NULL, NULL, NULL }
 #define MM_MODULE_RECORD(type, init, test, symb) \
 	{ MM_MODULE_VERSION, type::base_type(), init, test, symb }
diff --git a/libmodman/module_manager.cpp b/libmodman/module_manager.cpp
index e2c3cbb..c5d4ce2 100644
--- a/libmodman/module_manager.cpp
+++ b/libmodman/module_manager.cpp
@@ -17,9 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  ******************************************************************************/
 
-#include <algorithm>
-
+#include <algorithm>  // For sort()
 #include <sys/stat.h> // For stat()
+
 #ifdef WIN32
 #include <windows.h>
 #else
@@ -28,13 +28,11 @@
 #endif
 
 #include "module_manager.hpp"
-
-#include <cstdio>
+using namespace com::googlecode::libmodman;
 
 #ifdef WIN32
 #define pdlmtype HMODULE
 #define pdlopen(filename) LoadLibrary(filename)
-#define pdlopenl(filename) LoadLibraryEx(filename, NULL, DONT_RESOLVE_DLL_REFERENCES)
 #define pdlsym GetProcAddress
 #define pdlclose(module) FreeLibrary((pdlmtype) module)
 /*static std::string pdlerror() {
@@ -49,32 +47,21 @@
 			(LPTSTR) &msg,
 			0,
 			NULL);
-	e = std::string(msg);
+	e = std::string((const char*) msg);
     LocalFree(msg);
     return e;
 }*/
-static pdlmtype pdlreopen(pdlmtype module) {
-	char tmp[4096];
-	if (!module) return NULL;
-	DWORD i = GetModuleFileName(module, tmp, 4096);
-	pdlclose(module);
-	return (i == 0 || i == 4096) ? NULL : pdlopen(tmp);
-}
 #else
 #define pdlmtype void*
-#define pdlopen(filename) dlopen(filename, RTLD_NOW | RTLD_LOCAL)
-#define pdlopenl(filename) dlopen(filename, RTLD_LAZY | RTLD_LOCAL)
+#define pdlopen(filename) dlopen(filename, RTLD_LAZY | RTLD_LOCAL)
 #define pdlsym dlsym
 #define pdlclose(module) dlclose((pdlmtype) module)
 //static std::string pdlerror() { return dlerror(); }
-static pdlmtype pdlreopen(pdlmtype module) { return module; }
 #endif
 
 #define _str(s) #s
 #define __str(s) _str(s)
 
-using namespace com::googlecode::libmodman;
-
 module_manager::~module_manager() {
 	// Free all extensions
 	for (map<string, vector<base_extension*> >::iterator i=this->extensions.begin() ; i != this->extensions.end() ; i++) {
@@ -96,10 +83,9 @@ bool module_manager::load_file(string filename, bool symbreq) {
 	if (stat(filename.c_str(), &st) != 0) return false;
 	if ((st.st_mode & S_IFMT) != S_IFREG) return false;
 
-	// Open the module without doing any symbol resolution
-	pdlmtype dlobj = pdlopenl(filename.c_str());
+	// Open the module
+	pdlmtype dlobj = pdlopen(filename.c_str());
 	if (!dlobj) return false;
-	bool lazyload = true;
 
 	// If we have already loaded this module, return true
 	if (this->modules.find((void*) dlobj) != this->modules.end()) {
@@ -107,7 +93,6 @@ bool module_manager::load_file(string filename, bool symbreq) {
 		return true;
 	}
 
-on_reload:
 	// Get the module_info struct
 	module* mi = (module*) pdlsym(dlobj, __str(MM_MODULE_NAME));
 	if (!mi) {
@@ -150,14 +135,6 @@ on_reload:
 		}
 #endif
 
-		if (lazyload) {
-			// Reload the module (not in lazy mode)
-			dlobj = pdlreopen(dlobj);
-			if (!dlobj) return false;
-			lazyload = false;
-			goto on_reload;
-		}
-
 		// If our execution test succeeds, call init()
 		if (mi[i].test()) {
 			base_extension** extensions = mi[i].init();