Skip to content

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

oleaut32: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 066dba13
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 285 deletions
dlls/oleaut32/Makefile.in
View file @ c0a131f9
...@@ -2,7 +2,7 @@ MODULE = oleaut32.dll ...@@ -2,7 +2,7 @@ MODULE = oleaut32.dll
IMPORTLIB = oleaut32 IMPORTLIB = oleaut32
IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32
DELAYIMPORTS = comctl32 urlmon windowscodecs DELAYIMPORTS = comctl32 urlmon windowscodecs
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_OLEAUT32_ EXTRADEFS = -D_OLEAUT32_
C_SRCS = \ C_SRCS = \
connpt.c \ connpt.c \
......
dlls/oleaut32/connpt.c
View file @ c0a131f9
...@@ -101,9 +101,6 @@ static inline EnumConnectionsImpl *impl_from_IEnumConnections(IEnumConnections * ...@@ -101,9 +101,6 @@ static inline EnumConnectionsImpl *impl_from_IEnumConnections(IEnumConnections *
return CONTAINING_RECORD(iface, EnumConnectionsImpl, IEnumConnections_iface); return CONTAINING_RECORD(iface, EnumConnectionsImpl, IEnumConnections_iface);
} }
/************************************************************************
* ConnectionPointImpl_Destroy
*/
static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj) static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj)
{ {
DWORD i; DWORD i;
...@@ -118,11 +115,6 @@ static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj) ...@@ -118,11 +115,6 @@ static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj)
return; return;
} }
/************************************************************************
* ConnectionPointImpl_QueryInterface (IUnknown)
*
* See Windows documentation for more details on IUnknown methods.
*/
static HRESULT WINAPI ConnectionPointImpl_QueryInterface( static HRESULT WINAPI ConnectionPointImpl_QueryInterface(
IConnectionPoint* iface, IConnectionPoint* iface,
REFIID riid, REFIID riid,
...@@ -160,47 +152,29 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( ...@@ -160,47 +152,29 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface(
return S_OK; return S_OK;
} }
/************************************************************************
* ConnectionPointImpl_AddRef (IUnknown)
*
* See Windows documentation for more details on IUnknown methods.
*/
static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface) static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface)
{ {
ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ConnectionPointImpl *This = impl_from_IConnectionPoint(iface);
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); TRACE("%p, refcount %lu.\n", iface, refCount);
return refCount; return refCount;
} }
/************************************************************************
* ConnectionPointImpl_Release (IUnknown)
*
* See Windows documentation for more details on IUnknown methods.
*/
static ULONG WINAPI ConnectionPointImpl_Release( static ULONG WINAPI ConnectionPointImpl_Release(
IConnectionPoint* iface) IConnectionPoint* iface)
{ {
ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ConnectionPointImpl *This = impl_from_IConnectionPoint(iface);
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); TRACE("%p, refcount %lu.\n", iface, refCount);
/*
* If the reference count goes down to 0, perform suicide.
*/
if (!refCount) ConnectionPointImpl_Destroy(This); if (!refCount) ConnectionPointImpl_Destroy(This);
return refCount; return refCount;
} }
/************************************************************************
* ConnectionPointImpl_GetConnectionInterface (IConnectionPoint)
*
*/
static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface( static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface(
IConnectionPoint *iface, IConnectionPoint *iface,
IID *piid) IID *piid)
...@@ -211,10 +185,6 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface( ...@@ -211,10 +185,6 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface(
return S_OK; return S_OK;
} }
/************************************************************************
* ConnectionPointImpl_GetConnectionPointContainer (IConnectionPoint)
*
*/
static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer( static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer(
IConnectionPoint *iface, IConnectionPoint *iface,
IConnectionPointContainer **ppCPC) IConnectionPointContainer **ppCPC)
...@@ -225,10 +195,6 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer( ...@@ -225,10 +195,6 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer(
return IUnknown_QueryInterface(This->Obj, &IID_IConnectionPointContainer, (void**)ppCPC); return IUnknown_QueryInterface(This->Obj, &IID_IConnectionPointContainer, (void**)ppCPC);
} }
/************************************************************************
* ConnectionPointImpl_Advise (IConnectionPoint)
*
*/
static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface,
IUnknown *lpUnk, IUnknown *lpUnk,
DWORD *pdwCookie) DWORD *pdwCookie)
...@@ -258,15 +224,11 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, ...@@ -258,15 +224,11 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface,
} }
/************************************************************************ static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface, DWORD dwCookie)
* ConnectionPointImpl_Unadvise (IConnectionPoint)
*
*/
static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface,
DWORD dwCookie)
{ {
ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ConnectionPointImpl *This = impl_from_IConnectionPoint(iface);
TRACE("(%p)->(%d)\n", This, dwCookie);
TRACE("%p, %#lx.\n", iface, dwCookie);
if(dwCookie == 0 || dwCookie > This->maxSinks) return E_INVALIDARG; if(dwCookie == 0 || dwCookie > This->maxSinks) return E_INVALIDARG;
...@@ -278,13 +240,7 @@ static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface, ...@@ -278,13 +240,7 @@ static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface,
return S_OK; return S_OK;
} }
/************************************************************************ static HRESULT WINAPI ConnectionPointImpl_EnumConnections(IConnectionPoint *iface, IEnumConnections **ppEnum)
* ConnectionPointImpl_EnumConnections (IConnectionPoint)
*
*/
static HRESULT WINAPI ConnectionPointImpl_EnumConnections(
IConnectionPoint *iface,
LPENUMCONNECTIONS *ppEnum)
{ {
ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ConnectionPointImpl *This = impl_from_IConnectionPoint(iface);
CONNECTDATA *pCD; CONNECTDATA *pCD;
...@@ -337,9 +293,6 @@ static const IConnectionPointVtbl ConnectionPointImpl_VTable = ...@@ -337,9 +293,6 @@ static const IConnectionPointVtbl ConnectionPointImpl_VTable =
static const IEnumConnectionsVtbl EnumConnectionsImpl_VTable; static const IEnumConnectionsVtbl EnumConnectionsImpl_VTable;
/************************************************************************
* EnumConnectionsImpl_Construct
*/
static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk, static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk,
DWORD nSinks, DWORD nSinks,
CONNECTDATA *pCD) CONNECTDATA *pCD)
...@@ -361,9 +314,6 @@ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk, ...@@ -361,9 +314,6 @@ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk,
return Obj; return Obj;
} }
/************************************************************************
* EnumConnectionsImpl_Destroy
*/
static void EnumConnectionsImpl_Destroy(EnumConnectionsImpl *Obj) static void EnumConnectionsImpl_Destroy(EnumConnectionsImpl *Obj)
{ {
DWORD i; DWORD i;
...@@ -376,11 +326,6 @@ static void EnumConnectionsImpl_Destroy(EnumConnectionsImpl *Obj) ...@@ -376,11 +326,6 @@ static void EnumConnectionsImpl_Destroy(EnumConnectionsImpl *Obj)
return; return;
} }
/************************************************************************
* EnumConnectionsImpl_QueryInterface (IUnknown)
*
* See Windows documentation for more details on IUnknown methods.
*/
static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( static HRESULT WINAPI EnumConnectionsImpl_QueryInterface(
IEnumConnections* iface, IEnumConnections* iface,
REFIID riid, REFIID riid,
...@@ -417,56 +362,37 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( ...@@ -417,56 +362,37 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface(
return S_OK; return S_OK;
} }
/************************************************************************
* EnumConnectionsImpl_AddRef (IUnknown)
*
* See Windows documentation for more details on IUnknown methods.
*/
static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface) static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface)
{ {
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); TRACE("%p, refcount %lu.\n", iface, refCount);
IUnknown_AddRef(This->pUnk); IUnknown_AddRef(This->pUnk);
return refCount; return refCount;
} }
/************************************************************************
* EnumConnectionsImpl_Release (IUnknown)
*
* See Windows documentation for more details on IUnknown methods.
*/
static ULONG WINAPI EnumConnectionsImpl_Release(IEnumConnections* iface) static ULONG WINAPI EnumConnectionsImpl_Release(IEnumConnections* iface)
{ {
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); TRACE("%p, refcount %lu.\n", iface, refCount);
IUnknown_Release(This->pUnk); IUnknown_Release(This->pUnk);
/*
* If the reference count goes down to 0, perform suicide.
*/
if (!refCount) EnumConnectionsImpl_Destroy(This); if (!refCount) EnumConnectionsImpl_Destroy(This);
return refCount; return refCount;
} }
/************************************************************************ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, ULONG cConn, LPCONNECTDATA pCD, ULONG *pEnum)
* EnumConnectionsImpl_Next (IEnumConnections)
*
*/
static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface,
ULONG cConn, LPCONNECTDATA pCD,
ULONG *pEnum)
{ {
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
DWORD nRet = 0; DWORD nRet = 0;
TRACE("(%p)->(%d, %p, %p)\n", This, cConn, pCD, pEnum);
TRACE("%p, %lu, %p, %p.\n", iface, cConn, pCD, pEnum);
if(pEnum == NULL) { if(pEnum == NULL) {
if(cConn != 1) if(cConn != 1)
...@@ -491,16 +417,11 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, ...@@ -491,16 +417,11 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, ULONG cSkip)
/************************************************************************
* EnumConnectionsImpl_Skip (IEnumConnections)
*
*/
static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface,
ULONG cSkip)
{ {
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
TRACE("(%p)->(%d)\n", This, cSkip);
TRACE("%p, %lu.\n", iface, cSkip);
if(This->nCur + cSkip >= This->nConns) if(This->nCur + cSkip >= This->nConns)
return S_FALSE; return S_FALSE;
...@@ -510,11 +431,6 @@ static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, ...@@ -510,11 +431,6 @@ static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface,
return S_OK; return S_OK;
} }
/************************************************************************
* EnumConnectionsImpl_Reset (IEnumConnections)
*
*/
static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface)
{ {
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
...@@ -525,13 +441,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) ...@@ -525,13 +441,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface)
return S_OK; return S_OK;
} }
static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface, IEnumConnections **ppEnum)
/************************************************************************
* EnumConnectionsImpl_Clone (IEnumConnections)
*
*/
static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface,
LPENUMCONNECTIONS *ppEnum)
{ {
EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); EnumConnectionsImpl *This = impl_from_IEnumConnections(iface);
EnumConnectionsImpl *newObj; EnumConnectionsImpl *newObj;
......
dlls/oleaut32/dispatch.c
View file @ c0a131f9
...@@ -248,7 +248,7 @@ static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface) ...@@ -248,7 +248,7 @@ static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface)
StdDispatch *This = impl_from_IDispatch(iface); StdDispatch *This = impl_from_IDispatch(iface);
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); TRACE("%p, refcount %lu.\n", iface, refCount);
return refCount; return refCount;
} }
...@@ -263,7 +263,7 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface) ...@@ -263,7 +263,7 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface)
StdDispatch *This = impl_from_IDispatch(iface); StdDispatch *This = impl_from_IDispatch(iface);
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); TRACE("%p, refcount %lu.\n", iface, refCount);
if (!refCount) if (!refCount)
{ {
...@@ -319,7 +319,8 @@ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pcti ...@@ -319,7 +319,8 @@ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pcti
static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo)
{ {
StdDispatch *This = impl_from_IDispatch(iface); StdDispatch *This = impl_from_IDispatch(iface);
TRACE("(%d, %x, %p)\n", iTInfo, lcid, ppTInfo);
TRACE("%d, %#lx, %p.\n", iTInfo, lcid, ppTInfo);
*ppTInfo = NULL; *ppTInfo = NULL;
if (iTInfo != 0) if (iTInfo != 0)
...@@ -360,7 +361,8 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI ...@@ -360,7 +361,8 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI
static HRESULT WINAPI StdDispatch_GetIDsOfNames(LPDISPATCH iface, REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId) static HRESULT WINAPI StdDispatch_GetIDsOfNames(LPDISPATCH iface, REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId)
{ {
StdDispatch *This = impl_from_IDispatch(iface); StdDispatch *This = impl_from_IDispatch(iface);
TRACE("(%s, %p, %d, 0x%x, %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
TRACE("%s, %p, %d, %#lx, %p.\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
if (!IsEqualGUID(riid, &IID_NULL)) if (!IsEqualGUID(riid, &IID_NULL))
{ {
...@@ -398,7 +400,8 @@ static HRESULT WINAPI StdDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMember, ...@@ -398,7 +400,8 @@ static HRESULT WINAPI StdDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMember,
EXCEPINFO * pExcepInfo, UINT * puArgErr) EXCEPINFO * pExcepInfo, UINT * puArgErr)
{ {
StdDispatch *This = impl_from_IDispatch(iface); StdDispatch *This = impl_from_IDispatch(iface);
TRACE("(%d, %s, 0x%x, 0x%x, %p, %p, %p, %p)\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
TRACE("%ld, %s, %#lx, 0x%x, %p, %p, %p, %p.\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
if (!IsEqualGUID(riid, &IID_NULL)) if (!IsEqualGUID(riid, &IID_NULL))
{ {
......
dlls/oleaut32/hash.c
View file @ c0a131f9
...@@ -509,7 +509,7 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr) ...@@ -509,7 +509,7 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr)
ULONG nHiWord, nLoWord = 0x0deadbee; ULONG nHiWord, nLoWord = 0x0deadbee;
const unsigned char *str = (const unsigned char *)lpStr, *pnLookup = NULL; const unsigned char *str = (const unsigned char *)lpStr, *pnLookup = NULL;
TRACE("(%d, 0x%x, %s) %s\n", skind, lcid, debugstr_a(lpStr), TRACE("%d, %#lx, %s, %s.\n", skind, lcid, debugstr_a(lpStr),
(skind == SYS_WIN16) ? "SYS_WIN16" : (skind == SYS_WIN32) ? "SYS_WIN32" : ""); (skind == SYS_WIN16) ? "SYS_WIN16" : (skind == SYS_WIN32) ? "SYS_WIN32" : "");
if (!str) if (!str)
...@@ -520,7 +520,7 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr) ...@@ -520,7 +520,7 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr)
switch (PRIMARYLANGID(LANGIDFROMLCID(lcid))) switch (PRIMARYLANGID(LANGIDFROMLCID(lcid)))
{ {
default: default:
ERR("Unknown lcid %x, treating as latin-based, please report\n", lcid); ERR("Unknown lcid %lx, treating as latin-based, please report\n", lcid);
/* .. Fall Through .. */ /* .. Fall Through .. */
case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN: case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN:
case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE: case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE:
......
dlls/oleaut32/oleaut.c
View file @ c0a131f9
...@@ -691,7 +691,7 @@ HRESULT WINAPI OleTranslateColor( ...@@ -691,7 +691,7 @@ HRESULT WINAPI OleTranslateColor(
COLORREF colorref; COLORREF colorref;
BYTE b = HIBYTE(HIWORD(clr)); BYTE b = HIBYTE(HIWORD(clr));
TRACE("(%08x, %p, %p)\n", clr, hpal, pColorRef); TRACE("%#lx, %p, %p.\n", clr, hpal, pColorRef);
/* /*
* In case pColorRef is NULL, provide our own to simplify the code. * In case pColorRef is NULL, provide our own to simplify the code.
...@@ -814,7 +814,7 @@ static BOOL actctx_get_typelib_module(REFIID iid, WCHAR *module, DWORD len) ...@@ -814,7 +814,7 @@ static BOOL actctx_get_typelib_module(REFIID iid, WCHAR *module, DWORD len)
if (tlib->name_len/sizeof(WCHAR) >= len) if (tlib->name_len/sizeof(WCHAR) >= len)
{ {
ERR("need larger module buffer, %u\n", tlib->name_len); ERR("need larger module buffer, %lu.\n", tlib->name_len);
return FALSE; return FALSE;
} }
...@@ -979,7 +979,7 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateProxy(IPSFactoryBuffer *iface, ...@@ -979,7 +979,7 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateProxy(IPSFactoryBuffer *iface,
hr = dispatch_create_proxy(outer, proxy, out); hr = dispatch_create_proxy(outer, proxy, out);
if (FAILED(hr)) if (FAILED(hr))
ERR("Failed to create proxy, hr %#x.\n", hr); ERR("Failed to create proxy, hr %#lx.\n", hr);
ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_ReleaseTypeAttr(typeinfo, attr);
ITypeInfo_Release(typeinfo); ITypeInfo_Release(typeinfo);
...@@ -1025,7 +1025,7 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateStub(IPSFactoryBuffer *iface, ...@@ -1025,7 +1025,7 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateStub(IPSFactoryBuffer *iface,
hr = dispatch_create_stub(server, stub); hr = dispatch_create_stub(server, stub);
if (FAILED(hr)) if (FAILED(hr))
ERR("Failed to create proxy, hr %#x.\n", hr); ERR("Failed to create proxy, hr %#lx.\n", hr);
ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_ReleaseTypeAttr(typeinfo, attr);
ITypeInfo_Release(typeinfo); ITypeInfo_Release(typeinfo);
...@@ -1173,7 +1173,7 @@ HRESULT WINAPI GetAltMonthNames(LCID lcid, LPOLESTR **str) ...@@ -1173,7 +1173,7 @@ HRESULT WINAPI GetAltMonthNames(LCID lcid, LPOLESTR **str)
NULL NULL
}; };
TRACE("%#x, %p\n", lcid, str); TRACE("%#lx, %p.\n", lcid, str);
if (PRIMARYLANGID(LANGIDFROMLCID(lcid)) == LANG_ARABIC) if (PRIMARYLANGID(LANGIDFROMLCID(lcid)) == LANG_ARABIC)
*str = (LPOLESTR *)arabic_hijri; *str = (LPOLESTR *)arabic_hijri;
......
dlls/oleaut32/olefont.c
View file @ c0a131f9
...@@ -489,28 +489,20 @@ static HRESULT WINAPI OLEFontImpl_QueryInterface( ...@@ -489,28 +489,20 @@ static HRESULT WINAPI OLEFontImpl_QueryInterface(
return S_OK; return S_OK;
} }
/************************************************************************ static ULONG WINAPI OLEFontImpl_AddRef(IFont* iface)
* OLEFontImpl_AddRef (IUnknown)
*/
static ULONG WINAPI OLEFontImpl_AddRef(
IFont* iface)
{ {
OLEFontImpl *this = impl_from_IFont(iface); OLEFontImpl *this = impl_from_IFont(iface);
TRACE("(%p)->(ref=%d)\n", this, this->ref); ULONG ref = InterlockedIncrement(&this->ref);
return InterlockedIncrement(&this->ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
} }
/************************************************************************
* OLEFontImpl_Release (IUnknown)
*/
static ULONG WINAPI OLEFontImpl_Release(IFont* iface) static ULONG WINAPI OLEFontImpl_Release(IFont* iface)
{ {
OLEFontImpl *this = impl_from_IFont(iface); OLEFontImpl *this = impl_from_IFont(iface);
ULONG ref; ULONG ref = InterlockedDecrement(&this->ref);
TRACE("(%p)->(ref=%d)\n", this, this->ref); TRACE("%p, refcount %lu.\n", iface, ref);
ref = InterlockedDecrement(&this->ref);
if (ref == 0) if (ref == 0)
{ {
...@@ -712,15 +704,10 @@ static HRESULT WINAPI OLEFontImpl_get_Size( ...@@ -712,15 +704,10 @@ static HRESULT WINAPI OLEFontImpl_get_Size(
return S_OK; return S_OK;
} }
/************************************************************************ static HRESULT WINAPI OLEFontImpl_put_Size(IFont *iface, CY size)
* OLEFontImpl_put_Size (IFont)
*/
static HRESULT WINAPI OLEFontImpl_put_Size(
IFont* iface,
CY size)
{ {
OLEFontImpl *this = impl_from_IFont(iface); OLEFontImpl *this = impl_from_IFont(iface);
TRACE("(%p)->(%d)\n", this, size.s.Lo); TRACE("%p, %ld.\n", iface, size.s.Lo);
this->description.cySize.s.Hi = 0; this->description.cySize.s.Hi = 0;
this->description.cySize.s.Lo = size.s.Lo; this->description.cySize.s.Lo = size.s.Lo;
OLEFont_SendNotify(this, DISPID_FONT_SIZE); OLEFont_SendNotify(this, DISPID_FONT_SIZE);
...@@ -728,14 +715,7 @@ static HRESULT WINAPI OLEFontImpl_put_Size( ...@@ -728,14 +715,7 @@ static HRESULT WINAPI OLEFontImpl_put_Size(
return S_OK; return S_OK;
} }
/************************************************************************ static HRESULT WINAPI OLEFontImpl_get_Bold(IFont *iface, BOOL *pbold)
* OLEFontImpl_get_Bold (IFont)
*
* See Windows documentation for more details on IFont methods.
*/
static HRESULT WINAPI OLEFontImpl_get_Bold(
IFont* iface,
BOOL* pbold)
{ {
OLEFontImpl *this = impl_from_IFont(iface); OLEFontImpl *this = impl_from_IFont(iface);
TRACE("(%p)->(%p)\n", this, pbold); TRACE("(%p)->(%p)\n", this, pbold);
...@@ -1063,7 +1043,8 @@ static HRESULT WINAPI OLEFontImpl_SetRatio( ...@@ -1063,7 +1043,8 @@ static HRESULT WINAPI OLEFontImpl_SetRatio(
LONG cyHimetric) LONG cyHimetric)
{ {
OLEFontImpl *this = impl_from_IFont(iface); OLEFontImpl *this = impl_from_IFont(iface);
TRACE("(%p)->(%d, %d)\n", this, cyLogical, cyHimetric);
TRACE("%p, %ld, %ld.\n", iface, cyLogical, cyHimetric);
if(cyLogical == 0 || cyHimetric == 0) if(cyLogical == 0 || cyHimetric == 0)
return E_FAIL; return E_FAIL;
...@@ -1243,9 +1224,9 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo( ...@@ -1243,9 +1224,9 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo(
} }
hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IFontDisp, ppTInfo); hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IFontDisp, ppTInfo);
ITypeLib_Release(tl); ITypeLib_Release(tl);
if (FAILED(hres)) { if (FAILED(hres))
FIXME("Did not IDispatch typeinfo from typelib, hres %x\n",hres); FIXME("Did not IDispatch typeinfo from typelib, hres %#lx.\n", hres);
}
return hres; return hres;
} }
...@@ -1302,7 +1283,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke( ...@@ -1302,7 +1283,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
OLEFontImpl *this = impl_from_IDispatch(iface); OLEFontImpl *this = impl_from_IDispatch(iface);
HRESULT hr; HRESULT hr;
TRACE("%p->(%d,%s,0x%x,0x%x,%p,%p,%p,%p)\n", this, dispIdMember, TRACE("%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p.\n", iface, dispIdMember,
debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo,
puArgErr); puArgErr);
...@@ -1499,7 +1480,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke( ...@@ -1499,7 +1480,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
} }
break; break;
default: default:
ERR("member not found for dispid 0x%x\n", dispIdMember); ERR("member not found for dispid %#lx.\n", dispIdMember);
return DISP_E_MEMBERNOTFOUND; return DISP_E_MEMBERNOTFOUND;
} }
} }
...@@ -2006,7 +1987,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( ...@@ -2006,7 +1987,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load(
} }
if (FAILED(iRes)) if (FAILED(iRes))
WARN("-- 0x%08x\n", iRes); WARN("-- %#lx.\n", iRes);
return iRes; return iRes;
} }
......
dlls/oleaut32/olepicture.c
View file @ c0a131f9
...@@ -401,49 +401,30 @@ static void OLEPictureImpl_Destroy(OLEPictureImpl* Obj) ...@@ -401,49 +401,30 @@ static void OLEPictureImpl_Destroy(OLEPictureImpl* Obj)
HeapFree(GetProcessHeap(), 0, Obj); HeapFree(GetProcessHeap(), 0, Obj);
} }
/************************************************************************
* OLEPictureImpl_AddRef (IUnknown)
*
* See Windows documentation for more details on IUnknown methods.
*/
static ULONG WINAPI OLEPictureImpl_AddRef( static ULONG WINAPI OLEPictureImpl_AddRef(
IPicture* iface) IPicture* iface)
{ {
OLEPictureImpl *This = impl_from_IPicture(iface); OLEPictureImpl *This = impl_from_IPicture(iface);
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); TRACE("%p, refcount %lu.\n", iface, refCount);
return refCount; return refCount;
} }
/************************************************************************
* OLEPictureImpl_Release (IUnknown)
*
* See Windows documentation for more details on IUnknown methods.
*/
static ULONG WINAPI OLEPictureImpl_Release( static ULONG WINAPI OLEPictureImpl_Release(
IPicture* iface) IPicture* iface)
{ {
OLEPictureImpl *This = impl_from_IPicture(iface); OLEPictureImpl *This = impl_from_IPicture(iface);
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); TRACE("%p, refcount %lu.\n", iface, refCount);
/*
* If the reference count goes down to 0, perform suicide.
*/
if (!refCount) OLEPictureImpl_Destroy(This); if (!refCount) OLEPictureImpl_Destroy(This);
return refCount; return refCount;
} }
/************************************************************************
* OLEPictureImpl_QueryInterface (IUnknown)
*
* See Windows documentation for more details on IUnknown methods.
*/
static HRESULT WINAPI OLEPictureImpl_QueryInterface( static HRESULT WINAPI OLEPictureImpl_QueryInterface(
IPicture* iface, IPicture* iface,
REFIID riid, REFIID riid,
...@@ -578,26 +559,18 @@ static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface, ...@@ -578,26 +559,18 @@ static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface,
return S_OK; return S_OK;
} }
/************************************************************************ static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface, OLE_XSIZE_HIMETRIC *pwidth)
* OLEPictureImpl_get_Width
*/
static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface,
OLE_XSIZE_HIMETRIC *pwidth)
{ {
OLEPictureImpl *This = impl_from_IPicture(iface); OLEPictureImpl *This = impl_from_IPicture(iface);
TRACE("(%p)->(%p): width is %d\n", This, pwidth, This->himetricWidth); TRACE("%p, %p.\n", iface, pwidth);
*pwidth = This->himetricWidth; *pwidth = This->himetricWidth;
return S_OK; return S_OK;
} }
/************************************************************************ static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, OLE_YSIZE_HIMETRIC *pheight)
* OLEPictureImpl_get_Height
*/
static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface,
OLE_YSIZE_HIMETRIC *pheight)
{ {
OLEPictureImpl *This = impl_from_IPicture(iface); OLEPictureImpl *This = impl_from_IPicture(iface);
TRACE("(%p)->(%p): height is %d\n", This, pheight, This->himetricHeight); TRACE("%p, %p.\n", iface, pheight);
*pheight = This->himetricHeight; *pheight = This->himetricHeight;
return S_OK; return S_OK;
} }
...@@ -656,8 +629,8 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, ...@@ -656,8 +629,8 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc,
LPCRECT prcWBounds) LPCRECT prcWBounds)
{ {
OLEPictureImpl *This = impl_from_IPicture(iface); OLEPictureImpl *This = impl_from_IPicture(iface);
TRACE("(%p)->(%p, (%d,%d), (%d,%d) <- (%d,%d), (%d,%d), %p)\n", TRACE("%p, %p, (%ld,%ld), (%ld,%ld), (%ld,%ld), (%ld,%ld), %p)\n", iface, hdc, x, y, cx, cy, xSrc, ySrc,
This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds); cxSrc, cySrc, prcWBounds);
if(prcWBounds) if(prcWBounds)
TRACE("prcWBounds %s\n", wine_dbgstr_rect(prcWBounds)); TRACE("prcWBounds %s\n", wine_dbgstr_rect(prcWBounds));
...@@ -1225,7 +1198,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x ...@@ -1225,7 +1198,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x
HDC hdcRef; HDC hdcRef;
int i; int i;
TRACE("(this %p, xbuf %p, xread %u)\n", This, xbuf, xread); TRACE("(this %p, xbuf %p, xread %lu)\n", This, xbuf, xread);
/* /*
FIXME("icon.idReserved=%d\n",cifd->idReserved); FIXME("icon.idReserved=%d\n",cifd->idReserved);
...@@ -1263,7 +1236,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x ...@@ -1263,7 +1236,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x
} }
if (xread < cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize) if (xread < cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize)
{ {
ERR("Icon data address %u is over %u bytes available.\n", ERR("Icon data address %lu is over %lu bytes available.\n",
cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize, xread); cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize, xread);
return E_FAIL; return E_FAIL;
} }
...@@ -1402,7 +1375,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) ...@@ -1402,7 +1375,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
*/ */
hr = IStream_Stat(pStm,&statstg,STATFLAG_NONAME); hr = IStream_Stat(pStm,&statstg,STATFLAG_NONAME);
if (hr != S_OK) { if (hr != S_OK) {
TRACE("stat failed with hres %x, proceeding to read all data.\n",hr); TRACE("stat failed with hres %#lx, proceeding to read all data.\n",hr);
statfailed = TRUE; statfailed = TRUE;
/* we will read at least 8 byte ... just right below */ /* we will read at least 8 byte ... just right below */
statstg.cbSize.QuadPart = 8; statstg.cbSize.QuadPart = 8;
...@@ -1414,7 +1387,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) ...@@ -1414,7 +1387,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
do { do {
hr = IStream_Read(pStm, header, 8, &xread); hr = IStream_Read(pStm, header, 8, &xread);
if (hr != S_OK || xread!=8) { if (hr != S_OK || xread!=8) {
ERR("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); ERR("Failure while reading picture header (hr is %#lx, nread is %ld).\n",hr,xread);
return (hr?hr:E_FAIL); return (hr?hr:E_FAIL);
} }
headerread += xread; headerread += xread;
...@@ -1422,7 +1395,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) ...@@ -1422,7 +1395,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
if (!memcmp(&(header[0]),"lt\0\0", 4) && (statfailed || (header[1] + headerread <= statstg.cbSize.QuadPart))) { if (!memcmp(&(header[0]),"lt\0\0", 4) && (statfailed || (header[1] + headerread <= statstg.cbSize.QuadPart))) {
if (toread != 0 && toread != header[1]) if (toread != 0 && toread != header[1])
FIXME("varying lengths of image data (prev=%u curr=%u), only last one will be used\n", FIXME("varying lengths of image data (prev=%lu curr=%lu), only last one will be used\n",
toread, header[1]); toread, header[1]);
toread = header[1]; toread = header[1];
if (statfailed) if (statfailed)
...@@ -1447,7 +1420,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) ...@@ -1447,7 +1420,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
else toread -= 8; else toread -= 8;
xread = 8; xread = 8;
} else { } else {
FIXME("Unknown stream header magic: %08x\n", header[0]); FIXME("Unknown stream header magic: %#lx.\n", header[0]);
toread = header[1]; toread = header[1];
} }
} }
...@@ -1478,8 +1451,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) ...@@ -1478,8 +1451,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
} }
} }
if (hr != S_OK) if (hr != S_OK)
TRACE("hr in no-stat loader case is %08x\n", hr); TRACE("hr in no-stat loader case is %#lx.\n", hr);
TRACE("loaded %d bytes.\n", xread); TRACE("loaded %ld bytes.\n", xread);
This->datalen = xread; This->datalen = xread;
This->data = xbuf; This->data = xbuf;
} else { } else {
...@@ -1499,7 +1472,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) ...@@ -1499,7 +1472,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
break; break;
} }
if (xread != This->datalen) if (xread != This->datalen)
ERR("Could only read %d of %d bytes out of stream?\n",xread,This->datalen); ERR("Could only read %ld of %d bytes out of stream?\n", xread, This->datalen);
} }
if (This->datalen == 0) { /* Marks the "NONE" picture */ if (This->datalen == 0) { /* Marks the "NONE" picture */
This->desc.picType = PICTYPE_NONE; This->desc.picType = PICTYPE_NONE;
...@@ -1542,7 +1515,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) ...@@ -1542,7 +1515,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
hr = OLEPictureImpl_LoadEnhMetafile(This, xbuf, xread); hr = OLEPictureImpl_LoadEnhMetafile(This, xbuf, xread);
if (hr == S_OK) break; if (hr == S_OK) break;
FIXME("Unknown magic %04x, %d read bytes:\n",magic,xread); FIXME("Unknown magic %04x, %ld read bytes:\n", magic, xread);
hr=E_FAIL; hr=E_FAIL;
for (i=0;i<xread+8;i++) { for (i=0;i<xread+8;i++) {
if (i<8) MESSAGE("%02x ",((unsigned char*)header)[i]); if (i<8) MESSAGE("%02x ",((unsigned char*)header)[i]);
...@@ -1771,8 +1744,7 @@ static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) ...@@ -1771,8 +1744,7 @@ static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength)
if (infoIcon.hbmColor) DeleteObject(infoIcon.hbmColor); if (infoIcon.hbmColor) DeleteObject(infoIcon.hbmColor);
HeapFree(GetProcessHeap(), 0, pInfoBitmap); HeapFree(GetProcessHeap(), 0, pInfoBitmap);
} else { } else {
printf("ERROR: Unable to get icon information (error %u)\n", ERR("Unable to get icon information (error %lu)\n", GetLastError());
GetLastError());
} }
return success; return success;
} }
...@@ -1964,7 +1936,7 @@ static HRESULT WINAPI OLEPictureImpl_GetTypeInfo( ...@@ -1964,7 +1936,7 @@ static HRESULT WINAPI OLEPictureImpl_GetTypeInfo(
hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IPictureDisp, ppTInfo); hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IPictureDisp, ppTInfo);
if (FAILED(hres)) if (FAILED(hres))
ERR("Did not get IPictureDisp typeinfo from typelib, hres %x\n", hres); ERR("Did not get IPictureDisp typeinfo from typelib, hres %#lx.\n", hres);
return hres; return hres;
} }
...@@ -2160,7 +2132,7 @@ static HRESULT WINAPI OLEPictureImpl_Invoke( ...@@ -2160,7 +2132,7 @@ static HRESULT WINAPI OLEPictureImpl_Invoke(
break; break;
} }
ERR("invalid dispid 0x%x or wFlags 0x%x\n", dispIdMember, wFlags); ERR("invalid dispid %#lx or wFlags 0x%x\n", dispIdMember, wFlags);
return DISP_E_MEMBERNOTFOUND; return DISP_E_MEMBERNOTFOUND;
} }
...@@ -2259,7 +2231,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, ...@@ -2259,7 +2231,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
IPicture *newpic; IPicture *newpic;
HRESULT hr; HRESULT hr;
TRACE("(%p,%d,%d,%s,%p), partially implemented.\n", TRACE("%p, %ld, %d, %s, %p), partially implemented.\n",
lpstream, lSize, fRunmode, debugstr_guid(riid), ppvObj); lpstream, lSize, fRunmode, debugstr_guid(riid), ppvObj);
hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic); hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic);
...@@ -2298,7 +2270,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, ...@@ -2298,7 +2270,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
IPicture *newpic; IPicture *newpic;
HRESULT hr; HRESULT hr;
FIXME("(%p,%d,%d,%s,x=%d,y=%d,f=%x,%p), partially implemented.\n", FIXME("%p, %ld, %d, %s, %lu, %lu, %#lx, %p, partially implemented.\n",
lpstream, lSize, fRunmode, debugstr_guid(riid), xsiz, ysiz, flags, ppvObj); lpstream, lSize, fRunmode, debugstr_guid(riid), xsiz, ysiz, flags, ppvObj);
hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic); hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic);
...@@ -2365,9 +2337,8 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, ...@@ -2365,9 +2337,8 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
WCHAR *file_candidate; WCHAR *file_candidate;
WCHAR path_buf[MAX_PATH]; WCHAR path_buf[MAX_PATH];
TRACE("(%s,%p,%d,%08x,%s,%p): stub\n", TRACE("%s, %p, %ld, %#lx, %s, %p.\n", debugstr_w(szURLorPath), punkCaller, dwReserved,
debugstr_w(szURLorPath), punkCaller, dwReserved, clrReserved, clrReserved, debugstr_guid(riid), ppvRet);
debugstr_guid(riid), ppvRet);
if (!szURLorPath || !ppvRet) if (!szURLorPath || !ppvRet)
return E_INVALIDARG; return E_INVALIDARG;
......
dlls/oleaut32/olepropframe.c
View file @ c0a131f9
...@@ -93,7 +93,7 @@ static ULONG WINAPI PropertyPageSite_AddRef(IPropertyPageSite* iface) ...@@ -93,7 +93,7 @@ static ULONG WINAPI PropertyPageSite_AddRef(IPropertyPageSite* iface)
PropertyPageSite *this = impl_from_IPropertyPageSite(iface); PropertyPageSite *this = impl_from_IPropertyPageSite(iface);
LONG ref = InterlockedIncrement(&this->ref); LONG ref = InterlockedIncrement(&this->ref);
TRACE("(%p) ref=%d\n", this, ref); TRACE("%p, refcount %ld.\n", iface, ref);
return ref; return ref;
} }
...@@ -102,7 +102,7 @@ static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface) ...@@ -102,7 +102,7 @@ static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface)
PropertyPageSite *this = impl_from_IPropertyPageSite(iface); PropertyPageSite *this = impl_from_IPropertyPageSite(iface);
LONG ref = InterlockedDecrement(&this->ref); LONG ref = InterlockedDecrement(&this->ref);
TRACE("(%p) ref=%d\n", this, ref); TRACE("%p, refcount %ld.\n", iface, ref);
if(!ref) if(!ref)
HeapFree(GetProcessHeap(), 0, this); HeapFree(GetProcessHeap(), 0, this);
return ref; return ref;
...@@ -111,7 +111,7 @@ static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface) ...@@ -111,7 +111,7 @@ static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface)
static HRESULT WINAPI PropertyPageSite_OnStatusChange( static HRESULT WINAPI PropertyPageSite_OnStatusChange(
IPropertyPageSite *iface, DWORD dwFlags) IPropertyPageSite *iface, DWORD dwFlags)
{ {
TRACE("(%p, %x)\n", iface, dwFlags); TRACE("%p, %lx.\n", iface, dwFlags);
return S_OK; return S_OK;
} }
...@@ -178,7 +178,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) ...@@ -178,7 +178,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams)
if(!lpParams) if(!lpParams)
return E_POINTER; return E_POINTER;
TRACE("(%d %p %d %d %s %d %p %d %p %d %d)\n", lpParams->cbStructSize, TRACE("%ld, %p, %d, %d, %s, %ld, %p, %ld, %p, %ld, %ld.\n", lpParams->cbStructSize,
lpParams->hWndOwner, lpParams->x, lpParams->y, lpParams->hWndOwner, lpParams->x, lpParams->y,
debugstr_w(lpParams->lpszCaption), lpParams->cObjects, debugstr_w(lpParams->lpszCaption), lpParams->cObjects,
lpParams->lplpUnk, lpParams->cPages, lpParams->lpPages, lpParams->lplpUnk, lpParams->cPages, lpParams->lpPages,
...@@ -286,7 +286,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) ...@@ -286,7 +286,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams)
res = IPropertyPage_SetObjects(property_page[i], res = IPropertyPage_SetObjects(property_page[i],
lpParams->cObjects, lpParams->lplpUnk); lpParams->cObjects, lpParams->lplpUnk);
if(FAILED(res)) if(FAILED(res))
WARN("SetObjects() failed, hr %#x.\n", res); WARN("SetObjects() failed, hr %#lx.\n", res);
res = IPropertyPage_GetPageInfo(property_page[i], &page_info); res = IPropertyPage_GetPageInfo(property_page[i], &page_info);
if(FAILED(res)) if(FAILED(res))
......
dlls/oleaut32/recinfo.c
View file @ c0a131f9
...@@ -163,7 +163,7 @@ static ULONG WINAPI IRecordInfoImpl_AddRef(IRecordInfo *iface) ...@@ -163,7 +163,7 @@ static ULONG WINAPI IRecordInfoImpl_AddRef(IRecordInfo *iface)
{ {
IRecordInfoImpl *This = impl_from_IRecordInfo(iface); IRecordInfoImpl *This = impl_from_IRecordInfo(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) -> %d\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
return ref; return ref;
} }
...@@ -172,7 +172,7 @@ static ULONG WINAPI IRecordInfoImpl_Release(IRecordInfo *iface) ...@@ -172,7 +172,7 @@ static ULONG WINAPI IRecordInfoImpl_Release(IRecordInfo *iface)
IRecordInfoImpl *This = impl_from_IRecordInfo(iface); IRecordInfoImpl *This = impl_from_IRecordInfo(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) -> %d\n", This, ref); TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) { if(!ref) {
int i; int i;
...@@ -441,8 +441,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutField(IRecordInfo *iface, ULONG wFlags, ...@@ -441,8 +441,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutField(IRecordInfo *iface, ULONG wFlags,
IRecordInfoImpl *This = impl_from_IRecordInfo(iface); IRecordInfoImpl *This = impl_from_IRecordInfo(iface);
int i; int i;
TRACE("(%p)->(%08x %p %s %p)\n", This, wFlags, pvData, debugstr_w(szFieldName), TRACE("%p, %#lx, %p, %s, %p.\n", iface, wFlags, pvData, debugstr_w(szFieldName), pvarField);
pvarField);
if(!pvData || !szFieldName || !pvarField if(!pvData || !szFieldName || !pvarField
|| (wFlags != INVOKE_PROPERTYPUTREF && wFlags != INVOKE_PROPERTYPUT)) || (wFlags != INVOKE_PROPERTYPUTREF && wFlags != INVOKE_PROPERTYPUT))
...@@ -469,7 +468,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutFieldNoCopy(IRecordInfo *iface, ULONG w ...@@ -469,7 +468,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutFieldNoCopy(IRecordInfo *iface, ULONG w
IRecordInfoImpl *This = impl_from_IRecordInfo(iface); IRecordInfoImpl *This = impl_from_IRecordInfo(iface);
int i; int i;
FIXME("(%p)->(%08x %p %s %p) stub\n", This, wFlags, pvData, debugstr_w(szFieldName), pvarField); FIXME("%p, %#lx, %p, %s, %p stub\n", iface, wFlags, pvData, debugstr_w(szFieldName), pvarField);
if(!pvData || !szFieldName || !pvarField if(!pvData || !szFieldName || !pvarField
|| (wFlags != INVOKE_PROPERTYPUTREF && wFlags != INVOKE_PROPERTYPUT)) || (wFlags != INVOKE_PROPERTYPUTREF && wFlags != INVOKE_PROPERTYPUT))
...@@ -597,8 +596,8 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID rGuidTypeLib, ULONG uVerMajor, ...@@ -597,8 +596,8 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID rGuidTypeLib, ULONG uVerMajor,
ITypeInfo *pTypeInfo; ITypeInfo *pTypeInfo;
ITypeLib *pTypeLib; ITypeLib *pTypeLib;
HRESULT hres; HRESULT hres;
TRACE("(%p,%d,%d,%d,%s,%p)\n", rGuidTypeLib, uVerMajor, uVerMinor, TRACE("%p, %lu, %lu, %#lx, %s, %p.\n", rGuidTypeLib, uVerMajor, uVerMinor,
lcid, debugstr_guid(rGuidTypeInfo), ppRecInfo); lcid, debugstr_guid(rGuidTypeInfo), ppRecInfo);
hres = LoadRegTypeLib(rGuidTypeLib, uVerMajor, uVerMinor, lcid, &pTypeLib); hres = LoadRegTypeLib(rGuidTypeLib, uVerMajor, uVerMinor, lcid, &pTypeLib);
...@@ -637,7 +636,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo ...@@ -637,7 +636,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo
hres = ITypeInfo_GetTypeAttr(pTI, &typeattr); hres = ITypeInfo_GetTypeAttr(pTI, &typeattr);
if(FAILED(hres) || !typeattr) { if(FAILED(hres) || !typeattr) {
WARN("GetTypeAttr failed: %08x\n", hres); WARN("GetTypeAttr failed: %#lx.\n", hres);
return hres; return hres;
} }
...@@ -646,13 +645,13 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo ...@@ -646,13 +645,13 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo
guid = typeattr->guid; guid = typeattr->guid;
ITypeInfo_ReleaseTypeAttr(pTI, typeattr); ITypeInfo_ReleaseTypeAttr(pTI, typeattr);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("GetRefTypeInfo failed: %08x\n", hres); WARN("GetRefTypeInfo failed: %#lx.\n", hres);
return hres; return hres;
} }
hres = ITypeInfo_GetTypeAttr(pTypeInfo, &typeattr); hres = ITypeInfo_GetTypeAttr(pTypeInfo, &typeattr);
if(FAILED(hres)) { if(FAILED(hres)) {
ITypeInfo_Release(pTypeInfo); ITypeInfo_Release(pTypeInfo);
WARN("GetTypeAttr failed for referenced type: %08x\n", hres); WARN("GetTypeAttr failed for referenced type: %#lx.\n", hres);
return hres; return hres;
} }
}else { }else {
...@@ -702,8 +701,8 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo ...@@ -702,8 +701,8 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo
hres = ITypeInfo_GetDocumentation(pTypeInfo, vardesc->memid, &ret->fields[i].name, hres = ITypeInfo_GetDocumentation(pTypeInfo, vardesc->memid, &ret->fields[i].name,
NULL, NULL, NULL); NULL, NULL, NULL);
if(FAILED(hres)) if(FAILED(hres))
WARN("GetDocumentation failed: %08x\n", hres); WARN("GetDocumentation failed: %#lx.\n", hres);
TRACE("field=%s, offset=%d\n", debugstr_w(ret->fields[i].name), ret->fields[i].offset); TRACE("field=%s, offset=%ld\n", debugstr_w(ret->fields[i].name), ret->fields[i].offset);
ITypeInfo_ReleaseVarDesc(pTypeInfo, vardesc); ITypeInfo_ReleaseVarDesc(pTypeInfo, vardesc);
} }
......
dlls/oleaut32/safearray.c
View file @ c0a131f9
...@@ -287,7 +287,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell) ...@@ -287,7 +287,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell)
ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); ULONG ulCellCount = SAFEARRAY_GetCellCount(psa);
if (ulStartCell > ulCellCount) { if (ulStartCell > ulCellCount) {
FIXME("unexpected ulCellCount %d, start %d\n",ulCellCount,ulStartCell); FIXME("unexpected ulCellCount %ld, start %ld\n", ulCellCount, ulStartCell);
return E_UNEXPECTED; return E_UNEXPECTED;
} }
...@@ -372,7 +372,7 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) ...@@ -372,7 +372,7 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest)
/* destination is cleared automatically */ /* destination is cleared automatically */
hRet = VariantCopy(dest_var, src_var); hRet = VariantCopy(dest_var, src_var);
if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%08x, element %u\n", hRet, ulCellCount); if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx, element %lu.\n", hRet, ulCellCount);
src_var++; src_var++;
dest_var++; dest_var++;
} }
...@@ -495,7 +495,7 @@ HRESULT WINAPI SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut) ...@@ -495,7 +495,7 @@ HRESULT WINAPI SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut)
(*ppsaOut)->cDims = cDims; (*ppsaOut)->cDims = cDims;
TRACE("(%d): %u bytes allocated for descriptor.\n", cDims, allocSize); TRACE("%d: %lu bytes allocated for descriptor.\n", cDims, allocSize);
return S_OK; return S_OK;
} }
...@@ -569,7 +569,7 @@ HRESULT WINAPI SafeArrayAllocData(SAFEARRAY *psa) ...@@ -569,7 +569,7 @@ HRESULT WINAPI SafeArrayAllocData(SAFEARRAY *psa)
if (psa->pvData) if (psa->pvData)
{ {
hRet = S_OK; hRet = S_OK;
TRACE("%u bytes allocated for data at %p (%u objects).\n", TRACE("%lu bytes allocated for data at %p (%lu objects).\n",
ulSize * psa->cbElements, psa->pvData, ulSize); ulSize * psa->cbElements, psa->pvData, ulSize);
} }
else else
...@@ -676,7 +676,7 @@ SAFEARRAY* WINAPI SafeArrayCreateEx(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsa ...@@ -676,7 +676,7 @@ SAFEARRAY* WINAPI SafeArrayCreateEx(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsa
*/ */
SAFEARRAY* WINAPI SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements) SAFEARRAY* WINAPI SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements)
{ {
TRACE("(%s,%d,%u)\n", debugstr_vt(vt), lLbound, cElements); TRACE("%s, %ld, %lu.\n", debugstr_vt(vt), lLbound, cElements);
if (vt == VT_RECORD) if (vt == VT_RECORD)
return NULL; return NULL;
...@@ -708,7 +708,7 @@ SAFEARRAY* WINAPI SafeArrayCreateVectorEx(VARTYPE vt, LONG lLbound, ULONG cEleme ...@@ -708,7 +708,7 @@ SAFEARRAY* WINAPI SafeArrayCreateVectorEx(VARTYPE vt, LONG lLbound, ULONG cEleme
IRecordInfo* iRecInfo = pvExtra; IRecordInfo* iRecInfo = pvExtra;
SAFEARRAY* psa; SAFEARRAY* psa;
TRACE("(%s,%d,%u,%p)\n", debugstr_vt(vt), lLbound, cElements, pvExtra); TRACE("%s, %ld, %lu, %p.\n", debugstr_vt(vt), lLbound, cElements, pvExtra);
if (vt == VT_RECORD) if (vt == VT_RECORD)
{ {
...@@ -886,7 +886,7 @@ HRESULT WINAPI SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData ...@@ -886,7 +886,7 @@ HRESULT WINAPI SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData
VARIANT* lpDest = lpvDest; VARIANT* lpDest = lpvDest;
hRet = VariantCopy(lpDest, lpVariant); hRet = VariantCopy(lpDest, lpVariant);
if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%x\n", hRet); if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx.\n", hRet);
} }
else if (psa->fFeatures & FADF_BSTR) else if (psa->fFeatures & FADF_BSTR)
{ {
...@@ -971,7 +971,7 @@ HRESULT WINAPI SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData ...@@ -971,7 +971,7 @@ HRESULT WINAPI SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData
/* The original content of pvData is ignored. */ /* The original content of pvData is ignored. */
V_VT(lpDest) = VT_EMPTY; V_VT(lpDest) = VT_EMPTY;
hRet = VariantCopy(lpDest, lpVariant); hRet = VariantCopy(lpDest, lpVariant);
if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%x\n", hRet); if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx.\n", hRet);
} }
else if (psa->fFeatures & FADF_BSTR) else if (psa->fFeatures & FADF_BSTR)
{ {
...@@ -1113,8 +1113,8 @@ UINT WINAPI SafeArrayGetDim(SAFEARRAY *psa) ...@@ -1113,8 +1113,8 @@ UINT WINAPI SafeArrayGetDim(SAFEARRAY *psa)
*/ */
UINT WINAPI SafeArrayGetElemsize(SAFEARRAY *psa) UINT WINAPI SafeArrayGetElemsize(SAFEARRAY *psa)
{ {
TRACE("(%p) returning %d\n", psa, psa ? psa->cbElements : 0u); TRACE("%p, returning %ld.\n", psa, psa ? psa->cbElements : 0u);
return psa ? psa->cbElements : 0; return psa ? psa->cbElements : 0;
} }
/************************************************************************* /*************************************************************************
......
dlls/oleaut32/varformat.c
View file @ c0a131f9
...@@ -492,7 +492,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, ...@@ -492,7 +492,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
DWORD fmt_state = 0; DWORD fmt_state = 0;
LPCWSTR pFormat = lpszFormat; LPCWSTR pFormat = lpszFormat;
TRACE("(%s,%p,%d,%d,%d,0x%08x,%p)\n", debugstr_w(lpszFormat), rgbTok, cbTok, TRACE("%s, %p, %d, %d, %d, %#lx, %p.\n", debugstr_w(lpszFormat), rgbTok, cbTok,
nFirstDay, nFirstWeek, lcid, pcbActual); nFirstDay, nFirstWeek, lcid, pcbActual);
if (!rgbTok || if (!rgbTok ||
...@@ -1162,7 +1162,7 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, ...@@ -1162,7 +1162,7 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat,
const BYTE* pToken = NULL; const BYTE* pToken = NULL;
HRESULT hRes = S_OK; HRESULT hRes = S_OK;
TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat),
rgbTok, dwFlags, pbstrOut, lcid); rgbTok, dwFlags, pbstrOut, lcid);
V_VT(&vString) = VT_EMPTY; V_VT(&vString) = VT_EMPTY;
...@@ -1570,7 +1570,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, ...@@ -1570,7 +1570,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat,
const BYTE* pToken = NULL; const BYTE* pToken = NULL;
HRESULT hRes; HRESULT hRes;
TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn),
debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid);
V_VT(&vDate) = VT_EMPTY; V_VT(&vDate) = VT_EMPTY;
...@@ -1909,7 +1909,7 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat, ...@@ -1909,7 +1909,7 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat,
BOOL bUpper = FALSE; BOOL bUpper = FALSE;
HRESULT hRes = S_OK; HRESULT hRes = S_OK;
TRACE("%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat),
rgbTok, dwFlags, pbstrOut, lcid); rgbTok, dwFlags, pbstrOut, lcid);
V_VT(&vStr) = VT_EMPTY; V_VT(&vStr) = VT_EMPTY;
...@@ -2035,7 +2035,7 @@ HRESULT WINAPI VarFormatFromTokens(LPVARIANT pVarIn, LPOLESTR lpszFormat, ...@@ -2035,7 +2035,7 @@ HRESULT WINAPI VarFormatFromTokens(LPVARIANT pVarIn, LPOLESTR lpszFormat,
VARIANT vTmp; VARIANT vTmp;
HRESULT hres; HRESULT hres;
TRACE("(%p,%s,%p,%x,%p,0x%08x)\n", pVarIn, debugstr_w(lpszFormat), TRACE("%p, %s, %p, %#lx, %p, %#lx.\n", pVarIn, debugstr_w(lpszFormat),
rgbTok, dwFlags, pbstrOut, lcid); rgbTok, dwFlags, pbstrOut, lcid);
if (!pbstrOut) if (!pbstrOut)
...@@ -2122,7 +2122,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat, ...@@ -2122,7 +2122,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat,
BYTE buff[256]; BYTE buff[256];
HRESULT hres; HRESULT hres;
TRACE("(%s,%s,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), TRACE("%s, %s, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat),
nFirstDay, nFirstWeek, dwFlags, pbstrOut); nFirstDay, nFirstWeek, dwFlags, pbstrOut);
if (!pbstrOut) if (!pbstrOut)
...@@ -2134,7 +2134,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat, ...@@ -2134,7 +2134,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat,
if (SUCCEEDED(hres)) if (SUCCEEDED(hres))
hres = VarFormatFromTokens(pVarIn, lpszFormat, buff, dwFlags, hres = VarFormatFromTokens(pVarIn, lpszFormat, buff, dwFlags,
pbstrOut, LOCALE_USER_DEFAULT); pbstrOut, LOCALE_USER_DEFAULT);
TRACE("returning 0x%08x, %s\n", hres, debugstr_w(*pbstrOut)); TRACE("returning %#lx, %s\n", hres, debugstr_w(*pbstrOut));
return hres; return hres;
} }
...@@ -2172,7 +2172,7 @@ HRESULT WINAPI VarFormatDateTime(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, B ...@@ -2172,7 +2172,7 @@ HRESULT WINAPI VarFormatDateTime(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, B
static WCHAR szEmpty[] = L""; static WCHAR szEmpty[] = L"";
const BYTE* lpFmt = NULL; const BYTE* lpFmt = NULL;
TRACE("%s,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut); TRACE("%s, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut);
if (!pVarIn || !pbstrOut || nFormat < 0 || nFormat > 4) if (!pVarIn || !pbstrOut || nFormat < 0 || nFormat > 4)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -2224,7 +2224,7 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT ...@@ -2224,7 +2224,7 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT
HRESULT hRet; HRESULT hRet;
VARIANT vStr; VARIANT vStr;
TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading,
nParens, nGrouping, dwFlags, pbstrOut); nParens, nGrouping, dwFlags, pbstrOut);
if (!pVarIn || !pbstrOut || nDigits > 9) if (!pVarIn || !pbstrOut || nDigits > 9)
...@@ -2329,7 +2329,7 @@ HRESULT WINAPI VarFormatPercent(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT ...@@ -2329,7 +2329,7 @@ HRESULT WINAPI VarFormatPercent(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT
HRESULT hRet; HRESULT hRet;
VARIANT vDbl; VARIANT vDbl;
TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading,
nParens, nGrouping, dwFlags, pbstrOut); nParens, nGrouping, dwFlags, pbstrOut);
if (!pVarIn || !pbstrOut || nDigits > 9) if (!pVarIn || !pbstrOut || nDigits > 9)
...@@ -2403,7 +2403,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, ...@@ -2403,7 +2403,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading,
VARIANT vStr; VARIANT vStr;
CY cy; CY cy;
TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading,
nParens, nGrouping, dwFlags, pbstrOut); nParens, nGrouping, dwFlags, pbstrOut);
if (!pVarIn || !pbstrOut || nDigits > 9) if (!pVarIn || !pbstrOut || nDigits > 9)
...@@ -2512,7 +2512,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO ...@@ -2512,7 +2512,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO
return E_INVALIDARG; return E_INVALIDARG;
if (dwFlags) if (dwFlags)
FIXME("Does not support dwFlags 0x%x, ignoring.\n", dwFlags); FIXME("Does not support flags %#lx, ignoring.\n", dwFlags);
if (fAbbrev) if (fAbbrev)
localeValue = LOCALE_SABBREVMONTHNAME1 + iMonth - 1; localeValue = LOCALE_SABBREVMONTHNAME1 + iMonth - 1;
...@@ -2521,7 +2521,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO ...@@ -2521,7 +2521,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO
size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, NULL, 0); size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, NULL, 0);
if (!size) { if (!size) {
ERR("GetLocaleInfo 0x%x failed.\n", localeValue); ERR("GetLocaleInfo %#lx failed.\n", localeValue);
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
} }
*pbstrOut = SysAllocStringLen(NULL,size - 1); *pbstrOut = SysAllocStringLen(NULL,size - 1);
...@@ -2529,7 +2529,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO ...@@ -2529,7 +2529,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, *pbstrOut, size); size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, *pbstrOut, size);
if (!size) { if (!size) {
ERR("GetLocaleInfo of 0x%x failed in 2nd stage?!\n", localeValue); ERR("GetLocaleInfo of %#lx failed in 2nd stage?!\n", localeValue);
SysFreeString(*pbstrOut); SysFreeString(*pbstrOut);
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
} }
...@@ -2569,7 +2569,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, ...@@ -2569,7 +2569,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay,
return E_INVALIDARG; return E_INVALIDARG;
if (dwFlags) if (dwFlags)
FIXME("Does not support dwFlags 0x%x, ignoring.\n", dwFlags); FIXME("Does not support flags %#lx, ignoring.\n", dwFlags);
/* If we have to use the default firstDay, find which one it is */ /* If we have to use the default firstDay, find which one it is */
if (iFirstDay == 0) { if (iFirstDay == 0) {
...@@ -2578,7 +2578,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, ...@@ -2578,7 +2578,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay,
size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue,
(LPWSTR)&firstDay, sizeof(firstDay) / sizeof(WCHAR)); (LPWSTR)&firstDay, sizeof(firstDay) / sizeof(WCHAR));
if (!size) { if (!size) {
ERR("GetLocaleInfo 0x%x failed.\n", localeValue); ERR("GetLocaleInfo %#lx failed.\n", localeValue);
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
} }
iFirstDay = firstDay + 2; iFirstDay = firstDay + 2;
...@@ -2591,7 +2591,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, ...@@ -2591,7 +2591,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay,
/* Determine the size of the data, allocate memory and retrieve the data */ /* Determine the size of the data, allocate memory and retrieve the data */
size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, NULL, 0); size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, NULL, 0);
if (!size) { if (!size) {
ERR("GetLocaleInfo 0x%x failed.\n", localeValue); ERR("GetLocaleInfo %#lx failed.\n", localeValue);
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
} }
*pbstrOut = SysAllocStringLen(NULL, size - 1); *pbstrOut = SysAllocStringLen(NULL, size - 1);
...@@ -2599,7 +2599,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, ...@@ -2599,7 +2599,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay,
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, *pbstrOut, size); size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, *pbstrOut, size);
if (!size) { if (!size) {
ERR("GetLocaleInfo 0x%x failed in 2nd stage?!\n", localeValue); ERR("GetLocaleInfo %#lx failed in 2nd stage?!\n", localeValue);
SysFreeString(*pbstrOut); SysFreeString(*pbstrOut);
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
} }
......
dlls/oleaut32/variant.c
View file @ c0a131f9
...@@ -51,7 +51,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, ...@@ -51,7 +51,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
VARTYPE vtFrom = V_TYPE(ps); VARTYPE vtFrom = V_TYPE(ps);
DWORD dwFlags = 0; DWORD dwFlags = 0;
TRACE("(%s,0x%08x,0x%04x,%s,%s)\n", debugstr_variant(pd), lcid, wFlags, TRACE("%s, %#lx, 0x%04x, %s, %s.\n", debugstr_variant(pd), lcid, wFlags,
debugstr_variant(ps), debugstr_vt(vt)); debugstr_variant(ps), debugstr_vt(vt));
if (vt == VT_BSTR || vtFrom == VT_BSTR) if (vt == VT_BSTR || vtFrom == VT_BSTR)
...@@ -918,7 +918,7 @@ VariantCopyInd_Return: ...@@ -918,7 +918,7 @@ VariantCopyInd_Return:
if (pSrc != pvargSrc) if (pSrc != pvargSrc)
VariantClear(&vTmp); VariantClear(&vTmp);
TRACE("returning 0x%08x, %s\n", hres, debugstr_variant(pvargDest)); TRACE("returning %#lx, %s\n", hres, debugstr_variant(pvargDest));
return hres; return hres;
} }
...@@ -972,7 +972,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, const VARIANTARG* pvar ...@@ -972,7 +972,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, const VARIANTARG* pvar
{ {
HRESULT res = S_OK; HRESULT res = S_OK;
TRACE("(%s,%s,0x%08x,0x%04x,%s)\n", debugstr_variant(pvargDest), TRACE("%s, %s, %#lx, 0x%04x, %s.\n", debugstr_variant(pvargDest),
debugstr_variant(pvargSrc), lcid, wFlags, debugstr_vt(vt)); debugstr_variant(pvargSrc), lcid, wFlags, debugstr_vt(vt));
if (vt == VT_CLSID) if (vt == VT_CLSID)
...@@ -1021,7 +1021,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, const VARIANTARG* pvar ...@@ -1021,7 +1021,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, const VARIANTARG* pvar
} }
} }
TRACE("returning 0x%08x, %s\n", res, debugstr_variant(pvargDest)); TRACE("returning %#lx, %s\n", res, debugstr_variant(pvargDest));
return res; return res;
} }
...@@ -1329,7 +1329,7 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT ...@@ -1329,7 +1329,7 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT
UDATE ud; UDATE ud;
double dateVal = 0; double dateVal = 0;
TRACE("(%p->%d/%d/%d %d:%d:%d:%d %d %d,0x%08x,0x%08x,%p)\n", pUdateIn, TRACE("%p, %d/%d/%d, %d:%d:%d:%d, %#x, %d, %#lx, %#lx, %p.\n", pUdateIn,
pUdateIn->st.wMonth, pUdateIn->st.wDay, pUdateIn->st.wYear, pUdateIn->st.wMonth, pUdateIn->st.wDay, pUdateIn->st.wYear,
pUdateIn->st.wHour, pUdateIn->st.wMinute, pUdateIn->st.wSecond, pUdateIn->st.wHour, pUdateIn->st.wMinute, pUdateIn->st.wSecond,
pUdateIn->st.wMilliseconds, pUdateIn->st.wDayOfWeek, pUdateIn->st.wMilliseconds, pUdateIn->st.wDayOfWeek,
...@@ -1338,7 +1338,7 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT ...@@ -1338,7 +1338,7 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT
if (lcid != MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)) if (lcid != MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT))
FIXME("lcid possibly not handled, treating as en-us\n"); FIXME("lcid possibly not handled, treating as en-us\n");
if (dwFlags & ~(VAR_TIMEVALUEONLY|VAR_DATEVALUEONLY)) if (dwFlags & ~(VAR_TIMEVALUEONLY|VAR_DATEVALUEONLY))
FIXME("unsupported flags: %x\n", dwFlags); FIXME("unsupported flags: %lx\n", dwFlags);
ud = *pUdateIn; ud = *pUdateIn;
...@@ -1416,7 +1416,7 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) ...@@ -1416,7 +1416,7 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate)
double datePart, timePart; double datePart, timePart;
int julianDays; int julianDays;
TRACE("(%g,0x%08x,%p)\n", dateIn, dwFlags, lpUdate); TRACE("%g, %#lx, %p.\n", dateIn, dwFlags, lpUdate);
if (dateIn <= (DATE_MIN - 1.0) || dateIn >= (DATE_MAX + 1.0)) if (dateIn <= (DATE_MIN - 1.0) || dateIn >= (DATE_MAX + 1.0))
return E_INVALIDARG; return E_INVALIDARG;
...@@ -1507,7 +1507,7 @@ typedef struct tagVARIANT_NUMBER_CHARS ...@@ -1507,7 +1507,7 @@ typedef struct tagVARIANT_NUMBER_CHARS
WARN("buffer too small for " #fld "\n"); \ WARN("buffer too small for " #fld "\n"); \
else \ else \
if (buff[0]) lpChars->name = buff[0]; \ if (buff[0]) lpChars->name = buff[0]; \
TRACE("lcid 0x%x, " #name "=%s\n", lcid, wine_dbgstr_wn(&lpChars->name, 1)) TRACE("lcid 0x%lx, " #name "=%s\n", lcid, wine_dbgstr_wn(&lpChars->name, 1))
/* Get the valid number characters for an lcid */ /* Get the valid number characters for an lcid */
static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags)
...@@ -1533,7 +1533,7 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID ...@@ -1533,7 +1533,7 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID
if (!*lpChars->sCurrency) if (!*lpChars->sCurrency)
wcscpy(lpChars->sCurrency, L"$"); wcscpy(lpChars->sCurrency, L"$");
lpChars->sCurrencyLen = wcslen(lpChars->sCurrency); lpChars->sCurrencyLen = wcslen(lpChars->sCurrency);
TRACE("lcid 0x%x, sCurrency=%u %s\n", lcid, lpChars->sCurrencyLen, wine_dbgstr_w(lpChars->sCurrency)); TRACE("lcid %#lx, sCurrency %lu %s\n", lcid, lpChars->sCurrencyLen, wine_dbgstr_w(lpChars->sCurrency));
} }
/* Number Parsing States */ /* Number Parsing States */
...@@ -1590,7 +1590,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla ...@@ -1590,7 +1590,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla
int cchUsed = 0; int cchUsed = 0;
OLECHAR cDigitSeparator2; OLECHAR cDigitSeparator2;
TRACE("(%s,%d,0x%08x,%p,%p)\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig); TRACE("%s, %#lx, %#lx, %p, %p.\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig);
if (!pNumprs || !rgbDig) if (!pNumprs || !rgbDig)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -2083,7 +2083,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, ...@@ -2083,7 +2083,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig,
int wholeNumberDigits, fractionalDigits, divisor10 = 0, multiplier10 = 0; int wholeNumberDigits, fractionalDigits, divisor10 = 0, multiplier10 = 0;
TRACE("(%p,%p,0x%x,%p)\n", pNumprs, rgbDig, dwVtBits, pVarDst); TRACE("%p, %p, %lx, %p.\n", pNumprs, rgbDig, dwVtBits, pVarDst);
if (pNumprs->nBaseShift) if (pNumprs->nBaseShift)
{ {
...@@ -2182,7 +2182,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, ...@@ -2182,7 +2182,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig,
return S_OK; return S_OK;
} }
TRACE("Overflow: possible return types: 0x%x, value: %s\n", dwVtBits, wine_dbgstr_longlong(ul64)); TRACE("Overflow: possible return types: %#lx, value: %s\n", dwVtBits, wine_dbgstr_longlong(ul64));
return DISP_E_OVERFLOW; return DISP_E_OVERFLOW;
} }
...@@ -2783,7 +2783,7 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags) ...@@ -2783,7 +2783,7 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags)
DWORD xmask; DWORD xmask;
HRESULT rc; HRESULT rc;
TRACE("(%s,%s,0x%08x,0x%08x)\n", debugstr_variant(left), debugstr_variant(right), lcid, flags); TRACE("%s, %s, %#lx, %#lx.\n", debugstr_variant(left), debugstr_variant(right), lcid, flags);
lvt = V_VT(left) & VT_TYPEMASK; lvt = V_VT(left) & VT_TYPEMASK;
rvt = V_VT(right) & VT_TYPEMASK; rvt = V_VT(right) & VT_TYPEMASK;
...@@ -3378,7 +3378,7 @@ end: ...@@ -3378,7 +3378,7 @@ end:
VariantClear(&tv); VariantClear(&tv);
VariantClear(&tempLeft); VariantClear(&tempLeft);
VariantClear(&tempRight); VariantClear(&tempRight);
TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); TRACE("returning %#lx, %s\n", hres, debugstr_variant(result));
return hres; return hres;
} }
...@@ -3567,7 +3567,7 @@ end: ...@@ -3567,7 +3567,7 @@ end:
VariantClear(&tv); VariantClear(&tv);
VariantClear(&tempLeft); VariantClear(&tempLeft);
VariantClear(&tempRight); VariantClear(&tempRight);
TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); TRACE("returning %#lx, %s\n", hres, debugstr_variant(result));
return hres; return hres;
} }
...@@ -3729,7 +3729,7 @@ end: ...@@ -3729,7 +3729,7 @@ end:
VariantClear(&rv); VariantClear(&rv);
VariantClear(&tempLeft); VariantClear(&tempLeft);
VariantClear(&tempRight); VariantClear(&tempRight);
TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); TRACE("returning %#lx, %s\n", hres, debugstr_variant(result));
return hres; return hres;
} }
...@@ -3992,7 +3992,7 @@ end: ...@@ -3992,7 +3992,7 @@ end:
VariantClear(&rv); VariantClear(&rv);
VariantClear(&tempLeft); VariantClear(&tempLeft);
VariantClear(&tempRight); VariantClear(&tempRight);
TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); TRACE("returning %#lx, %s\n", hres, debugstr_variant(result));
return hres; return hres;
} }
...@@ -5225,7 +5225,7 @@ VarRound_Exit: ...@@ -5225,7 +5225,7 @@ VarRound_Exit:
V_VT(pVarOut) = VT_EMPTY; V_VT(pVarOut) = VT_EMPTY;
VariantClear(&temp); VariantClear(&temp);
TRACE("returning 0x%08x %s\n", hRet, debugstr_variant(pVarOut)); TRACE("returning %#lx, %s\n", hRet, debugstr_variant(pVarOut));
return hRet; return hRet;
} }
...@@ -5585,14 +5585,14 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) ...@@ -5585,14 +5585,14 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result)
rc = VariantChangeType(&lv, left, 0, VT_I8); rc = VariantChangeType(&lv, left, 0, VT_I8);
if(FAILED(rc)) if(FAILED(rc))
{ {
FIXME("Could not convert left type %d to %d? rc == 0x%X\n", V_VT(left), VT_I8, rc); FIXME("Could not convert left type %d to %d? rc == %#lx.\n", V_VT(left), VT_I8, rc);
goto end; goto end;
} }
rc = VariantChangeType(&rv, right, 0, VT_I8); rc = VariantChangeType(&rv, right, 0, VT_I8);
if(FAILED(rc)) if(FAILED(rc))
{ {
FIXME("Could not convert right type %d to %d? rc == 0x%X\n", V_VT(right), VT_I8, rc); FIXME("Could not convert right type %d to %d? rc == %#lx.\n", V_VT(right), VT_I8, rc);
goto end; goto end;
} }
......
dlls/oleaut32/vartype.c
View file @ c0a131f9
...@@ -6723,7 +6723,7 @@ BOOL get_date_format(LCID lcid, DWORD flags, const SYSTEMTIME *st, ...@@ -6723,7 +6723,7 @@ BOOL get_date_format(LCID lcid, DWORD flags, const SYSTEMTIME *st,
}; };
if(flags & ~(LOCALE_NOUSEROVERRIDE|VAR_DATEVALUEONLY)) if(flags & ~(LOCALE_NOUSEROVERRIDE|VAR_DATEVALUEONLY))
FIXME("ignoring flags %x\n", flags); FIXME("ignoring flags %lx\n", flags);
flags &= LOCALE_NOUSEROVERRIDE; flags &= LOCALE_NOUSEROVERRIDE;
while(*fmt && date_len) { while(*fmt && date_len) {
...@@ -6814,7 +6814,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst ...@@ -6814,7 +6814,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst
DWORD dwFormatFlags = dwFlags & LOCALE_NOUSEROVERRIDE; DWORD dwFormatFlags = dwFlags & LOCALE_NOUSEROVERRIDE;
WCHAR date[128], fmt_buff[80], *time; WCHAR date[128], fmt_buff[80], *time;
TRACE("(%g,0x%08x,0x%08x,%p)\n", dateIn, lcid, dwFlags, pbstrOut); TRACE("%g, %#lx, %#lx, %p.\n", dateIn, lcid, dwFlags, pbstrOut);
if (!pbstrOut || !VariantTimeToSystemTime(dateIn, &st)) if (!pbstrOut || !VariantTimeToSystemTime(dateIn, &st))
return E_INVALIDARG; return E_INVALIDARG;
...@@ -6888,7 +6888,7 @@ HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BS ...@@ -6888,7 +6888,7 @@ HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BS
DWORD dwResId = IDS_TRUE; DWORD dwResId = IDS_TRUE;
LANGID langId; LANGID langId;
TRACE("%d,0x%08x,0x%08x,%p\n", boolIn, lcid, dwFlags, pbstrOut); TRACE("%d, %#lx, %#lx, %p.\n", boolIn, lcid, dwFlags, pbstrOut);
if (!pbstrOut) if (!pbstrOut)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -7193,7 +7193,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl ...@@ -7193,7 +7193,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl
HRESULT hres; HRESULT hres;
int ret; int ret;
TRACE("%s,%s,%d,%08x\n", TRACE("%s, %s, %#lx, %#lx.\n",
debugstr_wn(pbstrLeft, SysStringLen(pbstrLeft)), debugstr_wn(pbstrLeft, SysStringLen(pbstrLeft)),
debugstr_wn(pbstrRight, SysStringLen(pbstrRight)), lcid, dwFlags); debugstr_wn(pbstrRight, SysStringLen(pbstrRight)), lcid, dwFlags);
...@@ -7233,7 +7233,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl ...@@ -7233,7 +7233,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl
hres = CompareStringW(lcid, dwFlags, pbstrLeft, lenLeft, hres = CompareStringW(lcid, dwFlags, pbstrLeft, lenLeft,
pbstrRight, lenRight) - CSTR_LESS_THAN; pbstrRight, lenRight) - CSTR_LESS_THAN;
TRACE("%d\n", hres); TRACE("%ld\n", hres);
return hres; return hres;
} }
} }
...@@ -7448,7 +7448,7 @@ static inline HRESULT VARIANT_MakeDate(DATEPARSE *dp, DWORD iDate, ...@@ -7448,7 +7448,7 @@ static inline HRESULT VARIANT_MakeDate(DATEPARSE *dp, DWORD iDate,
else else
v3 = dp->dwValues[offset + 2]; v3 = dp->dwValues[offset + 2];
TRACE("(%d,%d,%d,%d,%d)\n", v1, v2, v3, iDate, offset); TRACE("%ld, %ld, %ld, %ld, %ld.\n", v1, v2, v3, iDate, offset);
/* If one number must be a month (Because a month name was given), then only /* If one number must be a month (Because a month name was given), then only
* consider orders with the month in that position. * consider orders with the month in that position.
...@@ -7476,7 +7476,7 @@ static inline HRESULT VARIANT_MakeDate(DATEPARSE *dp, DWORD iDate, ...@@ -7476,7 +7476,7 @@ static inline HRESULT VARIANT_MakeDate(DATEPARSE *dp, DWORD iDate,
} }
VARIANT_MakeDate_Start: VARIANT_MakeDate_Start:
TRACE("dwAllOrders is 0x%08x\n", dwAllOrders); TRACE("dwAllOrders is %#lx\n", dwAllOrders);
while (dwAllOrders) while (dwAllOrders)
{ {
...@@ -7508,7 +7508,7 @@ VARIANT_MakeDate_Start: ...@@ -7508,7 +7508,7 @@ VARIANT_MakeDate_Start:
dwTry = dwAllOrders; dwTry = dwAllOrders;
} }
TRACE("Attempt %d, dwTry is 0x%08x\n", dwCount, dwTry); TRACE("Attempt %ld, dwTry is %#lx\n", dwCount, dwTry);
dwCount++; dwCount++;
if (!dwTry) if (!dwTry)
...@@ -7604,7 +7604,7 @@ VARIANT_MakeDate_OK: ...@@ -7604,7 +7604,7 @@ VARIANT_MakeDate_OK:
* But Wine doesn't have/use that key at the time of writing. * But Wine doesn't have/use that key at the time of writing.
*/ */
st->wYear = v3 <= 49 ? 2000 + v3 : v3 <= 99 ? 1900 + v3 : v3; st->wYear = v3 <= 49 ? 2000 + v3 : v3 <= 99 ? 1900 + v3 : v3;
TRACE("Returning date %d/%d/%d\n", v1, v2, st->wYear); TRACE("Returning date %ld/%ld/%d\n", v1, v2, st->wYear);
return S_OK; return S_OK;
} }
...@@ -7673,13 +7673,13 @@ HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DA ...@@ -7673,13 +7673,13 @@ HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DA
*pdateOut = 0.0; *pdateOut = 0.0;
TRACE("(%s,0x%08x,0x%08x,%p)\n", debugstr_w(strIn), lcid, dwFlags, pdateOut); TRACE("%s, %#lx, %#lx, %p.\n", debugstr_w(strIn), lcid, dwFlags, pdateOut);
memset(&dp, 0, sizeof(dp)); memset(&dp, 0, sizeof(dp));
GetLocaleInfoW(lcid, LOCALE_IDATE|LOCALE_RETURN_NUMBER|(dwFlags & LOCALE_NOUSEROVERRIDE), GetLocaleInfoW(lcid, LOCALE_IDATE|LOCALE_RETURN_NUMBER|(dwFlags & LOCALE_NOUSEROVERRIDE),
(LPWSTR)&iDate, sizeof(iDate)/sizeof(WCHAR)); (LPWSTR)&iDate, sizeof(iDate)/sizeof(WCHAR));
TRACE("iDate is %d\n", iDate); TRACE("iDate is %ld\n", iDate);
/* Get the month/day/am/pm tokens for this locale */ /* Get the month/day/am/pm tokens for this locale */
for (i = 0; i < ARRAY_SIZE(tokens); i++) for (i = 0; i < ARRAY_SIZE(tokens); i++)
...@@ -7831,7 +7831,7 @@ HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DA ...@@ -7831,7 +7831,7 @@ HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DA
* magic here occurs in VARIANT_MakeDate() above, where we determine what * magic here occurs in VARIANT_MakeDate() above, where we determine what
* each date number must represent in the context of iDate. * each date number must represent in the context of iDate.
*/ */
TRACE("0x%08x\n", TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4)); TRACE("%#lx\n", TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4));
switch (TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4)) switch (TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4))
{ {
......
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