forked from Mirrors/tinycc
Win: crt, initialize global __argc, __targv and _tenviron of msvcrt
_tenviron: as far as possible, not in ASC '-run' mode. __argc and __targv are shortcuts for _tWinMain, when you want to use program parameters.master
parent
6f1860e200
commit
faa9744f5d
|
@ -44,9 +44,7 @@ int _dowildcard;
|
||||||
void _tstart(void)
|
void _tstart(void)
|
||||||
{
|
{
|
||||||
__TRY__
|
__TRY__
|
||||||
int argc, ret;
|
int ret;
|
||||||
_TCHAR **argv;
|
|
||||||
_TCHAR **env;
|
|
||||||
_startupinfo start_info;
|
_startupinfo start_info;
|
||||||
|
|
||||||
// Sets the current application type
|
// Sets the current application type
|
||||||
|
@ -60,31 +58,31 @@ void _tstart(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
start_info.newmode = 0;
|
start_info.newmode = 0;
|
||||||
__tgetmainargs( &argc, &argv, &env, _dowildcard, &start_info);
|
__tgetmainargs( &__argc, &__targv, &_tenviron, _dowildcard, &start_info);
|
||||||
ret = _tmain(argc, argv, env);
|
ret = _tmain(__argc, __targv, _tenviron);
|
||||||
exit(ret);
|
exit(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
int _runtmain(int argc, /* as tcc passed in */ char **argv)
|
int _runtmain(int argc, /* as tcc passed in */ char **argv)
|
||||||
{
|
{
|
||||||
#ifdef UNICODE
|
#ifdef UNICODE
|
||||||
int wargc;
|
|
||||||
_TCHAR **wargv, **wenv;
|
|
||||||
_startupinfo start_info = {0};
|
_startupinfo start_info = {0};
|
||||||
|
|
||||||
__tgetmainargs(&wargc, &wargv, &wenv, _dowildcard, &start_info);
|
__tgetmainargs(&__argc, &__targv, &_tenviron, _dowildcard, &start_info);
|
||||||
/* may be wrong when tcc has received wildcards (*.c) */
|
/* may be wrong when tcc has received wildcards (*.c) */
|
||||||
if (argc < wargc)
|
if (argc < __argc) {
|
||||||
wargv += wargc - argc;
|
__targv += __argc - argc;
|
||||||
else
|
__argc = argc;
|
||||||
argc = wargc;
|
}
|
||||||
#define argv wargv
|
#else
|
||||||
|
__argc = argc;
|
||||||
|
__targv = argv;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __i386
|
#ifdef __i386
|
||||||
_controlfp(_PC_53, _MCW_PC);
|
_controlfp(_PC_53, _MCW_PC);
|
||||||
#endif
|
#endif
|
||||||
return _tmain(argc, argv, _tenviron);
|
return _tmain(__argc, __targv, _tenviron);
|
||||||
}
|
}
|
||||||
|
|
||||||
// =============================================
|
// =============================================
|
||||||
|
|
|
@ -33,31 +33,25 @@ int __cdecl __tgetmainargs(int *pargc, _TCHAR ***pargv, _TCHAR ***penv, int glob
|
||||||
int _twinstart(void)
|
int _twinstart(void)
|
||||||
{
|
{
|
||||||
__TRY__
|
__TRY__
|
||||||
_TCHAR *szCmd;
|
_TCHAR *szCmd, *p;
|
||||||
STARTUPINFO startinfo;
|
STARTUPINFO startinfo;
|
||||||
|
_startupinfo start_info_con = {0};
|
||||||
int fShow;
|
int fShow;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
__set_app_type(__GUI_APP);
|
__set_app_type(__GUI_APP);
|
||||||
_controlfp(0x10000, 0x30000);
|
_controlfp(0x10000, 0x30000);
|
||||||
|
|
||||||
szCmd = GetCommandLine();
|
start_info_con.newmode = 0;
|
||||||
if (szCmd) {
|
__tgetmainargs(&__argc, &__targv, &_tenviron, 0, &start_info_con);
|
||||||
while (__T(' ') == *szCmd)
|
|
||||||
szCmd++;
|
p = GetCommandLine();
|
||||||
if (__T('\"') == *szCmd) {
|
if (__argc > 1)
|
||||||
while (*++szCmd)
|
szCmd = _tcsstr(p, __targv[1]);
|
||||||
if (__T('\"') == *szCmd) {
|
if (NULL == szCmd)
|
||||||
szCmd++;
|
szCmd = __T("");
|
||||||
break;
|
else if (szCmd > p && szCmd[-1] == __T('\"'))
|
||||||
}
|
--szCmd;
|
||||||
} else {
|
|
||||||
while (*szCmd && __T(' ') != *szCmd)
|
|
||||||
szCmd++;
|
|
||||||
}
|
|
||||||
while (__T(' ') == *szCmd)
|
|
||||||
szCmd++;
|
|
||||||
}
|
|
||||||
|
|
||||||
GetStartupInfo(&startinfo);
|
GetStartupInfo(&startinfo);
|
||||||
fShow = startinfo.wShowWindow;
|
fShow = startinfo.wShowWindow;
|
||||||
|
@ -73,22 +67,23 @@ int _runtwinmain(int argc, /* as tcc passed in */ char **argv)
|
||||||
_TCHAR *szCmd, *p;
|
_TCHAR *szCmd, *p;
|
||||||
|
|
||||||
#ifdef UNICODE
|
#ifdef UNICODE
|
||||||
int wargc;
|
|
||||||
_TCHAR **wargv, **wenv;
|
|
||||||
_startupinfo start_info = {0};
|
_startupinfo start_info = {0};
|
||||||
|
|
||||||
__tgetmainargs(&wargc, &wargv, &wenv, 0, &start_info);
|
__tgetmainargs(&__argc, &__targv, &_tenviron, 0, &start_info);
|
||||||
if (argc < wargc)
|
/* may be wrong when tcc has received wildcards (*.c) */
|
||||||
wargv += wargc - argc;
|
if (argc < __argc) {
|
||||||
else
|
__targv += __argc - argc;
|
||||||
argc = wargc;
|
__argc = argc;
|
||||||
#define argv wargv
|
}
|
||||||
|
#else
|
||||||
|
__argc = argc;
|
||||||
|
__targv = argv;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
p = GetCommandLine();
|
p = GetCommandLine();
|
||||||
szCmd = NULL;
|
szCmd = NULL;
|
||||||
if (argc > 1)
|
if (argc > 1)
|
||||||
szCmd = _tcsstr(p, argv[1]);
|
szCmd = _tcsstr(p, __targv[1]);
|
||||||
if (NULL == szCmd)
|
if (NULL == szCmd)
|
||||||
szCmd = __T("");
|
szCmd = __T("");
|
||||||
else if (szCmd > p && szCmd[-1] == __T('\"'))
|
else if (szCmd > p && szCmd[-1] == __T('\"'))
|
||||||
|
|
Loading…
Reference in New Issue