Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:42:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRT] Always initialize _[w]pgmptr with a *FULL* path to the current application.

Browse source 
Otherwise fall back to the computed argv[0].
This is expected by some applications, for example Git.
Code is adapted from Wine.

Many thanks to Stanislav Motylkov for having investigated this bug!

CORE-12931 CORE-13892 CORE-13898 CORE-14066
This commit is contained in:
Hermès Bélusca-Maïto 2018-06-05 23:50:11 +02:00
parent cac1bc12ae
commit f215f394d8
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
sdk/lib/crt/misc/getargs.c
View file

@ -208,7 +208,7 @@ void __getmainargs(int* argc, char*** argv, char*** env, int expand_wildcards, i
len = strlen(_acmdln); len = strlen(_acmdln);
buffer = malloc(sizeof(char) * len); buffer = malloc(sizeof(char) * len);
// Reference: https://msdn.microsoft.com/en-us/library/a1y7w461(v=vs.71).aspx // Reference: https://msdn.microsoft.com/en-us/library/a1y7w461.aspx
while (TRUE) while (TRUE)
{ {
// Arguments are delimited by white space, which is either a space or a tab. // Arguments are delimited by white space, which is either a space or a tab.
@ -294,7 +294,6 @@ void __getmainargs(int* argc, char*** argv, char*** env, int expand_wildcards, i
/* Free the temporary buffer. */ /* Free the temporary buffer. */
free(buffer); free(buffer);
HeapValidate(GetProcessHeap(), 0, NULL);
*argc = __argc; *argc = __argc;
if (__argv == NULL) if (__argv == NULL)
@ -304,7 +303,21 @@ void __getmainargs(int* argc, char*** argv, char*** env, int expand_wildcards, i
} }
*argv = __argv; *argv = __argv;
*env = _environ; *env = _environ;
_pgmptr = malloc(MAX_PATH * sizeof(char));
if (_pgmptr)
{
if (!GetModuleFileNameA(NULL, _pgmptr, MAX_PATH))
_pgmptr[0] = '\0';
else
_pgmptr[MAX_PATH - 1] = '\0';
}
else
{
_pgmptr = _strdup(__argv[0]); _pgmptr = _strdup(__argv[0]);
}
HeapValidate(GetProcessHeap(), 0, NULL);
// if (new_mode) _set_new_mode(*new_mode); // if (new_mode) _set_new_mode(*new_mode);
} }
@ -342,7 +355,7 @@ void __wgetmainargs(int* argc, wchar_t*** wargv, wchar_t*** wenv,
len = wcslen(_wcmdln); len = wcslen(_wcmdln);
buffer = malloc(sizeof(wchar_t) * len); buffer = malloc(sizeof(wchar_t) * len);
// Reference: https://msdn.microsoft.com/en-us/library/a1y7w461(v=vs.71).aspx // Reference: https://msdn.microsoft.com/en-us/library/a1y7w461.aspx
while (TRUE) while (TRUE)
{ {
// Arguments are delimited by white space, which is either a space or a tab. // Arguments are delimited by white space, which is either a space or a tab.
@ -429,8 +442,6 @@ void __wgetmainargs(int* argc, wchar_t*** wargv, wchar_t*** wenv,
/* Free the temporary buffer. */ /* Free the temporary buffer. */
free(buffer); free(buffer);
HeapValidate(GetProcessHeap(), 0, NULL);
*argc = __argc; *argc = __argc;
if (__wargv == NULL) if (__wargv == NULL)
{ {
@ -439,7 +450,21 @@ void __wgetmainargs(int* argc, wchar_t*** wargv, wchar_t*** wenv,
} }
*wargv = __wargv; *wargv = __wargv;
*wenv = __winitenv; *wenv = __winitenv;
_wpgmptr = malloc(MAX_PATH * sizeof(wchar_t));
if (_wpgmptr)
{
if (!GetModuleFileNameW(NULL, _wpgmptr, MAX_PATH))
_wpgmptr[0] = '\0';
else
_wpgmptr[MAX_PATH - 1] = '\0';
}
else
{
_wpgmptr = _wcsdup(__wargv[0]); _wpgmptr = _wcsdup(__wargv[0]);
}
HeapValidate(GetProcessHeap(), 0, NULL);
// if (new_mode) _set_new_mode(*new_mode); // if (new_mode) _set_new_mode(*new_mode);
} }