Skip to content

W
wine-winehq
Commit 5bb7a6d5 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

scrrun: Fix long types warnings.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 68baaea7
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 123 deletions
dlls/scrrun/Makefile.in
View file @ 5bb7a6d5
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = scrrun.dll MODULE = scrrun.dll
IMPORTS = uuid oleaut32 version advapi32 IMPORTS = uuid oleaut32 version advapi32
......
dlls/scrrun/dictionary.c
View file @ 5bb7a6d5
...@@ -240,7 +240,7 @@ static ULONG WINAPI dict_enum_AddRef(IEnumVARIANT *iface) ...@@ -240,7 +240,7 @@ static ULONG WINAPI dict_enum_AddRef(IEnumVARIANT *iface)
{ {
struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); struct dictionary_enum *This = impl_from_IEnumVARIANT(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->(%u)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
...@@ -249,7 +249,7 @@ static ULONG WINAPI dict_enum_Release(IEnumVARIANT *iface) ...@@ -249,7 +249,7 @@ static ULONG WINAPI dict_enum_Release(IEnumVARIANT *iface)
struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); struct dictionary_enum *This = impl_from_IEnumVARIANT(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%u)\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if (!ref) if (!ref)
{ {
...@@ -267,7 +267,7 @@ static HRESULT WINAPI dict_enum_Next(IEnumVARIANT *iface, ULONG count, VARIANT * ...@@ -267,7 +267,7 @@ static HRESULT WINAPI dict_enum_Next(IEnumVARIANT *iface, ULONG count, VARIANT *
struct keyitem_pair *pair; struct keyitem_pair *pair;
ULONG i = 0; ULONG i = 0;
TRACE("(%p)->(%u %p %p)\n", This, count, keys, fetched); TRACE("%p, %lu, %p, %p.\n", iface, count, keys, fetched);
if (fetched) if (fetched)
*fetched = 0; *fetched = 0;
...@@ -292,7 +292,7 @@ static HRESULT WINAPI dict_enum_Skip(IEnumVARIANT *iface, ULONG count) ...@@ -292,7 +292,7 @@ static HRESULT WINAPI dict_enum_Skip(IEnumVARIANT *iface, ULONG count)
{ {
struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); struct dictionary_enum *This = impl_from_IEnumVARIANT(iface);
TRACE("(%p)->(%u)\n", This, count); TRACE("%p, %lu.\n", iface, count);
if (!count) if (!count)
return S_OK; return S_OK;
...@@ -418,7 +418,7 @@ static ULONG WINAPI dictionary_AddRef(IDictionary *iface) ...@@ -418,7 +418,7 @@ static ULONG WINAPI dictionary_AddRef(IDictionary *iface)
struct dictionary *dictionary = impl_from_IDictionary(iface); struct dictionary *dictionary = impl_from_IDictionary(iface);
ULONG ref = InterlockedIncrement(&dictionary->ref); ULONG ref = InterlockedIncrement(&dictionary->ref);
TRACE("%p, refcount %u.\n", iface, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
...@@ -428,7 +428,7 @@ static ULONG WINAPI dictionary_Release(IDictionary *iface) ...@@ -428,7 +428,7 @@ static ULONG WINAPI dictionary_Release(IDictionary *iface)
struct dictionary *dictionary = impl_from_IDictionary(iface); struct dictionary *dictionary = impl_from_IDictionary(iface);
ULONG ref = InterlockedDecrement(&dictionary->ref); ULONG ref = InterlockedDecrement(&dictionary->ref);
TRACE("%p, refcount %u.\n", iface, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if (!ref) if (!ref)
{ {
...@@ -449,7 +449,7 @@ static HRESULT WINAPI dictionary_GetTypeInfoCount(IDictionary *iface, UINT *pcti ...@@ -449,7 +449,7 @@ static HRESULT WINAPI dictionary_GetTypeInfoCount(IDictionary *iface, UINT *pcti
static HRESULT WINAPI dictionary_GetTypeInfo(IDictionary *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) static HRESULT WINAPI dictionary_GetTypeInfo(IDictionary *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
{ {
TRACE("%p, %u, %u, %p.\n", iface, iTInfo, lcid, ppTInfo); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IDictionary_tid, ppTInfo); return get_typeinfo(IDictionary_tid, ppTInfo);
} }
...@@ -460,7 +460,7 @@ static HRESULT WINAPI dictionary_GetIDsOfNames(IDictionary *iface, REFIID riid, ...@@ -460,7 +460,7 @@ static HRESULT WINAPI dictionary_GetIDsOfNames(IDictionary *iface, REFIID riid,
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("%p, %s, %p, %u, %u, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo(IDictionary_tid, &typeinfo); hr = get_typeinfo(IDictionary_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
...@@ -476,18 +476,16 @@ static HRESULT WINAPI dictionary_Invoke(IDictionary *iface, DISPID dispIdMember, ...@@ -476,18 +476,16 @@ static HRESULT WINAPI dictionary_Invoke(IDictionary *iface, DISPID dispIdMember,
LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr) EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
struct dictionary *dictionary = impl_from_IDictionary(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("%p, %d, %s, %d, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IDictionary_tid, &typeinfo); hr = get_typeinfo(IDictionary_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
hr = ITypeInfo_Invoke(typeinfo, &dictionary->IDictionary_iface, dispIdMember, wFlags, hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo); ITypeInfo_Release(typeinfo);
} }
......
dlls/scrrun/filesystem.c
View file @ 5bb7a6d5
...@@ -187,7 +187,7 @@ static inline HRESULT create_error(DWORD err) ...@@ -187,7 +187,7 @@ static inline HRESULT create_error(DWORD err)
case ERROR_FILE_EXISTS: return CTL_E_FILEALREADYEXISTS; case ERROR_FILE_EXISTS: return CTL_E_FILEALREADYEXISTS;
case ERROR_ALREADY_EXISTS: return CTL_E_FILEALREADYEXISTS; case ERROR_ALREADY_EXISTS: return CTL_E_FILEALREADYEXISTS;
default: default:
FIXME("Unsupported error code: %d\n", err); FIXME("Unsupported error code: %ld\n", err);
return E_FAIL; return E_FAIL;
} }
} }
...@@ -308,9 +308,11 @@ static HRESULT WINAPI textstream_QueryInterface(ITextStream *iface, REFIID riid, ...@@ -308,9 +308,11 @@ static HRESULT WINAPI textstream_QueryInterface(ITextStream *iface, REFIID riid,
static ULONG WINAPI textstream_AddRef(ITextStream *iface) static ULONG WINAPI textstream_AddRef(ITextStream *iface)
{ {
struct textstream *This = impl_from_ITextStream(iface); struct textstream *stream = impl_from_ITextStream(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&stream->ref);
TRACE("(%p)->(%d)\n", This, ref);
TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
...@@ -319,7 +321,7 @@ static ULONG WINAPI textstream_Release(ITextStream *iface) ...@@ -319,7 +321,7 @@ static ULONG WINAPI textstream_Release(ITextStream *iface)
struct textstream *stream = impl_from_ITextStream(iface); struct textstream *stream = impl_from_ITextStream(iface);
ULONG ref = InterlockedDecrement(&stream->ref); ULONG ref = InterlockedDecrement(&stream->ref);
TRACE("%p, refcount %d.\n", iface, ref); TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref) if (!ref)
{ {
...@@ -342,8 +344,8 @@ static HRESULT WINAPI textstream_GetTypeInfoCount(ITextStream *iface, UINT *pcti ...@@ -342,8 +344,8 @@ static HRESULT WINAPI textstream_GetTypeInfoCount(ITextStream *iface, UINT *pcti
static HRESULT WINAPI textstream_GetTypeInfo(ITextStream *iface, UINT iTInfo, static HRESULT WINAPI textstream_GetTypeInfo(ITextStream *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
struct textstream *This = impl_from_ITextStream(iface); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(ITextStream_tid, ppTInfo); return get_typeinfo(ITextStream_tid, ppTInfo);
} }
...@@ -351,11 +353,10 @@ static HRESULT WINAPI textstream_GetIDsOfNames(ITextStream *iface, REFIID riid, ...@@ -351,11 +353,10 @@ static HRESULT WINAPI textstream_GetIDsOfNames(ITextStream *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId) LCID lcid, DISPID *rgDispId)
{ {
struct textstream *This = impl_from_ITextStream(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo(ITextStream_tid, &typeinfo); hr = get_typeinfo(ITextStream_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
...@@ -372,11 +373,10 @@ static HRESULT WINAPI textstream_Invoke(ITextStream *iface, DISPID dispIdMember, ...@@ -372,11 +373,10 @@ static HRESULT WINAPI textstream_Invoke(ITextStream *iface, DISPID dispIdMember,
DISPPARAMS *pDispParams, VARIANT *pVarResult, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr) EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
struct textstream *This = impl_from_ITextStream(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(ITextStream_tid, &typeinfo); hr = get_typeinfo(ITextStream_tid, &typeinfo);
...@@ -513,7 +513,7 @@ static HRESULT WINAPI textstream_Read(ITextStream *iface, LONG len, BSTR *text) ...@@ -513,7 +513,7 @@ static HRESULT WINAPI textstream_Read(ITextStream *iface, LONG len, BSTR *text)
struct textstream *This = impl_from_ITextStream(iface); struct textstream *This = impl_from_ITextStream(iface);
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE("(%p)->(%d %p)\n", This, len, text); TRACE("%p, %ld, %p.\n", iface, len, text);
if (!text) if (!text)
return E_POINTER; return E_POINTER;
...@@ -685,15 +685,15 @@ static HRESULT WINAPI textstream_WriteLine(ITextStream *iface, BSTR text) ...@@ -685,15 +685,15 @@ static HRESULT WINAPI textstream_WriteLine(ITextStream *iface, BSTR text)
static HRESULT WINAPI textstream_WriteBlankLines(ITextStream *iface, LONG lines) static HRESULT WINAPI textstream_WriteBlankLines(ITextStream *iface, LONG lines)
{ {
struct textstream *This = impl_from_ITextStream(iface); FIXME("%p, %ld stub\n", iface, lines);
FIXME("(%p)->(%d): stub\n", This, lines);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI textstream_Skip(ITextStream *iface, LONG count) static HRESULT WINAPI textstream_Skip(ITextStream *iface, LONG count)
{ {
struct textstream *This = impl_from_ITextStream(iface); FIXME("%p, %ld stub\n", iface, count);
FIXME("(%p)->(%d): stub\n", This, count);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -866,9 +866,11 @@ static HRESULT WINAPI drive_QueryInterface(IDrive *iface, REFIID riid, void **ob ...@@ -866,9 +866,11 @@ static HRESULT WINAPI drive_QueryInterface(IDrive *iface, REFIID riid, void **ob
static ULONG WINAPI drive_AddRef(IDrive *iface) static ULONG WINAPI drive_AddRef(IDrive *iface)
{ {
struct drive *This = impl_from_IDrive(iface); struct drive *drive = impl_from_IDrive(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&drive->ref);
TRACE("(%p)->(%d)\n", This, ref);
TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
...@@ -877,7 +879,7 @@ static ULONG WINAPI drive_Release(IDrive *iface) ...@@ -877,7 +879,7 @@ static ULONG WINAPI drive_Release(IDrive *iface)
struct drive *drive = impl_from_IDrive(iface); struct drive *drive = impl_from_IDrive(iface);
ULONG ref = InterlockedDecrement(&drive->ref); ULONG ref = InterlockedDecrement(&drive->ref);
TRACE("%p, refcount %d.\n", iface, ref); TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref) if (!ref)
free(drive); free(drive);
...@@ -896,8 +898,8 @@ static HRESULT WINAPI drive_GetTypeInfoCount(IDrive *iface, UINT *pctinfo) ...@@ -896,8 +898,8 @@ static HRESULT WINAPI drive_GetTypeInfoCount(IDrive *iface, UINT *pctinfo)
static HRESULT WINAPI drive_GetTypeInfo(IDrive *iface, UINT iTInfo, static HRESULT WINAPI drive_GetTypeInfo(IDrive *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
struct drive *This = impl_from_IDrive(iface); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IDrive_tid, ppTInfo); return get_typeinfo(IDrive_tid, ppTInfo);
} }
...@@ -905,11 +907,10 @@ static HRESULT WINAPI drive_GetIDsOfNames(IDrive *iface, REFIID riid, ...@@ -905,11 +907,10 @@ static HRESULT WINAPI drive_GetIDsOfNames(IDrive *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId) LCID lcid, DISPID *rgDispId)
{ {
struct drive *This = impl_from_IDrive(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo(IDrive_tid, &typeinfo); hr = get_typeinfo(IDrive_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
...@@ -926,11 +927,10 @@ static HRESULT WINAPI drive_Invoke(IDrive *iface, DISPID dispIdMember, ...@@ -926,11 +927,10 @@ static HRESULT WINAPI drive_Invoke(IDrive *iface, DISPID dispIdMember,
DISPPARAMS *pDispParams, VARIANT *pVarResult, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr) EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
struct drive *This = impl_from_IDrive(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IDrive_tid, &typeinfo); hr = get_typeinfo(IDrive_tid, &typeinfo);
...@@ -1218,7 +1218,7 @@ static ULONG WINAPI enumvariant_AddRef(IEnumVARIANT *iface) ...@@ -1218,7 +1218,7 @@ static ULONG WINAPI enumvariant_AddRef(IEnumVARIANT *iface)
{ {
struct enumvariant *This = impl_from_IEnumVARIANT(iface); struct enumvariant *This = impl_from_IEnumVARIANT(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
...@@ -1227,7 +1227,7 @@ static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface) ...@@ -1227,7 +1227,7 @@ static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface)
struct enumvariant *This = impl_from_IEnumVARIANT(iface); struct enumvariant *This = impl_from_IEnumVARIANT(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref) if (!ref)
{ {
...@@ -1274,7 +1274,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel ...@@ -1274,7 +1274,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel
WIN32_FIND_DATAW data; WIN32_FIND_DATAW data;
ULONG count = 0; ULONG count = 0;
TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); TRACE("%p, %lu, %p, %p.\n", iface, celt, var, fetched);
if (fetched) if (fetched)
*fetched = 0; *fetched = 0;
...@@ -1327,7 +1327,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG cel ...@@ -1327,7 +1327,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG cel
HANDLE handle = This->data.u.foldercoll.find; HANDLE handle = This->data.u.foldercoll.find;
WIN32_FIND_DATAW data; WIN32_FIND_DATAW data;
TRACE("(%p)->(%d)\n", This, celt); TRACE("%p, %lu.\n", iface, celt);
if (!celt) return S_OK; if (!celt) return S_OK;
...@@ -1409,7 +1409,7 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) ...@@ -1409,7 +1409,7 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface)
struct enumvariant *This = impl_from_IEnumVARIANT(iface); struct enumvariant *This = impl_from_IEnumVARIANT(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref) if (!ref)
{ {
...@@ -1428,7 +1428,7 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, ...@@ -1428,7 +1428,7 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt,
WIN32_FIND_DATAW data; WIN32_FIND_DATAW data;
ULONG count = 0; ULONG count = 0;
TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); TRACE("%p, %ld, %p, %p.\n", iface, celt, var, fetched);
if (fetched) if (fetched)
*fetched = 0; *fetched = 0;
...@@ -1475,7 +1475,7 @@ static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) ...@@ -1475,7 +1475,7 @@ static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt)
HANDLE handle = This->data.u.filecoll.find; HANDLE handle = This->data.u.filecoll.find;
WIN32_FIND_DATAW data; WIN32_FIND_DATAW data;
TRACE("(%p)->(%d)\n", This, celt); TRACE("%p, %lu.\n", iface, celt);
if (!celt) return S_OK; if (!celt) return S_OK;
...@@ -1551,7 +1551,7 @@ static ULONG WINAPI drivecoll_enumvariant_Release(IEnumVARIANT *iface) ...@@ -1551,7 +1551,7 @@ static ULONG WINAPI drivecoll_enumvariant_Release(IEnumVARIANT *iface)
struct enumvariant *This = impl_from_IEnumVARIANT(iface); struct enumvariant *This = impl_from_IEnumVARIANT(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref) if (!ref)
{ {
...@@ -1581,7 +1581,7 @@ static HRESULT WINAPI drivecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt ...@@ -1581,7 +1581,7 @@ static HRESULT WINAPI drivecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt
struct enumvariant *This = impl_from_IEnumVARIANT(iface); struct enumvariant *This = impl_from_IEnumVARIANT(iface);
ULONG count = 0; ULONG count = 0;
TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); TRACE("%p, %lu, %p, %p.\n", iface, celt, var, fetched);
if (fetched) if (fetched)
*fetched = 0; *fetched = 0;
...@@ -1612,7 +1612,7 @@ static HRESULT WINAPI drivecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt ...@@ -1612,7 +1612,7 @@ static HRESULT WINAPI drivecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt
{ {
struct enumvariant *This = impl_from_IEnumVARIANT(iface); struct enumvariant *This = impl_from_IEnumVARIANT(iface);
TRACE("(%p)->(%d)\n", This, celt); TRACE("%p, %lu.\n", iface, celt);
if (!celt) return S_OK; if (!celt) return S_OK;
...@@ -1696,22 +1696,25 @@ static HRESULT WINAPI foldercoll_QueryInterface(IFolderCollection *iface, REFIID ...@@ -1696,22 +1696,25 @@ static HRESULT WINAPI foldercoll_QueryInterface(IFolderCollection *iface, REFIID
static ULONG WINAPI foldercoll_AddRef(IFolderCollection *iface) static ULONG WINAPI foldercoll_AddRef(IFolderCollection *iface)
{ {
struct foldercollection *This = impl_from_IFolderCollection(iface); struct foldercollection *collection = impl_from_IFolderCollection(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&collection->ref);
TRACE("(%p)->(%d)\n", This, ref);
TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI foldercoll_Release(IFolderCollection *iface) static ULONG WINAPI foldercoll_Release(IFolderCollection *iface)
{ {
struct foldercollection *This = impl_from_IFolderCollection(iface); struct foldercollection *collection = impl_from_IFolderCollection(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&collection->ref);
TRACE("(%p)->(%d)\n", This, ref);
TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref) if (!ref)
{ {
SysFreeString(This->path); SysFreeString(collection->path);
free(This); free(collection);
} }
return ref; return ref;
...@@ -1728,8 +1731,8 @@ static HRESULT WINAPI foldercoll_GetTypeInfoCount(IFolderCollection *iface, UINT ...@@ -1728,8 +1731,8 @@ static HRESULT WINAPI foldercoll_GetTypeInfoCount(IFolderCollection *iface, UINT
static HRESULT WINAPI foldercoll_GetTypeInfo(IFolderCollection *iface, UINT iTInfo, static HRESULT WINAPI foldercoll_GetTypeInfo(IFolderCollection *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
struct foldercollection *This = impl_from_IFolderCollection(iface); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IFolderCollection_tid, ppTInfo); return get_typeinfo(IFolderCollection_tid, ppTInfo);
} }
...@@ -1737,11 +1740,10 @@ static HRESULT WINAPI foldercoll_GetIDsOfNames(IFolderCollection *iface, REFIID ...@@ -1737,11 +1740,10 @@ static HRESULT WINAPI foldercoll_GetIDsOfNames(IFolderCollection *iface, REFIID
LPOLESTR *rgszNames, UINT cNames, LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId) LCID lcid, DISPID *rgDispId)
{ {
struct foldercollection *This = impl_from_IFolderCollection(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo(IFolderCollection_tid, &typeinfo); hr = get_typeinfo(IFolderCollection_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
...@@ -1758,11 +1760,10 @@ static HRESULT WINAPI foldercoll_Invoke(IFolderCollection *iface, DISPID dispIdM ...@@ -1758,11 +1760,10 @@ static HRESULT WINAPI foldercoll_Invoke(IFolderCollection *iface, DISPID dispIdM
DISPPARAMS *pDispParams, VARIANT *pVarResult, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr) EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
struct foldercollection *This = impl_from_IFolderCollection(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IFolderCollection_tid, &typeinfo); hr = get_typeinfo(IFolderCollection_tid, &typeinfo);
...@@ -1897,22 +1898,25 @@ static HRESULT WINAPI filecoll_QueryInterface(IFileCollection *iface, REFIID rii ...@@ -1897,22 +1898,25 @@ static HRESULT WINAPI filecoll_QueryInterface(IFileCollection *iface, REFIID rii
static ULONG WINAPI filecoll_AddRef(IFileCollection *iface) static ULONG WINAPI filecoll_AddRef(IFileCollection *iface)
{ {
struct filecollection *This = impl_from_IFileCollection(iface); struct filecollection *collection = impl_from_IFileCollection(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&collection->ref);
TRACE("(%p)->(%d)\n", This, ref);
TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI filecoll_Release(IFileCollection *iface) static ULONG WINAPI filecoll_Release(IFileCollection *iface)
{ {
struct filecollection *This = impl_from_IFileCollection(iface); struct filecollection *collection = impl_from_IFileCollection(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&collection->ref);
TRACE("(%p)->(%d)\n", This, ref);
TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref) if (!ref)
{ {
SysFreeString(This->path); SysFreeString(collection->path);
free(This); free(collection);
} }
return ref; return ref;
...@@ -1929,8 +1933,8 @@ static HRESULT WINAPI filecoll_GetTypeInfoCount(IFileCollection *iface, UINT *pc ...@@ -1929,8 +1933,8 @@ static HRESULT WINAPI filecoll_GetTypeInfoCount(IFileCollection *iface, UINT *pc
static HRESULT WINAPI filecoll_GetTypeInfo(IFileCollection *iface, UINT iTInfo, static HRESULT WINAPI filecoll_GetTypeInfo(IFileCollection *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
struct filecollection *This = impl_from_IFileCollection(iface); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IFileCollection_tid, ppTInfo); return get_typeinfo(IFileCollection_tid, ppTInfo);
} }
...@@ -1938,11 +1942,10 @@ static HRESULT WINAPI filecoll_GetIDsOfNames(IFileCollection *iface, REFIID riid ...@@ -1938,11 +1942,10 @@ static HRESULT WINAPI filecoll_GetIDsOfNames(IFileCollection *iface, REFIID riid
LPOLESTR *rgszNames, UINT cNames, LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId) LCID lcid, DISPID *rgDispId)
{ {
struct filecollection *This = impl_from_IFileCollection(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo(IFileCollection_tid, &typeinfo); hr = get_typeinfo(IFileCollection_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
...@@ -1959,11 +1962,10 @@ static HRESULT WINAPI filecoll_Invoke(IFileCollection *iface, DISPID dispIdMembe ...@@ -1959,11 +1962,10 @@ static HRESULT WINAPI filecoll_Invoke(IFileCollection *iface, DISPID dispIdMembe
DISPPARAMS *pDispParams, VARIANT *pVarResult, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr) EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
struct filecollection *This = impl_from_IFileCollection(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IFileCollection_tid, &typeinfo); hr = get_typeinfo(IFileCollection_tid, &typeinfo);
...@@ -2089,20 +2091,23 @@ static HRESULT WINAPI drivecoll_QueryInterface(IDriveCollection *iface, REFIID r ...@@ -2089,20 +2091,23 @@ static HRESULT WINAPI drivecoll_QueryInterface(IDriveCollection *iface, REFIID r
static ULONG WINAPI drivecoll_AddRef(IDriveCollection *iface) static ULONG WINAPI drivecoll_AddRef(IDriveCollection *iface)
{ {
struct drivecollection *This = impl_from_IDriveCollection(iface); struct drivecollection *collection = impl_from_IDriveCollection(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&collection->ref);
TRACE("(%p)->(%d)\n", This, ref);
TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI drivecoll_Release(IDriveCollection *iface) static ULONG WINAPI drivecoll_Release(IDriveCollection *iface)
{ {
struct drivecollection *This = impl_from_IDriveCollection(iface); struct drivecollection *collection = impl_from_IDriveCollection(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&collection->ref);
TRACE("(%p)->(%d)\n", This, ref);
TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref) if (!ref)
free(This); free(collection);
return ref; return ref;
} }
...@@ -2118,8 +2123,8 @@ static HRESULT WINAPI drivecoll_GetTypeInfoCount(IDriveCollection *iface, UINT * ...@@ -2118,8 +2123,8 @@ static HRESULT WINAPI drivecoll_GetTypeInfoCount(IDriveCollection *iface, UINT *
static HRESULT WINAPI drivecoll_GetTypeInfo(IDriveCollection *iface, UINT iTInfo, static HRESULT WINAPI drivecoll_GetTypeInfo(IDriveCollection *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
struct drivecollection *This = impl_from_IDriveCollection(iface); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IDriveCollection_tid, ppTInfo); return get_typeinfo(IDriveCollection_tid, ppTInfo);
} }
...@@ -2127,11 +2132,10 @@ static HRESULT WINAPI drivecoll_GetIDsOfNames(IDriveCollection *iface, REFIID ri ...@@ -2127,11 +2132,10 @@ static HRESULT WINAPI drivecoll_GetIDsOfNames(IDriveCollection *iface, REFIID ri
LPOLESTR *rgszNames, UINT cNames, LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId) LCID lcid, DISPID *rgDispId)
{ {
struct drivecollection *This = impl_from_IDriveCollection(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo(IDriveCollection_tid, &typeinfo); hr = get_typeinfo(IDriveCollection_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
...@@ -2148,11 +2152,10 @@ static HRESULT WINAPI drivecoll_Invoke(IDriveCollection *iface, DISPID dispIdMem ...@@ -2148,11 +2152,10 @@ static HRESULT WINAPI drivecoll_Invoke(IDriveCollection *iface, DISPID dispIdMem
DISPPARAMS *pDispParams, VARIANT *pVarResult, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr) EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
struct drivecollection *This = impl_from_IDriveCollection(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IDriveCollection_tid, &typeinfo); hr = get_typeinfo(IDriveCollection_tid, &typeinfo);
...@@ -2259,22 +2262,25 @@ static HRESULT WINAPI folder_QueryInterface(IFolder *iface, REFIID riid, void ** ...@@ -2259,22 +2262,25 @@ static HRESULT WINAPI folder_QueryInterface(IFolder *iface, REFIID riid, void **
static ULONG WINAPI folder_AddRef(IFolder *iface) static ULONG WINAPI folder_AddRef(IFolder *iface)
{ {
struct folder *This = impl_from_IFolder(iface); struct folder *folder = impl_from_IFolder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&folder->ref);
TRACE("(%p)->(%d)\n", This, ref);
TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
static ULONG WINAPI folder_Release(IFolder *iface) static ULONG WINAPI folder_Release(IFolder *iface)
{ {
struct folder *This = impl_from_IFolder(iface); struct folder *folder = impl_from_IFolder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&folder->ref);
TRACE("(%p)->(%d)\n", This, ref);
TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref) if (!ref)
{ {
SysFreeString(This->path); SysFreeString(folder->path);
free(This); free(folder);
} }
return ref; return ref;
...@@ -2291,8 +2297,8 @@ static HRESULT WINAPI folder_GetTypeInfoCount(IFolder *iface, UINT *pctinfo) ...@@ -2291,8 +2297,8 @@ static HRESULT WINAPI folder_GetTypeInfoCount(IFolder *iface, UINT *pctinfo)
static HRESULT WINAPI folder_GetTypeInfo(IFolder *iface, UINT iTInfo, static HRESULT WINAPI folder_GetTypeInfo(IFolder *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
struct folder *This = impl_from_IFolder(iface); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IFolder_tid, ppTInfo); return get_typeinfo(IFolder_tid, ppTInfo);
} }
...@@ -2300,11 +2306,10 @@ static HRESULT WINAPI folder_GetIDsOfNames(IFolder *iface, REFIID riid, ...@@ -2300,11 +2306,10 @@ static HRESULT WINAPI folder_GetIDsOfNames(IFolder *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId) LCID lcid, DISPID *rgDispId)
{ {
struct folder *This = impl_from_IFolder(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo(IFolder_tid, &typeinfo); hr = get_typeinfo(IFolder_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
...@@ -2321,11 +2326,10 @@ static HRESULT WINAPI folder_Invoke(IFolder *iface, DISPID dispIdMember, ...@@ -2321,11 +2326,10 @@ static HRESULT WINAPI folder_Invoke(IFolder *iface, DISPID dispIdMember,
DISPPARAMS *pDispParams, VARIANT *pVarResult, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr) EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
struct folder *This = impl_from_IFolder(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IFolder_tid, &typeinfo); hr = get_typeinfo(IFolder_tid, &typeinfo);
...@@ -2617,10 +2621,10 @@ static HRESULT WINAPI file_QueryInterface(IFile *iface, REFIID riid, void **obj) ...@@ -2617,10 +2621,10 @@ static HRESULT WINAPI file_QueryInterface(IFile *iface, REFIID riid, void **obj)
static ULONG WINAPI file_AddRef(IFile *iface) static ULONG WINAPI file_AddRef(IFile *iface)
{ {
struct file *This = impl_from_IFile(iface); struct file *file = impl_from_IFile(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&file->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
...@@ -2630,7 +2634,7 @@ static ULONG WINAPI file_Release(IFile *iface) ...@@ -2630,7 +2634,7 @@ static ULONG WINAPI file_Release(IFile *iface)
struct file *file = impl_from_IFile(iface); struct file *file = impl_from_IFile(iface);
LONG ref = InterlockedDecrement(&file->ref); LONG ref = InterlockedDecrement(&file->ref);
TRACE("%p, refcount %d.\n", iface, ref); TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref) if (!ref)
{ {
...@@ -2654,9 +2658,7 @@ static HRESULT WINAPI file_GetTypeInfoCount(IFile *iface, UINT *pctinfo) ...@@ -2654,9 +2658,7 @@ static HRESULT WINAPI file_GetTypeInfoCount(IFile *iface, UINT *pctinfo)
static HRESULT WINAPI file_GetTypeInfo(IFile *iface, static HRESULT WINAPI file_GetTypeInfo(IFile *iface,
UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
{ {
struct file *This = impl_from_IFile(iface); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo(IFile_tid, ppTInfo); return get_typeinfo(IFile_tid, ppTInfo);
} }
...@@ -2664,11 +2666,10 @@ static HRESULT WINAPI file_GetTypeInfo(IFile *iface, ...@@ -2664,11 +2666,10 @@ static HRESULT WINAPI file_GetTypeInfo(IFile *iface,
static HRESULT WINAPI file_GetIDsOfNames(IFile *iface, REFIID riid, static HRESULT WINAPI file_GetIDsOfNames(IFile *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{ {
struct file *This = impl_from_IFile(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid),
rgszNames, cNames, lcid, rgDispId); rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo(IFile_tid, &typeinfo); hr = get_typeinfo(IFile_tid, &typeinfo);
...@@ -2679,13 +2680,13 @@ static HRESULT WINAPI file_GetIDsOfNames(IFile *iface, REFIID riid, ...@@ -2679,13 +2680,13 @@ static HRESULT WINAPI file_GetIDsOfNames(IFile *iface, REFIID riid,
return hr; return hr;
} }
static HRESULT WINAPI file_Invoke(IFile *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) static HRESULT WINAPI file_Invoke(IFile *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags,
DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
struct file *This = impl_from_IFile(iface);
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IFile_tid, &typeinfo); hr = get_typeinfo(IFile_tid, &typeinfo);
...@@ -3046,7 +3047,8 @@ static HRESULT WINAPI filesys_GetTypeInfoCount(IFileSystem3 *iface, UINT *pctinf ...@@ -3046,7 +3047,8 @@ static HRESULT WINAPI filesys_GetTypeInfoCount(IFileSystem3 *iface, UINT *pctinf
static HRESULT WINAPI filesys_GetTypeInfo(IFileSystem3 *iface, UINT iTInfo, static HRESULT WINAPI filesys_GetTypeInfo(IFileSystem3 *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
TRACE("(%p)->(%u %u %p)\n", iface, iTInfo, lcid, ppTInfo); TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IFileSystem3_tid, ppTInfo); return get_typeinfo(IFileSystem3_tid, ppTInfo);
} }
...@@ -3057,7 +3059,7 @@ static HRESULT WINAPI filesys_GetIDsOfNames(IFileSystem3 *iface, REFIID riid, ...@@ -3057,7 +3059,7 @@ static HRESULT WINAPI filesys_GetIDsOfNames(IFileSystem3 *iface, REFIID riid,
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s %p %u %u %p)\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo(IFileSystem3_tid, &typeinfo); hr = get_typeinfo(IFileSystem3_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
...@@ -3077,7 +3079,7 @@ static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember, ...@@ -3077,7 +3079,7 @@ static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember,
ITypeInfo *typeinfo; ITypeInfo *typeinfo;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", iface, dispIdMember, debugstr_guid(riid), TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IFileSystem3_tid, &typeinfo); hr = get_typeinfo(IFileSystem3_tid, &typeinfo);
...@@ -3939,7 +3941,7 @@ static HRESULT WINAPI filesys_GetFileVersion(IFileSystem3 *iface, BSTR name, BST ...@@ -3939,7 +3941,7 @@ static HRESULT WINAPI filesys_GetFileVersion(IFileSystem3 *iface, BSTR name, BST
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
} }
ret = VerQueryValueW(ptr, L"\\", (void **)&info, &len); ret = VerQueryValueW(ptr, L"\\", (void **)&info, NULL);
if (!ret) if (!ret)
{ {
free(ptr); free(ptr);
......
dlls/scrrun/scrrun.c
View file @ 5bb7a6d5
...@@ -126,7 +126,7 @@ static HRESULT load_typelib(void) ...@@ -126,7 +126,7 @@ static HRESULT load_typelib(void)
hres = LoadRegTypeLib(&LIBID_Scripting, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); hres = LoadRegTypeLib(&LIBID_Scripting, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl);
if(FAILED(hres)) { if(FAILED(hres)) {
ERR("LoadRegTypeLib failed: %08x\n", hres); ERR("LoadRegTypeLib failed: %#lx.\n", hres);
return hres; return hres;
} }
...@@ -157,7 +157,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) ...@@ -157,7 +157,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo)
hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti);
if(FAILED(hres)) { if(FAILED(hres)) {
ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); ERR("GetTypeInfoOfGuid(%s) failed: %#lx.\n", debugstr_guid(tid_ids[tid]), hres);
return hres; return hres;
} }
...@@ -236,7 +236,7 @@ void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo * ...@@ -236,7 +236,7 @@ void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *
BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
{ {
TRACE("%p, %u, %p\n", hinst, reason, reserved); TRACE("%p, %lu, %p\n", hinst, reason, reserved);
switch (reason) switch (reason)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment