vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

platform: win32: COM_CheckLibraryDirectDependency fixes

Browse source
This commit is contained in:
Velaron 2020-09-03 02:54:01 +03:00 • committed by Alibek Omarov
parent f3d8a2bcb0
commit 03668116d7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
engine/platform/win32/lib_win.c
View file

@ -239,7 +239,7 @@ static int ProtectionFlags[2][2][2] =
typedef BOOL (WINAPI *DllEntryProc)( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved ); typedef BOOL (WINAPI *DllEntryProc)( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved );
#define GET_HEADER_DICTIONARY( module, idx ) &(module)->headers->OptionalHeader.DataDirectory[idx] #define GET_HEADER_DICTIONARY( module, idx ) &(module)->headers->OptionalHeader.DataDirectory[idx]
#define CALCULATE_ADDRESS( base, offset ) (((DWORD)(base)) + (offset)) #define CALCULATE_ADDRESS( base, offset ) ((DWORD)(base) + (DWORD)(offset))
static void CopySections( const byte *data, PIMAGE_NT_HEADERS old_headers, PMEMORYMODULE module ) static void CopySections( const byte *data, PIMAGE_NT_HEADERS old_headers, PMEMORYMODULE module )
{ {
@ -957,7 +957,7 @@ qboolean COM_CheckLibraryDirectDependency( const char *name, const char *depname
PIMAGE_NT_HEADERS old_header; PIMAGE_NT_HEADERS old_header;
PIMAGE_DATA_DIRECTORY directory; PIMAGE_DATA_DIRECTORY directory;
PIMAGE_IMPORT_DESCRIPTOR importDesc; PIMAGE_IMPORT_DESCRIPTOR importDesc;
string errorstring; string errorstring = "";
void *data = NULL; void *data = NULL;
dll_user_t *hInst; dll_user_t *hInst;
@ -992,7 +992,7 @@ qboolean COM_CheckLibraryDirectDependency( const char *name, const char *depname
if( directory->Size <= 0 ) if( directory->Size <= 0 )
{ {
Q_snprintf( errorstring, sizeof( errorstring ), "%s has no dependencies. Is this dll valid?\n" ); Q_snprintf( errorstring, sizeof( errorstring ), "%s has no dependencies. Is this dll valid?\n", name );
goto libraryerror; goto libraryerror;
} }
@ -1011,7 +1011,7 @@ qboolean COM_CheckLibraryDirectDependency( const char *name, const char *depname
} }
libraryerror: libraryerror:
Con_Printf( errorstring ); if( errorstring[0] ) Con_Printf( errorstring );
if( data ) Mem_Free( data ); // release memory if( data ) Mem_Free( data ); // release memory
return false; return false;
} }