Blame patches/sdl2-2.0.8.local.patch

213fe0
diff -ru SDL2-2.0.8.orig/src/video/windows/SDL_windowskeyboard.c SDL2-2.0.8/src/video/windows/SDL_windowskeyboard.c
213fe0
--- SDL2-2.0.8.orig/src/video/windows/SDL_windowskeyboard.c     2018-03-01 17:34:43.000000000 +0100
224402
+++ SDL2-2.0.8/src/video/windows/SDL_windowskeyboard.c  2020-10-05 20:39:13.169351110 +0200
224402
@@ -28,7 +28,10 @@
224402
 #include "../../events/scancodes_windows.h"
213fe0
224402
 #include <imm.h>
224402
-#include <oleauto.h>
224402
+
213fe0
+#ifndef CFS_FORCE_POSITION
213fe0
+#define CFS_FORCE_POSITION 0x0020
213fe0
+#endif
224402
213fe0
 #ifndef SDL_DISABLE_WINDOWS_IME
213fe0
 static void IME_Init(SDL_VideoData *videodata, HWND hwnd);
213fe0
diff -ru SDL2-2.0.8.orig/src/video/windows/SDL_msctf.h SDL2-2.0.8/src/video/windows/SDL_msctf.h
213fe0
--- SDL2-2.0.8.orig/src/video/windows/SDL_msctf.h       2018-03-01 17:34:43.000000000 +0100
213fe0
+++ SDL2-2.0.8/src/video/windows/SDL_msctf.h    2020-10-04 12:38:34.746446128 +0200
213fe0
@@ -22,7 +22,18 @@
213fe0
 #ifndef SDL_msctf_h_
213fe0
 #define SDL_msctf_h_
213fe0
213fe0
-#include <unknwn.h>
213fe0
+#include <windows.h>
213fe0
+#include <stdint.h>
213fe0
+typedef uint16_t* BSTR;
213fe0
+typedef DWORD HIMCC;
213fe0
+#define NEAR
213fe0
+#define FAR
213fe0
+typedef struct tagCANDIDATEFORM {
213fe0
+   DWORD dwIndex;
213fe0
+   DWORD dwStyle;
213fe0
+   POINT ptCurrentPos;
213fe0
+   RECT rcArea;
213fe0
+} CANDIDATEFORM,*PCANDIDATEFORM,*NPCANDIDATEFORM,*LPCANDIDATEFORM;
213fe0
213fe0
 #define     TF_INVALID_COOKIE               (0xffffffff)
213fe0
 #define     TF_IPSINK_FLAG_ACTIVE           0x0001
213fe0
@@ -53,20 +53,20 @@
213fe0
213fe0
 typedef struct ITfThreadMgrVtbl
Lucio Andrés Illanes Albornoz (arab, vxp) eda559
 {
213fe0
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfThreadMgr *, REFIID, void **);
213fe0
-    ULONG (STDMETHODCALLTYPE *AddRef)(ITfThreadMgr *);
213fe0
-    ULONG (STDMETHODCALLTYPE *Release)(ITfThreadMgr *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *Activate)(ITfThreadMgr *, TfClientId *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *Deactivate)(ITfThreadMgr *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *CreateDocumentMgr)(ITfThreadMgr *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *EnumDocumentMgrs)(ITfThreadMgr *, IEnumTfDocumentMgrs **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetFocus)(ITfThreadMgr *, ITfDocumentMgr **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *SetFocus)(ITfThreadMgr *, ITfDocumentMgr *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *AssociateFocus)(ITfThreadMgr *, HWND, ITfDocumentMgr *, ITfDocumentMgr **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *IsThreadFocus)(ITfThreadMgr *, BOOL *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetFunctionProvider)(ITfThreadMgr *, REFCLSID, ITfFunctionProvider **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *EnumFunctionProviders)(ITfThreadMgr *, IEnumTfFunctionProviders **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetGlobalCompartment)(ITfThreadMgr *, ITfCompartmentMgr **);
213fe0
+    HRESULT (__stdcall *QueryInterface)(ITfThreadMgr *, REFIID, void **);
213fe0
+    ULONG (__stdcall *AddRef)(ITfThreadMgr *);
213fe0
+    ULONG (__stdcall *Release)(ITfThreadMgr *);
213fe0
+    HRESULT (__stdcall *Activate)(ITfThreadMgr *, TfClientId *);
213fe0
+    HRESULT (__stdcall *Deactivate)(ITfThreadMgr *);
213fe0
+    HRESULT (__stdcall *CreateDocumentMgr)(ITfThreadMgr *);
213fe0
+    HRESULT (__stdcall *EnumDocumentMgrs)(ITfThreadMgr *, IEnumTfDocumentMgrs **);
213fe0
+    HRESULT (__stdcall *GetFocus)(ITfThreadMgr *, ITfDocumentMgr **);
213fe0
+    HRESULT (__stdcall *SetFocus)(ITfThreadMgr *, ITfDocumentMgr *);
213fe0
+    HRESULT (__stdcall *AssociateFocus)(ITfThreadMgr *, HWND, ITfDocumentMgr *, ITfDocumentMgr **);
213fe0
+    HRESULT (__stdcall *IsThreadFocus)(ITfThreadMgr *, BOOL *);
213fe0
+    HRESULT (__stdcall *GetFunctionProvider)(ITfThreadMgr *, REFCLSID, ITfFunctionProvider **);
213fe0
+    HRESULT (__stdcall *EnumFunctionProviders)(ITfThreadMgr *, IEnumTfFunctionProviders **);
213fe0
+    HRESULT (__stdcall *GetGlobalCompartment)(ITfThreadMgr *, ITfCompartmentMgr **);
213fe0
 } ITfThreadMgrVtbl;
213fe0
213fe0
 struct ITfThreadMgr
213fe0
@@ -76,22 +76,22 @@
213fe0
213fe0
 typedef struct ITfThreadMgrExVtbl
213fe0
 {
213fe0
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfThreadMgrEx *, REFIID, void **);
213fe0
-    ULONG (STDMETHODCALLTYPE *AddRef)(ITfThreadMgrEx *);
213fe0
-    ULONG (STDMETHODCALLTYPE *Release)(ITfThreadMgrEx *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *Activate)(ITfThreadMgrEx *, TfClientId *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *Deactivate)(ITfThreadMgrEx *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *CreateDocumentMgr)(ITfThreadMgrEx *, ITfDocumentMgr **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *EnumDocumentMgrs)(ITfThreadMgrEx *, IEnumTfDocumentMgrs **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetFocus)(ITfThreadMgrEx *, ITfDocumentMgr **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *SetFocus)(ITfThreadMgrEx *, ITfDocumentMgr *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *AssociateFocus)(ITfThreadMgrEx *, ITfDocumentMgr *, ITfDocumentMgr **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *IsThreadFocus)(ITfThreadMgrEx *, BOOL *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetFunctionProvider)(ITfThreadMgrEx *, REFCLSID, ITfFunctionProvider **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *EnumFunctionProviders)(ITfThreadMgrEx *, IEnumTfFunctionProviders **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetGlobalCompartment)(ITfThreadMgrEx *, ITfCompartmentMgr **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *ActivateEx)(ITfThreadMgrEx *, TfClientId *, DWORD);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetActiveFlags)(ITfThreadMgrEx *, DWORD *);
213fe0
+    HRESULT (__stdcall *QueryInterface)(ITfThreadMgrEx *, REFIID, void **);
213fe0
+    ULONG (__stdcall *AddRef)(ITfThreadMgrEx *);
213fe0
+    ULONG (__stdcall *Release)(ITfThreadMgrEx *);
213fe0
+    HRESULT (__stdcall *Activate)(ITfThreadMgrEx *, TfClientId *);
213fe0
+    HRESULT (__stdcall *Deactivate)(ITfThreadMgrEx *);
213fe0
+    HRESULT (__stdcall *CreateDocumentMgr)(ITfThreadMgrEx *, ITfDocumentMgr **);
213fe0
+    HRESULT (__stdcall *EnumDocumentMgrs)(ITfThreadMgrEx *, IEnumTfDocumentMgrs **);
213fe0
+    HRESULT (__stdcall *GetFocus)(ITfThreadMgrEx *, ITfDocumentMgr **);
213fe0
+    HRESULT (__stdcall *SetFocus)(ITfThreadMgrEx *, ITfDocumentMgr *);
213fe0
+    HRESULT (__stdcall *AssociateFocus)(ITfThreadMgrEx *, ITfDocumentMgr *, ITfDocumentMgr **);
213fe0
+    HRESULT (__stdcall *IsThreadFocus)(ITfThreadMgrEx *, BOOL *);
213fe0
+    HRESULT (__stdcall *GetFunctionProvider)(ITfThreadMgrEx *, REFCLSID, ITfFunctionProvider **);
213fe0
+    HRESULT (__stdcall *EnumFunctionProviders)(ITfThreadMgrEx *, IEnumTfFunctionProviders **);
213fe0
+    HRESULT (__stdcall *GetGlobalCompartment)(ITfThreadMgrEx *, ITfCompartmentMgr **);
213fe0
+    HRESULT (__stdcall *ActivateEx)(ITfThreadMgrEx *, TfClientId *, DWORD);
213fe0
+    HRESULT (__stdcall *GetActiveFlags)(ITfThreadMgrEx *, DWORD *);
213fe0
 } ITfThreadMgrExVtbl;
213fe0
213fe0
 struct ITfThreadMgrEx
213fe0
@@ -101,15 +101,15 @@
213fe0
213fe0
 typedef struct ITfDocumentMgrVtbl
213fe0
 {
213fe0
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfDocumentMgr *, REFIID, void **);
213fe0
-    ULONG (STDMETHODCALLTYPE *AddRef)(ITfDocumentMgr *);
213fe0
-    ULONG (STDMETHODCALLTYPE *Release)(ITfDocumentMgr *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *CreateContext)(ITfDocumentMgr *, TfClientId, DWORD, IUnknown *, ITfContext **, TfEditCookie *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *Push)(ITfDocumentMgr *, ITfContext *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *Pop)(ITfDocumentMgr *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetTop)(ITfDocumentMgr *, ITfContext **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetBase)(ITfDocumentMgr *, ITfContext **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *EnumContexts)(ITfDocumentMgr *, IEnumTfContexts **);
213fe0
+    HRESULT (__stdcall *QueryInterface)(ITfDocumentMgr *, REFIID, void **);
213fe0
+    ULONG (__stdcall *AddRef)(ITfDocumentMgr *);
213fe0
+    ULONG (__stdcall *Release)(ITfDocumentMgr *);
213fe0
+    HRESULT (__stdcall *CreateContext)(ITfDocumentMgr *, TfClientId, DWORD, IUnknown *, ITfContext **, TfEditCookie *);
213fe0
+    HRESULT (__stdcall *Push)(ITfDocumentMgr *, ITfContext *);
213fe0
+    HRESULT (__stdcall *Pop)(ITfDocumentMgr *);
213fe0
+    HRESULT (__stdcall *GetTop)(ITfDocumentMgr *, ITfContext **);
213fe0
+    HRESULT (__stdcall *GetBase)(ITfDocumentMgr *, ITfContext **);
213fe0
+    HRESULT (__stdcall *EnumContexts)(ITfDocumentMgr *, IEnumTfContexts **);
213fe0
 } ITfDocumentMgrVtbl;
213fe0
213fe0
 struct ITfDocumentMgr
213fe0
@@ -119,12 +119,12 @@
213fe0
213fe0
 typedef struct ITfUIElementSinkVtbl
213fe0
 {
213fe0
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfUIElementSink *, REFIID, void **);
213fe0
-    ULONG (STDMETHODCALLTYPE *AddRef)(ITfUIElementSink *);
213fe0
-    ULONG (STDMETHODCALLTYPE *Release)(ITfUIElementSink *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *BeginUIElement)(ITfUIElementSink *, DWORD, BOOL *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *UpdateUIElement)(ITfUIElementSink *, DWORD);
213fe0
-    HRESULT (STDMETHODCALLTYPE *EndUIElement)(ITfUIElementSink *, DWORD);
213fe0
+    HRESULT (__stdcall *QueryInterface)(ITfUIElementSink *, REFIID, void **);
213fe0
+    ULONG (__stdcall *AddRef)(ITfUIElementSink *);
213fe0
+    ULONG (__stdcall *Release)(ITfUIElementSink *);
213fe0
+    HRESULT (__stdcall *BeginUIElement)(ITfUIElementSink *, DWORD, BOOL *);
213fe0
+    HRESULT (__stdcall *UpdateUIElement)(ITfUIElementSink *, DWORD);
213fe0
+    HRESULT (__stdcall *EndUIElement)(ITfUIElementSink *, DWORD);
213fe0
 } ITfUIElementSinkVtbl;
213fe0
213fe0
 struct ITfUIElementSink
213fe0
@@ -134,14 +134,14 @@
213fe0
213fe0
 typedef struct ITfUIElementMgrVtbl
213fe0
 {
213fe0
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfUIElementMgr *, REFIID, void **);
213fe0
-    ULONG (STDMETHODCALLTYPE *AddRef)(ITfUIElementMgr *);
213fe0
-    ULONG (STDMETHODCALLTYPE *Release)(ITfUIElementMgr *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *BeginUIElement)(ITfUIElementMgr *, ITfUIElement *, BOOL *, DWORD *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *UpdateUIElement)(ITfUIElementMgr *, DWORD);
213fe0
-    HRESULT (STDMETHODCALLTYPE *EndUIElement)(ITfUIElementMgr *, DWORD);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetUIElement)(ITfUIElementMgr *, DWORD, ITfUIElement **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *EnumUIElements)(ITfUIElementMgr *, IEnumTfUIElements **);
213fe0
+    HRESULT (__stdcall *QueryInterface)(ITfUIElementMgr *, REFIID, void **);
213fe0
+    ULONG (__stdcall *AddRef)(ITfUIElementMgr *);
213fe0
+    ULONG (__stdcall *Release)(ITfUIElementMgr *);
213fe0
+    HRESULT (__stdcall *BeginUIElement)(ITfUIElementMgr *, ITfUIElement *, BOOL *, DWORD *);
213fe0
+    HRESULT (__stdcall *UpdateUIElement)(ITfUIElementMgr *, DWORD);
213fe0
+    HRESULT (__stdcall *EndUIElement)(ITfUIElementMgr *, DWORD);
213fe0
+    HRESULT (__stdcall *GetUIElement)(ITfUIElementMgr *, DWORD, ITfUIElement **);
213fe0
+    HRESULT (__stdcall *EnumUIElements)(ITfUIElementMgr *, IEnumTfUIElements **);
213fe0
 } ITfUIElementMgrVtbl;
213fe0
213fe0
 struct ITfUIElementMgr
213fe0
@@ -151,21 +151,21 @@
213fe0
213fe0
 typedef struct ITfCandidateListUIElementVtbl
213fe0
 {
213fe0
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfCandidateListUIElement *, REFIID, void **);
213fe0
-    ULONG (STDMETHODCALLTYPE *AddRef)(ITfCandidateListUIElement *);
213fe0
-    ULONG (STDMETHODCALLTYPE *Release)(ITfCandidateListUIElement *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetDescription)(ITfCandidateListUIElement *, BSTR *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetGUID)(ITfCandidateListUIElement *, GUID *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *Show)(ITfCandidateListUIElement *, BOOL);
213fe0
-    HRESULT (STDMETHODCALLTYPE *IsShown)(ITfCandidateListUIElement *, BOOL *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetUpdatedFlags)(ITfCandidateListUIElement *, DWORD *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetDocumentMgr)(ITfCandidateListUIElement *, ITfDocumentMgr **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetCount)(ITfCandidateListUIElement *, UINT *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetSelection)(ITfCandidateListUIElement *, UINT *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetString)(ITfCandidateListUIElement *, UINT, BSTR *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetPageIndex)(ITfCandidateListUIElement *, UINT *, UINT, UINT *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *SetPageIndex)(ITfCandidateListUIElement *, UINT *, UINT);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetCurrentPage)(ITfCandidateListUIElement *, UINT *);
213fe0
+    HRESULT (__stdcall *QueryInterface)(ITfCandidateListUIElement *, REFIID, void **);
213fe0
+    ULONG (__stdcall *AddRef)(ITfCandidateListUIElement *);
213fe0
+    ULONG (__stdcall *Release)(ITfCandidateListUIElement *);
213fe0
+    HRESULT (__stdcall *GetDescription)(ITfCandidateListUIElement *, BSTR *);
213fe0
+    HRESULT (__stdcall *GetGUID)(ITfCandidateListUIElement *, GUID *);
213fe0
+    HRESULT (__stdcall *Show)(ITfCandidateListUIElement *, BOOL);
213fe0
+    HRESULT (__stdcall *IsShown)(ITfCandidateListUIElement *, BOOL *);
213fe0
+    HRESULT (__stdcall *GetUpdatedFlags)(ITfCandidateListUIElement *, DWORD *);
213fe0
+    HRESULT (__stdcall *GetDocumentMgr)(ITfCandidateListUIElement *, ITfDocumentMgr **);
213fe0
+    HRESULT (__stdcall *GetCount)(ITfCandidateListUIElement *, UINT *);
213fe0
+    HRESULT (__stdcall *GetSelection)(ITfCandidateListUIElement *, UINT *);
213fe0
+    HRESULT (__stdcall *GetString)(ITfCandidateListUIElement *, UINT, BSTR *);
213fe0
+    HRESULT (__stdcall *GetPageIndex)(ITfCandidateListUIElement *, UINT *, UINT, UINT *);
213fe0
+    HRESULT (__stdcall *SetPageIndex)(ITfCandidateListUIElement *, UINT *, UINT);
213fe0
+    HRESULT (__stdcall *GetCurrentPage)(ITfCandidateListUIElement *, UINT *);
213fe0
 } ITfCandidateListUIElementVtbl;
213fe0
213fe0
 struct ITfCandidateListUIElement
213fe0
@@ -175,19 +175,19 @@
213fe0
213fe0
 typedef struct ITfReadingInformationUIElementVtbl
213fe0
 {
213fe0
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfReadingInformationUIElement *, REFIID, void **);
213fe0
-    ULONG (STDMETHODCALLTYPE *AddRef)(ITfReadingInformationUIElement *);
213fe0
-    ULONG (STDMETHODCALLTYPE *Release)(ITfReadingInformationUIElement *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetDescription)(ITfReadingInformationUIElement *, BSTR *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetGUID)(ITfReadingInformationUIElement *, GUID *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *Show)(ITfReadingInformationUIElement *, BOOL);
213fe0
-    HRESULT (STDMETHODCALLTYPE *IsShown)(ITfReadingInformationUIElement *, BOOL *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetUpdatedFlags)(ITfReadingInformationUIElement *, DWORD *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetContext)(ITfReadingInformationUIElement *, ITfContext **);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetString)(ITfReadingInformationUIElement *, BSTR *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetMaxReadingStringLength)(ITfReadingInformationUIElement *, UINT *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetErrorIndex)(ITfReadingInformationUIElement *, UINT *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *IsVerticalOrderPreferred)(ITfReadingInformationUIElement *, BOOL *);
213fe0
+    HRESULT (__stdcall *QueryInterface)(ITfReadingInformationUIElement *, REFIID, void **);
213fe0
+    ULONG (__stdcall *AddRef)(ITfReadingInformationUIElement *);
213fe0
+    ULONG (__stdcall *Release)(ITfReadingInformationUIElement *);
213fe0
+    HRESULT (__stdcall *GetDescription)(ITfReadingInformationUIElement *, BSTR *);
213fe0
+    HRESULT (__stdcall *GetGUID)(ITfReadingInformationUIElement *, GUID *);
213fe0
+    HRESULT (__stdcall *Show)(ITfReadingInformationUIElement *, BOOL);
213fe0
+    HRESULT (__stdcall *IsShown)(ITfReadingInformationUIElement *, BOOL *);
213fe0
+    HRESULT (__stdcall *GetUpdatedFlags)(ITfReadingInformationUIElement *, DWORD *);
213fe0
+    HRESULT (__stdcall *GetContext)(ITfReadingInformationUIElement *, ITfContext **);
213fe0
+    HRESULT (__stdcall *GetString)(ITfReadingInformationUIElement *, BSTR *);
213fe0
+    HRESULT (__stdcall *GetMaxReadingStringLength)(ITfReadingInformationUIElement *, UINT *);
213fe0
+    HRESULT (__stdcall *GetErrorIndex)(ITfReadingInformationUIElement *, UINT *);
213fe0
+    HRESULT (__stdcall *IsVerticalOrderPreferred)(ITfReadingInformationUIElement *, BOOL *);
213fe0
 } ITfReadingInformationUIElementVtbl;
213fe0
213fe0
 struct ITfReadingInformationUIElement
213fe0
@@ -197,13 +197,13 @@
213fe0
213fe0
 typedef struct ITfUIElementVtbl
213fe0
 {
213fe0
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfUIElement *, REFIID, void **);
213fe0
-    ULONG (STDMETHODCALLTYPE *AddRef)(ITfUIElement *);
213fe0
-    ULONG (STDMETHODCALLTYPE *Release)(ITfUIElement *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetDescription)(ITfUIElement *, BSTR *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *GetGUID)(ITfUIElement *, GUID *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *Show)(ITfUIElement *, BOOL);
213fe0
-    HRESULT (STDMETHODCALLTYPE *IsShown)(ITfUIElement *, BOOL *);
213fe0
+    HRESULT (__stdcall *QueryInterface)(ITfUIElement *, REFIID, void **);
213fe0
+    ULONG (__stdcall *AddRef)(ITfUIElement *);
213fe0
+    ULONG (__stdcall *Release)(ITfUIElement *);
213fe0
+    HRESULT (__stdcall *GetDescription)(ITfUIElement *, BSTR *);
213fe0
+    HRESULT (__stdcall *GetGUID)(ITfUIElement *, GUID *);
213fe0
+    HRESULT (__stdcall *Show)(ITfUIElement *, BOOL);
213fe0
+    HRESULT (__stdcall *IsShown)(ITfUIElement *, BOOL *);
213fe0
 } ITfUIElementVtbl;
213fe0
213fe0
 struct ITfUIElement
213fe0
@@ -213,10 +213,10 @@
213fe0
213fe0
 typedef struct ITfInputProcessorProfileActivationSinkVtbl
213fe0
 {
213fe0
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfInputProcessorProfileActivationSink *, REFIID, void **);
213fe0
-    ULONG (STDMETHODCALLTYPE *AddRef)(ITfInputProcessorProfileActivationSink *);
213fe0
-    ULONG (STDMETHODCALLTYPE *Release)(ITfInputProcessorProfileActivationSink *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *OnActivated)(ITfInputProcessorProfileActivationSink *, DWORD, LANGID, REFCLSID, REFGUID, REFGUID, HKL, DWORD);
213fe0
+    HRESULT (__stdcall *QueryInterface)(ITfInputProcessorProfileActivationSink *, REFIID, void **);
213fe0
+    ULONG (__stdcall *AddRef)(ITfInputProcessorProfileActivationSink *);
213fe0
+    ULONG (__stdcall *Release)(ITfInputProcessorProfileActivationSink *);
213fe0
+    HRESULT (__stdcall *OnActivated)(ITfInputProcessorProfileActivationSink *, DWORD, LANGID, REFCLSID, REFGUID, REFGUID, HKL, DWORD);
213fe0
213fe0
 } ITfInputProcessorProfileActivationSinkVtbl;
213fe0
213fe0
@@ -227,11 +227,11 @@
213fe0
213fe0
 typedef struct ITfSourceVtbl
213fe0
 {
213fe0
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfSource *, REFIID, void **);
213fe0
-    ULONG (STDMETHODCALLTYPE *AddRef)(ITfSource *);
213fe0
-    ULONG (STDMETHODCALLTYPE *Release)(ITfSource *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *AdviseSink)(ITfSource *, REFIID, IUnknown *, DWORD *);
213fe0
-    HRESULT (STDMETHODCALLTYPE *UnadviseSink)(ITfSource *, DWORD);
213fe0
+    HRESULT (__stdcall *QueryInterface)(ITfSource *, REFIID, void **);
213fe0
+    ULONG (__stdcall *AddRef)(ITfSource *);
213fe0
+    ULONG (__stdcall *Release)(ITfSource *);
213fe0
+    HRESULT (__stdcall *AdviseSink)(ITfSource *, REFIID, IUnknown *, DWORD *);
213fe0
+    HRESULT (__stdcall *UnadviseSink)(ITfSource *, DWORD);
213fe0
 } ITfSourceVtbl;
213fe0
213fe0
 struct ITfSource