mirror of https://github.com/encounter/SDL.git
Windows GetBasePath should use GetModuleFileNameExW() and check for overflows.
Apparently you might get strange paths from GetModuleFileName(), such as short path names or UNC filenames, so this avoids that problem. Since you have to tapdance with linking different libraries and defining macros depending on what Windows you plan to target, we dynamically load the API we need, which works on all versions of Windows (on Win7, it'll load a compatibility wrapper for the newer API location). What a mess. This also now does the right thing if there isn't enough space to store the path, looping with a larger allocated buffer each try. Fixes Bugzilla #2435.
This commit is contained in:
parent
75702ffebc
commit
6d1ad3847a
|
@ -36,11 +36,44 @@
|
||||||
char *
|
char *
|
||||||
SDL_GetBasePath(void)
|
SDL_GetBasePath(void)
|
||||||
{
|
{
|
||||||
TCHAR path[MAX_PATH];
|
DWORD (WINAPI * pGetModuleFileNameExW)(HANDLE, HMODULE, LPWSTR, DWORD) = NULL;
|
||||||
const DWORD len = GetModuleFileName(NULL, path, SDL_arraysize(path));
|
DWORD buflen = 128;
|
||||||
size_t i;
|
WCHAR *path = NULL;
|
||||||
|
HANDLE psapi = LoadLibrary(L"psapi.dll");
|
||||||
|
char *retval = NULL;
|
||||||
|
DWORD len = 0;
|
||||||
|
|
||||||
SDL_assert(len < SDL_arraysize(path));
|
if (!psapi) {
|
||||||
|
WIN_SetError("Couldn't load psapi.dll");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
pGetModuleFileNameExW = GetProcAddress(psapi, "GetModuleFileNameExW");
|
||||||
|
if (!pGetModuleFileNameExW) {
|
||||||
|
WIN_SetError("Couldn't find GetModuleFileNameExW");
|
||||||
|
FreeLibrary(psapi);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
while (SDL_TRUE) {
|
||||||
|
path = (WCHAR *) SDL_malloc(path, buflen * sizeof (WCHAR));
|
||||||
|
if (!path) {
|
||||||
|
FreeLibrary(psapi);
|
||||||
|
SDL_OutOfMemory();
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
len = pGetModuleFileNameEx(GetCurrentProcess(), NULL, path, buflen);
|
||||||
|
if (len != buflen) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* buffer too small? Try again. */
|
||||||
|
SDL_free(path);
|
||||||
|
len *= 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
FreeLibrary(psapi);
|
||||||
|
|
||||||
if (len == 0) {
|
if (len == 0) {
|
||||||
WIN_SetError("Couldn't locate our .exe");
|
WIN_SetError("Couldn't locate our .exe");
|
||||||
|
@ -55,7 +88,11 @@ SDL_GetBasePath(void)
|
||||||
|
|
||||||
SDL_assert(i > 0); /* Should have been an absolute path. */
|
SDL_assert(i > 0); /* Should have been an absolute path. */
|
||||||
path[i+1] = '\0'; /* chop off filename. */
|
path[i+1] = '\0'; /* chop off filename. */
|
||||||
return WIN_StringToUTF8(path);
|
|
||||||
|
retval = WIN_StringToUTF8(path);
|
||||||
|
SDL_free(path);
|
||||||
|
|
||||||
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
|
|
Loading…
Reference in New Issue