From 03f8528315fa46c95991a34f3325d7b33ae5538c Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Sat, 02 May 2020 21:48:36 +0000
Subject: [PATCH] Update source to SDL2 2.0.12
---
source/src/main/windows/SDL_windows_main.c | 153 ++++++++------------------------------------------
1 files changed, 26 insertions(+), 127 deletions(-)
diff --git a/source/src/main/windows/SDL_windows_main.c b/source/src/main/windows/SDL_windows_main.c
index 32f6727..f8b1041 100644
--- a/source/src/main/windows/SDL_windows_main.c
+++ b/source/src/main/windows/SDL_windows_main.c
@@ -9,6 +9,7 @@
/* Include this so we define UNICODE properly */
#include "../../core/windows/SDL_windows.h"
+#include <shellapi.h> /* CommandLineToArgvW() */
/* Include the SDL main definition header */
#include "SDL.h"
@@ -18,87 +19,7 @@
# undef main
#endif /* main */
-static void
-UnEscapeQuotes(char *arg)
-{
- char *last = NULL;
-
- while (*arg) {
- if (*arg == '"' && (last != NULL && *last == '\\')) {
- char *c_curr = arg;
- char *c_last = last;
-
- while (*c_curr) {
- *c_last = *c_curr;
- c_last = c_curr;
- c_curr++;
- }
- *c_last = '\0';
- }
- last = arg;
- arg++;
- }
-}
-
-/* Parse a command line buffer into arguments */
-static int
-ParseCommandLine(char *cmdline, char **argv)
-{
- char *bufp;
- char *lastp = NULL;
- int argc, last_argc;
-
- argc = last_argc = 0;
- for (bufp = cmdline; *bufp;) {
- /* Skip leading whitespace */
- while (*bufp == ' ' || *bufp == '\t') {
- ++bufp;
- }
- /* Skip over argument */
- if (*bufp == '"') {
- ++bufp;
- if (*bufp) {
- if (argv) {
- argv[argc] = bufp;
- }
- ++argc;
- }
- /* Skip over word */
- lastp = bufp;
- while (*bufp && (*bufp != '"' || *lastp == '\\')) {
- lastp = bufp;
- ++bufp;
- }
- } else {
- if (*bufp) {
- if (argv) {
- argv[argc] = bufp;
- }
- ++argc;
- }
- /* Skip over word */
- while (*bufp && (*bufp != ' ' && *bufp != '\t')) {
- ++bufp;
- }
- }
- if (*bufp) {
- if (argv) {
- *bufp = '\0';
- }
- ++bufp;
- }
-
- /* Strip out \ from \" sequences */
- if (argv && last_argc != argc) {
- UnEscapeQuotes(argv[last_argc]);
- }
- last_argc = argc;
- }
- if (argv) {
- argv[argc] = NULL;
- }
- return (argc);
-}
+#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
@@ -119,65 +40,43 @@
/* Gets the arguments with GetCommandLine, converts them to argc and argv
and calls SDL_main */
static int
-main_getcmdline()
+main_getcmdline(void)
{
+ LPWSTR *argvw;
char **argv;
- int argc;
- char *cmdline = NULL;
- int retval = 0;
- int cmdalloc = 0;
- const TCHAR *text = GetCommandLine();
- const TCHAR *ptr;
- int argc_guess = 2; /* space for NULL and initial argument. */
- int rc;
+ int i, argc, result;
- /* make a rough guess of command line arguments. Overestimates if there
- are quoted things. */
- for (ptr = text; *ptr; ptr++) {
- if ((*ptr == ' ') || (*ptr == '\t')) {
- argc_guess++;
- }
- }
-
-#if UNICODE
- rc = WideCharToMultiByte(CP_UTF8, 0, text, -1, NULL, 0, NULL, NULL);
- if (rc > 0) {
- cmdalloc = rc + (sizeof (char *) * argc_guess);
- argv = (char **) VirtualAlloc(NULL, cmdalloc, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE);
- if (argv) {
- int rc2;
- cmdline = (char *) (argv + argc_guess);
- rc2 = WideCharToMultiByte(CP_UTF8, 0, text, -1, cmdline, rc, NULL, NULL);
- SDL_assert(rc2 == rc);
- }
- }
-#else
- /* !!! FIXME: are these in the system codepage? We need to convert to UTF-8. */
- rc = ((int) SDL_strlen(text)) + 1;
- cmdalloc = rc + (sizeof (char *) * argc_guess);
- argv = (char **) VirtualAlloc(NULL, cmdalloc, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE);
- if (argv) {
- cmdline = (char *) (argv + argc_guess);
- SDL_strcpy(cmdline, text);
- }
-#endif
- if (cmdline == NULL) {
+ argvw = CommandLineToArgvW(GetCommandLineW(), &argc);
+ if (argvw == NULL) {
return OutOfMemory();
}
/* Parse it into argv and argc */
- SDL_assert(ParseCommandLine(cmdline, NULL) <= argc_guess);
- argc = ParseCommandLine(cmdline, argv);
+ argv = (char **)SDL_calloc(argc + 1, sizeof(*argv));
+ if (!argv) {
+ return OutOfMemory();
+ }
+ for (i = 0; i < argc; ++i) {
+ argv[i] = WIN_WStringToUTF8(argvw[i]);
+ if (!argv[i]) {
+ return OutOfMemory();
+ }
+ }
+ argv[i] = NULL;
+ LocalFree(argvw);
SDL_SetMainReady();
/* Run the application main() code */
- retval = SDL_main(argc, argv);
+ result = SDL_main(argc, argv);
- VirtualFree(argv, cmdalloc, MEM_DECOMMIT);
- VirtualFree(argv, 0, MEM_RELEASE);
+ /* Free argv, to avoid memory leak */
+ for (i = 0; i < argc; ++i) {
+ SDL_free(argv[i]);
+ }
+ SDL_free(argv);
- return retval;
+ return result;
}
/* This is where execution begins [console apps, ansi] */
--
Gitblit v1.9.3