X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79e385875be4ca15a4d36428156c33e5ccf74f23..11bfe4bfdc79b0374a0f287dac80efa262b365a7:/src/msw/dlmsw.cpp diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp index 9f904a240c..2e6d519edd 100644 --- a/src/msw/dlmsw.cpp +++ b/src/msw/dlmsw.cpp @@ -79,8 +79,15 @@ public: wxVersionDLL *verDLL; }; + // TODO: fix EnumerateLoadedModules() to use EnumerateLoadedModules64() + #ifdef __WIN64__ + typedef DWORD64 DWORD_32_64; + #else + typedef DWORD DWORD_32_64; + #endif + static BOOL CALLBACK - EnumModulesProc(PSTR name, DWORD base, ULONG size, void *data); + EnumModulesProc(PSTR name, DWORD_32_64 base, ULONG size, void *data); }; // ---------------------------------------------------------------------------- @@ -209,7 +216,7 @@ wxString wxVersionDLL::GetFileVersion(const wxString& filename) const /* static */ BOOL CALLBACK wxDynamicLibraryDetailsCreator::EnumModulesProc(PSTR name, - DWORD base, + DWORD_32_64 base, ULONG size, void *data) { @@ -244,6 +251,15 @@ wxDynamicLibraryDetailsCreator::EnumModulesProc(PSTR name, // wxDynamicLibrary implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// misc functions +// ---------------------------------------------------------------------------- + +wxDllType wxDynamicLibrary::GetProgramHandle() +{ + return (wxDllType)::GetModuleHandle(NULL); +} + // ---------------------------------------------------------------------------- // loading/unloading DLLs // ----------------------------------------------------------------------------