Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compilation for latest SDK where EnumModulesProc() first parameter is now const (bug 1629333)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-01-07 23:35:49 +00:00
parent d200d68cbf
commit 090afcf011
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/dlmsw.cpp
View File

@@ -79,6 +79,16 @@ public:
wxVersionDLL *verDLL; wxVersionDLL *verDLL;
}; };
// the declared type of the first EnumModulesProc() parameter changed in
// recent SDK versions and is no PCSTR instead of old PSTR, we know that
// it's const in version 11 and non-const in version 8 included with VC8
// (and earlier), suppose that it's only changed in version 11
#if defined(API_VERSION_NUMBER) && API_VERSION_NUMBER >= 11
typedef PCSTR NameStr_t;
#else
typedef PSTR NameStr_t;
#endif
// TODO: fix EnumerateLoadedModules() to use EnumerateLoadedModules64() // TODO: fix EnumerateLoadedModules() to use EnumerateLoadedModules64()
#ifdef __WIN64__ #ifdef __WIN64__
typedef DWORD64 DWORD_32_64; typedef DWORD64 DWORD_32_64;
@@ -87,7 +97,7 @@ public:
#endif #endif
static BOOL CALLBACK static BOOL CALLBACK
EnumModulesProc(PSTR name, DWORD_32_64 base, ULONG size, void *data); EnumModulesProc(NameStr_t name, DWORD_32_64 base, ULONG size, void *data);
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -215,7 +225,7 @@ wxString wxVersionDLL::GetFileVersion(const wxString& filename) const
/* static */ /* static */
BOOL CALLBACK BOOL CALLBACK
wxDynamicLibraryDetailsCreator::EnumModulesProc(PSTR name, wxDynamicLibraryDetailsCreator::EnumModulesProc(NameStr_t name,
DWORD_32_64 base, DWORD_32_64 base,
ULONG size, ULONG size,
void *data) void *data)