mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 21:13:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SHLWAPI] Sync with Wine Staging 1.7.55. CORE-10536

Browse Source 
svn path=/trunk/; revision=70058
This commit is contained in:
Amine Khaldi 2015-11-23 09:42:20 +00:00
parent e06c5e2fe4
commit 337eb3951f
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reactos/dll/win32/shlwapi/ordinal.c
View File

@ -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;

4
reactos/dll/win32/shlwapi/path.c
View File

@ -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));
}

3
reactos/dll/win32/shlwapi/reg.c
View File

@ -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)

2
reactos/media/doc/README.WINE
View File

@ -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