[INETCPL] Sync with Wine Staging 3.17. CORE-15127

diff --git a/dll/cpl/inetcpl/CMakeLists.txt b/dll/cpl/inetcpl/CMakeLists.txt
index dfdd6b8..28acde0 100644 (file)
--- a/dll/cpl/inetcpl/CMakeLists.txt
+++ b/dll/cpl/inetcpl/CMakeLists.txt
@@ -1,11 +1,13 @@
 
+add_definitions(-D__WINESRC__)
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 spec2def(inetcpl.cpl inetcpl.spec)
 
 list(APPEND SOURCE
-    inetcpl.c
+    connections.c
     content.c
     general.c
+    inetcpl.c
     security.c
     precomp.h)
 

diff --git a/dll/cpl/inetcpl/connections.c b/dll/cpl/inetcpl/connections.c
new file mode 100644 (file)
index 0000000..648cd3d
--- /dev/null
+++ b/dll/cpl/inetcpl/connections.c
@@ -0,0 +1,363 @@
+/*
+ * Copyright 2018 Piotr cabna for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ */
+
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <wininet.h>
+#include <winuser.h>
+#include <winreg.h>
+
+#include "inetcpl.h"
+#include "wine/debug.h"
+#include "wine/heap.h"
+#include "wine/unicode.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
+
+static const WCHAR auto_config_url[] = {'A','u','t','o','C','o','n','f','i','g','U','R','L',0};
+static const WCHAR internet_settings[] = {'S','o','f','t','w','a','r','e','\\',
+    'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\',
+    'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
+    'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0};
+static const WCHAR proxy_enable[] = {'P','r','o','x','y','E','n','a','b','l','e',0};
+static const WCHAR proxy_server[] = {'P','r','o','x','y','S','e','r','v','e','r',0};
+static const WCHAR connections[] = {'C','o','n','n','e','c','t','i','o','n','s',0};
+static const WCHAR default_connection_settings[] = {'D','e','f','a','u','l','t',
+    'C','o','n','n','e','c','t','i','o','n','S','e','t','t','i','n','g','s',0};
+
+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 = heap_alloc_zero(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;
+
+    SendMessageW(GetDlgItem(hwnd, IDC_EDIT_PAC_SCRIPT),
+            EM_LIMITTEXT, INTERNET_MAX_URL_LENGTH, 0);
+    SendMessageW(GetDlgItem(hwnd, IDC_EDIT_PROXY_SERVER),
+            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, proxy_enable, NULL, &type, (BYTE*)&enabled, &size);
+    if(res || type != REG_DWORD)
+        enabled = 0;
+    size = sizeof(address);
+    res = RegQueryValueExW(hkey, proxy_server, NULL, &type, (BYTE*)address, &size);
+    if(res || type != REG_SZ)
+        address[0] = 0;
+    size = sizeof(pac_url);
+    res = RegQueryValueExW(hkey, auto_config_url, NULL, &type, (BYTE*)pac_url, &size);
+    if(res || type != REG_SZ)
+        pac_url[0] = 0;
+
+    res = RegOpenKeyW(hkey, connections, &con);
+    RegCloseKey(hkey);
+    if(!res)
+    {
+        connection_settings *settings = NULL;
+        size = 0;
+
+        while((res = RegQueryValueExW(con, default_connection_settings, NULL, &type,
+                        (BYTE*)settings, &size)) == ERROR_MORE_DATA || !settings)
+        {
+            connection_settings *new_settings = heap_realloc(settings, size);
+            if(!new_settings)
+            {
+                RegCloseKey(con);
+                heap_free(settings);
+                return;
+            }
+            settings = new_settings;
+        }
+        RegCloseKey(con);
+
+        if(!res && type == REG_BINARY)
+        {
+            if(settings->version != CONNECTION_SETTINGS_VERSION)
+                FIXME("unexpected structure version (%x)\n", settings->version);
+            else if(settings->flags & CONNECTION_SETTINGS_WPAD)
+                CheckDlgButton(hwnd, IDC_USE_WPAD, BST_CHECKED);
+        }
+        heap_free(settings);
+    }
+
+    TRACE("ProxyEnable = %x\n", enabled);
+    TRACE("ProxyServer = %s\n", wine_dbgstr_w(address));
+    TRACE("AutoConfigURL = %s\n", wine_dbgstr_w(auto_config_url));
+
+    if(enabled)
+    {
+        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 = strchrW(address, ':');
+    if(port)
+    {
+        *port = 0;
+        port++;
+    }
+    SetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, address);
+    if(port)
+        SetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT, port);
+
+    if(pac_url[0])
+    {
+        CheckDlgButton(hwnd, IDC_USE_PAC_SCRIPT, BST_CHECKED);
+        EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PAC_SCRIPT), TRUE);
+        SetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT, pac_url);
+    }
+
+    return;
+}
+
+static INT_PTR connections_on_command(HWND hwnd, WPARAM wparam)
+{
+    BOOL checked;
+
+    switch (wparam)
+    {
+        case IDC_USE_PAC_SCRIPT:
+            checked = IsDlgButtonChecked(hwnd, IDC_USE_PAC_SCRIPT);
+            EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PAC_SCRIPT), checked);
+            break;
+        case IDC_USE_PROXY_SERVER:
+            checked = IsDlgButtonChecked(hwnd, IDC_USE_PROXY_SERVER);
+            EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_SERVER), checked);
+            EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), checked);
+    }
+
+    switch (wparam)
+    {
+        case IDC_USE_WPAD:
+        case IDC_USE_PAC_SCRIPT:
+        case IDC_USE_PROXY_SERVER:
+        case MAKEWPARAM(IDC_EDIT_PAC_SCRIPT, EN_CHANGE):
+        case MAKEWPARAM(IDC_EDIT_PROXY_SERVER, EN_CHANGE):
+        case MAKEWPARAM(IDC_EDIT_PROXY_PORT, EN_CHANGE):
+            if(initdialog_done)
+                SendMessageW(GetParent(hwnd), PSM_CHANGED, (WPARAM)hwnd, 0);
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+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;
+
+    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, proxy_enable, 0, REG_DWORD,
+            (BYTE*)&use_proxy, sizeof(use_proxy));
+    if(res)
+    {
+        RegCloseKey(hkey);
+        return FALSE;
+    }
+    TRACE("ProxyEnable set to %x\n", use_proxy);
+
+    proxy_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, proxy, ARRAY_SIZE(proxy));
+    if(proxy_len)
+    {
+        proxy[proxy_len++] = ':';
+        port_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT, proxy+proxy_len,
+                ARRAY_SIZE(proxy)-proxy_len);
+        if(!port_len)
+        {
+            proxy[proxy_len++] = '8';
+            proxy[proxy_len++] = '0';
+            proxy[proxy_len] = 0;
+        }
+
+        res = RegSetValueExW(hkey, proxy_server, 0, REG_SZ,
+                (BYTE*)proxy, (proxy_len+port_len)*sizeof(WCHAR));
+    }
+    else
+    {
+        res = RegDeleteValueW(hkey, proxy_server);
+        if(res == ERROR_FILE_NOT_FOUND)
+            res = ERROR_SUCCESS;
+    }
+    if(res)
+    {
+        RegCloseKey(hkey);
+        return FALSE;
+    }
+    TRACE("ProxtServer 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, auto_config_url, 0, REG_SZ,
+                (BYTE*)pac_script, pac_script_len*sizeof(WCHAR));
+    }
+    else
+    {
+        res = RegDeleteValueW(hkey, auto_config_url);
+        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, 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, default_connection_settings, 0, REG_BINARY,
+            (BYTE*)default_connection, size);
+    heap_free(default_connection);
+    RegCloseKey(con);
+    return !res;
+}
+
+INT_PTR CALLBACK connections_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+    switch (msg)
+    {
+        case WM_INITDIALOG:
+            connections_on_initdialog(hwnd);
+            initdialog_done = TRUE;
+            break;
+        case WM_COMMAND:
+            return connections_on_command(hwnd, wparam);
+        case WM_NOTIFY:
+            return connections_on_notify(hwnd, wparam, lparam);
+    }
+    return FALSE;
+}

diff --git a/dll/cpl/inetcpl/general.c b/dll/cpl/inetcpl/general.c
index e0f473c..b9fbf1e 100644 (file)
--- a/dll/cpl/inetcpl/general.c
+++ b/dll/cpl/inetcpl/general.c
@@ -263,10 +263,10 @@ static INT_PTR general_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam)
     if (psn->hdr.code == PSN_APPLY)
     {
         *buffer = 0;
-        GetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer, sizeof(buffer)/sizeof(WCHAR));
+        GetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer, ARRAY_SIZE(buffer));
         TRACE("EDITTEXT has %s\n", debugstr_w(buffer));
 
-        res = parse_url_from_outside(buffer, parsed, sizeof(parsed)/sizeof(WCHAR));
+        res = parse_url_from_outside(buffer, parsed, ARRAY_SIZE(parsed));
         TRACE("got %d with %s\n", res, debugstr_w(parsed));
 
         if (res)

diff --git a/dll/cpl/inetcpl/inetcpl.c b/dll/cpl/inetcpl/inetcpl.c
index 578867a..9f22016 100644 (file)
--- a/dll/cpl/inetcpl/inetcpl.c
+++ b/dll/cpl/inetcpl/inetcpl.c
@@ -129,6 +129,12 @@ static void display_cpl_sheets(HWND parent)
     psp[id].pfnDlgProc = content_dlgproc;
     id++;
 
+    psp[id].dwSize = sizeof (PROPSHEETPAGEW);
+    psp[id].hInstance = hcpl;
+    psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTIONS);
+    psp[id].pfnDlgProc = connections_dlgproc;
+    id++;
+
     /* Fill out the PROPSHEETHEADER */
     psh.dwSize = sizeof (PROPSHEETHEADERW);
     psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK;

diff --git a/dll/cpl/inetcpl/inetcpl.h b/dll/cpl/inetcpl/inetcpl.h
index b01362b..b8b0921 100644 (file)
--- a/dll/cpl/inetcpl/inetcpl.h
+++ b/dll/cpl/inetcpl/inetcpl.h
@@ -27,6 +27,7 @@
 #include <commctrl.h>
 
 extern HMODULE hcpl;
+INT_PTR CALLBACK connections_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
 INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
 INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
 INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
@@ -89,4 +90,12 @@ INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
 #define IDC_CERT            4100
 #define IDC_CERT_PUBLISHER  4101
 
+#define IDD_CONNECTIONS         5000
+#define IDC_USE_WPAD            5100
+#define IDC_USE_PAC_SCRIPT      5101
+#define IDC_EDIT_PAC_SCRIPT     5102
+#define IDC_USE_PROXY_SERVER    5200
+#define IDC_EDIT_PROXY_SERVER   5201
+#define IDC_EDIT_PROXY_PORT     5202
+
 #endif

diff --git a/dll/cpl/inetcpl/lang/He.rc b/dll/cpl/inetcpl/lang/He.rc
index c992668..1ca4330 100644 (file)
--- a/dll/cpl/inetcpl/lang/He.rc
+++ b/dll/cpl/inetcpl/lang/He.rc
@@ -120,3 +120,22 @@ BEGIN
     PUSHBUTTON "מפיצים...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/Sr.rc b/dll/cpl/inetcpl/lang/Sr.rc
index 5a5913e..9dc6c97 100644 (file)
--- a/dll/cpl/inetcpl/lang/Sr.rc
+++ b/dll/cpl/inetcpl/lang/Sr.rc
@@ -116,6 +116,25 @@ BEGIN
 
 END
 
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END
+
 LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
 
 STRINGTABLE
@@ -208,3 +227,22 @@ BEGIN
     PUSHBUTTON "Izdavači...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/cs-CZ.rc b/dll/cpl/inetcpl/lang/cs-CZ.rc
index 14ccdb5..f4d848e 100644 (file)
--- a/dll/cpl/inetcpl/lang/cs-CZ.rc
+++ b/dll/cpl/inetcpl/lang/cs-CZ.rc
@@ -100,3 +100,22 @@ BEGIN
     PUSHBUTTON "Vydavatelé...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/de-DE.rc b/dll/cpl/inetcpl/lang/de-DE.rc
index 4907388..5ac600f 100644 (file)
--- a/dll/cpl/inetcpl/lang/de-DE.rc
+++ b/dll/cpl/inetcpl/lang/de-DE.rc
@@ -115,3 +115,22 @@ BEGIN
     PUSHBUTTON "Herausgeber...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/en-US.rc b/dll/cpl/inetcpl/lang/en-US.rc
index 591e5c4..d1b2777 100644 (file)
--- a/dll/cpl/inetcpl/lang/en-US.rc
+++ b/dll/cpl/inetcpl/lang/en-US.rc
@@ -113,3 +113,22 @@ BEGIN
     PUSHBUTTON "Pu&blishers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/es-ES.rc b/dll/cpl/inetcpl/lang/es-ES.rc
index 3f612f9..9f1c2ac 100644 (file)
--- a/dll/cpl/inetcpl/lang/es-ES.rc
+++ b/dll/cpl/inetcpl/lang/es-ES.rc
@@ -93,3 +93,22 @@ BEGIN
     PUSHBUTTON "Autoridades...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/fr-FR.rc b/dll/cpl/inetcpl/lang/fr-FR.rc
index f07bb92..89f7b94 100644 (file)
--- a/dll/cpl/inetcpl/lang/fr-FR.rc
+++ b/dll/cpl/inetcpl/lang/fr-FR.rc
@@ -117,3 +117,22 @@ BEGIN
     PUSHBUTTON "Éditeurs...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/it-IT.rc b/dll/cpl/inetcpl/lang/it-IT.rc
index 462116c..982a5a0 100644 (file)
--- a/dll/cpl/inetcpl/lang/it-IT.rc
+++ b/dll/cpl/inetcpl/lang/it-IT.rc
@@ -116,3 +116,22 @@ BEGIN
     PUSHBUTTON "Editori...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/ja-JP.rc b/dll/cpl/inetcpl/lang/ja-JP.rc
index 9dd12c9..66ad198 100644 (file)
--- a/dll/cpl/inetcpl/lang/ja-JP.rc
+++ b/dll/cpl/inetcpl/lang/ja-JP.rc
@@ -117,3 +117,22 @@ BEGIN
     PUSHBUTTON "発行元...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/ko-KR.rc b/dll/cpl/inetcpl/lang/ko-KR.rc
index 11b52c5..1782bdb 100644 (file)
--- a/dll/cpl/inetcpl/lang/ko-KR.rc
+++ b/dll/cpl/inetcpl/lang/ko-KR.rc
@@ -116,3 +116,22 @@ BEGIN
     PUSHBUTTON "발행자...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/lt-LT.rc b/dll/cpl/inetcpl/lang/lt-LT.rc
index 7cf82e9..f550fd8 100644 (file)
--- a/dll/cpl/inetcpl/lang/lt-LT.rc
+++ b/dll/cpl/inetcpl/lang/lt-LT.rc
@@ -116,3 +116,22 @@ BEGIN
     PUSHBUTTON "Publikuotojai...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/nl-NL.rc b/dll/cpl/inetcpl/lang/nl-NL.rc
index a13c59b..8065123 100644 (file)
--- a/dll/cpl/inetcpl/lang/nl-NL.rc
+++ b/dll/cpl/inetcpl/lang/nl-NL.rc
@@ -113,3 +113,22 @@ BEGIN
     PUSHBUTTON "Uitgevers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/pl-PL.rc b/dll/cpl/inetcpl/lang/pl-PL.rc
index adf3311..d6c18bb 100644 (file)
--- a/dll/cpl/inetcpl/lang/pl-PL.rc
+++ b/dll/cpl/inetcpl/lang/pl-PL.rc
@@ -116,3 +116,22 @@ BEGIN
     PUSHBUTTON "Wydawcy...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/pt-BR.rc b/dll/cpl/inetcpl/lang/pt-BR.rc
index b102102..6d67707 100644 (file)
--- a/dll/cpl/inetcpl/lang/pt-BR.rc
+++ b/dll/cpl/inetcpl/lang/pt-BR.rc
@@ -115,3 +115,22 @@ BEGIN
     PUSHBUTTON "Editores...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/ro-RO.rc b/dll/cpl/inetcpl/lang/ro-RO.rc
index ecf7146..6fcb556 100644 (file)
--- a/dll/cpl/inetcpl/lang/ro-RO.rc
+++ b/dll/cpl/inetcpl/lang/ro-RO.rc
@@ -114,3 +114,22 @@ BEGIN
     PUSHBUTTON "Agenți pu&blici…", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/ru-RU.rc b/dll/cpl/inetcpl/lang/ru-RU.rc
index a684857..4380367 100644 (file)
--- a/dll/cpl/inetcpl/lang/ru-RU.rc
+++ b/dll/cpl/inetcpl/lang/ru-RU.rc
@@ -116,3 +116,22 @@ BEGIN
     PUSHBUTTON "Издатели...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/sq-AL.rc b/dll/cpl/inetcpl/lang/sq-AL.rc
index 6f65595..a57ad50 100644 (file)
--- a/dll/cpl/inetcpl/lang/sq-AL.rc
+++ b/dll/cpl/inetcpl/lang/sq-AL.rc
@@ -115,3 +115,22 @@ BEGIN
     PUSHBUTTON "Botuesit...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/sv-SE.rc b/dll/cpl/inetcpl/lang/sv-SE.rc
index 63ccf4e..f78f8e7 100644 (file)
--- a/dll/cpl/inetcpl/lang/sv-SE.rc
+++ b/dll/cpl/inetcpl/lang/sv-SE.rc
@@ -115,3 +115,22 @@ BEGIN
     PUSHBUTTON "Utgivare...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/tr-TR.rc b/dll/cpl/inetcpl/lang/tr-TR.rc
index 4cb462b..1b20210 100644 (file)
--- a/dll/cpl/inetcpl/lang/tr-TR.rc
+++ b/dll/cpl/inetcpl/lang/tr-TR.rc
@@ -116,3 +116,22 @@ BEGIN
     PUSHBUTTON "&Yayımcılar...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/uk-UA.rc b/dll/cpl/inetcpl/lang/uk-UA.rc
index 89880fd..83a850e 100644 (file)
--- a/dll/cpl/inetcpl/lang/uk-UA.rc
+++ b/dll/cpl/inetcpl/lang/uk-UA.rc
@@ -117,3 +117,22 @@ BEGIN
     PUSHBUTTON "Видавці...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/zh-CN.rc b/dll/cpl/inetcpl/lang/zh-CN.rc
index b272da8..af61320 100644 (file)
--- a/dll/cpl/inetcpl/lang/zh-CN.rc
+++ b/dll/cpl/inetcpl/lang/zh-CN.rc
@@ -112,3 +112,22 @@ BEGIN
     PUSHBUTTON "发行商(&B)...", IDC_CERT_PUBLISHER, 230, 34, 80, 14
 
 END
+
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/lang/zh-TW.rc b/dll/cpl/inetcpl/lang/zh-TW.rc
index 223253c..780dcc7 100644 (file)
--- a/dll/cpl/inetcpl/lang/zh-TW.rc
+++ b/dll/cpl/inetcpl/lang/zh-TW.rc
@@ -113,3 +113,21 @@ BEGIN
 
 END
 
+/* "Connections" propsheet */
+IDD_CONNECTIONS DIALOG 0, 0, 320, 220
+STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+CAPTION "Connections"
+BEGIN
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+END

diff --git a/dll/cpl/inetcpl/precomp.h b/dll/cpl/inetcpl/precomp.h
index 8faa56f..6ec441e 100644 (file)
--- a/dll/cpl/inetcpl/precomp.h
+++ b/dll/cpl/inetcpl/precomp.h
@@ -21,6 +21,7 @@
 #include <shlwapi.h>
 
 #include <wine/debug.h>
+#include <wine/heap.h>
 
 #include "inetcpl.h"
 

diff --git a/dll/cpl/inetcpl/security.c b/dll/cpl/inetcpl/security.c
index 543ada4..e11caf1 100644 (file)
--- a/dll/cpl/inetcpl/security.c
+++ b/dll/cpl/inetcpl/security.c
@@ -73,7 +73,7 @@ static DWORD url_templates[] = {URLTEMPLATE_CUSTOM,
 static DWORD index_from_urltemplate(URLTEMPLATE value)
 {
 
-    DWORD index = sizeof(url_templates) / sizeof(url_templates[0]);
+    DWORD index = ARRAY_SIZE(url_templates);
 
     while((index > 0) && (url_templates[index-1] != value))
         index--;
@@ -105,12 +105,12 @@ static void update_security_level(secdlg_data *sd, DWORD lv_index, DWORD tb_inde
         current_index = (tb_index > 0) ? tb_index : index_from_urltemplate(sd->levels[lv_index]);
 
         name[0] = 0;
-        LoadStringW(hcpl, IDS_SEC_LEVEL0 + current_index, name, sizeof(name)/sizeof(name[0]));
+        LoadStringW(hcpl, IDS_SEC_LEVEL0 + current_index, name, ARRAY_SIZE(name));
         TRACE("new level #%d: %s\n", current_index, debugstr_w(name));
         SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_LEVEL), name);
 
         name[0] = 0;
-        LoadStringW(hcpl, IDS_SEC_LEVEL0_INFO + (current_index * 0x10), name, sizeof(name)/sizeof(name[0]));
+        LoadStringW(hcpl, IDS_SEC_LEVEL0_INFO + (current_index * 0x10), name, ARRAY_SIZE(name));
         TRACE("new level info: %s\n", debugstr_w(name));
         SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_LEVEL_INFO), name);
 
@@ -134,8 +134,8 @@ static void update_zone_info(secdlg_data *sd, DWORD lv_index)
 
     SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_ZONE_INFO), za->szDescription);
 
-    len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name));
-    lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(*name) - len - 1);
+    len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, ARRAY_SIZE(name));
+    lstrcpynW(&name[len], za->szDisplayName, ARRAY_SIZE(name) - len - 1);
 
     TRACE("new title: %s\n", debugstr_w(name));
     SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_GROUP), name);

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 3cc9cff..f277dc5 100644 (file)
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -220,7 +220,7 @@ reactos/dll/win32/xinput1_3           # Synced to WineStaging-2.9
 reactos/dll/win32/xinput9_1_0         # Synced to WineStaging-2.9
 reactos/dll/win32/xmllite             # Synced to WineStaging-3.3
 
-reactos/dll/cpl/inetcpl               # Synced to WineStaging-3.3
+reactos/dll/cpl/inetcpl               # Synced to WineStaging-3.17
 
 reactos/win32ss/printing/monitors/localmon/ui/  # Synced to WineStaging-3.3 (known there as /dll/win32/localui)