Fixed bug CORE-2628 : FB 2.5-beta2-win32 denied FreeAdhocUDF library …

…functions
FirebirdSQL · Mar 16, 2010 · 64e162e · 64e162e
1 parent 66e7ea9
commit 64e162e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/jrd/os/win32/mod_loader.cpp b/src/jrd/os/win32/mod_loader.cpp
@@ -159,7 +159,7 @@ bool ModuleLoader::isLoadableModule(const PathName& module)
 	ContextActivator ctx;
 
 	const HMODULE hMod = LoadLibraryEx(module.c_str(), 0,
-		LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_AS_DATAFILE);
+		(Firebird::bEmbedded ? LOAD_WITH_ALTERED_SEARCH_PATH : 0) | LOAD_LIBRARY_AS_DATAFILE);
 
 	if (hMod) {
 		FreeLibrary(hMod);
@@ -183,7 +183,8 @@ ModuleLoader::Module *ModuleLoader::loadModule(const Firebird::PathName& modPath
 	const UINT oldErrorMode =
 		SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
 
-	const HMODULE module = LoadLibraryEx(modPath.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
+	const HMODULE module = LoadLibraryEx(modPath.c_str(), 0, 
+		Firebird::bEmbedded ? LOAD_WITH_ALTERED_SEARCH_PATH : 0);
 
 	// Restore old mode in case we are embedded into user application
 	SetErrorMode(oldErrorMode);