From 90cb67a7f41f9048b7e506edfea62191a56d98a8 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 23 Dec 2019 00:57:10 +0100
Subject: [PATCH] [INETCPL] Sync with Wine Staging 4.18. CORE-16441

---
 dll/cpl/inetcpl/connections.c | 6 +++---
 dll/cpl/inetcpl/inetcpl.c     | 7 +++++++
 media/doc/README.WINE         | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dll/cpl/inetcpl/connections.c b/dll/cpl/inetcpl/connections.c
index 648cd3d0029..c24374fd2a5 100644
--- a/dll/cpl/inetcpl/connections.c
+++ b/dll/cpl/inetcpl/connections.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Piotr cabna for CodeWeavers
+ * Copyright 2018 Piotr Caban for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,7 @@
 #include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
+#include <winnls.h>
 #include <wininet.h>
 #include <winuser.h>
 #include <winreg.h>
@@ -27,7 +28,6 @@
 #include "inetcpl.h"
 #include "wine/debug.h"
 #include "wine/heap.h"
-#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
 
@@ -193,7 +193,7 @@ static void connections_on_initdialog(HWND hwnd)
         EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), TRUE);
     }
 
-    port = strchrW(address, ':');
+    port = wcschr(address, ':');
     if(port)
     {
         *port = 0;
diff --git a/dll/cpl/inetcpl/inetcpl.c b/dll/cpl/inetcpl/inetcpl.c
index b4d5a14037a..41d66605d2d 100644
--- a/dll/cpl/inetcpl/inetcpl.c
+++ b/dll/cpl/inetcpl/inetcpl.c
@@ -77,17 +77,24 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
  */
 static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam)
 {
+#ifdef __REACTOS__
     // NOTE: This callback is needed to set large icon correctly.
     HICON hIcon;
+#endif
     TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam);
     switch (msg)
     {
         case PSCB_INITIALIZED:
+#ifdef __REACTOS__
         {
             hIcon = LoadIconW(hcpl, MAKEINTRESOURCEW(ICO_MAIN));
             SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
             break;
         }
+#else
+            SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM) LoadIconW(hcpl, MAKEINTRESOURCEW(ICO_MAIN)));
+            break;
+#endif
     }
     return 0;
 }
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 64ee6000989..277510e938b 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -222,7 +222,7 @@ dll/win32/xinput9_1_0         # Synced to WineStaging-2.9
 dll/win32/xmllite             # Synced to WineStaging-4.18
 dll/win32/xolehlp             # Synced to WineStaging-3.21
 
-dll/cpl/inetcpl               # Synced to WineStaging-3.17
+dll/cpl/inetcpl               # Synced to WineStaging-4.18
 
 win32ss/printing/monitors/localmon/ui/  # Synced to WineStaging-3.3 (known there as /dll/win32/localui)
 
-- 
2.17.1