Merge branch 'devel' into araq

1 files changed, 59 insertions, 33 deletions

diff --git a/tinyc/win32/lib/wincrt1.c b/tinyc/win32/lib/wincrt1.c
index 98edb6b9b..ce3a63f13 100644
--- a/tinyc/win32/lib/wincrt1.c
+++ b/tinyc/win32/lib/wincrt1.c
@@ -1,6 +1,10 @@
 //+---------------------------------------------------------------------------
 
+// _UNICODE for tchar.h, UNICODE for API
+#include <tchar.h>
+
 #include <windows.h>
+#include <stdlib.h>
 
 #define __UNKNOWN_APP    0
 #define __CONSOLE_APP    1
@@ -8,42 +12,64 @@
 void __set_app_type(int);
 void _controlfp(unsigned a, unsigned b);
 
-int _winstart(void)
+#ifdef _UNICODE
+#define __tgetmainargs __wgetmainargs
+#define _twinstart _wwinstart
+#define _runtwinmain _runwwinmain
+int APIENTRY wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int);
+#else
+#define __tgetmainargs __getmainargs
+#define _twinstart _winstart
+#define _runtwinmain _runwinmain
+#endif
+
+typedef struct { int newmode; } _startupinfo;
+int __cdecl __tgetmainargs(int *pargc, _TCHAR ***pargv, _TCHAR ***penv, int globb, _startupinfo*);
+
+static int go_winmain(TCHAR *arg1)
 {
-	char *szCmd; STARTUPINFO startinfo;
-
-	__set_app_type(__GUI_APP);
-	_controlfp(0x10000, 0x30000);
-
-	szCmd = GetCommandLine();
-	if (szCmd)
-	{
-		while (' ' == *szCmd) szCmd++;
-		if ('\"' == *szCmd)
-		{
-			while (*++szCmd)
-				if ('\"' == *szCmd) { szCmd++; break; }
-		}
-		else
-		{
-			while (*szCmd && ' ' != *szCmd) szCmd++;
-		}
-		while (' ' == *szCmd) szCmd++;
-	}
-
-	GetStartupInfo(&startinfo);
-	exit(WinMain(GetModuleHandle(NULL), NULL, szCmd,
-		(startinfo.dwFlags & STARTF_USESHOWWINDOW) ?
-			startinfo.wShowWindow : SW_SHOWDEFAULT));
+    STARTUPINFO si;
+    _TCHAR *szCmd, *p;
+    int fShow;
+
+    GetStartupInfo(&si);
+    if (si.dwFlags & STARTF_USESHOWWINDOW)
+        fShow = si.wShowWindow;
+    else
+        fShow = SW_SHOWDEFAULT;
+
+    szCmd = NULL, p = GetCommandLine();
+    if (arg1)
+        szCmd = _tcsstr(p, arg1);
+    if (NULL == szCmd)
+        szCmd = _tcsdup(__T(""));
+    else if (szCmd > p && szCmd[-1] == __T('"'))
+        --szCmd;
+#if defined __i386__ || defined __x86_64__
+    _controlfp(0x10000, 0x30000);
+#endif
+    return _tWinMain(GetModuleHandle(NULL), NULL, szCmd, fShow);
 }
 
-int _runwinmain(int argc, char **argv)
+int _twinstart(void)
 {
-	char *szCmd = NULL;
-	char *p = GetCommandLine();
-	if (argc > 1) szCmd = strstr(p, argv[1]);
-	if (NULL == szCmd) szCmd = "";
-	else if (szCmd > p && szCmd[-1] == '\"') --szCmd;
-	return WinMain(GetModuleHandle(NULL), NULL, szCmd, SW_SHOWDEFAULT);
+    __TRY__
+    _startupinfo start_info_con = {0};
+    __set_app_type(__GUI_APP);
+    __tgetmainargs(&__argc, &__targv, &_tenviron, 0, &start_info_con);
+    exit(go_winmain(__argc > 1 ? __targv[1] : NULL));
 }
 
+int _runtwinmain(int argc, /* as tcc passed in */ char **argv)
+{
+#ifdef UNICODE
+    _startupinfo start_info = {0};
+    __tgetmainargs(&__argc, &__targv, &_tenviron, 0, &start_info);
+    /* may be wrong when tcc has received wildcards (*.c) */
+    if (argc < __argc)
+        __targv += __argc - argc, __argc = argc;
+#else
+    __argc = argc, __targv = argv;
+#endif
+    return go_winmain(__argc > 1 ? __targv[1] : NULL);
+}