- Wine-Commits - list.winehq.org

Eric Pouech : msvcrt: Don't reset invalid std handle in init.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: 233074ded08b326e8049102fdadd81a6187fa073 URL: https://gitlab.winehq.org/wine/wine/-/commit/233074ded08b326e8049102fdadd81… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Nov 15 08:51:43 2023 +0100 msvcrt: Don't reset invalid std handle in init. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 8 ++++---- dlls/msvcrt/file.c | 12 +++++++----- dlls/msvcrt/tests/file.c | 1 - 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e329f28ac8b..21f1b3b96f6 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3341,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 = 24, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, - {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 16}, + {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .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}, @@ -3369,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 = 24}, - {ARG_STD | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING, .is_todo = 16}, +/*10*/ {ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK, HATTR_DANGLING}, + {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}, diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 3c1d9572585..b4e80a4b5d0 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -560,12 +560,14 @@ static void msvcrt_set_fd(ioinfo *fdinfo, HANDLE hand, int flag) ioinfo_set_unicode(fdinfo, FALSE); ioinfo_set_textmode(fdinfo, TEXTMODE_ANSI); - if (hand == MSVCRT_NO_CONSOLE) hand = 0; - switch (fdinfo-MSVCRT___pioinfo[0]) + if (hand != MSVCRT_NO_CONSOLE) { - case 0: SetStdHandle(STD_INPUT_HANDLE, hand); break; - case 1: SetStdHandle(STD_OUTPUT_HANDLE, hand); break; - case 2: SetStdHandle(STD_ERROR_HANDLE, hand); break; + switch (fdinfo-MSVCRT___pioinfo[0]) + { + case 0: SetStdHandle(STD_INPUT_HANDLE, hand); break; + case 1: SetStdHandle(STD_OUTPUT_HANDLE, hand); break; + case 2: SetStdHandle(STD_ERROR_HANDLE, hand); break; + } } } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9357b215cd8..1ac6cfe3182 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1897,7 +1897,6 @@ static void test_invalid_stdin_child( void ) 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];

1 0

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

Feb. 12, 2024

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

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

Feb. 12, 2024

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 Feb. 12, 2024

Feb. 12, 2024

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

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

Feb. 12, 2024

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

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

Feb. 12, 2024

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

Alexandre Julliard : ntdll/tests: Don't use x86-64 assembly on ARM64EC.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: df8d907fb4e6c1da53e40eebb3a43a3f0081c6e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/df8d907fb4e6c1da53e40eebb3a43a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 22:52:07 2024 +0100 ntdll/tests: Don't use x86-64 assembly on ARM64EC. --- dlls/ntdll/tests/exception.c | 132 ++++++++++++++++++++++++------------------- dlls/ntdll/tests/time.c | 4 +- 2 files changed, 75 insertions(+), 61 deletions(-)

1 0

Piotr Caban : wininet: Store proxy type in proxyinfo_t.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: c17b0d6a3faa13d95322805de16dea49e173e142 URL: https://gitlab.winehq.org/wine/wine/-/commit/c17b0d6a3faa13d95322805de16dea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 13:38:45 2024 +0100 wininet: Store proxy type in proxyinfo_t. --- dlls/wininet/internet.c | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9702c3e4f05..238b540994e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -81,7 +81,7 @@ static UINT_PTR handle_table_size; typedef struct { - DWORD proxyEnabled; + DWORD flags; LPWSTR proxy; LPWSTR proxyBypass; LPWSTR proxyUsername; @@ -326,12 +326,14 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) { HKEY key; + DWORD val; LONG ret; if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) return ret; - if ((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE*)&lpwpi->proxyEnabled, sizeof(DWORD)))) + val = !!(lpwpi->flags & PROXY_TYPE_PROXY); + if ((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE*)&val, sizeof(DWORD)))) { RegCloseKey( key ); return ret; @@ -533,7 +535,7 @@ static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) { HKEY key; - DWORD type, len; + DWORD type, len, val; const WCHAR *envproxy; LONG ret; @@ -542,7 +544,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) EnterCriticalSection( &WININET_cs ); if (global_proxy) { - lpwpi->proxyEnabled = global_proxy->proxyEnabled; + lpwpi->flags = global_proxy->flags; lpwpi->proxy = wcsdup( global_proxy->proxy ); lpwpi->proxyBypass = wcsdup( global_proxy->proxyBypass ); } @@ -555,18 +557,22 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } len = sizeof(DWORD); - if (RegQueryValueExW( key, L"ProxyEnable", NULL, &type, (BYTE *)&lpwpi->proxyEnabled, &len ) || type != REG_DWORD) + if (RegQueryValueExW( key, L"ProxyEnable", NULL, &type, (BYTE *)&val, &len ) || type != REG_DWORD) { - lpwpi->proxyEnabled = 0; - if((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE *)&lpwpi->proxyEnabled, sizeof(DWORD) ))) + val = 0; + if((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE *)&val, sizeof(DWORD) ))) { FreeProxyInfo( lpwpi ); RegCloseKey( key ); return ret; } } + else + { + lpwpi->flags |= (val ? PROXY_TYPE_PROXY : PROXY_TYPE_DIRECT); + } - if (!(envproxy = _wgetenv( L"http_proxy" )) || lpwpi->proxyEnabled) + if (!(envproxy = _wgetenv( L"http_proxy" )) || (lpwpi->flags & PROXY_TYPE_PROXY)) { /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, L"ProxyServer", NULL, &type, NULL, &len ) && len && (type == REG_SZ)) @@ -611,19 +617,19 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (parse_proxy_url( lpwpi, envproxy )) { TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); - lpwpi->proxyEnabled = 1; + lpwpi->flags |= PROXY_TYPE_PROXY; lpwpi->proxyBypass = NULL; } else { WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxy)); - lpwpi->proxyEnabled = 0; + lpwpi->flags &= ~PROXY_TYPE_PROXY; lpwpi->proxy = NULL; lpwpi->proxyBypass = NULL; } } - if (lpwpi->proxyEnabled) + if (lpwpi->flags & PROXY_TYPE_PROXY) { TRACE("Proxy is enabled.\n"); @@ -689,7 +695,7 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) if (INTERNET_LoadProxySettings( &wpi )) return FALSE; - if (wpi.proxyEnabled) + if (wpi.flags & PROXY_TYPE_PROXY) { TRACE("http proxy = %s bypass = %s\n", debugstr_w(wpi.proxy), debugstr_w(wpi.proxyBypass)); @@ -2696,10 +2702,7 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u switch (optionW->dwOption) { case INTERNET_PER_CONN_FLAGS: - if(pi.proxyEnabled) - optionW->Value.dwValue = PROXY_TYPE_PROXY; - else - optionW->Value.dwValue = PROXY_TYPE_DIRECT; + optionW->Value.dwValue = pi.flags; if (url) /* native includes PROXY_TYPE_DIRECT even if PROXY_TYPE_PROXY is set */ optionW->Value.dwValue |= PROXY_TYPE_DIRECT|PROXY_TYPE_AUTO_PROXY_URL; @@ -3026,13 +3029,13 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, { if (info->dwAccessType == INTERNET_OPEN_TYPE_PROXY) { - global_proxy->proxyEnabled = 1; + global_proxy->flags = PROXY_TYPE_PROXY; global_proxy->proxy = wcsdup(info->lpszProxy); global_proxy->proxyBypass = wcsdup(info->lpszProxyBypass); } else { - global_proxy->proxyEnabled = 0; + global_proxy->flags = PROXY_TYPE_DIRECT; global_proxy->proxy = global_proxy->proxyBypass = NULL; } } @@ -3188,14 +3191,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; case INTERNET_PER_CONN_FLAGS: - if(option->Value.dwValue & PROXY_TYPE_PROXY) - pi.proxyEnabled = 1; - else - { - if(option->Value.dwValue != PROXY_TYPE_DIRECT) - FIXME("Unhandled flags: 0x%lx\n", option->Value.dwValue); - pi.proxyEnabled = 0; - } + if(option->Value.dwValue & ~(PROXY_TYPE_PROXY | PROXY_TYPE_DIRECT)) + FIXME("Unhandled flags: 0x%lx\n", option->Value.dwValue); + pi.flags = option->Value.dwValue; break; case INTERNET_PER_CONN_PROXY_BYPASS:

1 0

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

Feb. 12, 2024

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: Don't allocate global_proxy structure dynamically.
by Alexandre Julliard Feb. 12, 2024

Feb. 12, 2024

Module: wine Branch: master Commit: 1a53e28cc8af7084b80b4a906ce854e3e646aa53 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a53e28cc8af7084b80b4a906ce854… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 13:42:31 2024 +0100 wininet: Don't allocate global_proxy structure dynamically. --- dlls/wininet/internet.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 238b540994e..a8ae37a52cd 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -472,16 +472,13 @@ static void FreeProxyInfo( proxyinfo_t *lpwpi ) free(lpwpi->proxyPassword); } -static proxyinfo_t *global_proxy; +static proxyinfo_t global_proxy; static void free_global_proxy( void ) { EnterCriticalSection( &WININET_cs ); - if (global_proxy) - { - FreeProxyInfo( global_proxy ); - free( global_proxy ); - } + FreeProxyInfo( &global_proxy ); + memset( &global_proxy, 0, sizeof(global_proxy) ); LeaveCriticalSection( &WININET_cs ); } @@ -542,11 +539,11 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) memset( lpwpi, 0, sizeof(*lpwpi) ); EnterCriticalSection( &WININET_cs ); - if (global_proxy) + if (global_proxy.flags) { - lpwpi->flags = global_proxy->flags; - lpwpi->proxy = wcsdup( global_proxy->proxy ); - lpwpi->proxyBypass = wcsdup( global_proxy->proxyBypass ); + lpwpi->flags = global_proxy.flags; + lpwpi->proxy = wcsdup( global_proxy.proxy ); + lpwpi->proxyBypass = wcsdup( global_proxy.proxyBypass ); } LeaveCriticalSection( &WININET_cs ); @@ -3024,20 +3021,16 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, { EnterCriticalSection( &WININET_cs ); free_global_proxy(); - global_proxy = malloc(sizeof(proxyinfo_t)); - if (global_proxy) + if (info->dwAccessType == INTERNET_OPEN_TYPE_PROXY) { - if (info->dwAccessType == INTERNET_OPEN_TYPE_PROXY) - { - global_proxy->flags = PROXY_TYPE_PROXY; - global_proxy->proxy = wcsdup(info->lpszProxy); - global_proxy->proxyBypass = wcsdup(info->lpszProxyBypass); - } - else - { - global_proxy->flags = PROXY_TYPE_DIRECT; - global_proxy->proxy = global_proxy->proxyBypass = NULL; - } + global_proxy.flags = PROXY_TYPE_PROXY; + global_proxy.proxy = wcsdup(info->lpszProxy); + global_proxy.proxyBypass = wcsdup(info->lpszProxyBypass); + } + else + { + global_proxy.flags = PROXY_TYPE_DIRECT; + global_proxy.proxy = global_proxy.proxyBypass = NULL; } LeaveCriticalSection( &WININET_cs ); }

1 0