[PATCH 0/6] MR5093: wininet: Improve proxy configuration reading and writing (part 3).

List overview All Threads

newer

older

[PATCH 0/6] MR5004: winevulkan:...

[PATCH v18 0/6] MR3103: server:...

Piotr Caban (＠piotr)

16 Feb 2024 16 Feb '24

12:52 p.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/5093

Show replies by date

Piotr Caban

16 Feb 16 Feb

12:52 p.m.

New subject: [PATCH 1/6] wininet: Add support for INTERNET_PER_CONN_AUTOCONFIG_URL in InternetSetOption.

From: Piotr Caban piotr@codeweavers.com

--- dlls/wininet/internet.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 54063a25b7e..7744b359040 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -446,7 +446,7 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) } }

- if (lpwpi->autoconf_url) + if (lpwpi->autoconf_url && lpwpi->flags & PROXY_TYPE_AUTO_PROXY_URL) { if ((ret = RegSetValueExW( key, L"AutoConfigURL", 0, REG_SZ, (BYTE*)lpwpi->autoconf_url, sizeof(WCHAR) * (lstrlenW(lpwpi->autoconf_url) + 1)))) @@ -3395,6 +3395,10 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break;

case INTERNET_PER_CONN_AUTOCONFIG_URL: + free(pi.autoconf_url); + pi.autoconf_url = wcsdup(option->Value.pszValue); + break; + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS:

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5093

Piotr Caban

12:52 p.m.

New subject: [PATCH 2/6] wininet: Fix INTERNET_PER_CONN_AUTOCONFIG_URL option when quering global proxy settings.

From: Piotr Caban piotr@codeweavers.com

--- dlls/wininet/internet.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7744b359040..1f1f63f2671 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2873,25 +2873,25 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u }

case INTERNET_OPTION_PER_CONNECTION_OPTION: { - WCHAR *url; + WCHAR *url = NULL; INTERNET_PER_CONN_OPTION_LISTW *con = buffer; INTERNET_PER_CONN_OPTION_LISTA *conA = buffer; DWORD res = ERROR_SUCCESS, i; proxyinfo_t pi; LONG ret;

- TRACE("Getting global proxy info\n"); if((ret = INTERNET_LoadProxySettings(&pi))) return ret;

- FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); + TRACE("INTERNET_OPTION_PER_CONNECTION_OPTION\n");

if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) { FreeProxyInfo(&pi); return ERROR_INSUFFICIENT_BUFFER; }

- url = get_proxy_autoconfig_url(); + if (pi.flags & PROXY_TYPE_AUTO_DETECT) + url = get_proxy_autoconfig_url();

for (i = 0; i < con->dwOptionCount; i++) { INTERNET_PER_CONN_OPTIONW *optionW = con->pOptions + i; @@ -2900,9 +2900,6 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u switch (optionW->dwOption) { case INTERNET_PER_CONN_FLAGS: 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; break;

case INTERNET_PER_CONN_PROXY_SERVER: @@ -2920,22 +2917,26 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u break;

case INTERNET_PER_CONN_AUTOCONFIG_URL: - if (!url) - optionW->Value.pszValue = NULL; - else if (unicode) - optionW->Value.pszValue = copy_optionW(url); + if (unicode) + optionW->Value.pszValue = copy_optionW(pi.autoconf_url); else - optionA->Value.pszValue = copy_optionA(url); + optionA->Value.pszValue = copy_optionA(pi.autoconf_url); break;

case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: optionW->Value.dwValue = AUTO_PROXY_FLAG_ALWAYS_DETECT; break;

+ case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + if (unicode) + optionW->Value.pszValue = copy_optionW(url); + else + optionA->Value.pszValue = copy_optionA(url); + break; + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: - case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: FIXME("Unhandled dwOption %ld\n", optionW->dwOption); memset(&optionW->Value, 0, sizeof(optionW->Value)); break;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5093

Piotr Caban

12:52 p.m.

New subject: [PATCH 3/6] wininet: Add support for INTERNET_OPTION_PER_CONNECTION_OPTION option on session handles.

From: Piotr Caban piotr@codeweavers.com

--- dlls/wininet/internet.c | 185 +++++++++++++++++++++++++++++++++------- 1 file changed, 154 insertions(+), 31 deletions(-)

diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1f1f63f2671..5ee1242da1b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -110,6 +110,8 @@ static ULONG connect_timeout = 60000; static const WCHAR szInternetSettings[] = L"Software\Microsoft\Windows\CurrentVersion\Internet Settings";

+static WCHAR *get_proxy_autoconfig_url(void); + void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t size) { UINT_PTR handle = 0, num; @@ -985,6 +987,37 @@ static VOID APPINFO_Destroy(object_header_t *hdr) free(lpwai->proxyPassword); }

+static WCHAR *copy_optionW(WCHAR *value) +{ + DWORD len; + void *tmp; + + if (!value) + return NULL; + + len = (wcslen(value) + 1) * sizeof(WCHAR); + if (!(tmp = GlobalAlloc(0, len))) + return NULL; + + return memcpy(tmp, value, len); +} + +static char *copy_optionA(WCHAR *value) +{ + DWORD len; + void *tmp; + + if (!value) + return NULL; + + len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); + if (!(tmp = GlobalAlloc(0, len))) + return NULL; + + WideCharToMultiByte(CP_ACP, 0, value, -1, tmp, len, NULL, NULL); + return tmp; +} + static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { appinfo_t *ai = (appinfo_t*)hdr; @@ -1123,6 +1156,80 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(ULONG);

return ERROR_SUCCESS; + + case INTERNET_OPTION_PER_CONNECTION_OPTION: { + INTERNET_PER_CONN_OPTION_LISTW *con = buffer; + INTERNET_PER_CONN_OPTION_LISTA *conA = buffer; + LONG res = ERROR_SUCCESS; + WCHAR *url = NULL; + int i; + + if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) + return ERROR_INSUFFICIENT_BUFFER; + + EnterCriticalSection(&WININET_cs); + + if (global_proxy.flags & PROXY_TYPE_AUTO_DETECT) + url = get_proxy_autoconfig_url(); + + for (i = 0; i < con->dwOptionCount; i++) { + INTERNET_PER_CONN_OPTIONW *optionW = con->pOptions + i; + INTERNET_PER_CONN_OPTIONA *optionA = conA->pOptions + i; + + switch (optionW->dwOption) { + case INTERNET_PER_CONN_FLAGS: + optionW->Value.dwValue = global_proxy.flags; + break; + + case INTERNET_PER_CONN_PROXY_SERVER: + if (unicode) + optionW->Value.pszValue = copy_optionW(global_proxy.proxy); + else + optionA->Value.pszValue = copy_optionA(global_proxy.proxy); + break; + + case INTERNET_PER_CONN_PROXY_BYPASS: + if (unicode) + optionW->Value.pszValue = copy_optionW(global_proxy.proxyBypass); + else + optionA->Value.pszValue = copy_optionA(global_proxy.proxyBypass); + break; + + case INTERNET_PER_CONN_AUTOCONFIG_URL: + if (unicode) + optionW->Value.pszValue = copy_optionW(global_proxy.autoconf_url); + else + optionA->Value.pszValue = copy_optionA(global_proxy.autoconf_url); + break; + + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + optionW->Value.dwValue = AUTO_PROXY_FLAG_ALWAYS_DETECT; + break; + + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + if (unicode) + optionW->Value.pszValue = copy_optionW(url); + else + optionA->Value.pszValue = copy_optionA(url); + break; + + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: + case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: + FIXME("Unhandled dwOption %ld\n", optionW->dwOption); + memset(&optionW->Value, 0, sizeof(optionW->Value)); + break; + + default: + FIXME("Unknown dwOption %ld\n", optionW->dwOption); + res = ERROR_INVALID_PARAMETER; + break; + } + } + + LeaveCriticalSection(&WININET_cs); + return res; + } }

return INET_QueryOption(hdr, option, buffer, size, unicode); @@ -1150,6 +1257,53 @@ static DWORD APPINFO_SetOption(object_header_t *hdr, DWORD option, void *buf, DW case INTERNET_OPTION_REFRESH: FIXME("INTERNET_OPTION_REFRESH\n"); return ERROR_SUCCESS; + case INTERNET_OPTION_PER_CONNECTION_OPTION: { + INTERNET_PER_CONN_OPTION_LISTW *con = buf; + unsigned int i; + + EnterCriticalSection( &WININET_cs ); + for (i = 0; i < con->dwOptionCount; i++) { + INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i; + + switch (option->dwOption) { + case INTERNET_PER_CONN_PROXY_SERVER: + free(global_proxy.proxy); + global_proxy.proxy = wcsdup(option->Value.pszValue); + break; + + case INTERNET_PER_CONN_FLAGS: + if(option->Value.dwValue & ~(PROXY_TYPE_PROXY | PROXY_TYPE_DIRECT)) + FIXME("Unhandled flags: 0x%lx\n", option->Value.dwValue); + global_proxy.flags = option->Value.dwValue; + break; + + case INTERNET_PER_CONN_PROXY_BYPASS: + free(global_proxy.proxyBypass); + global_proxy.proxyBypass = wcsdup(option->Value.pszValue); + break; + + case INTERNET_PER_CONN_AUTOCONFIG_URL: + free(global_proxy.autoconf_url); + global_proxy.autoconf_url = wcsdup(option->Value.pszValue); + break; + + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: + case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + FIXME("Unhandled dwOption %ld\n", option->dwOption); + break; + + default: + FIXME("Unknown dwOption %ld\n", option->dwOption); + SetLastError(ERROR_INVALID_PARAMETER); + break; + } + } + LeaveCriticalSection( &WININET_cs ); + return ERROR_SUCCESS; + } }

return INET_SetOption(hdr, option, buf, size); @@ -2759,37 +2913,6 @@ static WCHAR *get_proxy_autoconfig_url(void) return ret; }

-static WCHAR *copy_optionW(WCHAR *value) -{ - DWORD len; - void *tmp; - - if (!value) - return NULL; - - len = (wcslen(value) + 1) * sizeof(WCHAR); - if (!(tmp = GlobalAlloc(0, len))) - return NULL; - - return memcpy(tmp, value, len); -} - -static char *copy_optionA(WCHAR *value) -{ - DWORD len; - void *tmp; - - if (!value) - return NULL; - - len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); - if (!(tmp = GlobalAlloc(0, len))) - return NULL; - - WideCharToMultiByte(CP_ACP, 0, value, -1, tmp, len, NULL, NULL); - return tmp; -} - static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode) { /* FIXME: This function currently handles more options than it should. Options requiring

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5093

Piotr Caban

12:52 p.m.

New subject: [PATCH 4/6] wininet/tests: Add more INTERNET_OPTION_PER_CONNECTION_OPTION tests.

From: Piotr Caban piotr@codeweavers.com

--- dlls/wininet/tests/internet.c | 7 +++++++ 1 file changed, 7 insertions(+)

diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 1475d2161ce..b1216d63de7 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1308,6 +1308,13 @@ static void test_Option_PerConnectionOption(void) ok(ret, "HeapValidate failed, last error %lu\n", GetLastError()); GlobalFree(options[0].Value.pszValue);

+ /* verify that global proxy settings were not changed */ + ret = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, &size); + ok(ret, "InternetQueryOption should've succeeded\n"); + ok(lstrcmpW(options[0].Value.pszValue, proxy_srvW), + "Retrieved proxy server should've been %s, was: %s\n", + wine_dbgstr_w(proxy_srvW), wine_dbgstr_w(options[0].Value.pszValue)); + /* disable the proxy server */ list.dwOptionCount = 1; options[0].dwOption = INTERNET_PER_CONN_FLAGS;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5093

Piotr Caban

12:52 p.m.

New subject: [PATCH 5/6] inetcpl.cpl: Use wininet functions to set proxy settings.

From: Piotr Caban piotr@codeweavers.com

--- dlls/inetcpl.cpl/connections.c | 272 ++++++++------------------------- 1 file changed, 64 insertions(+), 208 deletions(-)

diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index 842f154bd8c..cf10f728652 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -30,93 +30,14 @@

WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);

-static const WCHAR internet_settings[] = L"Software\Microsoft\Windows\CurrentVersion\Internet Settings"; - static BOOL initdialog_done;

-#define CONNECTION_SETTINGS_VERSION 0x46 -#define CONNECTION_SETTINGS_MANUAL_PROXY 0x2 -#define CONNECTION_SETTINGS_PAC_SCRIPT 0x4 -#define CONNECTION_SETTINGS_WPAD 0x8 - -typedef struct { - DWORD version; - DWORD id; - DWORD flags; - BYTE data[1]; - /* DWORD proxy_server_len; */ - /* UTF8 proxy_server[proxy_server_len]; */ - /* DWORD bypass_list_len; */ - /* UTF8 bypass_list[bypass_list_len]; */ - /* DWORD configuration_script_len; */ - /* UTF8 configuration_script[configuration_script_len]; */ - /* DWORD unk[8]; set to 0 */ -} connection_settings; - -static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_server, - BOOL use_wpad, BOOL use_pac_script, const WCHAR *pac_url, connection_settings **ret) -{ - DWORD size = FIELD_OFFSET(connection_settings, data), pos; - DWORD proxy_server_len; - DWORD pac_url_len; - - size += sizeof(DWORD); - if(proxy_server) - { - proxy_server_len = WideCharToMultiByte(CP_UTF8, 0, proxy_server, -1, - NULL, 0, NULL, NULL); - if(!proxy_server_len) return 0; - proxy_server_len--; - } - else - proxy_server_len = 0; - size += proxy_server_len; - if(pac_url) - { - pac_url_len = WideCharToMultiByte(CP_UTF8, 0, pac_url, -1, - NULL, 0, NULL, NULL); - if(!pac_url_len) return 0; - pac_url_len--; - } - else - pac_url_len = 0; - size += sizeof(DWORD)*10; - - *ret = calloc(1, size); - if(!*ret) return 0; - - (*ret)->version = CONNECTION_SETTINGS_VERSION; - (*ret)->flags = 1; - if(manual_proxy) (*ret)->flags |= CONNECTION_SETTINGS_MANUAL_PROXY; - if(use_pac_script) (*ret)->flags |= CONNECTION_SETTINGS_PAC_SCRIPT; - if(use_wpad) (*ret)->flags |= CONNECTION_SETTINGS_WPAD; - ((DWORD*)(*ret)->data)[0] = proxy_server_len; - pos = sizeof(DWORD); - if(proxy_server_len) - { - WideCharToMultiByte(CP_UTF8, 0, proxy_server, -1, - (char*)(*ret)->data+pos, proxy_server_len, NULL, NULL); - pos += proxy_server_len; - } - pos += sizeof(DWORD); /* skip proxy bypass list */ - ((DWORD*)((*ret)->data+pos))[0] = pac_url_len; - pos += sizeof(DWORD); - if(pac_url_len) - { - WideCharToMultiByte(CP_UTF8, 0, pac_url, -1, - (char*)(*ret)->data+pos, pac_url_len, NULL, NULL); - pos += pac_url_len; - } - return size; -} - static void connections_on_initdialog(HWND hwnd) { - DWORD type, size, enabled; - WCHAR address[INTERNET_MAX_URL_LENGTH], *port; - WCHAR pac_url[INTERNET_MAX_URL_LENGTH]; - HKEY hkey, con; - LONG res; + INTERNET_PER_CONN_OPTION_LISTW list; + INTERNET_PER_CONN_OPTIONW options[3]; + WCHAR *address, *port, *pac_url; + DWORD size, flags;

SendMessageW(GetDlgItem(hwnd, IDC_EDIT_PAC_SCRIPT), EM_LIMITTEXT, INTERNET_MAX_URL_LENGTH, 0); @@ -124,82 +45,59 @@ static void connections_on_initdialog(HWND hwnd) EM_LIMITTEXT, INTERNET_MAX_URL_LENGTH-10, 0); SendMessageW(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), EM_LIMITTEXT, 8, 0);

- res = RegOpenKeyW(HKEY_CURRENT_USER, internet_settings, &hkey); - if(res) - return; - - size = sizeof(enabled); - res = RegQueryValueExW(hkey, L"ProxyEnable", NULL, &type, (BYTE*)&enabled, &size); - if(res || type != REG_DWORD) - enabled = 0; - size = sizeof(address); - res = RegQueryValueExW(hkey, L"ProxyServer", NULL, &type, (BYTE*)address, &size); - if(res || type != REG_SZ) - address[0] = 0; - size = sizeof(pac_url); - res = RegQueryValueExW(hkey, L"AutoConfigURL", NULL, &type, (BYTE*)pac_url, &size); - if(res || type != REG_SZ) - pac_url[0] = 0; - - res = RegOpenKeyW(hkey, L"Connections", &con); - RegCloseKey(hkey); - if(!res) - { - connection_settings *settings = NULL; - size = 0; + list.dwSize = sizeof(list); + list.pszConnection = NULL; + list.dwOptionCount = ARRAY_SIZE(options); + list.pOptions = options;

- while((res = RegQueryValueExW(con, L"DefaultConnectionSettings", NULL, &type, - (BYTE*)settings, &size)) == ERROR_MORE_DATA || !settings) - { - connection_settings *new_settings = realloc(settings, size); - if(!new_settings) - { - RegCloseKey(con); - free(settings); - return; - } - settings = new_settings; - } - RegCloseKey(con); + options[0].dwOption = INTERNET_PER_CONN_FLAGS; + options[1].dwOption = INTERNET_PER_CONN_PROXY_SERVER; + options[2].dwOption = INTERNET_PER_CONN_AUTOCONFIG_URL; + size = sizeof(list); + if(!InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, &size)) + return;

- if(!res && type == REG_BINARY) - { - if(settings->version != CONNECTION_SETTINGS_VERSION) - FIXME("unexpected structure version (%lx)\n", settings->version); - else if(settings->flags & CONNECTION_SETTINGS_WPAD) - CheckDlgButton(hwnd, IDC_USE_WPAD, BST_CHECKED); - } - free(settings); - } + flags = options[0].Value.dwValue; + address = options[1].Value.pszValue; + pac_url = options[2].Value.pszValue;

- TRACE("ProxyEnable = %lx\n", enabled); + TRACE("flags = %lx\n", flags); TRACE("ProxyServer = %s\n", wine_dbgstr_w(address)); TRACE("AutoConfigURL = %s\n", wine_dbgstr_w(pac_url));

- if(enabled) + if (flags & PROXY_TYPE_AUTO_DETECT) + CheckDlgButton(hwnd, IDC_USE_WPAD, BST_CHECKED); + + if(flags & PROXY_TYPE_PROXY) { CheckDlgButton(hwnd, IDC_USE_PROXY_SERVER, BST_CHECKED); EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_SERVER), TRUE); EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), TRUE); }

- port = wcschr(address, ':'); - if(port) + if(address) { - *port = 0; - port++; + port = wcschr(address, ':'); + if(port) + { + *port = 0; + port++; + } + SetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, address); + if(port) + SetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT, port); } - SetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, address); - if(port) - SetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT, port);

- if(pac_url[0]) + if(flags & PROXY_TYPE_AUTO_PROXY_URL) { CheckDlgButton(hwnd, IDC_USE_PAC_SCRIPT, BST_CHECKED); EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PAC_SCRIPT), TRUE); - SetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT, pac_url); } + if(pac_url) + SetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT, pac_url);

+ GlobalFree(address); + GlobalFree(pac_url); return; }

@@ -237,31 +135,18 @@ static INT_PTR connections_on_command(HWND hwnd, WPARAM wparam)

static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) { - connection_settings *default_connection; WCHAR proxy[INTERNET_MAX_URL_LENGTH]; WCHAR pac_script[INTERNET_MAX_URL_LENGTH]; PSHNOTIFY *psn = (PSHNOTIFY*)lparam; DWORD proxy_len, port_len, pac_script_len; - DWORD use_proxy, use_pac_script, use_wpad, size; - LRESULT res; - HKEY hkey, con; + INTERNET_PER_CONN_OPTION_LISTW list; + INTERNET_PER_CONN_OPTIONW options[3]; + DWORD flags;

if(psn->hdr.code != PSN_APPLY) return FALSE;

- res = RegOpenKeyW(HKEY_CURRENT_USER, internet_settings, &hkey); - if(res) - return FALSE; - - use_proxy = IsDlgButtonChecked(hwnd, IDC_USE_PROXY_SERVER); - res = RegSetValueExW(hkey, L"ProxyEnable", 0, REG_DWORD, - (BYTE*)&use_proxy, sizeof(use_proxy)); - if(res) - { - RegCloseKey(hkey); - return FALSE; - } - TRACE("ProxyEnable set to %lx\n", use_proxy); + flags = IsDlgButtonChecked(hwnd, IDC_USE_PROXY_SERVER) ? PROXY_TYPE_PROXY : PROXY_TYPE_DIRECT;

proxy_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, proxy, ARRAY_SIZE(proxy)); if(proxy_len) @@ -275,65 +160,36 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) proxy[proxy_len++] = '0'; proxy[proxy_len] = 0; } - - res = RegSetValueExW(hkey, L"ProxyServer", 0, REG_SZ, - (BYTE*)proxy, (proxy_len+port_len)*sizeof(WCHAR)); } else { - res = RegDeleteValueW(hkey, L"ProxyServer"); - if(res == ERROR_FILE_NOT_FOUND) - res = ERROR_SUCCESS; + flags = PROXY_TYPE_DIRECT; } - if(res) - { - RegCloseKey(hkey); - return FALSE; - } - TRACE("ProxyServer set to %s\n", wine_dbgstr_w(proxy));

- use_pac_script = IsDlgButtonChecked(hwnd, IDC_USE_PAC_SCRIPT); pac_script_len = GetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT, pac_script, ARRAY_SIZE(pac_script)); - if(!pac_script_len) use_pac_script = FALSE; - if(use_pac_script) - { - res = RegSetValueExW(hkey, L"AutoConfigURL", 0, REG_SZ, - (BYTE*)pac_script, pac_script_len*sizeof(WCHAR)); - } - else - { - res = RegDeleteValueW(hkey, L"AutoConfigURL"); - if(res == ERROR_FILE_NOT_FOUND) - res = ERROR_SUCCESS; - } - if(res) - { - RegCloseKey(hkey); - return FALSE; - } - TRACE("AutoConfigURL set to %s\n", wine_dbgstr_w(use_pac_script ? pac_script : NULL)); - - use_wpad = IsDlgButtonChecked(hwnd, IDC_USE_WPAD); - - res = RegCreateKeyExW(hkey, L"Connections", 0, NULL, 0, KEY_WRITE, NULL, &con, NULL); - RegCloseKey(hkey); - if(res) - return FALSE; - - size = create_connection_settings(use_proxy, proxy, use_wpad, - use_pac_script, pac_script, &default_connection); - if(!size) - { - RegCloseKey(con); - return FALSE; - } - - res = RegSetValueExW(con, L"DefaultConnectionSettings", 0, REG_BINARY, - (BYTE*)default_connection, size); - free(default_connection); - RegCloseKey(con); - return !res; + if(pac_script_len && IsDlgButtonChecked(hwnd, IDC_USE_PAC_SCRIPT)) + flags |= PROXY_TYPE_AUTO_PROXY_URL; + + if(IsDlgButtonChecked(hwnd, IDC_USE_WPAD)) + flags |= PROXY_TYPE_AUTO_DETECT; + + TRACE("flags = %lx\n", flags); + TRACE("ProxyServer = %s\n", wine_dbgstr_w(proxy)); + TRACE("AutoConfigURL = %s\n", wine_dbgstr_w(pac_script)); + + list.dwSize = sizeof(list); + list.pszConnection = NULL; + list.dwOptionCount = ARRAY_SIZE(options); + list.pOptions = options; + + options[0].dwOption = INTERNET_PER_CONN_FLAGS; + options[0].Value.dwValue = flags; + options[1].dwOption = INTERNET_PER_CONN_PROXY_SERVER; + options[1].Value.pszValue = proxy; + options[2].dwOption = INTERNET_PER_CONN_AUTOCONFIG_URL; + options[2].Value.pszValue = pac_script; + return InternetSetOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, sizeof(list)); }

INT_PTR CALLBACK connections_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5093

Piotr Caban

12:52 p.m.

New subject: [PATCH 6/6] wininet/tests: Add initial PAC script tests.

From: Piotr Caban piotr@codeweavers.com

--- dlls/wininet/tests/http.c | 72 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 3 deletions(-)

diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 9405991c3b0..705f89f28ba 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -529,11 +529,13 @@ typedef struct { HINTERNET request; } test_request_t;

-#define open_simple_request(a,b,c,d,e) _open_simple_request(__LINE__,a,b,c,d,e) +#define open_simple_request(a,b,c,d,e) _open_simple_request(__LINE__,a,b,c,d,e,FALSE) +#define open_simple_request_proxy(a,b,c,d,e) _open_simple_request(__LINE__,a,b,c,d,e,TRUE) static void _open_simple_request(unsigned line, test_request_t *req, const char *host, - int port, const char *verb, const char *url) + int port, const char *verb, const char *url, BOOL use_proxy) { - req->session = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + req->session = InternetOpenA(NULL, use_proxy ? INTERNET_OPEN_TYPE_PRECONFIG : INTERNET_OPEN_TYPE_DIRECT, + NULL, NULL, 0); ok_(__FILE__,line)(req->session != NULL, "InternetOpenA failed: %lu\n", GetLastError());

req->connection = InternetConnectA(req->session, host, port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); @@ -2445,6 +2447,11 @@ static const char ok_with_length2[] = "Content-Length: 19\r\n\r\n" "HTTP/1.1 211 OK\r\n\r\n";

+static const char proxy_pac[] = +"function FindProxyForURL(url, host) {\r\n" +" return 'PROXY localhost:%d';\r\n" +"}\r\n\r\n"; + struct server_info { HANDLE hEvent; int port; @@ -2858,6 +2865,18 @@ static DWORD CALLBACK server_thread(LPVOID param) sprintf(msg, largemsg, content_length); send(c, msg, strlen(msg), 0); } + if (strstr(buffer, "GET /proxy.pac")) + { + char script[sizeof(proxy_pac) + 16]; + sprintf(script, proxy_pac, si->port); + send(c, okmsg, sizeof(okmsg)-1, 0); + send(c, script, strlen(script), 0); + } + if (strstr(buffer, "GET http://test.winehq.org/tests/hello.html")) + { + send(c, okmsg, sizeof(okmsg)-1, 0); + send(c, page1, sizeof(page1)-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -6625,6 +6644,52 @@ static void test_header_length(int port) close_request(&req); }

+static void test_pac(int port) +{ + static const WCHAR autoconf_url_fmt[] = L"http://localhost:%d/proxy.pac?ver=1"; + INTERNET_PER_CONN_OPTION_LISTW option_list; + INTERNET_PER_CONN_OPTIONW options[2]; + WCHAR autoconf_url[64]; + test_request_t req; + char buf[1000]; + DWORD len; + BOOL r; + + open_simple_request_proxy(&req, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, "GET", "/tests/hello.html"); + + swprintf(autoconf_url, ARRAY_SIZE(autoconf_url), autoconf_url_fmt, port); + memset(&option_list, 0, sizeof(option_list)); + option_list.dwSize = sizeof(option_list); + option_list.dwOptionCount = ARRAY_SIZE(options); + option_list.pOptions = options; + options[0].dwOption = INTERNET_PER_CONN_AUTOCONFIG_URL; + options[0].Value.pszValue = autoconf_url; + options[1].dwOption = INTERNET_PER_CONN_FLAGS; + options[1].Value.dwValue = PROXY_TYPE_AUTO_PROXY_URL; + r = InternetSetOptionW(req.session, INTERNET_OPTION_PER_CONNECTION_OPTION, (void*)&option_list, sizeof(option_list)); + ok(r, "InternetSetOptionW failed: %lu\n", GetLastError()); + + r = HttpSendRequestW(req.request, NULL, 0, NULL, 0); + ok(r, "HttpSendRequestW failed: %lu\n", GetLastError()); + + test_status_code(req.request, 200); + len = receive_simple_request(req.request, buf, sizeof(buf)); + todo_wine + ok(len == sizeof(page1) - 1, "unexpected buffer size\n"); + buf[len] = 0; + todo_wine + ok(!strcmp(buf, page1), "unexpected buffer content\n"); + + len = sizeof(option_list); + r = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, (void*)&option_list, &len); + ok(r, "InternetGetOptionW failed: %lu\n", GetLastError()); + r = InternetSetOptionW(req.session, INTERNET_OPTION_PER_CONNECTION_OPTION, (void*)&option_list, sizeof(option_list)); + ok(r, "InternetSetOptionW failed: %lu\n", GetLastError()); + GlobalFree(options[0].Value.pszValue); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -6692,6 +6757,7 @@ static void test_http_connection(void) test_remove_dot_segments(si.port); test_large_content(si.port); test_header_length(si.port); + test_pac(si.port);

/* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5093

Jacek Caban (＠jacek)

19 Feb 19 Feb

1:02 p.m.

New subject: [PATCH 0/6] MR5093: wininet: Improve proxy configuration reading and writing (part 3). - approved

This merge request was approved by Jacek Caban.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/5093

354

Age (days ago)

357

Last active (days ago)

wine-gitlab@winehq.org

7 comments

3 participants

tags (0)

participants (3)

Jacek Caban (＠jacek)
Piotr Caban
Piotr Caban (＠piotr)