sync shlwapi with wine 1.1.34
authorChristoph von Wittich <christoph_vw@reactos.org>
Sun, 6 Dec 2009 15:38:07 +0000 (15:38 +0000)
committerChristoph von Wittich <christoph_vw@reactos.org>
Sun, 6 Dec 2009 15:38:07 +0000 (15:38 +0000)
svn path=/trunk/; revision=44441

reactos/dll/win32/shlwapi/reg.c
reactos/dll/win32/shlwapi/shlwapi.spec

index c6fa2c7..9f652c9 100644 (file)
@@ -200,7 +200,7 @@ LONG WINAPI SHRegCloseUSKey(
     if (hKey->HKLMkey)
         ret = RegCloseKey(hKey->HKLMkey);
     if (hKey->HKLMstart && hKey->HKLMstart != HKEY_LOCAL_MACHINE)
     if (hKey->HKLMkey)
         ret = RegCloseKey(hKey->HKLMkey);
     if (hKey->HKLMstart && hKey->HKLMstart != HKEY_LOCAL_MACHINE)
-        ret = RegCloseKey(hKey->HKCUstart);
+        ret = RegCloseKey(hKey->HKLMstart);
 
     HeapFree(GetProcessHeap(), 0, hKey);
     return ret;
 
     HeapFree(GetProcessHeap(), 0, hKey);
     return ret;
index 1a79174..a8e7428 100644 (file)
 @ stdcall UrlApplySchemeW(wstr ptr ptr long)
 @ stdcall UrlCanonicalizeA(str ptr ptr long)
 @ stdcall UrlCanonicalizeW(wstr ptr ptr long)
 @ stdcall UrlApplySchemeW(wstr ptr ptr long)
 @ stdcall UrlCanonicalizeA(str ptr ptr long)
 @ stdcall UrlCanonicalizeW(wstr ptr ptr long)
-@ stdcall UrlCombineA(str str str ptr long)
-@ stdcall UrlCombineW(wstr wstr wstr ptr long)
+@ stdcall UrlCombineA(str str ptr ptr long)
+@ stdcall UrlCombineW(wstr wstr ptr ptr long)
 @ stdcall UrlCompareA(str str long)
 @ stdcall UrlCompareW(wstr wstr long)
 @ stdcall UrlCreateFromPathA(str ptr ptr long)
 @ stdcall UrlCompareA(str str long)
 @ stdcall UrlCompareW(wstr wstr long)
 @ stdcall UrlCreateFromPathA(str ptr ptr long)