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] Define a wmain() that converts arguments to UTF8.

wmain_patch.diff (text/plain), 1.51 KB, created by Jørgen Tjernø on 2015-02-02 20:00:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jørgen Tjernø

Created: 2015-02-02 20:00:05 UTC

Size: 1.51 KB

patch

obsolete

>--- c:\Users\jorgen.UBERENT\AppData\Local\Temp\thg.moyo5y\SDL.1.9331\src\main\windows\SDL_windows_main.c	Mon Feb 2 19:51:43 2015 UTC
>+++ c:\Users\jorgen.UBERENT\AppData\Local\Temp\thg.moyo5y\SDL.1\src\main\windows\SDL_windows_main.c	Mon Feb 2 19:51:43 2015 UTC
>@@ -109,13 +109,16 @@
> }
> 
> #if defined(_MSC_VER)
>-/* The VC++ compiler needs main defined */
>-#define console_main main
>+/* The VC++ compiler needs main/wmain defined */
>+# define console_utf8_main main
>+# if UNICODE
>+#  define console_wmain wmain
>+# endif
> #endif
> 
>-/* This is where execution begins [console apps] */
>+/* This is where execution begins [console apps, ansi] */
> int
>-console_main(int argc, char *argv[])
>+console_utf8_main(int argc, char *argv[])
> {
>     SDL_SetMainReady();
> 
>@@ -123,6 +126,22 @@
>     return SDL_main(argc, argv);
> }
> 
>+#if UNICODE
>+/* This is where execution begins [console apps, unicode] */
>+int
>+console_wmain(int argc, wchar_t *wargv[], wchar_t *wenvp)
>+{
>+    char **argv = SDL_stack_alloc(char*, argc);
>+    int i;
>+
>+    for (i = 0; i < argc; ++i) {
>+        argv[i] = WIN_StringToUTF8(wargv[i]);
>+    }
>+
>+    return console_utf8_main(argc, argv);
>+}
>+#endif
>+
> /* This is where execution begins [windowed apps] */
> int WINAPI
> WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
>@@ -151,7 +170,7 @@
>     ParseCommandLine(cmdline, argv);
> 
>     /* Run the main program */
>-    console_main(argc, argv);
>+    console_utf8_main(argc, argv);
> 
>     SDL_stack_free(argv);
>

Actions: View | Diff

Attachments on bug 2864: 2015

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.