ole32: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Sun Oct 15 05:28:08 CDT 2006
This needs to be applied after the GUID patch.
bye
michael
---
dlls/ole32/Makefile.in | 2 +
dlls/ole32/antimoniker.c | 4 +-
dlls/ole32/bindctx.c | 8 ++---
dlls/ole32/classmoniker.c | 4 +-
dlls/ole32/clipboard.c | 18 +++++-----
dlls/ole32/compobj.c | 48 ++++++++++++++-------------
dlls/ole32/compositemoniker.c | 24 +++++++-------
dlls/ole32/datacache.c | 10 +++---
dlls/ole32/dcom.idl | 4 +-
dlls/ole32/defaulthandler.c | 28 ++++++++--------
dlls/ole32/enumx.c | 4 +-
dlls/ole32/errorinfo.c | 12 +++----
dlls/ole32/filemoniker.c | 4 +-
dlls/ole32/ftmarshal.c | 10 +++---
dlls/ole32/git.c | 6 ++-
dlls/ole32/hglobalstream.c | 12 +++----
dlls/ole32/ifs.c | 18 +++++-----
dlls/ole32/itemmoniker.c | 4 +-
dlls/ole32/marshal.c | 72 +++++++++++++++++++++--------------------
dlls/ole32/memlockbytes.c | 8 ++---
dlls/ole32/memlockbytes16.c | 6 ++-
dlls/ole32/moniker.c | 20 ++++++-----
dlls/ole32/ole16.c | 22 ++++++-------
dlls/ole32/ole2.c | 32 +++++++++---------
dlls/ole32/ole2_16.c | 2 +
dlls/ole32/ole2stubs.c | 4 +-
dlls/ole32/oleobj.c | 22 ++++++-------
dlls/ole32/oleproxy.c | 30 +++++++++--------
dlls/ole32/rpc.c | 28 ++++++++--------
dlls/ole32/stg_bigblockfile.c | 14 ++++----
dlls/ole32/stg_prop.c | 70 ++++++++++++++++++++--------------------
dlls/ole32/stg_stream.c | 18 +++++-----
dlls/ole32/storage.c | 62 ++++++++++++++++++-----------------
dlls/ole32/storage32.c | 58 +++++++++++++++++----------------
dlls/ole32/stubmanager.c | 14 ++++----
35 files changed, 351 insertions(+), 351 deletions(-)
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index bebb53a..511ee49 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT
+EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c
index 53a39f5..829fc4f 100644
--- a/dlls/ole32/antimoniker.c
+++ b/dlls/ole32/antimoniker.c
@@ -258,7 +258,7 @@ static HRESULT WINAPI
AntiMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar,
IMoniker** ppmkToLeft, IMoniker** ppmkReduced)
{
- TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+ TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (ppmkReduced==NULL)
return E_POINTER;
@@ -540,7 +540,7 @@ AntiMonikerROTDataImpl_GetComparisonData
{
DWORD constant = 1;
- TRACE("(%p, %lu, %p)\n", pbData, cbMax, pcbData);
+ TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData);
*pcbData = sizeof(CLSID) + sizeof(DWORD);
if (cbMax < *pcbData)
diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c
index d83ffab..2dae2c4 100644
--- a/dlls/ole32/bindctx.c
+++ b/dlls/ole32/bindctx.c
@@ -170,7 +170,7 @@ BindCtxImpl_RegisterObjectBound(IBindCtx
if (lastIndex == This->bindCtxTableSize){ /* the table is full so it must be resized */
if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)){
- FIXME("This->bindCtxTableSize: %ld is out of data limite\n", This->bindCtxTableSize);
+ FIXME("This->bindCtxTableSize: %d is out of data limite\n", This->bindCtxTableSize);
return E_FAIL;
}
@@ -351,7 +351,7 @@ BindCtxImpl_RegisterObjectParam(IBindCtx
This->bindCtxTableSize+=BLOCK_TAB_SIZE; /* new table size */
if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE))
{
- FIXME("This->bindCtxTableSize: %ld is out of data limite\n", This->bindCtxTableSize);
+ FIXME("This->bindCtxTableSize: %d is out of data limite\n", This->bindCtxTableSize);
return E_FAIL;
}
This->bindCtxTable = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,This->bindCtxTable,
@@ -534,7 +534,7 @@ HRESULT WINAPI CreateBindCtx(DWORD reser
HRESULT hr;
IID riid=IID_IBindCtx;
- TRACE("(%ld,%p)\n",reserved,ppbc);
+ TRACE("(%d,%p)\n",reserved,ppbc);
newBindCtx = HeapAlloc(GetProcessHeap(), 0, sizeof(BindCtxImpl));
if (newBindCtx == 0)
@@ -557,7 +557,7 @@ HRESULT WINAPI BindMoniker(LPMONIKER pmk
HRESULT res;
IBindCtx * pbc;
- TRACE("(%p, %lx, %s, %p)\n", pmk, grfOpt, debugstr_guid(riid), ppvResult);
+ TRACE("(%p, %x, %s, %p)\n", pmk, grfOpt, debugstr_guid(riid), ppvResult);
res = CreateBindCtx(grfOpt, &pbc);
if (SUCCEEDED(res))
diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c
index e543a96..8bfafe8 100644
--- a/dlls/ole32/classmoniker.c
+++ b/dlls/ole32/classmoniker.c
@@ -289,7 +289,7 @@ static HRESULT WINAPI ClassMoniker_Reduc
IMoniker** ppmkToLeft,
IMoniker** ppmkReduced)
{
- TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+ TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (!ppmkReduced)
return E_POINTER;
@@ -637,7 +637,7 @@ static HRESULT WINAPI ClassMonikerROTDat
{
ClassMoniker *This = (ClassMoniker *)impl_from_IROTData(iface);
- TRACE("(%p, %lu, %p)\n", pbData, cbMax, pcbData);
+ TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData);
*pcbData = 2*sizeof(CLSID);
if (cbMax < *pcbData)
diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c
index 621bbe5..73627b3 100644
--- a/dlls/ole32/clipboard.c
+++ b/dlls/ole32/clipboard.c
@@ -78,7 +78,7 @@ #include "olestd.h"
#include "storage32.h"
-#define HANDLE_ERROR(err) { hr = err; TRACE("(HRESULT=%lx)\n", (HRESULT)err); goto CLEANUP; }
+#define HANDLE_ERROR(err) { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; }
WINE_DEFAULT_DEBUG_CHANNEL(ole);
@@ -930,7 +930,7 @@ static HRESULT OLEClipbrd_RenderFormat(I
if (FAILED(hr = IDataObject_GetDataHere(theOleClipboard->pIDataObjectSrc, pFormatetc, &std)))
{
- WARN("() : IDataObject_GetDataHere failed to render clipboard data! (%lx)\n", hr);
+ WARN("() : IDataObject_GetDataHere failed to render clipboard data! (%x)\n", hr);
GlobalFree(hStorage);
return hr;
}
@@ -1012,7 +1012,7 @@ static HRESULT OLEClipbrd_RenderFormat(I
{
if (FAILED(hr = IDataObject_GetData(pIDataObject, pFormatetc, &std)))
{
- WARN("() : IDataObject_GetData failed to render clipboard data! (%lx)\n", hr);
+ WARN("() : IDataObject_GetData failed to render clipboard data! (%x)\n", hr);
GlobalFree(hStorage);
return hr;
}
@@ -1154,7 +1154,7 @@ static ULONG WINAPI OLEClipbrd_IDataObje
*/
OLEClipbrd *This = (OLEClipbrd *)iface;
- TRACE("(%p)->(count=%lu)\n",This, This->ref);
+ TRACE("(%p)->(count=%u)\n",This, This->ref);
return InterlockedIncrement(&This->ref);
@@ -1174,7 +1174,7 @@ static ULONG WINAPI OLEClipbrd_IDataObje
OLEClipbrd *This = (OLEClipbrd *)iface;
ULONG ref;
- TRACE("(%p)->(count=%lu)\n",This, This->ref);
+ TRACE("(%p)->(count=%u)\n",This, This->ref);
/*
* Decrease the reference count on this object.
@@ -1406,7 +1406,7 @@ static HRESULT WINAPI OLEClipbrd_IDataOb
*/
OLEClipbrd *This = (OLEClipbrd *)iface;
- TRACE("(%p, %lx, %p)\n", iface, dwDirection, ppenumFormatEtc);
+ TRACE("(%p, %x, %p)\n", iface, dwDirection, ppenumFormatEtc);
/*
* If we have a data source placed on the clipboard (via OleSetClipboard)
@@ -1637,7 +1637,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFO
static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface)
{
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
- TRACE("(%p)->(count=%lu)\n",This, This->ref);
+ TRACE("(%p)->(count=%u)\n",This, This->ref);
if (This->pUnkDataObj)
IUnknown_AddRef(This->pUnkDataObj);
@@ -1656,7 +1656,7 @@ static ULONG WINAPI OLEClipbrd_IEnumFORM
LPMALLOC pIMalloc;
ULONG ref;
- TRACE("(%p)->(count=%lu)\n",This, This->ref);
+ TRACE("(%p)->(count=%u)\n",This, This->ref);
if (This->pUnkDataObj)
IUnknown_Release(This->pUnkDataObj); /* Release parent data object */
@@ -1723,7 +1723,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFO
static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULONG celt)
{
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
- TRACE("(%p)->(num=%lu)\n", This, celt);
+ TRACE("(%p)->(num=%u)\n", This, celt);
This->posFmt += celt;
if (This->posFmt > This->countFmt)
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index cd3a5c3..75172e7 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -223,7 +223,7 @@ static APARTMENT *apartment_construct(DW
{
APARTMENT *apt;
- TRACE("creating new apartment, model=%ld\n", model);
+ TRACE("creating new apartment, model=%d\n", model);
apt = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*apt));
apt->tid = GetCurrentThreadId();
@@ -314,7 +314,7 @@ static inline BOOL apartment_is_model(AP
DWORD apartment_addref(struct apartment *apt)
{
DWORD refs = InterlockedIncrement(&apt->refs);
- TRACE("%s: before = %ld\n", wine_dbgstr_longlong(apt->oxid), refs - 1);
+ TRACE("%s: before = %d\n", wine_dbgstr_longlong(apt->oxid), refs - 1);
return refs;
}
@@ -325,7 +325,7 @@ DWORD apartment_release(struct apartment
EnterCriticalSection(&csApartment);
ret = InterlockedDecrement(&apt->refs);
- TRACE("%s: after = %ld\n", wine_dbgstr_longlong(apt->oxid), ret);
+ TRACE("%s: after = %d\n", wine_dbgstr_longlong(apt->oxid), ret);
/* destruction stuff that needs to happen under csApartment CS */
if (ret == 0)
{
@@ -521,7 +521,7 @@ HRESULT apartment_createwindowifneeded(s
0, 0, OLE32_hInstance, NULL);
if (!hwnd)
{
- ERR("CreateWindow failed with error %ld\n", GetLastError());
+ ERR("CreateWindow failed with error %d\n", GetLastError());
return HRESULT_FROM_WIN32(GetLastError());
}
if (InterlockedCompareExchangePointer((PVOID *)&apt->win, hwnd, NULL))
@@ -860,7 +860,7 @@ HRESULT WINAPI CoDisconnectObject( LPUNK
IMarshal *marshal;
APARTMENT *apt;
- TRACE("(%p, 0x%08lx)\n", lpUnk, reserved);
+ TRACE("(%p, 0x%08x)\n", lpUnk, reserved);
hr = IUnknown_QueryInterface(lpUnk, &IID_IMarshal, (void **)&marshal);
if (hr == S_OK)
@@ -1011,7 +1011,7 @@ HRESULT WINE_StringFromCLSID(
return E_FAIL;
}
- sprintf(idstr, "{%08lX-%04X-%04X-%02X%02X-",
+ sprintf(idstr, "{%08X-%04X-%04X-%02X%02X-",
id->Data1, id->Data2, id->Data3,
id->Data4[0], id->Data4[1]);
s = &idstr[25];
@@ -1536,7 +1536,7 @@ HRESULT WINAPI CoRegisterClassObject(
LPUNKNOWN foundObject;
HRESULT hr;
- TRACE("(%s,%p,0x%08lx,0x%08lx,%p)\n",
+ TRACE("(%s,%p,0x%08x,0x%08x,%p)\n",
debugstr_guid(rclsid),pUnk,dwClsContext,flags,lpdwRegister);
if ( (lpdwRegister==0) || (pUnk==0) )
@@ -1606,7 +1606,7 @@ HRESULT WINAPI CoRegisterClassObject(
hr = CreateStreamOnHGlobal(0, TRUE, &newClass->pMarshaledData);
if (hr) {
- FIXME("Failed to create stream on hglobal, %lx\n", hr);
+ FIXME("Failed to create stream on hglobal, %x\n", hr);
IUnknown_Release(classfac);
return hr;
}
@@ -1614,7 +1614,7 @@ HRESULT WINAPI CoRegisterClassObject(
(LPVOID)classfac, MSHCTX_LOCAL, NULL,
MSHLFLAGS_TABLESTRONG);
if (hr) {
- FIXME("CoMarshalInterface failed, %lx!\n",hr);
+ FIXME("CoMarshalInterface failed, %x!\n",hr);
IUnknown_Release(classfac);
return hr;
}
@@ -1648,7 +1648,7 @@ HRESULT WINAPI CoRevokeClassObject(
RegisteredClass** prevClassLink;
RegisteredClass* curClass;
- TRACE("(%08lx)\n",dwRegister);
+ TRACE("(%08x)\n",dwRegister);
EnterCriticalSection( &csRegisteredClassList );
@@ -1861,7 +1861,7 @@ static HRESULT get_inproc_class_object(H
hr = DllGetClassObject(rclsid, riid, ppv);
if (hr != S_OK)
- ERR("DllGetClassObject returned error 0x%08lx\n", hr);
+ ERR("DllGetClassObject returned error 0x%08x\n", hr);
return hr;
}
@@ -1991,7 +1991,7 @@ HRESULT WINAPI CoGetClassObject(
}
if (FAILED(hres))
- ERR("no class object %s could be created for context 0x%lx\n",
+ ERR("no class object %s could be created for context 0x%x\n",
debugstr_guid(rclsid), dwClsContext);
return hres;
}
@@ -2118,7 +2118,7 @@ HRESULT WINAPI CoCreateInstance(
HRESULT hres;
LPCLASSFACTORY lpclf = 0;
- TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08lx, riid=%s, ppv=%p)\n", debugstr_guid(rclsid),
+ TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid),
pUnkOuter, dwClsContext, debugstr_guid(iid), ppv);
/*
@@ -2170,7 +2170,7 @@ HRESULT WINAPI CoCreateInstance(
hres = IClassFactory_CreateInstance(lpclf, pUnkOuter, iid, ppv);
IClassFactory_Release(lpclf);
if(FAILED(hres))
- FIXME("no instance created for interface %s of class %s, hres is 0x%08lx\n",
+ FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n",
debugstr_guid(iid), debugstr_guid(rclsid),hres);
return hres;
@@ -2442,7 +2442,7 @@ HRESULT WINAPI CoLockObjectExternal(
*/
HRESULT WINAPI CoInitializeWOW(DWORD x,DWORD y)
{
- FIXME("(0x%08lx,0x%08lx),stub!\n",x,y);
+ FIXME("(0x%08x,0x%08x),stub!\n",x,y);
return 0;
}
@@ -2613,7 +2613,7 @@ HRESULT WINAPI CoGetTreatAsClass(REFCLSI
}
res = CLSIDFromString(szClsidNew,clsidNew);
if (FAILED(res))
- ERR("Failed CLSIDFromStringA(%s), hres 0x%08lx\n", debugstr_w(szClsidNew), res);
+ ERR("Failed CLSIDFromStringA(%s), hres 0x%08x\n", debugstr_w(szClsidNew), res);
done:
if (hkey) RegCloseKey(hkey);
return res;
@@ -2744,7 +2744,7 @@ HRESULT WINAPI CoInitializeSecurity(PSEC
DWORD dwImpLevel, void* pReserved2,
DWORD dwCapabilities, void* pReserved3)
{
- FIXME("(%p,%ld,%p,%p,%ld,%ld,%p,%ld,%p) - stub!\n", pSecDesc, cAuthSvc,
+ FIXME("(%p,%d,%p,%p,%d,%d,%p,%d,%p) - stub!\n", pSecDesc, cAuthSvc,
asAuthSvc, pReserved1, dwAuthnLevel, dwImpLevel, pReserved2,
dwCapabilities, pReserved3);
return S_OK;
@@ -2866,7 +2866,7 @@ HRESULT WINAPI CoQueryProxyBlanket(IUnkn
IClientSecurity_Release(pCliSec);
}
- if (FAILED(hr)) ERR("-- failed with 0x%08lx\n", hr);
+ if (FAILED(hr)) ERR("-- failed with 0x%08x\n", hr);
return hr;
}
@@ -2911,7 +2911,7 @@ HRESULT WINAPI CoSetProxyBlanket(IUnknow
IClientSecurity_Release(pCliSec);
}
- if (FAILED(hr)) ERR("-- failed with 0x%08lx\n", hr);
+ if (FAILED(hr)) ERR("-- failed with 0x%08x\n", hr);
return hr;
}
@@ -2945,7 +2945,7 @@ HRESULT WINAPI CoCopyProxy(IUnknown *pPr
IClientSecurity_Release(pCliSec);
}
- if (FAILED(hr)) ERR("-- failed with 0x%08lx\n", hr);
+ if (FAILED(hr)) ERR("-- failed with 0x%08x\n", hr);
return hr;
}
@@ -3134,7 +3134,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(
APARTMENT *apt = COM_CurrentApt();
BOOL message_loop = apt && !apt->multi_threaded;
- TRACE("(0x%08lx, 0x%08lx, %ld, %p, %p)\n", dwFlags, dwTimeout, cHandles,
+ TRACE("(0x%08x, 0x%08x, %d, %p, %p)\n", dwFlags, dwTimeout, cHandles,
pHandles, lpdwindex);
while (TRUE)
@@ -3207,12 +3207,12 @@ HRESULT WINAPI CoWaitForMultipleHandles(
}
else
{
- ERR("Unexpected wait termination: %ld, %ld\n", res, GetLastError());
+ ERR("Unexpected wait termination: %d, %d\n", res, GetLastError());
hr = E_UNEXPECTED;
break;
}
}
- TRACE("-- 0x%08lx\n", hr);
+ TRACE("-- 0x%08x\n", hr);
return hr;
}
@@ -3273,7 +3273,7 @@ HRESULT WINAPI CoGetObject(LPCWSTR pszNa
*/
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
{
- TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
+ TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad);
switch(fdwReason) {
case DLL_PROCESS_ATTACH:
diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index 4a65277..6438e54 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -238,7 +238,7 @@ CompositeMonikerImpl_Load(IMoniker* ifac
res=OleLoadFromStream(pStm,&IID_IMoniker,(void**)&This->tabMoniker[This->tabLastIndex]);
if (FAILED(res))
{
- ERR("couldn't load moniker from stream, res = 0x%08lx\n", res);
+ ERR("couldn't load moniker from stream, res = 0x%08x\n", res);
break;
}
@@ -449,7 +449,7 @@ CompositeMonikerImpl_Reduce(IMoniker* if
IMoniker *tempMk,*antiMk,*mostRigthMk,*leftReducedComposedMk,*mostRigthReducedMk;
IEnumMoniker *enumMoniker;
- TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+ TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (ppmkReduced==NULL)
return E_POINTER;
@@ -1250,7 +1250,7 @@ CompositeMonikerROTDataImpl_GetCompariso
IMoniker *pmk;
HRESULT hr;
- TRACE("(%p, %lu, %p)\n", pbData, cbMax, pcbData);
+ TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData);
*pcbData = sizeof(CLSID);
@@ -1275,7 +1275,7 @@ CompositeMonikerROTDataImpl_GetCompariso
hr = S_OK;
}
else
- ERR("IROTData_GetComparisonData failed with error 0x%08lx\n", hr);
+ ERR("IROTData_GetComparisonData failed with error 0x%08x\n", hr);
}
IMoniker_Release(pmk);
@@ -1313,7 +1313,7 @@ CompositeMonikerROTDataImpl_GetCompariso
cbMax -= cbData;
}
else
- ERR("IROTData_GetComparisonData failed with error 0x%08lx\n", hr);
+ ERR("IROTData_GetComparisonData failed with error 0x%08x\n", hr);
}
IMoniker_Release(pmk);
@@ -1363,7 +1363,7 @@ static HRESULT WINAPI CompositeMonikerMa
{
IMoniker *This = impl_from_IMarshal(iface);
- TRACE("(%s, %p, %lx, %p, %lx, %p)\n", debugstr_guid(riid), pv,
+ TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags, pCid);
return IMoniker_GetClassID(This, pCid);
@@ -1379,7 +1379,7 @@ static HRESULT WINAPI CompositeMonikerMa
HRESULT hr;
ULARGE_INTEGER size;
- TRACE("(%s, %p, %lx, %p, %lx, %p)\n", debugstr_guid(riid), pv,
+ TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags, pSize);
*pSize = 0x10; /* to match native */
@@ -1421,7 +1421,7 @@ static HRESULT WINAPI CompositeMonikerMa
HRESULT hr;
ULONG i = 0;
- TRACE("(%p, %s, %p, %lx, %p, %lx)\n", pStm, debugstr_guid(riid), pv,
+ TRACE("(%p, %s, %p, %x, %p, %x)\n", pStm, debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags);
hr = IMoniker_Enum(This, TRUE, &pEnumMk);
@@ -1442,7 +1442,7 @@ static HRESULT WINAPI CompositeMonikerMa
}
if (i != 2)
- FIXME("moniker count of %ld not supported\n", i);
+ FIXME("moniker count of %d not supported\n", i);
IEnumMoniker_Release(pEnumMk);
@@ -1471,14 +1471,14 @@ static HRESULT WINAPI CompositeMonikerMa
hr = CoUnmarshalInterface(pStm, &IID_IMoniker, (void**)&This->tabMoniker[This->tabLastIndex]);
if (FAILED(hr))
{
- ERR("couldn't unmarshal moniker, hr = 0x%08lx\n", hr);
+ ERR("couldn't unmarshal moniker, hr = 0x%08x\n", hr);
return hr;
}
This->tabLastIndex++;
hr = CoUnmarshalInterface(pStm, &IID_IMoniker, (void**)&This->tabMoniker[This->tabLastIndex]);
if (FAILED(hr))
{
- ERR("couldn't unmarshal moniker, hr = 0x%08lx\n", hr);
+ ERR("couldn't unmarshal moniker, hr = 0x%08x\n", hr);
return hr;
}
This->tabLastIndex++;
@@ -1496,7 +1496,7 @@ static HRESULT WINAPI CompositeMonikerMa
static HRESULT WINAPI CompositeMonikerMarshalImpl_DisconnectObject(LPMARSHAL iface, DWORD dwReserved)
{
- TRACE("(0x%lx)\n", dwReserved);
+ TRACE("(0x%x)\n", dwReserved);
/* can't disconnect a state-based marshal as nothing on server side to
* disconnect from */
return S_OK;
diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
index 2225c20..378b86e 100644
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -269,7 +269,7 @@ static void DataCache_FireOnViewChange(
DWORD aspect,
LONG lindex)
{
- TRACE("(%p, %lx, %ld)\n", this, aspect, lindex);
+ TRACE("(%p, %x, %d)\n", this, aspect, lindex);
/*
* The sink supplies a filter when it registers
@@ -1183,7 +1183,7 @@ static HRESULT WINAPI DataCache_Draw(
DataCache *this = impl_from_IViewObject2(iface);
- TRACE("(%p, %lx, %ld, %p, %p, %p, %p, %p, %p, %lx)\n",
+ TRACE("(%p, %x, %d, %p, %p, %p, %p, %p, %p, %lx)\n",
iface,
dwDrawAspect,
lindex,
@@ -1322,7 +1322,7 @@ static HRESULT WINAPI DataCache_SetAdvis
{
DataCache *this = impl_from_IViewObject2(iface);
- TRACE("(%p, %lx, %lx, %p)\n", iface, aspects, advf, pAdvSink);
+ TRACE("(%p, %x, %x, %p)\n", iface, aspects, advf, pAdvSink);
/*
* A call to this function removes the previous sink
@@ -1419,7 +1419,7 @@ static HRESULT WINAPI DataCache_GetExten
DataCache *this = impl_from_IViewObject2(iface);
- TRACE("(%p, %lx, %ld, %p, %p)\n",
+ TRACE("(%p, %x, %d, %p, %p)\n",
iface, dwDrawAspect, lindex, ptd, lpsizel);
/*
@@ -1438,7 +1438,7 @@ static HRESULT WINAPI DataCache_GetExten
* This flag should be set to -1.
*/
if (lindex!=-1)
- FIXME("Unimplemented flag lindex = %ld\n", lindex);
+ FIXME("Unimplemented flag lindex = %d\n", lindex);
/*
* Right now, we support only the callback from
diff --git a/dlls/ole32/dcom.idl b/dlls/ole32/dcom.idl
index 0e53069..3d6b271 100644
--- a/dlls/ole32/dcom.idl
+++ b/dlls/ole32/dcom.idl
@@ -148,7 +148,7 @@ interface ObjectRpcBaseTypes
[case(OBJREF_CUSTOM)] struct OR_CUSTOM {
CLSID clsid;
unsigned long cbExtension;
- unsigned long size;
+ ULONG size;
[size_is(size), ref] byte *pData;
} u_custom;
} u_objref;
@@ -184,7 +184,7 @@ interface IRemUnknown : IUnknown
HRESULT RemQueryInterface(
[in] REFIPID ripid,
- [in] unsigned long cRefs,
+ [in] ULONG cRefs,
[in] unsigned short cIids,
[in, size_is(cIids)] IID *iids,
[out, size_is(,cIids)] REMQIRESULT **ppQIResults);
diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c
index a1af68e..9486813 100644
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -447,7 +447,7 @@ static HRESULT WINAPI DefaultHandler_Clo
DefaultHandler *This = impl_from_IOleObject(iface);
HRESULT hr;
- TRACE("(%ld)\n", dwSaveOption);
+ TRACE("(%d)\n", dwSaveOption);
if (!This->pOleDelegate)
return S_OK;
@@ -473,7 +473,7 @@ static HRESULT WINAPI DefaultHandler_Set
{
DefaultHandler *This = impl_from_IOleObject(iface);
- TRACE("(%p, %ld, %p)\n",
+ TRACE("(%p, %d, %p)\n",
iface,
dwWhichMoniker,
pmk);
@@ -499,7 +499,7 @@ static HRESULT WINAPI DefaultHandler_Get
{
DefaultHandler *This = impl_from_IOleObject(iface);
- TRACE("(%p, %ld, %ld, %p)\n",
+ TRACE("(%p, %d, %d, %p)\n",
iface, dwAssign, dwWhichMoniker, ppmk);
if (This->pOleDelegate)
@@ -534,7 +534,7 @@ static HRESULT WINAPI DefaultHandler_Ini
{
DefaultHandler *This = impl_from_IOleObject(iface);
- TRACE("(%p, %p, %d, %ld)\n",
+ TRACE("(%p, %p, %d, %d)\n",
iface, pDataObject, fCreation, dwReserved);
if (This->pOleDelegate)
@@ -557,7 +557,7 @@ static HRESULT WINAPI DefaultHandler_Get
{
DefaultHandler *This = impl_from_IOleObject(iface);
- TRACE("(%p, %ld, %p)\n",
+ TRACE("(%p, %d, %p)\n",
iface, dwReserved, ppDataObject);
if (This->pOleDelegate)
@@ -580,7 +580,7 @@ static HRESULT WINAPI DefaultHandler_DoV
IRunnableObject *pRunnableObj = (IRunnableObject *)&This->lpvtblIRunnableObject;
HRESULT hr;
- TRACE("(%ld, %p, %p, %ld, %p, %s)\n", iVerb, lpmsg, pActiveSite, lindex, hwndParent, wine_dbgstr_rect(lprcPosRect));
+ TRACE("(%d, %p, %p, %d, %p, %s)\n", iVerb, lpmsg, pActiveSite, lindex, hwndParent, wine_dbgstr_rect(lprcPosRect));
hr = IRunnableObject_Run(pRunnableObj, NULL);
if (FAILED(hr)) return hr;
@@ -679,7 +679,7 @@ static HRESULT WINAPI DefaultHandler_Get
{
DefaultHandler *This = impl_from_IOleObject(iface);
- TRACE("(%p, %ld, %p)\n", iface, dwFormOfType, pszUserType);
+ TRACE("(%p, %d, %p)\n", iface, dwFormOfType, pszUserType);
return OleRegGetUserType(&This->clsid, dwFormOfType, pszUserType);
}
@@ -698,7 +698,7 @@ static HRESULT WINAPI DefaultHandler_Set
{
DefaultHandler *This = impl_from_IOleObject(iface);
- TRACE("(%p, %lx, (%ld x %ld))\n", iface,
+ TRACE("(%p, %x, (%d x %d))\n", iface,
dwDrawAspect, psizel->cx, psizel->cy);
if (This->pOleDelegate)
@@ -726,7 +726,7 @@ static HRESULT WINAPI DefaultHandler_Get
DefaultHandler *This = impl_from_IOleObject(iface);
- TRACE("(%p, %lx, %p)\n", iface, dwDrawAspect, psizel);
+ TRACE("(%p, %x, %p)\n", iface, dwDrawAspect, psizel);
if (This->pOleDelegate)
return IOleObject_GetExtent(This->pOleDelegate, dwDrawAspect, psizel);
@@ -803,7 +803,7 @@ static HRESULT WINAPI DefaultHandler_Una
{
DefaultHandler *This = impl_from_IOleObject(iface);
- TRACE("(%p, %ld)\n", iface, dwConnection);
+ TRACE("(%p, %d)\n", iface, dwConnection);
/*
* If we don't have an advise holder yet, it means we don't have
@@ -860,7 +860,7 @@ static HRESULT WINAPI DefaultHandler_Get
HRESULT hres;
DefaultHandler *This = impl_from_IOleObject(iface);
- TRACE("(%p, %lx, %p)\n", iface, dwAspect, pdwStatus);
+ TRACE("(%p, %x, %p)\n", iface, dwAspect, pdwStatus);
if (This->pOleDelegate)
return IOleObject_GetMiscStatus(This->pOleDelegate, dwAspect, pdwStatus);
@@ -1099,7 +1099,7 @@ static HRESULT WINAPI DefaultHandler_Enu
HRESULT hres;
DefaultHandler *This = impl_from_IDataObject(iface);
- TRACE("(%p, %lx, %p)\n", iface, dwDirection, ppenumFormatEtc);
+ TRACE("(%p, %x, %p)\n", iface, dwDirection, ppenumFormatEtc);
hres = OleRegEnumFormatEtc(&This->clsid, dwDirection, ppenumFormatEtc);
@@ -1124,7 +1124,7 @@ static HRESULT WINAPI DefaultHandler_DAd
HRESULT hres = S_OK;
DefaultHandler *This = impl_from_IDataObject(iface);
- TRACE("(%p, %p, %ld, %p, %p)\n",
+ TRACE("(%p, %p, %d, %p, %p)\n",
iface, pformatetc, advf, pAdvSink, pdwConnection);
/* Make sure we have a data advise holder before we start. */
@@ -1160,7 +1160,7 @@ static HRESULT WINAPI DefaultHandler_DUn
{
DefaultHandler *This = impl_from_IDataObject(iface);
- TRACE("(%p, %ld)\n", iface, dwConnection);
+ TRACE("(%p, %d)\n", iface, dwConnection);
/*
* If we don't have a data advise holder yet, it means that
diff --git a/dlls/ole32/enumx.c b/dlls/ole32/enumx.c
index c928e4e..232abec 100644
--- a/dlls/ole32/enumx.c
+++ b/dlls/ole32/enumx.c
@@ -102,7 +102,7 @@ HRESULT WINAPI enumx_Next(enumx_impl *Th
unsigned char *p;
ULONG count = 0;
- TRACE("%p %lu %p\n", This, celt, pceltFetched);
+ TRACE("%p %u %p\n", This, celt, pceltFetched);
if (This->current == NULL)
This->current = list_head(&This->elements);
@@ -128,7 +128,7 @@ HRESULT WINAPI enumx_Skip(enumx_impl *Th
{
ULONG count = 0;
- TRACE("%p %lu\n", This, celt);
+ TRACE("%p %u\n", This, celt);
if (This->current == NULL)
This->current = list_head(&This->elements);
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index b7ce50a..dbbe2fd 100644
--- a/dlls/ole32/errorinfo.c
+++ b/dlls/ole32/errorinfo.c
@@ -222,7 +222,7 @@ static ULONG WINAPI IErrorInfoImpl_AddRe
IErrorInfo* iface)
{
ErrorInfoImpl *This = impl_from_IErrorInfo(iface);
- TRACE("(%p)->(count=%lu)\n",This,This->ref);
+ TRACE("(%p)->(count=%u)\n",This,This->ref);
return InterlockedIncrement(&This->ref);
}
@@ -232,7 +232,7 @@ static ULONG WINAPI IErrorInfoImpl_Relea
ErrorInfoImpl *This = impl_from_IErrorInfo(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(count=%lu)\n",This,ref+1);
+ TRACE("(%p)->(count=%u)\n",This,ref+1);
if (!ref)
{
@@ -248,7 +248,7 @@ static HRESULT WINAPI IErrorInfoImpl_Get
GUID * pGUID)
{
ErrorInfoImpl *This = impl_from_IErrorInfo(iface);
- TRACE("(%p)->(count=%lu)\n",This,This->ref);
+ TRACE("(%p)->(count=%u)\n",This,This->ref);
if(!pGUID )return E_INVALIDARG;
memcpy(pGUID, &This->m_Guid, sizeof(GUID));
return S_OK;
@@ -401,7 +401,7 @@ static HRESULT WINAPI ICreateErrorInfoIm
DWORD dwHelpContext)
{
ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface);
- TRACE("(%p,%ld)\n",This,dwHelpContext);
+ TRACE("(%p,%d)\n",This,dwHelpContext);
This->m_dwHelpContext = dwHelpContext;
return S_OK;
}
@@ -486,7 +486,7 @@ HRESULT WINAPI CreateErrorInfo(ICreateEr
*/
HRESULT WINAPI GetErrorInfo(ULONG dwReserved, IErrorInfo **pperrinfo)
{
- TRACE("(%ld, %p, %p)\n", dwReserved, pperrinfo, COM_CurrentInfo()->errorinfo);
+ TRACE("(%d, %p, %p)\n", dwReserved, pperrinfo, COM_CurrentInfo()->errorinfo);
if(!pperrinfo) return E_INVALIDARG;
@@ -510,7 +510,7 @@ HRESULT WINAPI SetErrorInfo(ULONG dwRese
{
IErrorInfo * pei;
- TRACE("(%ld, %p)\n", dwReserved, perrinfo);
+ TRACE("(%d, %p)\n", dwReserved, perrinfo);
/* release old errorinfo */
pei = COM_CurrentInfo()->errorinfo;
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index e9fb050..562c92f 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -639,7 +639,7 @@ static HRESULT WINAPI
FileMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar,
IMoniker** ppmkToLeft, IMoniker** ppmkReduced)
{
- TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+ TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (ppmkReduced==NULL)
return E_POINTER;
@@ -1245,7 +1245,7 @@ FileMonikerROTDataImpl_GetComparisonData
int i;
LPWSTR pszFileName;
- TRACE("(%p, %lu, %p)\n", pbData, cbMax, pcbData);
+ TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData);
*pcbData = sizeof(CLSID) + len * sizeof(WCHAR);
if (cbMax < *pcbData)
diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c
index 6f80091..9f6ad8c 100644
--- a/dlls/ole32/ftmarshal.c
+++ b/dlls/ole32/ftmarshal.c
@@ -138,7 +138,7 @@ static HRESULT WINAPI
FTMarshalImpl_GetUnmarshalClass (LPMARSHAL iface, REFIID riid, void *pv, DWORD dwDestContext,
void *pvDestContext, DWORD mshlflags, CLSID * pCid)
{
- TRACE("(%s, %p, 0x%lx, %p, 0x%lx, %p)\n", debugstr_guid(riid), pv,
+ TRACE("(%s, %p, 0x%x, %p, 0x%x, %p)\n", debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags, pCid);
if (dwDestContext == MSHCTX_INPROC || dwDestContext == MSHCTX_CROSSCTX)
memcpy(pCid, &CLSID_InProcFreeMarshaler, sizeof(CLSID_InProcFreeMarshaler));
@@ -155,7 +155,7 @@ FTMarshalImpl_GetMarshalSizeMax (LPMARSH
IMarshal *pMarshal = NULL;
HRESULT hres;
- TRACE("(%s, %p, 0x%lx, %p, 0x%lx, %p)\n", debugstr_guid(riid), pv,
+ TRACE("(%s, %p, 0x%x, %p, 0x%x, %p)\n", debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags, pSize);
/* if the marshalling happens inside the same process the interface pointer is
@@ -180,7 +180,7 @@ FTMarshalImpl_MarshalInterface (LPMARSHA
IMarshal *pMarshal = NULL;
HRESULT hres;
- TRACE("(%p, %s, %p, 0x%lx, %p, 0x%lx)\n", pStm, debugstr_guid(riid), pv,
+ TRACE("(%p, %s, %p, 0x%x, %p, 0x%x)\n", pStm, debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags);
/* if the marshalling happens inside the same process the interface pointer is
@@ -240,7 +240,7 @@ FTMarshalImpl_UnmarshalInterface (LPMARS
hres = IStream_Read (pStm, &constant, sizeof (constant), NULL);
if (hres != S_OK) return STG_E_READFAULT;
if (constant != 0)
- FIXME("constant is 0x%lx instead of 0\n", constant);
+ FIXME("constant is 0x%x instead of 0\n", constant);
hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL);
if (hres != S_OK) return STG_E_READFAULT;
@@ -270,7 +270,7 @@ static HRESULT WINAPI FTMarshalImpl_Rele
hres = IStream_Read (pStm, &constant, sizeof (constant), NULL);
if (hres != S_OK) return STG_E_READFAULT;
if (constant != 0)
- FIXME("constant is 0x%lx instead of 0\n", constant);
+ FIXME("constant is 0x%x instead of 0\n", constant);
hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL);
if (hres != S_OK) return STG_E_READFAULT;
diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c
index c750287..fbfa95f 100644
--- a/dlls/ole32/git.c
+++ b/dlls/ole32/git.c
@@ -235,7 +235,7 @@ StdGlobalInterfaceTable_RegisterInterfac
LeaveCriticalSection(&git_section);
- TRACE("Cookie is 0x%lx\n", entry->cookie);
+ TRACE("Cookie is 0x%x\n", entry->cookie);
return S_OK;
}
@@ -259,7 +259,7 @@ StdGlobalInterfaceTable_RevokeInterfaceF
hr = CoReleaseMarshalData(entry->stream);
if (hr != S_OK)
{
- WARN("Failed to release marshal data, hr = 0x%08lx\n", hr);
+ WARN("Failed to release marshal data, hr = 0x%08x\n", hr);
return hr;
}
IStream_Release(entry->stream);
@@ -286,7 +286,7 @@ StdGlobalInterfaceTable_GetInterfaceFrom
LARGE_INTEGER move;
LPUNKNOWN lpUnk;
- TRACE("dwCookie=0x%lx, riid=%s, ppv=%p\n", dwCookie, debugstr_guid(riid), ppv);
+ TRACE("dwCookie=0x%x, riid=%s, ppv=%p\n", dwCookie, debugstr_guid(riid), ppv);
entry = StdGlobalInterfaceTable_FindEntry(iface, dwCookie);
if (entry == NULL) return E_INVALIDARG;
diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c
index e24fd9d..52ef589 100644
--- a/dlls/ole32/hglobalstream.c
+++ b/dlls/ole32/hglobalstream.c
@@ -216,7 +216,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_
ULONG bytesReadBuffer;
ULONG bytesToReadFromBuffer;
- TRACE("(%p, %p, %ld, %p)\n", iface,
+ TRACE("(%p, %p, %d, %p)\n", iface,
pv, cb, pcbRead);
/*
@@ -284,7 +284,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_
ULARGE_INTEGER newSize;
ULONG bytesWritten = 0;
- TRACE("(%p, %p, %ld, %p)\n", iface, pv, cb, pcbWritten);
+ TRACE("(%p, %p, %d, %p)\n", iface, pv, cb, pcbWritten);
/*
* If the caller is not interested in the number of bytes written,
@@ -308,7 +308,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_
HRESULT hr = IStream_SetSize(iface, newSize);
if (FAILED(hr))
{
- ERR("IStream_SetSize failed with error 0x%08lx\n", hr);
+ ERR("IStream_SetSize failed with error 0x%08x\n", hr);
return hr;
}
}
@@ -357,7 +357,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_
ULARGE_INTEGER newPosition;
- TRACE("(%p, %lx%08lx, %ld, %p)\n", iface, dlibMove.u.HighPart,
+ TRACE("(%p, %x%08x, %d, %p)\n", iface, dlibMove.u.HighPart,
dlibMove.u.LowPart, dwOrigin, plibNewPosition);
/*
@@ -411,7 +411,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_
HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
HGLOBAL supportHandle;
- TRACE("(%p, %ld)\n", iface, libNewSize.u.LowPart);
+ TRACE("(%p, %d)\n", iface, libNewSize.u.LowPart);
/*
* HighPart is ignored as shown in tests
@@ -454,7 +454,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_
ULARGE_INTEGER totalBytesRead;
ULARGE_INTEGER totalBytesWritten;
- TRACE("(%p, %p, %ld, %p, %p)\n", iface, pstm,
+ TRACE("(%p, %p, %d, %p, %p)\n", iface, pstm,
cb.u.LowPart, pcbRead, pcbWritten);
/*
diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c
index 519828e..37ef44e 100644
--- a/dlls/ole32/ifs.c
+++ b/dlls/ole32/ifs.c
@@ -166,7 +166,7 @@ static LPVOID WINAPI IMalloc_fnAlloc(LPM
LPVOID addr;
- TRACE("(%ld)\n",cb);
+ TRACE("(%d)\n",cb);
if(Malloc32.pSpy) {
DWORD preAllocResult;
@@ -200,7 +200,7 @@ static LPVOID WINAPI IMalloc_fnRealloc(L
LPVOID pNewMemory;
- TRACE("(%p,%ld)\n",pv,cb);
+ TRACE("(%p,%d)\n",pv,cb);
if(Malloc32.pSpy) {
LPVOID pRealMemory;
@@ -396,7 +396,7 @@ static ULONG WINAPI IMallocSpy_fnAddRef
_MallocSpy *This = (_MallocSpy *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE ("(%p)->(count=%lu)\n", This, ref - 1);
+ TRACE ("(%p)->(count=%u)\n", This, ref - 1);
return ref;
}
@@ -413,7 +413,7 @@ static ULONG WINAPI IMallocSpy_fnRelease
_MallocSpy *This = (_MallocSpy *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE ("(%p)->(count=%lu)\n", This, ref + 1);
+ TRACE ("(%p)->(count=%u)\n", This, ref + 1);
if (!ref) {
/* our allocation list MUST be empty here */
@@ -424,7 +424,7 @@ static ULONG WINAPI IMallocSpy_fnRelease
static ULONG WINAPI IMallocSpy_fnPreAlloc(LPMALLOCSPY iface, ULONG cbRequest)
{
_MallocSpy *This = (_MallocSpy *)iface;
- TRACE ("(%p)->(%lu)\n", This, cbRequest);
+ TRACE ("(%p)->(%u)\n", This, cbRequest);
return cbRequest;
}
static PVOID WINAPI IMallocSpy_fnPostAlloc(LPMALLOCSPY iface, void* pActual)
@@ -449,7 +449,7 @@ static void WINAPI IMallocSpy_fnPostFre
static ULONG WINAPI IMallocSpy_fnPreRealloc(LPMALLOCSPY iface, void* pRequest, ULONG cbRequest, void** ppNewRequest, BOOL fSpyed)
{
_MallocSpy *This = (_MallocSpy *)iface;
- TRACE ("(%p)->(%p %lu %u)\n", This, pRequest, cbRequest, fSpyed);
+ TRACE ("(%p)->(%p %u %u)\n", This, pRequest, cbRequest, fSpyed);
*ppNewRequest = pRequest;
return cbRequest;
}
@@ -471,7 +471,7 @@ static PVOID WINAPI IMallocSpy_fnPreGetS
static ULONG WINAPI IMallocSpy_fnPostGetSize(LPMALLOCSPY iface, ULONG cbActual, BOOL fSpyed)
{
_MallocSpy *This = (_MallocSpy *)iface;
- TRACE ("(%p)->(%lu %u)\n", This, cbActual, fSpyed);
+ TRACE ("(%p)->(%u %u)\n", This, cbActual, fSpyed);
return cbActual;
}
@@ -502,7 +502,7 @@ static void WINAPI IMallocSpy_fnPostHeap
}
static void MallocSpyDumpLeaks(void) {
- TRACE("leaks: %lu\n", Malloc32.SpyedAllocationsLeft);
+ TRACE("leaks: %u\n", Malloc32.SpyedAllocationsLeft);
}
static const IMallocSpyVtbl VT_IMallocSpy =
@@ -665,7 +665,7 @@ HRESULT WINAPI CoRevokeMallocSpy(void)
}
if (Malloc32.SpyedAllocationsLeft) {
- TRACE("SpyReleasePending with %lu allocations left\n", Malloc32.SpyedAllocationsLeft);
+ TRACE("SpyReleasePending with %u allocations left\n", Malloc32.SpyedAllocationsLeft);
Malloc32.SpyReleasePending = TRUE;
hres = E_ACCESSDENIED;
} else {
diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c
index 3a0b94d..110e311 100644
--- a/dlls/ole32/itemmoniker.c
+++ b/dlls/ole32/itemmoniker.c
@@ -517,7 +517,7 @@ HRESULT WINAPI ItemMonikerImpl_Reduce(IM
IMoniker** ppmkToLeft,
IMoniker** ppmkReduced)
{
- TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+ TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (ppmkReduced==NULL)
return E_POINTER;
@@ -967,7 +967,7 @@ HRESULT WINAPI ItemMonikerROTDataImpl_Ge
LPWSTR pszItemName;
LPWSTR pszItemDelimiter;
- TRACE("(%p, %lu, %p)\n", pbData, cbMax, pcbData);
+ TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData);
*pcbData = sizeof(CLSID) + sizeof(WCHAR) + len * sizeof(WCHAR);
if (cbMax < *pcbData)
diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index cbe4a0f..3f74f6c 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -107,7 +107,7 @@ HRESULT marshal_object(APARTMENT *apt, S
hr = IUnknown_QueryInterface(object, riid, (void **)&iobject);
if (hr != S_OK)
{
- ERR("object doesn't expose interface %s, failing with error 0x%08lx\n",
+ ERR("object doesn't expose interface %s, failing with error 0x%08x\n",
debugstr_guid(riid), hr);
return E_NOINTERFACE;
}
@@ -222,7 +222,7 @@ static HRESULT WINAPI ClientIdentity_Que
static ULONG WINAPI ClientIdentity_AddRef(IMultiQI * iface)
{
struct proxy_manager * This = (struct proxy_manager *)iface;
- TRACE("%p - before %ld\n", iface, This->refs);
+ TRACE("%p - before %d\n", iface, This->refs);
return InterlockedIncrement(&This->refs);
}
@@ -230,7 +230,7 @@ static ULONG WINAPI ClientIdentity_Relea
{
struct proxy_manager * This = (struct proxy_manager *)iface;
ULONG refs = InterlockedDecrement(&This->refs);
- TRACE("%p - after %ld\n", iface, refs);
+ TRACE("%p - after %d\n", iface, refs);
if (!refs)
proxy_manager_destroy(This);
return refs;
@@ -247,13 +247,13 @@ static HRESULT WINAPI ClientIdentity_Que
/* mapping of RemQueryInterface index to QueryMultipleInterfaces index */
ULONG *mapping = HeapAlloc(GetProcessHeap(), 0, cMQIs * sizeof(*mapping));
- TRACE("cMQIs: %ld\n", cMQIs);
+ TRACE("cMQIs: %d\n", cMQIs);
/* try to get a local interface - this includes already active proxy
* interfaces and also interfaces exposed by the proxy manager */
for (i = 0; i < cMQIs; i++)
{
- TRACE("iid[%ld] = %s\n", i, debugstr_guid(pMQIs[i].pIID));
+ TRACE("iid[%d] = %s\n", i, debugstr_guid(pMQIs[i].pIID));
pMQIs[i].hr = proxy_manager_query_local_interface(This, pMQIs[i].pIID, (void **)&pMQIs[i].pItf);
if (pMQIs[i].hr == S_OK)
successful_mqis++;
@@ -265,7 +265,7 @@ static HRESULT WINAPI ClientIdentity_Que
}
}
- TRACE("%ld interfaces not found locally\n", nonlocal_mqis);
+ TRACE("%d interfaces not found locally\n", nonlocal_mqis);
/* if we have more than one interface not found locally then we must try
* to query the remote object for it */
@@ -288,7 +288,7 @@ static HRESULT WINAPI ClientIdentity_Que
hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS,
nonlocal_mqis, iids, &qiresults);
if (FAILED(hr))
- ERR("IRemUnknown_RemQueryInterface failed with error 0x%08lx\n", hr);
+ ERR("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr);
}
/* IRemUnknown_RemQueryInterface can return S_FALSE if only some of
@@ -319,7 +319,7 @@ static HRESULT WINAPI ClientIdentity_Que
CoTaskMemFree(qiresults);
}
- TRACE("%ld/%ld successfully queried\n", successful_mqis, cMQIs);
+ TRACE("%d/%d successfully queried\n", successful_mqis, cMQIs);
HeapFree(GetProcessHeap(), 0, iids);
HeapFree(GetProcessHeap(), 0, mapping);
@@ -409,7 +409,7 @@ static HRESULT WINAPI Proxy_MarshalInter
if (hr == S_OK && hrref == S_OK)
stdobjref.cPublicRefs = rif.cPublicRefs;
else
- ERR("IRemUnknown_RemAddRef returned with 0x%08lx, hrref = 0x%08lx\n", hr, hrref);
+ ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref);
}
}
@@ -458,7 +458,7 @@ static HRESULT WINAPI Proxy_MarshalInter
CoTaskMemFree(qiresults);
}
else
- ERR("IRemUnknown_RemQueryInterface failed with error 0x%08lx\n", hr);
+ ERR("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr);
}
}
@@ -506,7 +506,7 @@ static HRESULT ifproxy_get_public_ref(st
if (hr == S_OK && hrref == S_OK)
This->refs += NORMALEXTREFS;
else
- ERR("IRemUnknown_RemAddRef returned with 0x%08lx, hrref = 0x%08lx\n", hr, hrref);
+ ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref);
}
}
ReleaseMutex(This->parent->remoting_mutex);
@@ -528,7 +528,7 @@ static HRESULT ifproxy_release_public_re
{
IRemUnknown *remunk = NULL;
- TRACE("releasing %ld refs\n", This->refs);
+ TRACE("releasing %d refs\n", This->refs);
hr = proxy_manager_get_remunknown(This->parent, &remunk);
if (hr == S_OK)
@@ -546,7 +546,7 @@ static HRESULT ifproxy_release_public_re
wine_dbgstr_longlong(This->parent->oxid),
wine_dbgstr_longlong(This->parent->oid));
else
- ERR("IRemUnknown_RemRelease failed with error 0x%08lx\n", hr);
+ ERR("IRemUnknown_RemRelease failed with error 0x%08x\n", hr);
}
}
ReleaseMutex(This->parent->remoting_mutex);
@@ -784,11 +784,11 @@ static HRESULT proxy_manager_create_ifpr
&ifproxy->proxy, &ifproxy->iface);
IPSFactoryBuffer_Release(psfb);
if (hr != S_OK)
- ERR("Could not create proxy for interface %s, error 0x%08lx\n",
+ ERR("Could not create proxy for interface %s, error 0x%08x\n",
debugstr_guid(riid), hr);
}
else
- ERR("Could not get IPSFactoryBuffer for interface %s, error 0x%08lx\n",
+ ERR("Could not get IPSFactoryBuffer for interface %s, error 0x%08x\n",
debugstr_guid(riid), hr);
if (hr == S_OK)
@@ -909,7 +909,7 @@ static HRESULT proxy_manager_get_remunkn
}
LeaveCriticalSection(&This->cs);
- TRACE("got IRemUnknown* pointer %p, hr = 0x%08lx\n", *remunk, hr);
+ TRACE("got IRemUnknown* pointer %p, hr = 0x%08x\n", *remunk, hr);
return hr;
}
@@ -1081,7 +1081,7 @@ StdMarshalImpl_MarshalInterface(
hres = marshal_object(apt, &stdobjref, riid, (IUnknown *)pv, mshlflags);
if (hres)
{
- ERR("Failed to create ifstub, hres=0x%lx\n", hres);
+ ERR("Failed to create ifstub, hres=0x%x\n", hres);
return hres;
}
@@ -1228,7 +1228,7 @@ StdMarshalImpl_UnmarshalInterface(LPMARS
hres = unmarshal_object(&stdobjref, apt, This->dwDestContext,
This->pvDestContext, riid, ppv);
- if (hres) WARN("Failed with error 0x%08lx\n", hres);
+ if (hres) WARN("Failed with error 0x%08x\n", hres);
else TRACE("Successfully created proxy %p\n", *ppv);
return hres;
@@ -1337,11 +1337,11 @@ HRESULT WINAPI CoGetStandardMarshal(REFI
if (pUnk == NULL)
{
- FIXME("(%s,NULL,%lx,%p,%lx,%p), unimplemented yet.\n",
+ FIXME("(%s,NULL,%x,%p,%x,%p), unimplemented yet.\n",
debugstr_guid(riid),dwDestContext,pvDestContext,mshlflags,ppMarshal);
return E_NOTIMPL;
}
- TRACE("(%s,%p,%lx,%p,%lx,%p)\n",
+ TRACE("(%s,%p,%x,%p,%x,%p)\n",
debugstr_guid(riid),pUnk,dwDestContext,pvDestContext,mshlflags,ppMarshal);
*ppMarshal = HeapAlloc(GetProcessHeap(),0,sizeof(StdMarshalImpl));
dm = (StdMarshalImpl*) *ppMarshal;
@@ -1393,7 +1393,7 @@ static HRESULT get_unmarshaler_from_stre
hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res);
if (hr || (res != FIELD_OFFSET(OBJREF, u_objref)))
{
- ERR("Failed to read common OBJREF header, 0x%08lx\n", hr);
+ ERR("Failed to read common OBJREF header, 0x%08x\n", hr);
return STG_E_READFAULT;
}
@@ -1422,7 +1422,7 @@ static HRESULT get_unmarshaler_from_stre
custom_header_size, &res);
if (hr || (res != custom_header_size))
{
- ERR("Failed to read OR_CUSTOM header, 0x%08lx\n", hr);
+ ERR("Failed to read OR_CUSTOM header, 0x%08x\n", hr);
return STG_E_READFAULT;
}
/* now create the marshaler specified in the stream */
@@ -1438,7 +1438,7 @@ static HRESULT get_unmarshaler_from_stre
}
if (hr)
- ERR("Failed to create marshal, 0x%08lx\n", hr);
+ ERR("Failed to create marshal, 0x%08x\n", hr);
return hr;
}
@@ -1479,7 +1479,7 @@ HRESULT WINAPI CoGetMarshalSizeMax(ULONG
pvDestContext, mshlFlags, &marshaler_clsid);
if (hr)
{
- ERR("IMarshal::GetUnmarshalClass failed, 0x%08lx\n", hr);
+ ERR("IMarshal::GetUnmarshalClass failed, 0x%08x\n", hr);
IMarshal_Release(pMarshal);
return hr;
}
@@ -1552,7 +1552,7 @@ HRESULT WINAPI CoMarshalInterface(IStrea
OBJREF objref;
LPMARSHAL pMarshal;
- TRACE("(%p, %s, %p, %lx, %p,", pStream, debugstr_guid(riid), pUnk,
+ TRACE("(%p, %s, %p, %x, %p,", pStream, debugstr_guid(riid), pUnk,
dwDestContext, pvDestContext);
dump_MSHLFLAGS(mshlFlags);
TRACE(")\n");
@@ -1567,7 +1567,7 @@ HRESULT WINAPI CoMarshalInterface(IStrea
hr = get_marshaler(riid, pUnk, dwDestContext, pvDestContext, mshlFlags, &pMarshal);
if (hr)
{
- ERR("Failed to get marshaller, 0x%08lx\n", hr);
+ ERR("Failed to get marshaller, 0x%08x\n", hr);
return hr;
}
@@ -1575,7 +1575,7 @@ HRESULT WINAPI CoMarshalInterface(IStrea
pvDestContext, mshlFlags, &marshaler_clsid);
if (hr)
{
- ERR("IMarshal::GetUnmarshalClass failed, 0x%08lx\n", hr);
+ ERR("IMarshal::GetUnmarshalClass failed, 0x%08x\n", hr);
goto cleanup;
}
@@ -1589,7 +1589,7 @@ HRESULT WINAPI CoMarshalInterface(IStrea
hr = IStream_Write(pStream, &objref, FIELD_OFFSET(OBJREF, u_objref), NULL);
if (hr)
{
- ERR("Failed to write OBJREF header to stream, 0x%08lx\n", hr);
+ ERR("Failed to write OBJREF header to stream, 0x%08x\n", hr);
goto cleanup;
}
}
@@ -1605,7 +1605,7 @@ HRESULT WINAPI CoMarshalInterface(IStrea
&objref.u_objref.u_custom.size);
if (hr)
{
- ERR("Failed to get max size of marshal data, error 0x%08lx\n", hr);
+ ERR("Failed to get max size of marshal data, error 0x%08x\n", hr);
goto cleanup;
}
/* write constant sized common header and OR_CUSTOM data into stream */
@@ -1613,7 +1613,7 @@ HRESULT WINAPI CoMarshalInterface(IStrea
FIELD_OFFSET(OBJREF, u_objref.u_custom.pData), NULL);
if (hr)
{
- ERR("Failed to write OR_CUSTOM header to stream with 0x%08lx\n", hr);
+ ERR("Failed to write OR_CUSTOM header to stream with 0x%08x\n", hr);
goto cleanup;
}
}
@@ -1625,14 +1625,14 @@ HRESULT WINAPI CoMarshalInterface(IStrea
if (hr)
{
- ERR("Failed to marshal the interface %s, %lx\n", debugstr_guid(riid), hr);
+ ERR("Failed to marshal the interface %s, %x\n", debugstr_guid(riid), hr);
goto cleanup;
}
cleanup:
IMarshal_Release(pMarshal);
- TRACE("completed with hr 0x%08lx\n", hr);
+ TRACE("completed with hr 0x%08x\n", hr);
return hr;
}
@@ -1673,7 +1673,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStr
/* call the helper object to do the actual unmarshaling */
hr = IMarshal_UnmarshalInterface(pMarshal, pStream, &iid, (LPVOID*)&object);
if (hr)
- ERR("IMarshal::UnmarshalInterface failed, 0x%08lx\n", hr);
+ ERR("IMarshal::UnmarshalInterface failed, 0x%08x\n", hr);
/* IID_NULL means use the interface ID of the marshaled object */
if (!IsEqualIID(riid, &IID_NULL))
@@ -1686,7 +1686,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStr
TRACE("requested interface != marshalled interface, additional QI needed\n");
hr = IUnknown_QueryInterface(object, &iid, ppv);
if (hr)
- ERR("Couldn't query for interface %s, hr = 0x%08lx\n",
+ ERR("Couldn't query for interface %s, hr = 0x%08x\n",
debugstr_guid(riid), hr);
IUnknown_Release(object);
}
@@ -1698,7 +1698,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStr
IMarshal_Release(pMarshal);
- TRACE("completed with hr 0x%lx\n", hr);
+ TRACE("completed with hr 0x%x\n", hr);
return hr;
}
@@ -1740,7 +1740,7 @@ HRESULT WINAPI CoReleaseMarshalData(IStr
/* call the helper object to do the releasing of marshal data */
hr = IMarshal_ReleaseMarshalData(pMarshal, pStream);
if (hr)
- ERR("IMarshal::ReleaseMarshalData failed with error 0x%08lx\n", hr);
+ ERR("IMarshal::ReleaseMarshalData failed with error 0x%08x\n", hr);
IMarshal_Release(pMarshal);
return hr;
diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c
index 32edbc6..77d1b78 100644
--- a/dlls/ole32/memlockbytes.c
+++ b/dlls/ole32/memlockbytes.c
@@ -162,10 +162,10 @@ HRESULT WINAPI GetHGlobalFromILockBytes(
/* It is not our lockbytes implementation, so use a more generic way */
hres = ILockBytes_Stat(plkbyt,&stbuf,0);
if (hres != S_OK) {
- ERR("Cannot ILockBytes_Stat, %lx\n",hres);
+ ERR("Cannot ILockBytes_Stat, %x\n",hres);
return hres;
}
- FIXME("cbSize is %ld\n",stbuf.cbSize.u.LowPart);
+ FIXME("cbSize is %d\n",stbuf.cbSize.u.LowPart);
*phglobal = GlobalAlloc( GMEM_MOVEABLE|GMEM_SHARE, stbuf.cbSize.u.LowPart);
if (!*phglobal)
return E_INVALIDARG;
@@ -173,11 +173,11 @@ HRESULT WINAPI GetHGlobalFromILockBytes(
hres = ILockBytes_ReadAt(plkbyt, start, GlobalLock(*phglobal), stbuf.cbSize.u.LowPart, &xread);
GlobalUnlock(*phglobal);
if (hres != S_OK) {
- FIXME("%p->ReadAt failed with %lx\n",plkbyt,hres);
+ FIXME("%p->ReadAt failed with %x\n",plkbyt,hres);
return hres;
}
if (stbuf.cbSize.u.LowPart != xread) {
- FIXME("Read size is not requested size %ld vs %ld?\n",stbuf.cbSize.u.LowPart, xread);
+ FIXME("Read size is not requested size %d vs %d?\n",stbuf.cbSize.u.LowPart, xread);
}
return S_OK;
}
diff --git a/dlls/ole32/memlockbytes16.c b/dlls/ole32/memlockbytes16.c
index 7c9709a..88d1598 100644
--- a/dlls/ole32/memlockbytes16.c
+++ b/dlls/ole32/memlockbytes16.c
@@ -273,7 +273,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_Rea
ULONG bytesReadBuffer = 0;
ULONG bytesToReadFromBuffer;
- TRACE("(%p,%ld,%p,%ld,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbRead);
+ TRACE("(%p,%d,%p,%d,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbRead);
/*
* If the caller is not interested in the number of bytes read,
* we use another buffer to avoid "if" statements in the code.
@@ -339,7 +339,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_Set
HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface;
HGLOBAL16 supportHandle;
- TRACE("(%p,%ld)\n",This,libNewSize.u.LowPart);
+ TRACE("(%p,%d)\n",This,libNewSize.u.LowPart);
/*
* As documented.
*/
@@ -384,7 +384,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_Wri
ULARGE_INTEGER newSize;
ULONG bytesWritten = 0;
- TRACE("(%p,%ld,%p,%ld,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbWritten);
+ TRACE("(%p,%d,%p,%d,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbWritten);
/*
* If the caller is not interested in the number of bytes written,
* we use another buffer to avoid "if" statements in the code.
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 327038b..06946a0 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -143,7 +143,7 @@ static HRESULT get_moniker_comparison_da
hr = IMoniker_QueryInterface(pMoniker, &IID_IROTData, (void *)&pROTData);
if (hr != S_OK)
{
- ERR("Failed to query moniker for IROTData interface, hr = 0x%08lx\n", hr);
+ ERR("Failed to query moniker for IROTData interface, hr = 0x%08x\n", hr);
return hr;
}
IROTData_GetComparisonData(pROTData, NULL, 0, &size);
@@ -152,7 +152,7 @@ static HRESULT get_moniker_comparison_da
hr = IROTData_GetComparisonData(pROTData, (*moniker_data)->abData, size, &size);
if (hr != S_OK)
{
- ERR("Failed to copy comparison data into buffer, hr = 0x%08lx\n", hr);
+ ERR("Failed to copy comparison data into buffer, hr = 0x%08x\n", hr);
HeapFree(GetProcessHeap(), 0, *moniker_data);
return hr;
}
@@ -280,7 +280,7 @@ RunningObjectTableImpl_Register(IRunning
IStream *pStream = NULL;
DWORD mshlflags;
- TRACE("(%p,%ld,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister);
+ TRACE("(%p,%d,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister);
/*
* there's only two types of register : strong and or weak registration
@@ -290,7 +290,7 @@ RunningObjectTableImpl_Register(IRunning
(!(grfFlags & ROTFLAGS_REGISTRATIONKEEPSALIVE) || (grfFlags & ROTFLAGS_ALLOWANYCLIENT)) &&
(grfFlags) )
{
- ERR("Invalid combination of ROTFLAGS: %lx\n", grfFlags);
+ ERR("Invalid combination of ROTFLAGS: %x\n", grfFlags);
return E_INVALIDARG;
}
@@ -404,7 +404,7 @@ RunningObjectTableImpl_Revoke( IRunningO
RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface;
struct rot_entry *rot_entry;
- TRACE("(%p,%ld)\n",This,dwRegister);
+ TRACE("(%p,%d)\n",This,dwRegister);
EnterCriticalSection(&This->lock);
LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry)
@@ -535,7 +535,7 @@ RunningObjectTableImpl_NoteChangeTime(IR
RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface;
struct rot_entry *rot_entry;
- TRACE("(%p,%ld,%p)\n",This,dwRegister,pfiletime);
+ TRACE("(%p,%d,%p)\n",This,dwRegister,pfiletime);
EnterCriticalSection(&This->lock);
LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry)
@@ -832,7 +832,7 @@ static HRESULT WINAPI EnumMonikerImpl_
EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
HRESULT hr = S_OK;
- TRACE("(%p) TabCurrentPos %ld Tablastindx %ld\n", This, This->pos, This->moniker_count);
+ TRACE("(%p) TabCurrentPos %d Tablastindx %d\n", This, This->pos, This->moniker_count);
/* retrieve the requested number of moniker from the current position */
for(i = 0; (This->pos < This->moniker_count) && (i < celt); i++)
@@ -1037,7 +1037,7 @@ static HRESULT WINAPI MonikerMarshal_Get
{
MonikerMarshal *This = impl_from_IMarshal(iface);
- TRACE("(%s, %p, %lx, %p, %lx, %p)\n", debugstr_guid(riid), pv,
+ TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags, pCid);
return IMoniker_GetClassID(This->moniker, pCid);
@@ -1051,7 +1051,7 @@ static HRESULT WINAPI MonikerMarshal_Get
HRESULT hr;
ULARGE_INTEGER size;
- TRACE("(%s, %p, %lx, %p, %lx, %p)\n", debugstr_guid(riid), pv,
+ TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags, pSize);
hr = IMoniker_GetSizeMax(This->moniker, &size);
@@ -1066,7 +1066,7 @@ static HRESULT WINAPI MonikerMarshal_Mar
{
MonikerMarshal *This = impl_from_IMarshal(iface);
- TRACE("(%p, %s, %p, %lx, %p, %lx)\n", pStm, debugstr_guid(riid), pv,
+ TRACE("(%p, %s, %p, %x, %p, %x)\n", pStm, debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags);
return IMoniker_Save(This->moniker, pStm, FALSE);
diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c
index d3fca7e..410651c 100644
--- a/dlls/ole32/ole16.c
+++ b/dlls/ole32/ole16.c
@@ -105,7 +105,7 @@ ULONG CDECL IMalloc16_fnRelease(IMalloc1
*/
SEGPTR CDECL IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
IMalloc16Impl *This = (IMalloc16Impl *)iface;
- TRACE("(%p)->Alloc(%ld)\n",This,cb);
+ TRACE("(%p)->Alloc(%d)\n",This,cb);
return MapLS( HeapAlloc( GetProcessHeap(), 0, cb ) );
}
@@ -116,7 +116,7 @@ VOID CDECL IMalloc16_fnFree(IMalloc16* i
{
void *ptr = MapSL(pv);
IMalloc16Impl *This = (IMalloc16Impl *)iface;
- TRACE("(%p)->Free(%08lx)\n",This,pv);
+ TRACE("(%p)->Free(%08x)\n",This,pv);
UnMapLS(pv);
HeapFree( GetProcessHeap(), 0, ptr );
}
@@ -128,7 +128,7 @@ SEGPTR CDECL IMalloc16_fnRealloc(IMalloc
{
SEGPTR ret;
IMalloc16Impl *This = (IMalloc16Impl *)iface;
- TRACE("(%p)->Realloc(%08lx,%ld)\n",This,pv,cb);
+ TRACE("(%p)->Realloc(%08x,%d)\n",This,pv,cb);
if (!pv)
ret = IMalloc16_fnAlloc(iface, cb);
else if (cb) {
@@ -147,7 +147,7 @@ SEGPTR CDECL IMalloc16_fnRealloc(IMalloc
DWORD CDECL IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv)
{
IMalloc16Impl *This = (IMalloc16Impl *)iface;
- TRACE("(%p)->GetSize(%08lx)\n",This,pv);
+ TRACE("(%p)->GetSize(%08x)\n",This,pv);
return HeapSize( GetProcessHeap(), 0, MapSL(pv) );
}
@@ -371,7 +371,7 @@ _xmalloc16(DWORD size, SEGPTR *ptr) {
(LPVOID)args,
(LPDWORD)ptr
)) {
- ERR("CallTo16 IMalloc16 (%ld) failed\n",size);
+ ERR("CallTo16 IMalloc16 (%d) failed\n",size);
return E_FAIL;
}
return S_OK;
@@ -483,7 +483,7 @@ HRESULT WINAPI CoRegisterClassObject16(
DWORD flags, /* [in] REGCLS flags indicating how connections are made */
LPDWORD lpdwRegister
) {
- FIXME("(%s,%p,0x%08lx,0x%08lx,%p),stub\n",
+ FIXME("(%s,%p,0x%08x,0x%08x,%p),stub\n",
debugstr_guid(rclsid),pUnk,dwClsContext,flags,lpdwRegister
);
return 0;
@@ -495,7 +495,7 @@ HRESULT WINAPI CoRegisterClassObject16(
*/
HRESULT WINAPI CoRevokeClassObject16(DWORD dwRegister) /* [in] token on class obj */
{
- FIXME("(0x%08lx),stub!\n", dwRegister);
+ FIXME("(0x%08x),stub!\n", dwRegister);
return 0;
}
@@ -558,7 +558,7 @@ HRESULT WINAPI CoGetState16(LPDWORD stat
*/
BOOL WINAPI COMPOBJ_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst, WORD ds, WORD HeapSize, DWORD res1, WORD res2)
{
- TRACE("(%08lx, %04x, %04x, %04x, %08lx, %04x)\n", Reason, hInst, ds, HeapSize, res1, res2);
+ TRACE("(%08x, %04x, %04x, %04x, %08x, %04x)\n", Reason, hInst, ds, HeapSize, res1, res2);
return TRUE;
}
@@ -570,7 +570,7 @@ SEGPTR WINAPI CoMemAlloc(DWORD size, DWO
SEGPTR segptr;
/* FIXME: check context handling */
- TRACE("(%ld, 0x%08lx, 0x%08lx)\n", size, dwMemContext, x);
+ TRACE("(%d, 0x%08x, 0x%08x)\n", size, dwMemContext, x);
hres = _xmalloc16(size, &segptr);
if (hres != S_OK)
return (SEGPTR)0;
@@ -640,7 +640,7 @@ HRESULT WINAPI CoCreateInstance16(
REFIID iid,
LPVOID *ppv)
{
- FIXME("(%s, %p, %lx, %s, %p), stub!\n",
+ FIXME("(%s, %p, %x, %s, %p), stub!\n",
debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid),
ppv
);
@@ -662,6 +662,6 @@ HRESULT WINAPI DllGetClassObject16(REFCL
HRESULT WINAPI
GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
{
- FIXME("(%ld,%p),stub!\n",reserved,pprot);
+ FIXME("(%d,%p),stub!\n",reserved,pprot);
return E_NOTIMPL;
}
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index 9779618..980cbf9 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -283,7 +283,7 @@ void WINAPI OleUninitialize(void)
* OleInitializeWOW [OLE32.@]
*/
HRESULT WINAPI OleInitializeWOW(DWORD x, DWORD y) {
- FIXME("(0x%08lx, 0x%08lx),stub!\n",x, y);
+ FIXME("(0x%08x, 0x%08x),stub!\n",x, y);
return 0;
}
@@ -385,12 +385,12 @@ HRESULT WINAPI OleRegGetUserType(
/*
* Build the key name we're looking for
*/
- sprintf( keyName, "CLSID\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\",
+ sprintf( keyName, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\",
clsid->Data1, clsid->Data2, clsid->Data3,
clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3],
clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] );
- TRACE("(%s, %ld, %p)\n", keyName, dwFormOfType, pszUserType);
+ TRACE("(%s, %d, %p)\n", keyName, dwFormOfType, pszUserType);
/*
* Open the class id Key
@@ -602,12 +602,12 @@ HRESULT WINAPI OleRegGetMiscStatus(
/*
* Build the key name we're looking for
*/
- sprintf( keyName, "CLSID\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\",
+ sprintf( keyName, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\",
clsid->Data1, clsid->Data2, clsid->Data3,
clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3],
clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] );
- TRACE("(%s, %ld, %p)\n", keyName, dwAspect, pdwStatus);
+ TRACE("(%s, %d, %p)\n", keyName, dwAspect, pdwStatus);
/*
* Open the class id Key
@@ -641,7 +641,7 @@ HRESULT WINAPI OleRegGetMiscStatus(
/*
* Open the key specific to the requested aspect.
*/
- sprintf(keyName, "%ld", dwAspect);
+ sprintf(keyName, "%d", dwAspect);
result = RegOpenKeyA(miscStatusKey,
keyName,
@@ -716,7 +716,7 @@ static HRESULT WINAPI EnumOLEVERB_Next(
EnumOLEVERB *This = (EnumOLEVERB *)iface;
HRESULT hr = S_OK;
- TRACE("(%ld, %p, %p)\n", celt, rgelt, pceltFetched);
+ TRACE("(%d, %p, %p)\n", celt, rgelt, pceltFetched);
if (pceltFetched)
*pceltFetched = 0;
@@ -736,14 +736,14 @@ static HRESULT WINAPI EnumOLEVERB_Next(
}
else if (res != ERROR_SUCCESS)
{
- ERR("RegEnumKeyW failed with error %ld\n", res);
+ ERR("RegEnumKeyW failed with error %d\n", res);
hr = REGDB_E_READREGDB;
break;
}
res = RegQueryValueW(This->hkeyVerb, wszSubKey, NULL, &cbData);
if (res != ERROR_SUCCESS)
{
- ERR("RegQueryValueW failed with error %ld\n", res);
+ ERR("RegQueryValueW failed with error %d\n", res);
hr = REGDB_E_READREGDB;
break;
}
@@ -756,7 +756,7 @@ static HRESULT WINAPI EnumOLEVERB_Next(
res = RegQueryValueW(This->hkeyVerb, wszSubKey, pwszOLEVERB, &cbData);
if (res != ERROR_SUCCESS)
{
- ERR("RegQueryValueW failed with error %ld\n", res);
+ ERR("RegQueryValueW failed with error %d\n", res);
hr = REGDB_E_READREGDB;
CoTaskMemFree(pwszOLEVERB);
break;
@@ -802,7 +802,7 @@ static HRESULT WINAPI EnumOLEVERB_Skip(
{
EnumOLEVERB *This = (EnumOLEVERB *)iface;
- TRACE("(%ld)\n", celt);
+ TRACE("(%d)\n", celt);
This->index += celt;
return S_OK;
@@ -891,7 +891,7 @@ HRESULT WINAPI OleRegEnumVerbs (REFCLSID
else if (res == REGDB_E_KEYMISSING)
ERR("no Verbs key for class %s\n", debugstr_guid(clsid));
else
- ERR("failed to open Verbs key for CLSID %s with error %ld\n",
+ ERR("failed to open Verbs key for CLSID %s with error %d\n",
debugstr_guid(clsid), res);
return res;
}
@@ -900,7 +900,7 @@ HRESULT WINAPI OleRegEnumVerbs (REFCLSID
NULL, NULL, NULL, NULL, NULL, NULL);
if (res != ERROR_SUCCESS)
{
- ERR("failed to get subkey count with error %ld\n", GetLastError());
+ ERR("failed to get subkey count with error %d\n", GetLastError());
return REGDB_E_READREGDB;
}
@@ -2358,7 +2358,7 @@ HRESULT WINAPI OleCreate(
{
TRACE("trying to set stg %p\n", pStg);
hres = IPersistStorage_InitNew(pPS, pStg);
- TRACE("-- result 0x%08lx\n", hres);
+ TRACE("-- result 0x%08x\n", hres);
IPersistStorage_Release(pPS);
}
}
@@ -2367,7 +2367,7 @@ HRESULT WINAPI OleCreate(
{
TRACE("trying to set clientsite %p\n", pClientSite);
hres = IOleObject_SetClientSite(pOleObject, pClientSite);
- TRACE("-- result 0x%08lx\n", hres);
+ TRACE("-- result 0x%08x\n", hres);
}
if (pOleObject)
@@ -2931,7 +2931,7 @@ HRESULT WINAPI FreePropVariantArray(ULON
{
ULONG i;
- TRACE("(%lu, %p)\n", cVariants, rgvars);
+ TRACE("(%u, %p)\n", cVariants, rgvars);
if (!rgvars)
return E_INVALIDARG;
diff --git a/dlls/ole32/ole2_16.c b/dlls/ole32/ole2_16.c
index 693cf7c..a7a5f55 100644
--- a/dlls/ole32/ole2_16.c
+++ b/dlls/ole32/ole2_16.c
@@ -205,7 +205,7 @@ HRESULT WINAPI OleLoad16(
SEGPTR pClientSite,
LPVOID* ppvObj)
{
- FIXME("(%lx,%s,%lx,%p), stub!\n", pStg, debugstr_guid(riid), pClientSite, ppvObj);
+ FIXME("(%x,%s,%x,%p), stub!\n", pStg, debugstr_guid(riid), pClientSite, ppvObj);
return E_NOTIMPL;
}
diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c
index 0415b78..e339651 100644
--- a/dlls/ole32/ole2stubs.c
+++ b/dlls/ole32/ole2stubs.c
@@ -39,7 +39,7 @@ HRESULT WINAPI OleCreateLinkToFile(LPCO
DWORD renderopt, LPFORMATETC lpFormatEtc,
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj)
{
- FIXME("(%p,%p,%li,%p,%p,%p,%p), stub!\n",lpszFileName, riid, renderopt, lpFormatEtc, pClientSite, pStg, ppvObj);
+ FIXME("(%p,%p,%i,%p,%p,%p,%p), stub!\n",lpszFileName, riid, renderopt, lpFormatEtc, pClientSite, pStg, ppvObj);
return E_NOTIMPL;
}
@@ -115,7 +115,7 @@ HRESULT WINAPI OleRegEnumFormatEtc (
DWORD dwDirection,
LPENUMFORMATETC* ppenumFormatetc)
{
- FIXME("(%p, %ld, %p), stub!\n", clsid, dwDirection, ppenumFormatetc);
+ FIXME("(%p, %d, %p), stub!\n", clsid, dwDirection, ppenumFormatetc);
return E_NOTIMPL;
}
diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c
index a7470e4..1c88797 100644
--- a/dlls/ole32/oleobj.c
+++ b/dlls/ole32/oleobj.c
@@ -104,7 +104,7 @@ static HRESULT WINAPI EnumOleSTATDATA_Ne
EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface;
HRESULT hr = S_OK;
- TRACE("(%ld, %p, %p)\n", celt, rgelt, pceltFetched);
+ TRACE("(%d, %p, %p)\n", celt, rgelt, pceltFetched);
if (pceltFetched)
*pceltFetched = 0;
@@ -140,7 +140,7 @@ static HRESULT WINAPI EnumOleSTATDATA_Sk
{
EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface;
- TRACE("(%ld)\n", celt);
+ TRACE("(%d)\n", celt);
for (; celt; celt--)
{
@@ -277,7 +277,7 @@ static ULONG WINAPI OleAdviseHolderImpl_
OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(ref=%ld)\n", This, ref - 1);
+ TRACE("(%p)->(ref=%d)\n", This, ref - 1);
return ref;
}
@@ -290,7 +290,7 @@ static ULONG WINAPI OleAdviseHolderImpl_
{
OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface;
ULONG ref;
- TRACE("(%p)->(ref=%ld)\n", This, This->ref);
+ TRACE("(%p)->(ref=%d)\n", This, This->ref);
ref = InterlockedDecrement(&This->ref);
if (ref == 0) OleAdviseHolderImpl_Destructor(This);
@@ -374,7 +374,7 @@ static HRESULT WINAPI OleAdviseHolderImp
{
OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface;
- TRACE("(%p)->(%lu)\n", This, dwConnection);
+ TRACE("(%p)->(%u)\n", This, dwConnection);
/*
* So we don't return 0 as a cookie, the index was
@@ -645,7 +645,7 @@ static ULONG WINAPI DataAdviseHold
IDataAdviseHolder* iface)
{
DataAdviseHolder *This = (DataAdviseHolder *)iface;
- TRACE("(%p) (ref=%ld)\n", This, This->ref);
+ TRACE("(%p) (ref=%d)\n", This, This->ref);
return InterlockedIncrement(&This->ref);
}
@@ -659,7 +659,7 @@ static ULONG WINAPI DataAdviseHolder_Rel
{
DataAdviseHolder *This = (DataAdviseHolder *)iface;
ULONG ref;
- TRACE("(%p) (ref=%ld)\n", This, This->ref);
+ TRACE("(%p) (ref=%d)\n", This, This->ref);
/*
* Decrease the reference count on this object.
@@ -690,7 +690,7 @@ static HRESULT WINAPI DataAdviseHolder_A
DataAdviseHolder *This = (DataAdviseHolder *)iface;
- TRACE("(%p)->(%p, %p, %08lx, %p, %p)\n", This, pDataObject, pFetc, advf,
+ TRACE("(%p)->(%p, %p, %08x, %p, %p)\n", This, pDataObject, pFetc, advf,
pAdvise, pdwConnection);
/*
* Sanity check
@@ -779,7 +779,7 @@ static HRESULT WINAPI DataAdviseHold
{
DataAdviseHolder *This = (DataAdviseHolder *)iface;
- TRACE("(%p)->(%lu)\n", This, dwConnection);
+ TRACE("(%p)->(%u)\n", This, dwConnection);
/*
* So we don't return 0 as a cookie, the index was
@@ -834,7 +834,7 @@ static HRESULT WINAPI DataAdviseHold
STGMEDIUM stg;
HRESULT res;
- TRACE("(%p)->(%p,%08lx,%08lx)\n", This, pDataObject, dwReserved, advf);
+ TRACE("(%p)->(%p,%08x,%08x)\n", This, pDataObject, dwReserved, advf);
for(index = 0; index < This->maxCons; index++) {
if(This->Connections[index].sink != NULL) {
@@ -844,7 +844,7 @@ static HRESULT WINAPI DataAdviseHold
res = IDataObject_GetData(pDataObject,
&(This->Connections[index].fmat),
&stg);
- TRACE("returns %08lx\n", res);
+ TRACE("returns %08x\n", res);
}
TRACE("Calling IAdviseSink_OnDataChange\n");
IAdviseSink_OnDataChange(This->Connections[index].sink,
diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c
index 7f0b45d..ad2960d 100644
--- a/dlls/ole32/oleproxy.c
+++ b/dlls/ole32/oleproxy.c
@@ -159,7 +159,7 @@ CFStub_Invoke(
ULONG res;
if (msg->cbBuffer < sizeof(IID)) {
- FIXME("Not enough bytes in buffer (%ld)?\n",msg->cbBuffer);
+ FIXME("Not enough bytes in buffer (%d)?\n",msg->cbBuffer);
return E_FAIL;
}
memcpy(&iid,msg->Buffer,sizeof(iid));
@@ -184,7 +184,7 @@ CFStub_Invoke(
hres = CoMarshalInterface(pStm,&iid,ppv,0,NULL,0);
IUnknown_Release((IUnknown*)ppv);
if (hres) {
- FIXME("CoMarshalInterface failed, %lx!\n",hres);
+ FIXME("CoMarshalInterface failed, %x!\n",hres);
msg->cbBuffer = 0;
return hres;
}
@@ -202,20 +202,20 @@ CFStub_Invoke(
seekto.u.LowPart = 0;seekto.u.HighPart = 0;
hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
if (hres) {
- FIXME("IStream_Seek failed, %lx\n",hres);
+ FIXME("IStream_Seek failed, %x\n",hres);
return hres;
}
hres = IStream_Read(pStm,msg->Buffer,msg->cbBuffer,&res);
if (hres) {
- FIXME("Stream Read failed, %lx\n",hres);
+ FIXME("Stream Read failed, %x\n",hres);
return hres;
}
IStream_Release(pStm);
return S_OK;
}
FIXME("(%p,%p), stub!\n",msg,chanbuf);
- FIXME("iMethod is %ld\n",msg->iMethod);
- FIXME("cbBuffer is %ld\n",msg->cbBuffer);
+ FIXME("iMethod is %d\n",msg->iMethod);
+ FIXME("cbBuffer is %d\n",msg->cbBuffer);
return E_FAIL;
}
@@ -375,13 +375,13 @@ static HRESULT WINAPI CFProxy_CreateInst
msg.Buffer = NULL;
hres = IRpcChannelBuffer_GetBuffer(This->chanbuf,&msg,&IID_IClassFactory);
if (hres) {
- FIXME("IRpcChannelBuffer_GetBuffer failed with %lx?\n",hres);
+ FIXME("IRpcChannelBuffer_GetBuffer failed with %x?\n",hres);
return hres;
}
memcpy(msg.Buffer,riid,sizeof(*riid));
hres = IRpcChannelBuffer_SendReceive(This->chanbuf,&msg,&srstatus);
if (hres) {
- FIXME("IRpcChannelBuffer_SendReceive failed with %lx?\n",hres);
+ FIXME("IRpcChannelBuffer_SendReceive failed with %x?\n",hres);
return hres;
}
@@ -389,12 +389,12 @@ static HRESULT WINAPI CFProxy_CreateInst
return srstatus;
/* We got back: [Marshalled Interface data] */
- TRACE("got %ld bytes data.\n",msg.cbBuffer);
+ TRACE("got %d bytes data.\n",msg.cbBuffer);
hGlobal = GlobalAlloc(GMEM_MOVEABLE|GMEM_NODISCARD|GMEM_SHARE,msg.cbBuffer);
memcpy(GlobalLock(hGlobal),msg.Buffer,msg.cbBuffer);
hres = CreateStreamOnHGlobal(hGlobal,TRUE,&pStream);
if (hres) {
- FIXME("CreateStreamOnHGlobal failed with %lx\n",hres);
+ FIXME("CreateStreamOnHGlobal failed with %x\n",hres);
return hres;
}
hres = CoUnmarshalInterface(
@@ -404,7 +404,7 @@ static HRESULT WINAPI CFProxy_CreateInst
);
IStream_Release(pStream); /* Does GlobalFree hGlobal too. */
if (hres) {
- FIXME("CoMarshalInterface failed, %lx\n",hres);
+ FIXME("CoMarshalInterface failed, %x\n",hres);
return hres;
}
return S_OK;
@@ -521,7 +521,7 @@ static HRESULT WINAPI RemUnkStub_Invoke(
LPBYTE buf = pMsg->Buffer;
HRESULT hr = RPC_E_INVALIDMETHOD;
- TRACE("(%p)->Invoke(%p,%p) method %ld\n", This, pMsg, pChannel, iMethod);
+ TRACE("(%p)->Invoke(%p,%p) method %d\n", This, pMsg, pChannel, iMethod);
switch (iMethod)
{
case 3: /* RemQueryInterface */
@@ -725,7 +725,7 @@ static HRESULT WINAPI RemUnkProxy_RemQue
HRESULT hr = S_OK;
ULONG status;
- TRACE("(%p)->(%s,%ld,%d,%p,%p)\n",This,
+ TRACE("(%p)->(%s,%d,%d,%p,%p)\n",This,
debugstr_guid(ripid),cRefs,cIids,iids,ppQIResults);
*ppQIResults = NULL;
@@ -854,14 +854,14 @@ static HRESULT WINAPI RURpcProxyBufferIm
static ULONG WINAPI RURpcProxyBufferImpl_AddRef(LPRPCPROXYBUFFER iface) {
ICOM_THIS_MULTI(RemUnkProxy,lpvtbl_proxy,iface);
- TRACE("%p, %ld\n", iface, This->refs + 1);
+ TRACE("%p, %d\n", iface, This->refs + 1);
return InterlockedIncrement(&This->refs);
}
static ULONG WINAPI RURpcProxyBufferImpl_Release(LPRPCPROXYBUFFER iface) {
ICOM_THIS_MULTI(RemUnkProxy,lpvtbl_proxy,iface);
ULONG ref = InterlockedDecrement(&This->refs);
- TRACE("%p, %ld\n", iface, ref);
+ TRACE("%p, %d\n", iface, ref);
if (!ref) {
IRpcProxyBuffer_Disconnect(iface);
HeapFree(GetProcessHeap(),0,This);
diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c
index 7646e1d..7bb6e9f 100644
--- a/dlls/ole32/rpc.c
+++ b/dlls/ole32/rpc.c
@@ -265,7 +265,7 @@ static HRESULT WINAPI ClientRpcChannelBu
APARTMENT *apt = NULL;
IPID ipid;
- TRACE("(%p) iMethod=%ld\n", olemsg, olemsg->iMethod);
+ TRACE("(%p) iMethod=%d\n", olemsg, olemsg->iMethod);
hr = ClientRpcChannelBuffer_IsCorrectApartment(This, COM_CurrentApt());
if (hr != S_OK)
@@ -294,11 +294,11 @@ static HRESULT WINAPI ClientRpcChannelBu
params->handle = ClientRpcChannelBuffer_GetEventHandle(This);
if ((hr == S_OK) && !apt->multi_threaded)
{
- TRACE("Calling apartment thread 0x%08lx...\n", apt->tid);
+ TRACE("Calling apartment thread 0x%08x...\n", apt->tid);
if (!PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params))
{
- ERR("PostMessage failed with error %ld\n", GetLastError());
+ ERR("PostMessage failed with error %d\n", GetLastError());
hr = HRESULT_FROM_WIN32(GetLastError());
}
}
@@ -322,7 +322,7 @@ static HRESULT WINAPI ClientRpcChannelBu
*/
if (!QueueUserWorkItem(rpc_sendreceive_thread, params, WT_EXECUTEDEFAULT))
{
- ERR("QueueUserWorkItem failed with error %lx\n", GetLastError());
+ ERR("QueueUserWorkItem failed with error %x\n", GetLastError());
hr = E_UNEXPECTED;
}
else
@@ -355,7 +355,7 @@ static HRESULT WINAPI ClientRpcChannelBu
else
hr = HRESULT_FROM_WIN32(status);
- TRACE("-- 0x%08lx\n", hr);
+ TRACE("-- 0x%08x\n", hr);
return hr;
}
@@ -562,13 +562,13 @@ static void __RPC_STUB dispatch_rpc(RPC_
{
params->handle = CreateEventW(NULL, FALSE, FALSE, NULL);
- TRACE("Calling apartment thread 0x%08lx...\n", apt->tid);
+ TRACE("Calling apartment thread 0x%08x...\n", apt->tid);
if (PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params))
WaitForSingleObject(params->handle, INFINITE);
else
{
- ERR("PostMessage failed with error %ld\n", GetLastError());
+ ERR("PostMessage failed with error %d\n", GetLastError());
IRpcChannelBuffer_Release(params->chan);
IRpcStubBuffer_Release(params->stub);
}
@@ -759,7 +759,7 @@ static DWORD start_local_service(LPCWSTR
SC_HANDLE handle, hsvc;
DWORD r = ERROR_FUNCTION_FAILED;
- TRACE("Starting service %s %ld params\n", debugstr_w(name), num);
+ TRACE("Starting service %s %d params\n", debugstr_w(name), num);
handle = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT);
if (!handle)
@@ -779,7 +779,7 @@ static DWORD start_local_service(LPCWSTR
r = GetLastError();
CloseServiceHandle(handle);
- TRACE("StartService returned error %ld (%s)\n", r, (r == ERROR_SUCCESS) ? "ok":"failed");
+ TRACE("StartService returned error %d (%s)\n", r, (r == ERROR_SUCCESS) ? "ok":"failed");
return r;
}
@@ -886,7 +886,7 @@ HRESULT RPC_GetLocalClassObject(REFCLSID
return hres;
Sleep(1000);
} else {
- WARN("Connecting to %s, no response yet, retrying: le is %lx\n", debugstr_w(pipefn), GetLastError());
+ WARN("Connecting to %s, no response yet, retrying: le is %x\n", debugstr_w(pipefn), GetLastError());
Sleep(1000);
}
continue;
@@ -956,13 +956,13 @@ static DWORD WINAPI local_server_thread(
if (hPipe == INVALID_HANDLE_VALUE)
{
- FIXME("pipe creation failed for %s, le is %ld\n", debugstr_w(pipefn), GetLastError());
+ FIXME("pipe creation failed for %s, le is %d\n", debugstr_w(pipefn), GetLastError());
return 1;
}
while (1) {
if (!ConnectNamedPipe(hPipe,NULL) && GetLastError() != ERROR_PIPE_CONNECTED) {
- ERR("Failure during ConnectNamedPipe %ld, ABORT!\n",GetLastError());
+ ERR("Failure during ConnectNamedPipe %d, ABORT!\n",GetLastError());
break;
}
@@ -975,7 +975,7 @@ static DWORD WINAPI local_server_thread(
seekto.u.HighPart = 0;
hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
if (hres) {
- FIXME("IStream_Seek failed, %lx\n",hres);
+ FIXME("IStream_Seek failed, %x\n",hres);
return hres;
}
@@ -984,7 +984,7 @@ static DWORD WINAPI local_server_thread(
hres = IStream_Read(pStm,buffer,buflen,&res);
if (hres) {
- FIXME("Stream Read failed, %lx\n",hres);
+ FIXME("Stream Read failed, %x\n",hres);
HeapFree(GetProcessHeap(),0,buffer);
return hres;
}
diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c
index b946ab0..df2cea1 100644
--- a/dlls/ole32/stg_bigblockfile.c
+++ b/dlls/ole32/stg_bigblockfile.c
@@ -248,7 +248,7 @@ static BOOL BIGBLOCKFILE_FileInit(LPBIGB
This->maplist = NULL;
- TRACE("file len %lu\n", This->filesize.u.LowPart);
+ TRACE("file len %u\n", This->filesize.u.LowPart);
return TRUE;
}
@@ -285,7 +285,7 @@ static BOOL BIGBLOCKFILE_MemInit(LPBIGBL
This->pbytearray = GlobalLock(This->hbytearray);
- TRACE("mem on %p len %lu\n", This->pbytearray, This->filesize.u.LowPart);
+ TRACE("mem on %p len %u\n", This->pbytearray, This->filesize.u.LowPart);
return TRUE;
}
@@ -342,7 +342,7 @@ void* BIGBLOCKFILE_GetROBigBlock(
if (This->blocksize * (index + 1)
> ROUND_UP(This->filesize.u.LowPart, This->blocksize))
{
- TRACE("out of range %lu vs %lu\n", This->blocksize * (index + 1),
+ TRACE("out of range %u vs %u\n", This->blocksize * (index + 1),
This->filesize.u.LowPart);
return NULL;
}
@@ -434,7 +434,7 @@ void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE
if (This->filesize.u.LowPart == newSize.u.LowPart)
return;
- TRACE("from %lu to %lu\n", This->filesize.u.LowPart, newSize.u.LowPart);
+ TRACE("from %u to %u\n", This->filesize.u.LowPart, newSize.u.LowPart);
/*
* unmap all views, must be done before call to SetEndFile
*/
@@ -687,7 +687,7 @@ static BOOL BIGBLOCKFILE_MapPage(LPBIGBL
page->lpBytes = (LPBYTE)This->pbytearray + lowoffset;
}
- TRACE("mapped page %lu to %p\n", page->page_index, page->lpBytes);
+ TRACE("mapped page %u to %p\n", page->page_index, page->lpBytes);
return page->lpBytes != NULL;
}
@@ -717,7 +717,7 @@ static MappedPage *BIGBLOCKFILE_CreatePa
static void BIGBLOCKFILE_UnmapPage(LPBIGBLOCKFILE This, MappedPage *page)
{
- TRACE("%ld at %p\n", page->page_index, page->lpBytes);
+ TRACE("%d at %p\n", page->page_index, page->lpBytes);
if (page->refcnt > 0)
ERR("unmapping inuse page %p\n", page->lpBytes);
@@ -831,7 +831,7 @@ static void BIGBLOCKFILE_RemapList(LPBIG
if (list->page_index * PAGE_SIZE > This->filesize.u.LowPart)
{
- TRACE("discarding %lu\n", list->page_index);
+ TRACE("discarding %u\n", list->page_index);
/* page is entirely outside of the file, delete it */
BIGBLOCKFILE_UnlinkPage(list);
diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c
index f0d144b..ec613b1 100644
--- a/dlls/ole32/stg_prop.c
+++ b/dlls/ole32/stg_prop.c
@@ -305,7 +305,7 @@ static HRESULT WINAPI IPropertyStorage_f
HRESULT hr = S_OK;
ULONG i;
- TRACE("(%p, %ld, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar);
+ TRACE("(%p, %d, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar);
if (!cpspec)
return S_FALSE;
@@ -360,7 +360,7 @@ static HRESULT PropertyStorage_StringCop
HRESULT hr = S_OK;
int len;
- TRACE("%s, %p, %ld, %ld\n",
+ TRACE("%s, %p, %d, %d\n",
srcCP == CP_UNICODE ? debugstr_w((LPCWSTR)src) : debugstr_a(src), dst,
dstCP, srcCP);
assert(src);
@@ -430,7 +430,7 @@ static HRESULT PropertyStorage_StringCop
HeapFree(GetProcessHeap(), 0, wideStr);
}
}
- TRACE("returning 0x%08lx (%s)\n", hr,
+ TRACE("returning 0x%08x (%s)\n", hr,
dstCP == CP_UNICODE ? debugstr_w((LPCWSTR)*dst) : debugstr_a(*dst));
return hr;
}
@@ -479,7 +479,7 @@ static HRESULT PropertyStorage_StoreProp
case VT_VECTOR|VT_I1:
This->format = 1;
}
- TRACE("Setting 0x%08lx to type %d\n", propid, propvar->vt);
+ TRACE("Setting 0x%08x to type %d\n", propid, propvar->vt);
if (prop)
{
PropVariantClear(prop);
@@ -537,7 +537,7 @@ static HRESULT PropertyStorage_StoreName
if (strlen(name) >= MAX_VERSION_0_PROP_NAME_LENGTH)
This->format = 1;
}
- TRACE("Adding prop name %s, propid %ld\n",
+ TRACE("Adding prop name %s, propid %d\n",
This->codePage == CP_UNICODE ? debugstr_w((LPCWSTR)name) :
debugstr_a(name), id);
dictionary_insert(This->name_to_propid, name, (void *)id);
@@ -560,7 +560,7 @@ static HRESULT WINAPI IPropertyStorage_f
HRESULT hr = S_OK;
ULONG i;
- TRACE("(%p, %ld, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar);
+ TRACE("(%p, %d, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar);
if (cpspec && (!rgpspec || !rgpropvar))
return E_INVALIDARG;
@@ -659,7 +659,7 @@ static HRESULT WINAPI IPropertyStorage_f
ULONG i;
HRESULT hr;
- TRACE("(%p, %ld, %p)\n", iface, cpspec, rgpspec);
+ TRACE("(%p, %d, %p)\n", iface, cpspec, rgpspec);
if (cpspec && !rgpspec)
return E_INVALIDARG;
@@ -707,7 +707,7 @@ static HRESULT WINAPI IPropertyStorage_f
ULONG i;
HRESULT hr = S_FALSE;
- TRACE("(%p, %ld, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName);
+ TRACE("(%p, %d, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName);
if (cpropid && (!rgpropid || !rglpwstrName))
return E_INVALIDARG;
@@ -747,7 +747,7 @@ static HRESULT WINAPI IPropertyStorage_f
ULONG i;
HRESULT hr;
- TRACE("(%p, %ld, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName);
+ TRACE("(%p, %d, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName);
if (cpropid && (!rgpropid || !rglpwstrName))
return E_INVALIDARG;
@@ -780,7 +780,7 @@ static HRESULT WINAPI IPropertyStorage_f
ULONG i;
HRESULT hr;
- TRACE("(%p, %ld, %p)\n", iface, cpropid, rgpropid);
+ TRACE("(%p, %d, %p)\n", iface, cpropid, rgpropid);
if (cpropid && !rgpropid)
return E_INVALIDARG;
@@ -816,7 +816,7 @@ static HRESULT WINAPI IPropertyStorage_f
PropertyStorage_impl *This = (PropertyStorage_impl *)iface;
HRESULT hr;
- TRACE("(%p, 0x%08lx)\n", iface, grfCommitFlags);
+ TRACE("(%p, 0x%08x)\n", iface, grfCommitFlags);
if (!(This->grfMode & STGM_READWRITE))
return STG_E_ACCESSDENIED;
@@ -961,7 +961,7 @@ static void PropertyStorage_PropNameDest
static int PropertyStorage_PropCompare(const void *a, const void *b,
void *extra)
{
- TRACE("(%ld, %ld)\n", (PROPID)a, (PROPID)b);
+ TRACE("(%d, %d)\n", (PROPID)a, (PROPID)b);
return (PROPID)a - (PROPID)b;
}
@@ -1004,7 +1004,7 @@ static HRESULT PropertyStorage_ReadDicti
assert(This->propid_to_name);
StorageUtl_ReadDWord(ptr, 0, &numEntries);
- TRACE("Reading %ld entries:\n", numEntries);
+ TRACE("Reading %d entries:\n", numEntries);
ptr += sizeof(DWORD);
for (i = 0; SUCCEEDED(hr) && i < numEntries; i++)
{
@@ -1015,7 +1015,7 @@ static HRESULT PropertyStorage_ReadDicti
ptr += sizeof(PROPID);
StorageUtl_ReadDWord(ptr, 0, &cbEntry);
ptr += sizeof(DWORD);
- TRACE("Reading entry with ID 0x%08lx, %ld bytes\n", propid, cbEntry);
+ TRACE("Reading entry with ID 0x%08x, %d bytes\n", propid, cbEntry);
/* Make sure the source string is NULL-terminated */
if (This->codePage != CP_UNICODE)
ptr[cbEntry - 1] = '\0';
@@ -1074,7 +1074,7 @@ static HRESULT PropertyStorage_ReadPrope
case VT_UINT:
case VT_UI4:
StorageUtl_ReadDWord(data, 0, &prop->u.ulVal);
- TRACE("Read ulong %ld\n", prop->u.ulVal);
+ TRACE("Read ulong %d\n", prop->u.ulVal);
break;
case VT_LPSTR:
{
@@ -1177,7 +1177,7 @@ static HRESULT PropertyStorage_ReadHeade
{
if (count != sizeof(buf))
{
- WARN("read only %ld\n", count);
+ WARN("read only %d\n", count);
hr = STG_E_INVALIDHEADER;
}
else
@@ -1194,7 +1194,7 @@ static HRESULT PropertyStorage_ReadHeade
&hdr->reserved);
}
}
- TRACE("returning 0x%08lx\n", hr);
+ TRACE("returning 0x%08x\n", hr);
return hr;
}
@@ -1212,7 +1212,7 @@ static HRESULT PropertyStorage_ReadFmtId
{
if (count != sizeof(buf))
{
- WARN("read only %ld\n", count);
+ WARN("read only %d\n", count);
hr = STG_E_INVALIDHEADER;
}
else
@@ -1223,7 +1223,7 @@ static HRESULT PropertyStorage_ReadFmtId
&fmt->dwOffset);
}
}
- TRACE("returning 0x%08lx\n", hr);
+ TRACE("returning 0x%08x\n", hr);
return hr;
}
@@ -1241,7 +1241,7 @@ static HRESULT PropertyStorage_ReadSecti
{
if (count != sizeof(buf))
{
- WARN("read only %ld\n", count);
+ WARN("read only %d\n", count);
hr = STG_E_INVALIDHEADER;
}
else
@@ -1252,7 +1252,7 @@ static HRESULT PropertyStorage_ReadSecti
cProperties), &hdr->cProperties);
}
}
- TRACE("returning 0x%08lx\n", hr);
+ TRACE("returning 0x%08x\n", hr);
return hr;
}
@@ -1324,7 +1324,7 @@ static HRESULT PropertyStorage_ReadFromS
goto end;
if (fmtOffset.dwOffset > stat.cbSize.u.LowPart)
{
- WARN("invalid offset %ld (stream length is %ld)\n", fmtOffset.dwOffset,
+ WARN("invalid offset %d (stream length is %d)\n", fmtOffset.dwOffset,
stat.cbSize.u.LowPart);
hr = STG_E_INVALIDHEADER;
goto end;
@@ -1342,7 +1342,7 @@ static HRESULT PropertyStorage_ReadFromS
/* The section size includes the section header, so check it */
if (sectionHdr.cbSection < sizeof(PROPERTYSECTIONHEADER))
{
- WARN("section header too small, got %ld\n", sectionHdr.cbSection);
+ WARN("section header too small, got %d\n", sectionHdr.cbSection);
hr = STG_E_INVALIDHEADER;
goto end;
}
@@ -1357,7 +1357,7 @@ static HRESULT PropertyStorage_ReadFromS
sizeof(PROPERTYSECTIONHEADER), &count);
if (FAILED(hr))
goto end;
- TRACE("Reading %ld properties:\n", sectionHdr.cProperties);
+ TRACE("Reading %d properties:\n", sectionHdr.cProperties);
for (i = 0; SUCCEEDED(hr) && i < sectionHdr.cProperties; i++)
{
PROPERTYIDOFFSET *idOffset = (PROPERTYIDOFFSET *)(buf +
@@ -1379,7 +1379,7 @@ static HRESULT PropertyStorage_ReadFromS
* later.
*/
dictOffset = idOffset->dwOffset;
- TRACE("Dictionary offset is %ld\n", dictOffset);
+ TRACE("Dictionary offset is %d\n", dictOffset);
}
else
{
@@ -1389,7 +1389,7 @@ static HRESULT PropertyStorage_ReadFromS
if (SUCCEEDED(PropertyStorage_ReadProperty(This, &prop,
buf + idOffset->dwOffset - sizeof(PROPERTYSECTIONHEADER))))
{
- TRACE("Read property with ID 0x%08lx, type %d\n",
+ TRACE("Read property with ID 0x%08x, type %d\n",
idOffset->propid, prop.vt);
switch(idOffset->propid)
{
@@ -1427,7 +1427,7 @@ static HRESULT PropertyStorage_ReadFromS
}
if (!This->locale)
This->locale = LOCALE_SYSTEM_DEFAULT;
- TRACE("Code page is %d, locale is %ld\n", This->codePage, This->locale);
+ TRACE("Code page is %d, locale is %d\n", This->codePage, This->locale);
if (dictOffset)
hr = PropertyStorage_ReadDictionary(This,
buf + dictOffset - sizeof(PROPERTYSECTIONHEADER));
@@ -1603,7 +1603,7 @@ static HRESULT PropertyStorage_WriteDict
*sectionOffset += closure.bytesWritten;
if (closure.bytesWritten % sizeof(DWORD))
{
- TRACE("adding %ld bytes of padding\n", sizeof(DWORD) -
+ TRACE("adding %d bytes of padding\n", sizeof(DWORD) -
closure.bytesWritten % sizeof(DWORD));
*sectionOffset += sizeof(DWORD) - closure.bytesWritten % sizeof(DWORD);
}
@@ -1624,7 +1624,7 @@ static HRESULT PropertyStorage_WriteProp
assert(var);
assert(sectionOffset);
- TRACE("%p, %ld, 0x%08lx, (%d), (%ld)\n", This, propNum, propid, var->vt,
+ TRACE("%p, %d, 0x%08x, (%d), (%d)\n", This, propNum, propid, var->vt,
*sectionOffset);
seek.QuadPart = SECTIONHEADER_OFFSET + sizeof(PROPERTYSECTIONHEADER) +
@@ -1744,7 +1744,7 @@ static HRESULT PropertyStorage_WriteProp
*sectionOffset += bytesWritten;
if (bytesWritten % sizeof(DWORD))
{
- TRACE("adding %ld bytes of padding\n", sizeof(DWORD) -
+ TRACE("adding %d bytes of padding\n", sizeof(DWORD) -
bytesWritten % sizeof(DWORD));
*sectionOffset += sizeof(DWORD) - bytesWritten % sizeof(DWORD);
}
@@ -2039,7 +2039,7 @@ static HRESULT PropertyStorage_Construct
else
ps->codePage = CP_UNICODE;
ps->locale = LOCALE_SYSTEM_DEFAULT;
- TRACE("Code page is %d, locale is %ld\n", ps->codePage, ps->locale);
+ TRACE("Code page is %d, locale is %d\n", ps->codePage, ps->locale);
*pps = (IPropertyStorage *)ps;
TRACE("PropertyStorage %p constructed\n", ps);
hr = S_OK;
@@ -2106,7 +2106,7 @@ static HRESULT WINAPI IPropertySetStorag
IStream *stm = NULL;
HRESULT r;
- TRACE("%p %s %08lx %08lx %p\n", This, debugstr_guid(rfmtid), grfFlags,
+ TRACE("%p %s %08x %08x %p\n", This, debugstr_guid(rfmtid), grfFlags,
grfMode, ppprstg);
/* be picky */
@@ -2143,7 +2143,7 @@ static HRESULT WINAPI IPropertySetStorag
r = PropertyStorage_ConstructEmpty(stm, rfmtid, grfFlags, grfMode, ppprstg);
end:
- TRACE("returning 0x%08lx\n", r);
+ TRACE("returning 0x%08x\n", r);
return r;
}
@@ -2161,7 +2161,7 @@ static HRESULT WINAPI IPropertySetStorag
WCHAR name[CCH_MAX_PROPSTG_NAME];
HRESULT r;
- TRACE("%p %s %08lx %p\n", This, debugstr_guid(rfmtid), grfMode, ppprstg);
+ TRACE("%p %s %08x %p\n", This, debugstr_guid(rfmtid), grfMode, ppprstg);
/* be picky */
if (grfMode != (STGM_READWRITE|STGM_SHARE_EXCLUSIVE) &&
@@ -2188,7 +2188,7 @@ static HRESULT WINAPI IPropertySetStorag
r = PropertyStorage_ConstructFromStream(stm, rfmtid, grfMode, ppprstg);
end:
- TRACE("returning 0x%08lx\n", r);
+ TRACE("returning 0x%08x\n", r);
return r;
}
diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c
index c66fa65..467c3fc 100644
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -265,7 +265,7 @@ static HRESULT WINAPI StgStreamImpl_Read
ULONG bytesToReadFromBuffer;
HRESULT res;
- TRACE("(%p, %p, %ld, %p)\n",
+ TRACE("(%p, %p, %d, %p)\n",
iface, pv, cb, pcbRead);
if (!This->parentStorage)
@@ -335,7 +335,7 @@ static HRESULT WINAPI StgStreamImpl_Read
}
end:
- TRACE("<-- %08lx\n", res);
+ TRACE("<-- %08x\n", res);
return res;
}
@@ -361,7 +361,7 @@ static HRESULT WINAPI StgStreamImpl_Writ
ULONG bytesWritten = 0;
HRESULT res;
- TRACE("(%p, %p, %ld, %p)\n",
+ TRACE("(%p, %p, %d, %p)\n",
iface, pv, cb, pcbWritten);
/*
@@ -373,7 +373,7 @@ static HRESULT WINAPI StgStreamImpl_Writ
case STGM_READWRITE:
break;
default:
- WARN("access denied by flags: 0x%lx\n", STGM_ACCESS_MODE(This->grfMode));
+ WARN("access denied by flags: 0x%x\n", STGM_ACCESS_MODE(This->grfMode));
return STG_E_ACCESSDENIED;
}
@@ -454,7 +454,7 @@ static HRESULT WINAPI StgStreamImpl_Writ
*/
This->currentPosition.u.LowPart += *pcbWritten;
- TRACE("<-- S_OK, written %lu\n", *pcbWritten);
+ TRACE("<-- S_OK, written %u\n", *pcbWritten);
return res;
}
@@ -476,7 +476,7 @@ static HRESULT WINAPI StgStreamImpl_Seek
ULARGE_INTEGER newPosition;
- TRACE("(%p, %ld, %ld, %p)\n",
+ TRACE("(%p, %d, %d, %p)\n",
iface, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
/*
@@ -544,7 +544,7 @@ static HRESULT WINAPI StgStreamImpl_SetS
StgProperty curProperty;
BOOL Success;
- TRACE("(%p, %ld)\n", iface, libNewSize.u.LowPart);
+ TRACE("(%p, %d)\n", iface, libNewSize.u.LowPart);
if(!This->parentStorage)
return STG_E_REVERTED;
@@ -659,7 +659,7 @@ static HRESULT WINAPI StgStreamImpl_Copy
ULARGE_INTEGER totalBytesRead;
ULARGE_INTEGER totalBytesWritten;
- TRACE("(%p, %p, %ld, %p, %p)\n",
+ TRACE("(%p, %p, %d, %p, %p)\n",
iface, pstm, cb.u.LowPart, pcbRead, pcbWritten);
/*
@@ -809,7 +809,7 @@ static HRESULT WINAPI StgStreamImpl_Stat
StgProperty curProperty;
BOOL readSuccessful;
- TRACE("%p %p %ld\n", This, pstatstg, grfStatFlag);
+ TRACE("%p %p %d\n", This, pstatstg, grfStatFlag);
/*
* if stream has no parent, return STG_E_REVERTED
diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c
index 962992d..901150c 100644
--- a/dlls/ole32/storage.c
+++ b/dlls/ole32/storage.c
@@ -353,12 +353,12 @@ STORAGE_get_big_block(stream_access16 *s
if ((SetFilePointer( str->hf, (n+1)*BIGSIZE, NULL,
SEEK_SET ) == INVALID_SET_FILE_POINTER) && GetLastError())
{
- WARN("(%p,%d,%p), seek failed (%ld)\n",str->hf, n, block, GetLastError());
+ WARN("(%p,%d,%p), seek failed (%d)\n",str->hf, n, block, GetLastError());
return FALSE;
}
if (!ReadFile( str->hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE)
{
- WARN("(hf=%p, block size %d): read didn't read (%ld)\n",str->hf,n,GetLastError());
+ WARN("(hf=%p, block size %d): read didn't read (%d)\n",str->hf,n,GetLastError());
return FALSE;
}
} else {
@@ -382,7 +382,7 @@ STORAGE_get_big_block(stream_access16 *s
(LPVOID)args,
(LPDWORD)&hres
)) {
- ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %lx\n",hres);
+ ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %x\n",hres);
return FALSE;
}
memcpy(block, MapSL(args[3]), BIGSIZE);
@@ -414,7 +414,7 @@ _ilockbytes16_writeat(SEGPTR lockbytes,
(LPVOID)args,
(LPDWORD)&hres
)) {
- ERR("CallTo16 ILockBytes16::WriteAt() failed, hres %lx\n",hres);
+ ERR("CallTo16 ILockBytes16::WriteAt() failed, hres %x\n",hres);
return FALSE;
}
UnMapLS(args[3]);
@@ -434,12 +434,12 @@ STORAGE_put_big_block(stream_access16 *s
if ((SetFilePointer( str->hf, (n+1)*BIGSIZE, NULL,
SEEK_SET ) == INVALID_SET_FILE_POINTER) && GetLastError())
{
- WARN("seek failed (%ld)\n",GetLastError());
+ WARN("seek failed (%d)\n",GetLastError());
return FALSE;
}
if (!WriteFile( str->hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE)
{
- WARN(" write failed (%ld)\n",GetLastError());
+ WARN(" write failed (%d)\n",GetLastError());
return FALSE;
}
return TRUE;
@@ -719,9 +719,9 @@ STORAGE_dump_pps_entry(struct storage_pp
return;
DPRINTF("name: %s\n",name);
DPRINTF("type: %d\n",stde->pps_type);
- DPRINTF("prev pps: %ld\n",stde->pps_prev);
- DPRINTF("next pps: %ld\n",stde->pps_next);
- DPRINTF("dir pps: %ld\n",stde->pps_dir);
+ DPRINTF("prev pps: %d\n",stde->pps_prev);
+ DPRINTF("next pps: %d\n",stde->pps_next);
+ DPRINTF("dir pps: %d\n",stde->pps_dir);
DPRINTF("guid: %s\n",debugstr_guid(&(stde->pps_guid)));
if (stde->pps_type !=2) {
time_t t;
@@ -733,8 +733,8 @@ STORAGE_dump_pps_entry(struct storage_pp
t = dw;
DPRINTF("ts2: %s\n",ctime(&t));
}
- DPRINTF("startblock: %ld\n",stde->pps_sb);
- DPRINTF("size: %ld\n",stde->pps_size);
+ DPRINTF("startblock: %d\n",stde->pps_sb);
+ DPRINTF("size: %d\n",stde->pps_size);
}
/******************************************************************************
@@ -1107,7 +1107,7 @@ _ilockbytes16_addref(SEGPTR lockbytes) {
(LPVOID)args,
(LPDWORD)&hres
))
- ERR("CallTo16 ILockBytes16::AddRef() failed, hres %lx\n",hres);
+ ERR("CallTo16 ILockBytes16::AddRef() failed, hres %x\n",hres);
}
static void
@@ -1125,7 +1125,7 @@ _ilockbytes16_release(SEGPTR lockbytes)
(LPVOID)args,
(LPDWORD)&hres
))
- ERR("CallTo16 ILockBytes16::Release() failed, hres %lx\n",hres);
+ ERR("CallTo16 ILockBytes16::Release() failed, hres %x\n",hres);
}
static void
@@ -1143,7 +1143,7 @@ _ilockbytes16_flush(SEGPTR lockbytes) {
(LPVOID)args,
(LPDWORD)&hres
))
- ERR("CallTo16 ILockBytes16::Flush() failed, hres %lx\n",hres);
+ ERR("CallTo16 ILockBytes16::Flush() failed, hres %x\n",hres);
}
/******************************************************************************
@@ -1180,7 +1180,7 @@ HRESULT CDECL IStream16_fnSeek(
IStream16* iface,LARGE_INTEGER offset,DWORD whence,ULARGE_INTEGER *newpos
) {
IStream16Impl *This = (IStream16Impl *)iface;
- TRACE_(relay)("(%p)->([%ld.%ld],%ld,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos);
+ TRACE_(relay)("(%p)->([%d.%d],%d,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos);
switch (whence) {
/* unix SEEK_xx should be the same as win95 ones */
@@ -1229,7 +1229,7 @@ HRESULT CDECL IStream16_fnRead(
int blocknr;
LPBYTE pbv = pv;
- TRACE_(relay)("(%p)->(%p,%ld,%p)\n",This,pv,cb,pcbRead);
+ TRACE_(relay)("(%p)->(%p,%d,%p)\n",This,pv,cb,pcbRead);
if (!pcbRead) bytesread=&xxread;
*bytesread = 0;
@@ -1294,7 +1294,7 @@ HRESULT CDECL IStream16_fnWrite(
if (!pcbWrite) byteswritten=&xxwritten;
*byteswritten = 0;
- TRACE_(relay)("(%p)->(%p,%ld,%p)\n",This,pv,cb,pcbWrite);
+ TRACE_(relay)("(%p)->(%p,%d,%p)\n",This,pv,cb,pcbWrite);
/* do we need to junk some blocks? */
newsize = This->offset.u.LowPart+cb;
oldsize = This->stde.pps_size;
@@ -1714,7 +1714,7 @@ HRESULT CDECL IStorage16_fnStat(
DWORD len = WideCharToMultiByte( CP_ACP, 0, This->stde.pps_rawname, -1, NULL, 0, NULL, NULL );
LPSTR nameA = HeapAlloc( GetProcessHeap(), 0, len );
- TRACE("(%p)->(%p,0x%08lx)\n",
+ TRACE("(%p)->(%p,0x%08x)\n",
This,pstatstg,grfStatFlag
);
WideCharToMultiByte( CP_ACP, 0, This->stde.pps_rawname, -1, nameA, len, NULL, NULL );
@@ -1739,7 +1739,7 @@ HRESULT CDECL IStorage16_fnCommit(
LPSTORAGE16 iface,DWORD commitflags
) {
IStorage16Impl *This = (IStorage16Impl *)iface;
- FIXME("(%p)->(0x%08lx),STUB!\n",
+ FIXME("(%p)->(0x%08x),STUB!\n",
This,commitflags
);
return S_OK;
@@ -1750,7 +1750,7 @@ HRESULT CDECL IStorage16_fnCommit(
*/
HRESULT CDECL IStorage16_fnCopyTo(LPSTORAGE16 iface,DWORD ciidExclude,const IID *rgiidExclude,SNB16 SNB16Exclude,IStorage16 *pstgDest) {
IStorage16Impl *This = (IStorage16Impl *)iface;
- FIXME("IStorage16(%p)->(0x%08lx,%s,%p,%p),stub!\n",
+ FIXME("IStorage16(%p)->(0x%08x,%s,%p,%p),stub!\n",
This,ciidExclude,debugstr_guid(rgiidExclude),SNB16Exclude,pstgDest
);
return S_OK;
@@ -1772,7 +1772,7 @@ HRESULT CDECL IStorage16_fnCreateStorage
int nPPSEntries;
READ_HEADER(&This->str);
- TRACE("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n",
+ TRACE("(%p)->(%s,0x%08x,0x%08x,0x%08x,%p)\n",
This,pwcsName,grfMode,dwStgFormat,reserved2,ppstg
);
if (grfMode & STGM_TRANSACTED)
@@ -1839,7 +1839,7 @@ HRESULT CDECL IStorage16_fnCreateStream(
BOOL ret;
int nPPSEntries;
- TRACE("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n",
+ TRACE("(%p)->(%s,0x%08x,0x%08x,0x%08x,%p)\n",
This,pwcsName,grfMode,reserved1,reserved2,ppstm
);
if (grfMode & STGM_TRANSACTED)
@@ -1901,7 +1901,7 @@ HRESULT CDECL IStorage16_fnOpenStorage(
WCHAR name[33];
int newpps;
- TRACE("(%p)->(%s,%p,0x%08lx,%p,0x%08lx,%p)\n",
+ TRACE("(%p)->(%s,%p,0x%08x,%p,0x%08x,%p)\n",
This,pwcsName,pstgPrio,grfMode,snbExclude,reserved,ppstg
);
if (grfMode & STGM_TRANSACTED)
@@ -1941,7 +1941,7 @@ HRESULT CDECL IStorage16_fnOpenStream(
WCHAR name[33];
int newpps;
- TRACE("(%p)->(%s,%p,0x%08lx,0x%08lx,%p)\n",
+ TRACE("(%p)->(%s,%p,0x%08x,0x%08x,%p)\n",
This,pwcsName,reserved1,grfMode,reserved2,ppstm
);
if (grfMode & STGM_TRANSACTED)
@@ -2052,13 +2052,13 @@ HRESULT WINAPI StgCreateDocFile16(
IStorage16Impl* lpstg;
struct storage_pps_entry stde;
- TRACE("(%s,0x%08lx,0x%08lx,%p)\n",
+ TRACE("(%s,0x%08x,0x%08x,%p)\n",
pwcsName,grfMode,reserved,ppstgOpen
);
_create_istorage16(ppstgOpen);
hf = CreateFileA(pwcsName,GENERIC_READ|GENERIC_WRITE,0,NULL,CREATE_NEW,0,0);
if (hf==INVALID_HANDLE_VALUE) {
- WARN("couldn't open file for storage:%ld\n",GetLastError());
+ WARN("couldn't open file for storage:%d\n",GetLastError());
return E_FAIL;
}
lpstg = MapSL((SEGPTR)*ppstgOpen);
@@ -2113,7 +2113,7 @@ HRESULT WINAPI StgOpenStorage16(
IStorage16Impl* lpstg;
struct storage_pps_entry stde;
- TRACE("(%s,%p,0x%08lx,%p,%ld,%p)\n",
+ TRACE("(%s,%p,0x%08x,%p,%d,%p)\n",
pwcsName,pstgPriority,grfMode,snbExclude,reserved,ppstgOpen
);
_create_istorage16(ppstgOpen);
@@ -2168,7 +2168,7 @@ HRESULT WINAPI StgIsStorageILockBytes16(
(LPVOID)args,
(LPDWORD)&hres
)) {
- ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %lx\n",hres);
+ ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %x\n",hres);
return hres;
}
if (memcmp(MapSL(args[3]), STORAGE_magic, sizeof(STORAGE_magic)) == 0) {
@@ -2194,7 +2194,7 @@ HRESULT WINAPI StgOpenStorageOnILockByte
int i,ret;
struct storage_pps_entry stde;
- FIXME("(%lx, %p, 0x%08lx, %d, %lx, %p)\n", plkbyt, pstgPriority, grfMode, (int)snbExclude, reserved, ppstgOpen);
+ FIXME("(%x, %p, 0x%08x, %d, %x, %p)\n", plkbyt, pstgPriority, grfMode, (int)snbExclude, reserved, ppstgOpen);
if ((plkbyt == 0) || (ppstgOpen == 0))
return STG_E_INVALIDPOINTER;
@@ -2241,7 +2241,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pst
HRESULT hres;
DWORD args[3];
- TRACE("(%lx, %p)\n", pstg, pclsid);
+ TRACE("(%x, %p)\n", pstg, pclsid);
if(pclsid==NULL)
return E_POINTER;
@@ -2262,7 +2262,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pst
(LPDWORD)&hres
)) {
WOWGlobalUnlockFree16(args[1]);
- ERR("CallTo16 IStorage16::Stat() failed, hres %lx\n",hres);
+ ERR("CallTo16 IStorage16::Stat() failed, hres %x\n",hres);
return hres;
}
memcpy(&statstg, MapSL(args[1]), sizeof(STATSTG16));
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 0293073..cd67465 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -319,7 +319,7 @@ static ULONG WINAPI StorageBaseImpl_AddR
StorageBaseImpl *This = (StorageBaseImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) AddRef to %ld\n", This, ref);
+ TRACE("(%p) AddRef to %d\n", This, ref);
return ref;
}
@@ -341,7 +341,7 @@ static ULONG WINAPI StorageBaseImpl_Rele
*/
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) ReleaseRef to %d\n", This, ref);
/*
* If the reference count goes down to 0, perform suicide.
@@ -381,7 +381,7 @@ static HRESULT WINAPI StorageBaseImpl_Op
ULONG foundPropertyIndex;
HRESULT res = STG_E_UNKNOWN;
- TRACE("(%p, %s, %p, %lx, %ld, %p)\n",
+ TRACE("(%p, %s, %p, %x, %d, %p)\n",
iface, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm);
/*
@@ -487,7 +487,7 @@ static HRESULT WINAPI StorageBaseImpl_Op
end:
if (res == S_OK)
TRACE("<-- IStream %p\n", *ppstm);
- TRACE("<-- %08lx\n", res);
+ TRACE("<-- %08x\n", res);
return res;
}
@@ -514,7 +514,7 @@ static HRESULT WINAPI StorageBaseImpl_Op
ULONG foundPropertyIndex;
HRESULT res = STG_E_UNKNOWN;
- TRACE("(%p, %s, %p, %lx, %p, %ld, %p)\n",
+ TRACE("(%p, %s, %p, %x, %p, %d, %p)\n",
iface, debugstr_w(pwcsName), pstgPriority,
grfMode, snbExclude, reserved, ppstg);
@@ -626,7 +626,7 @@ static HRESULT WINAPI StorageBaseImpl_Op
res = STG_E_FILENOTFOUND;
end:
- TRACE("<-- %08lx\n", res);
+ TRACE("<-- %08x\n", res);
return res;
}
@@ -648,7 +648,7 @@ static HRESULT WINAPI StorageBaseImpl_En
StorageBaseImpl *This = (StorageBaseImpl *)iface;
IEnumSTATSTGImpl* newEnum;
- TRACE("(%p, %ld, %p, %ld, %p)\n",
+ TRACE("(%p, %d, %p, %d, %p)\n",
iface, reserved1, reserved2, reserved3, ppenum);
/*
@@ -697,7 +697,7 @@ static HRESULT WINAPI StorageBaseImpl_St
BOOL readSuccessful;
HRESULT res = STG_E_UNKNOWN;
- TRACE("(%p, %p, %lx)\n",
+ TRACE("(%p, %p, %x)\n",
iface, pstatstg, grfStatFlag);
/*
@@ -735,9 +735,9 @@ static HRESULT WINAPI StorageBaseImpl_St
end:
if (res == S_OK)
{
- TRACE("<-- STATSTG: pwcsName: %s, type: %ld, cbSize.Low/High: %ld/%ld, grfMode: %08lx, grfLocksSupported: %ld, grfStateBits: %08lx\n", debugstr_w(pstatstg->pwcsName), pstatstg->type, pstatstg->cbSize.u.LowPart, pstatstg->cbSize.u.HighPart, pstatstg->grfMode, pstatstg->grfLocksSupported, pstatstg->grfStateBits);
+ TRACE("<-- STATSTG: pwcsName: %s, type: %d, cbSize.Low/High: %d/%d, grfMode: %08x, grfLocksSupported: %d, grfStateBits: %08x\n", debugstr_w(pstatstg->pwcsName), pstatstg->type, pstatstg->cbSize.u.LowPart, pstatstg->cbSize.u.HighPart, pstatstg->grfMode, pstatstg->grfLocksSupported, pstatstg->grfStateBits);
}
- TRACE("<-- %08lx\n", res);
+ TRACE("<-- %08x\n", res);
return res;
}
@@ -921,7 +921,7 @@ static HRESULT WINAPI StorageBaseImpl_Cr
StgProperty currentProperty, newStreamProperty;
ULONG foundPropertyIndex, newPropertyIndex;
- TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
+ TRACE("(%p, %s, %x, %d, %d, %p)\n",
iface, debugstr_w(pwcsName), grfMode,
reserved1, reserved2, ppstm);
@@ -1141,7 +1141,7 @@ static HRESULT WINAPI StorageImpl_Create
ULONG newPropertyIndex;
HRESULT hr;
- TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
+ TRACE("(%p, %s, %x, %d, %d, %p)\n",
iface, debugstr_w(pwcsName), grfMode,
reserved1, reserved2, ppstg);
@@ -1165,7 +1165,7 @@ static HRESULT WINAPI StorageImpl_Create
if ( FAILED( validateSTGM(grfMode) ) ||
(grfMode & STGM_DELETEONRELEASE) )
{
- WARN("bad grfMode: 0x%lx\n", grfMode);
+ WARN("bad grfMode: 0x%x\n", grfMode);
return STG_E_INVALIDFLAG;
}
@@ -1539,7 +1539,7 @@ static HRESULT WINAPI StorageImpl_CopyTo
if ((ciidExclude != 0) || (rgiidExclude != NULL) || (snbExclude != NULL))
FIXME("Exclude option not implemented\n");
- TRACE("(%p, %ld, %p, %p, %p)\n",
+ TRACE("(%p, %d, %p, %p, %p)\n",
iface, ciidExclude, rgiidExclude,
snbExclude, pstgDest);
@@ -1673,7 +1673,7 @@ static HRESULT WINAPI StorageImpl_CopyTo
}
else
{
- WARN("unknown element type: %ld\n", curElement.type);
+ WARN("unknown element type: %d\n", curElement.type);
}
} while (hr == S_OK);
@@ -1696,7 +1696,7 @@ static HRESULT WINAPI StorageImpl_MoveEl
const OLECHAR *pwcsNewName,/* [string][in] */
DWORD grfFlags) /* [in] */
{
- FIXME("(%p %s %p %s %lu): stub\n", iface,
+ FIXME("(%p %s %p %s %u): stub\n", iface,
debugstr_w(pwcsName), pstgDest,
debugstr_w(pwcsNewName), grfFlags);
return E_NOTIMPL;
@@ -1716,7 +1716,7 @@ static HRESULT WINAPI StorageImpl_Commit
IStorage* iface,
DWORD grfCommitFlags)/* [in] */
{
- FIXME("(%p %ld): stub\n", iface, grfCommitFlags);
+ FIXME("(%p %d): stub\n", iface, grfCommitFlags);
return S_OK;
}
@@ -2942,7 +2942,7 @@ static HRESULT StorageImpl_GetNextBlockI
if(depotBlockCount >= This->bigBlockDepotCount)
{
- WARN("depotBlockCount %ld, bigBlockDepotCount %ld\n", depotBlockCount,
+ WARN("depotBlockCount %d, bigBlockDepotCount %d\n", depotBlockCount,
This->bigBlockDepotCount);
return STG_E_READFAULT;
}
@@ -3620,7 +3620,7 @@ BlockChainStream* Storage32Impl_SmallBlo
if (FAILED(resRead) || FAILED(resWrite))
{
- ERR("conversion failed: resRead = 0x%08lx, resWrite = 0x%08lx\n", resRead, resWrite);
+ ERR("conversion failed: resRead = 0x%08x, resWrite = 0x%08x\n", resRead, resWrite);
BlockChainStream_Destroy(bbTempChain);
return NULL;
}
@@ -5686,7 +5686,7 @@ HRESULT WINAPI StgCreateDocfile(
DWORD fileAttributes;
WCHAR tempFileName[MAX_PATH];
- TRACE("(%s, %lx, %ld, %p)\n",
+ TRACE("(%s, %x, %d, %p)\n",
debugstr_w(pwcsName), grfMode,
reserved, ppstgOpen);
@@ -5827,7 +5827,7 @@ HRESULT WINAPI StgCreateDocfile(
(REFIID)&IID_IStorage,
(void**)ppstgOpen);
end:
- TRACE("<-- %p r = %08lx\n", *ppstgOpen, hr);
+ TRACE("<-- %p r = %08x\n", *ppstgOpen, hr);
return hr;
}
@@ -5837,7 +5837,7 @@ end:
*/
HRESULT WINAPI StgCreateStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD stgfmt, DWORD grfAttrs, STGOPTIONS* pStgOptions, void* reserved, REFIID riid, void** ppObjectOpen)
{
- TRACE("(%s, %lx, %lx, %lx, %p, %p, %p, %p)\n", debugstr_w(pwcsName),
+ TRACE("(%s, %x, %x, %x, %p, %p, %p, %p)\n", debugstr_w(pwcsName),
grfMode, stgfmt, grfAttrs, pStgOptions, reserved, riid, ppObjectOpen);
if (stgfmt != STGFMT_FILE && grfAttrs != 0)
@@ -5876,7 +5876,7 @@ HRESULT WINAPI StgCreatePropSetStg(IStor
{
HRESULT hr;
- TRACE("(%p, 0x%lx, %p)\n", pstg, reserved, ppPropSetStg);
+ TRACE("(%p, 0x%x, %p)\n", pstg, reserved, ppPropSetStg);
if (reserved)
hr = STG_E_INVALIDPARAMETER;
else
@@ -5890,7 +5890,7 @@ HRESULT WINAPI StgCreatePropSetStg(IStor
*/
HRESULT WINAPI StgOpenStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD stgfmt, DWORD grfAttrs, STGOPTIONS* pStgOptions, void* reserved, REFIID riid, void** ppObjectOpen)
{
- TRACE("(%s, %lx, %lx, %lx, %p, %p, %p, %p)\n", debugstr_w(pwcsName),
+ TRACE("(%s, %x, %x, %x, %p, %p, %p, %p)\n", debugstr_w(pwcsName),
grfMode, stgfmt, grfAttrs, pStgOptions, reserved, riid, ppObjectOpen);
if (stgfmt != STGFMT_DOCFILE && grfAttrs != 0)
@@ -5948,7 +5948,7 @@ HRESULT WINAPI StgOpenStorage(
WCHAR fullname[MAX_PATH];
BOOL newFile;
- TRACE("(%s, %p, %lx, %p, %ld, %p)\n",
+ TRACE("(%s, %p, %x, %p, %d, %p)\n",
debugstr_w(pwcsName), pstgPriority, grfMode,
snbExclude, reserved, ppstgOpen);
@@ -6144,7 +6144,7 @@ HRESULT WINAPI StgOpenStorage(
(void**)ppstgOpen);
end:
- TRACE("<-- %08lx, IStorage %p\n", hr, ppstgOpen ? *ppstgOpen : NULL);
+ TRACE("<-- %08x, IStorage %p\n", hr, ppstgOpen ? *ppstgOpen : NULL);
return hr;
}
@@ -6463,7 +6463,7 @@ static HRESULT validateSTGM(DWORD stgm)
if (stgm&~STGM_KNOWN_FLAGS)
{
- ERR("unknown flags %08lx\n", stgm);
+ ERR("unknown flags %08x\n", stgm);
return E_FAIL;
}
@@ -7061,7 +7061,7 @@ static HRESULT STREAM_ReadString( IStrea
if( count != sizeof(len) )
return E_OUTOFMEMORY;
- TRACE("%ld bytes\n",len);
+ TRACE("%d bytes\n",len);
str = CoTaskMemAlloc( len );
if( !str )
@@ -7193,7 +7193,7 @@ HRESULT WINAPI ReadFmtUserTypeStg (LPSTO
STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm );
if( FAILED ( r ) )
{
- WARN("Failed to open stream r = %08lx\n", r);
+ WARN("Failed to open stream r = %08x\n", r);
return r;
}
diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c
index f187404..520e56d 100644
--- a/dlls/ole32/stubmanager.c
+++ b/dlls/ole32/stubmanager.c
@@ -205,7 +205,7 @@ ULONG stub_manager_int_addref(struct stu
refs = ++This->refs;
LeaveCriticalSection(&This->apt->cs);
- TRACE("before %ld\n", refs - 1);
+ TRACE("before %d\n", refs - 1);
return refs;
}
@@ -219,7 +219,7 @@ ULONG stub_manager_int_release(struct st
EnterCriticalSection(&apt->cs);
refs = --This->refs;
- TRACE("after %ld\n", refs);
+ TRACE("after %d\n", refs);
/* remove from apartment so no other thread can access it... */
if (!refs)
@@ -247,7 +247,7 @@ ULONG stub_manager_ext_addref(struct stu
LeaveCriticalSection(&m->lock);
- TRACE("added %lu refs to %p (oid %s), rc is now %lu\n", refs, m, wine_dbgstr_longlong(m->oid), rc);
+ TRACE("added %u refs to %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc);
return rc;
}
@@ -265,7 +265,7 @@ ULONG stub_manager_ext_release(struct st
LeaveCriticalSection(&m->lock);
- TRACE("removed %lu refs from %p (oid %s), rc is now %lu\n", refs, m, wine_dbgstr_longlong(m->oid), rc);
+ TRACE("removed %u refs from %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc);
if (rc == 0 && last_unlock_releases)
stub_manager_int_release(m);
@@ -608,7 +608,7 @@ static ULONG WINAPI RemUnknown_AddRef(IR
refs = InterlockedIncrement(&This->refs);
- TRACE("%p before: %ld\n", iface, refs-1);
+ TRACE("%p before: %d\n", iface, refs-1);
return refs;
}
@@ -621,7 +621,7 @@ static ULONG WINAPI RemUnknown_Release(I
if (!refs)
HeapFree(GetProcessHeap(), 0, This);
- TRACE("%p after: %ld\n", iface, refs);
+ TRACE("%p after: %d\n", iface, refs);
return refs;
}
@@ -635,7 +635,7 @@ static HRESULT WINAPI RemUnknown_RemQuer
APARTMENT *apt;
struct stub_manager *stubmgr;
- TRACE("(%p)->(%s, %ld, %d, %p, %p)\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults);
+ TRACE("(%p)->(%s, %d, %d, %p, %p)\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults);
hr = ipid_to_stub_manager(ripid, &apt, &stubmgr);
if (hr != S_OK) return hr;
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061015/695ea79a/attachment-0001.pgp
More information about the wine-patches
mailing list