We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch that makes the main entry point on Windows use the GetCommandLine path of WinMain.

SDL2_use_getcommandline_for_windows_main_entry_point.diff (text/plain), 2.32 KB, created by Simon Hug on 2016-10-14 09:59:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Hug

Created: 2016-10-14 09:59:53 UTC

Size: 2.32 KB

patch

obsolete

>diff -r cd2e0b0c7ec5 src/main/windows/SDL_windows_main.c
>--- a/src/main/windows/SDL_windows_main.c	Fri Oct 14 01:04:21 2016 -0700
>+++ b/src/main/windows/SDL_windows_main.c	Fri Oct 14 11:19:13 2016 +0200
>@@ -126,12 +126,49 @@
>     return SDL_main(argc, argv);
> }
> 
>+/* Gets the arguments with GetCommandLine, converts them to argc and argv
>+   and calls main_utf8 */
>+static int
>+main_getcmdline()
>+{
>+    char **argv;
>+    int argc;
>+    char *cmdline;
>+    int retval = 0;
>+
>+    /* Grab the command line */
>+    TCHAR *text = GetCommandLine();
>+#if UNICODE
>+    cmdline = WIN_StringToUTF8(text);
>+#else
>+    /* !!! FIXME: are these in the system codepage? We need to convert to UTF-8. */
>+    cmdline = SDL_strdup(text);
>+#endif
>+    if (cmdline == NULL) {
>+        return OutOfMemory();
>+    }
>+
>+    /* Parse it into argv and argc */
>+    argc = ParseCommandLine(cmdline, NULL);
>+    argv = SDL_stack_alloc(char *, argc + 1);
>+    if (argv == NULL) {
>+        return OutOfMemory();
>+    }
>+    ParseCommandLine(cmdline, argv);
>+
>+    retval = main_utf8(argc, argv);
>+
>+    SDL_stack_free(argv);
>+    SDL_free(cmdline);
>+
>+    return retval;
>+}
>+
> /* This is where execution begins [console apps, ansi] */
> int
> console_ansi_main(int argc, char *argv[])
> {
>-    /* !!! FIXME: are these in the system codepage? We need to convert to UTF-8. */
>-    return main_utf8(argc, argv);
>+    return main_getcmdline();
> }
> 
> 
>@@ -162,39 +199,7 @@
> int WINAPI
> WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
> {
>-    char **argv;
>-    int argc;
>-    char *cmdline;
>-
>-    /* Grab the command line */
>-    TCHAR *text = GetCommandLine();
>-#if UNICODE
>-    cmdline = WIN_StringToUTF8(text);
>-#else
>-    /* !!! FIXME: are these in the system codepage? We need to convert to UTF-8. */
>-    cmdline = SDL_strdup(text);
>-#endif
>-    if (cmdline == NULL) {
>-        return OutOfMemory();
>-    }
>-
>-    /* Parse it into argv and argc */
>-    argc = ParseCommandLine(cmdline, NULL);
>-    argv = SDL_stack_alloc(char *, argc + 1);
>-    if (argv == NULL) {
>-        return OutOfMemory();
>-    }
>-    ParseCommandLine(cmdline, argv);
>-
>-    /* Run the main program */
>-    main_utf8(argc, argv);
>-
>-    SDL_stack_free(argv);
>-
>-    SDL_free(cmdline);
>-
>-    /* Hush little compiler, don't you cry... */
>-    return 0;
>+    return main_getcmdline();
> }
> 
> #endif /* __WIN32__ */

Actions: View | Diff

Attachments on bug 3452: 2583

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.