Skip to content

Commit 1286711

Browse files
authored
[SDK][CICERO] Replace msctf_undoc.h with msctf_undoc.idl (reactos#8060)
Follow-up of reactos#8057. Generally, the IDL file is a higher level than the header file. JIRA issue: CORE-19361 - Modify CMakeLists.txt. - Add sdk/include/reactos/CMakeLists.txt. - Add reactos_idls CMake target in - sdk/include/reactos/CMakeLists.txt to process IDL files. - Add reactos_idls dependency to cicero. - Delete msctf_undoc.h and add msctf_undoc.idl.
1 parent 52ca353 commit 1286711

File tree

5 files changed

+148
-149
lines changed

5 files changed

+148
-149
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
347347
add_subdirectory(sdk/include/xdk)
348348
add_subdirectory(sdk/include/psdk)
349349
add_subdirectory(sdk/include/dxsdk)
350-
add_subdirectory(sdk/include/reactos/wine)
351-
add_subdirectory(sdk/include/reactos/mc)
350+
add_subdirectory(sdk/include/reactos)
352351
add_subdirectory(sdk/include/asm)
353352

354353
if(ARCH MATCHES "64$")

base/ctf/cicero/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ list(APPEND SOURCE
1010

1111
add_library(cicero STATIC ${SOURCE})
1212
target_compile_definitions(cicero PRIVATE UNICODE _UNICODE)
13-
add_dependencies(cicero psdk)
13+
add_dependencies(cicero psdk reactos_idls)
1414
target_include_directories(cicero INTERFACE
1515
$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}>)

sdk/include/reactos/CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
add_subdirectory(wine)
3+
add_subdirectory(mc)
4+
5+
add_definitions(-D_MIDL_USE_GUIDDEF_)
6+
7+
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
8+
9+
list(APPEND SOURCE
10+
msctf_undoc.idl)
11+
12+
add_idl_headers(reactos_idls ${SOURCE})
13+
add_dependencies(reactos_idls psdk)

sdk/include/reactos/msctf_undoc.h

Lines changed: 0 additions & 146 deletions
This file was deleted.
Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
/*
2+
* PROJECT: ReactOS header
3+
* LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
4+
* PURPOSE: Private header for msctf.dll
5+
* COPYRIGHT: Copyright 2025 Katayama Hirofumi MZ <[email protected]>
6+
*/
7+
8+
import "msctf.idl";
9+
import "inputscope.idl";
10+
11+
[
12+
object,
13+
uuid(8b99712b-5815-4bcc-b9a9-53db1c8d6755),
14+
pointer_default(unique)
15+
]
16+
interface ITfRangeAnchor : IUnknown
17+
{
18+
HRESULT GetFormattedText(
19+
[in] TfEditCookie ec,
20+
[out] IDataObject **ppDataObject);
21+
HRESULT GetEmbedded(
22+
[in] TfEditCookie ec,
23+
[in] REFGUID rguidService,
24+
[in] REFIID riid,
25+
[out] IUnknown **ppunk);
26+
HRESULT InsertEmbedded(
27+
[in] TfEditCookie ec,
28+
[in] DWORD dwFlags,
29+
[in] IDataObject *pDataObject);
30+
HRESULT ShiftStart(
31+
[in] TfEditCookie ec,
32+
[in] LONG cchReq,
33+
[out] LONG *pcch,
34+
[in] const TF_HALTCOND *pHalt);
35+
HRESULT ShiftEnd(
36+
[in] TfEditCookie ec,
37+
[in] LONG cchReq,
38+
[out] LONG *pcch,
39+
[in] const TF_HALTCOND *pHalt);
40+
HRESULT ShiftStartToRange(
41+
[in] TfEditCookie ec,
42+
[in] ITfRange *pRange,
43+
[in] TfAnchor aPos);
44+
HRESULT ShiftEndToRange(
45+
[in] TfEditCookie ec,
46+
[in] ITfRange *pRange,
47+
[in] TfAnchor aPos);
48+
HRESULT ShiftStartRegion(
49+
[in] TfEditCookie ec,
50+
[in] TfShiftDir dir,
51+
[out] BOOL *pfNoRegion);
52+
HRESULT ShiftEndRegion(
53+
[in] TfEditCookie ec,
54+
[in] TfShiftDir dir,
55+
[out] BOOL *pfNoRegion);
56+
HRESULT IsEmpty(
57+
[in] TfEditCookie ec,
58+
[out] BOOL *pfEmpty);
59+
HRESULT Collapse(
60+
[in] TfEditCookie ec,
61+
[in] TfAnchor aPos);
62+
HRESULT IsEqualStart(
63+
[in] TfEditCookie ec,
64+
[in] ITfRange *pWith,
65+
[in] TfAnchor aPos,
66+
[out] BOOL *pfEqual);
67+
HRESULT IsEqualEnd(
68+
[in] TfEditCookie ec,
69+
[in] ITfRange *pWith,
70+
[in] TfAnchor aPos,
71+
[out] BOOL *pfEqual);
72+
HRESULT CompareStart(
73+
[in] TfEditCookie ec,
74+
[in] ITfRange *pWith,
75+
[in] TfAnchor aPos,
76+
[out] LONG *plResult);
77+
HRESULT CompareEnd(
78+
[in] TfEditCookie ec,
79+
[in] ITfRange *pWith,
80+
[in] TfAnchor aPos,
81+
[out] LONG *plResult);
82+
HRESULT AdjustForInsert(
83+
[in] TfEditCookie ec,
84+
[in] ULONG cchInsert,
85+
[out] BOOL *pfInsertOk);
86+
HRESULT GetGravity(
87+
[out] TfGravity *pgStart,
88+
[out] TfGravity *pgEnd);
89+
HRESULT SetGravity(
90+
[in] TfEditCookie ec,
91+
[in] TfGravity gStart,
92+
[in] TfGravity gEnd);
93+
HRESULT Clone([out] ITfRange **ppClone);
94+
HRESULT GetContext([out] ITfContext **ppContext);
95+
}
96+
97+
cpp_quote("BOOL WINAPI TF_InitSystem(VOID);")
98+
cpp_quote("BOOL WINAPI TF_UninitSystem(VOID);")
99+
cpp_quote("HRESULT WINAPI TF_GetGlobalCompartment(_Out_ ITfCompartmentMgr **ppCompMgr);")
100+
cpp_quote("HRESULT WINAPI TF_PostAllThreadMsg(_In_opt_ WPARAM wParam, _In_ DWORD dwFlags);")
101+
cpp_quote("HANDLE WINAPI TF_CreateCicLoadMutex(_Out_ LPBOOL pfWinLogon);")
102+
cpp_quote("HRESULT WINAPI TF_InvalidAssemblyListCache(VOID);")
103+
cpp_quote("HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(VOID);")
104+
cpp_quote("HICON WINAPI TF_GetLangIcon(_In_ LANGID LangID, _Out_writes_(cchText) PWSTR pszText, _In_ INT cchText);")
105+
cpp_quote("VOID WINAPI TF_InitMlngInfo(VOID);")
106+
cpp_quote("INT WINAPI TF_MlngInfoCount(VOID);")
107+
cpp_quote("INT WINAPI TF_GetMlngIconIndex(_In_ INT iKL);")
108+
cpp_quote("HICON WINAPI TF_InatExtractIcon(_In_ INT iKL);")
109+
cpp_quote("HRESULT WINAPI TF_RunInputCPL(VOID);")
110+
cpp_quote("LONG WINAPI TF_CheckThreadInputIdle(_In_ DWORD dwThreadId, _In_ DWORD dwMilliseconds);")
111+
cpp_quote("BOOL WINAPI TF_IsInMarshaling(_In_ DWORD dwThreadId);")
112+
113+
cpp_quote("// This is intentionally misspelled to match the original name:")
114+
cpp_quote("BOOL WINAPI TF_IsFullScreenWindowAcitvated(VOID);")
115+
116+
cpp_quote("HRESULT WINAPI TF_CUASAppFix(_In_ LPCSTR pszName);")
117+
cpp_quote("HRESULT WINAPI TF_ClearLangBarAddIns(_In_ REFGUID rguid);")
118+
cpp_quote("HRESULT WINAPI TF_GetInputScope(_In_opt_ HWND hWnd, _Out_ ITfInputScope **ppInputScope);")
119+
cpp_quote("BOOL WINAPI TF_DllDetachInOther(VOID);")
120+
121+
cpp_quote("BOOL WINAPI")
122+
cpp_quote("TF_GetMlngHKL(")
123+
cpp_quote(" _In_ INT iKL,")
124+
cpp_quote(" _Out_opt_ HKL *phKL,")
125+
cpp_quote(" _Out_writes_opt_(cchText) LPWSTR pszText,")
126+
cpp_quote(" _In_ INT cchText);")
127+
128+
cpp_quote("BOOL WINAPI")
129+
cpp_quote("TF_GetThreadFlags(")
130+
cpp_quote(" _In_ DWORD dwThreadId,")
131+
cpp_quote(" _Out_ LPDWORD pdwFlags1,")
132+
cpp_quote(" _Out_ LPDWORD pdwFlags2,")
133+
cpp_quote(" _Out_ LPDWORD pdwFlags3);")

0 commit comments

Comments
 (0)