[ros-diffs] [akhaldi] 63558: [RPCRT4] * Do not rely on RegDeleteTreeW which shouldn't be exported. CORE-8174

[akhaldi]

Author: akhaldi
Date: Sun Jun  8 17:11:47 2014
New Revision: 63558

URL: http://svn.reactos.org/svn/reactos?rev=63558&view=rev
Log:
[RPCRT4]
* Do not rely on RegDeleteTreeW which shouldn't be exported.
CORE-8174

Modified:
    trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt
    trunk/reactos/dll/win32/rpcrt4/cpsf.c

Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt?rev=63558&r1=63557&r2=63558&view=diff
==============================================================================
--- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt       [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt       [iso-8859-1] Sun Jun  8 
17:11:47 2014
@@ -52,6 +52,6 @@
 target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB})
 
 add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32)
-add_importlibs(rpcrt4 msvcrt advapi32 ws2_32 kernel32 ntdll)
+add_importlibs(rpcrt4 advapi32 ws2_32 shlwapi msvcrt kernel32 ntdll)
 add_pch(rpcrt4 precomp.h SOURCE)
 add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.c?rev=63558&r1=63557&r2=63558&view=diff
==============================================================================
--- trunk/reactos/dll/win32/rpcrt4/cpsf.c       [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rpcrt4/cpsf.c       [iso-8859-1] Sun Jun  8 
17:11:47 2014
@@ -22,6 +22,12 @@
 
 #include <winreg.h>
 
+#define NO_SHLWAPI_PATH
+#define NO_SHLWAPI_STRFCNS
+#define NO_SHLWAPI_GDI
+#define NO_SHLWAPI_STREAM
+#include <shlwapi.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 static void format_clsid( WCHAR *buffer, const CLSID *clsid )
@@ -308,7 +314,7 @@
 
       strcpyW( keyname, interfaceW );
       format_clsid( keyname + strlenW(keyname), proxy->header.piid );
-      RegDeleteTreeW(HKEY_CLASSES_ROOT, keyname);
+      SHDeleteKeyW(HKEY_CLASSES_ROOT, keyname);
     }
     pProxyFileList++;
   }
@@ -316,7 +322,7 @@
   /* unregister clsid */
   strcpyW( keyname, clsidW );
   strcatW( keyname, clsid );
-  RegDeleteTreeW(HKEY_CLASSES_ROOT, keyname);
+  SHDeleteKeyW(HKEY_CLASSES_ROOT, keyname);
 
   return S_OK;
 }