[PATCH 10/10] Use implementation pointer to trace ICreateTypeInfo2
Nikolay Sivov
nsivov at codeweavers.com
Sun Jan 23 14:34:21 CST 2011
---
dlls/oleaut32/typelib2.c | 242 +++++++++++++++++++++++++++-------------------
1 files changed, 141 insertions(+), 101 deletions(-)
diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c
index 8260ef2..5c843a1 100644
--- a/dlls/oleaut32/typelib2.c
+++ b/dlls/oleaut32/typelib2.c
@@ -1594,7 +1594,7 @@ static ULONG WINAPI ICreateTypeInfo2_fnAddRef(ICreateTypeInfo2 *iface)
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->ref was %u\n",This, ref - 1);
+ TRACE("(%p)->(%u)\n", This, ref);
if(ref==1 && This->typelib)
ICreateTypeLib2_AddRef((ICreateTypeLib2 *)This->typelib);
@@ -1610,7 +1610,7 @@ static ULONG WINAPI ICreateTypeInfo2_fnRelease(ICreateTypeInfo2 *iface)
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%u)\n",This, ref);
+ TRACE("(%p)->(%u)\n", This, ref);
if (!ref) {
if (This->typelib) {
@@ -1638,7 +1638,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetGuid(ICreateTypeInfo2 *iface, REFGUI
MSFT_GuidEntry guidentry;
int offset;
- TRACE("(%p,%s)\n", iface, debugstr_guid(guid));
+ TRACE("(%p)->(%s)\n", This, debugstr_guid(guid));
guidentry.guid = *guid;
guidentry.hreftype = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16];
@@ -1664,7 +1664,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, U
{
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
- TRACE("(%p,0x%x)\n", iface, uTypeFlags);
+ TRACE("(%p)->(0x%x)\n", This, uTypeFlags);
if(uTypeFlags & TYPEFLAG_FDUAL) {
This->typeinfo->typekind |= 0x10;
@@ -1734,10 +1734,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetDocString(
LPOLESTR pStrDoc)
{
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
-
int offset;
- TRACE("(%p,%s)\n", iface, debugstr_w(pStrDoc));
+ TRACE("(%p)->(%s)\n", This, debugstr_w(pStrDoc));
if (!pStrDoc)
return E_INVALIDARG;
@@ -1752,13 +1751,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetDocString(
*/
static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext(
ICreateTypeInfo2* iface,
- DWORD dwHelpContext)
+ DWORD context)
{
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
- TRACE("(%p,%d)\n", iface, dwHelpContext);
+ TRACE("(%p)->(%d)\n", This, context);
- This->typeinfo->helpcontext = dwHelpContext;
+ This->typeinfo->helpcontext = context;
return S_OK;
}
@@ -1768,14 +1767,14 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext(
*/
static HRESULT WINAPI ICreateTypeInfo2_fnSetVersion(
ICreateTypeInfo2* iface,
- WORD wMajorVerNum,
- WORD wMinorVerNum)
+ WORD major,
+ WORD minor)
{
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
- TRACE("(%p,%d,%d)\n", iface, wMajorVerNum, wMinorVerNum);
+ TRACE("(%p)->(%d,%d)\n", This, major, minor);
- This->typeinfo->version = wMajorVerNum | (wMinorVerNum << 16);
+ This->typeinfo->version = major | (minor << 16);
return S_OK;
}
@@ -1793,7 +1792,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(
UINT index;
HRESULT res;
- TRACE("(%p,%p,%p)\n", iface, pTInfo, phRefType);
+ TRACE("(%p)->(%p,%p)\n", This, pTInfo, phRefType);
if(!pTInfo || !phRefType)
return E_INVALIDARG;
@@ -1917,7 +1916,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc(
int decoded_size;
HRESULT hres;
- TRACE("(%p,%d,%p)\n", iface, index, pFuncDesc);
+ TRACE("(%p)->(%d,%p)\n", This, index, pFuncDesc);
if(!pFuncDesc || pFuncDesc->oVft&3)
return E_INVALIDARG;
@@ -2066,7 +2065,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(
{
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
- TRACE("(%p,%d,%d)\n", iface, index, hRefType);
+ TRACE("(%p)->(%d,%d)\n", This, index, hRefType);
if (This->typekind == TKIND_COCLASS) {
int offset;
@@ -2129,23 +2128,22 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(
static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeFlags(
ICreateTypeInfo2* iface,
UINT index,
- INT implTypeFlags)
+ INT flags)
{
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
int offset;
MSFT_RefRecord *ref;
- TRACE("(%p,%d,0x%x)\n", iface, index, implTypeFlags);
+ TRACE("(%p)->(%d,0x%x)\n", This, index, flags);
- if (This->typekind != TKIND_COCLASS) {
+ if (This->typekind != TKIND_COCLASS)
return TYPE_E_BADMODULEKIND;
- }
offset = ctl2_find_nth_reference(This->typelib, This->typeinfo->datatype1, index);
if (offset == -1) return TYPE_E_ELEMENTNOTFOUND;
ref = (MSFT_RefRecord *)&This->typelib->typelib_segment_data[MSFT_SEG_REFERENCES][offset];
- ref->flags = implTypeFlags;
+ ref->flags = flags;
return S_OK;
}
@@ -2155,17 +2153,17 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeFlags(
*/
static HRESULT WINAPI ICreateTypeInfo2_fnSetAlignment(
ICreateTypeInfo2* iface,
- WORD cbAlignment)
+ WORD alignment)
{
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
- TRACE("(%p,%d)\n", iface, cbAlignment);
+ TRACE("(%p)->(%d)\n", This, alignment);
- if (!cbAlignment) return E_INVALIDARG;
- if (cbAlignment > 16) return E_INVALIDARG;
+ if (!alignment) return E_INVALIDARG;
+ if (alignment > 16) return E_INVALIDARG;
This->typeinfo->typekind &= ~0xffc0;
- This->typeinfo->typekind |= cbAlignment << 6;
+ This->typeinfo->typekind |= alignment << 6;
/* FIXME: There's probably some way to simplify this. */
switch (This->typekind) {
@@ -2177,17 +2175,17 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetAlignment(
case TKIND_INTERFACE:
case TKIND_DISPATCH:
case TKIND_COCLASS:
- if (cbAlignment > 4) cbAlignment = 4;
+ if (alignment > 4) alignment = 4;
break;
case TKIND_RECORD:
case TKIND_MODULE:
case TKIND_UNION:
- cbAlignment = 1;
+ alignment = 1;
break;
}
- This->typeinfo->typekind |= cbAlignment << 11;
+ This->typeinfo->typekind |= alignment << 11;
return S_OK;
}
@@ -2197,9 +2195,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetAlignment(
*/
static HRESULT WINAPI ICreateTypeInfo2_fnSetSchema(
ICreateTypeInfo2* iface,
- LPOLESTR pStrSchema)
+ LPOLESTR schema)
{
- FIXME("(%p,%s), stub!\n", iface, debugstr_w(pStrSchema));
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%s), stub!\n", This, debugstr_w(schema));
return E_OUTOFMEMORY;
}
@@ -2221,7 +2220,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(
int var_type_size;
int alignment;
- TRACE("(%p,%d,%p)\n", iface, index, pVarDesc);
+ TRACE("(%p)->(%d,%p)\n", This, index, pVarDesc);
TRACE("%d, %p, %d, {{%x, %d}, {%p, %x}}, 0x%x, %d\n", pVarDesc->memid, pVarDesc->lpstrSchema, pVarDesc->u.oInst,
pVarDesc->elemdescVar.tdesc.u.hreftype, pVarDesc->elemdescVar.tdesc.vt,
pVarDesc->elemdescVar.u.paramdesc.pparamdescex, pVarDesc->elemdescVar.u.paramdesc.wParamFlags,
@@ -2322,6 +2321,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(
/* increment the number of variable elements */
This->typeinfo->cElement += 0x10000;
+ERR("count=%d\n", This->typeinfo->cElement);
return status;
}
@@ -2340,7 +2340,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames(
int offset, len, i;
char *namedata;
- TRACE("(%p %d %p %d)\n", This, index, names, cNames);
+ TRACE("(%p)->(%d,%p,%d)\n", This, index, names, cNames);
if(!names)
return E_INVALIDARG;
@@ -2411,7 +2411,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName(
int offset, i;
char *namedata;
- TRACE("(%p,%d,%s)\n", This, index, debugstr_w(szName));
+ TRACE("(%p)->(%d,%s)\n", This, index, debugstr_w(szName));
if (cti2_get_var_count(This->typeinfo) <= index)
return TYPE_E_ELEMENTNOTFOUND;
@@ -2449,15 +2449,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeDescAlias(
int encoded_typedesc;
int width;
- if (This->typekind != TKIND_ALIAS) {
- return TYPE_E_WRONGTYPEKIND;
- }
+ FIXME("(%p)->(%p), hack!\n", This, pTDescAlias);
- FIXME("(%p,%p), hack!\n", iface, pTDescAlias);
+ if (This->typekind != TKIND_ALIAS)
+ return TYPE_E_WRONGTYPEKIND;
- if (ctl2_encode_typedesc(This->typelib, pTDescAlias, &encoded_typedesc, &width, NULL, NULL) == -1) {
+ if (ctl2_encode_typedesc(This->typelib, pTDescAlias, &encoded_typedesc, &width, NULL, NULL) == -1)
return E_OUTOFMEMORY;
- }
This->typeinfo->size = width;
This->typeinfo->datatype1 = encoded_typedesc;
@@ -2474,7 +2472,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDefineFuncAsDllEntry(
LPOLESTR szDllName,
LPOLESTR szProcName)
{
- FIXME("(%p,%d,%s,%s), stub!\n", iface, index, debugstr_w(szDllName), debugstr_w(szProcName));
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d,%s,%s), stub!\n", This, index, debugstr_w(szDllName), debugstr_w(szProcName));
return E_OUTOFMEMORY;
}
@@ -2486,7 +2485,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncDocString(
UINT index,
LPOLESTR szDocString)
{
- FIXME("(%p,%d,%s), stub!\n", iface, index, debugstr_w(szDocString));
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d,%s), stub!\n", This, index, debugstr_w(szDocString));
return E_OUTOFMEMORY;
}
@@ -2501,7 +2501,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarDocString(
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
CyclicList *iter;
- TRACE("(%p,%d,%s)\n", This, index, debugstr_w(docstring));
+ TRACE("(%p)->(%d,%s)\n", This, index, debugstr_w(docstring));
if (!docstring) return E_INVALIDARG;
@@ -2536,7 +2536,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext(
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
CyclicList *func;
- TRACE("(%p,%d,%d)\n", iface, index, dwHelpContext);
+ TRACE("(%p)->(%d,%d)\n", This, index, dwHelpContext);
if(cti2_get_func_count(This->typeinfo) < index)
return TYPE_E_ELEMENTNOTFOUND;
@@ -2568,7 +2568,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext(
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
CyclicList *iter;
- TRACE("(%p,%d,%d)\n", This, index, context);
+ TRACE("(%p)->(%d,%d)\n", This, index, context);
if (cti2_get_var_count(This->typeinfo) <= index)
return TYPE_E_ELEMENTNOTFOUND;
@@ -2595,7 +2595,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetMops(
UINT index,
BSTR bstrMops)
{
- FIXME("(%p,%d,%p), stub!\n", iface, index, bstrMops);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d,%p), stub!\n", This, index, bstrMops);
return E_OUTOFMEMORY;
}
@@ -2606,7 +2607,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeIdldesc(
ICreateTypeInfo2* iface,
IDLDESC* pIdlDesc)
{
- FIXME("(%p,%p), stub!\n", iface, pIdlDesc);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%p), stub!\n", This, pIdlDesc);
return E_OUTOFMEMORY;
}
@@ -2851,7 +2853,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDesc(
ICreateTypeInfo2* iface, /* [I] The typeinfo from which to delete a function. */
UINT index) /* [I] The index of the function to delete. */
{
- FIXME("(%p,%d), stub!\n", iface, index);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%u), stub!\n", This, index);
return E_OUTOFMEMORY;
}
@@ -2870,7 +2873,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDescByMemId(
MEMBERID memid, /* [I] The member id of the function to delete. */
INVOKEKIND invKind) /* [I] The invocation type of the function to delete. (?) */
{
- FIXME("(%p,%d,%d), stub!\n", iface, memid, invKind);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d,%d), stub!\n", This, memid, invKind);
return E_OUTOFMEMORY;
}
@@ -2889,7 +2893,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteVarDesc(
ICreateTypeInfo2* iface, /* [I] The typeinfo from which to delete the variable description. */
UINT index) /* [I] The index of the variable description to delete. */
{
- FIXME("(%p,%d), stub!\n", iface, index);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d), stub!\n", This, index);
return E_OUTOFMEMORY;
}
@@ -2908,7 +2913,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteVarDescByMemId(
ICreateTypeInfo2* iface, /* [I] The typeinfo from which to delete the variable description. */
MEMBERID memid) /* [I] The member id of the variable description to delete. */
{
- FIXME("(%p,%d), stub!\n", iface, memid);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d), stub!\n", This, memid);
return E_OUTOFMEMORY;
}
@@ -2926,7 +2932,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteImplType(
ICreateTypeInfo2* iface, /* [I] The typeinfo from which to delete. */
UINT index) /* [I] The index of the interface to delete. */
{
- FIXME("(%p,%d), stub!\n", iface, index);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d), stub!\n", This, index);
return E_OUTOFMEMORY;
}
@@ -2943,16 +2950,16 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteImplType(
static HRESULT WINAPI ICreateTypeInfo2_fnSetCustData(
ICreateTypeInfo2* iface, /* [I] The typeinfo in which to set the custom data. */
REFGUID guid, /* [I] The GUID used as a key to retrieve the custom data. */
- VARIANT* pVarVal) /* [I] The custom data. */
+ VARIANT* data) /* [I] The custom data. */
{
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
- TRACE("(%p,%s,%p)!\n", iface, debugstr_guid(guid), pVarVal);
+ TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(guid), data);
- if (!pVarVal)
- return E_INVALIDARG;
+ if (!data)
+ return E_INVALIDARG;
- return ctl2_set_custdata(This->typelib, guid, pVarVal, &This->typeinfo->oCustData);
+ return ctl2_set_custdata(This->typelib, guid, data, &This->typeinfo->oCustData);
}
/******************************************************************************
@@ -2974,7 +2981,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncCustData(
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
CyclicList *iter;
- TRACE("(%p,%d,%s,%p)\n", iface, index, debugstr_guid(guid), pVarVal);
+ TRACE("(%p)->(%d,%s,%p)\n", This, index, debugstr_guid(guid), pVarVal);
if(index >= cti2_get_func_count(This->typeinfo))
return TYPE_E_ELEMENTNOTFOUND;
@@ -3009,7 +3016,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetParamCustData(
REFGUID guid, /* [I] The GUID used as a key to retrieve the custom data. */
VARIANT* pVarVal) /* [I] The custom data. */
{
- FIXME("(%p,%d,%d,%s,%p), stub!\n", iface, indexFunc, indexParam, debugstr_guid(guid), pVarVal);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d,%d,%s,%p), stub!\n", This, indexFunc, indexParam, debugstr_guid(guid), pVarVal);
return E_OUTOFMEMORY;
}
@@ -3029,7 +3037,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarCustData(
REFGUID guid, /* [I] The GUID used as a key to retrieve the custom data. */
VARIANT* pVarVal) /* [I] The custom data. */
{
- FIXME("(%p,%d,%s,%p), stub!\n", iface, index, debugstr_guid(guid), pVarVal);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d,%s,%p), stub!\n", This, index, debugstr_guid(guid), pVarVal);
return E_OUTOFMEMORY;
}
@@ -3049,7 +3058,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeCustData(
REFGUID guid, /* [I] The GUID used as a key to retrieve the custom data. */
VARIANT* pVarVal) /* [I] The custom data. */
{
- FIXME("(%p,%d,%s,%p), stub!\n", iface, index, debugstr_guid(guid), pVarVal);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d,%s,%p), stub!\n", This, index, debugstr_guid(guid), pVarVal);
return E_OUTOFMEMORY;
}
@@ -3067,7 +3077,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(
ICreateTypeInfo2* iface, /* [I] The typeinfo on which to set the help string context. */
ULONG dwHelpStringContext) /* [I] The help string context. */
{
- FIXME("(%p,%d), stub!\n", iface, dwHelpStringContext);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d), stub!\n", This, dwHelpStringContext);
return E_OUTOFMEMORY;
}
@@ -3086,7 +3097,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpStringContext(
UINT index, /* [I] The index for the function on which to set the help string context. */
ULONG dwHelpStringContext) /* [I] The help string context. */
{
- FIXME("(%p,%d,%d), stub!\n", iface, index, dwHelpStringContext);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d,%d), stub!\n", This, index, dwHelpStringContext);
return E_OUTOFMEMORY;
}
@@ -3105,7 +3117,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpStringContext(
UINT index, /* [I] The index of the variable on which to set the help string context. */
ULONG dwHelpStringContext) /* [I] The help string context */
{
- FIXME("(%p,%d,%d), stub!\n", iface, index, dwHelpStringContext);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%d,%d), stub!\n", This, index, dwHelpStringContext);
return E_OUTOFMEMORY;
}
@@ -3117,7 +3130,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpStringContext(
static HRESULT WINAPI ICreateTypeInfo2_fnInvalidate(
ICreateTypeInfo2* iface)
{
- FIXME("(%p), stub!\n", iface);
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p), stub!\n", This);
return E_OUTOFMEMORY;
}
@@ -3135,7 +3149,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetName(
ICreateTypeInfo2* iface,
LPOLESTR szName)
{
- FIXME("(%p,%s), stub!\n", iface, debugstr_w(szName));
+ ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
+ FIXME("(%p)->(%s), stub!\n", This, debugstr_w(szName));
return E_OUTOFMEMORY;
}
@@ -3181,7 +3196,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeAttr(
ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
HRESULT hres;
- TRACE("(%p,%p)\n", iface, ppTypeAttr);
+ TRACE("(%p)->(%p)\n", This, ppTypeAttr);
if(!ppTypeAttr)
return E_INVALIDARG;
@@ -3228,7 +3243,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeComp(
ITypeInfo2* iface,
ITypeComp** ppTComp)
{
- FIXME("(%p,%p), stub!\n", iface, ppTComp);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%p), stub!\n", This, ppTComp);
return E_OUTOFMEMORY;
}
@@ -3245,7 +3261,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncDesc(
CyclicList *desc;
HRESULT hres;
- TRACE("(%p,%d,%p), semi-stub\n", iface, index, ppFuncDesc);
+ TRACE("(%p)->(%d,%p), semi-stub\n", This, index, ppFuncDesc);
if (!ppFuncDesc)
return E_INVALIDARG;
@@ -3345,7 +3361,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarDesc(
UINT index,
VARDESC** ppVarDesc)
{
- FIXME("(%p,%d,%p), stub!\n", iface, index, ppVarDesc);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%d,%p), stub!\n", This, index, ppVarDesc);
return E_OUTOFMEMORY;
}
@@ -3359,7 +3376,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetNames(
UINT cMaxNames,
UINT* pcNames)
{
- FIXME("(%p,%d,%p,%d,%p), stub!\n", iface, memid, rgBstrNames, cMaxNames, pcNames);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%d,%p,%d,%p), stub!\n", This, memid, rgBstrNames, cMaxNames, pcNames);
return E_OUTOFMEMORY;
}
@@ -3375,7 +3393,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeOfImplType(
MSFT_RefRecord *ref;
int offset;
- TRACE("(%p,%d,%p)\n", iface, index, pRefType);
+ TRACE("(%p)->(%d,%p)\n", This, index, pRefType);
if(!pRefType)
return E_INVALIDARG;
@@ -3420,7 +3438,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetImplTypeFlags(
int offset;
MSFT_RefRecord *ref;
- TRACE("(%p,%d,%p)\n", iface, index, pImplTypeFlags);
+ TRACE("(%p)->(%d,%p)\n", This, index, pImplTypeFlags);
if(!pImplTypeFlags)
return E_INVALIDARG;
@@ -3451,7 +3469,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetIDsOfNames(
UINT cNames,
MEMBERID* pMemId)
{
- FIXME("(%p,%p,%d,%p), stub!\n", iface, rgszNames, cNames, pMemId);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%p,%d,%p), stub!\n", This, rgszNames, cNames, pMemId);
return E_OUTOFMEMORY;
}
@@ -3468,7 +3487,8 @@ static HRESULT WINAPI ITypeInfo2_fnInvoke(
EXCEPINFO* pExcepInfo,
UINT* puArgErr)
{
- FIXME("(%p,%p,%d,%x,%p,%p,%p,%p), stub!\n", iface, pvInstance, memid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%p,%d,%x,%p,%p,%p,%p), stub!\n", This, pvInstance, memid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_OUTOFMEMORY;
}
@@ -3487,7 +3507,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation(
HRESULT status = TYPE_E_ELEMENTNOTFOUND;
INT nameoffset, docstringoffset, helpcontext;
- TRACE("(%p,%d,%p,%p,%p,%p)\n", iface, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
+ TRACE("(%p)->(%d,%p,%p,%p,%p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
if (memid == -1)
{
@@ -3578,7 +3598,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetDllEntry(
BSTR* pBstrName,
WORD* pwOrdinal)
{
- FIXME("(%p,%d,%d,%p,%p,%p), stub!\n", iface, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%d,%d,%p,%p,%p), stub!\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
return E_OUTOFMEMORY;
}
@@ -3592,7 +3613,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeInfo(
{
ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
- TRACE("(%p,%d,%p)\n", iface, hRefType, ppTInfo);
+ TRACE("(%p)->(%d,%p)\n", This, hRefType, ppTInfo);
if(!ppTInfo)
return E_INVALIDARG;
@@ -3655,7 +3676,8 @@ static HRESULT WINAPI ITypeInfo2_fnAddressOfMember(
INVOKEKIND invKind,
PVOID* ppv)
{
- FIXME("(%p,%d,%d,%p), stub!\n", iface, memid, invKind, ppv);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%d,%d,%p), stub!\n", This, memid, invKind, ppv);
return E_OUTOFMEMORY;
}
@@ -3668,7 +3690,8 @@ static HRESULT WINAPI ITypeInfo2_fnCreateInstance(
REFIID riid,
PVOID* ppvObj)
{
- FIXME("(%p,%p,%s,%p), stub!\n", iface, pUnkOuter, debugstr_guid(riid), ppvObj);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%p,%s,%p), stub!\n", This, pUnkOuter, debugstr_guid(riid), ppvObj);
return E_OUTOFMEMORY;
}
@@ -3680,7 +3703,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetMops(
MEMBERID memid,
BSTR* pBstrMops)
{
- FIXME("(%p,%d,%p), stub!\n", iface, memid, pBstrMops);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%d,%p), stub!\n", This, memid, pBstrMops);
return E_OUTOFMEMORY;
}
@@ -3694,7 +3718,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetContainingTypeLib(
{
ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
- TRACE("(%p,%p,%p)\n", iface, ppTLib, pIndex);
+ TRACE("(%p)->(%p,%p)\n", This, ppTLib, pIndex);
*ppTLib = (ITypeLib *)&This->typelib->lpVtblTypeLib2;
ICreateTypeLib_AddRef((ICreateTypeLib*)This->typelib);
@@ -3723,7 +3747,8 @@ static void WINAPI ITypeInfo2_fnReleaseTypeAttr(
ITypeInfo2* iface,
TYPEATTR* pTypeAttr)
{
- TRACE("(%p,%p)\n", iface, pTypeAttr);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ TRACE("(%p)->(%p)\n", This, pTypeAttr);
if (pTypeAttr->tdescAlias.vt != VT_USERDEFINED)
release_typedesc(pTypeAttr->tdescAlias.u.lptdesc);
@@ -3738,9 +3763,10 @@ static void WINAPI ITypeInfo2_fnReleaseFuncDesc(
ITypeInfo2* iface,
FUNCDESC* pFuncDesc)
{
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
int i;
- TRACE("(%p,%p)\n", iface, pFuncDesc);
+ TRACE("(%p)->(%p)\n", This, pFuncDesc);
heap_free(pFuncDesc->lprgscode);
@@ -3769,7 +3795,8 @@ static void WINAPI ITypeInfo2_fnReleaseVarDesc(
ITypeInfo2* iface,
VARDESC* pVarDesc)
{
- FIXME("(%p,%p), stub!\n", iface, pVarDesc);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%p), stub!\n", This, pVarDesc);
}
/******************************************************************************
@@ -3786,7 +3813,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeKind(
ITypeInfo2* iface, /* [I] The TypeInfo to obtain the typekind for. */
TYPEKIND* pTypeKind) /* [O] The typekind for this TypeInfo. */
{
- FIXME("(%p,%p), stub!\n", iface, pTypeKind);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%p), stub!\n", This, pTypeKind);
return E_OUTOFMEMORY;
}
@@ -3804,7 +3832,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeFlags(
ITypeInfo2* iface, /* [I] The TypeInfo to obtain the typeflags for. */
ULONG* pTypeFlags) /* [O] The type flags for this TypeInfo. */
{
- FIXME("(%p,%p), stub!\n", iface, pTypeFlags);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%p), stub!\n", This, pTypeFlags);
return E_OUTOFMEMORY;
}
@@ -3824,7 +3853,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncIndexOfMemId(
INVOKEKIND invKind, /* [I] The invocation kind for the function. */
UINT* pFuncIndex) /* [O] The index of the function. */
{
- FIXME("(%p,%d,%d,%p), stub!\n", iface, memid, invKind, pFuncIndex);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%d,%d,%p), stub!\n", This, memid, invKind, pFuncIndex);
return E_OUTOFMEMORY;
}
@@ -3843,7 +3873,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarIndexOfMemId(
MEMBERID memid, /* [I] The member id for the variable. */
UINT* pVarIndex) /* [O] The index of the variable. */
{
- FIXME("(%p,%d,%p), stub!\n", iface, memid, pVarIndex);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%d,%p), stub!\n", This, memid, pVarIndex);
return E_OUTOFMEMORY;
}
@@ -3866,7 +3897,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetCustData(
MSFT_CDGuid *cdentry;
int offset;
- TRACE("(%p,%s,%p)\n", iface, debugstr_guid(guid), pVarVal);
+ TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(guid), pVarVal);
if (!guid || !pVarVal)
return E_INVALIDARG;
@@ -3897,7 +3928,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncCustData(
REFGUID guid, /* [I] The GUID under which the custom data is stored. */
VARIANT* pVarVal) /* [O] The custom data. */
{
- FIXME("(%p,%d,%s,%p), stub!\n", iface, index, debugstr_guid(guid), pVarVal);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%u,%s,%p), stub!\n", This, index, debugstr_guid(guid), pVarVal);
return E_OUTOFMEMORY;
}
@@ -3918,7 +3950,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetParamCustData(
REFGUID guid, /* [I] The GUID under which the custom data is stored. */
VARIANT* pVarVal) /* [O] The custom data. */
{
- FIXME("(%p,%d,%d,%s,%p), stub!\n", iface, indexFunc, indexParam, debugstr_guid(guid), pVarVal);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%u,%u,%s,%p), stub!\n", This, indexFunc, indexParam, debugstr_guid(guid), pVarVal);
return E_OUTOFMEMORY;
}
@@ -3938,7 +3971,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarCustData(
REFGUID guid, /* [I] The GUID under which the custom data is stored. */
VARIANT* pVarVal) /* [O] The custom data. */
{
- FIXME("(%p,%d,%s,%p), stub!\n", iface, index, debugstr_guid(guid), pVarVal);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%u,%s,%p), stub!\n", This, index, debugstr_guid(guid), pVarVal);
return E_OUTOFMEMORY;
}
@@ -3958,7 +3992,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetImplTypeCustData(
REFGUID guid, /* [I] The GUID under which the custom data is stored. */
VARIANT* pVarVal) /* [O] The custom data. */
{
- FIXME("(%p,%d,%s,%p), stub!\n", iface, index, debugstr_guid(guid), pVarVal);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%u,%s,%p), stub!\n", This, index, debugstr_guid(guid), pVarVal);
return E_OUTOFMEMORY;
}
@@ -3980,7 +4015,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation2(
DWORD* pdwHelpStringContext, /* [O] The help string context. */
BSTR* pbstrHelpStringDll) /* [O] The help file name. */
{
- FIXME("(%p,%d,%d,%p,%p,%p), stub!\n", iface, memid, lcid, pbstrHelpString, pdwHelpStringContext, pbstrHelpStringDll);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%d,%d,%p,%p,%p), stub!\n", This, memid, lcid, pbstrHelpString, pdwHelpStringContext, pbstrHelpStringDll);
return E_OUTOFMEMORY;
}
@@ -3998,7 +4034,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllCustData(
ITypeInfo2* iface, /* [I] The TypeInfo in which to find the custom data. */
CUSTDATA* pCustData) /* [O] A pointer to the custom data. */
{
- FIXME("(%p,%p), stub!\n", iface, pCustData);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%p), stub!\n", This, pCustData);
return E_OUTOFMEMORY;
}
@@ -4017,7 +4054,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllFuncCustData(
UINT index, /* [I] The index of the function for which to retrieve the custom data. */
CUSTDATA* pCustData) /* [O] A pointer to the custom data. */
{
- FIXME("(%p,%d,%p), stub!\n", iface, index, pCustData);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%d,%p), stub!\n", This, index, pCustData);
return E_OUTOFMEMORY;
}
@@ -4037,7 +4075,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllParamCustData(
UINT indexParam, /* [I] The index of the parameter for which to retrieve the custom data. */
CUSTDATA* pCustData) /* [O] A pointer to the custom data. */
{
- FIXME("(%p,%d,%d,%p), stub!\n", iface, indexFunc, indexParam, pCustData);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%u,%u,%p), stub!\n", This, indexFunc, indexParam, pCustData);
return E_OUTOFMEMORY;
}
@@ -4056,7 +4095,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllVarCustData(
UINT index, /* [I] The index of the variable for which to retrieve the custom data. */
CUSTDATA* pCustData) /* [O] A pointer to the custom data. */
{
- FIXME("(%p,%d,%p), stub!\n", iface, index, pCustData);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%u,%p), stub!\n", This, index, pCustData);
return E_OUTOFMEMORY;
}
@@ -4075,7 +4115,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllImplTypeCustData(
UINT index, /* [I] The index of the implemented type for which to retrieve the custom data. */
CUSTDATA* pCustData) /* [O] A pointer to the custom data. */
{
- FIXME("(%p,%d,%p), stub!\n", iface, index, pCustData);
+ ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface);
+ FIXME("(%p)->(%u,%p), stub!\n", This, index, pCustData);
return E_OUTOFMEMORY;
}
@@ -4132,7 +4173,6 @@ static const ICreateTypeInfo2Vtbl ctypeinfo2vt =
static const ITypeInfo2Vtbl typeinfo2vt =
{
-
ITypeInfo2_fnQueryInterface,
ITypeInfo2_fnAddRef,
ITypeInfo2_fnRelease,
--
1.5.6.5
--------------020806060905030402050903--
More information about the wine-patches
mailing list