From 97738d1ae99035695599e5ddec2f0cd5931101d5 Mon Sep 17 00:00:00 2001 From: grischka Date: Sat, 18 Jul 2009 22:07:10 +0200 Subject: win32: reformat examples, crt etc --- win32/lib/crt1.c | 16 ++++++------ win32/lib/wincrt1.c | 75 +++++++++++++++++++++++++++++++---------------------- 2 files changed, 52 insertions(+), 39 deletions(-) (limited to 'win32/lib') diff --git a/win32/lib/crt1.c b/win32/lib/crt1.c index 1cf12f2..2e18c2b 100644 --- a/win32/lib/crt1.c +++ b/win32/lib/crt1.c @@ -11,7 +11,7 @@ void _controlfp(unsigned a, unsigned b); typedef struct { - int newmode; + int newmode; } _startupinfo; void __getmainargs(int *pargc, char ***pargv, char ***penv, int globb, _startupinfo*); @@ -20,15 +20,15 @@ int main(int argc, char **argv, char **env); int _start(void) { - int argc; char **argv; char **env; int ret; - _startupinfo start_info = {0}; + int argc; char **argv; char **env; int ret; + _startupinfo start_info = {0}; - _controlfp(0x10000, 0x30000); - __set_app_type(__CONSOLE_APP); - __getmainargs(&argc, &argv, &env, 0, &start_info); + _controlfp(0x10000, 0x30000); + __set_app_type(__CONSOLE_APP); + __getmainargs(&argc, &argv, &env, 0, &start_info); - ret = main(argc, argv, env); - exit(ret); + ret = main(argc, argv, env); + exit(ret); } // ============================================= diff --git a/win32/lib/wincrt1.c b/win32/lib/wincrt1.c index 98edb6b..212f9d4 100644 --- a/win32/lib/wincrt1.c +++ b/win32/lib/wincrt1.c @@ -10,40 +10,53 @@ void _controlfp(unsigned a, unsigned b); int _winstart(void) { - 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)); + char *szCmd; + STARTUPINFO startinfo; + int fShow; + int ret; + + __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); + fShow = startinfo.wShowWindow; + if (0 == (startinfo.dwFlags & STARTF_USESHOWWINDOW)) + fShow = SW_SHOWDEFAULT; + + ret = WinMain(GetModuleHandle(NULL), NULL, szCmd, fShow); + exit(ret); } int _runwinmain(int argc, char **argv) { - 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); + char *szCmd, *p; + + p = GetCommandLine(); + szCmd = NULL; + 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); } -- cgit v1.3.1