Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/oleaut32/Makefile.in | 2 +-
dlls/oleaut32/connpt.c | 120 +++--------------
dlls/oleaut32/dispatch.c | 13 +-
dlls/oleaut32/hash.c | 4 +-
dlls/oleaut32/oleaut.c | 10 +-
dlls/oleaut32/olefont.c | 53 +++-----
dlls/oleaut32/olepicture.c | 79 ++++-------
dlls/oleaut32/olepropframe.c | 10 +-
dlls/oleaut32/recinfo.c | 23 ++--
dlls/oleaut32/safearray.c | 20 +--
dlls/oleaut32/typelib.c | 254 +++++++++++++++--------------------
dlls/oleaut32/usrmarshal.c | 97 ++++++-------
dlls/oleaut32/varformat.c | 36 ++---
dlls/oleaut32/variant.c | 40 +++---
dlls/oleaut32/vartype.c | 24 ++--
15 files changed, 312 insertions(+), 473 deletions(-)
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index d9e7c7df332..a7dea7a37c7 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -2,7 +2,7 @@ MODULE = oleaut32.dll
IMPORTLIB = oleaut32
IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32
DELAYIMPORTS = comctl32 urlmon windowscodecs
-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_OLEAUT32_
+EXTRADEFS = -D_OLEAUT32_
C_SRCS = \
connpt.c \
diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c
index 0405d3857c8..993f2d9cf08 100644
--- a/dlls/oleaut32/connpt.c
+++ b/dlls/oleaut32/connpt.c
@@ -101,9 +101,6 @@ static inline EnumConnectionsImpl *impl_from_IEnumConnections(IEnumConnections *
return CONTAINING_RECORD(iface, EnumConnectionsImpl, IEnumConnections_iface);
}
-/************************************************************************
- * ConnectionPointImpl_Destroy
- */
static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj)
{
DWORD i;
@@ -118,11 +115,6 @@ static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj)
return;
}
-/************************************************************************
- * ConnectionPointImpl_QueryInterface (IUnknown)
- *
- * See Windows documentation for more details on IUnknown methods.
- */
static HRESULT WINAPI ConnectionPointImpl_QueryInterface(
IConnectionPoint* iface,
REFIID riid,
@@ -160,47 +152,29 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface(
return S_OK;
}
-
-/************************************************************************
- * ConnectionPointImpl_AddRef (IUnknown)
- *
- * See Windows documentation for more details on IUnknown methods.
- */
static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface)
{
ConnectionPointImpl *This = impl_from_IConnectionPoint(iface);
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(ref before=%d)\n", This, refCount - 1);
+ TRACE("%p, refcount %lu.\n", iface, refCount);
return refCount;
}
-/************************************************************************
- * ConnectionPointImpl_Release (IUnknown)
- *
- * See Windows documentation for more details on IUnknown methods.
- */
static ULONG WINAPI ConnectionPointImpl_Release(
IConnectionPoint* iface)
{
ConnectionPointImpl *This = impl_from_IConnectionPoint(iface);
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(ref before=%d)\n", This, refCount + 1);
+ TRACE("%p, refcount %lu.\n", iface, refCount);
- /*
- * If the reference count goes down to 0, perform suicide.
- */
if (!refCount) ConnectionPointImpl_Destroy(This);
return refCount;
}
-/************************************************************************
- * ConnectionPointImpl_GetConnectionInterface (IConnectionPoint)
- *
- */
static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface(
IConnectionPoint *iface,
IID *piid)
@@ -211,10 +185,6 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface(
return S_OK;
}
-/************************************************************************
- * ConnectionPointImpl_GetConnectionPointContainer (IConnectionPoint)
- *
- */
static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer(
IConnectionPoint *iface,
IConnectionPointContainer **ppCPC)
@@ -225,10 +195,6 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer(
return IUnknown_QueryInterface(This->Obj, &IID_IConnectionPointContainer, (void**)ppCPC);
}
-/************************************************************************
- * ConnectionPointImpl_Advise (IConnectionPoint)
- *
- */
static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface,
IUnknown *lpUnk,
DWORD *pdwCookie)
@@ -258,15 +224,11 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface,
}
-/************************************************************************
- * ConnectionPointImpl_Unadvise (IConnectionPoint)
- *
- */
-static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface,
- DWORD dwCookie)
+static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface, DWORD dwCookie)
{
ConnectionPointImpl *This = impl_from_IConnectionPoint(iface);
- TRACE("(%p)->(%d)\n", This, dwCookie);
+
+ TRACE("%p, %#lx.\n", iface, dwCookie);
if(dwCookie == 0 || dwCookie > This->maxSinks) return E_INVALIDARG;
@@ -278,13 +240,7 @@ static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface,
return S_OK;
}
-/************************************************************************
- * ConnectionPointImpl_EnumConnections (IConnectionPoint)
- *
- */
-static HRESULT WINAPI ConnectionPointImpl_EnumConnections(
- IConnectionPoint *iface,
- LPENUMCONNECTIONS *ppEnum)
+static HRESULT WINAPI ConnectionPointImpl_EnumConnections(IConnectionPoint *iface, IEnumConnections **ppEnum)
{
ConnectionPointImpl *This = impl_from_IConnectionPoint(iface);
CONNECTDATA *pCD;
@@ -337,9 +293,6 @@ static const IConnectionPointVtbl ConnectionPointImpl_VTable =
static const IEnumConnectionsVtbl EnumConnectionsImpl_VTable;
-/************************************************************************
- * EnumConnectionsImpl_Construct
- */
static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk,
DWORD nSinks,
CONNECTDATA *pCD)
@@ -361,9 +314,6 @@ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk,
return Obj;
}
-/************************************************************************
- * EnumConnectionsImpl_Destroy
- */
static void EnumConnectionsImpl_Destroy(EnumConnectionsImpl *Obj)
{
DWORD i;
@@ -376,11 +326,6 @@ static void EnumConnectionsImpl_Destroy(EnumConnectionsImpl *Obj)
return;
}
-/************************************************************************
- * EnumConnectionsImpl_QueryInterface (IUnknown)
- *
- * See Windows documentation for more details on IUnknown methods.
- */
static HRESULT WINAPI EnumConnectionsImpl_QueryInterface(
IEnumConnections* iface,
REFIID riid,
@@ -417,56 +362,37 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface(
return S_OK;
}
-
-/************************************************************************
- * EnumConnectionsImpl_AddRef (IUnknown)
- *
- * See Windows documentation for more details on IUnknown methods.
- */
static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface)
{
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(ref before=%d)\n", This, refCount - 1);
+ TRACE("%p, refcount %lu.\n", iface, refCount);
IUnknown_AddRef(This->pUnk);
return refCount;
}
-/************************************************************************
- * EnumConnectionsImpl_Release (IUnknown)
- *
- * See Windows documentation for more details on IUnknown methods.
- */
static ULONG WINAPI EnumConnectionsImpl_Release(IEnumConnections* iface)
{
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(ref before=%d)\n", This, refCount + 1);
+ TRACE("%p, refcount %lu.\n", iface, refCount);
IUnknown_Release(This->pUnk);
- /*
- * If the reference count goes down to 0, perform suicide.
- */
if (!refCount) EnumConnectionsImpl_Destroy(This);
return refCount;
}
-/************************************************************************
- * EnumConnectionsImpl_Next (IEnumConnections)
- *
- */
-static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface,
- ULONG cConn, LPCONNECTDATA pCD,
- ULONG *pEnum)
+static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, ULONG cConn, LPCONNECTDATA pCD, ULONG *pEnum)
{
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
DWORD nRet = 0;
- TRACE("(%p)->(%d, %p, %p)\n", This, cConn, pCD, pEnum);
+
+ TRACE("%p, %lu, %p, %p.\n", iface, cConn, pCD, pEnum);
if(pEnum == NULL) {
if(cConn != 1)
@@ -491,16 +417,11 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface,
return S_OK;
}
-
-/************************************************************************
- * EnumConnectionsImpl_Skip (IEnumConnections)
- *
- */
-static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface,
- ULONG cSkip)
+static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, ULONG cSkip)
{
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
- TRACE("(%p)->(%d)\n", This, cSkip);
+
+ TRACE("%p, %lu.\n", iface, cSkip);
if(This->nCur + cSkip >= This->nConns)
return S_FALSE;
@@ -510,11 +431,6 @@ static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface,
return S_OK;
}
-
-/************************************************************************
- * EnumConnectionsImpl_Reset (IEnumConnections)
- *
- */
static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface)
{
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
@@ -525,13 +441,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface)
return S_OK;
}
-
-/************************************************************************
- * EnumConnectionsImpl_Clone (IEnumConnections)
- *
- */
-static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface,
- LPENUMCONNECTIONS *ppEnum)
+static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface, IEnumConnections **ppEnum)
{
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
EnumConnectionsImpl *newObj;
diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c
index 39d6fddee51..7fa96e5af83 100644
--- a/dlls/oleaut32/dispatch.c
+++ b/dlls/oleaut32/dispatch.c
@@ -248,7 +248,7 @@ static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface)
StdDispatch *This = impl_from_IDispatch(iface);
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(ref before=%u)\n",This, refCount - 1);
+ TRACE("%p, refcount %lu.\n", iface, refCount);
return refCount;
}
@@ -263,7 +263,7 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface)
StdDispatch *This = impl_from_IDispatch(iface);
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(ref before=%u)\n", This, refCount + 1);
+ TRACE("%p, refcount %lu.\n", iface, refCount);
if (!refCount)
{
@@ -319,7 +319,8 @@ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pcti
static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo)
{
StdDispatch *This = impl_from_IDispatch(iface);
- TRACE("(%d, %x, %p)\n", iTInfo, lcid, ppTInfo);
+
+ TRACE("%d, %#lx, %p.\n", iTInfo, lcid, ppTInfo);
*ppTInfo = NULL;
if (iTInfo != 0)
@@ -360,7 +361,8 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI
static HRESULT WINAPI StdDispatch_GetIDsOfNames(LPDISPATCH iface, REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId)
{
StdDispatch *This = impl_from_IDispatch(iface);
- TRACE("(%s, %p, %d, 0x%x, %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
+
+ TRACE("%s, %p, %d, %#lx, %p.\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
if (!IsEqualGUID(riid, &IID_NULL))
{
@@ -398,7 +400,8 @@ static HRESULT WINAPI StdDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMember,
EXCEPINFO * pExcepInfo, UINT * puArgErr)
{
StdDispatch *This = impl_from_IDispatch(iface);
- TRACE("(%d, %s, 0x%x, 0x%x, %p, %p, %p, %p)\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
+
+ TRACE("%ld, %s, %#lx, 0x%x, %p, %p, %p, %p.\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
if (!IsEqualGUID(riid, &IID_NULL))
{
diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c
index 43043980adb..f1df69ef5e3 100644
--- a/dlls/oleaut32/hash.c
+++ b/dlls/oleaut32/hash.c
@@ -509,7 +509,7 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr)
ULONG nHiWord, nLoWord = 0x0deadbee;
const unsigned char *str = (const unsigned char *)lpStr, *pnLookup = NULL;
- TRACE("(%d, 0x%x, %s) %s\n", skind, lcid, debugstr_a(lpStr),
+ TRACE("%d, %#lx, %s, %s.\n", skind, lcid, debugstr_a(lpStr),
(skind == SYS_WIN16) ? "SYS_WIN16" : (skind == SYS_WIN32) ? "SYS_WIN32" : "");
if (!str)
@@ -520,7 +520,7 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr)
switch (PRIMARYLANGID(LANGIDFROMLCID(lcid)))
{
default:
- ERR("Unknown lcid %x, treating as latin-based, please report\n", lcid);
+ ERR("Unknown lcid %lx, treating as latin-based, please report\n", lcid);
/* .. Fall Through .. */
case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN:
case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE:
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index c29e64a4091..858622c833c 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -691,7 +691,7 @@ HRESULT WINAPI OleTranslateColor(
COLORREF colorref;
BYTE b = HIBYTE(HIWORD(clr));
- TRACE("(%08x, %p, %p)\n", clr, hpal, pColorRef);
+ TRACE("%#lx, %p, %p.\n", clr, hpal, pColorRef);
/*
* In case pColorRef is NULL, provide our own to simplify the code.
@@ -814,7 +814,7 @@ static BOOL actctx_get_typelib_module(REFIID iid, WCHAR *module, DWORD len)
if (tlib->name_len/sizeof(WCHAR) >= len)
{
- ERR("need larger module buffer, %u\n", tlib->name_len);
+ ERR("need larger module buffer, %lu.\n", tlib->name_len);
return FALSE;
}
@@ -979,7 +979,7 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateProxy(IPSFactoryBuffer *iface,
hr = dispatch_create_proxy(outer, proxy, out);
if (FAILED(hr))
- ERR("Failed to create proxy, hr %#x.\n", hr);
+ ERR("Failed to create proxy, hr %#lx.\n", hr);
ITypeInfo_ReleaseTypeAttr(typeinfo, attr);
ITypeInfo_Release(typeinfo);
@@ -1025,7 +1025,7 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateStub(IPSFactoryBuffer *iface,
hr = dispatch_create_stub(server, stub);
if (FAILED(hr))
- ERR("Failed to create proxy, hr %#x.\n", hr);
+ ERR("Failed to create proxy, hr %#lx.\n", hr);
ITypeInfo_ReleaseTypeAttr(typeinfo, attr);
ITypeInfo_Release(typeinfo);
@@ -1173,7 +1173,7 @@ HRESULT WINAPI GetAltMonthNames(LCID lcid, LPOLESTR **str)
NULL
};
- TRACE("%#x, %p\n", lcid, str);
+ TRACE("%#lx, %p.\n", lcid, str);
if (PRIMARYLANGID(LANGIDFROMLCID(lcid)) == LANG_ARABIC)
*str = (LPOLESTR *)arabic_hijri;
diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index f071d00c602..28cfcdf933c 100644
--- a/dlls/oleaut32/olefont.c
+++ b/dlls/oleaut32/olefont.c
@@ -489,28 +489,20 @@ static HRESULT WINAPI OLEFontImpl_QueryInterface(
return S_OK;
}
-/************************************************************************
- * OLEFontImpl_AddRef (IUnknown)
- */
-static ULONG WINAPI OLEFontImpl_AddRef(
- IFont* iface)
+static ULONG WINAPI OLEFontImpl_AddRef(IFont* iface)
{
OLEFontImpl *this = impl_from_IFont(iface);
- TRACE("(%p)->(ref=%d)\n", this, this->ref);
- return InterlockedIncrement(&this->ref);
+ ULONG ref = InterlockedIncrement(&this->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
+ return ref;
}
-/************************************************************************
- * OLEFontImpl_Release (IUnknown)
- */
static ULONG WINAPI OLEFontImpl_Release(IFont* iface)
{
OLEFontImpl *this = impl_from_IFont(iface);
- ULONG ref;
+ ULONG ref = InterlockedDecrement(&this->ref);
- TRACE("(%p)->(ref=%d)\n", this, this->ref);
-
- ref = InterlockedDecrement(&this->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if (ref == 0)
{
@@ -712,15 +704,10 @@ static HRESULT WINAPI OLEFontImpl_get_Size(
return S_OK;
}
-/************************************************************************
- * OLEFontImpl_put_Size (IFont)
- */
-static HRESULT WINAPI OLEFontImpl_put_Size(
- IFont* iface,
- CY size)
+static HRESULT WINAPI OLEFontImpl_put_Size(IFont *iface, CY size)
{
OLEFontImpl *this = impl_from_IFont(iface);
- TRACE("(%p)->(%d)\n", this, size.s.Lo);
+ TRACE("%p, %ld.\n", iface, size.s.Lo);
this->description.cySize.s.Hi = 0;
this->description.cySize.s.Lo = size.s.Lo;
OLEFont_SendNotify(this, DISPID_FONT_SIZE);
@@ -728,14 +715,7 @@ static HRESULT WINAPI OLEFontImpl_put_Size(
return S_OK;
}
-/************************************************************************
- * OLEFontImpl_get_Bold (IFont)
- *
- * See Windows documentation for more details on IFont methods.
- */
-static HRESULT WINAPI OLEFontImpl_get_Bold(
- IFont* iface,
- BOOL* pbold)
+static HRESULT WINAPI OLEFontImpl_get_Bold(IFont *iface, BOOL *pbold)
{
OLEFontImpl *this = impl_from_IFont(iface);
TRACE("(%p)->(%p)\n", this, pbold);
@@ -1063,7 +1043,8 @@ static HRESULT WINAPI OLEFontImpl_SetRatio(
LONG cyHimetric)
{
OLEFontImpl *this = impl_from_IFont(iface);
- TRACE("(%p)->(%d, %d)\n", this, cyLogical, cyHimetric);
+
+ TRACE("%p, %ld, %ld.\n", iface, cyLogical, cyHimetric);
if(cyLogical == 0 || cyHimetric == 0)
return E_FAIL;
@@ -1243,9 +1224,9 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo(
}
hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IFontDisp, ppTInfo);
ITypeLib_Release(tl);
- if (FAILED(hres)) {
- FIXME("Did not IDispatch typeinfo from typelib, hres %x\n",hres);
- }
+ if (FAILED(hres))
+ FIXME("Did not IDispatch typeinfo from typelib, hres %#lx.\n", hres);
+
return hres;
}
@@ -1302,7 +1283,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
OLEFontImpl *this = impl_from_IDispatch(iface);
HRESULT hr;
- TRACE("%p->(%d,%s,0x%x,0x%x,%p,%p,%p,%p)\n", this, dispIdMember,
+ TRACE("%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p.\n", iface, dispIdMember,
debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo,
puArgErr);
@@ -1499,7 +1480,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
}
break;
default:
- ERR("member not found for dispid 0x%x\n", dispIdMember);
+ ERR("member not found for dispid %#lx.\n", dispIdMember);
return DISP_E_MEMBERNOTFOUND;
}
}
@@ -2006,7 +1987,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load(
}
if (FAILED(iRes))
- WARN("-- 0x%08x\n", iRes);
+ WARN("-- %#lx.\n", iRes);
return iRes;
}
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 5dac8e4ee61..2f9e27042d9 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -401,49 +401,30 @@ static void OLEPictureImpl_Destroy(OLEPictureImpl* Obj)
HeapFree(GetProcessHeap(), 0, Obj);
}
-
-/************************************************************************
- * OLEPictureImpl_AddRef (IUnknown)
- *
- * See Windows documentation for more details on IUnknown methods.
- */
static ULONG WINAPI OLEPictureImpl_AddRef(
IPicture* iface)
{
OLEPictureImpl *This = impl_from_IPicture(iface);
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(ref before=%d)\n", This, refCount - 1);
+ TRACE("%p, refcount %lu.\n", iface, refCount);
return refCount;
}
-/************************************************************************
- * OLEPictureImpl_Release (IUnknown)
- *
- * See Windows documentation for more details on IUnknown methods.
- */
static ULONG WINAPI OLEPictureImpl_Release(
IPicture* iface)
{
OLEPictureImpl *This = impl_from_IPicture(iface);
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(ref before=%d)\n", This, refCount + 1);
+ TRACE("%p, refcount %lu.\n", iface, refCount);
- /*
- * If the reference count goes down to 0, perform suicide.
- */
if (!refCount) OLEPictureImpl_Destroy(This);
return refCount;
}
-/************************************************************************
- * OLEPictureImpl_QueryInterface (IUnknown)
- *
- * See Windows documentation for more details on IUnknown methods.
- */
static HRESULT WINAPI OLEPictureImpl_QueryInterface(
IPicture* iface,
REFIID riid,
@@ -578,26 +559,18 @@ static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface,
return S_OK;
}
-/************************************************************************
- * OLEPictureImpl_get_Width
- */
-static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface,
- OLE_XSIZE_HIMETRIC *pwidth)
+static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface, OLE_XSIZE_HIMETRIC *pwidth)
{
OLEPictureImpl *This = impl_from_IPicture(iface);
- TRACE("(%p)->(%p): width is %d\n", This, pwidth, This->himetricWidth);
+ TRACE("%p, %p.\n", iface, pwidth);
*pwidth = This->himetricWidth;
return S_OK;
}
-/************************************************************************
- * OLEPictureImpl_get_Height
- */
-static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface,
- OLE_YSIZE_HIMETRIC *pheight)
+static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, OLE_YSIZE_HIMETRIC *pheight)
{
OLEPictureImpl *This = impl_from_IPicture(iface);
- TRACE("(%p)->(%p): height is %d\n", This, pheight, This->himetricHeight);
+ TRACE("%p, %p.\n", iface, pheight);
*pheight = This->himetricHeight;
return S_OK;
}
@@ -656,8 +629,8 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc,
LPCRECT prcWBounds)
{
OLEPictureImpl *This = impl_from_IPicture(iface);
- TRACE("(%p)->(%p, (%d,%d), (%d,%d) <- (%d,%d), (%d,%d), %p)\n",
- This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds);
+ TRACE("%p, %p, (%ld,%ld), (%ld,%ld), (%ld,%ld), (%ld,%ld), %p)\n", iface, hdc, x, y, cx, cy, xSrc, ySrc,
+ cxSrc, cySrc, prcWBounds);
if(prcWBounds)
TRACE("prcWBounds %s\n", wine_dbgstr_rect(prcWBounds));
@@ -1225,7 +1198,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x
HDC hdcRef;
int i;
- TRACE("(this %p, xbuf %p, xread %u)\n", This, xbuf, xread);
+ TRACE("(this %p, xbuf %p, xread %lu)\n", This, xbuf, xread);
/*
FIXME("icon.idReserved=%d\n",cifd->idReserved);
@@ -1263,7 +1236,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x
}
if (xread < cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize)
{
- ERR("Icon data address %u is over %u bytes available.\n",
+ ERR("Icon data address %lu is over %lu bytes available.\n",
cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize, xread);
return E_FAIL;
}
@@ -1402,7 +1375,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
*/
hr = IStream_Stat(pStm,&statstg,STATFLAG_NONAME);
if (hr != S_OK) {
- TRACE("stat failed with hres %x, proceeding to read all data.\n",hr);
+ TRACE("stat failed with hres %#lx, proceeding to read all data.\n",hr);
statfailed = TRUE;
/* we will read at least 8 byte ... just right below */
statstg.cbSize.QuadPart = 8;
@@ -1414,7 +1387,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
do {
hr = IStream_Read(pStm, header, 8, &xread);
if (hr != S_OK || xread!=8) {
- ERR("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread);
+ ERR("Failure while reading picture header (hr is %#lx, nread is %ld).\n",hr,xread);
return (hr?hr:E_FAIL);
}
headerread += xread;
@@ -1422,7 +1395,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
if (!memcmp(&(header[0]),"lt\0\0", 4) && (statfailed || (header[1] + headerread <= statstg.cbSize.QuadPart))) {
if (toread != 0 && toread != header[1])
- FIXME("varying lengths of image data (prev=%u curr=%u), only last one will be used\n",
+ FIXME("varying lengths of image data (prev=%lu curr=%lu), only last one will be used\n",
toread, header[1]);
toread = header[1];
if (statfailed)
@@ -1447,7 +1420,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
else toread -= 8;
xread = 8;
} else {
- FIXME("Unknown stream header magic: %08x\n", header[0]);
+ FIXME("Unknown stream header magic: %#lx.\n", header[0]);
toread = header[1];
}
}
@@ -1478,8 +1451,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
}
}
if (hr != S_OK)
- TRACE("hr in no-stat loader case is %08x\n", hr);
- TRACE("loaded %d bytes.\n", xread);
+ TRACE("hr in no-stat loader case is %#lx.\n", hr);
+ TRACE("loaded %ld bytes.\n", xread);
This->datalen = xread;
This->data = xbuf;
} else {
@@ -1499,7 +1472,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
break;
}
if (xread != This->datalen)
- ERR("Could only read %d of %d bytes out of stream?\n",xread,This->datalen);
+ ERR("Could only read %ld of %d bytes out of stream?\n", xread, This->datalen);
}
if (This->datalen == 0) { /* Marks the "NONE" picture */
This->desc.picType = PICTYPE_NONE;
@@ -1542,7 +1515,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
hr = OLEPictureImpl_LoadEnhMetafile(This, xbuf, xread);
if (hr == S_OK) break;
- FIXME("Unknown magic %04x, %d read bytes:\n",magic,xread);
+ FIXME("Unknown magic %04x, %ld read bytes:\n", magic, xread);
hr=E_FAIL;
for (i=0;i<xread+8;i++) {
if (i<8) MESSAGE("%02x ",((unsigned char*)header)[i]);
@@ -1771,8 +1744,7 @@ static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength)
if (infoIcon.hbmColor) DeleteObject(infoIcon.hbmColor);
HeapFree(GetProcessHeap(), 0, pInfoBitmap);
} else {
- printf("ERROR: Unable to get icon information (error %u)\n",
- GetLastError());
+ ERR("Unable to get icon information (error %lu)\n", GetLastError());
}
return success;
}
@@ -1964,7 +1936,7 @@ static HRESULT WINAPI OLEPictureImpl_GetTypeInfo(
hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IPictureDisp, ppTInfo);
if (FAILED(hres))
- ERR("Did not get IPictureDisp typeinfo from typelib, hres %x\n", hres);
+ ERR("Did not get IPictureDisp typeinfo from typelib, hres %#lx.\n", hres);
return hres;
}
@@ -2160,7 +2132,7 @@ static HRESULT WINAPI OLEPictureImpl_Invoke(
break;
}
- ERR("invalid dispid 0x%x or wFlags 0x%x\n", dispIdMember, wFlags);
+ ERR("invalid dispid %#lx or wFlags 0x%x\n", dispIdMember, wFlags);
return DISP_E_MEMBERNOTFOUND;
}
@@ -2259,7 +2231,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
IPicture *newpic;
HRESULT hr;
- TRACE("(%p,%d,%d,%s,%p), partially implemented.\n",
+ TRACE("%p, %ld, %d, %s, %p), partially implemented.\n",
lpstream, lSize, fRunmode, debugstr_guid(riid), ppvObj);
hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic);
@@ -2298,7 +2270,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
IPicture *newpic;
HRESULT hr;
- FIXME("(%p,%d,%d,%s,x=%d,y=%d,f=%x,%p), partially implemented.\n",
+ FIXME("%p, %ld, %d, %s, %lu, %lu, %#lx, %p, partially implemented.\n",
lpstream, lSize, fRunmode, debugstr_guid(riid), xsiz, ysiz, flags, ppvObj);
hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic);
@@ -2365,9 +2337,8 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
WCHAR *file_candidate;
WCHAR path_buf[MAX_PATH];
- TRACE("(%s,%p,%d,%08x,%s,%p): stub\n",
- debugstr_w(szURLorPath), punkCaller, dwReserved, clrReserved,
- debugstr_guid(riid), ppvRet);
+ TRACE("%s, %p, %ld, %#lx, %s, %p.\n", debugstr_w(szURLorPath), punkCaller, dwReserved,
+ clrReserved, debugstr_guid(riid), ppvRet);
if (!szURLorPath || !ppvRet)
return E_INVALIDARG;
diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c
index a351d73d468..6ffd8f3d3e4 100644
--- a/dlls/oleaut32/olepropframe.c
+++ b/dlls/oleaut32/olepropframe.c
@@ -93,7 +93,7 @@ static ULONG WINAPI PropertyPageSite_AddRef(IPropertyPageSite* iface)
PropertyPageSite *this = impl_from_IPropertyPageSite(iface);
LONG ref = InterlockedIncrement(&this->ref);
- TRACE("(%p) ref=%d\n", this, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
@@ -102,7 +102,7 @@ static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface)
PropertyPageSite *this = impl_from_IPropertyPageSite(iface);
LONG ref = InterlockedDecrement(&this->ref);
- TRACE("(%p) ref=%d\n", this, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
if(!ref)
HeapFree(GetProcessHeap(), 0, this);
return ref;
@@ -111,7 +111,7 @@ static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface)
static HRESULT WINAPI PropertyPageSite_OnStatusChange(
IPropertyPageSite *iface, DWORD dwFlags)
{
- TRACE("(%p, %x)\n", iface, dwFlags);
+ TRACE("%p, %lx.\n", iface, dwFlags);
return S_OK;
}
@@ -178,7 +178,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams)
if(!lpParams)
return E_POINTER;
- TRACE("(%d %p %d %d %s %d %p %d %p %d %d)\n", lpParams->cbStructSize,
+ TRACE("%ld, %p, %d, %d, %s, %ld, %p, %ld, %p, %ld, %ld.\n", lpParams->cbStructSize,
lpParams->hWndOwner, lpParams->x, lpParams->y,
debugstr_w(lpParams->lpszCaption), lpParams->cObjects,
lpParams->lplpUnk, lpParams->cPages, lpParams->lpPages,
@@ -286,7 +286,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams)
res = IPropertyPage_SetObjects(property_page[i],
lpParams->cObjects, lpParams->lplpUnk);
if(FAILED(res))
- WARN("SetObjects() failed, hr %#x.\n", res);
+ WARN("SetObjects() failed, hr %#lx.\n", res);
res = IPropertyPage_GetPageInfo(property_page[i], &page_info);
if(FAILED(res))
diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c
index 44d46595e85..7d46d6c4299 100644
--- a/dlls/oleaut32/recinfo.c
+++ b/dlls/oleaut32/recinfo.c
@@ -163,7 +163,7 @@ static ULONG WINAPI IRecordInfoImpl_AddRef(IRecordInfo *iface)
{
IRecordInfoImpl *This = impl_from_IRecordInfo(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) -> %d\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -172,7 +172,7 @@ static ULONG WINAPI IRecordInfoImpl_Release(IRecordInfo *iface)
IRecordInfoImpl *This = impl_from_IRecordInfo(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) -> %d\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) {
int i;
@@ -441,8 +441,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutField(IRecordInfo *iface, ULONG wFlags,
IRecordInfoImpl *This = impl_from_IRecordInfo(iface);
int i;
- TRACE("(%p)->(%08x %p %s %p)\n", This, wFlags, pvData, debugstr_w(szFieldName),
- pvarField);
+ TRACE("%p, %#lx, %p, %s, %p.\n", iface, wFlags, pvData, debugstr_w(szFieldName), pvarField);
if(!pvData || !szFieldName || !pvarField
|| (wFlags != INVOKE_PROPERTYPUTREF && wFlags != INVOKE_PROPERTYPUT))
@@ -469,7 +468,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutFieldNoCopy(IRecordInfo *iface, ULONG w
IRecordInfoImpl *This = impl_from_IRecordInfo(iface);
int i;
- FIXME("(%p)->(%08x %p %s %p) stub\n", This, wFlags, pvData, debugstr_w(szFieldName), pvarField);
+ FIXME("%p, %#lx, %p, %s, %p stub\n", iface, wFlags, pvData, debugstr_w(szFieldName), pvarField);
if(!pvData || !szFieldName || !pvarField
|| (wFlags != INVOKE_PROPERTYPUTREF && wFlags != INVOKE_PROPERTYPUT))
@@ -597,8 +596,8 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID rGuidTypeLib, ULONG uVerMajor,
ITypeInfo *pTypeInfo;
ITypeLib *pTypeLib;
HRESULT hres;
-
- TRACE("(%p,%d,%d,%d,%s,%p)\n", rGuidTypeLib, uVerMajor, uVerMinor,
+
+ TRACE("%p, %lu, %lu, %#lx, %s, %p.\n", rGuidTypeLib, uVerMajor, uVerMinor,
lcid, debugstr_guid(rGuidTypeInfo), ppRecInfo);
hres = LoadRegTypeLib(rGuidTypeLib, uVerMajor, uVerMinor, lcid, &pTypeLib);
@@ -637,7 +636,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo
hres = ITypeInfo_GetTypeAttr(pTI, &typeattr);
if(FAILED(hres) || !typeattr) {
- WARN("GetTypeAttr failed: %08x\n", hres);
+ WARN("GetTypeAttr failed: %#lx.\n", hres);
return hres;
}
@@ -646,13 +645,13 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo
guid = typeattr->guid;
ITypeInfo_ReleaseTypeAttr(pTI, typeattr);
if(FAILED(hres)) {
- WARN("GetRefTypeInfo failed: %08x\n", hres);
+ WARN("GetRefTypeInfo failed: %#lx.\n", hres);
return hres;
}
hres = ITypeInfo_GetTypeAttr(pTypeInfo, &typeattr);
if(FAILED(hres)) {
ITypeInfo_Release(pTypeInfo);
- WARN("GetTypeAttr failed for referenced type: %08x\n", hres);
+ WARN("GetTypeAttr failed for referenced type: %#lx.\n", hres);
return hres;
}
}else {
@@ -702,8 +701,8 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo
hres = ITypeInfo_GetDocumentation(pTypeInfo, vardesc->memid, &ret->fields[i].name,
NULL, NULL, NULL);
if(FAILED(hres))
- WARN("GetDocumentation failed: %08x\n", hres);
- TRACE("field=%s, offset=%d\n", debugstr_w(ret->fields[i].name), ret->fields[i].offset);
+ WARN("GetDocumentation failed: %#lx.\n", hres);
+ TRACE("field=%s, offset=%ld\n", debugstr_w(ret->fields[i].name), ret->fields[i].offset);
ITypeInfo_ReleaseVarDesc(pTypeInfo, vardesc);
}
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index 0b769358f65..92d55752e8a 100644
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -287,7 +287,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell)
ULONG ulCellCount = SAFEARRAY_GetCellCount(psa);
if (ulStartCell > ulCellCount) {
- FIXME("unexpected ulCellCount %d, start %d\n",ulCellCount,ulStartCell);
+ FIXME("unexpected ulCellCount %ld, start %ld\n", ulCellCount, ulStartCell);
return E_UNEXPECTED;
}
@@ -372,7 +372,7 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest)
/* destination is cleared automatically */
hRet = VariantCopy(dest_var, src_var);
- if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%08x, element %u\n", hRet, ulCellCount);
+ if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx, element %lu.\n", hRet, ulCellCount);
src_var++;
dest_var++;
}
@@ -495,7 +495,7 @@ HRESULT WINAPI SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut)
(*ppsaOut)->cDims = cDims;
- TRACE("(%d): %u bytes allocated for descriptor.\n", cDims, allocSize);
+ TRACE("%d: %lu bytes allocated for descriptor.\n", cDims, allocSize);
return S_OK;
}
@@ -569,7 +569,7 @@ HRESULT WINAPI SafeArrayAllocData(SAFEARRAY *psa)
if (psa->pvData)
{
hRet = S_OK;
- TRACE("%u bytes allocated for data at %p (%u objects).\n",
+ TRACE("%lu bytes allocated for data at %p (%lu objects).\n",
ulSize * psa->cbElements, psa->pvData, ulSize);
}
else
@@ -676,7 +676,7 @@ SAFEARRAY* WINAPI SafeArrayCreateEx(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsa
*/
SAFEARRAY* WINAPI SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements)
{
- TRACE("(%s,%d,%u)\n", debugstr_vt(vt), lLbound, cElements);
+ TRACE("%s, %ld, %lu.\n", debugstr_vt(vt), lLbound, cElements);
if (vt == VT_RECORD)
return NULL;
@@ -708,7 +708,7 @@ SAFEARRAY* WINAPI SafeArrayCreateVectorEx(VARTYPE vt, LONG lLbound, ULONG cEleme
IRecordInfo* iRecInfo = pvExtra;
SAFEARRAY* psa;
- TRACE("(%s,%d,%u,%p)\n", debugstr_vt(vt), lLbound, cElements, pvExtra);
+ TRACE("%s, %ld, %lu, %p.\n", debugstr_vt(vt), lLbound, cElements, pvExtra);
if (vt == VT_RECORD)
{
@@ -886,7 +886,7 @@ HRESULT WINAPI SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData
VARIANT* lpDest = lpvDest;
hRet = VariantCopy(lpDest, lpVariant);
- if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%x\n", hRet);
+ if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx.\n", hRet);
}
else if (psa->fFeatures & FADF_BSTR)
{
@@ -971,7 +971,7 @@ HRESULT WINAPI SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData
/* The original content of pvData is ignored. */
V_VT(lpDest) = VT_EMPTY;
hRet = VariantCopy(lpDest, lpVariant);
- if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%x\n", hRet);
+ if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx.\n", hRet);
}
else if (psa->fFeatures & FADF_BSTR)
{
@@ -1113,8 +1113,8 @@ UINT WINAPI SafeArrayGetDim(SAFEARRAY *psa)
*/
UINT WINAPI SafeArrayGetElemsize(SAFEARRAY *psa)
{
- TRACE("(%p) returning %d\n", psa, psa ? psa->cbElements : 0u);
- return psa ? psa->cbElements : 0;
+ TRACE("%p, returning %ld.\n", psa, psa ? psa->cbElements : 0u);
+ return psa ? psa->cbElements : 0;
}
/*************************************************************************
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 2a453a1f0e0..cdc48e9c7fe 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -297,7 +297,7 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin,
WCHAR Path[MAX_PATH];
LONG res;
- TRACE_(typelib)("(%s, %x.%x, 0x%x, %p)\n", debugstr_guid(guid), wMaj, wMin, lcid, path);
+ TRACE_(typelib)("%s, %x.%x, %#lx, %p\n", debugstr_guid(guid), wMaj, wMin, lcid, path);
if (redir)
{
@@ -370,7 +370,7 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin,
}
}
RegCloseKey( hkey );
- TRACE_(typelib)("-- 0x%08x\n", hr);
+ TRACE_(typelib)("-- %#lx\n", hr);
return hr;
}
@@ -486,7 +486,7 @@ HRESULT WINAPI LoadTypeLibEx(
break;
}
- TRACE(" returns %08x\n",res);
+ TRACE(" returns %#lx\n",res);
return res;
}
@@ -1018,7 +1018,7 @@ HRESULT WINAPI UnRegisterTypeLibForUser(
LCID lcid, /* [in] locale id */
SYSKIND syskind)
{
- FIXME("(%s, %u, %u, %u, %u) unregistering the typelib system-wide\n",
+ FIXME("%s, %u, %u, %#lx, %u unregistering the typelib system-wide\n",
debugstr_guid(libid), wVerMajor, wVerMinor, lcid, syskind);
return UnRegisterTypeLib(libid, wVerMajor, wVerMinor, lcid, syskind);
}
@@ -1352,8 +1352,7 @@ static void dump_TypeDesc(const TYPEDESC *pTD,char *szVarType) {
case VT_VARIANT: sprintf(szVarType, "VT_VARIANT"); break;
case VT_VOID: sprintf(szVarType, "VT_VOID"); break;
case VT_HRESULT: sprintf(szVarType, "VT_HRESULT"); break;
- case VT_USERDEFINED: sprintf(szVarType, "VT_USERDEFINED ref = %x",
- pTD->u.hreftype); break;
+ case VT_USERDEFINED: sprintf(szVarType, "VT_USERDEFINED ref = %lx", pTD->u.hreftype); break;
case VT_LPSTR: sprintf(szVarType, "VT_LPSTR"); break;
case VT_LPWSTR: sprintf(szVarType, "VT_LPWSTR"); break;
case VT_PTR: sprintf(szVarType, "ptr to ");
@@ -1389,7 +1388,7 @@ static void dump_ELEMDESC(const ELEMDESC *edesc) {
}
static void dump_FUNCDESC(const FUNCDESC *funcdesc) {
int i;
- MESSAGE("memid is %08x\n",funcdesc->memid);
+ MESSAGE("memid is %#lx\n", funcdesc->memid);
for (i=0;i<funcdesc->cParams;i++) {
MESSAGE("Param %d:\n",i);
dump_ELEMDESC(funcdesc->lprgelemdescParam+i);
@@ -1482,8 +1481,7 @@ static void dump_TLBImpLib(const TLBImpLib *import)
{
TRACE_(typelib)("%s %s\n", debugstr_guid(TLB_get_guidref(import->guid)),
debugstr_w(import->name));
- TRACE_(typelib)("v%d.%d lcid=%x offset=%x\n", import->wVersionMajor,
- import->wVersionMinor, import->lcid, import->offset);
+ TRACE_(typelib)("v%d.%d lcid %#lx offset=%x\n", import->wVersionMajor, import->wVersionMinor, import->lcid, import->offset);
}
static void dump_TLBRefType(const ITypeLibImpl *pTL)
@@ -1492,7 +1490,7 @@ static void dump_TLBRefType(const ITypeLibImpl *pTL)
LIST_FOR_EACH_ENTRY(ref, &pTL->ref_list, TLBRefType, entry)
{
- TRACE_(typelib)("href:0x%08x\n", ref->reference);
+ TRACE_(typelib)("href:%#lx\n", ref->reference);
if(ref->index == -1)
TRACE_(typelib)("%s\n", debugstr_guid(TLB_get_guidref(ref->guid)));
else
@@ -1511,7 +1509,7 @@ static void dump_TLBImplType(const TLBImplType * impl, UINT n)
if(!impl)
return;
while (n) {
- TRACE_(typelib)("implementing/inheriting interface hRef = %x implflags %x\n",
+ TRACE_(typelib)("implementing/inheriting interface hRef = %lx implflags %x\n",
impl->hRef, impl->implflags);
++impl;
--n;
@@ -1528,7 +1526,7 @@ static void dump_DispParms(const DISPPARAMS * pdp)
{
TRACE("named args:\n");
for (index = 0; index < pdp->cNamedArgs; index++)
- TRACE( "\t0x%x\n", pdp->rgdispidNamedArgs[index] );
+ TRACE( "\t0x%lx\n", pdp->rgdispidNamedArgs[index] );
}
if (pdp->cArgs && pdp->rgvarg)
@@ -1541,7 +1539,7 @@ static void dump_DispParms(const DISPPARAMS * pdp)
static void dump_TypeInfo(const ITypeInfoImpl * pty)
{
- TRACE("%p ref=%u\n", pty, pty->ref);
+ TRACE("%p ref %lu\n", pty, pty->ref);
TRACE("%s %s\n", debugstr_w(TLB_get_bstr(pty->Name)), debugstr_w(TLB_get_bstr(pty->DocString)));
TRACE("attr:%s\n", debugstr_guid(TLB_get_guidref(pty->guid)));
TRACE("kind:%s\n", typekind_desc[pty->typeattr.typekind]);
@@ -1557,9 +1555,9 @@ static void dump_TypeInfo(const ITypeInfoImpl * pty)
static void dump_VARDESC(const VARDESC *v)
{
- MESSAGE("memid %d\n",v->memid);
+ MESSAGE("memid %ld\n",v->memid);
MESSAGE("lpstrSchema %s\n",debugstr_w(v->lpstrSchema));
- MESSAGE("oInst %d\n",v->u.oInst);
+ MESSAGE("oInst %ld\n", v->u.oInst);
dump_ELEMDESC(&(v->elemdescVar));
MESSAGE("wVarFlags %x\n",v->wVarFlags);
MESSAGE("varkind %d\n",v->varkind);
@@ -2033,7 +2031,7 @@ static inline void MSFT_Seek(TLBContext *pcx, LONG where)
if (where > pcx->length)
{
/* FIXME */
- ERR("seek beyond end (%d/%d)\n", where, pcx->length );
+ ERR("seek beyond end (%ld/%d)\n", where, pcx->length );
TLB_abort();
}
pcx->pos = where;
@@ -2043,7 +2041,7 @@ static inline void MSFT_Seek(TLBContext *pcx, LONG where)
/* read function */
static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, LONG where )
{
- TRACE_(typelib)("pos=0x%08x len=0x%08x 0x%08x 0x%08x 0x%08x\n",
+ TRACE_(typelib)("pos=0x%08x len %#lx, %u, %u, %#lx\n",
pcx->pos, count, pcx->oStart, pcx->length, where);
MSFT_Seek(pcx, where);
@@ -3371,7 +3369,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath
*ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength);
else
{
- FIXME("Header type magic 0x%08x not supported.\n",dwSignature);
+ FIXME("Header type magic %#lx not supported.\n", dwSignature);
ret = TYPE_E_CANTLOADLIBRARY;
}
}
@@ -3398,7 +3396,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath
else
{
if(ret != E_FAIL)
- ERR("Loading of typelib %s failed with error %d\n", debugstr_w(pszFileName), GetLastError());
+ ERR("Loading of typelib %s failed with error %ld\n", debugstr_w(pszFileName), GetLastError());
ret = TYPE_E_CANTLOADLIBRARY;
}
@@ -3446,7 +3444,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength)
ITypeLibImpl * pTypeLibImpl;
int i;
- TRACE("%p, TLB length = %d\n", pLib, dwTLBLength);
+ TRACE("%p, TLB length = %ld\n", pLib, dwTLBLength);
pTypeLibImpl = TypeLibImpl_Constructor();
if (!pTypeLibImpl) return NULL;
@@ -3474,14 +3472,14 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength)
lPSegDir = sizeof(tlbHeader) + (tlbHeader.nrtypeinfos)*4 + ((tlbHeader.varflags & HELPDLLFLAG)? 4 :0);
/* now read the segment directory */
- TRACE("read segment directory (at %d)\n",lPSegDir);
+ TRACE("read segment directory (at %ld)\n",lPSegDir);
MSFT_ReadLEDWords(&tlbSegDir, sizeof(tlbSegDir), &cx, lPSegDir);
cx.pTblDir = &tlbSegDir;
/* just check two entries */
if ( tlbSegDir.pTypeInfoTab.res0c != 0x0F || tlbSegDir.pImpInfo.res0c != 0x0F)
{
- ERR("cannot find the table directory, ptr=0x%x\n",lPSegDir);
+ ERR("cannot find the table directory, ptr %#lx\n",lPSegDir);
heap_free(pTypeLibImpl);
return NULL;
}
@@ -3930,7 +3928,7 @@ static sltg_ref_lookup_t *SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeLibImpl *pTL,
import->offset = lib_offs;
TLB_GUIDFromString( pNameTable + lib_offs + 4, &tmpguid);
import->guid = TLB_append_guid(&pTL->guid_list, &tmpguid, 2);
- if(sscanf(pNameTable + lib_offs + 40, "}#%hd.%hd#%x#%s",
+ if(sscanf(pNameTable + lib_offs + 40, "}#%hd.%hd#%lx#%s",
&import->wVersionMajor,
&import->wVersionMinor,
&import->lcid, fname) != 4) {
@@ -4035,7 +4033,7 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign
TRACE_(typelib)("name: %s\n", debugstr_w(TLB_get_bstr(pVarDesc->Name)));
TRACE_(typelib)("byte_offs = 0x%x\n", pItem->byte_offs);
- TRACE_(typelib)("memid = 0x%x\n", pItem->memid);
+ TRACE_(typelib)("memid = %#lx\n", pItem->memid);
if(pItem->flags & 0x02)
pType = &pItem->type;
@@ -4402,7 +4400,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
DWORD len, order;
ITypeInfoImpl **ppTypeInfoImpl;
- TRACE_(typelib)("%p, TLB length = %d\n", pLib, dwTLBLength);
+ TRACE_(typelib)("%p, TLB length = %ld\n", pLib, dwTLBLength);
pTypeLibImpl = TypeLibImpl_Constructor();
@@ -4411,11 +4409,11 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
pHeader = pLib;
TRACE_(typelib)("header:\n");
- TRACE_(typelib)("\tmagic=0x%08x, file blocks = %d\n", pHeader->SLTG_magic,
+ TRACE_(typelib)("\tmagic %#lx, file blocks = %d\n", pHeader->SLTG_magic,
pHeader->nrOfFileBlks );
- if (pHeader->SLTG_magic != SLTG_SIGNATURE) {
- FIXME_(typelib)("Header type magic 0x%08x not supported.\n",
- pHeader->SLTG_magic);
+ if (pHeader->SLTG_magic != SLTG_SIGNATURE)
+ {
+ FIXME_(typelib)("Header type magic %#lx not supported.\n", pHeader->SLTG_magic);
return NULL;
}
@@ -4566,8 +4564,8 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
heap_free(pOtherTypeInfoBlks);
return NULL;
}
- TRACE_(typelib)("pTIHeader->res06 = %x, pTIHeader->res0e = %x, "
- "pTIHeader->res16 = %x, pTIHeader->res1e = %x\n",
+ TRACE_(typelib)("pTIHeader->res06 = %lx, pTIHeader->res0e = %lx, "
+ "pTIHeader->res16 = %lx, pTIHeader->res1e = %lx\n",
pTIHeader->res06, pTIHeader->res0e, pTIHeader->res16, pTIHeader->res1e);
*ppTypeInfoImpl = ITypeInfoImpl_Constructor();
@@ -4710,7 +4708,7 @@ static ULONG WINAPI ITypeLib2_fnAddRef( ITypeLib2 *iface)
ITypeLibImpl *This = impl_from_ITypeLib2(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%u\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -4720,7 +4718,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
ITypeLibImpl *This = impl_from_ITypeLib2(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%u\n",This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if (!ref)
{
@@ -5036,8 +5034,7 @@ static HRESULT WINAPI ITypeLib2_fnIsName(
int tic;
UINT nNameBufLen = (lstrlenW(szNameBuf)+1)*sizeof(WCHAR), fdc, vrc;
- TRACE("(%p)->(%s,%08x,%p)\n", This, debugstr_w(szNameBuf), lHashVal,
- pfName);
+ TRACE("%p, %s, %#lx, %p.\n", iface, debugstr_w(szNameBuf), lHashVal, pfName);
*pfName=TRUE;
for(tic = 0; tic < This->TypeInfoCount; ++tic){
@@ -5086,7 +5083,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName(
UINT count = 0;
UINT len;
- TRACE("(%p)->(%s %u %p %p %p)\n", This, debugstr_w(name), hash, ppTInfo, memid, found);
+ TRACE("%p, %s %#lx, %p, %p, %p.\n", iface, debugstr_w(name), hash, ppTInfo, memid, found);
if ((!name && hash == 0) || !ppTInfo || !memid || !found)
return E_INVALIDARG;
@@ -5207,7 +5204,7 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation2(
HRESULT result;
ITypeInfo *pTInfo;
- FIXME("(%p) index %d lcid %d half implemented stub!\n", This, index, lcid);
+ FIXME("%p, %d, %#lx, partially implemented stub!\n", iface, index, lcid);
/* the help string should be obtained from the helpstringdll,
* using the _DLLGetDocumentation function, based on the supplied
@@ -5353,7 +5350,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind(
BOOL typemismatch = FALSE;
int i;
- TRACE("(%p)->(%s, 0x%x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr);
+ TRACE("%p, %s, %#lx, %#x, %p, %p, %p.\n", iface, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr);
*pDescKind = DESCKIND_NONE;
pBindPtr->lptcomp = NULL;
@@ -5489,7 +5486,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType(
ITypeLibImpl *This = impl_from_ITypeComp(iface);
ITypeInfoImpl *info;
- TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp);
+ TRACE("%p, %s, %#lx, %p, %p.\n", iface, debugstr_w(szName), lHash, ppTInfo, ppTComp);
if(!szName || !ppTInfo || !ppTComp)
return E_INVALIDARG;
@@ -5573,14 +5570,12 @@ static HRESULT WINAPI ITypeInfo_fnQueryInterface(
return E_NOINTERFACE;
}
-/* ITypeInfo::AddRef
- */
static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface)
{
ITypeInfoImpl *This = impl_from_ITypeInfo2(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->ref is %u\n",This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if (ref == 1 /* incremented from 0 */)
ITypeLib2_AddRef(&This->pTypeLib->ITypeLib2_iface);
@@ -5642,14 +5637,12 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This)
heap_free(This);
}
-/* ITypeInfo::Release
- */
static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface)
{
ITypeInfoImpl *This = impl_from_ITypeInfo2(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%u)\n",This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if (!ref)
{
@@ -5663,12 +5656,6 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface)
return ref;
}
-/* ITypeInfo::GetTypeAttr
- *
- * Retrieves a TYPEATTR structure that contains the attributes of the type
- * description.
- *
- */
static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface,
LPTYPEATTR *ppTypeAttr)
{
@@ -6018,7 +6005,7 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index,
if ((This->typeattr.typekind == TKIND_DISPATCH) && hrefoffset)
ITypeInfoImpl_FuncDescAddHrefOffset(*ppFuncDesc, hrefoffset);
- TRACE("-- 0x%08x\n", hr);
+ TRACE("-- %#lx.\n", hr);
return hr;
}
@@ -6182,7 +6169,7 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid,
{
ITypeInfoImpl *This = impl_from_ITypeInfo2(iface);
- TRACE("(%p) memid 0x%08x max_names %d\n", This, memid, max_names);
+ TRACE("%p, %#lx, %p, %d, %p\n", iface, memid, names, max_names, num_names);
if (!names) return E_INVALIDARG;
@@ -6243,9 +6230,9 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeOfImplType(
if(TRACE_ON(ole))
{
if(SUCCEEDED(hr))
- TRACE("SUCCESS -- hRef = 0x%08x\n", *pRefType );
+ TRACE("SUCCESS -- hRef %#lx.\n", *pRefType );
else
- TRACE("FAILURE -- hresult = 0x%08x\n", hr);
+ TRACE("FAILURE -- hresult %#lx.\n", hr);
}
return hr;
@@ -6291,8 +6278,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface,
HRESULT ret=S_OK;
UINT i, fdc;
- TRACE("(%p) Name %s cNames %d\n", This, debugstr_w(*rgszNames),
- cNames);
+ TRACE("%p, %s, %d.\n", iface, debugstr_w(*rgszNames), cNames);
/* init out parameters in case of failure */
for (i = 0; i < cNames; i++)
@@ -6312,7 +6298,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface,
else
ret=DISP_E_UNKNOWNNAME;
};
- TRACE("-- 0x%08x\n", ret);
+ TRACE("-- %#lx.\n", ret);
return ret;
}
}
@@ -6547,7 +6533,7 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART
DWORD_PTR *args;
void *func;
- TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n",
+ TRACE("%p, %Id, %d, %d, %d, %p, %p, %p (vt=%d).\n",
pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg,
pvargResult, V_VT(pvargResult));
@@ -7013,15 +6999,13 @@ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc,
hr = ITypeInfo_GetRefTypeInfo(tinfo, tdesc->u.hreftype, &tinfo2);
if (hr)
{
- ERR("Could not get typeinfo of hreftype %x for VT_USERDEFINED, "
- "hr = 0x%08x\n",
- tdesc->u.hreftype, hr);
+ ERR("Could not get typeinfo of hreftype %lx for VT_USERDEFINED, hr %#lx.\n", tdesc->u.hreftype, hr);
return hr;
}
hr = ITypeInfo_GetTypeAttr(tinfo2, &tattr);
if (hr)
{
- ERR("ITypeInfo_GetTypeAttr failed, hr = 0x%08x\n", hr);
+ ERR("ITypeInfo_GetTypeAttr failed, hr %#lx.\n", hr);
ITypeInfo_Release(tinfo2);
return hr;
}
@@ -7224,9 +7208,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
const TLBFuncDesc *pFuncInfo;
UINT fdc;
- TRACE("(%p)(%p,id=%d,flags=0x%08x,%p,%p,%p,%p)\n",
- This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr
- );
+ TRACE("%p, %p, %ld, %#x, %p, %p, %p, %p.\n", iface, pIUnk, memid, wFlags, pDispParams,
+ pVarResult, pExcepInfo, pArgErr);
if( This->typeattr.wTypeFlags & TYPEFLAG_FRESTRICTED )
return DISP_E_MEMBERNOTFOUND;
@@ -7406,7 +7389,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
hres = SafeArrayAccessData(a, (LPVOID)&v);
if (hres != S_OK)
{
- ERR("SafeArrayAccessData failed with %x\n", hres);
+ ERR("SafeArrayAccessData failed with %#lx.\n", hres);
SafeArrayDestroy(a);
break;
}
@@ -7415,7 +7398,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
hres = SafeArrayUnaccessData(a);
if (hres != S_OK)
{
- ERR("SafeArrayUnaccessData failed with %x\n", hres);
+ ERR("SafeArrayUnaccessData failed with %#lx.\n", hres);
SafeArrayDestroy(a);
break;
}
@@ -7585,13 +7568,13 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
hres = SafeArrayGetUBound(a, 1, &ubound);
if (hres != S_OK)
{
- ERR("SafeArrayGetUBound failed with %x\n", hres);
+ ERR("SafeArrayGetUBound failed with %#lx.\n", hres);
break;
}
hres = SafeArrayAccessData(a, (LPVOID)&v);
if (hres != S_OK)
{
- ERR("SafeArrayAccessData failed with %x\n", hres);
+ ERR("SafeArrayAccessData failed with %#lx.\n", hres);
break;
}
for (j = 0; j <= ubound; j++)
@@ -7599,7 +7582,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
hres = SafeArrayUnaccessData(a);
if (hres != S_OK)
{
- ERR("SafeArrayUnaccessData failed with %x\n", hres);
+ ERR("SafeArrayUnaccessData failed with %#lx.\n", hres);
break;
}
}
@@ -7617,7 +7600,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
if ((V_VT(&varresult) == VT_ERROR) && FAILED(V_ERROR(&varresult)))
{
- WARN("invoked function failed with error 0x%08x\n", V_ERROR(&varresult));
+ WARN("invoked function failed with error %#lx.\n", V_ERROR(&varresult));
hres = DISP_E_EXCEPTION;
if (pExcepInfo)
{
@@ -7685,7 +7668,7 @@ func_fail:
pVarResult,pExcepInfo,pArgErr
);
if (FAILED(hres))
- FIXME("IDispatch::Invoke failed with %08x. (Could be not a real error?)\n", hres);
+ FIXME("IDispatch::Invoke failed with %#lx. (Could be not a real error?)\n", hres);
IDispatch_Release(disp);
} else
FIXME("FUNC_DISPATCH used on object without IDispatch iface?\n");
@@ -7697,7 +7680,7 @@ func_fail:
break;
}
- TRACE("-- 0x%08x\n", hres);
+ TRACE("-- %#lx\n", hres);
return hres;
} else if(SUCCEEDED(hres = ITypeInfo2_GetVarIndexOfMemId(iface, memid, &var_index))) {
@@ -7727,7 +7710,7 @@ func_fail:
WARN("Could not search inherited interface!\n");
}
}
- WARN("did not find member id %d, flags 0x%x!\n", memid, wFlags);
+ WARN("did not find member id %ld, flags 0x%x!\n", memid, wFlags);
return DISP_E_MEMBERNOTFOUND;
}
@@ -7745,9 +7728,8 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface,
ITypeInfoImpl *This = impl_from_ITypeInfo2(iface);
const TLBFuncDesc *pFDesc;
const TLBVarDesc *pVDesc;
- TRACE("(%p) memid %d Name(%p) DocString(%p)"
- " HelpContext(%p) HelpFile(%p)\n",
- This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
+ TRACE("%p, %ld, %p, %p, %p, %p.\n",
+ iface, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
if(memid==MEMBERID_NIL){ /* documentation for the typeinfo */
if(pBstrName)
*pBstrName=SysAllocString(TLB_get_bstr(This->Name));
@@ -7800,7 +7782,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface,
WARN("Could not search inherited interface!\n");
}
- WARN("member %d not found\n", memid);
+ WARN("member %ld not found\n", memid);
return TYPE_E_ELEMENTNOTFOUND;
}
@@ -7816,7 +7798,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid
ITypeInfoImpl *This = impl_from_ITypeInfo2(iface);
const TLBFuncDesc *pFDesc;
- TRACE("(%p)->(memid %x, %d, %p, %p, %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
+ TRACE("%p, %#lx, %d, %p, %p, %p.\n", iface, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
if (pBstrDllName) *pBstrDllName = NULL;
if (pBstrName) *pBstrName = NULL;
@@ -7854,7 +7836,7 @@ static HRESULT ITypeInfoImpl_GetDispatchRefTypeInfo( ITypeInfo *iface,
ITypeInfoImpl *This = impl_from_ITypeInfo(iface);
HRESULT hr;
- TRACE("%p, 0x%x\n", iface, *hRefType);
+ TRACE("%p, %#lx.\n", iface, *hRefType);
if (This->impltypes && (*hRefType & DISPATCH_HREF_MASK))
{
@@ -7959,7 +7941,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
}
if(&ref_type->entry == &This->pTypeLib->ref_list)
{
- FIXME("Can't find pRefType for ref %x\n", hRefType);
+ FIXME("Can't find pRefType for ref %lx\n", hRefType);
return E_FAIL;
}
@@ -8028,7 +8010,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
ITypeLib_Release(pTLib);
if (FAILED(result))
{
- WARN("(%p) failed hreftype 0x%04x\n", This, hRefType);
+ WARN("(%p) failed hreftype %#lx.\n", iface, hRefType);
return result;
}
}
@@ -8037,7 +8019,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
ITypeInfo_Release(type_info);
else *ppTInfo = type_info;
- TRACE("(%p) hreftype 0x%04x loaded %s (%p)\n", This, hRefType,
+ TRACE("%p, hreftype %#lx, loaded %s (%p)\n", iface, hRefType,
SUCCEEDED(result)? "SUCCESS":"FAILURE", *ppTInfo);
return result;
}
@@ -8050,13 +8032,12 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
static HRESULT WINAPI ITypeInfo_fnAddressOfMember( ITypeInfo2 *iface,
MEMBERID memid, INVOKEKIND invKind, PVOID *ppv)
{
- ITypeInfoImpl *This = impl_from_ITypeInfo2(iface);
HRESULT hr;
BSTR dll, entry;
WORD ordinal;
HMODULE module;
- TRACE("(%p)->(0x%x, 0x%x, %p)\n", This, memid, invKind, ppv);
+ TRACE("%p, %lx, %#x, %p.\n", iface, memid, invKind, ppv);
hr = ITypeInfo2_GetDllEntry(iface, memid, invKind, &dll, &entry, &ordinal);
if (FAILED(hr))
@@ -8138,7 +8119,7 @@ static HRESULT WINAPI ITypeInfo_fnCreateInstance( ITypeInfo2 *iface,
{
IUnknown *pUnk;
hr = GetActiveObject(&pTA->guid, NULL, &pUnk);
- TRACE("GetActiveObject rets %08x\n", hr);
+ TRACE("GetActiveObject rets %#lx.\n", hr);
if(hr == S_OK)
{
hr = IUnknown_QueryInterface(pUnk, riid, ppvObj);
@@ -8160,11 +8141,9 @@ end:
*
* Retrieves marshalling information.
*/
-static HRESULT WINAPI ITypeInfo_fnGetMops( ITypeInfo2 *iface, MEMBERID memid,
- BSTR *pBstrMops)
+static HRESULT WINAPI ITypeInfo_fnGetMops( ITypeInfo2 *iface, MEMBERID memid, BSTR *pBstrMops)
{
- ITypeInfoImpl *This = impl_from_ITypeInfo2(iface);
- FIXME("(%p %d) stub!\n", This, memid);
+ FIXME("%p, %ld stub!\n", iface, memid);
*pBstrMops = NULL;
return S_OK;
}
@@ -8264,8 +8243,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeKind( ITypeInfo2 * iface,
static HRESULT WINAPI ITypeInfo2_fnGetTypeFlags( ITypeInfo2 *iface, ULONG *pTypeFlags)
{
ITypeInfoImpl *This = impl_from_ITypeInfo2(iface);
+ TRACE("%p, %p.\n", iface, pTypeFlags);
*pTypeFlags=This->typeattr.wTypeFlags;
- TRACE("(%p) flags 0x%x\n", This,*pTypeFlags);
return S_OK;
}
@@ -8292,8 +8271,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncIndexOfMemId( ITypeInfo2 * iface,
} else
result = TYPE_E_ELEMENTNOTFOUND;
- TRACE("(%p) memid 0x%08x invKind 0x%04x -> %s\n", This,
- memid, invKind, SUCCEEDED(result) ? "SUCCESS" : "FAILED");
+ TRACE("%p, %#lx, %#x, hr %#lx.\n", iface, memid, invKind, result);
return result;
}
@@ -8309,7 +8287,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarIndexOfMemId( ITypeInfo2 * iface,
ITypeInfoImpl *This = impl_from_ITypeInfo2(iface);
TLBVarDesc *pVarInfo;
- TRACE("%p %d %p\n", iface, memid, pVarIndex);
+ TRACE("%p, %ld, %p.\n", iface, memid, pVarIndex);
pVarInfo = TLB_get_vardesc_by_memberid(This, memid);
if(!pVarInfo)
@@ -8490,9 +8468,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation2(
ITypeInfoImpl *This = impl_from_ITypeInfo2(iface);
const TLBFuncDesc *pFDesc;
const TLBVarDesc *pVDesc;
- TRACE("(%p) memid %d lcid(0x%x) HelpString(%p) "
- "HelpStringContext(%p) HelpStringDll(%p)\n",
- This, memid, lcid, pbstrHelpString, pdwHelpStringContext,
+ TRACE("%p, %ld, %#lx, %p, %p, %p.\n",
+ iface, memid, lcid, pbstrHelpString, pdwHelpStringContext,
pbstrHelpStringDll );
/* the help string should be obtained from the helpstringdll,
* using the _DLLGetDocumentation function, based on the supplied
@@ -8842,7 +8819,7 @@ static HRESULT WINAPI ITypeComp_fnBind(
HRESULT hr = DISP_E_MEMBERNOTFOUND;
UINT fdc;
- TRACE("(%p)->(%s, %x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr);
+ TRACE("%p, %s, %#lx, 0x%x, %p, %p, %p.\n", iface, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr);
*pDescKind = DESCKIND_NONE;
pBindPtr->lpfuncdesc = NULL;
@@ -8923,7 +8900,7 @@ static HRESULT WINAPI ITypeComp_fnBindType(
ITypeInfo ** ppTInfo,
ITypeComp ** ppTComp)
{
- TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp);
+ TRACE("%s, %#lx, %p, %p.\n", debugstr_w(szName), lHash, ppTInfo, ppTComp);
/* strange behaviour (does nothing) but like the
* original */
@@ -9142,7 +9119,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 *iface,
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- TRACE("%p %d\n", This, helpContext);
+ TRACE("%p, %ld.\n", iface, helpContext);
This->dwHelpContext = helpContext;
@@ -9154,7 +9131,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 *iface,
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- TRACE("%p %x\n", This, lcid);
+ TRACE("%p, %#lx.\n", iface, lcid);
This->set_lcid = lcid;
@@ -9387,7 +9364,7 @@ static DWORD WMSFT_encode_variant(VARIANT *value, WMSFT_TLBFile *file)
if(V_VT(value) != arg_type) {
hres = VariantChangeType(&v, value, 0, arg_type);
if(FAILED(hres)){
- ERR("VariantChangeType failed: %08x\n", hres);
+ ERR("VariantChangeType failed: %#lx.\n", hres);
return -1;
}
}
@@ -10314,61 +10291,61 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface)
running_offset = 0;
- TRACE("header at: 0x%x\n", running_offset);
+ TRACE("header at: 0x%lx\n", running_offset);
running_offset += sizeof(file.header);
- TRACE("junk at: 0x%x\n", running_offset);
+ TRACE("junk at: 0x%lx\n", running_offset);
running_offset += junk_size;
- TRACE("segdir at: 0x%x\n", running_offset);
+ TRACE("segdir at: 0x%lx\n", running_offset);
running_offset += sizeof(file.segdir);
- TRACE("typeinfo at: 0x%x\n", running_offset);
+ TRACE("typeinfo at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pTypeInfoTab, &file.typeinfo_seg, &running_offset);
- TRACE("guidhashtab at: 0x%x\n", running_offset);
+ TRACE("guidhashtab at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pGuidHashTab, &file.guidhash_seg, &running_offset);
- TRACE("guidtab at: 0x%x\n", running_offset);
+ TRACE("guidtab at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pGuidTab, &file.guid_seg, &running_offset);
- TRACE("reftab at: 0x%x\n", running_offset);
+ TRACE("reftab at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pRefTab, &file.ref_seg, &running_offset);
- TRACE("impinfo at: 0x%x\n", running_offset);
+ TRACE("impinfo at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pImpInfo, &file.impinfo_seg, &running_offset);
- TRACE("impfiles at: 0x%x\n", running_offset);
+ TRACE("impfiles at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pImpFiles, &file.impfile_seg, &running_offset);
- TRACE("namehashtab at: 0x%x\n", running_offset);
+ TRACE("namehashtab at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pNameHashTab, &file.namehash_seg, &running_offset);
- TRACE("nametab at: 0x%x\n", running_offset);
+ TRACE("nametab at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pNametab, &file.name_seg, &running_offset);
- TRACE("stringtab at: 0x%x\n", running_offset);
+ TRACE("stringtab at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pStringtab, &file.string_seg, &running_offset);
- TRACE("typdesc at: 0x%x\n", running_offset);
+ TRACE("typdesc at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pTypdescTab, &file.typdesc_seg, &running_offset);
- TRACE("arraydescriptions at: 0x%x\n", running_offset);
+ TRACE("arraydescriptions at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pArrayDescriptions, &file.arraydesc_seg, &running_offset);
- TRACE("custdata at: 0x%x\n", running_offset);
+ TRACE("custdata at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pCustData, &file.custdata_seg, &running_offset);
- TRACE("cdguids at: 0x%x\n", running_offset);
+ TRACE("cdguids at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.pCDGuids, &file.cdguids_seg, &running_offset);
- TRACE("res0e at: 0x%x\n", running_offset);
+ TRACE("res0e at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.res0e, NULL, &running_offset);
- TRACE("res0f at: 0x%x\n", running_offset);
+ TRACE("res0f at: 0x%lx\n", running_offset);
tmp_fill_segdir_seg(&file.segdir.res0f, NULL, &running_offset);
- TRACE("aux_seg at: 0x%x\n", running_offset);
+ TRACE("aux_seg at: 0x%lx\n", running_offset);
WMSFT_fixup_typeinfos(This, &file, running_offset);
@@ -10452,8 +10429,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetCustData(ICreateTypeLib2 *iface,
static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringContext(ICreateTypeLib2 *iface,
ULONG helpStringContext)
{
- ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %u - stub\n", This, helpStringContext);
+ FIXME("%p, %lu - stub\n", iface, helpStringContext);
return E_NOTIMPL;
}
@@ -10587,7 +10563,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext(ICreateTypeInfo2 *iface,
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- TRACE("%p %d\n", This, helpContext);
+ TRACE("%p, %ld.\n", iface, helpContext);
This->dwHelpContext = helpContext;
@@ -10663,7 +10639,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(ICreateTypeInfo2 *iface,
libattr->wMinorVerNum, libattr->lcid, &implib->name);
if(FAILED(hres)){
implib->name = NULL;
- TRACE("QueryPathOfRegTypeLib failed, no name stored: %08x\n", hres);
+ TRACE("QueryPathOfRegTypeLib failed, no name stored: %#lx.\n", hres);
}
}
@@ -10845,7 +10821,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface,
TLBImplType *impl_type;
HRESULT hres;
- TRACE("%p %u %d\n", This, index, refType);
+ TRACE("%p, %u, %ld.\n", iface, index, refType);
switch(This->typeattr.typekind){
case TKIND_COCLASS: {
@@ -11134,7 +11110,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext(ICreateTypeInfo2 *if
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
TLBFuncDesc *func_desc = &This->funcdescs[index];
- TRACE("%p %u %d\n", This, index, helpContext);
+ TRACE("%p, %u, %ld.\n", iface, index, helpContext);
if(index >= This->typeattr.cFuncs)
return TYPE_E_ELEMENTNOTFOUND;
@@ -11150,7 +11126,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext(ICreateTypeInfo2 *ifa
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
TLBVarDesc *var_desc = &This->vardescs[index];
- TRACE("%p %u %d\n", This, index, helpContext);
+ TRACE("%p, %u, %ld.\n", iface, index, helpContext);
if(index >= This->typeattr.cVars)
return TYPE_E_ELEMENTNOTFOUND;
@@ -11347,24 +11323,21 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDesc(ICreateTypeInfo2 *iface,
static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDescByMemId(ICreateTypeInfo2 *iface,
MEMBERID memid, INVOKEKIND invKind)
{
- ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %x %d - stub\n", This, memid, invKind);
+ FIXME("%p, %#lx, %d - stub\n", iface, memid, invKind);
return E_NOTIMPL;
}
static HRESULT WINAPI ICreateTypeInfo2_fnDeleteVarDesc(ICreateTypeInfo2 *iface,
UINT index)
{
- ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %u - stub\n", This, index);
+ FIXME("%p, %u - stub\n", iface, index);
return E_NOTIMPL;
}
static HRESULT WINAPI ICreateTypeInfo2_fnDeleteVarDescByMemId(ICreateTypeInfo2 *iface,
MEMBERID memid)
{
- ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %x - stub\n", This, memid);
+ FIXME("%p, %#lx - stub\n", iface, memid);
return E_NOTIMPL;
}
@@ -11447,7 +11420,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(ICreateTypeInfo2 *
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- TRACE("%p %u\n", This, helpStringContext);
+ TRACE("%p, %lu.\n", iface, helpStringContext);
This->dwHelpStringContext = helpStringContext;
@@ -11457,23 +11430,20 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(ICreateTypeInfo2 *
static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpStringContext(ICreateTypeInfo2 *iface,
UINT index, ULONG helpStringContext)
{
- ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %u %u - stub\n", This, index, helpStringContext);
+ FIXME("%p, %u, %lu - stub\n", iface, index, helpStringContext);
return E_NOTIMPL;
}
static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpStringContext(ICreateTypeInfo2 *iface,
UINT index, ULONG helpStringContext)
{
- ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %u %u - stub\n", This, index, helpStringContext);
+ FIXME("%p, %u, %lu - stub\n", iface, index, helpStringContext);
return E_NOTIMPL;
}
static HRESULT WINAPI ICreateTypeInfo2_fnInvalidate(ICreateTypeInfo2 *iface)
{
- ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p - stub\n", This);
+ FIXME("%p - stub\n", iface);
return E_NOTIMPL;
}
diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c
index fe21520b2e7..aa54a2b092b 100644
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -102,7 +102,7 @@ unsigned char * WINAPI CLEANLOCALSTORAGE_UserMarshal(ULONG *pFlags, unsigned cha
break;
default:
- ERR("Unknown type %x\n", pstg->flags);
+ ERR("Unknown type %lx\n", pstg->flags);
}
*(VOID**)pstg->pStorage = NULL;
@@ -135,11 +135,11 @@ typedef struct
ULONG WINAPI BSTR_UserSize(ULONG *pFlags, ULONG Start, BSTR *pstr)
{
- TRACE("(%x,%d,%p) => %p\n", *pFlags, Start, pstr, *pstr);
+ TRACE("%#lx, %lu, %p => %p\n", *pFlags, Start, pstr, *pstr);
if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr));
ALIGN_LENGTH(Start, 3);
Start += sizeof(bstr_wire_t) + ((SysStringByteLen(*pstr) + 1) & ~1);
- TRACE("returning %d\n", Start);
+ TRACE("returning %ld\n", Start);
return Start;
}
@@ -148,7 +148,7 @@ unsigned char * WINAPI BSTR_UserMarshal(ULONG *pFlags, unsigned char *Buffer, BS
bstr_wire_t *header;
DWORD len = SysStringByteLen(*pstr);
- TRACE("(%x,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr);
+ TRACE("%#lx, %p, %p => %p\n", *pFlags, Buffer, pstr, *pstr);
if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr));
ALIGN_POINTER(Buffer, 3);
@@ -168,12 +168,12 @@ unsigned char * WINAPI BSTR_UserMarshal(ULONG *pFlags, unsigned char *Buffer, BS
unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, BSTR *pstr)
{
bstr_wire_t *header;
- TRACE("(%x,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr);
+ TRACE("%#lx, %p, %p => %p\n", *pFlags, Buffer, pstr, *pstr);
ALIGN_POINTER(Buffer, 3);
header = (bstr_wire_t*)Buffer;
if(header->len != header->len2)
- FIXME("len %08x != len2 %08x\n", header->len, header->len2);
+ FIXME("len %#lx != len2 %#lx\n", header->len, header->len2);
if (header->byte_len == 0xffffffff)
{
@@ -188,7 +188,7 @@ unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer,
void WINAPI BSTR_UserFree(ULONG *pFlags, BSTR *pstr)
{
- TRACE("(%x,%p) => %p\n", *pFlags, pstr, *pstr);
+ TRACE("%#lx, %p => %p\n", *pFlags, pstr, *pstr);
SysFreeString(*pstr);
*pstr = NULL;
}
@@ -282,7 +282,7 @@ static unsigned interface_user_size(ULONG *pFlags, ULONG Start, REFIID riid, IUn
}
}
size += sizeof(ULONG);
- TRACE("wire-size extra of interface variant is %d\n", size);
+ TRACE("wire-size extra of interface variant is %ld.\n", size);
return Start + size;
}
@@ -327,7 +327,7 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar)
static unsigned char* interface_user_marshal(ULONG *pFlags, unsigned char *Buffer,
REFIID riid, IUnknown *punk)
{
- TRACE("pFlags=%d, Buffer=%p, pUnk=%p\n", *pFlags, Buffer, punk);
+ TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, punk);
/* first DWORD is used to store pointer itself, truncated on win64 */
if(!punk)
@@ -350,7 +350,7 @@ static unsigned char *interface_user_unmarshal(ULONG *pFlags, unsigned char *Buf
{
DWORD ptr;
- TRACE("pFlags=%d, Buffer=%p, ppUnk=%p\n", *pFlags, Buffer, ppunk);
+ TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, ppunk);
/* skip pointer part itself */
ptr = *(DWORD*)Buffer;
@@ -365,7 +365,7 @@ static unsigned char *interface_user_unmarshal(ULONG *pFlags, unsigned char *Buf
ULONG WINAPI VARIANT_UserSize(ULONG *pFlags, ULONG Start, VARIANT *pvar)
{
int align;
- TRACE("(%x,%d,%p)\n", *pFlags, Start, pvar);
+ TRACE("%#lx, %lu, %p.\n", *pFlags, Start, pvar);
TRACE("vt=%04x\n", V_VT(pvar));
ALIGN_LENGTH(Start, 7);
@@ -381,7 +381,7 @@ ULONG WINAPI VARIANT_UserSize(ULONG *pFlags, ULONG Start, VARIANT *pvar)
Start += get_type_size(pFlags, V_VT(pvar));
Start = wire_extra_user_size(pFlags, Start, pvar);
- TRACE("returning %d\n", Start);
+ TRACE("returning %ld\n", Start);
return Start;
}
@@ -392,7 +392,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer,
int align;
unsigned char *Pos;
- TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar);
+ TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, pvar);
TRACE("vt=%04x\n", V_VT(pvar));
ALIGN_POINTER(Buffer, 7);
@@ -479,7 +479,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer,
}
}
header->clSize = ((Pos - Buffer) + 7) >> 3;
- TRACE("marshalled size=%d\n", header->clSize);
+ TRACE("marshalled size %ld\n", header->clSize);
return Pos;
}
@@ -490,7 +490,7 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe
int align;
unsigned char *Pos;
- TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar);
+ TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, pvar);
ALIGN_POINTER(Buffer, 7);
@@ -617,7 +617,7 @@ void WINAPI VARIANT_UserFree(ULONG *pFlags, VARIANT *pvar)
VARTYPE vt = V_VT(pvar);
PVOID ref = NULL;
- TRACE("(%x,%p)\n", *pFlags, pvar);
+ TRACE("%#lx, %p.\n", *pFlags, pvar);
TRACE("vt=%04x\n", V_VT(pvar));
if (vt & VT_BYREF) ref = pvar->n1.n2.n3.byref;
@@ -773,7 +773,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY
{
ULONG size = StartingSize;
- TRACE("("); dump_user_flags(pFlags); TRACE(", %d, %p\n", StartingSize, *ppsa);
+ TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, *ppsa);
ALIGN_LENGTH(size, 3);
size += sizeof(ULONG);
@@ -1248,7 +1248,7 @@ HRESULT CALLBACK IDispatch_Invoke_Proxy(
UINT uArgErr;
EXCEPINFO ExcepInfo;
- TRACE("(%p)->(%d,%s,%x,%x,%p,%p,%p,%p)\n", This,
+ TRACE("%p, %ld, %s, %#lx, %x, %p, %p, %p, %p.\n", This,
dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult,
pExcepInfo, puArgErr);
@@ -1488,7 +1488,7 @@ HRESULT CALLBACK ITypeComp_Bind_Proxy(
VARDESC *vardesc;
HRESULT hr;
- TRACE("(%p, %s, %#x, %#x, %p, %p, %p)\n", This, debugstr_w(name), lHashVal, flags, ti,
+ TRACE("%p, %s, %#lx, %#x, %p, %p, %p.\n", This, debugstr_w(name), lHashVal, flags, ti,
desckind, bindptr);
*desckind = DESCKIND_NONE;
@@ -1534,7 +1534,7 @@ HRESULT __RPC_STUB ITypeComp_Bind_Stub(
BINDPTR bindptr;
HRESULT hr;
- TRACE("(%p, %s, %#x, %#x, %p, %p, %p, %p, %p, %p)\n", This, debugstr_w(name),
+ TRACE("%p, %s, %#lx, %#x, %p, %p, %p, %p, %p, %p.\n", This, debugstr_w(name),
lHashVal, flags, ti, desckind, funcdesc, vardesc, typecomp, stg);
memset(stg, 0, sizeof(*stg));
@@ -1586,7 +1586,7 @@ HRESULT CALLBACK ITypeComp_BindType_Proxy(
{
HRESULT hr;
- TRACE("(%p, %s, %#x, %p, %p)\n", This, debugstr_w(name), lHashVal, ti, typecomp);
+ TRACE("%p, %s, %#lx, %p, %p.\n", This, debugstr_w(name), lHashVal, ti, typecomp);
hr = ITypeComp_RemoteBindType_Proxy(This, name, lHashVal, ti);
if (hr == S_OK)
@@ -1606,7 +1606,7 @@ HRESULT __RPC_STUB ITypeComp_BindType_Stub(
ITypeComp *typecomp = NULL;
HRESULT hr;
- TRACE("(%p, %s, %#x, %p)\n", This, debugstr_w(name), lHashVal, ti);
+ TRACE("%p, %s, %#lx, %p.\n", This, debugstr_w(name), lHashVal, ti);
hr = ITypeComp_BindType(This, name, lHashVal, ti, &typecomp);
@@ -1729,7 +1729,7 @@ HRESULT CALLBACK ITypeInfo_GetNames_Proxy(
UINT cMaxNames,
UINT* pcNames)
{
- TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames);
+ TRACE("%p, %#lx, %p, %d, %p.\n", This, memid, rgBstrNames, cMaxNames, pcNames);
return ITypeInfo_RemoteGetNames_Proxy(This, memid, rgBstrNames, cMaxNames, pcNames);
}
@@ -1741,7 +1741,7 @@ HRESULT __RPC_STUB ITypeInfo_GetNames_Stub(
UINT cMaxNames,
UINT* pcNames)
{
- TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames);
+ TRACE("%p, %#lx, %p, %d, %p.\n", This, memid, rgBstrNames, cMaxNames, pcNames);
return ITypeInfo_GetNames(This, memid, rgBstrNames, cMaxNames, pcNames);
}
@@ -1791,7 +1791,8 @@ HRESULT CALLBACK ITypeInfo_GetDocumentation_Proxy(ITypeInfo *This, MEMBERID memi
DWORD dummy_help_context, flags = 0;
BSTR dummy_name, dummy_doc_string, dummy_help_file;
HRESULT hr;
- TRACE("(%p, %08x, %p, %p, %p, %p)\n", This, memid, name, doc_string, help_context, help_file);
+
+ TRACE("%p, %#lx, %p, %p, %p, %p.\n", This, memid, name, doc_string, help_context, help_file);
if(!name) name = &dummy_name;
else flags = 1;
@@ -1816,7 +1817,7 @@ HRESULT __RPC_STUB ITypeInfo_GetDocumentation_Stub(ITypeInfo *This, MEMBERID mem
DWORD flags, BSTR *name, BSTR *doc_string,
DWORD *help_context, BSTR *help_file)
{
- TRACE("(%p, %08x, %08x, %p, %p, %p, %p)\n", This, memid, flags, name, doc_string, help_context, help_file);
+ TRACE("%p, %#lx, %#lx, %p, %p, %p, %p.\n", This, memid, flags, name, doc_string, help_context, help_file);
*name = *doc_string = *help_file = NULL;
*help_context = 0;
@@ -1837,7 +1838,8 @@ HRESULT CALLBACK ITypeInfo_GetDllEntry_Proxy(ITypeInfo *This, MEMBERID memid,
BSTR dummy_dll_name, dummy_name;
WORD dummy_ordinal;
HRESULT hr;
- TRACE("(%p, %08x, %x, %p, %p, %p)\n", This, memid, invkind, dll_name, name, ordinal);
+
+ TRACE("%p, %#lx, %#x, %p, %p, %p.\n", This, memid, invkind, dll_name, name, ordinal);
if(!dll_name) dll_name = &dummy_dll_name;
else flags = 1;
@@ -1860,7 +1862,7 @@ HRESULT __RPC_STUB ITypeInfo_GetDllEntry_Stub(ITypeInfo *This, MEMBERID memid,
BSTR *dll_name, BSTR *name,
WORD *ordinal)
{
- TRACE("(%p, %08x, %x, %p, %p, %p)\n", This, memid, invkind, dll_name, name, ordinal);
+ TRACE("%p, %#lx, %x, %p, %p, %p.\n", This, memid, invkind, dll_name, name, ordinal);
*dll_name = *name = NULL;
*ordinal = 0;
@@ -2017,7 +2019,8 @@ HRESULT CALLBACK ITypeInfo2_GetDocumentation2_Proxy(ITypeInfo2 *This, MEMBERID m
DWORD dummy_help_context, flags = 0;
BSTR dummy_help_string, dummy_help_dll;
HRESULT hr;
- TRACE("(%p, %08x, %08x, %p, %p, %p)\n", This, memid, lcid, help_string, help_context, help_dll);
+
+ TRACE("%p, %#lx, %#lx, %p, %p, %p.\n", This, memid, lcid, help_string, help_context, help_dll);
if(!help_string) help_string = &dummy_help_string;
else flags = 1;
@@ -2040,7 +2043,7 @@ HRESULT __RPC_STUB ITypeInfo2_GetDocumentation2_Stub(ITypeInfo2 *This, MEMBERID
BSTR *help_string, DWORD *help_context,
BSTR *help_dll)
{
- TRACE("(%p, %08x, %08x, %08x, %p, %p, %p)\n", This, memid, lcid, flags, help_string, help_context, help_dll);
+ TRACE("%p, %#lx, %#lx, %#lx, %p, %p, %p.\n", This, memid, lcid, flags, help_string, help_context, help_dll);
*help_string = *help_dll = NULL;
*help_context = 0;
@@ -2139,7 +2142,7 @@ HRESULT __RPC_STUB ITypeLib_GetDocumentation_Stub(ITypeLib *This, INT index, DWO
BSTR *name, BSTR *doc_string,
DWORD *help_context, BSTR *help_file)
{
- TRACE("(%p, %d, %08x, %p, %p, %p, %p)\n", This, index, flags, name, doc_string, help_context, help_file);
+ TRACE("%p, %d, %#lx, %p, %p, %p, %p.\n", This, index, flags, name, doc_string, help_context, help_file);
*name = *doc_string = *help_file = NULL;
*help_context = 0;
@@ -2241,7 +2244,8 @@ HRESULT CALLBACK ITypeLib2_GetDocumentation2_Proxy(ITypeLib2 *This, INT index,
DWORD dummy_help_context, flags = 0;
BSTR dummy_help_string, dummy_help_dll;
HRESULT hr;
- TRACE("(%p, %d, %08x, %p, %p, %p)\n", This, index, lcid, help_string, help_context, help_dll);
+
+ TRACE("%p, %d, %#lx, %p, %p, %p.\n", This, index, lcid, help_string, help_context, help_dll);
if(!help_string) help_string = &dummy_help_string;
else flags = 1;
@@ -2263,7 +2267,7 @@ HRESULT __RPC_STUB ITypeLib2_GetDocumentation2_Stub(ITypeLib2 *This, INT index,
DWORD flags, BSTR *help_string,
DWORD *help_context, BSTR *help_dll)
{
- TRACE("(%p, %d, %08x, %08x, %p, %p, %p)\n", This, index, lcid, flags, help_string, help_context, help_dll);
+ TRACE("%p, %d, %#lx, %#lx, %p, %p, %p.\n", This, index, lcid, flags, help_string, help_context, help_dll);
*help_string = *help_dll = NULL;
*help_context = 0;
@@ -2323,7 +2327,8 @@ HRESULT __RPC_STUB IPropertyBag_Read_Stub(
{
IDispatch *disp;
HRESULT hr;
- TRACE("(%p, %s, %p, %p, %x, %p)\n", This, debugstr_w(pszPropName), pVar,
+
+ TRACE("%p, %s, %p, %p, %lx, %p.\n", This, debugstr_w(pszPropName), pVar,
pErrorLog, varType, pUnkObj);
if(varType & (VT_BYREF | VT_ARRAY | VT_VECTOR))
@@ -2402,7 +2407,7 @@ HRESULT CALLBACK IEnumConnections_Next_Proxy(
{
ULONG fetched;
- TRACE("(%u, %p %p)\n", cConnections, rgcd, pcFetched);
+ TRACE("%lu, %p, %p.\n", cConnections, rgcd, pcFetched);
if (!pcFetched)
pcFetched = &fetched;
@@ -2418,7 +2423,7 @@ HRESULT __RPC_STUB IEnumConnections_Next_Stub(
{
HRESULT hr;
- TRACE("(%u, %p, %p)\n", cConnections, rgcd, pcFetched);
+ TRACE("%lu, %p, %p.\n", cConnections, rgcd, pcFetched);
*pcFetched = 0;
hr = IEnumConnections_Next(This, cConnections, rgcd, pcFetched);
@@ -2436,7 +2441,7 @@ HRESULT CALLBACK IEnumConnectionPoints_Next_Proxy(
{
ULONG fetched;
- TRACE("(%u, %p %p)\n", cConnections, ppCP, pcFetched);
+ TRACE("%lu, %p %p.\n", cConnections, ppCP, pcFetched);
if (!pcFetched)
pcFetched = &fetched;
@@ -2452,7 +2457,7 @@ HRESULT __RPC_STUB IEnumConnectionPoints_Next_Stub(
{
HRESULT hr;
- TRACE("(%u, %p, %p)\n", cConnections, ppCP, pcFetched);
+ TRACE("%lu, %p, %p.\n", cConnections, ppCP, pcFetched);
*pcFetched = 0;
hr = IEnumConnectionPoints_Next(This, cConnections, ppCP, pcFetched);
@@ -2467,7 +2472,7 @@ HRESULT CALLBACK IPersistMemory_Load_Proxy(
LPVOID pMem,
ULONG cbSize)
{
- TRACE("(%p, %u)\n", pMem, cbSize);
+ TRACE("%p, %lu.\n", pMem, cbSize);
if (!pMem)
return E_POINTER;
@@ -2480,7 +2485,7 @@ HRESULT __RPC_STUB IPersistMemory_Load_Stub(
BYTE *pMem,
ULONG cbSize)
{
- TRACE("(%p, %u)\n", pMem, cbSize);
+ TRACE("%p, %lu.\n", pMem, cbSize);
return IPersistMemory_Load(This, pMem, cbSize);
}
@@ -2490,7 +2495,7 @@ HRESULT CALLBACK IPersistMemory_Save_Proxy(
BOOL fClearDirty,
ULONG cbSize)
{
- TRACE("(%p, %d, %u)\n", pMem, fClearDirty, cbSize);
+ TRACE("%p, %d, %lu.\n", pMem, fClearDirty, cbSize);
if (!pMem)
return E_POINTER;
@@ -2504,7 +2509,7 @@ HRESULT __RPC_STUB IPersistMemory_Save_Stub(
BOOL fClearDirty,
ULONG cbSize)
{
- TRACE("(%p, %d, %u)\n", pMem, fClearDirty, cbSize);
+ TRACE("%p, %d, %lu.\n", pMem, fClearDirty, cbSize);
return IPersistMemory_Save(This, pMem, fClearDirty, cbSize);
}
@@ -2512,7 +2517,7 @@ void CALLBACK IAdviseSinkEx_OnViewStatusChange_Proxy(
IAdviseSinkEx* This,
DWORD dwViewStatus)
{
- TRACE("(%p, 0x%08x)\n", This, dwViewStatus);
+ TRACE("%p, %#lx.\n", This, dwViewStatus);
IAdviseSinkEx_RemoteOnViewStatusChange_Proxy(This, dwViewStatus);
}
@@ -2520,7 +2525,7 @@ HRESULT __RPC_STUB IAdviseSinkEx_OnViewStatusChange_Stub(
IAdviseSinkEx* This,
DWORD dwViewStatus)
{
- TRACE("(%p, 0x%08x)\n", This, dwViewStatus);
+ TRACE("%p, %#lx.\n", This, dwViewStatus);
IAdviseSinkEx_OnViewStatusChange(This, dwViewStatus);
return S_OK;
}
@@ -2533,7 +2538,7 @@ HRESULT CALLBACK IEnumOleUndoUnits_Next_Proxy(
{
ULONG fetched;
- TRACE("(%u, %p %p)\n", cElt, rgElt, pcEltFetched);
+ TRACE("%lu, %p %p.\n", cElt, rgElt, pcEltFetched);
if (!pcEltFetched)
pcEltFetched = &fetched;
@@ -2549,7 +2554,7 @@ HRESULT __RPC_STUB IEnumOleUndoUnits_Next_Stub(
{
HRESULT hr;
- TRACE("(%u, %p, %p)\n", cElt, rgElt, pcEltFetched);
+ TRACE("%lu, %p, %p.\n", cElt, rgElt, pcEltFetched);
*pcEltFetched = 0;
hr = IEnumOleUndoUnits_Next(This, cElt, rgElt, pcEltFetched);
diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c
index 8ed8f790d14..1d6fac4c518 100644
--- a/dlls/oleaut32/varformat.c
+++ b/dlls/oleaut32/varformat.c
@@ -492,7 +492,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
DWORD fmt_state = 0;
LPCWSTR pFormat = lpszFormat;
- TRACE("(%s,%p,%d,%d,%d,0x%08x,%p)\n", debugstr_w(lpszFormat), rgbTok, cbTok,
+ TRACE("%s, %p, %d, %d, %d, %#lx, %p.\n", debugstr_w(lpszFormat), rgbTok, cbTok,
nFirstDay, nFirstWeek, lcid, pcbActual);
if (!rgbTok ||
@@ -1162,7 +1162,7 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat,
const BYTE* pToken = NULL;
HRESULT hRes = S_OK;
- TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat),
+ TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat),
rgbTok, dwFlags, pbstrOut, lcid);
V_VT(&vString) = VT_EMPTY;
@@ -1570,7 +1570,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat,
const BYTE* pToken = NULL;
HRESULT hRes;
- TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn),
+ TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn),
debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid);
V_VT(&vDate) = VT_EMPTY;
@@ -1909,7 +1909,7 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat,
BOOL bUpper = FALSE;
HRESULT hRes = S_OK;
- TRACE("%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat),
+ TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat),
rgbTok, dwFlags, pbstrOut, lcid);
V_VT(&vStr) = VT_EMPTY;
@@ -2035,7 +2035,7 @@ HRESULT WINAPI VarFormatFromTokens(LPVARIANT pVarIn, LPOLESTR lpszFormat,
VARIANT vTmp;
HRESULT hres;
- TRACE("(%p,%s,%p,%x,%p,0x%08x)\n", pVarIn, debugstr_w(lpszFormat),
+ TRACE("%p, %s, %p, %#lx, %p, %#lx.\n", pVarIn, debugstr_w(lpszFormat),
rgbTok, dwFlags, pbstrOut, lcid);
if (!pbstrOut)
@@ -2122,7 +2122,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat,
BYTE buff[256];
HRESULT hres;
- TRACE("(%s,%s,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat),
+ TRACE("%s, %s, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat),
nFirstDay, nFirstWeek, dwFlags, pbstrOut);
if (!pbstrOut)
@@ -2134,7 +2134,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat,
if (SUCCEEDED(hres))
hres = VarFormatFromTokens(pVarIn, lpszFormat, buff, dwFlags,
pbstrOut, LOCALE_USER_DEFAULT);
- TRACE("returning 0x%08x, %s\n", hres, debugstr_w(*pbstrOut));
+ TRACE("returning %#lx, %s\n", hres, debugstr_w(*pbstrOut));
return hres;
}
@@ -2172,7 +2172,7 @@ HRESULT WINAPI VarFormatDateTime(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, B
static WCHAR szEmpty[] = L"";
const BYTE* lpFmt = NULL;
- TRACE("%s,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut);
+ TRACE("%s, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut);
if (!pVarIn || !pbstrOut || nFormat < 0 || nFormat > 4)
return E_INVALIDARG;
@@ -2224,7 +2224,7 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT
HRESULT hRet;
VARIANT vStr;
- TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading,
+ TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading,
nParens, nGrouping, dwFlags, pbstrOut);
if (!pVarIn || !pbstrOut || nDigits > 9)
@@ -2329,7 +2329,7 @@ HRESULT WINAPI VarFormatPercent(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT
HRESULT hRet;
VARIANT vDbl;
- TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading,
+ TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading,
nParens, nGrouping, dwFlags, pbstrOut);
if (!pVarIn || !pbstrOut || nDigits > 9)
@@ -2403,7 +2403,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading,
VARIANT vStr;
CY cy;
- TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading,
+ TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading,
nParens, nGrouping, dwFlags, pbstrOut);
if (!pVarIn || !pbstrOut || nDigits > 9)
@@ -2512,7 +2512,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO
return E_INVALIDARG;
if (dwFlags)
- FIXME("Does not support dwFlags 0x%x, ignoring.\n", dwFlags);
+ FIXME("Does not support flags %#lx, ignoring.\n", dwFlags);
if (fAbbrev)
localeValue = LOCALE_SABBREVMONTHNAME1 + iMonth - 1;
@@ -2521,7 +2521,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO
size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, NULL, 0);
if (!size) {
- ERR("GetLocaleInfo 0x%x failed.\n", localeValue);
+ ERR("GetLocaleInfo %#lx failed.\n", localeValue);
return HRESULT_FROM_WIN32(GetLastError());
}
*pbstrOut = SysAllocStringLen(NULL,size - 1);
@@ -2529,7 +2529,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO
return E_OUTOFMEMORY;
size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, *pbstrOut, size);
if (!size) {
- ERR("GetLocaleInfo of 0x%x failed in 2nd stage?!\n", localeValue);
+ ERR("GetLocaleInfo of %#lx failed in 2nd stage?!\n", localeValue);
SysFreeString(*pbstrOut);
return HRESULT_FROM_WIN32(GetLastError());
}
@@ -2569,7 +2569,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay,
return E_INVALIDARG;
if (dwFlags)
- FIXME("Does not support dwFlags 0x%x, ignoring.\n", dwFlags);
+ FIXME("Does not support flags %#lx, ignoring.\n", dwFlags);
/* If we have to use the default firstDay, find which one it is */
if (iFirstDay == 0) {
@@ -2578,7 +2578,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay,
size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue,
(LPWSTR)&firstDay, sizeof(firstDay) / sizeof(WCHAR));
if (!size) {
- ERR("GetLocaleInfo 0x%x failed.\n", localeValue);
+ ERR("GetLocaleInfo %#lx failed.\n", localeValue);
return HRESULT_FROM_WIN32(GetLastError());
}
iFirstDay = firstDay + 2;
@@ -2591,7 +2591,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay,
/* Determine the size of the data, allocate memory and retrieve the data */
size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, NULL, 0);
if (!size) {
- ERR("GetLocaleInfo 0x%x failed.\n", localeValue);
+ ERR("GetLocaleInfo %#lx failed.\n", localeValue);
return HRESULT_FROM_WIN32(GetLastError());
}
*pbstrOut = SysAllocStringLen(NULL, size - 1);
@@ -2599,7 +2599,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay,
return E_OUTOFMEMORY;
size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, *pbstrOut, size);
if (!size) {
- ERR("GetLocaleInfo 0x%x failed in 2nd stage?!\n", localeValue);
+ ERR("GetLocaleInfo %#lx failed in 2nd stage?!\n", localeValue);
SysFreeString(*pbstrOut);
return HRESULT_FROM_WIN32(GetLastError());
}
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index 010b1143172..bf8f041b9c6 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -51,7 +51,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
VARTYPE vtFrom = V_TYPE(ps);
DWORD dwFlags = 0;
- TRACE("(%s,0x%08x,0x%04x,%s,%s)\n", debugstr_variant(pd), lcid, wFlags,
+ TRACE("%s, %#lx, 0x%04x, %s, %s.\n", debugstr_variant(pd), lcid, wFlags,
debugstr_variant(ps), debugstr_vt(vt));
if (vt == VT_BSTR || vtFrom == VT_BSTR)
@@ -918,7 +918,7 @@ VariantCopyInd_Return:
if (pSrc != pvargSrc)
VariantClear(&vTmp);
- TRACE("returning 0x%08x, %s\n", hres, debugstr_variant(pvargDest));
+ TRACE("returning %#lx, %s\n", hres, debugstr_variant(pvargDest));
return hres;
}
@@ -972,7 +972,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, const VARIANTARG* pvar
{
HRESULT res = S_OK;
- TRACE("(%s,%s,0x%08x,0x%04x,%s)\n", debugstr_variant(pvargDest),
+ TRACE("%s, %s, %#lx, 0x%04x, %s.\n", debugstr_variant(pvargDest),
debugstr_variant(pvargSrc), lcid, wFlags, debugstr_vt(vt));
if (vt == VT_CLSID)
@@ -1021,7 +1021,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, const VARIANTARG* pvar
}
}
- TRACE("returning 0x%08x, %s\n", res, debugstr_variant(pvargDest));
+ TRACE("returning %#lx, %s\n", res, debugstr_variant(pvargDest));
return res;
}
@@ -1329,7 +1329,7 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT
UDATE ud;
double dateVal = 0;
- TRACE("(%p->%d/%d/%d %d:%d:%d:%d %d %d,0x%08x,0x%08x,%p)\n", pUdateIn,
+ TRACE("%p, %d/%d/%d, %d:%d:%d:%d, %#x, %d, %#lx, %#lx, %p.\n", pUdateIn,
pUdateIn->st.wMonth, pUdateIn->st.wDay, pUdateIn->st.wYear,
pUdateIn->st.wHour, pUdateIn->st.wMinute, pUdateIn->st.wSecond,
pUdateIn->st.wMilliseconds, pUdateIn->st.wDayOfWeek,
@@ -1338,7 +1338,7 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT
if (lcid != MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT))
FIXME("lcid possibly not handled, treating as en-us\n");
if (dwFlags & ~(VAR_TIMEVALUEONLY|VAR_DATEVALUEONLY))
- FIXME("unsupported flags: %x\n", dwFlags);
+ FIXME("unsupported flags: %lx\n", dwFlags);
ud = *pUdateIn;
@@ -1416,7 +1416,7 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate)
double datePart, timePart;
int julianDays;
- TRACE("(%g,0x%08x,%p)\n", dateIn, dwFlags, lpUdate);
+ TRACE("%g, %#lx, %p.\n", dateIn, dwFlags, lpUdate);
if (dateIn <= (DATE_MIN - 1.0) || dateIn >= (DATE_MAX + 1.0))
return E_INVALIDARG;
@@ -1507,7 +1507,7 @@ typedef struct tagVARIANT_NUMBER_CHARS
WARN("buffer too small for " #fld "\n"); \
else \
if (buff[0]) lpChars->name = buff[0]; \
- TRACE("lcid 0x%x, " #name "=%s\n", lcid, wine_dbgstr_wn(&lpChars->name, 1))
+ TRACE("lcid 0x%lx, " #name "=%s\n", lcid, wine_dbgstr_wn(&lpChars->name, 1))
/* Get the valid number characters for an lcid */
static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags)
@@ -1533,7 +1533,7 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID
if (!*lpChars->sCurrency)
wcscpy(lpChars->sCurrency, L"$");
lpChars->sCurrencyLen = wcslen(lpChars->sCurrency);
- TRACE("lcid 0x%x, sCurrency=%u %s\n", lcid, lpChars->sCurrencyLen, wine_dbgstr_w(lpChars->sCurrency));
+ TRACE("lcid %#lx, sCurrency %lu %s\n", lcid, lpChars->sCurrencyLen, wine_dbgstr_w(lpChars->sCurrency));
}
/* Number Parsing States */
@@ -1590,7 +1590,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla
int cchUsed = 0;
OLECHAR cDigitSeparator2;
- TRACE("(%s,%d,0x%08x,%p,%p)\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig);
+ TRACE("%s, %#lx, %#lx, %p, %p.\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig);
if (!pNumprs || !rgbDig)
return E_INVALIDARG;
@@ -2083,7 +2083,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig,
int wholeNumberDigits, fractionalDigits, divisor10 = 0, multiplier10 = 0;
- TRACE("(%p,%p,0x%x,%p)\n", pNumprs, rgbDig, dwVtBits, pVarDst);
+ TRACE("%p, %p, %lx, %p.\n", pNumprs, rgbDig, dwVtBits, pVarDst);
if (pNumprs->nBaseShift)
{
@@ -2182,7 +2182,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig,
return S_OK;
}
- TRACE("Overflow: possible return types: 0x%x, value: %s\n", dwVtBits, wine_dbgstr_longlong(ul64));
+ TRACE("Overflow: possible return types: %#lx, value: %s\n", dwVtBits, wine_dbgstr_longlong(ul64));
return DISP_E_OVERFLOW;
}
@@ -2783,7 +2783,7 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags)
DWORD xmask;
HRESULT rc;
- TRACE("(%s,%s,0x%08x,0x%08x)\n", debugstr_variant(left), debugstr_variant(right), lcid, flags);
+ TRACE("%s, %s, %#lx, %#lx.\n", debugstr_variant(left), debugstr_variant(right), lcid, flags);
lvt = V_VT(left) & VT_TYPEMASK;
rvt = V_VT(right) & VT_TYPEMASK;
@@ -3378,7 +3378,7 @@ end:
VariantClear(&tv);
VariantClear(&tempLeft);
VariantClear(&tempRight);
- TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result));
+ TRACE("returning %#lx, %s\n", hres, debugstr_variant(result));
return hres;
}
@@ -3567,7 +3567,7 @@ end:
VariantClear(&tv);
VariantClear(&tempLeft);
VariantClear(&tempRight);
- TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result));
+ TRACE("returning %#lx, %s\n", hres, debugstr_variant(result));
return hres;
}
@@ -3729,7 +3729,7 @@ end:
VariantClear(&rv);
VariantClear(&tempLeft);
VariantClear(&tempRight);
- TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result));
+ TRACE("returning %#lx, %s\n", hres, debugstr_variant(result));
return hres;
}
@@ -3992,7 +3992,7 @@ end:
VariantClear(&rv);
VariantClear(&tempLeft);
VariantClear(&tempRight);
- TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result));
+ TRACE("returning %#lx, %s\n", hres, debugstr_variant(result));
return hres;
}
@@ -5225,7 +5225,7 @@ VarRound_Exit:
V_VT(pVarOut) = VT_EMPTY;
VariantClear(&temp);
- TRACE("returning 0x%08x %s\n", hRet, debugstr_variant(pVarOut));
+ TRACE("returning %#lx, %s\n", hRet, debugstr_variant(pVarOut));
return hRet;
}
@@ -5585,14 +5585,14 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result)
rc = VariantChangeType(&lv, left, 0, VT_I8);
if(FAILED(rc))
{
- FIXME("Could not convert left type %d to %d? rc == 0x%X\n", V_VT(left), VT_I8, rc);
+ FIXME("Could not convert left type %d to %d? rc == %#lx.\n", V_VT(left), VT_I8, rc);
goto end;
}
rc = VariantChangeType(&rv, right, 0, VT_I8);
if(FAILED(rc))
{
- FIXME("Could not convert right type %d to %d? rc == 0x%X\n", V_VT(right), VT_I8, rc);
+ FIXME("Could not convert right type %d to %d? rc == %#lx.\n", V_VT(right), VT_I8, rc);
goto end;
}
diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c
index 916a4858607..3850fec7066 100644
--- a/dlls/oleaut32/vartype.c
+++ b/dlls/oleaut32/vartype.c
@@ -6723,7 +6723,7 @@ BOOL get_date_format(LCID lcid, DWORD flags, const SYSTEMTIME *st,
};
if(flags & ~(LOCALE_NOUSEROVERRIDE|VAR_DATEVALUEONLY))
- FIXME("ignoring flags %x\n", flags);
+ FIXME("ignoring flags %lx\n", flags);
flags &= LOCALE_NOUSEROVERRIDE;
while(*fmt && date_len) {
@@ -6814,7 +6814,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst
DWORD dwFormatFlags = dwFlags & LOCALE_NOUSEROVERRIDE;
WCHAR date[128], fmt_buff[80], *time;
- TRACE("(%g,0x%08x,0x%08x,%p)\n", dateIn, lcid, dwFlags, pbstrOut);
+ TRACE("%g, %#lx, %#lx, %p.\n", dateIn, lcid, dwFlags, pbstrOut);
if (!pbstrOut || !VariantTimeToSystemTime(dateIn, &st))
return E_INVALIDARG;
@@ -6888,7 +6888,7 @@ HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BS
DWORD dwResId = IDS_TRUE;
LANGID langId;
- TRACE("%d,0x%08x,0x%08x,%p\n", boolIn, lcid, dwFlags, pbstrOut);
+ TRACE("%d, %#lx, %#lx, %p.\n", boolIn, lcid, dwFlags, pbstrOut);
if (!pbstrOut)
return E_INVALIDARG;
@@ -7193,7 +7193,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl
HRESULT hres;
int ret;
- TRACE("%s,%s,%d,%08x\n",
+ TRACE("%s, %s, %#lx, %#lx.\n",
debugstr_wn(pbstrLeft, SysStringLen(pbstrLeft)),
debugstr_wn(pbstrRight, SysStringLen(pbstrRight)), lcid, dwFlags);
@@ -7233,7 +7233,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl
hres = CompareStringW(lcid, dwFlags, pbstrLeft, lenLeft,
pbstrRight, lenRight) - CSTR_LESS_THAN;
- TRACE("%d\n", hres);
+ TRACE("%ld\n", hres);
return hres;
}
}
@@ -7448,7 +7448,7 @@ static inline HRESULT VARIANT_MakeDate(DATEPARSE *dp, DWORD iDate,
else
v3 = dp->dwValues[offset + 2];
- TRACE("(%d,%d,%d,%d,%d)\n", v1, v2, v3, iDate, offset);
+ TRACE("%ld, %ld, %ld, %ld, %ld.\n", v1, v2, v3, iDate, offset);
/* If one number must be a month (Because a month name was given), then only
* consider orders with the month in that position.
@@ -7476,7 +7476,7 @@ static inline HRESULT VARIANT_MakeDate(DATEPARSE *dp, DWORD iDate,
}
VARIANT_MakeDate_Start:
- TRACE("dwAllOrders is 0x%08x\n", dwAllOrders);
+ TRACE("dwAllOrders is %#lx\n", dwAllOrders);
while (dwAllOrders)
{
@@ -7508,7 +7508,7 @@ VARIANT_MakeDate_Start:
dwTry = dwAllOrders;
}
- TRACE("Attempt %d, dwTry is 0x%08x\n", dwCount, dwTry);
+ TRACE("Attempt %ld, dwTry is %#lx\n", dwCount, dwTry);
dwCount++;
if (!dwTry)
@@ -7604,7 +7604,7 @@ VARIANT_MakeDate_OK:
* But Wine doesn't have/use that key at the time of writing.
*/
st->wYear = v3 <= 49 ? 2000 + v3 : v3 <= 99 ? 1900 + v3 : v3;
- TRACE("Returning date %d/%d/%d\n", v1, v2, st->wYear);
+ TRACE("Returning date %ld/%ld/%d\n", v1, v2, st->wYear);
return S_OK;
}
@@ -7673,13 +7673,13 @@ HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DA
*pdateOut = 0.0;
- TRACE("(%s,0x%08x,0x%08x,%p)\n", debugstr_w(strIn), lcid, dwFlags, pdateOut);
+ TRACE("%s, %#lx, %#lx, %p.\n", debugstr_w(strIn), lcid, dwFlags, pdateOut);
memset(&dp, 0, sizeof(dp));
GetLocaleInfoW(lcid, LOCALE_IDATE|LOCALE_RETURN_NUMBER|(dwFlags & LOCALE_NOUSEROVERRIDE),
(LPWSTR)&iDate, sizeof(iDate)/sizeof(WCHAR));
- TRACE("iDate is %d\n", iDate);
+ TRACE("iDate is %ld\n", iDate);
/* Get the month/day/am/pm tokens for this locale */
for (i = 0; i < ARRAY_SIZE(tokens); i++)
@@ -7831,7 +7831,7 @@ HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DA
* magic here occurs in VARIANT_MakeDate() above, where we determine what
* each date number must represent in the context of iDate.
*/
- TRACE("0x%08x\n", TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4));
+ TRACE("%#lx\n", TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4));
switch (TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4))
{
--
2.34.1
