[ros-diffs] [akhaldi] 63555: [MSCTF] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174

Author: akhaldi
Date: Sun Jun  8 15:00:51 2014
New Revision: 63555

URL: http://svn.reactos.org/svn/reactos?rev=63555&view=rev
Log:
[MSCTF]
* Do not rely on RegDeleteTreeW which shouldn't be exported.
* We no longer need to define _WIN32_WINNT as 0x600.
CORE-8174

Modified:
    trunk/reactos/dll/win32/msctf/CMakeLists.txt
    trunk/reactos/dll/win32/msctf/categorymgr.c
    trunk/reactos/dll/win32/msctf/inputprocessor.c
    trunk/reactos/dll/win32/msctf/msctf_internal.h

Modified: trunk/reactos/dll/win32/msctf/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/msctf/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/CMakeLists.txt	[iso-8859-1] Sun Jun  8 15:00:51 2014
@@ -1,6 +1,3 @@
-
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -27,6 +24,6 @@
 
 set_module_type(msctf win32dll)
 target_link_libraries(msctf uuid wine)
-add_importlibs(msctf ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
+add_importlibs(msctf ole32 oleaut32 user32 advapi32 shlwapi msvcrt kernel32 ntdll)
 add_pch(msctf msctf_internal.h SOURCE)
 add_cd_file(TARGET msctf DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/msctf/categorymgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/categorymg…
==============================================================================
--- trunk/reactos/dll/win32/msctf/categorymgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/categorymgr.c	[iso-8859-1] Sun Jun  8 15:00:51 2014
@@ -154,9 +154,9 @@
     sprintfW(fullkey,fmt2,ctg,ctg,buf,buf2);
 
     sprintfW(fullkey,fmt2,ctg,itm,buf2,buf);
-    RegDeleteTreeW(tipkey, fullkey);
+    SHDeleteKeyW(tipkey, fullkey);
     sprintfW(fullkey,fmt2,ctg,itm,buf2,buf);
-    RegDeleteTreeW(tipkey, fullkey);
+    SHDeleteKeyW(tipkey, fullkey);
 
     RegCloseKey(tipkey);
     return S_OK;

Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputproce…
==============================================================================
--- trunk/reactos/dll/win32/msctf/inputprocessor.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/inputprocessor.c	[iso-8859-1] Sun Jun  8 15:00:51 2014
@@ -227,8 +227,8 @@
     StringFromGUID2(rclsid, buf, 39);
     sprintfW(fullkey,szwTipfmt,szwSystemTIPKey,buf);
 
-    RegDeleteTreeW(HKEY_LOCAL_MACHINE, fullkey);
-    RegDeleteTreeW(HKEY_CURRENT_USER, fullkey);
+    SHDeleteKeyW(HKEY_LOCAL_MACHINE, fullkey);
+    SHDeleteKeyW(HKEY_CURRENT_USER, fullkey);
 
     return S_OK;
 }

Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte…
==============================================================================
--- trunk/reactos/dll/win32/msctf/msctf_internal.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/msctf_internal.h	[iso-8859-1] Sun Jun  8 15:00:51 2014
@@ -37,6 +37,7 @@
 #include <objbase.h>
 #include <olectl.h>
 #include <msctf.h>
+#include <shlwapi.h>
 
 #include <wine/list.h>
 #include <wine/unicode.h>