dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-02-28 06:43:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sys_DLL_Load() for Win32: Mention D3_ARCH in warning about wrong arch

Browse source 
also changed that logic a bit so FormatMessage() is only called when
actually used

and while at it, fixed the build with mingw-w64 on my system
(somehow an SDL header used strcmp() and that didn't work with
 `#define strcmp idStr::Cmp` from Str.h)
This commit is contained in:
Daniel Gibson 2024-11-07 06:02:38 +01:00
parent 373f59c484
commit 218813efb3
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
neo/sys/win32/win_main.cpp
View file

@ -53,6 +53,8 @@ If you have questions concerning this license or the applicable additional terms
#include "tools/edit_public.h"
#undef strcmp // get rid of "#define strcmp idStr::Cmp", it conflicts with SDL headers
#include "sys/sys_sdl.h"
#ifdef D3_SDL3
@ -646,6 +648,24 @@ uintptr_t Sys_DLL_Load( const char *dllName ) {
}
} else {
DWORD e = GetLastError();
if ( e == 0x7E ) {
// 0x7E is "The specified module could not be found."
// don't print a warning for that error, it's expected
// when trying different possible paths for a DLL
return 0;
}
if ( e == 0xC1) {
// "[193 (0xC1)] is not a valid Win32 application"
// probably going to be common. Lets try to be less cryptic.
common->Warning( "LoadLibrary( \"%s\" ) Failed ! [%i (0x%X)]\tprobably the DLL is of the wrong architecture, "
"like x64 instead of x86 (this build of dhewm3 expects %s)",
dllName, e, e, D3_ARCH );
return 0;
}
// for all other errors, print whatever FormatMessage() gives us
LPVOID msgBuf = NULL;
FormatMessage(
@ -658,17 +678,7 @@ uintptr_t Sys_DLL_Load( const char *dllName ) {
(LPTSTR)&msgBuf,
0, NULL);
idStr errorStr = va( "[%i (0x%X)]\t%s", e, e, msgBuf );
// common, skipped.
if ( e == 0x7E ) // [126 (0x7E)] The specified module could not be found.
errorStr = "";
// probably going to be common. Lets try to be less cryptic.
else if ( e == 0xC1 ) // [193 (0xC1)] is not a valid Win32 application.
errorStr = va( "[%i (0x%X)]\t%s", e, e, "probably the DLL is of the wrong architecture, like x64 instead of x86" );
if ( errorStr.Length() )
common->Warning( "LoadLibrary(%s) Failed ! %s", dllName, errorStr.c_str() );
common->Warning( "LoadLibrary( \"%s\" ) Failed ! [%i (0x%X)]\t%s", dllName, e, e, msgBuf );
::LocalFree( msgBuf );
}