From 337eb3951f60a0b0fbb3539e10556030b2a1c562 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 23 Nov 2015 09:42:20 +0000
Subject: [PATCH] [SHLWAPI] Sync with Wine Staging 1.7.55. CORE-10536

svn path=/trunk/; revision=70058
---
 reactos/dll/win32/shlwapi/ordinal.c | 4 ++--
 reactos/dll/win32/shlwapi/path.c    | 4 ++--
 reactos/dll/win32/shlwapi/reg.c     | 3 +++
 reactos/media/doc/README.WINE       | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/reactos/dll/win32/shlwapi/ordinal.c b/reactos/dll/win32/shlwapi/ordinal.c
index 8a0c41d657e..220b25e13f9 100644
--- a/reactos/dll/win32/shlwapi/ordinal.c
+++ b/reactos/dll/win32/shlwapi/ordinal.c
@@ -5167,9 +5167,9 @@ HRESULT WINAPI IUnknown_QueryServiceForWebBrowserApp(IUnknown* lpUnknown,
  *  pValue: address to receive the property value as a 32-bit signed integer
  *
  * RETURNS
- *  0 for Success
+ *  HRESULT codes
  */
-BOOL WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLONG pValue)
+HRESULT WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLONG pValue)
 {
     VARIANT var;
     HRESULT hr;
diff --git a/reactos/dll/win32/shlwapi/path.c b/reactos/dll/win32/shlwapi/path.c
index 710e4a0880e..507af840b33 100644
--- a/reactos/dll/win32/shlwapi/path.c
+++ b/reactos/dll/win32/shlwapi/path.c
@@ -650,7 +650,7 @@ void WINAPI PathStripPathA(LPSTR lpszPath)
   if (lpszPath)
   {
     LPSTR lpszFileName = PathFindFileNameA(lpszPath);
-    if(lpszFileName)
+    if(lpszFileName != lpszPath)
       RtlMoveMemory(lpszPath, lpszFileName, strlen(lpszFileName)+1);
   }
 }
@@ -666,7 +666,7 @@ void WINAPI PathStripPathW(LPWSTR lpszPath)
 
   TRACE("(%s)\n", debugstr_w(lpszPath));
   lpszFileName = PathFindFileNameW(lpszPath);
-  if(lpszFileName)
+  if(lpszFileName != lpszPath)
     RtlMoveMemory(lpszPath, lpszFileName, (strlenW(lpszFileName)+1)*sizeof(WCHAR));
 }
 
diff --git a/reactos/dll/win32/shlwapi/reg.c b/reactos/dll/win32/shlwapi/reg.c
index 8b573a3b4e2..74c1ab8c3c4 100644
--- a/reactos/dll/win32/shlwapi/reg.c
+++ b/reactos/dll/win32/shlwapi/reg.c
@@ -182,6 +182,9 @@ LONG WINAPI SHRegCloseUSKey(
     LPSHUSKEY hKey = hUSKey;
     LONG ret = ERROR_SUCCESS;
 
+    if (!hKey)
+        return ERROR_INVALID_PARAMETER;
+
     if (hKey->HKCUkey)
         ret = RegCloseKey(hKey->HKCUkey);
     if (hKey->HKCUstart && hKey->HKCUstart != HKEY_CURRENT_USER)
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 06612bce208..cf21154fd0e 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -178,7 +178,7 @@ reactos/dll/win32/shdoclc             # Synced to WineStaging-1.7.47
 reactos/dll/win32/shdocvw             # Synced to WineStaging-1.7.47
 reactos/dll/win32/shell32             # Forked at Wine-20071011
 reactos/dll/win32/shfolder            # Synced to WineStaging-1.7.47
-reactos/dll/win32/shlwapi             # Synced to WineStaging-1.7.47
+reactos/dll/win32/shlwapi             # Synced to WineStaging-1.7.55
 reactos/dll/win32/slbcsp              # Synced to WineStaging-1.7.47
 reactos/dll/win32/snmpapi             # Synced to WineStaging-1.7.47
 reactos/dll/win32/softpub             # Synced to WineStaging-1.7.47