February 2024 - Wine-commits

Piotr Caban : wininet: Return process-wide proxy settings from INTERNET_GetProxySettings.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 132da0e0eed69af4060d799f4d1edaf6db545e43 URL: https://gitlab.winehq.org/wine/wine/-/commit/132da0e0eed69af4060d799f4d1eda… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 16:59:55 2024 +0100 wininet: Return process-wide proxy settings from INTERNET_GetProxySettings. Use INTERNET_LoadProxySettings when settings from registry are needed. --- dlls/wininet/internet.c | 64 ++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 58f35605940..4739834df53 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -609,46 +609,50 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) return ERROR_SUCCESS; } -/*********************************************************************** - * INTERNET_GetProxySettings - * - * Loads proxy information from registry, enironment or process-wide settings - * into lpwpi. - */ -static LONG INTERNET_GetProxySettings( proxyinfo_t *lpwpi ) +static void init_global_proxy(void) { const WCHAR *envproxy; - LONG ret; - if ((ret = INTERNET_LoadProxySettings( lpwpi )) || (lpwpi->flags & PROXY_TYPE_PROXY)) - return ret; - FreeProxyInfo( lpwpi ); + EnterCriticalSection( &WININET_cs ); + if (global_proxy.flags) goto done; - if ((envproxy = _wgetenv( L"http_proxy" ))) + INTERNET_LoadProxySettings( &global_proxy ); + if (global_proxy.flags & PROXY_TYPE_PROXY || !(envproxy = _wgetenv( L"http_proxy" ))) + goto done; + + if (parse_proxy_url( &global_proxy, envproxy )) { - memset( lpwpi, 0, sizeof(*lpwpi) ); - lpwpi->flags = PROXY_TYPE_DIRECT; - if (parse_proxy_url( lpwpi, envproxy )) - { - lpwpi->flags = PROXY_TYPE_PROXY; - lpwpi->proxyBypass = wcsdup(_wgetenv( L"no_proxy" )); - TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); - TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass)); - } - else - { - WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxy)); - } - return ERROR_SUCCESS; + global_proxy.flags |= PROXY_TYPE_PROXY; + global_proxy.proxyBypass = wcsdup(_wgetenv( L"no_proxy" )); + TRACE("http proxy (from environment) = %s\n", debugstr_w(global_proxy.proxy)); + TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(global_proxy.proxyBypass)); } + else + { + WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxy)); + } + +done: + LeaveCriticalSection( &WININET_cs ); +} +/*********************************************************************** + * INTERNET_GetProxySettings + * + * Loads process-wide proxy settings into lpwpi. + */ +static LONG INTERNET_GetProxySettings( proxyinfo_t *lpwpi ) +{ + init_global_proxy(); + + memset(lpwpi, 0, sizeof(*lpwpi)); EnterCriticalSection( &WININET_cs ); lpwpi->flags = global_proxy.flags; lpwpi->proxy = wcsdup( global_proxy.proxy ); lpwpi->proxyBypass = wcsdup( global_proxy.proxyBypass ); + lpwpi->proxyUsername = wcsdup( global_proxy.proxyUsername ); + lpwpi->proxyPassword = wcsdup( global_proxy.proxyPassword ); LeaveCriticalSection( &WININET_cs ); - - lpwpi->flags |= PROXY_TYPE_DIRECT; return ERROR_SUCCESS; } @@ -2651,7 +2655,7 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u LONG ret; TRACE("Getting global proxy info\n"); - if((ret = INTERNET_GetProxySettings(&pi))) + if((ret = INTERNET_LoadProxySettings(&pi))) return ret; FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); @@ -3142,7 +3146,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, unsigned int i; proxyinfo_t pi; - if (INTERNET_GetProxySettings(&pi)) return FALSE; + if (INTERNET_LoadProxySettings(&pi)) return FALSE; for (i = 0; i < con->dwOptionCount; i++) { INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i;

1 0

Piotr Caban : wininet: Add support for reading AutoConfigURL from registry.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 40b5e767d464917a6b53f444ce4d2a3a8f53389c URL: https://gitlab.winehq.org/wine/wine/-/commit/40b5e767d464917a6b53f444ce4d2a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 17:21:16 2024 +0100 wininet: Add support for reading AutoConfigURL from registry. --- dlls/wininet/internet.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4739834df53..1d7b9796a21 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -86,6 +86,7 @@ typedef struct LPWSTR proxyBypass; LPWSTR proxyUsername; LPWSTR proxyPassword; + LPWSTR autoconf_url; } proxyinfo_t; static ULONG max_conns = 2, max_1_0_conns = 4; @@ -470,6 +471,7 @@ static void FreeProxyInfo( proxyinfo_t *lpwpi ) free(lpwpi->proxyBypass); free(lpwpi->proxyUsername); free(lpwpi->proxyPassword); + free(lpwpi->autoconf_url); } static proxyinfo_t global_proxy; @@ -605,6 +607,23 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) TRACE("No proxy bypass server settings in registry.\n"); } + if (!RegQueryValueExW( key, L"AutoConfigURL", NULL, &type, NULL, &len ) && len && (type == REG_SZ)) + { + LPWSTR autoconf_url; + + if (!(autoconf_url = malloc( len ))) + { + RegCloseKey( key ); + FreeProxyInfo( lpwpi ); + return ERROR_OUTOFMEMORY; + } + RegQueryValueExW( key, L"AutoConfigURL", NULL, &type, (BYTE*)autoconf_url, &len ); + + lpwpi->flags |= PROXY_TYPE_AUTO_PROXY_URL; + lpwpi->autoconf_url = autoconf_url; + TRACE("AutoConfigURL = %s\n", debugstr_w(lpwpi->autoconf_url)); + } + RegCloseKey( key ); return ERROR_SUCCESS; }

1 0

Piotr Caban : wininet: Store whole ProxyServer string so it's not lost while saving settings to registry.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 17d8cb24d4ffb4533b147d81ee265235594450eb URL: https://gitlab.winehq.org/wine/wine/-/commit/17d8cb24d4ffb4533b147d81ee2652… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 17:42:31 2024 +0100 wininet: Store whole ProxyServer string so it's not lost while saving settings to registry. --- dlls/wininet/internet.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1d7b9796a21..4a89cc4064c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -342,7 +342,8 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) if (lpwpi->proxy) { - if ((ret = RegSetValueExW( key, L"ProxyServer", 0, REG_SZ, (BYTE*)lpwpi->proxy, sizeof(WCHAR) * (lstrlenW(lpwpi->proxy) + 1)))) + if ((ret = RegSetValueExW( key, L"ProxyServer", 0, REG_SZ, (BYTE*)lpwpi->proxy, + sizeof(WCHAR) * (lstrlenW(lpwpi->proxy) + 1)))) { RegCloseKey( key ); return ret; @@ -519,6 +520,23 @@ static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) return TRUE; } +static WCHAR *get_http_proxy( const WCHAR *proxy ) +{ + const WCHAR *p, *end; + WCHAR *ret; + + p = wcsstr( proxy, L"http=" ); + if (p) p += 5; + else p = proxy; + end = wcschr( p, ';' ); + if (!end) end = p + wcslen( p ); + + ret = malloc( (end - p + 1) * sizeof(WCHAR) ); + memcpy(ret, p, (end - p) * sizeof(WCHAR) ); + ret[end - p] = 0; + return ret; +} + /*********************************************************************** * INTERNET_LoadProxySettings * @@ -559,7 +577,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, L"ProxyServer", NULL, &type, NULL, &len ) && len && (type == REG_SZ)) { - LPWSTR szProxy, p; + LPWSTR szProxy; if (!(szProxy = malloc( len ))) { @@ -568,18 +586,8 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } RegQueryValueExW( key, L"ProxyServer", NULL, &type, (BYTE*)szProxy, &len ); - /* find the http proxy, and strip away everything else */ - p = wcsstr( szProxy, L"http=" ); - if (p) - { - p += lstrlenW( L"http=" ); - lstrcpyW( szProxy, p ); - } - p = wcschr( szProxy, ';' ); - if (p) *p = 0; - lpwpi->proxy = szProxy; - TRACE("http proxy (from registry%s) = %s\n", lpwpi->flags & PROXY_TYPE_PROXY ? "" : ", disabled", + TRACE("proxy server (from registry%s) = %s\n", lpwpi->flags & PROXY_TYPE_PROXY ? "" : ", disabled", debugstr_w(lpwpi->proxy)); } else @@ -690,10 +698,11 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) TRACE("http proxy = %s bypass = %s\n", debugstr_w(wpi.proxy), debugstr_w(wpi.proxyBypass)); lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; - lpwai->proxy = wpi.proxy; + lpwai->proxy = get_http_proxy( wpi.proxy ); lpwai->proxyBypass = wpi.proxyBypass; lpwai->proxyUsername = wpi.proxyUsername; lpwai->proxyPassword = wpi.proxyPassword; + free( wpi.proxy ); return TRUE; }

1 0

Piotr Caban : wininet: Set ProxyOverride registry key when saving proxy information.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 666a472f06dd95b555a20b3581e97eb3f428deb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/666a472f06dd95b555a20b3581e97e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 20:10:22 2024 +0100 wininet: Set ProxyOverride registry key when saving proxy information. --- dlls/wininet/internet.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4a89cc4064c..e8804d49d03 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -358,6 +358,24 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) } } + if (lpwpi->proxyBypass) + { + if ((ret = RegSetValueExW( key, L"ProxyOverride", 0, REG_SZ, (BYTE*)lpwpi->proxyBypass, + sizeof(WCHAR) * (lstrlenW(lpwpi->proxyBypass) + 1)))) + { + RegCloseKey( key ); + return ret; + } + } + else + { + if ((ret = RegDeleteValueW( key, L"ProxyOverride" )) && ret != ERROR_FILE_NOT_FOUND) + { + RegCloseKey( key ); + return ret; + } + } + RegCloseKey(key); return ERROR_SUCCESS; }

1 0

Piotr Caban : wininet: Set AutoConfigURL registry key when saving proxy information.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 1d479df4e81b2fe56e7e37da20c0c5bfab4c4efb URL: https://gitlab.winehq.org/wine/wine/-/commit/1d479df4e81b2fe56e7e37da20c0c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 20:10:42 2024 +0100 wininet: Set AutoConfigURL registry key when saving proxy information. --- dlls/wininet/internet.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e8804d49d03..fc962016246 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -376,6 +376,24 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) } } + if (lpwpi->autoconf_url) + { + if ((ret = RegSetValueExW( key, L"AutoConfigURL", 0, REG_SZ, (BYTE*)lpwpi->autoconf_url, + sizeof(WCHAR) * (lstrlenW(lpwpi->autoconf_url) + 1)))) + { + RegCloseKey( key ); + return ret; + } + } + else + { + if ((ret = RegDeleteValueW( key, L"AutoConfigURL" )) && ret != ERROR_FILE_NOT_FOUND) + { + RegCloseKey( key ); + return ret; + } + } + RegCloseKey(key); return ERROR_SUCCESS; }

1 0

Bernhard Übelacker : cmd: Handle lines with just spaces in bracket blocks.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: d7edf3e651a2601d6086f49d3b2907e2321b8607 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7edf3e651a2601d6086f49d3b2907… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Fri Feb 9 21:45:37 2024 +0100 cmd: Handle lines with just spaces in bracket blocks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51599 --- programs/cmd/tests/test_builtins.cmd | 26 ++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ programs/cmd/wcmdmain.c | 1 + 3 files changed, 33 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 510a1ba5931..44dfd080b90 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1029,6 +1029,32 @@ if not exist %windir% ( ) else ( echo windir does exist ) +if 1 == 0 ( + echo 1 == 0 should not be true +(a)space@ +) else echo block containing a line with just space seems to work +if 1 == 0 ( + echo 1 == 0 should not be true +(a)tab@ +) else echo block containing a line with just tab seems to work +if 1 == 0 ( + echo 1 == 0 should not be true +(a)space@@tab@ +) else echo block containing a line with just space and tab seems to work +if 1 == 0 ( + echo 1 == 0 should not be true +(a)tab@@space@ +) else echo block containing a line with just tab and space seems to work +if 1 == 0 ( + echo 1 == 0 should not be true +(a)space@ +(a)space@ +) else echo block containing two lines with just space seems to work +if 1 == 0 ( + echo 1 == 0 should not be true +(a)tab@ +(a)tab@ +) else echo block containing two lines with just tab seems to work echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0f48a823109..fc1f9991df4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -707,6 +707,12 @@ comparison operators surrounded by brackets seem to work comparison operators surrounded by brackets seem to work windir is defined windir does exist +block containing a line with just space seems to work +block containing a line with just tab seems to work +block containing a line with just space and tab seems to work +block containing a line with just tab and space seems to work +block containing two lines with just space seems to work +block containing two lines with just tab seems to work --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 843fef8ea50..09cfeae1a01 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2326,6 +2326,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } else break; } + extraData = WCMD_skip_leading_spaces(extraData); } while (*extraData == 0x00); curPos = extraSpace;

1 0

Bernhard Übelacker : cmd: Avoid execution if block misses closing brackets.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: c418771a43ed01ebe464b37405da506bc64a6fe0 URL: https://gitlab.winehq.org/wine/wine/-/commit/c418771a43ed01ebe464b37405da50… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Fri Feb 9 21:45:57 2024 +0100 cmd: Avoid execution if block misses closing brackets. --- programs/cmd/tests/test_builtins.cmd | 24 ++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 5 +++++ programs/cmd/wcmdmain.c | 7 +++++++ 3 files changed, 36 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 44dfd080b90..1ab2935aec4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1055,6 +1055,30 @@ if 1 == 0 ( @tab@ @tab@ ) else echo block containing two lines with just tab seems to work +:: +echo @if 1 == 1 (> blockclosing.cmd +echo echo with closing bracket>> blockclosing.cmd +echo )>> blockclosing.cmd +cmd.exe /Q /C blockclosing.cmd +echo %ERRORLEVEL% ok +:: +echo @if 1 == 1 (> blockclosing.cmd +echo echo without closing bracket first>> blockclosing.cmd +echo echo without closing bracket second>> blockclosing.cmd +cmd.exe /Q /C blockclosing.cmd +echo %ERRORLEVEL% two lines +:: +echo echo before both blocks> blockclosing.cmd +echo @if 1 == 1 (>> blockclosing.cmd +echo echo before nested block without closing bracket>> blockclosing.cmd +echo @if 2 == 2 (>> blockclosing.cmd +echo echo without closing bracket>> blockclosing.cmd +echo )>> blockclosing.cmd +echo echo outside of block without closing bracket>> blockclosing.cmd +cmd.exe /Q /C blockclosing.cmd +echo %ERRORLEVEL% nested +:: +del blockclosing.cmd echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index fc1f9991df4..0fb4a597ac5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -713,6 +713,11 @@ block containing a line with just space and tab seems to work block containing a line with just tab and space seems to work block containing two lines with just space seems to work block containing two lines with just tab seems to work +with closing bracket +0 ok +255 two lines +before both blocks +255 nested --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 09cfeae1a01..1867c5afb92 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2347,6 +2347,13 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } } + if (curDepth > lineCurDepth) { + WINE_TRACE("Brackets do not match, error out without executing.\n"); + WCMD_free_commands(*output); + *output = NULL; + errorlevel = 255; + } + /* Dump out the parsed output */ WCMD_DumpCommands(*output);

1 0

Eric Pouech : kernel32/tests: Add tests for CreateProcess with invalid handles.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: eba8b548704432d0556dcd7efd928b4b3c862716 URL: https://gitlab.winehq.org/wine/wine/-/commit/eba8b548704432d0556dcd7efd928b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Nov 29 15:06:51 2023 +0100 kernel32/tests: Add tests for CreateProcess with invalid handles. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 103 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 85 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 1ecf8a35f21..2a9a1b4c02f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -326,6 +326,7 @@ static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fm #define HATTR_UNTOUCHED 0x10 /* Identify fields untouched by GetStartupInfoW */ #define HATTR_INHERIT 0x20 /* inheritance flag set */ #define HATTR_PROTECT 0x40 /* protect from close flag set */ +#define HATTR_DANGLING 0x80 /* a pseudo value to show that the handle value has been copied but not inherited */ #define HANDLE_UNTOUCHEDW (HANDLE)(DWORD_PTR)(0x5050505050505050ull) @@ -3188,6 +3189,9 @@ static void copy_change_subsystem(const char* in, const char* out, DWORD subsyst #define H_DISK 1 #define H_CHAR 2 #define H_PIPE 3 +#define H_NULL 4 +#define H_INVALID 5 +#define H_DEVIL 6 /* unassigned handle */ #define ARG_STD 0x80000000 #define ARG_STARTUPINFO 0x00000000 @@ -3261,6 +3265,16 @@ static BOOL build_startupinfo( STARTUPINFOA *startup, unsigned args, HANDLE hstd ok(ret, "Couldn't create anon pipe\n"); needs_close = TRUE; break; + case H_NULL: + hstd[0] = hstd[1] = NULL; + break; + case H_INVALID: + hstd[0] = hstd[1] = INVALID_HANDLE_VALUE; + break; + case H_DEVIL: + hstd[0] = (HANDLE)(ULONG_PTR)0x066600; + hstd[1] = (HANDLE)(ULONG_PTR)0x066610; + break; default: ok(0, "Unsupported handle type %x\n", args & ARG_HANDLE_MASK); return FALSE; @@ -3293,7 +3307,7 @@ struct std_handle_test unsigned args; /* output */ DWORD expected; - unsigned is_todo; /* bitmask: 1 on TEB values, 2 on StartupInfoA values, 4 on StartupInfoW values */ + unsigned is_todo; /* bitmask: 1 on TEB values, 2 on StartupInfoA values, 4 on StartupInfoW values, 8 dangling in StartupInfoW */ DWORD is_broken; /* Win7 broken file types */ }; @@ -3324,6 +3338,18 @@ static void test_StdHandleInheritance(void) /* all others handles type behave as H_DISK */ {ARG_STARTUPINFO | ARG_HANDLE_PROTECT | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, {ARG_STD | ARG_HANDLE_PROTECT | H_DISK, HATTR_TYPE | HATTR_PROTECT | FILE_TYPE_DISK}, + + /* all others handles type behave as H_DISK */ + {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 8, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING}, + + /* all others handles type behave as H_DISK */ +/*10*/ {ARG_STARTUPINFO | H_DEVIL, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STD | H_DEVIL, HATTR_NULL}, + {ARG_STARTUPINFO | H_INVALID, HATTR_NULL, .is_broken = HATTR_INVALID}, + {ARG_STD | H_INVALID, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STARTUPINFO | H_NULL, HATTR_NULL, .is_broken = HATTR_INVALID}, +/*15*/ {ARG_STD | H_NULL, HATTR_NULL, .is_broken = HATTR_INVALID}, }, nothing_gui[] = { @@ -3340,6 +3366,21 @@ static void test_StdHandleInheritance(void) /* all others handles type behave as H_DISK */ {ARG_STARTUPINFO | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL}, + + /* all others handles type behave as H_DISK */ +/*10*/ {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 8}, + {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING}, + + /* all others handles type behave as H_DISK */ + {ARG_STARTUPINFO | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STD | H_DISK, HATTR_NULL}, + + {ARG_STARTUPINFO | H_DEVIL, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, +/*15*/ {ARG_STD | H_DEVIL, HATTR_NULL}, + {ARG_STARTUPINFO | H_INVALID, HATTR_NULL, .is_broken = HATTR_INVALID}, + {ARG_STD | H_INVALID, HATTR_NULL}, + {ARG_STARTUPINFO | H_NULL, HATTR_NULL}, + {ARG_STD | H_NULL, HATTR_NULL}, }, detached_cui[] = { @@ -3398,7 +3439,6 @@ static void test_StdHandleInheritance(void) STARTUPINFOA startup; HANDLE hstd[2] = {}; BOOL needs_close; - unsigned startup_expected; winetest_push_context("%s[%u] ", tests[j].descr, i); needs_close = build_startupinfo( &startup, std_tests[i].args, hstd ); @@ -3409,26 +3449,53 @@ static void test_StdHandleInheritance(void) ok(ret, "Couldn't run child\n"); reload_child_info(resfile); - startup_expected = (std_tests[i].args & ARG_STD) ? HATTR_INVALID : std_tests[i].expected; - - todo_wine_if(std_tests[i].is_todo & 2) + if (std_tests[i].expected & HATTR_DANGLING) { - okChildHexInt("StartupInfoA", "hStdInputEncode", startup_expected, std_tests[i].is_broken); - okChildHexInt("StartupInfoA", "hStdOutputEncode", startup_expected, std_tests[i].is_broken); - } - - startup_expected = (std_tests[i].args & ARG_STD) ? HATTR_UNTOUCHED : std_tests[i].expected; + /* The value of the handle (in parent) has been copied in STARTUPINFO fields (in child), + * but the object hasn't been inherited from parent to child. + * There's no reliable way to test that the object hasn't been inherited, as the + * entry in the child's handle table is free and could have been reused before + * this test occurs. + * So simply test that the value is passed untouched. + */ + okChildHexInt("StartupInfoA", "hStdInput", (DWORD_PTR)((std_tests[i].args & ARG_STD) ? INVALID_HANDLE_VALUE : hstd[0]), std_tests[i].is_broken); + okChildHexInt("StartupInfoA", "hStdOutput", (DWORD_PTR)((std_tests[i].args & ARG_STD) ? INVALID_HANDLE_VALUE : hstd[1]), std_tests[i].is_broken); + todo_wine_if(std_tests[i].is_todo & 8) + if (!(std_tests[i].args & ARG_STD)) + { + okChildHexInt("StartupInfoW", "hStdInput", (DWORD_PTR)hstd[0], std_tests[i].is_broken); + okChildHexInt("StartupInfoW", "hStdOutput", (DWORD_PTR)hstd[1], std_tests[i].is_broken); + } - todo_wine_if(std_tests[i].is_todo & 4) - { - okChildHexInt("StartupInfoW", "hStdInputEncode", startup_expected, std_tests[i].is_broken); - okChildHexInt("StartupInfoW", "hStdOutputEncode", startup_expected, std_tests[i].is_broken); + todo_wine + { + okChildHexInt("TEB", "hStdInput", (DWORD_PTR)hstd[0], std_tests[i].is_broken); + okChildHexInt("TEB", "hStdOutput", (DWORD_PTR)hstd[1], std_tests[i].is_broken); + } } - - todo_wine_if(std_tests[i].is_todo & 1) + else { - okChildHexInt("TEB", "hStdInputEncode", std_tests[i].expected, std_tests[i].is_broken); - okChildHexInt("TEB", "hStdOutputEncode", std_tests[i].expected, std_tests[i].is_broken); + unsigned startup_expected = (std_tests[i].args & ARG_STD) ? HATTR_INVALID : std_tests[i].expected; + + todo_wine_if(std_tests[i].is_todo & 2) + { + okChildHexInt("StartupInfoA", "hStdInputEncode", startup_expected, std_tests[i].is_broken); + okChildHexInt("StartupInfoA", "hStdOutputEncode", startup_expected, std_tests[i].is_broken); + } + + startup_expected = (std_tests[i].args & ARG_STD) ? HATTR_UNTOUCHED : std_tests[i].expected; + + todo_wine_if(std_tests[i].is_todo & 4) + { + okChildHexInt("StartupInfoW", "hStdInputEncode", startup_expected, std_tests[i].is_broken); + okChildHexInt("StartupInfoW", "hStdOutputEncode", startup_expected, std_tests[i].is_broken); + } + + todo_wine_if(std_tests[i].is_todo & 1) + { + okChildHexInt("TEB", "hStdInputEncode", std_tests[i].expected, std_tests[i].is_broken); + okChildHexInt("TEB", "hStdOutputEncode", std_tests[i].expected, std_tests[i].is_broken); + } } release_memory();

1 0

Eric Pouech : kernelbase: Don't use INVALID_HANDLE_VALUE as std handle in CreateProcess.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 4121a29b50819d3a16e7d75c0f6fb34c8fca3465 URL: https://gitlab.winehq.org/wine/wine/-/commit/4121a29b50819d3a16e7d75c0f6fb3… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 16 10:53:19 2023 +0100 kernelbase: Don't use INVALID_HANDLE_VALUE as std handle in CreateProcess. And don't infer detached console state from std handle values, but rely on a NULL console handle. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 13 +++++++------ dlls/kernelbase/process.c | 12 +++++------- dlls/ntdll/unix/process.c | 4 ++-- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 2a9a1b4c02f..e329f28ac8b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3307,7 +3307,8 @@ struct std_handle_test unsigned args; /* output */ DWORD expected; - unsigned is_todo; /* bitmask: 1 on TEB values, 2 on StartupInfoA values, 4 on StartupInfoW values, 8 dangling in StartupInfoW */ + unsigned is_todo; /* bitmask: 1 on TEB values, 2 on StartupInfoA values, 4 on StartupInfoW values, + 8 dangling in StartupInfoW, 16 dangling in TEB */ DWORD is_broken; /* Win7 broken file types */ }; @@ -3340,8 +3341,8 @@ static void test_StdHandleInheritance(void) {ARG_STD | ARG_HANDLE_PROTECT | H_DISK, HATTR_TYPE | HATTR_PROTECT | FILE_TYPE_DISK}, /* all others handles type behave as H_DISK */ - {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 8, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, - {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING}, + {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 24, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 16}, /* all others handles type behave as H_DISK */ /*10*/ {ARG_STARTUPINFO | H_DEVIL, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, @@ -3368,8 +3369,8 @@ static void test_StdHandleInheritance(void) {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL}, /* all others handles type behave as H_DISK */ -/*10*/ {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 8}, - {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING}, +/*10*/ {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 24}, + {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 16}, /* all others handles type behave as H_DISK */ {ARG_STARTUPINFO | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, @@ -3467,7 +3468,7 @@ static void test_StdHandleInheritance(void) okChildHexInt("StartupInfoW", "hStdOutput", (DWORD_PTR)hstd[1], std_tests[i].is_broken); } - todo_wine + todo_wine_if(std_tests[i].is_todo & 16) { okChildHexInt("TEB", "hStdInput", (DWORD_PTR)hstd[0], std_tests[i].is_broken); okChildHexInt("TEB", "hStdOutput", (DWORD_PTR)hstd[1], std_tests[i].is_broken); diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 1aeb8f55257..775512e7f0d 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -209,19 +209,17 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename params->hStdOutput = startup->hStdOutput; params->hStdError = startup->hStdError; } - else if (flags & (DETACHED_PROCESS | CREATE_NEW_CONSOLE)) - { - params->hStdInput = INVALID_HANDLE_VALUE; - params->hStdOutput = INVALID_HANDLE_VALUE; - params->hStdError = INVALID_HANDLE_VALUE; - } - else + else if (!(flags & (DETACHED_PROCESS | CREATE_NEW_CONSOLE))) { params->hStdInput = NtCurrentTeb()->Peb->ProcessParameters->hStdInput; params->hStdOutput = NtCurrentTeb()->Peb->ProcessParameters->hStdOutput; params->hStdError = NtCurrentTeb()->Peb->ProcessParameters->hStdError; } + if (params->hStdInput == INVALID_HANDLE_VALUE) params->hStdInput = NULL; + if (params->hStdOutput == INVALID_HANDLE_VALUE) params->hStdOutput = NULL; + if (params->hStdError == INVALID_HANDLE_VALUE) params->hStdError = NULL; + params->dwX = startup->dwX; params->dwY = startup->dwY; params->dwXSize = startup->dwXSize; diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index b58d69fb28a..bf24161fedb 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -444,7 +444,7 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so if ((peb->ProcessParameters && params->ProcessGroupId != peb->ProcessParameters->ProcessGroupId) || params->ConsoleHandle == CONSOLE_HANDLE_ALLOC || params->ConsoleHandle == CONSOLE_HANDLE_ALLOC_NO_WINDOW || - (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) + params->ConsoleHandle == NULL) { setsid(); set_stdio_fd( -1, -1 ); /* close stdin and stdout */ @@ -623,7 +623,7 @@ static NTSTATUS fork_and_exec( OBJECT_ATTRIBUTES *attr, int unixdir, if ((peb->ProcessParameters && params->ProcessGroupId != peb->ProcessParameters->ProcessGroupId) || params->ConsoleHandle == CONSOLE_HANDLE_ALLOC || params->ConsoleHandle == CONSOLE_HANDLE_ALLOC_NO_WINDOW || - (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) + params->ConsoleHandle == NULL) { setsid(); set_stdio_fd( -1, -1 ); /* close stdin and stdout */

1 0

Eric Pouech : msvcrt/tests: Extend test for invalid std handle on msvcrt init.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 35bea756475b95e530de51f112ce6e4d36aec6b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/35bea756475b95e530de51f112ce6e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Nov 15 08:51:14 2023 +0100 msvcrt/tests: Extend test for invalid std handle on msvcrt init. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 75d30648230..9357b215cd8 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1896,6 +1896,9 @@ static void test_invalid_stdin_child( void ) handle = (HANDLE)_get_osfhandle(STDIN_FILENO); ok(handle == (HANDLE)-2, "handle = %p\n", handle); ok(errno == 0xdeadbeef, "errno = %d\n", errno); + handle = GetStdHandle(STD_INPUT_HANDLE); + todo_wine + ok((LONG_PTR)handle > 0, "Expecting passed handle to be untouched\n"); info = &__pioinfo[STDIN_FILENO/MSVCRT_FD_BLOCK_SIZE][STDIN_FILENO%MSVCRT_FD_BLOCK_SIZE]; ok(info->handle == (HANDLE)-2, "info->handle = %p\n", info->handle);

1 0