[MSCTF]

* Do not rely on RegDeleteTreeW which shouldn't be exported.
* We no longer need to define _WIN32_WINNT as 0x600.
CORE-8174

svn path=/trunk/; revision=63555

diff --git a/reactos/dll/win32/msctf/CMakeLists.txt b/reactos/dll/win32/msctf/CMakeLists.txt
index 63be882..fae9512 100644 (file)
--- a/reactos/dll/win32/msctf/CMakeLists.txt
+++ b/reactos/dll/win32/msctf/CMakeLists.txt
@@ -1,7 +1,4 @@
 
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
-
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(msctf.dll msctf.spec)
@@ -27,6 +24,6 @@ add_library(msctf SHARED
 
 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)

diff --git a/reactos/dll/win32/msctf/categorymgr.c b/reactos/dll/win32/msctf/categorymgr.c
index 509494f..8d72413 100644 (file)
--- a/reactos/dll/win32/msctf/categorymgr.c
+++ b/reactos/dll/win32/msctf/categorymgr.c
@@ -154,9 +154,9 @@ static HRESULT WINAPI CategoryMgr_UnregisterCategory ( ITfCategoryMgr *iface,
     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;

diff --git a/reactos/dll/win32/msctf/inputprocessor.c b/reactos/dll/win32/msctf/inputprocessor.c
index 7d22540..f7561a9 100644 (file)
--- a/reactos/dll/win32/msctf/inputprocessor.c
+++ b/reactos/dll/win32/msctf/inputprocessor.c
@@ -227,8 +227,8 @@ static HRESULT WINAPI InputProcessorProfiles_Unregister(
     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;
 }

diff --git a/reactos/dll/win32/msctf/msctf_internal.h b/reactos/dll/win32/msctf/msctf_internal.h
index e59765d..c6b2643 100644 (file)
--- a/reactos/dll/win32/msctf/msctf_internal.h
+++ b/reactos/dll/win32/msctf/msctf_internal.h
@@ -37,6 +37,7 @@
 #include <objbase.h>
 #include <olectl.h>
 #include <msctf.h>
+#include <shlwapi.h>
 
 #include <wine/list.h>
 #include <wine/unicode.h>