[PATCH 3/3] oleaut32: Consistently print numbers
Andrew Eikum
aeikum at codeweavers.com
Wed Jun 5 14:25:16 CDT 2013
---
dlls/oleaut32/typelib.c | 156 ++++++++++++++++++++++++------------------------
1 file changed, 78 insertions(+), 78 deletions(-)
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index ad0b4ae..8168178 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -387,7 +387,7 @@ HRESULT WINAPI QueryPathOfRegTypeLib( REFGUID guid, WORD wMaj, WORD wMin, LCID l
HRESULT WINAPI CreateTypeLib(
SYSKIND syskind, LPCOLESTR szFile, ICreateTypeLib** ppctlib
) {
- FIXME("(%d,%s,%p), stub!\n",syskind,debugstr_w(szFile),ppctlib);
+ FIXME("(0x%x,%s,%p), stub!\n",syskind,debugstr_w(szFile),ppctlib);
return E_FAIL;
}
@@ -430,7 +430,7 @@ HRESULT WINAPI LoadTypeLibEx(
WCHAR szPath[MAX_PATH+1];
HRESULT res;
- TRACE("(%s,%d,%p)\n",debugstr_w(szFile), regkind, pptLib);
+ TRACE("(%s,0x%x,%p)\n",debugstr_w(szFile), regkind, pptLib);
*pptLib = NULL;
@@ -948,7 +948,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, %u, 0x%x) unregistering the typelib system-wide\n",
debugstr_guid(libid), wVerMajor, wVerMinor, lcid, syskind);
return UnRegisterTypeLib(libid, wVerMajor, wVerMinor, lcid, syskind);
}
@@ -1278,7 +1278,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",
+ case VT_USERDEFINED: sprintf(szVarType, "VT_USERDEFINED ref = 0x%x",
pTD->u.hreftype); break;
case VT_LPSTR: sprintf(szVarType, "VT_LPSTR"); break;
case VT_LPWSTR: sprintf(szVarType, "VT_LPWSTR"); break;
@@ -1293,7 +1293,7 @@ static void dump_TypeDesc(const TYPEDESC *pTD,char *szVarType) {
dump_TypeDesc(&pTD->u.lpadesc->tdescElem, szVarType + strlen(szVarType));
break;
- default: sprintf(szVarType, "unknown(%d)", pTD->vt & VT_TYPEMASK); break;
+ default: sprintf(szVarType, "unknown(0x%x)", pTD->vt & VT_TYPEMASK); break;
}
}
@@ -1301,7 +1301,7 @@ static void dump_ELEMDESC(const ELEMDESC *edesc) {
char buf[200];
USHORT flags = edesc->u.paramdesc.wParamFlags;
dump_TypeDesc(&edesc->tdesc,buf);
- MESSAGE("\t\ttdesc.vartype %d (%s)\n",edesc->tdesc.vt,buf);
+ MESSAGE("\t\ttdesc.vartype 0x%x (%s)\n",edesc->tdesc.vt,buf);
MESSAGE("\t\tu.paramdesc.wParamFlags");
if (!flags) MESSAGE(" PARAMFLAGS_NONE");
if (flags & PARAMFLAG_FIN) MESSAGE(" PARAMFLAG_FIN");
@@ -1320,7 +1320,7 @@ static void dump_FUNCDESC(const FUNCDESC *funcdesc) {
MESSAGE("Param %d:\n",i);
dump_ELEMDESC(funcdesc->lprgelemdescParam+i);
}
- MESSAGE("\tfunckind: %d (",funcdesc->funckind);
+ MESSAGE("\tfunckind: 0x%x (",funcdesc->funckind);
switch (funcdesc->funckind) {
case FUNC_VIRTUAL: MESSAGE("virtual");break;
case FUNC_PUREVIRTUAL: MESSAGE("pure virtual");break;
@@ -1329,14 +1329,14 @@ static void dump_FUNCDESC(const FUNCDESC *funcdesc) {
case FUNC_DISPATCH: MESSAGE("dispatch");break;
default: MESSAGE("unknown");break;
}
- MESSAGE(")\n\tinvkind: %d (",funcdesc->invkind);
+ MESSAGE(")\n\tinvkind: 0x%x (",funcdesc->invkind);
switch (funcdesc->invkind) {
case INVOKE_FUNC: MESSAGE("func");break;
case INVOKE_PROPERTYGET: MESSAGE("property get");break;
case INVOKE_PROPERTYPUT: MESSAGE("property put");break;
case INVOKE_PROPERTYPUTREF: MESSAGE("property put ref");break;
}
- MESSAGE(")\n\tcallconv: %d (",funcdesc->callconv);
+ MESSAGE(")\n\tcallconv: 0x%x (",funcdesc->callconv);
switch (funcdesc->callconv) {
case CC_CDECL: MESSAGE("cdecl");break;
case CC_PASCAL: MESSAGE("pascal");break;
@@ -1344,9 +1344,9 @@ static void dump_FUNCDESC(const FUNCDESC *funcdesc) {
case CC_SYSCALL: MESSAGE("syscall");break;
default:break;
}
- MESSAGE(")\n\toVft: %d\n", funcdesc->oVft);
+ MESSAGE(")\n\toVft: 0x%x\n", funcdesc->oVft);
MESSAGE("\tcParamsOpt: %d\n", funcdesc->cParamsOpt);
- MESSAGE("\twFlags: %x\n", funcdesc->wFuncFlags);
+ MESSAGE("\twFlags: 0x%x\n", funcdesc->wFuncFlags);
MESSAGE("\telemdescFunc (return value type):\n");
dump_ELEMDESC(&funcdesc->elemdescFunc);
@@ -1408,7 +1408,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,
+ TRACE_(typelib)("v%d.%d lcid=0x%x offset=0x%x\n", import->wVersionMajor,
import->wVersionMinor, import->lcid, import->offset);
}
@@ -1437,7 +1437,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 = 0x%x implflags 0x%x\n",
impl->hRef, impl->implflags);
++impl;
--n;
@@ -1538,12 +1538,12 @@ static void dump_TypeInfo(const ITypeInfoImpl * pty)
static void dump_VARDESC(const VARDESC *v)
{
- MESSAGE("memid %d\n",v->memid);
+ MESSAGE("memid 0x%x\n",v->memid);
MESSAGE("lpstrSchema %s\n",debugstr_w(v->lpstrSchema));
- MESSAGE("oInst %d\n",v->u.oInst);
+ MESSAGE("oInst 0x%x\n",v->u.oInst);
dump_ELEMDESC(&(v->elemdescVar));
- MESSAGE("wVarFlags %x\n",v->wVarFlags);
- MESSAGE("varkind %d\n",v->varkind);
+ MESSAGE("wVarFlags 0x%x\n",v->wVarFlags);
+ MESSAGE("varkind 0x%x\n",v->varkind);
}
static TYPEDESC std_typedesc[VT_LPWSTR+1] =
@@ -2093,7 +2093,7 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx )
}
MSFT_ReadLEWords(&(V_VT(pVar)), sizeof(VARTYPE), pcx,
pcx->pTblDir->pCustData.offset + offset );
- TRACE_(typelib)("Vartype = %x\n", V_VT(pVar));
+ TRACE_(typelib)("Vartype = 0x%x\n", V_VT(pVar));
switch (V_VT(pVar)){
case VT_EMPTY: /* FIXME: is this right? */
case VT_NULL: /* FIXME: is this right? */
@@ -2163,7 +2163,7 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx )
case VT_CLSID :
default:
size=0;
- FIXME("VARTYPE %d is not supported, setting pointer to NULL\n",
+ FIXME("VARTYPE 0x%x is not supported, setting pointer to NULL\n",
V_VT(pVar));
}
@@ -2204,7 +2204,7 @@ static void MSFT_GetTdesc(TLBContext *pcx, INT type, TYPEDESC *pTd,
else
*pTd=pcx->pLibInfo->pTypeDesc[type/(2*sizeof(INT))];
- TRACE_(typelib)("vt type = %X\n", pTd->vt);
+ TRACE_(typelib)("vt type = 0x%x\n", pTd->vt);
}
static int TLB_is_propgetput(INVOKEKIND invkind)
@@ -3709,7 +3709,7 @@ static sltg_ref_lookup_t *SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeLibImpl *pTL,
HREFTYPE typelib_ref;
if(pRef->magic != SLTG_REF_MAGIC) {
- FIXME("Ref magic = %x\n", pRef->magic);
+ FIXME("Ref magic = 0x%x\n", pRef->magic);
return NULL;
}
name = ( (char*)pRef->names + pRef->number);
@@ -3780,7 +3780,7 @@ static sltg_ref_lookup_t *SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeLibImpl *pTL,
typelib_ref += 4;
}
if((BYTE)*name != SLTG_REF_MAGIC)
- FIXME_(typelib)("End of ref block magic = %x\n", *name);
+ FIXME_(typelib)("End of ref block magic = 0x%x\n", *name);
dump_TLBRefType(pTL);
return table;
}
@@ -3913,7 +3913,7 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign
*(INT*)(pBlk + pItem->byte_offs);
break;
default:
- FIXME_(typelib)("VAR_CONST unimplemented for type %d\n", pVarDesc->vardesc.elemdescVar.tdesc.vt);
+ FIXME_(typelib)("VAR_CONST unimplemented for type 0x%x\n", pVarDesc->vardesc.elemdescVar.tdesc.vt);
}
}
}
@@ -4337,7 +4337,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
pNameTable += 0x20;
break;
default:
- FIXME_(typelib)("pNameTable jump = %x\n", *(WORD*)pNameTable);
+ FIXME_(typelib)("pNameTable jump = 0x%x\n", *(WORD*)pNameTable);
break;
}
@@ -4378,8 +4378,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 = 0x%x, pTIHeader->res0e = 0x%x, "
+ "pTIHeader->res16 = 0x%x, pTIHeader->res1e = 0x%x\n",
pTIHeader->res06, pTIHeader->res0e, pTIHeader->res16, pTIHeader->res1e);
*ppTypeInfoImpl = ITypeInfoImpl_Constructor();
@@ -4453,7 +4453,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
break;
default:
- FIXME("Not processing typekind %d\n", pTIHeader->typekind);
+ FIXME("Not processing typekind 0x%x\n", pTIHeader->typekind);
break;
}
@@ -4753,7 +4753,7 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation(
HRESULT result = E_INVALIDARG;
ITypeInfo *pTInfo;
- TRACE("(%p) index %d Name(%p) DocString(%p) HelpContext(%p) HelpFile(%p)\n",
+ TRACE("(%p) index 0x%x Name(%p) DocString(%p) HelpContext(%p) HelpFile(%p)\n",
This, index,
pBstrName, pBstrDocString,
pdwHelpContext, pBstrHelpFile);
@@ -4889,7 +4889,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 0x%x %p %p %p)\n", This, debugstr_w(name), hash, ppTInfo, memid, found);
if ((!name && hash == 0) || !ppTInfo || !memid || !found)
return E_INVALIDARG;
@@ -5006,7 +5006,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) index %d lcid 0x%x half implemented stub!\n", This, index, lcid);
/* the help string should be obtained from the helpstringdll,
* using the _DLLGetDocumentation function, based on the supplied
@@ -5284,7 +5284,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("(%s, 0x%x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp);
if(!szName || !ppTInfo || !ppTComp)
return E_INVALIDARG;
@@ -6170,7 +6170,7 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) {
res = call_method( func, nrargs, args, &stack_offset );
break;
default:
- FIXME("unsupported calling convention %d\n",callconv);
+ FIXME("unsupported calling convention 0x%x\n",callconv);
res = -1;
break;
}
@@ -6235,7 +6235,7 @@ 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, "
+ ERR("Could not get typeinfo of hreftype 0x%x for VT_USERDEFINED, "
"hr = 0x%08x\n",
tdesc->u.hreftype, hr);
return hr;
@@ -6285,7 +6285,7 @@ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc,
break;
default:
- FIXME("TKIND %d unhandled.\n",tattr->typekind);
+ FIXME("TKIND 0x%x unhandled.\n",tattr->typekind);
hr = E_NOTIMPL;
break;
}
@@ -6341,7 +6341,7 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc,
case VT_PTR:
case VT_LPSTR:
case VT_LPWSTR:
- ERR("cannot convert type %d into variant VT\n", tdesc->vt);
+ ERR("cannot convert type 0x%x into variant VT\n", tdesc->vt);
hr = DISP_E_BADVARTYPE;
break;
case VT_SAFEARRAY:
@@ -6388,7 +6388,7 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, const TYPEDESC *tdesc, GUID *gui
break;
default:
- ERR("Unexpected typekind %d\n", tattr->typekind);
+ ERR("Unexpected typekind 0x%x\n", tattr->typekind);
hres = E_UNEXPECTED;
}
@@ -6446,13 +6446,13 @@ DispCallFunc(
UINT i;
DWORD *args;
- TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n",
+ TRACE("(%p, 0x%lx, 0x%x, 0x%x, %d, %p, %p, %p (vt=0x%x))\n",
pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg,
pvargResult, V_VT(pvargResult));
if (cc != CC_STDCALL && cc != CC_CDECL)
{
- FIXME("unsupported calling convention %d\n",cc);
+ FIXME("unsupported calling convention 0x%x\n",cc);
return E_INVALIDARG;
}
@@ -6497,7 +6497,7 @@ DispCallFunc(
args[argspos++] = V_UI4(arg);
break;
}
- TRACE("arg %u: type %d\n",i,prgvt[i]);
+ TRACE("arg %u: type 0x%x\n",i,prgvt[i]);
dump_Variant(arg);
}
@@ -6524,7 +6524,7 @@ DispCallFunc(
V_UI8(pvargResult) = call_method( func, argspos - 1, args + 1, &stack_offset );
break;
case VT_HRESULT:
- WARN("invalid return type %u\n", vtReturn);
+ WARN("invalid return type 0x%x\n", vtReturn);
heap_free( args );
return E_INVALIDARG;
default:
@@ -6547,13 +6547,13 @@ DispCallFunc(
DWORD_PTR *args;
void *func;
- TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n",
+ TRACE("(%p, 0x%lx, 0x%x, 0x%x, %d, %p, %p, %p (vt=0x%x))\n",
pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg,
pvargResult, V_VT(pvargResult));
if (cc != CC_STDCALL && cc != CC_CDECL)
{
- FIXME("unsupported calling convention %d\n",cc);
+ FIXME("unsupported calling convention 0x%x\n",cc);
return E_INVALIDARG;
}
@@ -6587,7 +6587,7 @@ DispCallFunc(
args[argspos++] = V_UI8(arg);
break;
}
- TRACE("arg %u: type %d\n",i,prgvt[i]);
+ TRACE("arg %u: type 0x%x\n",i,prgvt[i]);
dump_Variant(arg);
}
@@ -6606,7 +6606,7 @@ DispCallFunc(
call_method( func, argspos, args );
break;
case VT_HRESULT:
- WARN("invalid return type %u\n", vtReturn);
+ WARN("invalid return type 0x%x\n", vtReturn);
heap_free( args );
return E_INVALIDARG;
default:
@@ -6619,7 +6619,7 @@ DispCallFunc(
return S_OK;
#else
- FIXME( "(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d)): not implemented for this CPU\n",
+ FIXME( "(%p, 0x%lx, 0x%x, 0x%x, %d, %p, %p, %p (vt=0x%x)): not implemented for this CPU\n",
pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult));
return E_NOTIMPL;
#endif
@@ -6658,7 +6658,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
const TLBFuncDesc *pFuncInfo;
UINT fdc;
- TRACE("(%p)(%p,id=%d,flags=0x%08x,%p,%p,%p,%p)\n",
+ TRACE("(%p)(%p,id=0x%x,flags=0x%08x,%p,%p,%p,%p)\n",
This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr
);
@@ -7007,7 +7007,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
if (FAILED(hres))
{
- ERR("failed to convert param %d to vt %d\n", i,
+ ERR("failed to convert param %d to vt 0x%x\n", i,
V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted]));
break;
}
@@ -7131,7 +7131,7 @@ func_fail:
break;
}
default:
- FIXME("Unknown function invocation type %d\n", func_desc->funckind);
+ FIXME("Unknown function invocation type 0x%x\n", func_desc->funckind);
hres = E_FAIL;
break;
}
@@ -7166,7 +7166,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 0x%x, flags 0x%x!\n", memid, wFlags);
return DISP_E_MEMBERNOTFOUND;
}
@@ -7184,7 +7184,7 @@ 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)"
+ TRACE("(%p) memid 0x%x Name(%p) DocString(%p)"
" HelpContext(%p) HelpFile(%p)\n",
This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
if(memid==MEMBERID_NIL){ /* documentation for the typeinfo */
@@ -7239,7 +7239,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface,
WARN("Could not search inherited interface!\n");
}
- WARN("member %d not found\n", memid);
+ WARN("member 0x%x not found\n", memid);
return TYPE_E_ELEMENTNOTFOUND;
}
@@ -7255,7 +7255,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)->(memid 0x%x, 0x%x, %p, %p, %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
if (pBstrDllName) *pBstrDllName = NULL;
if (pBstrName) *pBstrName = NULL;
@@ -7398,7 +7398,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 0x%x\n", hRefType);
goto end;
}
@@ -7533,7 +7533,7 @@ static HRESULT WINAPI ITypeInfo_fnCreateInstance( ITypeInfo2 *iface,
if(pTA->typekind != TKIND_COCLASS)
{
- WARN("CreateInstance on typeinfo of type %x\n", pTA->typekind);
+ WARN("CreateInstance on typeinfo of type 0x%x\n", pTA->typekind);
hr = E_INVALIDARG;
goto end;
}
@@ -7569,7 +7569,7 @@ 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 0x%x) stub!\n", This, memid);
*pBstrMops = NULL;
return S_OK;
}
@@ -7717,7 +7717,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 0x%x %p\n", iface, memid, pVarIndex);
pVarInfo = TLB_get_vardesc_by_memberid(This->vardescs, This->cVars, memid);
if(!pVarInfo)
@@ -7894,7 +7894,7 @@ 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) "
+ TRACE("(%p) memid 0x%x lcid(0x%x) HelpString(%p) "
"HelpStringContext(%p) HelpStringDll(%p)\n",
This, memid, lcid, pbstrHelpString, pdwHelpStringContext,
pbstrHelpStringDll );
@@ -8240,7 +8240,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, 0x%x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr);
*pDescKind = DESCKIND_NONE;
pBindPtr->lpfuncdesc = NULL;
@@ -8314,7 +8314,7 @@ static HRESULT WINAPI ITypeComp_fnBindType(
ITypeInfo ** ppTInfo,
ITypeComp ** ppTComp)
{
- TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp);
+ TRACE("(%s, 0x%x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp);
/* strange behaviour (does nothing) but like the
* original */
@@ -8345,7 +8345,7 @@ HRESULT WINAPI CreateTypeLib2(SYSKIND syskind, LPCOLESTR szFile,
ITypeLibImpl *This;
HRESULT hres;
- TRACE("(%d,%s,%p)\n", syskind, debugstr_w(szFile), ppctlib);
+ TRACE("(0x%x,%s,%p)\n", syskind, debugstr_w(szFile), ppctlib);
if (!szFile) return E_INVALIDARG;
@@ -8397,7 +8397,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface,
ITypeInfoImpl *info;
HRESULT hres;
- TRACE("%p %s %d %p\n", This, wine_dbgstr_w(name), kind, ctinfo);
+ TRACE("%p %s 0x%x %p\n", This, wine_dbgstr_w(name), kind, ctinfo);
if (!ctinfo || !name)
return E_INVALIDARG;
@@ -8438,7 +8438,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface,
info->cbSizeInstance = -0x75;
break;
default:
- FIXME("unrecognized typekind %d\n", info->typekind);
+ FIXME("unrecognized typekind 0x%x\n", info->typekind);
info->cbSizeInstance = 0xdeadbeef;
break;
}
@@ -8532,7 +8532,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 *iface,
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- TRACE("%p %d\n", This, helpContext);
+ TRACE("%p 0x%x\n", This, helpContext);
This->dwHelpContext = helpContext;
@@ -8544,7 +8544,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 *iface,
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- TRACE("%p %x\n", This, lcid);
+ TRACE("%p 0x%x\n", This, lcid);
This->set_lcid = lcid;
@@ -8556,7 +8556,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLibFlags(ICreateTypeLib2 *iface,
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- TRACE("%p %x\n", This, libFlags);
+ TRACE("%p 0x%x\n", This, libFlags);
This->libflags = libFlags;
@@ -9837,7 +9837,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringContext(ICreateTypeLib2 *if
ULONG helpStringContext)
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %u - stub\n", This, helpStringContext);
+ FIXME("%p 0x%x - stub\n", This, helpStringContext);
return E_NOTIMPL;
}
@@ -9916,7 +9916,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface,
WORD old_flags;
HRESULT hres;
- TRACE("%p %x\n", This, typeFlags);
+ TRACE("%p 0x%x\n", This, typeFlags);
if (typeFlags & TYPEFLAG_FDUAL) {
static const WCHAR stdole2tlb[] = { 's','t','d','o','l','e','2','.','t','l','b',0 };
@@ -9972,7 +9972,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext(ICreateTypeInfo2 *iface,
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- TRACE("%p %d\n", This, helpContext);
+ TRACE("%p 0x%x\n", This, helpContext);
This->dwHelpContext = helpContext;
@@ -10229,7 +10229,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface,
TLBImplType *impl_type;
HRESULT hres;
- TRACE("%p %u %d\n", This, index, refType);
+ TRACE("%p %u 0x%x\n", This, index, refType);
switch(This->typekind){
case TKIND_COCLASS: {
@@ -10249,7 +10249,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface,
return TYPE_E_ELEMENTNOTFOUND;
break;
default:
- FIXME("Unimplemented typekind: %d\n", This->typekind);
+ FIXME("Unimplemented typekind: 0x%x\n", This->typekind);
return E_NOTIMPL;
}
@@ -10303,7 +10303,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeFlags(ICreateTypeInfo2 *ifac
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
TLBImplType *impl_type = &This->impltypes[index];
- TRACE("%p %u %x\n", This, index, implTypeFlags);
+ TRACE("%p %u 0x%x\n", This, index, implTypeFlags);
if (This->typekind != TKIND_COCLASS)
return TYPE_E_BADMODULEKIND;
@@ -10492,7 +10492,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 0x%x\n", This, index, helpContext);
if(index >= This->cFuncs)
return TYPE_E_ELEMENTNOTFOUND;
@@ -10508,7 +10508,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 0x%x\n", This, index, helpContext);
if(index >= This->cVars)
return TYPE_E_ELEMENTNOTFOUND;
@@ -10670,7 +10670,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDescByMemId(ICreateTypeInfo2
MEMBERID memid, INVOKEKIND invKind)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %x %d - stub\n", This, memid, invKind);
+ FIXME("%p 0x%x 0x%x - stub\n", This, memid, invKind);
return E_NOTIMPL;
}
@@ -10686,7 +10686,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteVarDescByMemId(ICreateTypeInfo2 *
MEMBERID memid)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %x - stub\n", This, memid);
+ FIXME("%p 0x%x - stub\n", This, memid);
return E_NOTIMPL;
}
@@ -10752,7 +10752,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(ICreateTypeInfo2 *
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- TRACE("%p %u\n", This, helpStringContext);
+ TRACE("%p 0x%x\n", This, helpStringContext);
This->dwHelpStringContext = helpStringContext;
@@ -10763,7 +10763,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpStringContext(ICreateTypeInf
UINT index, ULONG helpStringContext)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %u %u - stub\n", This, index, helpStringContext);
+ FIXME("%p %u 0x%x - stub\n", This, index, helpStringContext);
return E_NOTIMPL;
}
@@ -10771,7 +10771,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpStringContext(ICreateTypeInfo
UINT index, ULONG helpStringContext)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %u %u - stub\n", This, index, helpStringContext);
+ FIXME("%p %u 0x%x - stub\n", This, index, helpStringContext);
return E_NOTIMPL;
}
--
1.8.3
More information about the wine-patches
mailing list