[cwittich] 44441: sync shlwapi with wine 1.1.34

Author: cwittich
Date: Sun Dec  6 16:38:07 2009
New Revision: 44441

URL: http://svn.reactos.org/svn/reactos?rev=44441&view=rev
Log:
sync shlwapi with wine 1.1.34

Modified:
    trunk/reactos/dll/win32/shlwapi/reg.c
    trunk/reactos/dll/win32/shlwapi/shlwapi.spec

Modified: trunk/reactos/dll/win32/shlwapi/reg.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/reg.c?rev...
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/reg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/reg.c [iso-8859-1] Sun Dec  6 16:38:07 2009
@@ -200,7 +200,7 @@
     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;

Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.s...
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Sun Dec  6 16:38:07 2009
@@ -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)