firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 08:03:04 +01:00
Code Issues

Windows only changes:

Browse Source 
- try to load DLL's from fbclient's folder if DLL's file name contains no full path 
- if attempt above failed, load DLL using given file name (as is)
- cleanup

It should fix CORE-4275 (create database fault if fbclient.dll loaded from another directory (Providers = Engine12))
This commit is contained in:
hvlad 2014-02-16 13:26:19 +00:00
parent 3babc6c040
commit e3b82996a1
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/os/win32/mod_loader.cpp
View File

@ -10,9 +10,11 @@
#include "../../../common/dllinst.h"
#include "../common/os/mod_loader.h"
#include <windows.h>
#include "../common/os/path_utils.h"
#include "../common/config/config.h"
#include "../common/classes/ImplementHelper.h"
typedef Firebird::string string;
typedef Firebird::PathName PathName;
using namespace Firebird;
/// This is the Win32 implementation of the mod_loader abstraction.
@ -169,7 +171,7 @@ bool ModuleLoader::isLoadableModule(const PathName& module)
return hMod != 0;
}
void ModuleLoader::doctorModuleExtension(Firebird::PathName& name)
void ModuleLoader::doctorModuleExtension(PathName& name)
{
const PathName::size_type pos = name.rfind(".dll");
if (pos != PathName::npos && pos == name.length() - 4)
@ -177,7 +179,7 @@ void ModuleLoader::doctorModuleExtension(Firebird::PathName& name)
name += ".dll";
}
ModuleLoader::Module *ModuleLoader::loadModule(const Firebird::PathName& modPath)
ModuleLoader::Module *ModuleLoader::loadModule(const PathName& modPath)
{
ContextActivator ctx;
@ -185,8 +187,24 @@ 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,
Firebird::bEmbedded ? LOAD_WITH_ALTERED_SEARCH_PATH : 0);
HMODULE module = 0;
if (PathUtils::isRelative(modPath))
{
MasterInterfacePtr master;
const char* baseDir = master->getConfigManager()->getDirectory(DirType::FB_DIR_BIN);
PathName fullName;
PathUtils::concatPath(fullName, baseDir, modPath);
module = LoadLibraryEx(fullName.c_str(), 0,
Firebird::bEmbedded ? LOAD_WITH_ALTERED_SEARCH_PATH : 0);
}
if (!module)
{
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);
@ -203,7 +221,7 @@ Win32Module::~Win32Module()
FreeLibrary(module);
}
void *Win32Module::findSymbol(const Firebird::string& symName)
void *Win32Module::findSymbol(const string& symName)
{
FARPROC result = GetProcAddress(module, symName.c_str());
if (!result)