From b0bec1e9969a7aaf186645ac4f94f4c1fbcc9dee Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sun, 6 Dec 2009 15:38:07 +0000 Subject: [PATCH] sync shlwapi with wine 1.1.34 svn path=/trunk/; revision=44441 --- reactos/dll/win32/shlwapi/reg.c | 2 +- reactos/dll/win32/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/shlwapi/reg.c b/reactos/dll/win32/shlwapi/reg.c index c6fa2c7e84d..9f652c9df92 100644 --- a/reactos/dll/win32/shlwapi/reg.c +++ b/reactos/dll/win32/shlwapi/reg.c @@ -200,7 +200,7 @@ LONG WINAPI SHRegCloseUSKey( 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; diff --git a/reactos/dll/win32/shlwapi/shlwapi.spec b/reactos/dll/win32/shlwapi/shlwapi.spec index 1a791745308..a8e7428c6f3 100644 --- a/reactos/dll/win32/shlwapi/shlwapi.spec +++ b/reactos/dll/win32/shlwapi/shlwapi.spec @@ -810,8 +810,8 @@ @ 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)