[CORE] Fixes for GetApplicationDirectory on 32 bit windows builds (#2290)

* Fix a signature error with the windows calls in GetApplicationDirectory for 32 bit builds.

* break is better than loop var to -1
This commit is contained in:
Jeffery Myers 2022-01-17 09:05:48 -08:00 committed by GitHub
parent 61d0c71b3c
commit bec27a6ebc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -166,9 +166,9 @@
#ifndef MAX_PATH #ifndef MAX_PATH
#define MAX_PATH 1025 #define MAX_PATH 1025
#endif #endif
unsigned int GetModuleFileNameA( void* hModule, const char* lpFilename, unsigned int nSize); __declspec(dllimport) unsigned long __stdcall GetModuleFileNameA(void* hModule, void* lpFilename, unsigned long nSize);
unsigned int GetModuleFileNameW( void* hModule, const unsigned short* lpFilename, unsigned int nSize); __declspec(dllimport) unsigned long __stdcall GetModuleFileNameW(void* hModule, void* lpFilename, unsigned long nSize);
int WideCharToMultiByte(unsigned int cp, unsigned long flags, const unsigned short *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default); __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, void* widestr, int cchwide, void* str, int cbmb, void* defchar, int* used_default);
#elif defined(__linux__) #elif defined(__linux__)
#include <unistd.h> #include <unistd.h>
#elif defined(__APPLE__) #elif defined(__APPLE__)
@ -3006,7 +3006,7 @@ const char *GetApplicationDirectory(void)
if (appDir[i] == '\\') if (appDir[i] == '\\')
{ {
appDir[i + 1] = '\0'; appDir[i + 1] = '\0';
i = -1; break;
} }
} }
} }
@ -3027,7 +3027,7 @@ const char *GetApplicationDirectory(void)
if (appDir[i] == '/') if (appDir[i] == '/')
{ {
appDir[i + 1] = '\0'; appDir[i + 1] = '\0';
i = -1; break;
} }
} }
} }
@ -3047,7 +3047,7 @@ const char *GetApplicationDirectory(void)
if (appDir[i] == '/') if (appDir[i] == '/')
{ {
appDir[i + 1] = '\0'; appDir[i + 1] = '\0';
i = -1; break;
} }
} }
} }