Author: akhaldi
Date: Mon Nov 23 09:42:20 2015
New Revision: 70058
URL:
http://svn.reactos.org/svn/reactos?rev=70058&view=rev
Log:
[SHLWAPI] Sync with Wine Staging 1.7.55. CORE-10536
Modified:
trunk/reactos/dll/win32/shlwapi/ordinal.c
trunk/reactos/dll/win32/shlwapi/path.c
trunk/reactos/dll/win32/shlwapi/reg.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Mon Nov 23 09:42:20 2015
@@ -5167,9 +5167,9 @@
* pValue: address to receive the property value as a 32-bit signed integer
*
* RETURNS
- * 0 for Success
- */
-BOOL WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLONG
pValue)
+ * HRESULT codes
+ */
+HRESULT WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLONG
pValue)
{
VARIANT var;
HRESULT hr;
Modified: trunk/reactos/dll/win32/shlwapi/path.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] Mon Nov 23 09:42:20 2015
@@ -650,7 +650,7 @@
if (lpszPath)
{
LPSTR lpszFileName = PathFindFileNameA(lpszPath);
- if(lpszFileName)
+ if(lpszFileName != lpszPath)
RtlMoveMemory(lpszPath, lpszFileName, strlen(lpszFileName)+1);
}
}
@@ -666,7 +666,7 @@
TRACE("(%s)\n", debugstr_w(lpszPath));
lpszFileName = PathFindFileNameW(lpszPath);
- if(lpszFileName)
+ if(lpszFileName != lpszPath)
RtlMoveMemory(lpszPath, lpszFileName, (strlenW(lpszFileName)+1)*sizeof(WCHAR));
}
Modified: trunk/reactos/dll/win32/shlwapi/reg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/reg.c?re…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/reg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/reg.c [iso-8859-1] Mon Nov 23 09:42:20 2015
@@ -181,6 +181,9 @@
{
LPSHUSKEY hKey = hUSKey;
LONG ret = ERROR_SUCCESS;
+
+ if (!hKey)
+ return ERROR_INVALID_PARAMETER;
if (hKey->HKCUkey)
ret = RegCloseKey(hKey->HKCUkey);
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Nov 23 09:42:20 2015
@@ -178,7 +178,7 @@
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