[PATCH 06/24] dlls/msctf: enable compilation with long types

Eric Pouech eric.pouech at gmail.com
Tue Feb 15 00:29:05 CST 2022


Signed-off-by: Eric Pouech <eric.pouech at gmail.com>

---
 dlls/msctf/Makefile.in      |    1 -
 dlls/msctf/categorymgr.c    |    4 ++--
 dlls/msctf/compartmentmgr.c |    6 +++---
 dlls/msctf/context.c        |   30 +++++++++++++++---------------
 dlls/msctf/documentmgr.c    |    6 +++---
 dlls/msctf/inputprocessor.c |   24 ++++++++++++------------
 dlls/msctf/msctf.c          |    4 ++--
 dlls/msctf/range.c          |    4 ++--
 dlls/msctf/threadmgr.c      |   16 ++++++++--------
 9 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in
index 0726f92e60f..3e04f7b6cbf 100644
--- a/dlls/msctf/Makefile.in
+++ b/dlls/msctf/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = msctf.dll
 IMPORTS   = uuid ole32 oleaut32 user32 advapi32
 
diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c
index f0ff896b3dd..c64738455fb 100644
--- a/dlls/msctf/categorymgr.c
+++ b/dlls/msctf/categorymgr.c
@@ -352,7 +352,7 @@ static HRESULT WINAPI CategoryMgr_GetGUID ( ITfCategoryMgr *iface,
 {
     CategoryMgr *This = impl_from_ITfCategoryMgr(iface);
 
-    TRACE("(%p) %i\n",This,guidatom);
+    TRACE("(%p) %li\n",This,guidatom);
 
     if (!pguid)
         return E_INVALIDARG;
@@ -370,7 +370,7 @@ static HRESULT WINAPI CategoryMgr_IsEqualTfGuidAtom ( ITfCategoryMgr *iface,
 {
     CategoryMgr *This = impl_from_ITfCategoryMgr(iface);
 
-    TRACE("(%p) %i %s %p\n",This,guidatom,debugstr_guid(rguid),pfEqual);
+    TRACE("(%p) %li %s %p\n",This,guidatom,debugstr_guid(rguid),pfEqual);
 
     if (!pfEqual)
         return E_INVALIDARG;
diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c
index 4cc25f3f9ab..831770b87b0 100644
--- a/dlls/msctf/compartmentmgr.c
+++ b/dlls/msctf/compartmentmgr.c
@@ -211,7 +211,7 @@ static HRESULT WINAPI CompartmentMgr_ClearCompartment(ITfCompartmentMgr *iface,
     CompartmentMgr *This = impl_from_ITfCompartmentMgr(iface);
     struct list *cursor;
 
-    TRACE("(%p) %i %s\n",This,tid,debugstr_guid(rguid));
+    TRACE("(%p) %li %s\n",This,tid,debugstr_guid(rguid));
 
     LIST_FOR_EACH(cursor, &This->values)
     {
@@ -487,7 +487,7 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface,
     ITfCompartmentEventSink *sink;
     struct list *cursor;
 
-    TRACE("(%p) %i %p\n",This,tid,pvarValue);
+    TRACE("(%p) %li %p\n",This,tid,pvarValue);
 
     if (!pvarValue)
         return E_INVALIDARG;
@@ -585,7 +585,7 @@ static HRESULT WINAPI CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdw
 {
     Compartment *This = impl_from_ITfSource(iface);
 
-    TRACE("(%p) %x\n",This,pdwCookie);
+    TRACE("(%p) %lx\n",This,pdwCookie);
 
     if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_COMPARTMENTSINK)
         return E_INVALIDARG;
diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c
index e901cbcbee4..782e8518883 100644
--- a/dlls/msctf/context.c
+++ b/dlls/msctf/context.c
@@ -210,7 +210,7 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface,
     HRESULT hr;
     DWORD  dwLockFlags = 0x0;
 
-    TRACE("(%p) %i %p %x %p\n",This, tid, pes, dwFlags, phrSession);
+    TRACE("(%p) %li %p %lx %p\n",This, tid, pes, dwFlags, phrSession);
 
     if (!(dwFlags & TF_ES_READ) && !(dwFlags & TF_ES_READWRITE))
     {
@@ -327,7 +327,7 @@ static HRESULT WINAPI Context_SetSelection (ITfContext *iface,
     ULONG i;
     HRESULT hr;
 
-    TRACE("(%p) %i %i %p\n",This,ec,ulCount,pSelection);
+    TRACE("(%p) %li %li %p\n",This,ec,ulCount,pSelection);
 
     if (!This->pITextStoreACP)
     {
@@ -362,7 +362,7 @@ static HRESULT WINAPI Context_GetStart (ITfContext *iface,
 {
     Context *This = impl_from_ITfContext(iface);
 
-    TRACE("(%p) %i %p\n",This,ec,ppStart);
+    TRACE("(%p) %li %p\n",This,ec,ppStart);
 
     if (!ppStart)
         return E_INVALIDARG;
@@ -383,7 +383,7 @@ static HRESULT WINAPI Context_GetEnd (ITfContext *iface,
 {
     Context *This = impl_from_ITfContext(iface);
     LONG end;
-    TRACE("(%p) %i %p\n",This,ec,ppEnd);
+    TRACE("(%p) %li %p\n",This,ec,ppEnd);
 
     if (!ppEnd)
         return E_INVALIDARG;
@@ -571,7 +571,7 @@ static HRESULT WINAPI ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCook
 {
     Context *This = impl_from_ITfSource(iface);
 
-    TRACE("(%p) %x\n",This,pdwCookie);
+    TRACE("(%p) %lx\n",This,pdwCookie);
 
     if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_CONTEXTSINK)
         return E_INVALIDARG;
@@ -614,7 +614,7 @@ static HRESULT WINAPI ContextOwnerCompositionServices_StartComposition(ITfContex
         TfEditCookie ecWrite, ITfRange *pCompositionRange, ITfCompositionSink *pSink, ITfComposition **ppComposition)
 {
     Context *This = impl_from_ITfContextOwnerCompositionServices(iface);
-    FIXME("STUB:(%p) %#x %p %p %p\n", This, ecWrite, pCompositionRange, pSink, ppComposition);
+    FIXME("STUB:(%p) %#lx %p %p %p\n", This, ecWrite, pCompositionRange, pSink, ppComposition);
     return E_NOTIMPL;
 }
 
@@ -630,7 +630,7 @@ static HRESULT WINAPI ContextOwnerCompositionServices_FindComposition(ITfContext
         TfEditCookie ecRead, ITfRange *pTestRange, IEnumITfCompositionView **ppEnum)
 {
     Context *This = impl_from_ITfContextOwnerCompositionServices(iface);
-    FIXME("STUB:(%p) %#x %p %p\n", This, ecRead, pTestRange, ppEnum);
+    FIXME("STUB:(%p) %#lx %p %p\n", This, ecRead, pTestRange, ppEnum);
     return E_NOTIMPL;
 }
 
@@ -638,7 +638,7 @@ static HRESULT WINAPI ContextOwnerCompositionServices_TakeOwnership(ITfContextOw
         TfEditCookie ecWrite, ITfCompositionView *pComposition, ITfCompositionSink *pSink, ITfComposition **ppComposition)
 {
     Context *This = impl_from_ITfContextOwnerCompositionServices(iface);
-    FIXME("STUB:(%p) %#x %p %p %p\n", This, ecWrite, pComposition, pSink, ppComposition);
+    FIXME("STUB:(%p) %#lx %p %p %p\n", This, ecWrite, pComposition, pSink, ppComposition);
     return E_NOTIMPL;
 }
 
@@ -693,7 +693,7 @@ static HRESULT WINAPI InsertAtSelection_InsertTextAtSelection(
     TS_TEXTCHANGE change;
     HRESULT hr;
 
-    TRACE("(%p) %i %x %s %p\n",This, ec, dwFlags, debugstr_wn(pchText,cch), ppRange);
+    TRACE("(%p) %li %lx %s %p\n",This, ec, dwFlags, debugstr_wn(pchText,cch), ppRange);
 
     if (!This->connected)
         return TF_E_DISCONNECTED;
@@ -762,7 +762,7 @@ static HRESULT WINAPI SourceSingle_AdviseSingleSink( ITfSourceSingle *iface,
     TfClientId tid, REFIID riid, IUnknown *punk)
 {
     Context *This = impl_from_ITfSourceSingle(iface);
-    FIXME("STUB:(%p) %i %s %p\n",This, tid, debugstr_guid(riid),punk);
+    FIXME("STUB:(%p) %li %s %p\n",This, tid, debugstr_guid(riid),punk);
     return E_NOTIMPL;
 }
 
@@ -770,7 +770,7 @@ static HRESULT WINAPI SourceSingle_UnadviseSingleSink( ITfSourceSingle *iface,
     TfClientId tid, REFIID riid)
 {
     Context *This = impl_from_ITfSourceSingle(iface);
-    FIXME("STUB:(%p) %i %s\n",This, tid, debugstr_guid(riid));
+    FIXME("STUB:(%p) %li %s\n",This, tid, debugstr_guid(riid));
     return E_NOTIMPL;
 }
 
@@ -855,7 +855,7 @@ static HRESULT WINAPI TextStoreACPSink_OnStatusChange(ITextStoreACPSink *iface,
     Context *This = impl_from_ITextStoreACPSink(iface);
     HRESULT hr, hrSession;
 
-    TRACE("(%p) %x\n",This, dwFlags);
+    TRACE("(%p) %lx\n",This, dwFlags);
 
     if (!This->pITextStoreACP)
     {
@@ -888,7 +888,7 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface,
     TfEditCookie ec;
     struct list *cursor;
 
-    TRACE("(%p) %x\n",This, dwLockFlags);
+    TRACE("(%p) %lx\n",This, dwLockFlags);
 
     if (!This->currentEditSession)
     {
@@ -1022,7 +1022,7 @@ static HRESULT WINAPI TextStoreACPServices_CreateRange(ITextStoreACPServices *if
 {
     Context *This = impl_from_ITextStoreACPServices(iface);
 
-    TRACE("%p, %d, %d, %p.\n", This, start, end, range);
+    TRACE("%p, %ld, %ld, %p.\n", This, start, end, range);
 
     return Range_Constructor(&This->ITfContext_iface, start, end, (ITfRange **)range);
 }
@@ -1054,7 +1054,7 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr
         return E_OUTOFMEMORY;
     }
 
-    TRACE("(%p) %x %p %p %p\n",This, tidOwner, punk, ppOut, pecTextStore);
+    TRACE("(%p) %lx %p %p %p\n",This, tidOwner, punk, ppOut, pecTextStore);
 
     This->ITfContext_iface.lpVtbl= &ContextVtbl;
     This->ITfSource_iface.lpVtbl = &ContextSourceVtbl;
diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c
index 37d55557f55..f2d5e1eae33 100644
--- a/dlls/msctf/documentmgr.c
+++ b/dlls/msctf/documentmgr.c
@@ -153,7 +153,7 @@ static HRESULT WINAPI DocumentMgr_CreateContext(ITfDocumentMgr *iface,
         TfEditCookie *pecTextStore)
 {
     DocumentMgr *This = impl_from_ITfDocumentMgr(iface);
-    TRACE("(%p) 0x%x 0x%x %p %p %p\n",This,tidOwner,dwFlags,punk,ppic,pecTextStore);
+    TRACE("(%p) 0x%lx 0x%lx %p %p %p\n",This,tidOwner,dwFlags,punk,ppic,pecTextStore);
     return Context_Constructor(tidOwner, punk, iface, ppic, pecTextStore);
 }
 
@@ -185,7 +185,7 @@ static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic)
 static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags)
 {
     DocumentMgr *This = impl_from_ITfDocumentMgr(iface);
-    TRACE("(%p) 0x%x\n",This,dwFlags);
+    TRACE("(%p) 0x%lx\n",This,dwFlags);
 
     if (dwFlags == TF_POPF_ALL)
     {
@@ -334,7 +334,7 @@ static HRESULT WINAPI DocumentMgrSource_UnadviseSink(ITfSource *iface, DWORD pdw
 {
     DocumentMgr *This = impl_from_ITfSource(iface);
 
-    TRACE("(%p) %x\n",This,pdwCookie);
+    TRACE("(%p) %lx\n",This,pdwCookie);
 
     if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_DMSINK)
         return E_INVALIDARG;
diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c
index 5e687f5ccc9..0f11e02a968 100644
--- a/dlls/msctf/inputprocessor.c
+++ b/dlls/msctf/inputprocessor.c
@@ -122,7 +122,7 @@ static ULONG WINAPI EnumTfInputProcessorProfiles_AddRef(IEnumTfInputProcessorPro
     EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     return ref;
 }
@@ -132,7 +132,7 @@ static ULONG WINAPI EnumTfInputProcessorProfiles_Release(IEnumTfInputProcessorPr
     EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if(!ref)
         HeapFree(GetProcessHeap(), 0, This);
@@ -153,7 +153,7 @@ static HRESULT WINAPI EnumTfInputProcessorProfiles_Next(IEnumTfInputProcessorPro
 {
     EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface);
 
-    FIXME("(%p)->(%u %p %p)\n", This, count, profile, fetch);
+    FIXME("(%p)->(%lu %p %p)\n", This, count, profile, fetch);
 
     if(fetch)
         *fetch = 0;
@@ -170,7 +170,7 @@ static HRESULT WINAPI EnumTfInputProcessorProfiles_Reset(IEnumTfInputProcessorPr
 static HRESULT WINAPI EnumTfInputProcessorProfiles_Skip(IEnumTfInputProcessorProfiles *iface, ULONG count)
 {
     EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface);
-    FIXME("(%p)->(%u)\n", This, count);
+    FIXME("(%p)->(%lu)\n", This, count);
     return E_NOTIMPL;
 }
 
@@ -346,7 +346,7 @@ static HRESULT WINAPI InputProcessorProfiles_AddLanguageProfile(
     static const WCHAR icnf[] = {'I','c','o','n','F','i','l','e',0};
     static const WCHAR icni[] = {'I','c','o','n','I','n','d','e','x',0};
 
-    TRACE("(%p) %s %x %s %s %s %i\n",This,debugstr_guid(rclsid), langid,
+    TRACE("(%p) %s %x %s %s %s %li\n",This,debugstr_guid(rclsid), langid,
             debugstr_guid(guidProfile), debugstr_wn(pchDesc,cchDesc),
             debugstr_wn(pchIconFile,cchFile),uIconIndex);
 
@@ -794,7 +794,7 @@ static HRESULT WINAPI InputProcessorProfileMgr_ActivateProfile(ITfInputProcessor
         LANGID langid, REFCLSID clsid, REFGUID guidProfile, HKL hkl, DWORD dwFlags)
 {
     InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface);
-    FIXME("(%p)->(%d %x %s %s %p %x)\n", This, dwProfileType, langid, debugstr_guid(clsid),
+    FIXME("(%p)->(%ld %x %s %s %p %lx)\n", This, dwProfileType, langid, debugstr_guid(clsid),
           debugstr_guid(guidProfile), hkl, dwFlags);
     return E_NOTIMPL;
 }
@@ -803,7 +803,7 @@ static HRESULT WINAPI InputProcessorProfileMgr_DeactivateProfile(ITfInputProcess
         LANGID langid, REFCLSID clsid, REFGUID guidProfile, HKL hkl, DWORD dwFlags)
 {
     InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface);
-    FIXME("(%p)->(%d %x %s %s %p %x)\n", This, dwProfileType, langid, debugstr_guid(clsid),
+    FIXME("(%p)->(%ld %x %s %s %p %lx)\n", This, dwProfileType, langid, debugstr_guid(clsid),
           debugstr_guid(guidProfile), hkl, dwFlags);
     return E_NOTIMPL;
 }
@@ -812,7 +812,7 @@ static HRESULT WINAPI InputProcessorProfileMgr_GetProfile(ITfInputProcessorProfi
         LANGID langid, REFCLSID clsid, REFGUID guidProfile, HKL hkl, TF_INPUTPROCESSORPROFILE *pProfile)
 {
     InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface);
-    FIXME("(%p)->(%d %x %s %s %p %p)\n", This, dwProfileType, langid, debugstr_guid(clsid),
+    FIXME("(%p)->(%ld %x %s %s %p %p)\n", This, dwProfileType, langid, debugstr_guid(clsid),
           debugstr_guid(guidProfile), hkl, pProfile);
     return E_NOTIMPL;
 }
@@ -840,7 +840,7 @@ static HRESULT WINAPI InputProcessorProfileMgr_ReleaseInputProcessor(ITfInputPro
         DWORD dwFlags)
 {
     InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface);
-    FIXME("(%p)->(%s %x)\n", This, debugstr_guid(rclsid), dwFlags);
+    FIXME("(%p)->(%s %lx)\n", This, debugstr_guid(rclsid), dwFlags);
     return E_NOTIMPL;
 }
 
@@ -850,7 +850,7 @@ static HRESULT WINAPI InputProcessorProfileMgr_RegisterProfile(ITfInputProcessor
         DWORD dwFlags)
 {
     InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface);
-    FIXME("(%p)->(%s %x %s %s %d %s %u %u %p %x %x %x)\n", This, debugstr_guid(rclsid), langid, debugstr_guid(guidProfile),
+    FIXME("(%p)->(%s %x %s %s %ld %s %lu %lu %p %lx %x %lx)\n", This, debugstr_guid(rclsid), langid, debugstr_guid(guidProfile),
           debugstr_w(pchDesc), cchDesc, debugstr_w(pchIconFile), cchFile, uIconIndex, hklsubstitute, dwPreferredLayout,
           bEnabledByDefault, dwFlags);
     return E_NOTIMPL;
@@ -860,7 +860,7 @@ static HRESULT WINAPI InputProcessorProfileMgr_UnregisterProfile(ITfInputProcess
         LANGID langid, REFGUID guidProfile, DWORD dwFlags)
 {
     InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface);
-    FIXME("(%p)->(%s %x %s %x)\n", This, debugstr_guid(rclsid), langid, debugstr_guid(guidProfile), dwFlags);
+    FIXME("(%p)->(%s %x %s %lx)\n", This, debugstr_guid(rclsid), langid, debugstr_guid(guidProfile), dwFlags);
     return E_NOTIMPL;
 }
 
@@ -935,7 +935,7 @@ static HRESULT WINAPI IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie)
 {
     InputProcessorProfiles *This = impl_from_ITfSource(iface);
 
-    TRACE("(%p) %x\n",This,pdwCookie);
+    TRACE("(%p) %lx\n",This,pdwCookie);
 
     if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_IPPSINK)
         return E_INVALIDARG;
diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c
index 4ae9e16d453..0b1a3fbce15 100644
--- a/dlls/msctf/msctf.c
+++ b/dlls/msctf/msctf.c
@@ -296,7 +296,7 @@ HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUn
 
     list_add_head(sink_list, &sink->entry);
     *cookie = generate_Cookie(cookie_magic, sink);
-    TRACE("cookie %x\n", *cookie);
+    TRACE("cookie %lx\n", *cookie);
     return S_OK;
 }
 
@@ -551,7 +551,7 @@ HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink)
  */
 BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
 {
-    TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad);
+    TRACE("%p 0x%lx %p\n", hinst, fdwReason, fImpLoad);
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c
index 9690a0a15c4..43268d51a30 100644
--- a/dlls/msctf/range.c
+++ b/dlls/msctf/range.c
@@ -193,7 +193,7 @@ static HRESULT WINAPI Range_Collapse(ITfRangeACP *iface, TfEditCookie ec,
 {
     Range *range = impl_from_ITfRangeACP(iface);
 
-    TRACE("%p, %i, %i.\n", iface, ec, aPos);
+    TRACE("%p, %li, %i.\n", iface, ec, aPos);
 
     switch (aPos)
     {
@@ -289,7 +289,7 @@ static HRESULT WINAPI Range_GetExtent(ITfRangeACP *iface, LONG *anchor, LONG *co
 
 static HRESULT WINAPI Range_SetExtent(ITfRangeACP *iface, LONG anchor, LONG count)
 {
-    FIXME("%p, %d, %d.\n", iface, anchor, count);
+    FIXME("%p, %ld, %ld.\n", iface, anchor, count);
 
     return E_NOTIMPL;
 }
diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c
index 0e054d4e654..b3cd5fee981 100644
--- a/dlls/msctf/threadmgr.c
+++ b/dlls/msctf/threadmgr.c
@@ -531,13 +531,13 @@ static HRESULT WINAPI ThreadMgr_ActivateEx(ITfThreadMgrEx *iface, TfClientId *id
 {
     ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
 
-    TRACE("(%p) %p, %#x\n", This, id, flags);
+    TRACE("(%p) %p, %#lx\n", This, id, flags);
 
     if (!id)
         return E_INVALIDARG;
 
     if (flags)
-        FIXME("Unimplemented flags %#x\n", flags);
+        FIXME("Unimplemented flags %#lx\n", flags);
 
     if (!processId)
     {
@@ -658,7 +658,7 @@ static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCo
     ThreadMgr *This = impl_from_ITfSource(iface);
     DWORD magic;
 
-    TRACE("(%p) %x\n",This,pdwCookie);
+    TRACE("(%p) %lx\n",This,pdwCookie);
 
     magic = get_Cookie_magic(pdwCookie);
     if (magic != COOKIE_MAGIC_TMSINK && magic != COOKIE_MAGIC_THREADFOCUSSINK
@@ -708,7 +708,7 @@ static HRESULT WINAPI KeystrokeMgr_AdviseKeyEventSink(ITfKeystrokeMgr *iface,
     CLSID textservice;
     ITfKeyEventSink *check = NULL;
 
-    TRACE("(%p) %x %p %i\n",This,tid,pSink,fForeground);
+    TRACE("(%p) %lx %p %i\n",This,tid,pSink,fForeground);
 
     if (!tid || !pSink)
         return E_INVALIDARG;
@@ -747,7 +747,7 @@ static HRESULT WINAPI KeystrokeMgr_UnadviseKeyEventSink(ITfKeystrokeMgr *iface,
     ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
     CLSID textservice;
     ITfKeyEventSink *check = NULL;
-    TRACE("(%p) %x\n",This,tid);
+    TRACE("(%p) %lx\n",This,tid);
 
     if (!tid)
         return E_INVALIDARG;
@@ -863,7 +863,7 @@ static HRESULT WINAPI KeystrokeMgr_PreserveKey(ITfKeystrokeMgr *iface,
     struct list *cursor;
     PreservedKey *newkey;
 
-    TRACE("(%p) %x %s (%x,%x) %s\n",This,tid, debugstr_guid(rguid),(prekey)?prekey->uVKey:0,(prekey)?prekey->uModifiers:0,debugstr_wn(pchDesc,cchDesc));
+    TRACE("(%p) %lx %s (%x,%x) %s\n",This,tid, debugstr_guid(rguid),(prekey)?prekey->uVKey:0,(prekey)?prekey->uModifiers:0,debugstr_wn(pchDesc,cchDesc));
 
     if (!tid || ! rguid || !prekey || (cchDesc && !pchDesc))
         return E_INVALIDARG;
@@ -1318,7 +1318,7 @@ static HRESULT WINAPI ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *i
     TfClientId tid, REFIID riid, IUnknown *punk)
 {
     ThreadMgr *This = impl_from_ITfSourceSingle(iface);
-    FIXME("STUB:(%p) %i %s %p\n",This, tid, debugstr_guid(riid),punk);
+    FIXME("STUB:(%p) %li %s %p\n",This, tid, debugstr_guid(riid),punk);
     return E_NOTIMPL;
 }
 
@@ -1326,7 +1326,7 @@ static HRESULT WINAPI ThreadMgrSourceSingle_UnadviseSingleSink( ITfSourceSingle
     TfClientId tid, REFIID riid)
 {
     ThreadMgr *This = impl_from_ITfSourceSingle(iface);
-    FIXME("STUB:(%p) %i %s\n",This, tid, debugstr_guid(riid));
+    FIXME("STUB:(%p) %li %s\n",This, tid, debugstr_guid(riid));
     return E_NOTIMPL;
 }
 




More information about the wine-devel mailing list