Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/vbscript/Makefile.in | 1 - dlls/vbscript/global.c | 12 +++---- dlls/vbscript/interp.c | 14 ++++---- dlls/vbscript/parser.y | 2 + dlls/vbscript/regexp.c | 6 ++- dlls/vbscript/utils.c | 6 ++- dlls/vbscript/vbdisp.c | 74 +++++++++++++++++++++-------------------- dlls/vbscript/vbregexp.c | 54 +++++++++++++++--------------- dlls/vbscript/vbscript.c | 36 ++++++++++---------- dlls/vbscript/vbscript_main.c | 2 + 10 files changed, 103 insertions(+), 104 deletions(-)
diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 96e4e0affb9..a6a0569cc03 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vbscript.dll IMPORTS = oleaut32 ole32 user32
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index feab156c7b4..ab06db87624 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -84,7 +84,7 @@ static ULONG WINAPI Builtin_AddRef(IDispatch *iface) BuiltinDisp *This = impl_from_IDispatch(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -94,7 +94,7 @@ static ULONG WINAPI Builtin_Release(IDispatch *iface) BuiltinDisp *This = impl_from_IDispatch(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { assert(!This->ctx); @@ -115,7 +115,7 @@ static HRESULT WINAPI Builtin_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) static HRESULT WINAPI Builtin_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { BuiltinDisp *This = impl_from_IDispatch(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); return DISP_E_BADINDEX; }
@@ -148,7 +148,7 @@ static HRESULT WINAPI Builtin_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLE unsigned i; HRESULT hres;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), names, name_cnt, lcid, ids); + TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), names, name_cnt, lcid, ids);
if(!This->ctx) { FIXME("NULL context\n"); @@ -173,7 +173,7 @@ static HRESULT WINAPI Builtin_Invoke(IDispatch *iface, DISPID id, REFIID riid, L unsigned argn, i; HRESULT hres;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, id, debugstr_guid(riid), lcid, flags, dp, res, ei, err); + TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, id, debugstr_guid(riid), lcid, flags, dp, res, ei, err);
if(!This->ctx) { FIXME("NULL context\n"); @@ -626,7 +626,7 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, unsigned type, BSTR o heap_free(title_buf); IActiveScriptSiteWindow_Release(acts_window); if(FAILED(hres)) { - FIXME("failed: %08x\n", hres); + FIXME("failed: %08lx\n", hres); return hres; }
diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f33454604d0..c43b5383dee 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1223,7 +1223,7 @@ static HRESULT interp_dim(exec_ctx_t *ctx)
hres = lookup_identifier(ctx, ident, VBDISP_LET, &ref); if(FAILED(hres)) { - FIXME("lookup %s failed: %08x\n", debugstr_w(ident), hres); + FIXME("lookup %s failed: %08lx\n", debugstr_w(ident), hres); return hres; }
@@ -1292,7 +1292,7 @@ static HRESULT interp_redim(exec_ctx_t *ctx)
hres = lookup_identifier(ctx, identifier, VBDISP_LET, &ref); if(FAILED(hres)) { - FIXME("lookup %s failed: %08x\n", debugstr_w(identifier), hres); + FIXME("lookup %s failed: %08lx\n", debugstr_w(identifier), hres); return hres; }
@@ -1332,7 +1332,7 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx)
hres = lookup_identifier(ctx, identifier, VBDISP_LET, &ref); if(FAILED(hres)) { - FIXME("lookup %s failed: %08x\n", debugstr_w(identifier), hres); + FIXME("lookup %s failed: %08lx\n", debugstr_w(identifier), hres); return hres; }
@@ -1367,7 +1367,7 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx) /* can resize the last dimensions (if others match */ for(i = 0; i+1 < dim_cnt; ++i) { if(array->rgsabound[array->cDims - 1 - i].cElements != bounds[i].cElements) { - TRACE("Can't resize %s, bound[%d] %d != %d\n", debugstr_w(identifier), i, array->rgsabound[i].cElements, bounds[i].cElements); + TRACE("Can't resize %s, bound[%d] %ld != %ld\n", debugstr_w(identifier), i, array->rgsabound[i].cElements, bounds[i].cElements); return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); } } @@ -1448,7 +1448,7 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) hres = IUnknown_QueryInterface(V_UNKNOWN(&iterv), &IID_IEnumVARIANT, (void**)&iter); IUnknown_Release(V_UNKNOWN(&iterv)); if(FAILED(hres)) { - FIXME("Could not get IEnumVARIANT iface: %08x\n", hres); + FIXME("Could not get IEnumVARIANT iface: %08lx\n", hres); return hres; }
@@ -1689,7 +1689,7 @@ static HRESULT interp_int(exec_ctx_t *ctx) const LONG arg = ctx->instr->arg1.lng; VARIANT v;
- TRACE("%d\n", arg); + TRACE("%ld\n", arg);
if(arg == (INT16)arg) { V_VT(&v) = VT_I2; @@ -2501,7 +2501,7 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd if(exec.resume_next) { unsigned stack_off;
- WARN("Failed %08x in resume next mode\n", hres); + WARN("Failed %08lx in resume next mode\n", hres);
/* * Unwinding here is simple. We need to find the next OP_catch, which contains diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 948f27288b0..90ed921c2a9 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -518,7 +518,7 @@ static int parser_error(unsigned *loc, parser_ctx_t *ctx, const char *str) FIXME("%s: %s\n", debugstr_w(ctx->code + *loc), debugstr_a(str)); ctx->hres = E_FAIL; }else { - WARN("%s: %08x\n", debugstr_w(ctx->code + *loc), ctx->hres); + WARN("%s: %08lx\n", debugstr_w(ctx->code + *loc), ctx->hres); } return 0; } diff --git a/dlls/vbscript/regexp.c b/dlls/vbscript/regexp.c index 33eec2aa848..030b0cf5d2d 100644 --- a/dlls/vbscript/regexp.c +++ b/dlls/vbscript/regexp.c @@ -1935,7 +1935,7 @@ PushBackTrackState(REGlobalData *gData, REOp op, ptrdiff_t btincr = ((char *)result + sz) - ((char *)gData->backTrackStack + btsize);
- TRACE("\tBT_Push: %lu,%lu\n", (ULONG_PTR)parenIndex, (ULONG_PTR)parenCount); + TRACE("\tBT_Push: %Iu,%Iu\n", (ULONG_PTR)parenIndex, (ULONG_PTR)parenCount);
JS_COUNT_OPERATION(gData->cx, JSOW_JUMP * (1 + parenCount)); if (btincr > 0) { @@ -2684,7 +2684,7 @@ ExecuteREBytecode(REGlobalData *gData, match_state_t *x)
case REOP_LPAREN: pc = ReadCompactIndex(pc, &parenIndex); - TRACE("[ %lu ]\n", (ULONG_PTR)parenIndex); + TRACE("[ %Iu ]\n", (ULONG_PTR)parenIndex); assert(parenIndex < gData->regexp->parenCount); if (parenIndex + 1 > parenSoFar) parenSoFar = parenIndex + 1; @@ -3047,7 +3047,7 @@ ExecuteREBytecode(REGlobalData *gData, match_state_t *x) parenSoFar = curState->parenSoFar; }
- TRACE("\tBT_Pop: %ld,%ld\n", + TRACE("\tBT_Pop: %Id,%Id\n", (ULONG_PTR)backTrackData->parenIndex, (ULONG_PTR)backTrackData->parenCount); continue; diff --git a/dlls/vbscript/utils.c b/dlls/vbscript/utils.c index d30842c52eb..b8c034b354a 100644 --- a/dlls/vbscript/utils.c +++ b/dlls/vbscript/utils.c @@ -62,7 +62,7 @@ static ULONG WINAPI safearray_iter_IEnumVARIANT_AddRef(IEnumVARIANT *iface) safearray_iter *This = impl_from_IEnumVARIANT(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -72,7 +72,7 @@ static ULONG WINAPI safearray_iter_IEnumVARIANT_Release(IEnumVARIANT *iface) safearray_iter *This = impl_from_IEnumVARIANT(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", iface, ref); + TRACE("(%p) ref=%ld\n", iface, ref);
if(!ref) { if(This->sa) @@ -90,7 +90,7 @@ static HRESULT WINAPI safearray_iter_IEnumVARIANT_Next(IEnumVARIANT *iface, HRESULT hres; VARIANT *v;
- TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + TRACE("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched);
if(celt != 1) { FIXME("celt != 1\n"); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index d67a1831bbe..1c6f68255bd 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -237,7 +237,7 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern return hres; } default: - FIXME("flags %x\n", flags); + FIXME("flags %lx\n", flags); return DISP_E_MEMBERNOTFOUND; } } @@ -317,7 +317,7 @@ static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) vbdisp_t *This = impl_from_IDispatchEx(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -327,7 +327,7 @@ static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) vbdisp_t *This = impl_from_IDispatchEx(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref && run_terminator(This)) { clean_props(This); @@ -353,7 +353,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC ITypeInfo **ppTInfo) { vbdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; }
@@ -362,7 +362,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, DISPID *rgDispId) { vbdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; } @@ -373,7 +373,7 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, { vbdisp_t *This = impl_from_IDispatchEx(iface);
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL); @@ -383,7 +383,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW { vbdisp_t *This = impl_from_IDispatchEx(iface);
- TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid);
grfdex &= ~FDEX_VERSION_MASK;
@@ -393,7 +393,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW /* Tests show that fdexNameCaseSensitive is ignored */
if(grfdex & ~(fdexNameEnsure|fdexNameCaseInsensitive|fdexNameCaseSensitive)) { - FIXME("unsupported flags %x\n", grfdex); + FIXME("unsupported flags %lx\n", grfdex); return E_NOTIMPL; }
@@ -405,7 +405,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc { vbdisp_t *This = impl_from_IDispatchEx(iface);
- TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
if(!This->desc) return E_UNEXPECTED; @@ -419,35 +419,35 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { vbdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + FIXME("(%p)->(%s %lx)\n", This, debugstr_w(bstrName), grfdex); return E_NOTIMPL; }
static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { vbdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x)\n", This, id); + FIXME("(%p)->(%lx)\n", This, id); return E_NOTIMPL; }
static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) { vbdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); + FIXME("(%p)->(%lx %lx %p)\n", This, id, grfdexFetch, pgrfdex); return E_NOTIMPL; }
static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) { vbdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %p)\n", This, id, pbstrName); + FIXME("(%p)->(%lx %p)\n", This, id, pbstrName); return E_NOTIMPL; }
static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { vbdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + FIXME("(%p)->(%lx %lx %p)\n", This, grfdex, id, pid); return E_NOTIMPL; }
@@ -614,7 +614,7 @@ static ULONG WINAPI ScriptTypeInfo_AddRef(ITypeInfo *iface) ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -625,7 +625,7 @@ static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) LONG ref = InterlockedDecrement(&This->ref); UINT i;
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { @@ -745,7 +745,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, HRESULT hr; UINT i = 0;
- TRACE("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + TRACE("(%p)->(%ld %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames);
if (!rgBstrNames || !pcNames) return E_INVALIDARG; if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; @@ -875,7 +875,7 @@ static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance, IDispatch *disp; HRESULT hr;
- TRACE("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, + TRACE("(%p)->(%p %ld %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
if (!pvInstance) return E_INVALIDARG; @@ -908,7 +908,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID function_t *func; HRESULT hr;
- TRACE("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + TRACE("(%p)->(%ld %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
if (pBstrDocString) *pBstrDocString = NULL; if (pdwHelpContext) *pdwHelpContext = 0; @@ -953,7 +953,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memi ITypeInfo *disp_typeinfo; HRESULT hr;
- TRACE("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); + TRACE("(%p)->(%ld %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
if (pBstrDllName) *pBstrDllName = NULL; if (pBstrName) *pBstrName = NULL; @@ -974,7 +974,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE h ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); HRESULT hr;
- TRACE("(%p)->(%x %p)\n", This, hRefType, ppTInfo); + TRACE("(%p)->(%lx %p)\n", This, hRefType, ppTInfo);
if (!ppTInfo || (INT)hRefType < 0) return E_INVALIDARG;
@@ -997,7 +997,7 @@ static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID ITypeInfo *disp_typeinfo; HRESULT hr;
- TRACE("(%p)->(%d %d %p)\n", This, memid, invKind, ppv); + TRACE("(%p)->(%ld %d %p)\n", This, memid, invKind, ppv);
if (!ppv) return E_INVALIDARG; *ppv = NULL; @@ -1030,7 +1030,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, B ITypeInfo *disp_typeinfo; HRESULT hr;
- TRACE("(%p)->(%d %p)\n", This, memid, pBstrMops); + TRACE("(%p)->(%ld %p)\n", This, memid, pBstrMops);
if (!pBstrMops) return E_INVALIDARG;
@@ -1135,7 +1135,7 @@ static HRESULT WINAPI ScriptTypeComp_Bind(ITypeComp *iface, LPOLESTR szName, ULO HRESULT hr; UINT i;
- TRACE("(%p)->(%s %08x %d %p %p %p)\n", This, debugstr_w(szName), lHashVal, + TRACE("(%p)->(%s %08lx %d %p %p %p)\n", This, debugstr_w(szName), lHashVal, wFlags, ppTInfo, pDescKind, pBindPtr);
if (!szName || !ppTInfo || !pDescKind || !pBindPtr) @@ -1189,7 +1189,7 @@ static HRESULT WINAPI ScriptTypeComp_BindType(ITypeComp *iface, LPOLESTR szName, ITypeComp *disp_typecomp; HRESULT hr;
- TRACE("(%p)->(%s %08x %p %p)\n", This, debugstr_w(szName), lHashVal, ppTInfo, ppTComp); + TRACE("(%p)->(%s %08lx %p %p)\n", This, debugstr_w(szName), lHashVal, ppTInfo, ppTComp);
if (!szName || !ppTInfo || !ppTComp) return E_INVALIDARG; @@ -1247,7 +1247,7 @@ static ULONG WINAPI ScriptDisp_AddRef(IDispatchEx *iface) ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -1258,7 +1258,7 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) LONG ref = InterlockedDecrement(&This->ref); unsigned i;
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { assert(!This->ctx); @@ -1292,7 +1292,7 @@ static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC UINT num_funcs = 0; unsigned i, j;
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ret); + TRACE("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ret);
if(iTInfo) return DISP_E_BADINDEX; @@ -1341,7 +1341,7 @@ static HRESULT WINAPI ScriptDisp_GetIDsOfNames(IDispatchEx *iface, REFIID riid, UINT i; HRESULT hres;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
if(cNames == 0) @@ -1366,7 +1366,7 @@ static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface);
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, @@ -1378,7 +1378,7 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); unsigned i;
- TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid);
if(!This->ctx) return E_UNEXPECTED; @@ -1407,7 +1407,7 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); HRESULT hres;
- TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
if (!This->ctx) return E_UNEXPECTED; @@ -1447,35 +1447,35 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT WINAPI ScriptDisp_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + FIXME("(%p)->(%s %lx)\n", This, debugstr_w(bstrName), grfdex); return E_NOTIMPL; }
static HRESULT WINAPI ScriptDisp_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - FIXME("(%p)->(%x)\n", This, id); + FIXME("(%p)->(%lx)\n", This, id); return E_NOTIMPL; }
static HRESULT WINAPI ScriptDisp_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); + FIXME("(%p)->(%lx %lx %p)\n", This, id, grfdexFetch, pgrfdex); return E_NOTIMPL; }
static HRESULT WINAPI ScriptDisp_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - FIXME("(%p)->(%x %p)\n", This, id, pbstrName); + FIXME("(%p)->(%lx %p)\n", This, id, pbstrName); return E_NOTIMPL; }
static HRESULT WINAPI ScriptDisp_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + FIXME("(%p)->(%lx %lx %p)\n", This, grfdex, id, pid); return E_NOTIMPL; }
diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index ddaadb0ce3f..24ce243c645 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -56,7 +56,7 @@ static HRESULT init_regexp_typeinfo(regexp_tid_t tid)
hres = LoadTypeLib(L"vbscript.dll\3", &tl); if(FAILED(hres)) { - ERR("LoadRegTypeLib failed: %08x\n", hres); + ERR("LoadRegTypeLib failed: %08lx\n", hres); return hres; }
@@ -69,7 +69,7 @@ static HRESULT init_regexp_typeinfo(regexp_tid_t tid)
hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if(FAILED(hres)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hres); return hres; }
@@ -170,7 +170,7 @@ static ULONG WINAPI SubMatches_AddRef(ISubMatches *iface) SubMatches *This = impl_from_ISubMatches(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -180,7 +180,7 @@ static ULONG WINAPI SubMatches_Release(ISubMatches *iface) SubMatches *This = impl_from_ISubMatches(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { heap_free(This->match); @@ -205,7 +205,7 @@ static HRESULT WINAPI SubMatches_GetTypeInfo(ISubMatches *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { SubMatches *This = impl_from_ISubMatches(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; }
@@ -214,7 +214,7 @@ static HRESULT WINAPI SubMatches_GetIDsOfNames(ISubMatches *iface, { SubMatches *This = impl_from_ISubMatches(iface);
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), + TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
return ITypeInfo_GetIDsOfNames(typeinfos[SubMatches_tid], rgszNames, cNames, rgDispId); @@ -226,7 +226,7 @@ static HRESULT WINAPI SubMatches_Invoke(ISubMatches *iface, DISPID dispIdMember, { SubMatches *This = impl_from_ISubMatches(iface);
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return ITypeInfo_Invoke(typeinfos[SubMatches_tid], iface, dispIdMember, wFlags, @@ -238,7 +238,7 @@ static HRESULT WINAPI SubMatches_get_Item(ISubMatches *iface, { SubMatches *This = impl_from_ISubMatches(iface);
- TRACE("(%p)->(%d %p)\n", This, index, pSubMatch); + TRACE("(%p)->(%ld %p)\n", This, index, pSubMatch);
if(!pSubMatch) return E_POINTER; @@ -377,7 +377,7 @@ static ULONG WINAPI Match2_AddRef(IMatch2 *iface) Match2 *This = impl_from_IMatch2(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -387,7 +387,7 @@ static ULONG WINAPI Match2_Release(IMatch2 *iface) Match2 *This = impl_from_IMatch2(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { ISubMatches_Release(&This->sub_matches->ISubMatches_iface); @@ -411,7 +411,7 @@ static HRESULT WINAPI Match2_GetTypeInfo(IMatch2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { Match2 *This = impl_from_IMatch2(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; }
@@ -420,7 +420,7 @@ static HRESULT WINAPI Match2_GetIDsOfNames(IMatch2 *iface, { Match2 *This = impl_from_IMatch2(iface);
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), + TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
return ITypeInfo_GetIDsOfNames(typeinfos[Match2_tid], rgszNames, cNames, rgDispId); @@ -432,7 +432,7 @@ static HRESULT WINAPI Match2_Invoke(IMatch2 *iface, DISPID dispIdMember, { Match2 *This = impl_from_IMatch2(iface);
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return ITypeInfo_Invoke(typeinfos[Match2_tid], iface, dispIdMember, wFlags, @@ -657,7 +657,7 @@ static ULONG WINAPI MatchCollectionEnum_AddRef(IEnumVARIANT *iface) MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -667,7 +667,7 @@ static ULONG WINAPI MatchCollectionEnum_Release(IEnumVARIANT *iface) MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { IMatchCollection2_Release(This->mc); @@ -684,7 +684,7 @@ static HRESULT WINAPI MatchCollectionEnum_Next(IEnumVARIANT *iface, DWORD i; HRESULT hres = S_OK;
- TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + TRACE("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched);
if(This->pos>=This->count) { if(pCeltFetched) @@ -714,7 +714,7 @@ static HRESULT WINAPI MatchCollectionEnum_Skip(IEnumVARIANT *iface, ULONG celt) { MatchCollectionEnum *This = impl_from_IMatchCollectionEnum(iface);
- TRACE("(%p)->(%u)\n", This, celt); + TRACE("(%p)->(%lu)\n", This, celt);
if(This->pos+celt <= This->count) This->pos += celt; @@ -810,7 +810,7 @@ static ULONG WINAPI MatchCollection2_AddRef(IMatchCollection2 *iface) MatchCollection2 *This = impl_from_IMatchCollection2(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -820,7 +820,7 @@ static ULONG WINAPI MatchCollection2_Release(IMatchCollection2 *iface) MatchCollection2 *This = impl_from_IMatchCollection2(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { DWORD i; @@ -849,7 +849,7 @@ static HRESULT WINAPI MatchCollection2_GetTypeInfo(IMatchCollection2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { MatchCollection2 *This = impl_from_IMatchCollection2(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; }
@@ -858,7 +858,7 @@ static HRESULT WINAPI MatchCollection2_GetIDsOfNames(IMatchCollection2 *iface, { MatchCollection2 *This = impl_from_IMatchCollection2(iface);
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), + TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
return ITypeInfo_GetIDsOfNames(typeinfos[MatchCollection2_tid], rgszNames, cNames, rgDispId); @@ -870,7 +870,7 @@ static HRESULT WINAPI MatchCollection2_Invoke(IMatchCollection2 *iface, DISPID d { MatchCollection2 *This = impl_from_IMatchCollection2(iface);
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return ITypeInfo_Invoke(typeinfos[MatchCollection2_tid], iface, dispIdMember, wFlags, @@ -1103,7 +1103,7 @@ static ULONG WINAPI RegExp2_AddRef(IRegExp2 *iface) RegExp2 *This = impl_from_IRegExp2(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -1113,7 +1113,7 @@ static ULONG WINAPI RegExp2_Release(IRegExp2 *iface) RegExp2 *This = impl_from_IRegExp2(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { heap_free(This->pattern); @@ -1140,7 +1140,7 @@ static HRESULT WINAPI RegExp2_GetTypeInfo(IRegExp2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; }
@@ -1149,7 +1149,7 @@ static HRESULT WINAPI RegExp2_GetIDsOfNames(IRegExp2 *iface, REFIID riid, { RegExp2 *This = impl_from_IRegExp2(iface);
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), + TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
return ITypeInfo_GetIDsOfNames(typeinfos[RegExp2_tid], rgszNames, cNames, rgDispId); @@ -1161,7 +1161,7 @@ static HRESULT WINAPI RegExp2_Invoke(IRegExp2 *iface, DISPID dispIdMember, { RegExp2 *This = impl_from_IRegExp2(iface);
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return ITypeInfo_Invoke(typeinfos[RegExp2_tid], iface, dispIdMember, wFlags, diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 4b57b4b2b93..9c5f92e0624 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -205,7 +205,7 @@ static HRESULT retrieve_named_item_disp(IActiveScriptSite *site, named_item_t *i
hres = IActiveScriptSite_GetItemInfo(site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL); if(FAILED(hres)) { - WARN("GetItemInfo failed: %08x\n", hres); + WARN("GetItemInfo failed: %08lx\n", hres); return hres; }
@@ -396,7 +396,7 @@ static ULONG WINAPI VBScriptError_AddRef(IActiveScriptError *iface) VBScriptError *This = impl_from_IActiveScriptError(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -406,7 +406,7 @@ static ULONG WINAPI VBScriptError_Release(IActiveScriptError *iface) VBScriptError *This = impl_from_IActiveScriptError(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { heap_free(This); @@ -531,7 +531,7 @@ static ULONG WINAPI VBScript_AddRef(IActiveScript *iface) VBScript *This = impl_from_IActiveScript(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -541,7 +541,7 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) VBScript *This = impl_from_IActiveScript(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", iface, ref); + TRACE("(%p) ref=%ld\n", iface, ref);
if(!ref) { decrease_state(This, SCRIPTSTATE_CLOSED); @@ -690,7 +690,7 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr IDispatch *disp = NULL; HRESULT hres;
- TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); + TRACE("(%p)->(%s %lx)\n", This, debugstr_w(pstrName), dwFlags);
if(This->thread_id != GetCurrentThreadId() || !This->ctx->site) return E_UNEXPECTED; @@ -700,7 +700,7 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr
hres = IActiveScriptSite_GetItemInfo(This->ctx->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL); if(FAILED(hres)) { - WARN("GetItemInfo failed: %08x\n", hres); + WARN("GetItemInfo failed: %08lx\n", hres); return hres; }
@@ -739,7 +739,7 @@ static HRESULT WINAPI VBScript_AddTypeLib(IActiveScript *iface, REFGUID rguidTyp DWORD dwMajor, DWORD dwMinor, DWORD dwFlags) { VBScript *This = impl_from_IActiveScript(iface); - FIXME("(%p)->(%s %d %d %d)\n", This, debugstr_guid(rguidTypeLib), dwMajor, dwMinor, dwFlags); + FIXME("(%p)->(%s %ld %ld %ld)\n", This, debugstr_guid(rguidTypeLib), dwMajor, dwMinor, dwFlags); return E_NOTIMPL; }
@@ -855,7 +855,7 @@ static HRESULT WINAPI VBScriptDebug_GetScriptTextAttributes(IActiveScriptDebug * LPCOLESTR code, ULONG len, LPCOLESTR delimiter, DWORD flags, SOURCE_TEXT_ATTR *attr) { VBScript *This = impl_from_IActiveScriptDebug(iface); - FIXME("(%p)->(%s %u %s %#x %p)\n", This, debugstr_w(code), len, + FIXME("(%p)->(%s %lu %s %#lx %p)\n", This, debugstr_w(code), len, debugstr_w(delimiter), flags, attr); return E_NOTIMPL; } @@ -864,7 +864,7 @@ static HRESULT WINAPI VBScriptDebug_GetScriptletTextAttributes(IActiveScriptDebu LPCOLESTR code, ULONG len, LPCOLESTR delimiter, DWORD flags, SOURCE_TEXT_ATTR *attr) { VBScript *This = impl_from_IActiveScriptDebug(iface); - FIXME("(%p)->(%s %u %s %#x %p)\n", This, debugstr_w(code), len, + FIXME("(%p)->(%s %lu %s %#lx %p)\n", This, debugstr_w(code), len, debugstr_w(delimiter), flags, attr); return E_NOTIMPL; } @@ -873,7 +873,7 @@ static HRESULT WINAPI VBScriptDebug_EnumCodeContextsOfPosition(IActiveScriptDebu CTXARG_T source, ULONG offset, ULONG len, IEnumDebugCodeContexts **ret) { VBScript *This = impl_from_IActiveScriptDebug(iface); - FIXME("(%p)->(%s %u %u %p)\n", This, wine_dbgstr_longlong(source), offset, len, ret); + FIXME("(%p)->(%s %lu %lu %p)\n", This, wine_dbgstr_longlong(source), offset, len, ret); return E_NOTIMPL; }
@@ -931,7 +931,7 @@ static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface, BSTR *pbstrName, EXCEPINFO *pexcepinfo) { VBScript *This = impl_from_IActiveScriptParse(iface); - FIXME("(%p)->(%s %s %s %s %s %s %s %u %x %p %p)\n", This, debugstr_w(pstrDefaultName), + FIXME("(%p)->(%s %s %s %s %s %s %s %lu %lx %p %p)\n", This, debugstr_w(pstrDefaultName), debugstr_w(pstrCode), debugstr_w(pstrItemName), debugstr_w(pstrSubItemName), debugstr_w(pstrEventName), debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLineNumber, dwFlags, pbstrName, pexcepinfo); @@ -947,7 +947,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, vbscode_t *code; HRESULT hres;
- TRACE("(%p)->(%s %s %p %s %s %u %x %p %p)\n", This, debugstr_w(pstrCode), + TRACE("(%p)->(%s %s %p %s %s %lu %lx %p %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLine, dwFlags, pvarResult, pexcepinfo);
@@ -1009,7 +1009,7 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar vbdisp_t *vbdisp; HRESULT hres;
- TRACE("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), + TRACE("(%p)->(%s %s %s %s %p %s %s %lu %lx %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), debugstr_w(pstrProcedureName), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLineNumber, dwFlags, ppdisp);
@@ -1081,7 +1081,7 @@ static HRESULT WINAPI VBScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *if { VBScript *This = impl_from_IObjectSafety(iface);
- TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + TRACE("(%p)->(%s %lx %lx)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions);
if(dwOptionSetMask & ~SUPPORTED_OPTIONS) return E_FAIL; @@ -1179,7 +1179,7 @@ static ULONG WINAPI AXSite_AddRef(IServiceProvider *iface) AXSite *This = impl_from_IServiceProvider(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -1189,7 +1189,7 @@ static ULONG WINAPI AXSite_Release(IServiceProvider *iface) AXSite *This = impl_from_IServiceProvider(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) heap_free(This); @@ -1222,7 +1222,7 @@ IUnknown *create_ax_site(script_ctx_t *ctx)
hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IServiceProvider, (void**)&sp); if(FAILED(hres)) { - ERR("Could not get IServiceProvider iface: %08x\n", hres); + ERR("Could not get IServiceProvider iface: %08lx\n", hres); return NULL; }
diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 087b387e0af..c7f63c791ae 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -268,7 +268,7 @@ static IClassFactory VBScriptRegExpFactory = { &VBScriptRegExpFactoryVtbl }; */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { - TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + TRACE("(%p %ld %p)\n", hInstDLL, fdwReason, lpv);
switch(fdwReason) {