1 files changed, 29 insertions, 47 deletions

diff --git a/win32/lib/wincrt1.c b/win32/lib/wincrt1.c
index 83e2f74..ce3a63f 100644
--- a/win32/lib/wincrt1.c
+++ b/win32/lib/wincrt1.c
@@ -23,71 +23,53 @@ int APIENTRY wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int);
 #define _runtwinmain _runwinmain
 #endif
 
-typedef struct
-{
-    int newmode;
-} _startupinfo; // CLI Vs GUI
-
+typedef struct { int newmode; } _startupinfo;
 int __cdecl __tgetmainargs(int *pargc, _TCHAR ***pargv, _TCHAR ***penv, int globb, _startupinfo*);
 
-int _twinstart(void)
+static int go_winmain(TCHAR *arg1)
 {
-    __TRY__
+    STARTUPINFO si;
     _TCHAR *szCmd, *p;
-    STARTUPINFO startinfo;
-    _startupinfo start_info_con = {0};
     int fShow;
-    int ret;
-
-    __set_app_type(__GUI_APP);
-    _controlfp(0x10000, 0x30000);
 
-    start_info_con.newmode = 0;
-    __tgetmainargs(&__argc, &__targv, &_tenviron, 0, &start_info_con);
+    GetStartupInfo(&si);
+    if (si.dwFlags & STARTF_USESHOWWINDOW)
+        fShow = si.wShowWindow;
+    else
+        fShow = SW_SHOWDEFAULT;
 
-    p = GetCommandLine();
-    if (__argc > 1)
-        szCmd = _tcsstr(p, __targv[1]);
+    szCmd = NULL, p = GetCommandLine();
+    if (arg1)
+        szCmd = _tcsstr(p, arg1);
     if (NULL == szCmd)
-        szCmd = __T("");
-    else if (szCmd > p && szCmd[-1] == __T('\"'))
+        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);
+}
 
-    GetStartupInfo(&startinfo);
-    fShow = startinfo.wShowWindow;
-    if (0 == (startinfo.dwFlags & STARTF_USESHOWWINDOW))
-        fShow = SW_SHOWDEFAULT;
-
-    ret = _tWinMain(GetModuleHandle(NULL), NULL, szCmd, fShow);
-    exit(ret);
+int _twinstart(void)
+{
+    __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)
 {
-    _TCHAR *szCmd, *p;
-
 #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;
-    }
+    if (argc < __argc)
+        __targv += __argc - argc, __argc = argc;
 #else
-    __argc = argc;
-    __targv = argv;
+    __argc = argc, __targv = argv;
 #endif
-
-    p = GetCommandLine();
-    szCmd = NULL;
-    if (argc > 1)
-        szCmd = _tcsstr(p, __targv[1]);
-    if (NULL == szCmd)
-        szCmd = __T("");
-    else if (szCmd > p && szCmd[-1] == __T('\"'))
-        --szCmd;
-    _controlfp(0x10000, 0x30000);
-    return _tWinMain(GetModuleHandle(NULL), NULL, szCmd, SW_SHOWDEFAULT);
+    return go_winmain(__argc > 1 ? __targv[1] : NULL);
 }