1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
|
diff -ru SDL2-2.0.8.orig/src/video/windows/SDL_windowskeyboard.c SDL2-2.0.8/src/video/windows/SDL_windowskeyboard.c
--- SDL2-2.0.8.orig/src/video/windows/SDL_windowskeyboard.c 2018-03-01 17:34:43.000000000 +0100
+++ SDL2-2.0.8/src/video/windows/SDL_windowskeyboard.c 2020-10-05 20:39:13.169351110 +0200
@@ -28,7 +28,10 @@
#include "../../events/scancodes_windows.h"
#include <imm.h>
-#include <oleauto.h>
+
+#ifndef CFS_FORCE_POSITION
+#define CFS_FORCE_POSITION 0x0020
+#endif
#ifndef SDL_DISABLE_WINDOWS_IME
static void IME_Init(SDL_VideoData *videodata, HWND hwnd);
diff -ru SDL2-2.0.8.orig/src/video/windows/SDL_msctf.h SDL2-2.0.8/src/video/windows/SDL_msctf.h
--- SDL2-2.0.8.orig/src/video/windows/SDL_msctf.h 2018-03-01 17:34:43.000000000 +0100
+++ SDL2-2.0.8/src/video/windows/SDL_msctf.h 2020-10-04 12:38:34.746446128 +0200
@@ -22,7 +22,18 @@
#ifndef SDL_msctf_h_
#define SDL_msctf_h_
-#include <unknwn.h>
+#include <windows.h>
+#include <stdint.h>
+typedef uint16_t* BSTR;
+typedef DWORD HIMCC;
+#define NEAR
+#define FAR
+typedef struct tagCANDIDATEFORM {
+ DWORD dwIndex;
+ DWORD dwStyle;
+ POINT ptCurrentPos;
+ RECT rcArea;
+} CANDIDATEFORM,*PCANDIDATEFORM,*NPCANDIDATEFORM,*LPCANDIDATEFORM;
#define TF_INVALID_COOKIE (0xffffffff)
#define TF_IPSINK_FLAG_ACTIVE 0x0001
@@ -53,20 +53,20 @@
typedef struct ITfThreadMgrVtbl
{
- HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfThreadMgr *, REFIID, void **);
- ULONG (STDMETHODCALLTYPE *AddRef)(ITfThreadMgr *);
- ULONG (STDMETHODCALLTYPE *Release)(ITfThreadMgr *);
- HRESULT (STDMETHODCALLTYPE *Activate)(ITfThreadMgr *, TfClientId *);
- HRESULT (STDMETHODCALLTYPE *Deactivate)(ITfThreadMgr *);
- HRESULT (STDMETHODCALLTYPE *CreateDocumentMgr)(ITfThreadMgr *);
- HRESULT (STDMETHODCALLTYPE *EnumDocumentMgrs)(ITfThreadMgr *, IEnumTfDocumentMgrs **);
- HRESULT (STDMETHODCALLTYPE *GetFocus)(ITfThreadMgr *, ITfDocumentMgr **);
- HRESULT (STDMETHODCALLTYPE *SetFocus)(ITfThreadMgr *, ITfDocumentMgr *);
- HRESULT (STDMETHODCALLTYPE *AssociateFocus)(ITfThreadMgr *, HWND, ITfDocumentMgr *, ITfDocumentMgr **);
- HRESULT (STDMETHODCALLTYPE *IsThreadFocus)(ITfThreadMgr *, BOOL *);
- HRESULT (STDMETHODCALLTYPE *GetFunctionProvider)(ITfThreadMgr *, REFCLSID, ITfFunctionProvider **);
- HRESULT (STDMETHODCALLTYPE *EnumFunctionProviders)(ITfThreadMgr *, IEnumTfFunctionProviders **);
- HRESULT (STDMETHODCALLTYPE *GetGlobalCompartment)(ITfThreadMgr *, ITfCompartmentMgr **);
+ HRESULT (__stdcall *QueryInterface)(ITfThreadMgr *, REFIID, void **);
+ ULONG (__stdcall *AddRef)(ITfThreadMgr *);
+ ULONG (__stdcall *Release)(ITfThreadMgr *);
+ HRESULT (__stdcall *Activate)(ITfThreadMgr *, TfClientId *);
+ HRESULT (__stdcall *Deactivate)(ITfThreadMgr *);
+ HRESULT (__stdcall *CreateDocumentMgr)(ITfThreadMgr *);
+ HRESULT (__stdcall *EnumDocumentMgrs)(ITfThreadMgr *, IEnumTfDocumentMgrs **);
+ HRESULT (__stdcall *GetFocus)(ITfThreadMgr *, ITfDocumentMgr **);
+ HRESULT (__stdcall *SetFocus)(ITfThreadMgr *, ITfDocumentMgr *);
+ HRESULT (__stdcall *AssociateFocus)(ITfThreadMgr *, HWND, ITfDocumentMgr *, ITfDocumentMgr **);
+ HRESULT (__stdcall *IsThreadFocus)(ITfThreadMgr *, BOOL *);
+ HRESULT (__stdcall *GetFunctionProvider)(ITfThreadMgr *, REFCLSID, ITfFunctionProvider **);
+ HRESULT (__stdcall *EnumFunctionProviders)(ITfThreadMgr *, IEnumTfFunctionProviders **);
+ HRESULT (__stdcall *GetGlobalCompartment)(ITfThreadMgr *, ITfCompartmentMgr **);
} ITfThreadMgrVtbl;
struct ITfThreadMgr
@@ -76,22 +76,22 @@
typedef struct ITfThreadMgrExVtbl
{
- HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfThreadMgrEx *, REFIID, void **);
- ULONG (STDMETHODCALLTYPE *AddRef)(ITfThreadMgrEx *);
- ULONG (STDMETHODCALLTYPE *Release)(ITfThreadMgrEx *);
- HRESULT (STDMETHODCALLTYPE *Activate)(ITfThreadMgrEx *, TfClientId *);
- HRESULT (STDMETHODCALLTYPE *Deactivate)(ITfThreadMgrEx *);
- HRESULT (STDMETHODCALLTYPE *CreateDocumentMgr)(ITfThreadMgrEx *, ITfDocumentMgr **);
- HRESULT (STDMETHODCALLTYPE *EnumDocumentMgrs)(ITfThreadMgrEx *, IEnumTfDocumentMgrs **);
- HRESULT (STDMETHODCALLTYPE *GetFocus)(ITfThreadMgrEx *, ITfDocumentMgr **);
- HRESULT (STDMETHODCALLTYPE *SetFocus)(ITfThreadMgrEx *, ITfDocumentMgr *);
- HRESULT (STDMETHODCALLTYPE *AssociateFocus)(ITfThreadMgrEx *, ITfDocumentMgr *, ITfDocumentMgr **);
- HRESULT (STDMETHODCALLTYPE *IsThreadFocus)(ITfThreadMgrEx *, BOOL *);
- HRESULT (STDMETHODCALLTYPE *GetFunctionProvider)(ITfThreadMgrEx *, REFCLSID, ITfFunctionProvider **);
- HRESULT (STDMETHODCALLTYPE *EnumFunctionProviders)(ITfThreadMgrEx *, IEnumTfFunctionProviders **);
- HRESULT (STDMETHODCALLTYPE *GetGlobalCompartment)(ITfThreadMgrEx *, ITfCompartmentMgr **);
- HRESULT (STDMETHODCALLTYPE *ActivateEx)(ITfThreadMgrEx *, TfClientId *, DWORD);
- HRESULT (STDMETHODCALLTYPE *GetActiveFlags)(ITfThreadMgrEx *, DWORD *);
+ HRESULT (__stdcall *QueryInterface)(ITfThreadMgrEx *, REFIID, void **);
+ ULONG (__stdcall *AddRef)(ITfThreadMgrEx *);
+ ULONG (__stdcall *Release)(ITfThreadMgrEx *);
+ HRESULT (__stdcall *Activate)(ITfThreadMgrEx *, TfClientId *);
+ HRESULT (__stdcall *Deactivate)(ITfThreadMgrEx *);
+ HRESULT (__stdcall *CreateDocumentMgr)(ITfThreadMgrEx *, ITfDocumentMgr **);
+ HRESULT (__stdcall *EnumDocumentMgrs)(ITfThreadMgrEx *, IEnumTfDocumentMgrs **);
+ HRESULT (__stdcall *GetFocus)(ITfThreadMgrEx *, ITfDocumentMgr **);
+ HRESULT (__stdcall *SetFocus)(ITfThreadMgrEx *, ITfDocumentMgr *);
+ HRESULT (__stdcall *AssociateFocus)(ITfThreadMgrEx *, ITfDocumentMgr *, ITfDocumentMgr **);
+ HRESULT (__stdcall *IsThreadFocus)(ITfThreadMgrEx *, BOOL *);
+ HRESULT (__stdcall *GetFunctionProvider)(ITfThreadMgrEx *, REFCLSID, ITfFunctionProvider **);
+ HRESULT (__stdcall *EnumFunctionProviders)(ITfThreadMgrEx *, IEnumTfFunctionProviders **);
+ HRESULT (__stdcall *GetGlobalCompartment)(ITfThreadMgrEx *, ITfCompartmentMgr **);
+ HRESULT (__stdcall *ActivateEx)(ITfThreadMgrEx *, TfClientId *, DWORD);
+ HRESULT (__stdcall *GetActiveFlags)(ITfThreadMgrEx *, DWORD *);
} ITfThreadMgrExVtbl;
struct ITfThreadMgrEx
@@ -101,15 +101,15 @@
typedef struct ITfDocumentMgrVtbl
{
- HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfDocumentMgr *, REFIID, void **);
- ULONG (STDMETHODCALLTYPE *AddRef)(ITfDocumentMgr *);
- ULONG (STDMETHODCALLTYPE *Release)(ITfDocumentMgr *);
- HRESULT (STDMETHODCALLTYPE *CreateContext)(ITfDocumentMgr *, TfClientId, DWORD, IUnknown *, ITfContext **, TfEditCookie *);
- HRESULT (STDMETHODCALLTYPE *Push)(ITfDocumentMgr *, ITfContext *);
- HRESULT (STDMETHODCALLTYPE *Pop)(ITfDocumentMgr *);
- HRESULT (STDMETHODCALLTYPE *GetTop)(ITfDocumentMgr *, ITfContext **);
- HRESULT (STDMETHODCALLTYPE *GetBase)(ITfDocumentMgr *, ITfContext **);
- HRESULT (STDMETHODCALLTYPE *EnumContexts)(ITfDocumentMgr *, IEnumTfContexts **);
+ HRESULT (__stdcall *QueryInterface)(ITfDocumentMgr *, REFIID, void **);
+ ULONG (__stdcall *AddRef)(ITfDocumentMgr *);
+ ULONG (__stdcall *Release)(ITfDocumentMgr *);
+ HRESULT (__stdcall *CreateContext)(ITfDocumentMgr *, TfClientId, DWORD, IUnknown *, ITfContext **, TfEditCookie *);
+ HRESULT (__stdcall *Push)(ITfDocumentMgr *, ITfContext *);
+ HRESULT (__stdcall *Pop)(ITfDocumentMgr *);
+ HRESULT (__stdcall *GetTop)(ITfDocumentMgr *, ITfContext **);
+ HRESULT (__stdcall *GetBase)(ITfDocumentMgr *, ITfContext **);
+ HRESULT (__stdcall *EnumContexts)(ITfDocumentMgr *, IEnumTfContexts **);
} ITfDocumentMgrVtbl;
struct ITfDocumentMgr
@@ -119,12 +119,12 @@
typedef struct ITfUIElementSinkVtbl
{
- HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfUIElementSink *, REFIID, void **);
- ULONG (STDMETHODCALLTYPE *AddRef)(ITfUIElementSink *);
- ULONG (STDMETHODCALLTYPE *Release)(ITfUIElementSink *);
- HRESULT (STDMETHODCALLTYPE *BeginUIElement)(ITfUIElementSink *, DWORD, BOOL *);
- HRESULT (STDMETHODCALLTYPE *UpdateUIElement)(ITfUIElementSink *, DWORD);
- HRESULT (STDMETHODCALLTYPE *EndUIElement)(ITfUIElementSink *, DWORD);
+ HRESULT (__stdcall *QueryInterface)(ITfUIElementSink *, REFIID, void **);
+ ULONG (__stdcall *AddRef)(ITfUIElementSink *);
+ ULONG (__stdcall *Release)(ITfUIElementSink *);
+ HRESULT (__stdcall *BeginUIElement)(ITfUIElementSink *, DWORD, BOOL *);
+ HRESULT (__stdcall *UpdateUIElement)(ITfUIElementSink *, DWORD);
+ HRESULT (__stdcall *EndUIElement)(ITfUIElementSink *, DWORD);
} ITfUIElementSinkVtbl;
struct ITfUIElementSink
@@ -134,14 +134,14 @@
typedef struct ITfUIElementMgrVtbl
{
- HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfUIElementMgr *, REFIID, void **);
- ULONG (STDMETHODCALLTYPE *AddRef)(ITfUIElementMgr *);
- ULONG (STDMETHODCALLTYPE *Release)(ITfUIElementMgr *);
- HRESULT (STDMETHODCALLTYPE *BeginUIElement)(ITfUIElementMgr *, ITfUIElement *, BOOL *, DWORD *);
- HRESULT (STDMETHODCALLTYPE *UpdateUIElement)(ITfUIElementMgr *, DWORD);
- HRESULT (STDMETHODCALLTYPE *EndUIElement)(ITfUIElementMgr *, DWORD);
- HRESULT (STDMETHODCALLTYPE *GetUIElement)(ITfUIElementMgr *, DWORD, ITfUIElement **);
- HRESULT (STDMETHODCALLTYPE *EnumUIElements)(ITfUIElementMgr *, IEnumTfUIElements **);
+ HRESULT (__stdcall *QueryInterface)(ITfUIElementMgr *, REFIID, void **);
+ ULONG (__stdcall *AddRef)(ITfUIElementMgr *);
+ ULONG (__stdcall *Release)(ITfUIElementMgr *);
+ HRESULT (__stdcall *BeginUIElement)(ITfUIElementMgr *, ITfUIElement *, BOOL *, DWORD *);
+ HRESULT (__stdcall *UpdateUIElement)(ITfUIElementMgr *, DWORD);
+ HRESULT (__stdcall *EndUIElement)(ITfUIElementMgr *, DWORD);
+ HRESULT (__stdcall *GetUIElement)(ITfUIElementMgr *, DWORD, ITfUIElement **);
+ HRESULT (__stdcall *EnumUIElements)(ITfUIElementMgr *, IEnumTfUIElements **);
} ITfUIElementMgrVtbl;
struct ITfUIElementMgr
@@ -151,21 +151,21 @@
typedef struct ITfCandidateListUIElementVtbl
{
- HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfCandidateListUIElement *, REFIID, void **);
- ULONG (STDMETHODCALLTYPE *AddRef)(ITfCandidateListUIElement *);
- ULONG (STDMETHODCALLTYPE *Release)(ITfCandidateListUIElement *);
- HRESULT (STDMETHODCALLTYPE *GetDescription)(ITfCandidateListUIElement *, BSTR *);
- HRESULT (STDMETHODCALLTYPE *GetGUID)(ITfCandidateListUIElement *, GUID *);
- HRESULT (STDMETHODCALLTYPE *Show)(ITfCandidateListUIElement *, BOOL);
- HRESULT (STDMETHODCALLTYPE *IsShown)(ITfCandidateListUIElement *, BOOL *);
- HRESULT (STDMETHODCALLTYPE *GetUpdatedFlags)(ITfCandidateListUIElement *, DWORD *);
- HRESULT (STDMETHODCALLTYPE *GetDocumentMgr)(ITfCandidateListUIElement *, ITfDocumentMgr **);
- HRESULT (STDMETHODCALLTYPE *GetCount)(ITfCandidateListUIElement *, UINT *);
- HRESULT (STDMETHODCALLTYPE *GetSelection)(ITfCandidateListUIElement *, UINT *);
- HRESULT (STDMETHODCALLTYPE *GetString)(ITfCandidateListUIElement *, UINT, BSTR *);
- HRESULT (STDMETHODCALLTYPE *GetPageIndex)(ITfCandidateListUIElement *, UINT *, UINT, UINT *);
- HRESULT (STDMETHODCALLTYPE *SetPageIndex)(ITfCandidateListUIElement *, UINT *, UINT);
- HRESULT (STDMETHODCALLTYPE *GetCurrentPage)(ITfCandidateListUIElement *, UINT *);
+ HRESULT (__stdcall *QueryInterface)(ITfCandidateListUIElement *, REFIID, void **);
+ ULONG (__stdcall *AddRef)(ITfCandidateListUIElement *);
+ ULONG (__stdcall *Release)(ITfCandidateListUIElement *);
+ HRESULT (__stdcall *GetDescription)(ITfCandidateListUIElement *, BSTR *);
+ HRESULT (__stdcall *GetGUID)(ITfCandidateListUIElement *, GUID *);
+ HRESULT (__stdcall *Show)(ITfCandidateListUIElement *, BOOL);
+ HRESULT (__stdcall *IsShown)(ITfCandidateListUIElement *, BOOL *);
+ HRESULT (__stdcall *GetUpdatedFlags)(ITfCandidateListUIElement *, DWORD *);
+ HRESULT (__stdcall *GetDocumentMgr)(ITfCandidateListUIElement *, ITfDocumentMgr **);
+ HRESULT (__stdcall *GetCount)(ITfCandidateListUIElement *, UINT *);
+ HRESULT (__stdcall *GetSelection)(ITfCandidateListUIElement *, UINT *);
+ HRESULT (__stdcall *GetString)(ITfCandidateListUIElement *, UINT, BSTR *);
+ HRESULT (__stdcall *GetPageIndex)(ITfCandidateListUIElement *, UINT *, UINT, UINT *);
+ HRESULT (__stdcall *SetPageIndex)(ITfCandidateListUIElement *, UINT *, UINT);
+ HRESULT (__stdcall *GetCurrentPage)(ITfCandidateListUIElement *, UINT *);
} ITfCandidateListUIElementVtbl;
struct ITfCandidateListUIElement
@@ -175,19 +175,19 @@
typedef struct ITfReadingInformationUIElementVtbl
{
- HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfReadingInformationUIElement *, REFIID, void **);
- ULONG (STDMETHODCALLTYPE *AddRef)(ITfReadingInformationUIElement *);
- ULONG (STDMETHODCALLTYPE *Release)(ITfReadingInformationUIElement *);
- HRESULT (STDMETHODCALLTYPE *GetDescription)(ITfReadingInformationUIElement *, BSTR *);
- HRESULT (STDMETHODCALLTYPE *GetGUID)(ITfReadingInformationUIElement *, GUID *);
- HRESULT (STDMETHODCALLTYPE *Show)(ITfReadingInformationUIElement *, BOOL);
- HRESULT (STDMETHODCALLTYPE *IsShown)(ITfReadingInformationUIElement *, BOOL *);
- HRESULT (STDMETHODCALLTYPE *GetUpdatedFlags)(ITfReadingInformationUIElement *, DWORD *);
- HRESULT (STDMETHODCALLTYPE *GetContext)(ITfReadingInformationUIElement *, ITfContext **);
- HRESULT (STDMETHODCALLTYPE *GetString)(ITfReadingInformationUIElement *, BSTR *);
- HRESULT (STDMETHODCALLTYPE *GetMaxReadingStringLength)(ITfReadingInformationUIElement *, UINT *);
- HRESULT (STDMETHODCALLTYPE *GetErrorIndex)(ITfReadingInformationUIElement *, UINT *);
- HRESULT (STDMETHODCALLTYPE *IsVerticalOrderPreferred)(ITfReadingInformationUIElement *, BOOL *);
+ HRESULT (__stdcall *QueryInterface)(ITfReadingInformationUIElement *, REFIID, void **);
+ ULONG (__stdcall *AddRef)(ITfReadingInformationUIElement *);
+ ULONG (__stdcall *Release)(ITfReadingInformationUIElement *);
+ HRESULT (__stdcall *GetDescription)(ITfReadingInformationUIElement *, BSTR *);
+ HRESULT (__stdcall *GetGUID)(ITfReadingInformationUIElement *, GUID *);
+ HRESULT (__stdcall *Show)(ITfReadingInformationUIElement *, BOOL);
+ HRESULT (__stdcall *IsShown)(ITfReadingInformationUIElement *, BOOL *);
+ HRESULT (__stdcall *GetUpdatedFlags)(ITfReadingInformationUIElement *, DWORD *);
+ HRESULT (__stdcall *GetContext)(ITfReadingInformationUIElement *, ITfContext **);
+ HRESULT (__stdcall *GetString)(ITfReadingInformationUIElement *, BSTR *);
+ HRESULT (__stdcall *GetMaxReadingStringLength)(ITfReadingInformationUIElement *, UINT *);
+ HRESULT (__stdcall *GetErrorIndex)(ITfReadingInformationUIElement *, UINT *);
+ HRESULT (__stdcall *IsVerticalOrderPreferred)(ITfReadingInformationUIElement *, BOOL *);
} ITfReadingInformationUIElementVtbl;
struct ITfReadingInformationUIElement
@@ -197,13 +197,13 @@
typedef struct ITfUIElementVtbl
{
- HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfUIElement *, REFIID, void **);
- ULONG (STDMETHODCALLTYPE *AddRef)(ITfUIElement *);
- ULONG (STDMETHODCALLTYPE *Release)(ITfUIElement *);
- HRESULT (STDMETHODCALLTYPE *GetDescription)(ITfUIElement *, BSTR *);
- HRESULT (STDMETHODCALLTYPE *GetGUID)(ITfUIElement *, GUID *);
- HRESULT (STDMETHODCALLTYPE *Show)(ITfUIElement *, BOOL);
- HRESULT (STDMETHODCALLTYPE *IsShown)(ITfUIElement *, BOOL *);
+ HRESULT (__stdcall *QueryInterface)(ITfUIElement *, REFIID, void **);
+ ULONG (__stdcall *AddRef)(ITfUIElement *);
+ ULONG (__stdcall *Release)(ITfUIElement *);
+ HRESULT (__stdcall *GetDescription)(ITfUIElement *, BSTR *);
+ HRESULT (__stdcall *GetGUID)(ITfUIElement *, GUID *);
+ HRESULT (__stdcall *Show)(ITfUIElement *, BOOL);
+ HRESULT (__stdcall *IsShown)(ITfUIElement *, BOOL *);
} ITfUIElementVtbl;
struct ITfUIElement
@@ -213,10 +213,10 @@
typedef struct ITfInputProcessorProfileActivationSinkVtbl
{
- HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfInputProcessorProfileActivationSink *, REFIID, void **);
- ULONG (STDMETHODCALLTYPE *AddRef)(ITfInputProcessorProfileActivationSink *);
- ULONG (STDMETHODCALLTYPE *Release)(ITfInputProcessorProfileActivationSink *);
- HRESULT (STDMETHODCALLTYPE *OnActivated)(ITfInputProcessorProfileActivationSink *, DWORD, LANGID, REFCLSID, REFGUID, REFGUID, HKL, DWORD);
+ HRESULT (__stdcall *QueryInterface)(ITfInputProcessorProfileActivationSink *, REFIID, void **);
+ ULONG (__stdcall *AddRef)(ITfInputProcessorProfileActivationSink *);
+ ULONG (__stdcall *Release)(ITfInputProcessorProfileActivationSink *);
+ HRESULT (__stdcall *OnActivated)(ITfInputProcessorProfileActivationSink *, DWORD, LANGID, REFCLSID, REFGUID, REFGUID, HKL, DWORD);
} ITfInputProcessorProfileActivationSinkVtbl;
@@ -227,11 +227,11 @@
typedef struct ITfSourceVtbl
{
- HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfSource *, REFIID, void **);
- ULONG (STDMETHODCALLTYPE *AddRef)(ITfSource *);
- ULONG (STDMETHODCALLTYPE *Release)(ITfSource *);
- HRESULT (STDMETHODCALLTYPE *AdviseSink)(ITfSource *, REFIID, IUnknown *, DWORD *);
- HRESULT (STDMETHODCALLTYPE *UnadviseSink)(ITfSource *, DWORD);
+ HRESULT (__stdcall *QueryInterface)(ITfSource *, REFIID, void **);
+ ULONG (__stdcall *AddRef)(ITfSource *);
+ ULONG (__stdcall *Release)(ITfSource *);
+ HRESULT (__stdcall *AdviseSink)(ITfSource *, REFIID, IUnknown *, DWORD *);
+ HRESULT (__stdcall *UnadviseSink)(ITfSource *, DWORD);
} ITfSourceVtbl;
struct ITfSource
|
