diff options
Diffstat (limited to 'src/libs/7zip/win/CPP/Windows/DLL.h')
| -rw-r--r-- | src/libs/7zip/win/CPP/Windows/DLL.h | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/libs/7zip/win/CPP/Windows/DLL.h b/src/libs/7zip/win/CPP/Windows/DLL.h index 4a253b326..d8848ce95 100644 --- a/src/libs/7zip/win/CPP/Windows/DLL.h +++ b/src/libs/7zip/win/CPP/Windows/DLL.h @@ -9,15 +9,13 @@ namespace NWindows { namespace NDLL { #ifdef UNDER_CE -#define My_GetProcAddress(module, proceName) GetProcAddressA(module, proceName) +#define My_GetProcAddress(module, procName) ::GetProcAddressA(module, procName) #else -#define My_GetProcAddress(module, proceName) ::GetProcAddress(module, proceName) +#define My_GetProcAddress(module, procName) ::GetProcAddress(module, procName) #endif - + class CLibrary { - bool LoadOperations(HMODULE newModule); -protected: HMODULE _module; public: CLibrary(): _module(NULL) {}; @@ -39,20 +37,15 @@ public: return m; } - bool Free(); - bool LoadEx(LPCTSTR fileName, DWORD flags = LOAD_LIBRARY_AS_DATAFILE); - bool Load(LPCTSTR fileName); - #ifndef _UNICODE - bool LoadEx(LPCWSTR fileName, DWORD flags = LOAD_LIBRARY_AS_DATAFILE); - bool Load(LPCWSTR fileName); - #endif + bool Free() throw(); + bool LoadEx(CFSTR path, DWORD flags = LOAD_LIBRARY_AS_DATAFILE) throw(); + bool Load(CFSTR path) throw(); FARPROC GetProc(LPCSTR procName) const { return My_GetProcAddress(_module, procName); } }; -bool MyGetModuleFileName(HMODULE hModule, CSysString &result); -#ifndef _UNICODE -bool MyGetModuleFileName(HMODULE hModule, UString &result); -#endif +bool MyGetModuleFileName(FString &path); + +FString GetModuleDirPrefix(); }} |