Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSCTF]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2014-06-08 15:00:51 +00:00
parent 5814ee76b3
commit f55a509638
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/msctf/CMakeLists.txt
View file

@ -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)

4
reactos/dll/win32/msctf/categorymgr.c
View file

@ -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;

4
reactos/dll/win32/msctf/inputprocessor.c
View file

@ -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;
}

1
reactos/dll/win32/msctf/msctf_internal.h
View file

@ -37,6 +37,7 @@
#include <objbase.h>
#include <olectl.h>
#include <msctf.h>
#include <shlwapi.h>
#include <wine/list.h>
#include <wine/unicode.h>