hdkv/yuzu
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

early-access version 1667

Browse Source
This commit is contained in:
pineappleEA
2021-05-09 11:30:38 +02:00
parent 5e268d25d7
commit 5dbb928ff2
1069 changed files with 38272 additions and 14437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
externals/SDL/src/main/windows/SDL_windows_main.c vendored
View File

@@ -19,8 +19,6 @@
# undef main
#endif /* main */
#define WIN_WStringToUTF8(S) SDL_iconv_string("UTF-8", "UTF-16LE", (char *)(S), (SDL_wcslen(S)+1)*sizeof(WCHAR))
/* Pop up an out of memory message, returns to Windows */
static BOOL
OutOfMemory(void)
@@ -51,16 +49,29 @@ main_getcmdline(void)
return OutOfMemory();
}
/* Note that we need to be careful about how we allocate/free memory here.
* If the application calls SDL_SetMemoryFunctions(), we can't rely on
* SDL_free() to use the same allocator after SDL_main() returns.
*/
/* Parse it into argv and argc */
argv = (char **)SDL_calloc(argc + 1, sizeof(*argv));
argv = (char **)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (argc + 1) * sizeof(*argv));
if (!argv) {
return OutOfMemory();
}
for (i = 0; i < argc; ++i) {
argv[i] = WIN_WStringToUTF8(argvw[i]);
DWORD len;
char *arg = WIN_StringToUTF8W(argvw[i]);
if (!arg) {
return OutOfMemory();
}
len = (DWORD)SDL_strlen(arg);
argv[i] = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len + 1);
if (!argv[i]) {
return OutOfMemory();
}
CopyMemory(argv[i], arg, len);
SDL_free(arg);
}
argv[i] = NULL;
LocalFree(argvw);
@@ -72,9 +83,9 @@ main_getcmdline(void)
/* Free argv, to avoid memory leak */
for (i = 0; i < argc; ++i) {
SDL_free(argv[i]);
HeapFree(GetProcessHeap(), 0, argv[i]);
}
SDL_free(argv);
HeapFree(GetProcessHeap(), 0, argv);
return result;
}

10
externals/SDL/src/main/windows/version.rc vendored
View File

@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,14,0
PRODUCTVERSION 2,0,14,0
FILEVERSION 2,0,15,0
PRODUCTVERSION 2,0,15,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
VALUE "FileVersion", "2, 0, 14, 0\0"
VALUE "FileVersion", "2, 0, 15, 0\0"
VALUE "InternalName", "SDL\0"
VALUE "LegalCopyright", "Copyright <20> 2020 Sam Lantinga\0"
VALUE "LegalCopyright", "Copyright <20> 2021 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL2.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
VALUE "ProductVersion", "2, 0, 14, 0\0"
VALUE "ProductVersion", "2, 0, 15, 0\0"
END
END
BLOCK "VarFileInfo"