[PATCH 01/27] dlls/dpvoice: enable compilation with long types
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dpvoice/Makefile.in | 1 - dlls/dpvoice/client.c | 28 ++++++++++++++-------------- dlls/dpvoice/server.c | 18 +++++++++--------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in index a3d85b093c6..7767d141fa8 100644 --- a/dlls/dpvoice/Makefile.in +++ b/dlls/dpvoice/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dpvoice.dll IMPORTS = dxguid uuid diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index b611370659e..b84f27b0a22 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -74,7 +74,7 @@ static ULONG WINAPI dpvclient_AddRef(IDirectPlayVoiceClient *iface) IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -84,7 +84,7 @@ static ULONG WINAPI dpvclient_Release(IDirectPlayVoiceClient *iface) IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -97,7 +97,7 @@ static HRESULT WINAPI dpvclient_Initialize(IDirectPlayVoiceClient *iface,LPUNKNO void *pUserContext, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %p %p %d\n", This, pVoid, pMessageHandler, pUserContext,pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %p %p %p %ld\n", This, pVoid, pMessageHandler, pUserContext,pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } @@ -105,14 +105,14 @@ static HRESULT WINAPI dpvclient_Connect(IDirectPlayVoiceClient *iface, PDVSOUNDD PDVCLIENTCONFIG pdvClientConfig, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %d\n", This, pSoundDeviceConfig, pdvClientConfig, dwFlags); + FIXME("%p %p %p %ld\n", This, pSoundDeviceConfig, pdvClientConfig, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_Disconnect(IDirectPlayVoiceClient *iface, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d\n", This, dwFlags); + FIXME("%p %ld\n", This, dwFlags); return E_NOTIMPL; } @@ -148,7 +148,7 @@ static HRESULT WINAPI dpvclient_GetCompressionTypes(IDirectPlayVoiceClient *ifac DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + FIXME("%p %p %p %p %ld semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } @@ -156,7 +156,7 @@ static HRESULT WINAPI dpvclient_SetTransmitTargets(IDirectPlayVoiceClient *iface DWORD dwNumTargets, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d %d\n", This, pdvIDTargets, dwNumTargets, dwFlags); + FIXME("%p %p %ld %ld\n", This, pdvIDTargets, dwNumTargets, dwFlags); return E_NOTIMPL; } @@ -164,7 +164,7 @@ static HRESULT WINAPI dpvclient_GetTransmitTargets(IDirectPlayVoiceClient *iface DWORD *pdwNumTargets, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d\n", This, pdwNumTargets, dwFlags); + FIXME("%p %p %ld\n", This, pdwNumTargets, dwFlags); return E_NOTIMPL; } @@ -173,21 +173,21 @@ static HRESULT WINAPI dpvclient_Create3DSoundBuffer(IDirectPlayVoiceClient *ifac LPDIRECTSOUND3DBUFFER *lpUserBuffer) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d %p %d %d %p\n", This, dvID, lpdsSourceBuffer, dwPriority, dwFlags, lpUserBuffer); + FIXME("%p %ld %p %ld %ld %p\n", This, dvID, lpdsSourceBuffer, dwPriority, dwFlags, lpUserBuffer); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_Delete3DSoundBuffer(IDirectPlayVoiceClient *iface, DVID dvID, LPDIRECTSOUND3DBUFFER *lpUserBuffer) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d %p\n", This, dvID, lpUserBuffer); + FIXME("%p %ld %p\n", This, dvID, lpUserBuffer); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_SetNotifyMask(IDirectPlayVoiceClient *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d\n", This, pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %ld\n", This, pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } @@ -261,7 +261,7 @@ static ULONG WINAPI dpvtest_AddRef(IDirectPlayVoiceTest *iface) IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -271,7 +271,7 @@ static ULONG WINAPI dpvtest_Release(IDirectPlayVoiceTest *iface) IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -284,7 +284,7 @@ static HRESULT WINAPI dpvtest_CheckAudioSetup(IDirectPlayVoiceTest *iface, const HWND hwndParent, DWORD dwFlags) { IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); - FIXME("%p %s %s %p %d\n", This, debugstr_guid(pguidPlaybackDevice), + FIXME("%p %s %s %p %ld\n", This, debugstr_guid(pguidPlaybackDevice), debugstr_guid(pguidCaptureDevice), hwndParent, dwFlags); return E_NOTIMPL; } diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c index a476a2e585d..42fea27a192 100644 --- a/dlls/dpvoice/server.c +++ b/dlls/dpvoice/server.c @@ -100,7 +100,7 @@ static ULONG WINAPI dpvserver_AddRef(IDirectPlayVoiceServer *iface) IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -110,7 +110,7 @@ static ULONG WINAPI dpvserver_Release(IDirectPlayVoiceServer *iface) IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -123,21 +123,21 @@ static HRESULT WINAPI dpvserver_Initialize(IDirectPlayVoiceServer *iface, IUnkno void *pUserContext, DWORD *lpdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %p %p %p %d\n", This, lpVoid, pMessageHandler, pUserContext,lpdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %p %p %p %ld\n", This, lpVoid, pMessageHandler, pUserContext,lpdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_StartSession(IDirectPlayVoiceServer *iface, PDVSESSIONDESC pSessionDesc, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %d\n", This, pSessionDesc, dwFlags); + FIXME("%p %p %ld\n", This, pSessionDesc, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_StopSession(IDirectPlayVoiceServer *iface, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d\n", This, dwFlags); + FIXME("%p %ld\n", This, dwFlags); return E_NOTIMPL; } @@ -166,7 +166,7 @@ static HRESULT WINAPI dpvserver_GetCompressionTypes(IDirectPlayVoiceServer *ifac DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + FIXME("%p %p %p %p %ld semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } @@ -174,7 +174,7 @@ static HRESULT WINAPI dpvserver_SetTransmitTargets(IDirectPlayVoiceServer *iface DWORD dwNumTargets, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d %p %d %d\n", This, dvSource, pdvIDTargets, dwNumTargets, dwFlags); + FIXME("%p %ld %p %ld %ld\n", This, dvSource, pdvIDTargets, dwNumTargets, dwFlags); return E_NOTIMPL; } @@ -182,14 +182,14 @@ static HRESULT WINAPI dpvserver_GetTransmitTargets(IDirectPlayVoiceServer *iface DWORD *pdwNumTargets, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d %p %p %d\n", This, dvSource, pdvIDTargets, pdwNumTargets, dwFlags); + FIXME("%p %ld %p %p %ld\n", This, dvSource, pdvIDTargets, pdwNumTargets, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_SetNotifyMask(IDirectPlayVoiceServer *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %d\n", This, pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %ld\n", This, pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dpwsockx/Makefile.in | 1 - dlls/dpwsockx/dpwsockx_main.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in index 0a478358e74..18b5581a696 100644 --- a/dlls/dpwsockx/Makefile.in +++ b/dlls/dpwsockx/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dpwsockx.dll IMPORTS = dxguid ws2_32 diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c index 2c73c17be21..06ef63674f8 100644 --- a/dlls/dpwsockx/dpwsockx_main.c +++ b/dlls/dpwsockx/dpwsockx_main.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data ) { - FIXME( "(%p,%d,%p,%u) stub\n", + FIXME( "(%p,%ld,%p,%u) stub\n", data->lpMessage, data->dwMessageSize, data->lpISP, data->bReturnStatus ); return DPERR_UNSUPPORTED; @@ -40,7 +40,7 @@ static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data ) static HRESULT WINAPI DPWSCB_Reply( LPDPSP_REPLYDATA data ) { - FIXME( "(%p,%p,%d,%d,%p) stub\n", + FIXME( "(%p,%p,%ld,%ld,%p) stub\n", data->lpSPMessageHeader, data->lpMessage, data->dwMessageSize, data->idNameServer, data->lpISP ); return DPERR_UNSUPPORTED; @@ -48,7 +48,7 @@ static HRESULT WINAPI DPWSCB_Reply( LPDPSP_REPLYDATA data ) static HRESULT WINAPI DPWSCB_Send( LPDPSP_SENDDATA data ) { - FIXME( "(0x%08x,%d,%d,%p,%d,%u,%p) stub\n", + FIXME( "(0x%08lx,%ld,%ld,%p,%ld,%u,%p) stub\n", data->dwFlags, data->idPlayerTo, data->idPlayerFrom, data->lpMessage, data->dwMessageSize, data->bSystemMessage, data->lpISP ); @@ -57,7 +57,7 @@ static HRESULT WINAPI DPWSCB_Send( LPDPSP_SENDDATA data ) static HRESULT WINAPI DPWSCB_CreatePlayer( LPDPSP_CREATEPLAYERDATA data ) { - FIXME( "(%d,0x%08x,%p,%p) stub\n", + FIXME( "(%ld,0x%08lx,%p,%p) stub\n", data->idPlayer, data->dwFlags, data->lpSPMessageHeader, data->lpISP ); return DPERR_UNSUPPORTED; @@ -65,14 +65,14 @@ static HRESULT WINAPI DPWSCB_CreatePlayer( LPDPSP_CREATEPLAYERDATA data ) static HRESULT WINAPI DPWSCB_DeletePlayer( LPDPSP_DELETEPLAYERDATA data ) { - FIXME( "(%d,0x%08x,%p) stub\n", + FIXME( "(%ld,0x%08lx,%p) stub\n", data->idPlayer, data->dwFlags, data->lpISP ); return DPERR_UNSUPPORTED; } static HRESULT WINAPI DPWSCB_GetAddress( LPDPSP_GETADDRESSDATA data ) { - FIXME( "(%d,0x%08x,%p,%p,%p) stub\n", + FIXME( "(%ld,0x%08lx,%p,%p,%p) stub\n", data->idPlayer, data->dwFlags, data->lpAddress, data->lpdwAddressSize, data->lpISP ); return DPERR_UNSUPPORTED; @@ -80,7 +80,7 @@ static HRESULT WINAPI DPWSCB_GetAddress( LPDPSP_GETADDRESSDATA data ) static HRESULT WINAPI DPWSCB_GetCaps( LPDPSP_GETCAPSDATA data ) { - TRACE( "(%d,%p,0x%08x,%p)\n", + TRACE( "(%ld,%p,0x%08lx,%p)\n", data->idPlayer, data->lpCaps, data->dwFlags, data->lpISP ); data->lpCaps->dwFlags = ( DPCAPS_ASYNCSUPPORTED | @@ -110,7 +110,7 @@ static HRESULT WINAPI DPWSCB_GetCaps( LPDPSP_GETCAPSDATA data ) static HRESULT WINAPI DPWSCB_Open( LPDPSP_OPENDATA data ) { - FIXME( "(%u,%p,%p,%u,0x%08x,0x%08x) stub\n", + FIXME( "(%u,%p,%p,%u,0x%08lx,0x%08lx) stub\n", data->bCreate, data->lpSPMessageHeader, data->lpISP, data->bReturnStatus, data->dwOpenFlags, data->dwSessionFlags ); return DPERR_UNSUPPORTED; @@ -137,7 +137,7 @@ static HRESULT WINAPI DPWSCB_GetAddressChoices( LPDPSP_GETADDRESSCHOICESDATA dat static HRESULT WINAPI DPWSCB_SendEx( LPDPSP_SENDEXDATA data ) { - FIXME( "(%p,0x%08x,%d,%d,%p,%d,%d,%d,%d,%p,%p,%u) stub\n", + FIXME( "(%p,0x%08lx,%ld,%ld,%p,%ld,%ld,%ld,%ld,%p,%p,%u) stub\n", data->lpISP, data->dwFlags, data->idPlayerTo, data->idPlayerFrom, data->lpSendBuffers, data->cBuffers, data->dwMessageSize, data->dwPriority, data->dwTimeout, data->lpDPContext, @@ -147,7 +147,7 @@ static HRESULT WINAPI DPWSCB_SendEx( LPDPSP_SENDEXDATA data ) static HRESULT WINAPI DPWSCB_SendToGroupEx( LPDPSP_SENDTOGROUPEXDATA data ) { - FIXME( "(%p,0x%08x,%d,%d,%p,%d,%d,%d,%d,%p,%p) stub\n", + FIXME( "(%p,0x%08lx,%ld,%ld,%p,%ld,%ld,%ld,%ld,%p,%p) stub\n", data->lpISP, data->dwFlags, data->idGroupTo, data->idPlayerFrom, data->lpSendBuffers, data->cBuffers, data->dwMessageSize, data->dwPriority, data->dwTimeout, data->lpDPContext, @@ -157,7 +157,7 @@ static HRESULT WINAPI DPWSCB_SendToGroupEx( LPDPSP_SENDTOGROUPEXDATA data ) static HRESULT WINAPI DPWSCB_Cancel( LPDPSP_CANCELDATA data ) { - FIXME( "(%p,0x%08x,%p,%d,0x%08x,0x%08x) stub\n", + FIXME( "(%p,0x%08lx,%p,%ld,0x%08lx,0x%08lx) stub\n", data->lpISP, data->dwFlags, data->lprglpvSPMsgID, data->cSPMsgID, data->dwMinPriority, data->dwMaxPriority ); return DPERR_UNSUPPORTED; @@ -165,7 +165,7 @@ static HRESULT WINAPI DPWSCB_Cancel( LPDPSP_CANCELDATA data ) static HRESULT WINAPI DPWSCB_GetMessageQueue( LPDPSP_GETMESSAGEQUEUEDATA data ) { - FIXME( "(%p,0x%08x,%d,%d,%p,%p) stub\n", + FIXME( "(%p,0x%08lx,%ld,%ld,%p,%p) stub\n", data->lpISP, data->dwFlags, data->idFrom, data->idTo, data->lpdwNumMsgs, data->lpdwNumBytes ); return DPERR_UNSUPPORTED;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dsdmo/Makefile.in | 1 - dlls/dsdmo/main.c | 44 ++++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index 38bd6a7ad0f..a3dd1ad11e9 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsdmo.dll IMPORTS = dmoguids strmiids uuid diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index fa39c28abd7..fe7cf1115a7 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -81,7 +81,7 @@ static ULONG WINAPI effect_inner_AddRef(IUnknown *iface) struct effect *effect = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&effect->refcount); - TRACE("%p increasing refcount to %u.\n", effect, refcount); + TRACE("%p increasing refcount to %lu.\n", effect, refcount); return refcount; } @@ -90,7 +90,7 @@ static ULONG WINAPI effect_inner_Release(IUnknown *iface) struct effect *effect = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&effect->refcount); - TRACE("%p decreasing refcount to %u.\n", effect, refcount); + TRACE("%p decreasing refcount to %lu.\n", effect, refcount); if (!refcount) { @@ -139,25 +139,25 @@ static HRESULT WINAPI effect_GetStreamCount(IMediaObject *iface, DWORD *input, D static HRESULT WINAPI effect_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p, stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p, stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI effect_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + FIXME("iface %p, index %lu, type_index %lu, type %p, stub!\n", iface, index, type_index, type); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + FIXME("iface %p, index %lu, type_index %lu, type %p, stub!\n", iface, index, type_index, type); return E_NOTIMPL; } @@ -166,7 +166,7 @@ static HRESULT WINAPI effect_SetInputType(IMediaObject *iface, DWORD index, cons struct effect *effect = impl_from_IMediaObject(iface); const WAVEFORMATEX *format; - TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + TRACE("iface %p, index %lu, type %p, flags %#lx.\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) { @@ -227,7 +227,7 @@ static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, con struct effect *effect = impl_from_IMediaObject(iface); HRESULT hr; - TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + TRACE("iface %p, index %lu, type %p, flags %#lx.\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) return S_OK; @@ -251,38 +251,38 @@ static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, con static HRESULT WINAPI effect_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + FIXME("iface %p, index %lu, type %p, stub!\n", iface, index, type); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + FIXME("iface %p, index %lu, type %p, stub!\n", iface, index, type); return E_NOTIMPL; } static HRESULT WINAPI effect_GetInputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *lookahead, DWORD *alignment) { - FIXME("iface %p, index %u, size %p, lookahead %p, alignment %p, stub!\n", iface, index, size, lookahead, alignment); + FIXME("iface %p, index %lu, size %p, lookahead %p, alignment %p, stub!\n", iface, index, size, lookahead, alignment); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment) { - FIXME("iface %p, index %u, size %p, alignment %p, stub!\n", iface, index, size, alignment); + FIXME("iface %p, index %lu, size %p, alignment %p, stub!\n", iface, index, size, alignment); return E_NOTIMPL; } static HRESULT WINAPI effect_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) { - FIXME("iface %p, index %u, latency %p, stub!\n", iface, index, latency); + FIXME("iface %p, index %lu, latency %p, stub!\n", iface, index, latency); return E_NOTIMPL; } static HRESULT WINAPI effect_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency) { - FIXME("iface %p, index %u, latency %s, stub!\n", iface, index, wine_dbgstr_longlong(latency)); + FIXME("iface %p, index %lu, latency %s, stub!\n", iface, index, wine_dbgstr_longlong(latency)); return E_NOTIMPL; } @@ -294,7 +294,7 @@ static HRESULT WINAPI effect_Flush(IMediaObject *iface) static HRESULT WINAPI effect_Discontinuity(IMediaObject *iface, DWORD index) { - FIXME("iface %p, index %u, stub!\n", iface, index); + FIXME("iface %p, index %lu, stub!\n", iface, index); return E_NOTIMPL; } @@ -312,14 +312,14 @@ static HRESULT WINAPI effect_FreeStreamingResources(IMediaObject *iface) static HRESULT WINAPI effect_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p, stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI effect_ProcessInput(IMediaObject *iface, DWORD index, IMediaBuffer *buffer, DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME timelength) { - FIXME("iface %p, index %u, buffer %p, flags %#x, timestamp %s, timelength %s, stub!\n", + FIXME("iface %p, index %lu, buffer %p, flags %#lx, timestamp %s, timelength %s, stub!\n", iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); return E_NOTIMPL; } @@ -327,13 +327,13 @@ static HRESULT WINAPI effect_ProcessInput(IMediaObject *iface, DWORD index, static HRESULT WINAPI effect_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { - FIXME("iface %p, flags %#x, count %u, buffers %p, status %p, stub!\n", iface, flags, count, buffers, status); + FIXME("iface %p, flags %#lx, count %lu, buffers %p, status %p, stub!\n", iface, flags, count, buffers, status); return E_NOTIMPL; } static HRESULT WINAPI effect_Lock(IMediaObject *iface, LONG lock) { - FIXME("iface %p, lock %d, stub!\n", iface, lock); + FIXME("iface %p, lock %ld, stub!\n", iface, lock); return E_NOTIMPL; } @@ -391,7 +391,7 @@ static ULONG WINAPI effect_inplace_Release(IMediaObjectInPlace *iface) static HRESULT WINAPI effect_inplace_Process(IMediaObjectInPlace *iface, ULONG size, BYTE *data, REFERENCE_TIME start, DWORD flags) { - FIXME("iface %p, size %u, data %p, start %s, flags %#x, stub!\n", + FIXME("iface %p, size %lu, data %p, start %s, flags %#lx, stub!\n", iface, size, data, wine_dbgstr_longlong(start), flags); return E_NOTIMPL; } @@ -599,7 +599,7 @@ static HRESULT WINAPI reverb_params_SetPreset(IDirectSoundFXI3DL2Reverb *iface, { struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); - FIXME("effect %p, preset %u, stub!\n", effect, preset); + FIXME("effect %p, preset %lu, stub!\n", effect, preset); return E_NOTIMPL; } @@ -617,7 +617,7 @@ static HRESULT WINAPI reverb_params_SetQuality(IDirectSoundFXI3DL2Reverb *iface, { struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); - FIXME("effect %p, quality %u, stub!\n", effect, quality); + FIXME("effect %p, quality %lu, stub!\n", effect, quality); return E_NOTIMPL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dsound/Makefile.in | 1 - dlls/dsound/buffer.c | 86 ++++++++++++++++++++++--------------------- dlls/dsound/capture.c | 80 ++++++++++++++++++++-------------------- dlls/dsound/dsound.c | 34 +++++++++-------- dlls/dsound/dsound_main.c | 24 ++++++------ dlls/dsound/duplex.c | 12 +++--- dlls/dsound/mixer.c | 52 +++++++++++++------------- dlls/dsound/primary.c | 90 +++++++++++++++++++++++---------------------- dlls/dsound/propset.c | 30 ++++++++------- dlls/dsound/sound3d.c | 62 ++++++++++++++++--------------- 10 files changed, 235 insertions(+), 236 deletions(-) diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in index b06d3b673c8..6cb653fdfa0 100644 --- a/dlls/dsound/Makefile.in +++ b/dlls/dsound/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsound.dll IMPORTLIB = dsound IMPORTS = dxguid uuid winmm ole32 advapi32 user32 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 9084ccd9928..eb87479b7df 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -59,7 +59,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -72,7 +72,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -119,7 +119,7 @@ static void commit_next_chunk(IDirectSoundBufferImpl *dsb) dsb->use_committed = TRUE; dsb->committed_mixpos = 0; - TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); + TRACE("committing %lu bytes from offset %lu\n", dsb->writelead, dsb->sec_mixpos); } static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSoundNotify *iface, @@ -127,7 +127,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSou { IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); - TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify); + TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify); if (howmuch > 0 && notify == NULL) { WARN("invalid parameter: notify == NULL\n"); @@ -137,7 +137,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSou if (TRACE_ON(dsound)) { unsigned int i; for (i=0;i<howmuch;i++) - TRACE("notify at %d to %p\n", + TRACE("notify at %ld to %p\n", notify[i].dwOffset,notify[i].hEventNotify); } @@ -208,15 +208,15 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume(IDirectSoundBuffer8 *ifac HRESULT hres = DS_OK; - TRACE("(%p,%d)\n",This,vol); + TRACE("(%p,%ld)\n",This,vol); if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { - WARN("control unavailable: This->dsbd.dwFlags = 0x%08x\n", This->dsbd.dwFlags); + WARN("control unavailable: This->dsbd.dwFlags = 0x%08lx\n", This->dsbd.dwFlags); return DSERR_CONTROLUNAVAIL; } if ((vol > DSBVOLUME_MAX) || (vol < DSBVOLUME_MIN)) { - WARN("invalid parameter: vol = %d\n", vol); + WARN("invalid parameter: vol = %ld\n", vol); return DSERR_INVALIDPARAM; } @@ -267,7 +267,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i DWORD oldFreq; void *newcommitted; - TRACE("(%p,%d)\n",This,freq); + TRACE("(%p,%ld)\n",This,freq); if (is_primary_buffer(This)) { WARN("not available for primary buffers.\n"); @@ -283,7 +283,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i freq = This->pwfx->nSamplesPerSec; if ((freq < DSBFREQUENCY_MIN) || (freq > DSBFREQUENCY_MAX)) { - WARN("invalid parameter: freq = %d\n", freq); + WARN("invalid parameter: freq = %ld\n", freq); return DSERR_INVALIDPARAM; } @@ -317,7 +317,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(IDirectSoundBuffer8 *iface, DW HRESULT hres = DS_OK; int i; - TRACE("(%p,%08x,%08x,%08x)\n",This,reserved1,reserved2,flags); + TRACE("(%p,%08lx,%08lx,%08lx)\n",This,reserved1,reserved2,flags); AcquireSRWLockExclusive(&This->lock); @@ -363,7 +363,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_AddRef(IDirectSoundBuffer8 *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -380,7 +380,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) ref = capped_refcount_dec(&This->ref); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); return ref; } @@ -388,7 +388,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); return ref; } @@ -407,7 +407,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition(IDirectSoundBuff /* sanity */ if (pos >= This->buflen){ - FIXME("Bad play position. playpos: %d, buflen: %d\n", pos, This->buflen); + FIXME("Bad play position. playpos: %ld, buflen: %ld\n", pos, This->buflen); pos %= This->buflen; } @@ -424,7 +424,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition(IDirectSoundBuff ReleaseSRWLockShared(&This->lock); - TRACE("playpos = %d, writepos = %d, buflen=%d (%p, time=%d)\n", + TRACE("playpos = %ld, writepos = %ld, buflen=%ld (%p, time=%ld)\n", playpos?*playpos:-1, writepos?*writepos:-1, This->buflen, This, GetTickCount()); return DS_OK; @@ -452,7 +452,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus(IDirectSoundBuffer8 *ifac *status |= DSBSTATUS_LOCSOFTWARE; ReleaseSRWLockShared(&This->lock); - TRACE("status=%x\n", *status); + TRACE("status=%lx\n", *status); return DS_OK; } @@ -463,7 +463,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFormat(IDirectSoundBuffer8 *ifac IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DWORD size; - TRACE("(%p,%p,%d,%p)\n",This,lpwf,wfsize,wfwritten); + TRACE("(%p,%p,%ld,%p)\n",This,lpwf,wfsize,wfwritten); size = sizeof(WAVEFORMATEX) + This->pwfx->cbSize; @@ -498,7 +498,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); HRESULT hres = DS_OK; - TRACE("(%p,%d,%d,%p,%p,%p,%p,0x%08x) at %d\n", This, writecursor, writebytes, lplpaudioptr1, + TRACE("(%p,%ld,%ld,%p,%p,%p,%p,0x%08lx) at %ld\n", This, writecursor, writebytes, lplpaudioptr1, audiobytes1, lplpaudioptr2, audiobytes2, flags, GetTickCount()); if (!audiobytes1) @@ -519,13 +519,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW writebytes = This->buflen; if (writecursor >= This->buflen) { - WARN("Invalid parameter, writecursor: %u >= buflen: %u\n", + WARN("Invalid parameter, writecursor: %lu >= buflen: %lu\n", writecursor, This->buflen); return DSERR_INVALIDPARAM; } if (writebytes > This->buflen) { - WARN("Invalid parameter, writebytes: %u > buflen: %u\n", + WARN("Invalid parameter, writebytes: %lu > buflen: %lu\n", writebytes, This->buflen); return DSERR_INVALIDPARAM; } @@ -543,9 +543,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW *(LPBYTE*)lplpaudioptr2 = NULL; if (audiobytes2) *audiobytes2 = 0; - TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", + TRACE("Locked %p(%li bytes) and %p(%li bytes) writecursor=%ld\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); - TRACE("->%d.0\n",writebytes); + TRACE("->%ld.0\n",writebytes); This->buffer->lockedbytes += writebytes; } else { DWORD remainder = writebytes + writecursor - This->buflen; @@ -566,7 +566,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW WARN("Overwriting mixing position, case 3\n"); commit_next_chunk(This); } - TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); + TRACE("Locked %p(%li bytes) and %p(%li bytes) writecursor=%ld\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); } ReleaseSRWLockShared(&This->lock); @@ -580,7 +580,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(IDirectSoundBuff IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); HRESULT hres = DS_OK; - TRACE("(%p,%d)\n",This,newpos); + TRACE("(%p,%ld)\n",This,newpos); AcquireSRWLockExclusive(&This->lock); @@ -605,10 +605,10 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetPan(IDirectSoundBuffer8 *iface, IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); HRESULT hres = DS_OK; - TRACE("(%p,%d)\n",This,pan); + TRACE("(%p,%ld)\n",This,pan); if ((pan > DSBPAN_RIGHT) || (pan < DSBPAN_LEFT)) { - WARN("invalid parameter: pan = %d\n", pan); + WARN("invalid parameter: pan = %ld\n", pan); return DSERR_INVALIDPARAM; } @@ -656,7 +656,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface), *iter; HRESULT hres = DS_OK; - TRACE("(%p,%p,%d,%p,%d)\n", This,p1,x1,p2,x2); + TRACE("(%p,%p,%ld,%p,%ld)\n", This,p1,x1,p2,x2); if (!p2) x2 = 0; @@ -714,7 +714,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFrequency(IDirectSoundBuffer8 *i } *freq = This->freq; - TRACE("-> %d\n", *freq); + TRACE("-> %ld\n", *freq); return DS_OK; } @@ -746,7 +746,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFX(IDirectSoundBuffer8 *iface, D DMO_MEDIA_TYPE dmt; WAVEFORMATEX wfx; - TRACE("(%p,%u,%p,%p)\n", This, dwEffectsCount, pDSFXDesc, pdwResultCodes); + TRACE("(%p,%lu,%p,%p)\n", This, dwEffectsCount, pDSFXDesc, pdwResultCodes); if (pdwResultCodes) for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; @@ -808,7 +808,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFX(IDirectSoundBuffer8 *iface, D dmt.pbFormat = (BYTE*)&wfx; for (u = 0; u < dwEffectsCount; u++) { - TRACE("%d: 0x%08x, %s\n", u, pDSFXDesc[u].dwFlags, dump_DSFX_guid(&pDSFXDesc[u])); + TRACE("%ld: 0x%08lx, %s\n", u, pDSFXDesc[u].dwFlags, dump_DSFX_guid(&pDSFXDesc[u])); hr2 = CoCreateInstance(&pDSFXDesc[u].guidDSFXClass, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (LPVOID*)&filters[u].obj); @@ -874,7 +874,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources(IDirectSoundBuffer IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DWORD u; - FIXME("(%p,%08u,%u,%p): stub, faking success\n",This,dwFlags,dwEffectsCount,pdwResultCodes); + FIXME("(%p,%08lu,%lu,%p): stub, faking success\n",This,dwFlags,dwEffectsCount,pdwResultCodes); if (pdwResultCodes) for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; @@ -889,7 +889,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(IDirectSoundBuffer8 IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DWORD i, count = 0; - TRACE("(%p,%s,%u,%s,%p)\n", This, debugstr_guid(clsid), index, debugstr_guid(iid), out); + TRACE("(%p,%s,%lu,%s,%p)\n", This, debugstr_guid(clsid), index, debugstr_guid(iid), out); if (!out) return E_INVALIDARG; @@ -926,7 +926,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCaps(IDirectSoundBuffer8 *iface, } if (caps->dwSize < sizeof(*caps)) { - WARN("invalid parameter: caps->dwSize = %d\n",caps->dwSize); + WARN("invalid parameter: caps->dwSize = %ld\n",caps->dwSize); return DSERR_INVALIDPARAM; } @@ -1041,7 +1041,7 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds TRACE("(%p,%p,%p)\n", device, dsbd, buffer); if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) { - WARN("invalid parameter: dsbd->dwBufferBytes = %d\n", dsbd->dwBufferBytes); + WARN("invalid parameter: dsbd->dwBufferBytes = %ld\n", dsbd->dwBufferBytes); return DSERR_INVALIDPARAM; /* FIXME: which error? */ } @@ -1089,7 +1089,7 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds if (wfex->wBitsPerSample==16) capf |= DSCAPS_SECONDARY16BIT; else capf |= DSCAPS_SECONDARY8BIT; - TRACE("capf = 0x%08x, device->drvcaps.dwFlags = 0x%08x\n", capf, device->drvcaps.dwFlags); + TRACE("capf = 0x%08lx, device->drvcaps.dwFlags = 0x%08lx\n", capf, device->drvcaps.dwFlags); /* Allocate an empty buffer */ bufsize = (sizeof(*(dsb->buffer)) + sizeof(void *) - 1) & ~(sizeof(void *) - 1); @@ -1167,7 +1167,7 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) ULONG ref = InterlockedIncrement(&This->numIfaces); if (ref > 1) - WARN("Destroying buffer with %u in use interfaces\n", ref - 1); + WARN("Destroying buffer with %lu in use interfaces\n", ref - 1); if (This->dsbd.dwFlags & DSBCAPS_LOCHARDWARE) This->device->drvcaps.dwFreeHwMixingAllBuffers++; @@ -1307,7 +1307,7 @@ static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&This->refiks); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -1324,7 +1324,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) ref = capped_refcount_dec(&This->refiks); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); return ref; } @@ -1332,7 +1332,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); return ref; } @@ -1343,7 +1343,7 @@ static HRESULT WINAPI IKsPropertySetImpl_Get(IKsPropertySet *iface, REFGUID guid { IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface); - TRACE("(iface=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("(iface=%p,guidPropSet=%s,dwPropID=%ld,pInstanceData=%p,cbInstanceData=%ld,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n", This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned); return E_PROP_ID_UNSUPPORTED; @@ -1355,7 +1355,7 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid { IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface); - TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData); + TRACE("(%p,%s,%ld,%p,%ld,%p,%ld)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData); return E_PROP_ID_UNSUPPORTED; } @@ -1365,7 +1365,7 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF { IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface); - TRACE("(%p,%s,%d,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport); + TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport); return E_PROP_ID_UNSUPPORTED; } diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 2fb3ce8c4a6..a00748d95bf 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -136,7 +136,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -149,7 +149,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -161,7 +161,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSou DWORD howmuch, const DSBPOSITIONNOTIFY *notify) { IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); - TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify); + TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify); if (howmuch > 0 && notify == NULL) { WARN("invalid parameter: notify == NULL\n"); @@ -171,7 +171,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSou if (TRACE_ON(dsound)) { unsigned int i; for (i=0;i<howmuch;i++) - TRACE("notify at %d to %p\n", + TRACE("notify at %ld to %p\n", notify[i].dwOffset,notify[i].hEventNotify); } @@ -262,7 +262,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_AddRef(IDirectSoundCaptureBuff IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -275,7 +275,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_Release(IDirectSoundCaptureBuf IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -295,7 +295,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetCaps(IDirectSoundCaptureB } if (lpDSCBCaps->dwSize < sizeof(DSCBCAPS)) { - WARN("invalid parameter: lpDSCBCaps->dwSize = %d\n", lpDSCBCaps->dwSize); + WARN("invalid parameter: lpDSCBCaps->dwSize = %ld\n", lpDSCBCaps->dwSize); return DSERR_INVALIDPARAM; } @@ -341,7 +341,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetCurrentPosition(IDirectSo LeaveCriticalSection(&This->device->lock); - TRACE("cappos=%d readpos=%d\n", (lpdwCapturePosition?*lpdwCapturePosition:-1), (lpdwReadPosition?*lpdwReadPosition:-1)); + TRACE("cappos=%ld readpos=%ld\n", (lpdwCapturePosition?*lpdwCapturePosition:-1), (lpdwReadPosition?*lpdwReadPosition:-1)); TRACE("returning DS_OK\n"); return DS_OK; @@ -353,7 +353,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetFormat(IDirectSoundCaptur IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); HRESULT hres = DS_OK; - TRACE("(%p,%p,0x%08x,%p)\n", This, lpwfxFormat, dwSizeAllocated, lpdwSizeWritten); + TRACE("(%p,%p,0x%08lx,%p)\n", This, lpwfxFormat, dwSizeAllocated, lpdwSizeWritten); if (This->device == NULL) { WARN("invalid parameter: This->device == NULL\n"); @@ -376,7 +376,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetFormat(IDirectSoundCaptur } } - TRACE("returning %08x\n", hres); + TRACE("returning %08lx\n", hres); return hres; } @@ -400,7 +400,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetStatus(IDirectSoundCaptur *lpdwStatus = 0; EnterCriticalSection(&(This->device->lock)); - TRACE("old This->device->state=%s, old lpdwStatus=%08x\n", + TRACE("old This->device->state=%s, old lpdwStatus=%08lx\n", captureStateString[This->device->state],*lpdwStatus); if ((This->device->state == STATE_STARTING) || (This->device->state == STATE_CAPTURING)) { @@ -408,11 +408,11 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetStatus(IDirectSoundCaptur if (This->flags & DSCBSTART_LOOPING) *lpdwStatus |= DSCBSTATUS_LOOPING; } - TRACE("new This->device->state=%s, new lpdwStatus=%08x\n", + TRACE("new This->device->state=%s, new lpdwStatus=%08lx\n", captureStateString[This->device->state],*lpdwStatus); LeaveCriticalSection(&(This->device->lock)); - TRACE("status=%x\n", *lpdwStatus); + TRACE("status=%lx\n", *lpdwStatus); TRACE("returning DS_OK\n"); return DS_OK; } @@ -434,7 +434,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Lock(IDirectSoundCaptureBuff IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); HRESULT hres = DS_OK; - TRACE( "(%p,%08u,%08u,%p,%p,%p,%p,0x%08x) at %d\n", This, dwReadCusor, + TRACE( "(%p,%08lu,%08lu,%p,%p,%p,%p,0x%08lx) at %ld\n", This, dwReadCusor, dwReadBytes, lplpvAudioPtr1, lpdwAudioBytes1, lplpvAudioPtr2, lpdwAudioBytes2, dwFlags, GetTickCount() ); @@ -477,7 +477,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Lock(IDirectSoundCaptureBuff LeaveCriticalSection(&(This->device->lock)); - TRACE("returning %08x\n", hres); + TRACE("returning %08lx\n", hres); return hres; } @@ -487,7 +487,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Start(IDirectSoundCaptureBuf IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); HRESULT hres; - TRACE( "(%p,0x%08x)\n", This, dwFlags ); + TRACE( "(%p,0x%08lx)\n", This, dwFlags ); if (This->device == NULL) { WARN("invalid parameter: This->device == NULL\n"); @@ -515,7 +515,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Start(IDirectSoundCaptureBuf hres = IAudioClient_Start(This->device->client); if(FAILED(hres)){ - WARN("Start failed: %08x\n", hres); + WARN("Start failed: %08lx\n", hres); LeaveCriticalSection(&This->device->lock); return hres; } @@ -572,7 +572,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Unlock(IDirectSoundCaptureBu IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); HRESULT hres = DS_OK; - TRACE( "(%p,%p,%08u,%p,%08u)\n", This, lpvAudioPtr1, dwAudioBytes1, + TRACE( "(%p,%p,%08lu,%p,%08lu)\n", This, lpvAudioPtr1, dwAudioBytes1, lpvAudioPtr2, dwAudioBytes2 ); if (lpvAudioPtr1 == NULL) { @@ -585,7 +585,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Unlock(IDirectSoundCaptureBu hres = DSERR_INVALIDCALL; } - TRACE("returning %08x\n", hres); + TRACE("returning %08lx\n", hres); return hres; } @@ -594,7 +594,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetObjectInPath(IDirectSound { IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); - FIXME( "(%p,%s,%u,%s,%p): stub\n", This, debugstr_guid(rguidObject), + FIXME( "(%p,%s,%lu,%s,%p): stub\n", This, debugstr_guid(rguidObject), dwIndex, debugstr_guid(rguidInterface), ppObject ); if (!ppObject) @@ -609,7 +609,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetFXStatus(IDirectSoundCapt { IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); - FIXME( "(%p,%u,%p): stub\n", This, dwFXCount, pdwFXStatus ); + FIXME( "(%p,%lu,%p): stub\n", This, dwFXCount, pdwFXStatus ); return DS_OK; } @@ -643,7 +643,7 @@ static void capture_CheckNotify(IDirectSoundCaptureBufferImpl *This, DWORD from, for (i = 0; i < This->nrofnotifies; ++i) { LPDSBPOSITIONNOTIFY event = This->notifies + i; DWORD offset = event->dwOffset; - TRACE("checking %d, position %d, event = %p\n", i, offset, event->hEventNotify); + TRACE("checking %d, position %ld, event = %p\n", i, offset, event->hEventNotify); if (offset == DSBPN_OFFSETSTOP) { if (!from && !len) { @@ -698,8 +698,8 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( wfex = lpcDSCBufferDesc->lpwfxFormat; - TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," - "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", + TRACE("(formattag=0x%04x,chans=%d,samplerate=%ld," + "bytespersec=%ld,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", wfex->wFormatTag, wfex->nChannels, wfex->nSamplesPerSec, wfex->nAvgBytesPerSec, wfex->nBlockAlign, wfex->wBitsPerSample, wfex->cbSize); @@ -743,7 +743,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( err = IMMDevice_Activate(device->mmdevice, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&device->client); if(FAILED(err)){ - WARN("Activate failed: %08x\n", err); + WARN("Activate failed: %08lx\n", err); HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); @@ -754,7 +754,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST | AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 200 * 100000, 0, device->pwfx, NULL); if(FAILED(err)){ - WARN("Initialize failed: %08x\n", err); + WARN("Initialize failed: %08lx\n", err); IAudioClient_Release(device->client); device->client = NULL; HeapFree(GetProcessHeap(), 0, This->pdscbd); @@ -769,7 +769,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( err = IAudioClient_SetEventHandle(device->client, This->sleepev); if(FAILED(err)){ - WARN("SetEventHandle failed: %08x\n", err); + WARN("SetEventHandle failed: %08lx\n", err); IAudioClient_Release(device->client); device->client = NULL; CloseHandle(This->sleepev); @@ -782,7 +782,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( err = IAudioClient_GetService(device->client, &IID_IAudioCaptureClient, (void**)&device->capture); if(FAILED(err)){ - WARN("GetService failed: %08x\n", err); + WARN("GetService failed: %08lx\n", err); IAudioClient_Release(device->client); device->client = NULL; CloseHandle(This->sleepev); @@ -793,7 +793,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( } buflen = lpcDSCBufferDesc->dwBufferBytes; - TRACE("desired buflen=%d, old buffer=%p\n", buflen, device->buffer); + TRACE("desired buflen=%ld, old buffer=%p\n", buflen, device->buffer); if (device->buffer) newbuf = HeapReAlloc(GetProcessHeap(),0,device->buffer,buflen); else @@ -854,7 +854,7 @@ static ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device) { ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref %d\n", device, ref); + TRACE("(%p) ref %ld\n", device, ref); if (!ref) { TRACE("deleting object\n"); @@ -900,7 +900,7 @@ static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) hr = IAudioCaptureClient_GetBuffer(device->capture, &buf, &packet_frames, &flags, NULL, NULL); if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); return hr; } if(hr == AUDCLNT_S_BUFFER_EMPTY) @@ -936,7 +936,7 @@ static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_frames); if(FAILED(hr)){ - WARN("ReleaseBuffer failed: %08x\n", hr); + WARN("ReleaseBuffer failed: %08lx\n", hr); return hr; } } @@ -953,7 +953,7 @@ static DWORD WINAPI DSOUND_capture_thread(void *user) hr = IAudioClient_GetDevicePeriod(buffer->device->client, &period, NULL); if(FAILED(hr)){ - WARN("GetDevicePeriod failed: %08x\n", hr); + WARN("GetDevicePeriod failed: %08lx\n", hr); wait_ms = 5; }else wait_ms = MulDiv(5, period, 10000); @@ -971,7 +971,7 @@ static DWORD WINAPI DSOUND_capture_thread(void *user) LeaveCriticalSection(&buffer->device->lock); }else if(ret != WAIT_TIMEOUT) - WARN("WaitForSingleObject failed: %u\n", GetLastError()); + WARN("WaitForSingleObject failed: %lu\n", GetLastError()); } return 0; @@ -1141,7 +1141,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) IDirectSoundCaptureImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -1153,7 +1153,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) IDirectSoundCaptureImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capture_destroy(This); @@ -1188,7 +1188,7 @@ static ULONG WINAPI IDirectSoundCaptureImpl_AddRef(IDirectSoundCapture *iface) IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); ULONG ref = InterlockedIncrement(&This->refdsc); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -1200,7 +1200,7 @@ static ULONG WINAPI IDirectSoundCaptureImpl_Release(IDirectSoundCapture *iface) IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); ULONG ref = InterlockedDecrement(&This->refdsc); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capture_destroy(This); @@ -1266,7 +1266,7 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps(IDirectSoundCapture *iface } if (lpDSCCaps->dwSize < sizeof(*lpDSCCaps)) { - WARN("invalid parameter: lpDSCCaps->dwSize = %d\n", lpDSCCaps->dwSize); + WARN("invalid parameter: lpDSCCaps->dwSize = %ld\n", lpDSCCaps->dwSize); return DSERR_INVALIDPARAM; } @@ -1274,7 +1274,7 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps(IDirectSoundCapture *iface lpDSCCaps->dwFormats = This->device->drvcaps.dwFormats; lpDSCCaps->dwChannels = This->device->drvcaps.dwChannels; - TRACE("(flags=0x%08x,format=0x%08x,channels=%d)\n",lpDSCCaps->dwFlags, + TRACE("(flags=0x%08lx,format=0x%08lx,channels=%ld)\n",lpDSCCaps->dwFlags, lpDSCCaps->dwFormats, lpDSCCaps->dwChannels); return DS_OK; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index bcff0d8642a..346cc4ceca3 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -60,7 +60,7 @@ static const char * dumpCooperativeLevel(DWORD level) LE(DSSCL_WRITEPRIMARY); } #undef LE - return wine_dbg_sprintf("Unknown(%08x)", level); + return wine_dbg_sprintf("Unknown(%08lx)", level); } static void _dump_DSCAPS(DWORD xmask) { @@ -190,7 +190,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device) { ULONG ref = InterlockedIncrement(&(device->ref)); - TRACE("(%p) ref %d\n", device, ref); + TRACE("(%p) ref %ld\n", device, ref); return ref; } @@ -198,7 +198,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) { HRESULT hr; ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref %d\n", device, ref); + TRACE("(%p) ref %ld\n", device, ref); if (!ref) { int i; @@ -328,7 +328,7 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU HeapFree(GetProcessHeap(), 0, device); LeaveCriticalSection(&DSOUND_renderers_lock); IMMDevice_Release(mmdevice); - WARN("DSOUND_ReopenDevice failed: %08x\n", hr); + WARN("DSOUND_ReopenDevice failed: %08lx\n", hr); return hr; } @@ -426,11 +426,11 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( *ppdsb = NULL; if (TRACE_ON(dsound)) { - TRACE("(structsize=%d)\n",dsbd->dwSize); - TRACE("(flags=0x%08x:\n",dsbd->dwFlags); + TRACE("(structsize=%ld)\n",dsbd->dwSize); + TRACE("(flags=0x%08lx:\n",dsbd->dwFlags); _dump_DSBCAPS(dsbd->dwFlags); TRACE(")\n"); - TRACE("(bufferbytes=%d)\n",dsbd->dwBufferBytes); + TRACE("(bufferbytes=%ld)\n",dsbd->dwBufferBytes); TRACE("(lpwfxFormat=%p)\n",dsbd->lpwfxFormat); } @@ -526,8 +526,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( } } - TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," - "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", + TRACE("(formattag=0x%04x,chans=%d,samplerate=%ld," + "bytespersec=%ld,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", dsbd->lpwfxFormat->wFormatTag, dsbd->lpwfxFormat->nChannels, dsbd->lpwfxFormat->nSamplesPerSec, dsbd->lpwfxFormat->nAvgBytesPerSec, @@ -710,7 +710,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) IDirectSoundImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -723,7 +723,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) IDirectSoundImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) directsound_destroy(This); @@ -759,7 +759,7 @@ static ULONG WINAPI IDirectSound8Impl_AddRef(IDirectSound8 *iface) IDirectSoundImpl *This = impl_from_IDirectSound8(iface); ULONG ref = InterlockedIncrement(&This->refds); - TRACE("(%p) refds=%d\n", This, ref); + TRACE("(%p) refds=%ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -772,7 +772,7 @@ static ULONG WINAPI IDirectSound8Impl_Release(IDirectSound8 *iface) IDirectSoundImpl *This = impl_from_IDirectSound8(iface); ULONG ref = InterlockedDecrement(&(This->refds)); - TRACE("(%p) refds=%d\n", This, ref); + TRACE("(%p) refds=%ld\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) directsound_destroy(This); @@ -803,7 +803,7 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds return DSERR_INVALIDPARAM; } if (dscaps->dwSize < sizeof(*dscaps)) { - WARN("invalid parameter: dscaps->dwSize = %d\n", dscaps->dwSize); + WARN("invalid parameter: dscaps->dwSize = %ld\n", dscaps->dwSize); return DSERR_INVALIDPARAM; } @@ -831,7 +831,7 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds dscaps->dwPlayCpuOverheadSwBuffers = This->device->drvcaps.dwPlayCpuOverheadSwBuffers; if (TRACE_ON(dsound)) { - TRACE("(flags=0x%08x:\n", dscaps->dwFlags); + TRACE("(flags=0x%08lx:\n", dscaps->dwFlags); _dump_DSCAPS(dscaps->dwFlags); TRACE(")\n"); } @@ -919,7 +919,7 @@ static HRESULT WINAPI IDirectSound8Impl_SetSpeakerConfig(IDirectSound8 *iface, D { IDirectSoundImpl *This = impl_from_IDirectSound8(iface); - TRACE("(%p,0x%08x)\n", This, config); + TRACE("(%p,0x%08lx)\n", This, config); if (!This->device) { WARN("not initialized\n"); @@ -1193,6 +1193,6 @@ void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device) break; default: - WARN("unknown speaker_config %u\n", device->speaker_config); + WARN("unknown speaker_config %lu\n", device->speaker_config); } } diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index f3bce6062fe..215588393d8 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -174,7 +174,7 @@ static HRESULT get_mmdevenum(IMMDeviceEnumerator **devenum) if(SUCCEEDED(init_hr)) CoUninitialize(); *devenum = NULL; - ERR("CoCreateInstance failed: %08x\n", hr); + ERR("CoCreateInstance failed: %08lx\n", hr); return hr; } @@ -197,7 +197,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps, if(!ps){ hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); + WARN("OpenPropertyStore failed: %08lx\n", hr); return hr; } }else @@ -208,7 +208,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps, hr = IPropertyStore_GetValue(ps, &PKEY_AudioEndpoint_GUID, &pv); if(FAILED(hr)){ IPropertyStore_Release(ps); - WARN("GetValue(GUID) failed: %08x\n", hr); + WARN("GetValue(GUID) failed: %08lx\n", hr); return hr; } @@ -276,7 +276,7 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest) hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, flow, role, &device); if(FAILED(hr)){ - WARN("GetDefaultAudioEndpoint failed: %08x\n", hr); + WARN("GetDefaultAudioEndpoint failed: %08lx\n", hr); release_mmdevenum(devenum, init_hr); return DSERR_NODRIVER; } @@ -357,7 +357,7 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow, DEVICE_STATE_ACTIVE, &coll); if(FAILED(hr)){ - WARN("EnumAudioEndpoints failed: %08x\n", hr); + WARN("EnumAudioEndpoints failed: %08lx\n", hr); release_mmdevenum(devenum, init_hr); return hr; } @@ -366,7 +366,7 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) if(FAILED(hr)){ IMMDeviceCollection_Release(coll); release_mmdevenum(devenum, init_hr); - WARN("GetCount failed: %08x\n", hr); + WARN("GetCount failed: %08lx\n", hr); return hr; } @@ -412,7 +412,7 @@ static BOOL send_device(IMMDevice *device, GUID *guid, hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); + WARN("OpenPropertyStore failed: %08lx\n", hr); return TRUE; } @@ -426,7 +426,7 @@ static BOOL send_device(IMMDevice *device, GUID *guid, (const PROPERTYKEY *)&DEVPKEY_Device_FriendlyName, &pv); if(FAILED(hr)){ IPropertyStore_Release(ps); - WARN("GetValue(FriendlyName) failed: %08x\n", hr); + WARN("GetValue(FriendlyName) failed: %08lx\n", hr); return TRUE; } @@ -461,7 +461,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, DEVICE_STATE_ACTIVE, &coll); if(FAILED(hr)){ release_mmdevenum(devenum, init_hr); - WARN("EnumAudioEndpoints failed: %08x\n", hr); + WARN("EnumAudioEndpoints failed: %08lx\n", hr); return DS_OK; } @@ -469,7 +469,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, if(FAILED(hr)){ IMMDeviceCollection_Release(coll); release_mmdevenum(devenum, init_hr); - WARN("GetCount failed: %08x\n", hr); + WARN("GetCount failed: %08lx\n", hr); return DS_OK; } @@ -500,7 +500,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, hr = IMMDeviceCollection_Item(coll, i, &device); if(FAILED(hr)){ - WARN("Item failed: %08x\n", hr); + WARN("Item failed: %08lx\n", hr); continue; } @@ -770,7 +770,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpvReserved); + TRACE("(%p %ld %p)\n", hInstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index cccfeba0f06..a3a9a066c31 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -107,7 +107,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -119,7 +119,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) fullduplex_destroy(This); @@ -154,7 +154,7 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_AddRef(IDirectSoundFullDuplex *if IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); ULONG ref = InterlockedIncrement(&This->refdsfd); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -166,7 +166,7 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_Release(IDirectSoundFullDuplex *i IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); ULONG ref = InterlockedDecrement(&This->refdsfd); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) fullduplex_destroy(This); @@ -183,7 +183,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDupl IDirectSoundCapture8 *dsc8 = NULL; HRESULT hr; - TRACE("(%p,%s,%s,%p,%p,%p,%x,%p,%p)\n", This, debugstr_guid(capture_dev), + TRACE("(%p,%s,%s,%p,%p,%p,%lx,%p,%p)\n", This, debugstr_guid(capture_dev), debugstr_guid(render_dev), cbufdesc, bufdesc, hwnd, level, dscb8, dsb8); if (!dscb8 || !dsb8) @@ -330,7 +330,7 @@ HRESULT WINAPI DirectSoundFullDuplexCreate(const GUID *capture_dev, const GUID * { HRESULT hr; - TRACE("(%s,%s,%p,%p,%p,%x,%p,%p,%p,%p)\n", debugstr_guid(capture_dev), + TRACE("(%s,%s,%p,%p,%p,%lx,%p,%p,%p,%p)\n", debugstr_guid(capture_dev), debugstr_guid(render_dev), cbufdesc, bufdesc, hwnd, level, dsfd, dscb8, dsb8, outer_unk); diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 1f91bc4dc0e..05b2bfbf8c3 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -47,7 +47,7 @@ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) double temp; TRACE("(%p)\n",volpan); - TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan); + TRACE("Vol=%ld Pan=%ld\n", volpan->lVolume, volpan->lPan); /* the AmpFactors are expressed in 16.16 fixed point */ /* FIXME: use calculated vol and pan ampfactors */ @@ -56,7 +56,7 @@ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) temp = (double) (volpan->lVolume + (volpan->lPan < 0 ? volpan->lPan : 0)); volpan->dwTotalAmpFactor[1] = (ULONG) (pow(2.0, temp / 600.0) * 0xffff); - TRACE("left = %x, right = %x\n", volpan->dwTotalAmpFactor[0], volpan->dwTotalAmpFactor[1]); + TRACE("left = %lx, right = %lx\n", volpan->dwTotalAmpFactor[0], volpan->dwTotalAmpFactor[1]); } void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) @@ -64,7 +64,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) double left,right; TRACE("(%p)\n",volpan); - TRACE("left=%x, right=%x\n",volpan->dwTotalAmpFactor[0],volpan->dwTotalAmpFactor[1]); + TRACE("left=%lx, right=%lx\n",volpan->dwTotalAmpFactor[0],volpan->dwTotalAmpFactor[1]); if (volpan->dwTotalAmpFactor[0]==0) left=-10000; else @@ -83,7 +83,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) if (volpan->lPan < -10000) volpan->lPan=-10000; - TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan); + TRACE("Vol=%ld Pan=%ld\n", volpan->lVolume, volpan->lPan); } /** @@ -142,7 +142,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) { dsb->mix_channels = ichannels; if (ichannels > 32) { - FIXME("Copying %u channels is unsupported, limiting to first 32\n", ichannels); + FIXME("Copying %lu channels is unsupported, limiting to first 32\n", ichannels); dsb->mix_channels = 32; } } @@ -193,7 +193,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) else { if (ichannels > 2) - FIXME("Conversion from %u to %u channels is not implemented, falling back to stereo\n", ichannels, ochannels); + FIXME("Conversion from %lu to %lu channels is not implemented, falling back to stereo\n", ichannels, ochannels); dsb->mix_channels = 2; } } @@ -248,7 +248,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len } } - TRACE("Not stopped: first notify: %u (%u), left notify: %u (%u), range: [%u,%u)\n", + TRACE("Not stopped: first notify: %u (%lu), left notify: %u (%lu), range: [%lu,%lu)\n", first, dsb->notifies[first].dwOffset, left, dsb->notifies[left].dwOffset, playpos, (playpos + len) % dsb->buflen); @@ -259,7 +259,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len if(dsb->notifies[check].dwOffset >= playpos + len) break; - TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); + TRACE("Signalling %p (%lu)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); SetEvent(dsb->notifies[check].hEventNotify); } } @@ -269,7 +269,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len if(dsb->notifies[check].dwOffset >= (playpos + len) % dsb->buflen) break; - TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); + TRACE("Signalling %p (%lu)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); SetEvent(dsb->notifies[check].hEventNotify); } } @@ -492,7 +492,7 @@ static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames) UINT channels = dsb->device->pwfx->nChannels, chan; TRACE("(%p,%d)\n",dsb,frames); - TRACE("left = %x, right = %x\n", dsb->volpan.dwTotalAmpFactor[0], + TRACE("left = %lx, right = %lx\n", dsb->volpan.dwTotalAmpFactor[0], dsb->volpan.dwTotalAmpFactor[1]); if ((!(dsb->dsbd.dwFlags & DSBCAPS_CTRLPAN) || (dsb->volpan.lPan == 0)) && @@ -533,8 +533,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, float *ibuf; DWORD oldpos; - TRACE("sec_mixpos=%d/%d\n", dsb->sec_mixpos, dsb->buflen); - TRACE("(%p, frames=%d)\n",dsb,frames); + TRACE("sec_mixpos=%ld/%ld\n", dsb->sec_mixpos, dsb->buflen); + TRACE("(%p, frames=%ld)\n",dsb,frames); /* Resample buffer to temporary buffer specifically allocated for this purpose, if needed */ oldpos = dsb->sec_mixpos; @@ -573,8 +573,8 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD { DWORD primary_done = 0; - TRACE("(%p, frames=%d)\n",dsb,frames); - TRACE("looping=%d, leadin=%d\n", dsb->playflags, dsb->leadin); + TRACE("(%p, frames=%ld)\n",dsb,frames); + TRACE("looping=%ld, leadin=%ld\n", dsb->playflags, dsb->leadin); /* If leading in, only mix about 20 ms, and 'skip' mixing the rest, for more fluid pointer advancement */ /* FIXME: Is this needed? */ @@ -589,14 +589,14 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD dsb->leadin = FALSE; - TRACE("frames (primary) = %i\n", frames); + TRACE("frames (primary) = %li\n", frames); /* First try to mix to the end of the buffer if possible * Theoretically it would allow for better optimization */ primary_done += DSOUND_MixInBuffer(dsb, mix_buffer, frames); - TRACE("total mixed data=%d\n", primary_done); + TRACE("total mixed data=%ld\n", primary_done); /* Report back the total prebuffered amount for this buffer */ return primary_done; @@ -620,14 +620,14 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff /* unless we find a running buffer, all have stopped */ *all_stopped = TRUE; - TRACE("(frames %d)\n", frames); + TRACE("(frames %ld)\n", frames); for (i = 0; i < device->nrofbuffers; i++) { dsb = device->buffers[i]; - TRACE("MixToPrimary for %p, state=%d\n", dsb, dsb->state); + TRACE("MixToPrimary for %p, state=%ld\n", dsb, dsb->state); if (dsb->buflen && dsb->state) { - TRACE("Checking %p, frames=%d\n", dsb, frames); + TRACE("Checking %p, frames=%ld\n", dsb, frames); AcquireSRWLockShared(&dsb->lock); if (dsb->state != STATE_STOPPED) { @@ -664,7 +664,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes) hr = IAudioRenderClient_GetBuffer(device->render, bytes / device->pwfx->nBlockAlign, &buffer); if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); return; } @@ -672,7 +672,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes) hr = IAudioRenderClient_ReleaseBuffer(device->render, bytes / device->pwfx->nBlockAlign, 0); if(FAILED(hr)) { - ERR("ReleaseBuffer failed: %08x\n", hr); + ERR("ReleaseBuffer failed: %08lx\n", hr); IAudioRenderClient_ReleaseBuffer(device->render, 0, 0); return; } @@ -705,7 +705,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) hr = IAudioClient_GetCurrentPadding(device->client, &pad_frames); if(FAILED(hr)){ - WARN("GetCurrentPadding failed: %08x\n", hr); + WARN("GetCurrentPadding failed: %08lx\n", hr); LeaveCriticalSection(&device->mixlock); return; } @@ -739,7 +739,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) hr = IAudioRenderClient_GetBuffer(device->render, frames, (BYTE **)&buffer); if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); LeaveCriticalSection(&device->mixlock); return; } @@ -759,7 +759,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) hr = IAudioRenderClient_ReleaseBuffer(device->render, frames, 0); if(FAILED(hr)) - ERR("ReleaseBuffer failed: %08x\n", hr); + ERR("ReleaseBuffer failed: %08lx\n", hr); device->pad += frames * block; } else if (!device->stopped) { @@ -793,9 +793,9 @@ DWORD CALLBACK DSOUND_mixthread(void *p) */ ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); if (ret == WAIT_FAILED) - WARN("wait returned error %u %08x!\n", GetLastError(), GetLastError()); + WARN("wait returned error %lu %08lx!\n", GetLastError(), GetLastError()); else if (ret != WAIT_OBJECT_0) - WARN("wait returned %08x!\n", ret); + WARN("wait returned %08lx!\n", ret); if (!dev->ref) break; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index e7da015a533..4f46f57926d 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -56,7 +56,7 @@ static DWORD speaker_config_to_channel_mask(DWORD speaker_config) return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; } - WARN("unknown speaker_config %u\n", speaker_config); + WARN("unknown speaker_config %lu\n", speaker_config); return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; } @@ -71,14 +71,14 @@ static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &store); if (FAILED(hr)) { - WARN("IMMDevice_OpenPropertyStore failed: %08x\n", hr); + WARN("IMMDevice_OpenPropertyStore failed: %08lx\n", hr); return def; } hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); if (FAILED(hr)) { - WARN("IPropertyStore_GetValue failed: %08x\n", hr); + WARN("IPropertyStore_GetValue failed: %08lx\n", hr); IPropertyStore_Release(store); return def; } @@ -188,7 +188,7 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client CoTaskMemFree(retwfe); } if (FAILED(hr)) { - WARN("IsFormatSupported failed: %08x\n", hr); + WARN("IsFormatSupported failed: %08lx\n", hr); HeapFree(GetProcessHeap(), 0, w); return hr; } @@ -263,7 +263,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, device->writelead = (wfx->nSamplesPerSec / 100) * wfx->nBlockAlign; - TRACE("buflen: %u, frames %u\n", device->buflen, frames); + TRACE("buflen: %lu, frames %lu\n", device->buflen, frames); if (!mixfloat) device->normfunction = normfunctions[wfx->wBitsPerSample/8 - 1]; @@ -299,7 +299,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) hres = IMMDevice_Activate(device->mmdevice, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void **)&client); if(FAILED(hres)){ - WARN("Activate failed: %08x\n", hres); + WARN("Activate failed: %08lx\n", hres); return hres; } @@ -314,13 +314,13 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 800000, 0, wfx, NULL); if(FAILED(hres)){ IAudioClient_Release(client); - ERR("Initialize failed: %08x\n", hres); + ERR("Initialize failed: %08lx\n", hres); return hres; } hres = IAudioClient_SetEventHandle(client, device->sleepev); if (FAILED(hres)) { - WARN("SetEventHandle failed: %08x\n", hres); + WARN("SetEventHandle failed: %08lx\n", hres); goto err; } @@ -335,17 +335,17 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) /* Now kick off the timer so the event fires periodically */ hres = IAudioClient_Start(client); if (FAILED(hres)) { - WARN("Start failed with %08x\n", hres); + WARN("Start failed with %08lx\n", hres); goto err; } hres = IAudioClient_GetStreamLatency(client, &period); if (FAILED(hres)) { - WARN("GetStreamLatency failed with %08x\n", hres); + WARN("GetStreamLatency failed with %08lx\n", hres); goto err; } hres = IAudioClient_GetBufferSize(client, &acbuf_frames); if (FAILED(hres)) { - WARN("GetBufferSize failed with %08x\n", hres); + WARN("GetBufferSize failed with %08lx\n", hres); goto err; } @@ -354,7 +354,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) aclen_frames = min(acbuf_frames, 3 * frag_frames); - TRACE("period %u ms frag_frames %u buf_frames %u\n", period_ms, frag_frames, aclen_frames); + TRACE("period %lu ms frag_frames %lu buf_frames %u\n", period_ms, frag_frames, aclen_frames); hres = DSOUND_PrimaryOpen(device, wfx, aclen_frames, forcewave); if(FAILED(hres)) @@ -375,7 +375,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return S_OK; err_service: - WARN("GetService failed: %08x\n", hres); + WARN("GetService failed: %08lx\n", hres); err: device->speaker_config = oldspeakerconfig; DSOUND_ParseSpeakerConfig(device); @@ -396,7 +396,7 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) EnterCriticalSection(&(device->mixlock)); if(device->primary && (device->primary->ref || device->primary->numIfaces)) - WARN("Destroying primary buffer while references held (%u %u)\n", device->primary->ref, device->primary->numIfaces); + WARN("Destroying primary buffer while references held (%lu %lu)\n", device->primary->ref, device->primary->numIfaces); HeapFree(GetProcessHeap(), 0, device->primary); device->primary = NULL; @@ -453,8 +453,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe WARN("invalid parameter: passed_fmt==NULL!\n"); return DSERR_INVALIDPARAM; } - TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," - "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", + TRACE("(formattag=0x%04x,chans=%d,samplerate=%ld," + "bytespersec=%ld,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", passed_fmt->wFormatTag, passed_fmt->nChannels, passed_fmt->nSamplesPerSec, passed_fmt->nAvgBytesPerSec, passed_fmt->nBlockAlign, passed_fmt->wBitsPerSample, passed_fmt->cbSize); @@ -539,7 +539,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LO float fvol; int i; - TRACE("(%p,%d)\n", iface, vol); + TRACE("(%p,%ld)\n", iface, vol); if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { WARN("control unavailable\n"); @@ -547,7 +547,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LO } if ((vol > DSBVOLUME_MAX) || (vol < DSBVOLUME_MIN)) { - WARN("invalid parameter: vol = %d\n", vol); + WARN("invalid parameter: vol = %ld\n", vol); return DSERR_INVALIDPARAM; } @@ -559,7 +559,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LO hr = IAudioStreamVolume_GetChannelVolume(device->volume, i, &fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("GetChannelVolume failed: %08x\n", hr); + WARN("GetChannelVolume failed: %08lx\n", hr); return hr; } } else @@ -579,7 +579,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LO hr = IAudioStreamVolume_SetChannelVolume(device->volume, i, fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("SetChannelVolume failed: %08x\n", hr); + WARN("SetChannelVolume failed: %08lx\n", hr); return hr; } } @@ -619,7 +619,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetVolume(IDirectSoundBuffer8 *iface, LO hr = IAudioStreamVolume_GetChannelVolume(device->volume, i, &fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("GetChannelVolume failed: %08x\n", hr); + WARN("GetChannelVolume failed: %08lx\n", hr); return hr; } } else @@ -639,7 +639,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetVolume(IDirectSoundBuffer8 *iface, LO static HRESULT WINAPI PrimaryBufferImpl_SetFrequency(IDirectSoundBuffer8 *iface, DWORD freq) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); - TRACE("(%p,%d)\n",This,freq); + TRACE("(%p,%ld)\n",This,freq); /* You cannot set the frequency of the primary buffer */ WARN("control unavailable\n"); @@ -651,10 +651,10 @@ static HRESULT WINAPI PrimaryBufferImpl_Play(IDirectSoundBuffer8 *iface, DWORD r { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; - TRACE("(%p,%08x,%08x,%08x)\n", iface, reserved1, reserved2, flags); + TRACE("(%p,%08lx,%08lx,%08lx)\n", iface, reserved1, reserved2, flags); if (!(flags & DSBPLAY_LOOPING)) { - WARN("invalid parameter: flags = %08x\n", flags); + WARN("invalid parameter: flags = %08lx\n", flags); return DSERR_INVALIDPARAM; } @@ -678,7 +678,7 @@ static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer8 *iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); return ref; @@ -707,7 +707,7 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer8 *iface) if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) primary ref %d\n", This, ref); + TRACE("(%p) primary ref %ld\n", This, ref); return ref; } @@ -747,7 +747,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer8 * LeaveCriticalSection(&(device->mixlock)); /* **** */ - TRACE("playpos = %d, writepos = %d (%p, time=%d)\n", playpos?*playpos:0, writepos?*writepos:0, device, GetTickCount()); + TRACE("playpos = %ld, writepos = %ld (%p, time=%ld)\n", playpos?*playpos:0, writepos?*writepos:0, device, GetTickCount()); return DS_OK; } @@ -766,7 +766,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetStatus(IDirectSoundBuffer8 *iface, DW if (!device->stopped) *status |= DSBSTATUS_PLAYING | DSBSTATUS_LOOPING; - TRACE("status=%x\n", *status); + TRACE("status=%lx\n", *status); return DS_OK; } @@ -777,7 +777,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer8 *iface, WA DWORD size; IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; - TRACE("(%p,%p,%d,%p)\n", iface, lpwf, wfsize, wfwritten); + TRACE("(%p,%p,%ld,%p)\n", iface, lpwf, wfsize, wfwritten); size = sizeof(WAVEFORMATEX) + device->primary_pwfx->cbSize; @@ -811,7 +811,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD w HRESULT hres; IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; - TRACE("(%p,%d,%d,%p,%p,%p,%p,0x%08x) at %d\n", + TRACE("(%p,%ld,%ld,%p,%p,%p,%p,0x%08lx) at %ld\n", iface, writecursor, writebytes, @@ -846,13 +846,13 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD w writebytes = device->buflen; if (writecursor >= device->buflen) { - WARN("Invalid parameter, writecursor: %u >= buflen: %u\n", + WARN("Invalid parameter, writecursor: %lu >= buflen: %lu\n", writecursor, device->buflen); return DSERR_INVALIDPARAM; } if (writebytes > device->buflen) { - WARN("Invalid parameter, writebytes: %u > buflen: %u\n", + WARN("Invalid parameter, writebytes: %lu > buflen: %lu\n", writebytes, device->buflen); return DSERR_INVALIDPARAM; } @@ -864,7 +864,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD w *(LPBYTE*)lplpaudioptr2 = NULL; if (audiobytes2) *audiobytes2 = 0; - TRACE("->%d.0\n",writebytes); + TRACE("->%ld.0\n",writebytes); } else { *(LPBYTE*)lplpaudioptr1 = device->buffer+writecursor; *audiobytes1 = device->buflen-writecursor; @@ -872,7 +872,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD w *(LPBYTE*)lplpaudioptr2 = device->buffer; if (audiobytes2) *audiobytes2 = writebytes-(device->buflen-writecursor); - TRACE("->%d.%d\n",*audiobytes1,audiobytes2?*audiobytes2:0); + TRACE("->%ld.%ld\n",*audiobytes1,audiobytes2?*audiobytes2:0); } return DS_OK; } @@ -880,7 +880,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD w static HRESULT WINAPI PrimaryBufferImpl_SetCurrentPosition(IDirectSoundBuffer8 *iface, DWORD newpos) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); - TRACE("(%p,%d)\n",This,newpos); + TRACE("(%p,%ld)\n",This,newpos); /* You cannot set the position of the primary buffer */ WARN("invalid call\n"); @@ -895,7 +895,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG HRESULT hr; int i; - TRACE("(%p,%d)\n", iface, pan); + TRACE("(%p,%ld)\n", iface, pan); if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { WARN("control unavailable\n"); @@ -903,7 +903,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG } if ((pan > DSBPAN_RIGHT) || (pan < DSBPAN_LEFT)) { - WARN("invalid parameter: pan = %d\n", pan); + WARN("invalid parameter: pan = %ld\n", pan); return DSERR_INVALIDPARAM; } @@ -915,7 +915,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG hr = IAudioStreamVolume_GetChannelVolume(device->volume, i, &fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("GetChannelVolume failed: %08x\n", hr); + WARN("GetChannelVolume failed: %08lx\n", hr); return hr; } } else @@ -935,7 +935,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG hr = IAudioStreamVolume_SetChannelVolume(device->volume, i, fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("SetChannelVolume failed: %08x\n", hr); + WARN("SetChannelVolume failed: %08lx\n", hr); return hr; } } @@ -975,7 +975,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetPan(IDirectSoundBuffer8 *iface, LONG hr = IAudioStreamVolume_GetChannelVolume(device->volume, i, &fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("GetChannelVolume failed: %08x\n", hr); + WARN("GetChannelVolume failed: %08lx\n", hr); return hr; } } else @@ -997,7 +997,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer8 *iface, void { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; - TRACE("(%p,%p,%d,%p,%d)\n", iface, p1, x1, p2, x2); + TRACE("(%p,%p,%ld,%p,%ld)\n", iface, p1, x1, p2, x2); if (device->priolevel != DSSCL_WRITEPRIMARY) { WARN("failed priority check!\n"); @@ -1035,7 +1035,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFrequency(IDirectSoundBuffer8 *iface, } *freq = device->pwfx->nSamplesPerSec; - TRACE("-> %d\n", *freq); + TRACE("-> %ld\n", *freq); return DS_OK; } @@ -1060,7 +1060,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCaps(IDirectSoundBuffer8 *iface, DSBC } if (caps->dwSize < sizeof(*caps)) { - WARN("invalid parameter: caps->dwSize = %d\n", caps->dwSize); + WARN("invalid parameter: caps->dwSize = %ld\n", caps->dwSize); return DSERR_INVALIDPARAM; } @@ -1203,8 +1203,8 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * device->ds3dl_need_recalc = TRUE; TRACE("Created primary buffer at %p\n", dsb); - TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," - "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", + TRACE("(formattag=0x%04x,chans=%d,samplerate=%ld," + "bytespersec=%ld,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", device->pwfx->wFormatTag, device->pwfx->nChannels, device->pwfx->nSamplesPerSec, device->pwfx->nAvgBytesPerSec, device->pwfx->nBlockAlign, device->pwfx->wBitsPerSample, diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 959256f8c4e..74d66cad68e 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -80,7 +80,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); return ref; } @@ -88,7 +88,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -124,7 +124,7 @@ static HRESULT DSPROPERTY_WaveDeviceMappingW( PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA ppd = pPropData; struct search_data search; - TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned); if (!ppd) { @@ -164,7 +164,7 @@ static HRESULT DSPROPERTY_WaveDeviceMappingA( DWORD len; HRESULT hr; - TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned); if (!ppd || !ppd->DeviceName) { @@ -201,7 +201,7 @@ static HRESULT DSPROPERTY_DescriptionW( PROPVARIANT pv; HRESULT hr; - TRACE("pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned); TRACE("DeviceId=%s\n",debugstr_guid(&ppd->DeviceId)); @@ -233,7 +233,7 @@ static HRESULT DSPROPERTY_DescriptionW( hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &ps); if(FAILED(hr)){ IMMDevice_Release(mmdevice); - WARN("OpenPropertyStore failed: %08x\n", hr); + WARN("OpenPropertyStore failed: %08lx\n", hr); return hr; } @@ -242,7 +242,7 @@ static HRESULT DSPROPERTY_DescriptionW( if(FAILED(hr)){ IPropertyStore_Release(ps); IMMDevice_Release(mmdevice); - WARN("GetValue(FriendlyName) failed: %08x\n", hr); + WARN("GetValue(FriendlyName) failed: %08lx\n", hr); return hr; } @@ -257,7 +257,7 @@ static HRESULT DSPROPERTY_DescriptionW( if (pcbReturned) { *pcbReturned = sizeof(*ppd); - TRACE("*pcbReturned=%d\n", *pcbReturned); + TRACE("*pcbReturned=%ld\n", *pcbReturned); } return S_OK; @@ -306,7 +306,7 @@ static HRESULT DSPROPERTY_EnumerateW( PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA ppd = pPropData; HRESULT hr; - TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned); if (pcbReturned) @@ -501,7 +501,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( PULONG pcbReturned ) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); - TRACE("(iface=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("(iface=%p,guidPropSet=%s,dwPropID=%lu,pInstanceData=%p,cbInstanceData=%lu,pPropData=%p,cbPropData=%lu,pcbReturned=%p)\n", This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned); if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) { @@ -523,7 +523,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( case DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: return DSPROPERTY_EnumerateW(pPropData,cbPropData,pcbReturned); default: - FIXME("unsupported ID: %d\n",dwPropID); + FIXME("unsupported ID: %ld\n",dwPropID); break; } } else { @@ -532,7 +532,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( if (pcbReturned) { *pcbReturned = 0; - FIXME("*pcbReturned=%d\n", *pcbReturned); + FIXME("*pcbReturned=%ld\n", *pcbReturned); } return E_PROP_ID_UNSUPPORTED; @@ -549,7 +549,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Set( { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); - FIXME("(%p,%s,%d,%p,%d,%p,%d), stub!\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData); + FIXME("(%p,%s,%ld,%p,%ld,%p,%ld), stub!\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData); return E_PROP_ID_UNSUPPORTED; } @@ -560,7 +560,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport( PULONG pTypeSupport ) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); - TRACE("(%p,%s,%d,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport); + TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport); if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) { switch (dwPropID) { @@ -589,7 +589,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport( *pTypeSupport = KSPROPERTY_SUPPORT_GET; return S_OK; default: - FIXME("unsupported ID: %d\n",dwPropID); + FIXME("unsupported ID: %ld\n",dwPropID); break; } } else { diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 06dbf58ca0b..48febdeb307 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -216,7 +216,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) /* attenuation proportional to the distance squared, converted to millibels as in lVolume*/ lVolume -= log10(flDistance/dsb->ds3db_ds3db.flMinDistance * flDistance/dsb->ds3db_ds3db.flMinDistance)*1000; - TRACE("dist. att: Distance = %f, MinDistance = %f => adjusting volume %d to %f\n", flDistance, dsb->ds3db_ds3db.flMinDistance, dsb->ds3db_lVolume, lVolume); + TRACE("dist. att: Distance = %f, MinDistance = %f => adjusting volume %ld to %f\n", flDistance, dsb->ds3db_ds3db.flMinDistance, dsb->ds3db_lVolume, lVolume); /* conning */ /* sometimes it happens that vConeOrientation vector = (0,0,0); in this case angle is "nan" and it's useless*/ @@ -252,7 +252,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) /* this probably isn't the right thing, but it's ok for the time being */ lVolume += ((flAngle - dwInsideConeAngle)/(dwOutsideConeAngle - dwInsideConeAngle)) * dsb->ds3db_ds3db.lConeOutsideVolume; } - TRACE("conning: Angle = %f deg; InsideConeAngle(/2) = %d deg; OutsideConeAngle(/2) = %d deg; ConeOutsideVolume = %d => adjusting volume to %f\n", + TRACE("conning: Angle = %f deg; InsideConeAngle(/2) = %ld deg; OutsideConeAngle(/2) = %ld deg; ConeOutsideVolume = %ld => adjusting volume to %f\n", flAngle, dsb->ds3db_ds3db.dwInsideConeAngle/2, dsb->ds3db_ds3db.dwOutsideConeAngle/2, dsb->ds3db_ds3db.lConeOutsideVolume, lVolume); } dsb->volpan.lVolume = lVolume; @@ -286,7 +286,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) if (flAngle < -M_PI) flAngle += 2*M_PI; } - TRACE("panning: Angle = %f rad, lPan = %d\n", flAngle, dsb->volpan.lPan); + TRACE("panning: Angle = %f rad, lPan = %ld\n", flAngle, dsb->volpan.lPan); /* FIXME: Doppler Effect disabled since i have no idea which frequency to change and how to do it */ if(0) @@ -312,7 +312,7 @@ if(0) /* formula taken from Gianicoli D.: Physics, 4th edition: */ /* FIXME: replace dsb->freq with appropriate frequency ! */ flFreq = dsb->freq * ((DEFAULT_VELOCITY + flListenerVel)/(DEFAULT_VELOCITY + flBufferVel)); - TRACE("doppler: Buffer velocity (component) = %f, Listener velocity (component) = %f => Doppler shift: %d Hz -> %f Hz\n", + TRACE("doppler: Buffer velocity (component) = %f, Listener velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", flBufferVel, flListenerVel, dsb->freq, flFreq); /* FIXME: replace following line with correct frequency setting ! */ dsb->freq = flFreq; @@ -395,7 +395,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(IDirectSound3DBuffer *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -408,7 +408,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(IDirectSound3DBuffer *iface IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref3D); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -430,7 +430,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetAllParameters(IDirectSound3DBu } if (lpDs3dBuffer->dwSize < sizeof(*lpDs3dBuffer)) { - WARN("invalid parameter: lpDs3dBuffer->dwSize = %d\n",lpDs3dBuffer->dwSize); + WARN("invalid parameter: lpDs3dBuffer->dwSize = %ld\n",lpDs3dBuffer->dwSize); return DSERR_INVALIDPARAM; } @@ -444,7 +444,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeAngles(IDirectSound3DBuffe { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); - TRACE("returning: Inside Cone Angle = %d degrees; Outside Cone Angle = %d degrees\n", + TRACE("returning: Inside Cone Angle = %ld degrees; Outside Cone Angle = %ld degrees\n", This->ds3db_ds3db.dwInsideConeAngle, This->ds3db_ds3db.dwOutsideConeAngle); *lpdwInsideConeAngle = This->ds3db_ds3db.dwInsideConeAngle; *lpdwOutsideConeAngle = This->ds3db_ds3db.dwOutsideConeAngle; @@ -469,7 +469,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOutsideVolume(IDirectSound { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); - TRACE("returning: Cone Outside Volume = %d\n", This->ds3db_ds3db.lConeOutsideVolume); + TRACE("returning: Cone Outside Volume = %ld\n", This->ds3db_ds3db.lConeOutsideVolume); *lplConeOutsideVolume = This->ds3db_ds3db.lConeOutsideVolume; return DS_OK; } @@ -499,7 +499,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetMode(IDirectSound3DBuffer *ifa { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); - TRACE("returning: Mode = %d\n", This->ds3db_ds3db.dwMode); + TRACE("returning: Mode = %ld\n", This->ds3db_ds3db.dwMode); *lpdwMode = This->ds3db_ds3db.dwMode; return DS_OK; } @@ -532,7 +532,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters(IDirectSound3DBu IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); DWORD status = DSERR_INVALIDPARAM; - TRACE("(%p,%p,%x)\n",iface,lpcDs3dBuffer,dwApply); + TRACE("(%p,%p,%lx)\n",iface,lpcDs3dBuffer,dwApply); if (lpcDs3dBuffer == NULL) { WARN("invalid parameter: lpcDs3dBuffer == NULL\n"); @@ -540,11 +540,11 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters(IDirectSound3DBu } if (lpcDs3dBuffer->dwSize != sizeof(DS3DBUFFER)) { - WARN("invalid parameter: lpcDs3dBuffer->dwSize = %d\n", lpcDs3dBuffer->dwSize); + WARN("invalid parameter: lpcDs3dBuffer->dwSize = %ld\n", lpcDs3dBuffer->dwSize); return status; } - TRACE("setting: all parameters; dwApply = %d\n", dwApply); + TRACE("setting: all parameters; dwApply = %ld\n", dwApply); This->ds3db_ds3db = *lpcDs3dBuffer; if (dwApply == DS3D_IMMEDIATE) @@ -562,7 +562,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeAngles(IDirectSound3DBuffe { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); - TRACE("setting: Inside Cone Angle = %d; Outside Cone Angle = %d; dwApply = %d\n", + TRACE("setting: Inside Cone Angle = %ld; Outside Cone Angle = %ld; dwApply = %ld\n", dwInsideConeAngle, dwOutsideConeAngle, dwApply); This->ds3db_ds3db.dwInsideConeAngle = dwInsideConeAngle; This->ds3db_ds3db.dwOutsideConeAngle = dwOutsideConeAngle; @@ -577,7 +577,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOrientation(IDirectSound3D { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); - TRACE("setting: Cone Orientation vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); + TRACE("setting: Cone Orientation vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply); This->ds3db_ds3db.vConeOrientation.x = x; This->ds3db_ds3db.vConeOrientation.y = y; This->ds3db_ds3db.vConeOrientation.z = z; @@ -595,7 +595,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOutsideVolume(IDirectSound { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); - TRACE("setting: ConeOutsideVolume = %d; dwApply = %d\n", lConeOutsideVolume, dwApply); + TRACE("setting: ConeOutsideVolume = %ld; dwApply = %ld\n", lConeOutsideVolume, dwApply); This->ds3db_ds3db.lConeOutsideVolume = lConeOutsideVolume; if (dwApply == DS3D_IMMEDIATE) { @@ -611,7 +611,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMaxDistance(IDirectSound3DBuff { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); - TRACE("setting: MaxDistance = %f; dwApply = %d\n", fMaxDistance, dwApply); + TRACE("setting: MaxDistance = %f; dwApply = %ld\n", fMaxDistance, dwApply); This->ds3db_ds3db.flMaxDistance = fMaxDistance; if (dwApply == DS3D_IMMEDIATE) { @@ -627,7 +627,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMinDistance(IDirectSound3DBuff { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); - TRACE("setting: MinDistance = %f; dwApply = %d\n", fMinDistance, dwApply); + TRACE("setting: MinDistance = %f; dwApply = %ld\n", fMinDistance, dwApply); This->ds3db_ds3db.flMinDistance = fMinDistance; if (dwApply == DS3D_IMMEDIATE) { @@ -643,7 +643,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMode(IDirectSound3DBuffer *ifa { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); - TRACE("setting: Mode = %d; dwApply = %d\n", dwMode, dwApply); + TRACE("setting: Mode = %ld; dwApply = %ld\n", dwMode, dwApply); This->ds3db_ds3db.dwMode = dwMode; if (dwApply == DS3D_IMMEDIATE) { @@ -659,7 +659,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetPosition(IDirectSound3DBuffer { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); - TRACE("setting: Position vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); + TRACE("setting: Position vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply); This->ds3db_ds3db.vPosition.x = x; This->ds3db_ds3db.vPosition.y = y; This->ds3db_ds3db.vPosition.z = z; @@ -677,7 +677,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetVelocity(IDirectSound3DBuffer { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); - TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); + TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply); This->ds3db_ds3db.vVelocity.x = x; This->ds3db_ds3db.vVelocity.y = y; This->ds3db_ds3db.vVelocity.z = z; @@ -743,7 +743,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *if IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -760,7 +760,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_Release(IDirectSound3DListener *i if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); return ref; } @@ -779,7 +779,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_GetAllParameter(IDirectSound3DL } if (lpDS3DL->dwSize < sizeof(*lpDS3DL)) { - WARN("invalid parameter: lpDS3DL->dwSize = %d\n",lpDS3DL->dwSize); + WARN("invalid parameter: lpDS3DL->dwSize = %ld\n",lpDS3DL->dwSize); return DSERR_INVALIDPARAM; } @@ -856,7 +856,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetAllParameters(IDirectSound3D { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); - TRACE("setting: all parameters; dwApply = %d\n", dwApply); + TRACE("setting: all parameters; dwApply = %ld\n", dwApply); This->device->ds3dl = *lpcDS3DL; if (dwApply == DS3D_IMMEDIATE) { @@ -872,7 +872,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetDistanceFactor(IDirectSound3 { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); - TRACE("setting: Distance Factor = %f; dwApply = %d\n", fDistanceFactor, dwApply); + TRACE("setting: Distance Factor = %f; dwApply = %ld\n", fDistanceFactor, dwApply); This->device->ds3dl.flDistanceFactor = fDistanceFactor; if (dwApply == DS3D_IMMEDIATE) { @@ -888,7 +888,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetDopplerFactor(IDirectSound3D { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); - TRACE("setting: Doppler Factor = %f; dwApply = %d\n", fDopplerFactor, dwApply); + TRACE("setting: Doppler Factor = %f; dwApply = %ld\n", fDopplerFactor, dwApply); This->device->ds3dl.flDopplerFactor = fDopplerFactor; if (dwApply == DS3D_IMMEDIATE) { @@ -905,7 +905,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetOrientation(IDirectSound3DLi { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); - TRACE("setting: Front vector = (%f,%f,%f); Top vector = (%f,%f,%f); dwApply = %d\n", + TRACE("setting: Front vector = (%f,%f,%f); Top vector = (%f,%f,%f); dwApply = %ld\n", xFront, yFront, zFront, xTop, yTop, zTop, dwApply); This->device->ds3dl.vOrientFront.x = xFront; This->device->ds3dl.vOrientFront.y = yFront; @@ -927,7 +927,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetPosition(IDirectSound3DListe { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); - TRACE("setting: Position vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); + TRACE("setting: Position vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply); This->device->ds3dl.vPosition.x = x; This->device->ds3dl.vPosition.y = y; This->device->ds3dl.vPosition.z = z; @@ -945,7 +945,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetRolloffFactor(IDirectSound3D { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); - TRACE("setting: Rolloff Factor = %f; dwApply = %d\n", fRolloffFactor, dwApply); + TRACE("setting: Rolloff Factor = %f; dwApply = %ld\n", fRolloffFactor, dwApply); This->device->ds3dl.flRolloffFactor = fRolloffFactor; if (dwApply == DS3D_IMMEDIATE) { @@ -961,7 +961,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetVelocity(IDirectSound3DListe { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); - TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); + TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply); This->device->ds3dl.vVelocity.x = x; This->device->ds3dl.vVelocity.y = y; This->device->ds3dl.vVelocity.z = z;
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Feb 10, 2022 at 08:41:37AM +0100, Eric Pouech wrote:
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
--- dlls/dsound/Makefile.in | 1 - dlls/dsound/buffer.c | 86 ++++++++++++++++++++++--------------------- dlls/dsound/capture.c | 80 ++++++++++++++++++++-------------------- dlls/dsound/dsound.c | 34 +++++++++-------- dlls/dsound/dsound_main.c | 24 ++++++------ dlls/dsound/duplex.c | 12 +++--- dlls/dsound/mixer.c | 52 +++++++++++++------------- dlls/dsound/primary.c | 90 +++++++++++++++++++++++---------------------- dlls/dsound/propset.c | 30 ++++++++------- dlls/dsound/sound3d.c | 62 ++++++++++++++++--------------- 10 files changed, 235 insertions(+), 236 deletions(-)
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in index b06d3b673c8..6cb653fdfa0 100644 --- a/dlls/dsound/Makefile.in +++ b/dlls/dsound/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsound.dll IMPORTLIB = dsound IMPORTS = dxguid uuid winmm ole32 advapi32 user32 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 9084ccd9928..eb87479b7df 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -59,7 +59,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -72,7 +72,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -119,7 +119,7 @@ static void commit_next_chunk(IDirectSoundBufferImpl *dsb)
dsb->use_committed = TRUE; dsb->committed_mixpos = 0; - TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); + TRACE("committing %lu bytes from offset %lu\n", dsb->writelead, dsb->sec_mixpos); }
static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSoundNotify *iface, @@ -127,7 +127,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSou { IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface);
- TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify); + TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify);
if (howmuch > 0 && notify == NULL) { WARN("invalid parameter: notify == NULL\n"); @@ -137,7 +137,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSou if (TRACE_ON(dsound)) { unsigned int i; for (i=0;i<howmuch;i++) - TRACE("notify at %d to %p\n", + TRACE("notify at %ld to %p\n", notify[i].dwOffset,notify[i].hEventNotify); }
@@ -208,15 +208,15 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume(IDirectSoundBuffer8 *ifac
HRESULT hres = DS_OK;
- TRACE("(%p,%d)\n",This,vol); + TRACE("(%p,%ld)\n",This,vol);
if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { - WARN("control unavailable: This->dsbd.dwFlags = 0x%08x\n", This->dsbd.dwFlags); + WARN("control unavailable: This->dsbd.dwFlags = 0x%08lx\n", This->dsbd.dwFlags); return DSERR_CONTROLUNAVAIL; }
if ((vol > DSBVOLUME_MAX) || (vol < DSBVOLUME_MIN)) { - WARN("invalid parameter: vol = %d\n", vol); + WARN("invalid parameter: vol = %ld\n", vol); return DSERR_INVALIDPARAM; }
@@ -267,7 +267,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i DWORD oldFreq; void *newcommitted;
- TRACE("(%p,%d)\n",This,freq); + TRACE("(%p,%ld)\n",This,freq);
if (is_primary_buffer(This)) { WARN("not available for primary buffers.\n"); @@ -283,7 +283,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i freq = This->pwfx->nSamplesPerSec;
if ((freq < DSBFREQUENCY_MIN) || (freq > DSBFREQUENCY_MAX)) { - WARN("invalid parameter: freq = %d\n", freq); + WARN("invalid parameter: freq = %ld\n", freq); return DSERR_INVALIDPARAM; }
@@ -317,7 +317,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(IDirectSoundBuffer8 *iface, DW HRESULT hres = DS_OK; int i;
- TRACE("(%p,%08x,%08x,%08x)\n",This,reserved1,reserved2,flags); + TRACE("(%p,%08lx,%08lx,%08lx)\n",This,reserved1,reserved2,flags);
AcquireSRWLockExclusive(&This->lock);
@@ -363,7 +363,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_AddRef(IDirectSoundBuffer8 *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -380,7 +380,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) ref = capped_refcount_dec(&This->ref); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); return ref; }
@@ -388,7 +388,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
return ref; } @@ -407,7 +407,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition(IDirectSoundBuff
/* sanity */ if (pos >= This->buflen){ - FIXME("Bad play position. playpos: %d, buflen: %d\n", pos, This->buflen); + FIXME("Bad play position. playpos: %ld, buflen: %ld\n", pos, This->buflen); pos %= This->buflen; }
@@ -424,7 +424,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition(IDirectSoundBuff
ReleaseSRWLockShared(&This->lock);
- TRACE("playpos = %d, writepos = %d, buflen=%d (%p, time=%d)\n", + TRACE("playpos = %ld, writepos = %ld, buflen=%ld (%p, time=%ld)\n", playpos?*playpos:-1, writepos?*writepos:-1, This->buflen, This, GetTickCount());
return DS_OK; @@ -452,7 +452,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus(IDirectSoundBuffer8 *ifac *status |= DSBSTATUS_LOCSOFTWARE; ReleaseSRWLockShared(&This->lock);
- TRACE("status=%x\n", *status); + TRACE("status=%lx\n", *status); return DS_OK; }
@@ -463,7 +463,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFormat(IDirectSoundBuffer8 *ifac IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DWORD size;
- TRACE("(%p,%p,%d,%p)\n",This,lpwf,wfsize,wfwritten); + TRACE("(%p,%p,%ld,%p)\n",This,lpwf,wfsize,wfwritten);
size = sizeof(WAVEFORMATEX) + This->pwfx->cbSize;
@@ -498,7 +498,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); HRESULT hres = DS_OK;
- TRACE("(%p,%d,%d,%p,%p,%p,%p,0x%08x) at %d\n", This, writecursor, writebytes, lplpaudioptr1, + TRACE("(%p,%ld,%ld,%p,%p,%p,%p,0x%08lx) at %ld\n", This, writecursor, writebytes, lplpaudioptr1, audiobytes1, lplpaudioptr2, audiobytes2, flags, GetTickCount());
if (!audiobytes1) @@ -519,13 +519,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW writebytes = This->buflen;
if (writecursor >= This->buflen) { - WARN("Invalid parameter, writecursor: %u >= buflen: %u\n", + WARN("Invalid parameter, writecursor: %lu >= buflen: %lu\n", writecursor, This->buflen); return DSERR_INVALIDPARAM; }
if (writebytes > This->buflen) { - WARN("Invalid parameter, writebytes: %u > buflen: %u\n", + WARN("Invalid parameter, writebytes: %lu > buflen: %lu\n", writebytes, This->buflen); return DSERR_INVALIDPARAM; } @@ -543,9 +543,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW *(LPBYTE*)lplpaudioptr2 = NULL; if (audiobytes2) *audiobytes2 = 0; - TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", + TRACE("Locked %p(%li bytes) and %p(%li bytes) writecursor=%ld\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); - TRACE("->%d.0\n",writebytes); + TRACE("->%ld.0\n",writebytes); This->buffer->lockedbytes += writebytes; } else { DWORD remainder = writebytes + writecursor - This->buflen; @@ -566,7 +566,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW WARN("Overwriting mixing position, case 3\n"); commit_next_chunk(This); } - TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); + TRACE("Locked %p(%li bytes) and %p(%li bytes) writecursor=%ld\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); }
ReleaseSRWLockShared(&This->lock); @@ -580,7 +580,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(IDirectSoundBuff IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); HRESULT hres = DS_OK;
- TRACE("(%p,%d)\n",This,newpos); + TRACE("(%p,%ld)\n",This,newpos);
AcquireSRWLockExclusive(&This->lock);
@@ -605,10 +605,10 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetPan(IDirectSoundBuffer8 *iface, IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); HRESULT hres = DS_OK;
- TRACE("(%p,%d)\n",This,pan); + TRACE("(%p,%ld)\n",This,pan);
if ((pan > DSBPAN_RIGHT) || (pan < DSBPAN_LEFT)) { - WARN("invalid parameter: pan = %d\n", pan); + WARN("invalid parameter: pan = %ld\n", pan); return DSERR_INVALIDPARAM; }
@@ -656,7 +656,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface), *iter; HRESULT hres = DS_OK;
- TRACE("(%p,%p,%d,%p,%d)\n", This,p1,x1,p2,x2); + TRACE("(%p,%p,%ld,%p,%ld)\n", This,p1,x1,p2,x2);
if (!p2) x2 = 0; @@ -714,7 +714,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFrequency(IDirectSoundBuffer8 *i }
*freq = This->freq; - TRACE("-> %d\n", *freq); + TRACE("-> %ld\n", *freq);
return DS_OK; } @@ -746,7 +746,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFX(IDirectSoundBuffer8 *iface, D DMO_MEDIA_TYPE dmt; WAVEFORMATEX wfx;
- TRACE("(%p,%u,%p,%p)\n", This, dwEffectsCount, pDSFXDesc, pdwResultCodes); + TRACE("(%p,%lu,%p,%p)\n", This, dwEffectsCount, pDSFXDesc, pdwResultCodes);
if (pdwResultCodes) for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; @@ -808,7 +808,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFX(IDirectSoundBuffer8 *iface, D dmt.pbFormat = (BYTE*)&wfx;
for (u = 0; u < dwEffectsCount; u++) { - TRACE("%d: 0x%08x, %s\n", u, pDSFXDesc[u].dwFlags, dump_DSFX_guid(&pDSFXDesc[u])); + TRACE("%ld: 0x%08lx, %s\n", u, pDSFXDesc[u].dwFlags, dump_DSFX_guid(&pDSFXDesc[u]));
hr2 = CoCreateInstance(&pDSFXDesc[u].guidDSFXClass, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (LPVOID*)&filters[u].obj);
@@ -874,7 +874,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources(IDirectSoundBuffer IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DWORD u;
- FIXME("(%p,%08u,%u,%p): stub, faking success\n",This,dwFlags,dwEffectsCount,pdwResultCodes); + FIXME("(%p,%08lu,%lu,%p): stub, faking success\n",This,dwFlags,dwEffectsCount,pdwResultCodes);
if (pdwResultCodes) for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; @@ -889,7 +889,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(IDirectSoundBuffer8 IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DWORD i, count = 0;
- TRACE("(%p,%s,%u,%s,%p)\n", This, debugstr_guid(clsid), index, debugstr_guid(iid), out); + TRACE("(%p,%s,%lu,%s,%p)\n", This, debugstr_guid(clsid), index, debugstr_guid(iid), out);
if (!out) return E_INVALIDARG; @@ -926,7 +926,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCaps(IDirectSoundBuffer8 *iface, }
if (caps->dwSize < sizeof(*caps)) { - WARN("invalid parameter: caps->dwSize = %d\n",caps->dwSize); + WARN("invalid parameter: caps->dwSize = %ld\n",caps->dwSize); return DSERR_INVALIDPARAM; }
@@ -1041,7 +1041,7 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds TRACE("(%p,%p,%p)\n", device, dsbd, buffer);
if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) { - WARN("invalid parameter: dsbd->dwBufferBytes = %d\n", dsbd->dwBufferBytes); + WARN("invalid parameter: dsbd->dwBufferBytes = %ld\n", dsbd->dwBufferBytes); return DSERR_INVALIDPARAM; /* FIXME: which error? */ }
@@ -1089,7 +1089,7 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds if (wfex->wBitsPerSample==16) capf |= DSCAPS_SECONDARY16BIT; else capf |= DSCAPS_SECONDARY8BIT;
- TRACE("capf = 0x%08x, device->drvcaps.dwFlags = 0x%08x\n", capf, device->drvcaps.dwFlags); + TRACE("capf = 0x%08lx, device->drvcaps.dwFlags = 0x%08lx\n", capf, device->drvcaps.dwFlags);
/* Allocate an empty buffer */ bufsize = (sizeof(*(dsb->buffer)) + sizeof(void *) - 1) & ~(sizeof(void *) - 1); @@ -1167,7 +1167,7 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) ULONG ref = InterlockedIncrement(&This->numIfaces);
if (ref > 1) - WARN("Destroying buffer with %u in use interfaces\n", ref - 1); + WARN("Destroying buffer with %lu in use interfaces\n", ref - 1);
if (This->dsbd.dwFlags & DSBCAPS_LOCHARDWARE) This->device->drvcaps.dwFreeHwMixingAllBuffers++; @@ -1307,7 +1307,7 @@ static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&This->refiks);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -1324,7 +1324,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) ref = capped_refcount_dec(&This->refiks); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); return ref; }
@@ -1332,7 +1332,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
return ref; } @@ -1343,7 +1343,7 @@ static HRESULT WINAPI IKsPropertySetImpl_Get(IKsPropertySet *iface, REFGUID guid { IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface);
- TRACE("(iface=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("(iface=%p,guidPropSet=%s,dwPropID=%ld,pInstanceData=%p,cbInstanceData=%ld,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n", This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned);
return E_PROP_ID_UNSUPPORTED; @@ -1355,7 +1355,7 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid { IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface);
- TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData); + TRACE("(%p,%s,%ld,%p,%ld,%p,%ld)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
return E_PROP_ID_UNSUPPORTED; } @@ -1365,7 +1365,7 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF { IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface);
- TRACE("(%p,%s,%d,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport); + TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
return E_PROP_ID_UNSUPPORTED; } diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 2fb3ce8c4a6..a00748d95bf 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -136,7 +136,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -149,7 +149,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -161,7 +161,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSou DWORD howmuch, const DSBPOSITIONNOTIFY *notify) { IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); - TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify); + TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify);
if (howmuch > 0 && notify == NULL) { WARN("invalid parameter: notify == NULL\n"); @@ -171,7 +171,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSou if (TRACE_ON(dsound)) { unsigned int i; for (i=0;i<howmuch;i++) - TRACE("notify at %d to %p\n", + TRACE("notify at %ld to %p\n", notify[i].dwOffset,notify[i].hEventNotify); }
@@ -262,7 +262,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_AddRef(IDirectSoundCaptureBuff IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -275,7 +275,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_Release(IDirectSoundCaptureBuf IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -295,7 +295,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetCaps(IDirectSoundCaptureB }
if (lpDSCBCaps->dwSize < sizeof(DSCBCAPS)) { - WARN("invalid parameter: lpDSCBCaps->dwSize = %d\n", lpDSCBCaps->dwSize); + WARN("invalid parameter: lpDSCBCaps->dwSize = %ld\n", lpDSCBCaps->dwSize); return DSERR_INVALIDPARAM; }
@@ -341,7 +341,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetCurrentPosition(IDirectSo
LeaveCriticalSection(&This->device->lock);
- TRACE("cappos=%d readpos=%d\n", (lpdwCapturePosition?*lpdwCapturePosition:-1), (lpdwReadPosition?*lpdwReadPosition:-1)); + TRACE("cappos=%ld readpos=%ld\n", (lpdwCapturePosition?*lpdwCapturePosition:-1), (lpdwReadPosition?*lpdwReadPosition:-1)); TRACE("returning DS_OK\n");
return DS_OK; @@ -353,7 +353,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetFormat(IDirectSoundCaptur IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); HRESULT hres = DS_OK;
- TRACE("(%p,%p,0x%08x,%p)\n", This, lpwfxFormat, dwSizeAllocated, lpdwSizeWritten); + TRACE("(%p,%p,0x%08lx,%p)\n", This, lpwfxFormat, dwSizeAllocated, lpdwSizeWritten);
if (This->device == NULL) { WARN("invalid parameter: This->device == NULL\n"); @@ -376,7 +376,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetFormat(IDirectSoundCaptur } }
- TRACE("returning %08x\n", hres); + TRACE("returning %08lx\n", hres); return hres; }
@@ -400,7 +400,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetStatus(IDirectSoundCaptur *lpdwStatus = 0; EnterCriticalSection(&(This->device->lock));
- TRACE("old This->device->state=%s, old lpdwStatus=%08x\n", + TRACE("old This->device->state=%s, old lpdwStatus=%08lx\n", captureStateString[This->device->state],*lpdwStatus); if ((This->device->state == STATE_STARTING) || (This->device->state == STATE_CAPTURING)) { @@ -408,11 +408,11 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetStatus(IDirectSoundCaptur if (This->flags & DSCBSTART_LOOPING) *lpdwStatus |= DSCBSTATUS_LOOPING; } - TRACE("new This->device->state=%s, new lpdwStatus=%08x\n", + TRACE("new This->device->state=%s, new lpdwStatus=%08lx\n", captureStateString[This->device->state],*lpdwStatus); LeaveCriticalSection(&(This->device->lock));
- TRACE("status=%x\n", *lpdwStatus); + TRACE("status=%lx\n", *lpdwStatus); TRACE("returning DS_OK\n"); return DS_OK; } @@ -434,7 +434,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Lock(IDirectSoundCaptureBuff IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); HRESULT hres = DS_OK;
- TRACE( "(%p,%08u,%08u,%p,%p,%p,%p,0x%08x) at %d\n", This, dwReadCusor, + TRACE( "(%p,%08lu,%08lu,%p,%p,%p,%p,0x%08lx) at %ld\n", This, dwReadCusor, dwReadBytes, lplpvAudioPtr1, lpdwAudioBytes1, lplpvAudioPtr2, lpdwAudioBytes2, dwFlags, GetTickCount() );
@@ -477,7 +477,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Lock(IDirectSoundCaptureBuff
LeaveCriticalSection(&(This->device->lock));
- TRACE("returning %08x\n", hres); + TRACE("returning %08lx\n", hres); return hres; }
@@ -487,7 +487,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Start(IDirectSoundCaptureBuf IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); HRESULT hres;
- TRACE( "(%p,0x%08x)\n", This, dwFlags ); + TRACE( "(%p,0x%08lx)\n", This, dwFlags );
if (This->device == NULL) { WARN("invalid parameter: This->device == NULL\n"); @@ -515,7 +515,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Start(IDirectSoundCaptureBuf
hres = IAudioClient_Start(This->device->client); if(FAILED(hres)){ - WARN("Start failed: %08x\n", hres); + WARN("Start failed: %08lx\n", hres); LeaveCriticalSection(&This->device->lock); return hres; } @@ -572,7 +572,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Unlock(IDirectSoundCaptureBu IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); HRESULT hres = DS_OK;
- TRACE( "(%p,%p,%08u,%p,%08u)\n", This, lpvAudioPtr1, dwAudioBytes1, + TRACE( "(%p,%p,%08lu,%p,%08lu)\n", This, lpvAudioPtr1, dwAudioBytes1, lpvAudioPtr2, dwAudioBytes2 );
if (lpvAudioPtr1 == NULL) { @@ -585,7 +585,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Unlock(IDirectSoundCaptureBu hres = DSERR_INVALIDCALL; }
- TRACE("returning %08x\n", hres); + TRACE("returning %08lx\n", hres); return hres; }
@@ -594,7 +594,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetObjectInPath(IDirectSound { IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface);
- FIXME( "(%p,%s,%u,%s,%p): stub\n", This, debugstr_guid(rguidObject), + FIXME( "(%p,%s,%lu,%s,%p): stub\n", This, debugstr_guid(rguidObject), dwIndex, debugstr_guid(rguidInterface), ppObject );
if (!ppObject) @@ -609,7 +609,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetFXStatus(IDirectSoundCapt { IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface);
- FIXME( "(%p,%u,%p): stub\n", This, dwFXCount, pdwFXStatus ); + FIXME( "(%p,%lu,%p): stub\n", This, dwFXCount, pdwFXStatus );
return DS_OK; } @@ -643,7 +643,7 @@ static void capture_CheckNotify(IDirectSoundCaptureBufferImpl *This, DWORD from, for (i = 0; i < This->nrofnotifies; ++i) { LPDSBPOSITIONNOTIFY event = This->notifies + i; DWORD offset = event->dwOffset; - TRACE("checking %d, position %d, event = %p\n", i, offset, event->hEventNotify); + TRACE("checking %d, position %ld, event = %p\n", i, offset, event->hEventNotify);
if (offset == DSBPN_OFFSETSTOP) { if (!from && !len) { @@ -698,8 +698,8 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create(
wfex = lpcDSCBufferDesc->lpwfxFormat;
- TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," - "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", + TRACE("(formattag=0x%04x,chans=%d,samplerate=%ld," + "bytespersec=%ld,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", wfex->wFormatTag, wfex->nChannels, wfex->nSamplesPerSec, wfex->nAvgBytesPerSec, wfex->nBlockAlign, wfex->wBitsPerSample, wfex->cbSize); @@ -743,7 +743,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( err = IMMDevice_Activate(device->mmdevice, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&device->client); if(FAILED(err)){ - WARN("Activate failed: %08x\n", err); + WARN("Activate failed: %08lx\n", err); HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); @@ -754,7 +754,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST | AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 200 * 100000, 0, device->pwfx, NULL); if(FAILED(err)){ - WARN("Initialize failed: %08x\n", err); + WARN("Initialize failed: %08lx\n", err); IAudioClient_Release(device->client); device->client = NULL; HeapFree(GetProcessHeap(), 0, This->pdscbd); @@ -769,7 +769,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create(
err = IAudioClient_SetEventHandle(device->client, This->sleepev); if(FAILED(err)){ - WARN("SetEventHandle failed: %08x\n", err); + WARN("SetEventHandle failed: %08lx\n", err); IAudioClient_Release(device->client); device->client = NULL; CloseHandle(This->sleepev); @@ -782,7 +782,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( err = IAudioClient_GetService(device->client, &IID_IAudioCaptureClient, (void**)&device->capture); if(FAILED(err)){ - WARN("GetService failed: %08x\n", err); + WARN("GetService failed: %08lx\n", err); IAudioClient_Release(device->client); device->client = NULL; CloseHandle(This->sleepev); @@ -793,7 +793,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( }
buflen = lpcDSCBufferDesc->dwBufferBytes; - TRACE("desired buflen=%d, old buffer=%p\n", buflen, device->buffer); + TRACE("desired buflen=%ld, old buffer=%p\n", buflen, device->buffer); if (device->buffer) newbuf = HeapReAlloc(GetProcessHeap(),0,device->buffer,buflen); else @@ -854,7 +854,7 @@ static ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device) { ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref %d\n", device, ref); + TRACE("(%p) ref %ld\n", device, ref);
if (!ref) { TRACE("deleting object\n"); @@ -900,7 +900,7 @@ static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) hr = IAudioCaptureClient_GetBuffer(device->capture, &buf, &packet_frames, &flags, NULL, NULL); if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); return hr; } if(hr == AUDCLNT_S_BUFFER_EMPTY) @@ -936,7 +936,7 @@ static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device)
hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_frames); if(FAILED(hr)){ - WARN("ReleaseBuffer failed: %08x\n", hr); + WARN("ReleaseBuffer failed: %08lx\n", hr); return hr; } } @@ -953,7 +953,7 @@ static DWORD WINAPI DSOUND_capture_thread(void *user)
hr = IAudioClient_GetDevicePeriod(buffer->device->client, &period, NULL); if(FAILED(hr)){ - WARN("GetDevicePeriod failed: %08x\n", hr); + WARN("GetDevicePeriod failed: %08lx\n", hr); wait_ms = 5; }else wait_ms = MulDiv(5, period, 10000); @@ -971,7 +971,7 @@ static DWORD WINAPI DSOUND_capture_thread(void *user)
LeaveCriticalSection(&buffer->device->lock); }else if(ret != WAIT_TIMEOUT) - WARN("WaitForSingleObject failed: %u\n", GetLastError()); + WARN("WaitForSingleObject failed: %lu\n", GetLastError()); }
return 0; @@ -1141,7 +1141,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) IDirectSoundCaptureImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -1153,7 +1153,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) IDirectSoundCaptureImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) capture_destroy(This); @@ -1188,7 +1188,7 @@ static ULONG WINAPI IDirectSoundCaptureImpl_AddRef(IDirectSoundCapture *iface) IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); ULONG ref = InterlockedIncrement(&This->refdsc);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -1200,7 +1200,7 @@ static ULONG WINAPI IDirectSoundCaptureImpl_Release(IDirectSoundCapture *iface) IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); ULONG ref = InterlockedDecrement(&This->refdsc);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) capture_destroy(This); @@ -1266,7 +1266,7 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps(IDirectSoundCapture *iface }
if (lpDSCCaps->dwSize < sizeof(*lpDSCCaps)) { - WARN("invalid parameter: lpDSCCaps->dwSize = %d\n", lpDSCCaps->dwSize); + WARN("invalid parameter: lpDSCCaps->dwSize = %ld\n", lpDSCCaps->dwSize); return DSERR_INVALIDPARAM; }
@@ -1274,7 +1274,7 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps(IDirectSoundCapture *iface lpDSCCaps->dwFormats = This->device->drvcaps.dwFormats; lpDSCCaps->dwChannels = This->device->drvcaps.dwChannels;
- TRACE("(flags=0x%08x,format=0x%08x,channels=%d)\n",lpDSCCaps->dwFlags, + TRACE("(flags=0x%08lx,format=0x%08lx,channels=%ld)\n",lpDSCCaps->dwFlags, lpDSCCaps->dwFormats, lpDSCCaps->dwChannels);
return DS_OK; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index bcff0d8642a..346cc4ceca3 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -60,7 +60,7 @@ static const char * dumpCooperativeLevel(DWORD level) LE(DSSCL_WRITEPRIMARY); } #undef LE - return wine_dbg_sprintf("Unknown(%08x)", level); + return wine_dbg_sprintf("Unknown(%08lx)", level); }
static void _dump_DSCAPS(DWORD xmask) { @@ -190,7 +190,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device) { ULONG ref = InterlockedIncrement(&(device->ref)); - TRACE("(%p) ref %d\n", device, ref); + TRACE("(%p) ref %ld\n", device, ref); return ref; }
@@ -198,7 +198,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) { HRESULT hr; ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref %d\n", device, ref); + TRACE("(%p) ref %ld\n", device, ref); if (!ref) { int i;
@@ -328,7 +328,7 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU HeapFree(GetProcessHeap(), 0, device); LeaveCriticalSection(&DSOUND_renderers_lock); IMMDevice_Release(mmdevice); - WARN("DSOUND_ReopenDevice failed: %08x\n", hr); + WARN("DSOUND_ReopenDevice failed: %08lx\n", hr); return hr; }
@@ -426,11 +426,11 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( *ppdsb = NULL;
if (TRACE_ON(dsound)) { - TRACE("(structsize=%d)\n",dsbd->dwSize); - TRACE("(flags=0x%08x:\n",dsbd->dwFlags); + TRACE("(structsize=%ld)\n",dsbd->dwSize); + TRACE("(flags=0x%08lx:\n",dsbd->dwFlags); _dump_DSBCAPS(dsbd->dwFlags); TRACE(")\n"); - TRACE("(bufferbytes=%d)\n",dsbd->dwBufferBytes); + TRACE("(bufferbytes=%ld)\n",dsbd->dwBufferBytes); TRACE("(lpwfxFormat=%p)\n",dsbd->lpwfxFormat); }
@@ -526,8 +526,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( } }
- TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," - "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", + TRACE("(formattag=0x%04x,chans=%d,samplerate=%ld," + "bytespersec=%ld,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", dsbd->lpwfxFormat->wFormatTag, dsbd->lpwfxFormat->nChannels, dsbd->lpwfxFormat->nSamplesPerSec, dsbd->lpwfxFormat->nAvgBytesPerSec, @@ -710,7 +710,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) IDirectSoundImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -723,7 +723,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) IDirectSoundImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) directsound_destroy(This); @@ -759,7 +759,7 @@ static ULONG WINAPI IDirectSound8Impl_AddRef(IDirectSound8 *iface) IDirectSoundImpl *This = impl_from_IDirectSound8(iface); ULONG ref = InterlockedIncrement(&This->refds);
- TRACE("(%p) refds=%d\n", This, ref); + TRACE("(%p) refds=%ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -772,7 +772,7 @@ static ULONG WINAPI IDirectSound8Impl_Release(IDirectSound8 *iface) IDirectSoundImpl *This = impl_from_IDirectSound8(iface); ULONG ref = InterlockedDecrement(&(This->refds));
- TRACE("(%p) refds=%d\n", This, ref); + TRACE("(%p) refds=%ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) directsound_destroy(This); @@ -803,7 +803,7 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds return DSERR_INVALIDPARAM; } if (dscaps->dwSize < sizeof(*dscaps)) { - WARN("invalid parameter: dscaps->dwSize = %d\n", dscaps->dwSize); + WARN("invalid parameter: dscaps->dwSize = %ld\n", dscaps->dwSize); return DSERR_INVALIDPARAM; }
@@ -831,7 +831,7 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds dscaps->dwPlayCpuOverheadSwBuffers = This->device->drvcaps.dwPlayCpuOverheadSwBuffers;
if (TRACE_ON(dsound)) { - TRACE("(flags=0x%08x:\n", dscaps->dwFlags); + TRACE("(flags=0x%08lx:\n", dscaps->dwFlags); _dump_DSCAPS(dscaps->dwFlags); TRACE(")\n"); } @@ -919,7 +919,7 @@ static HRESULT WINAPI IDirectSound8Impl_SetSpeakerConfig(IDirectSound8 *iface, D { IDirectSoundImpl *This = impl_from_IDirectSound8(iface);
- TRACE("(%p,0x%08x)\n", This, config); + TRACE("(%p,0x%08lx)\n", This, config);
if (!This->device) { WARN("not initialized\n"); @@ -1193,6 +1193,6 @@ void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device) break;
default: - WARN("unknown speaker_config %u\n", device->speaker_config); + WARN("unknown speaker_config %lu\n", device->speaker_config); } } diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index f3bce6062fe..215588393d8 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -174,7 +174,7 @@ static HRESULT get_mmdevenum(IMMDeviceEnumerator **devenum) if(SUCCEEDED(init_hr)) CoUninitialize(); *devenum = NULL; - ERR("CoCreateInstance failed: %08x\n", hr); + ERR("CoCreateInstance failed: %08lx\n", hr); return hr; }
@@ -197,7 +197,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps, if(!ps){ hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); + WARN("OpenPropertyStore failed: %08lx\n", hr); return hr; } }else @@ -208,7 +208,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps, hr = IPropertyStore_GetValue(ps, &PKEY_AudioEndpoint_GUID, &pv); if(FAILED(hr)){ IPropertyStore_Release(ps); - WARN("GetValue(GUID) failed: %08x\n", hr); + WARN("GetValue(GUID) failed: %08lx\n", hr); return hr; }
@@ -276,7 +276,7 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest) hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, flow, role, &device); if(FAILED(hr)){ - WARN("GetDefaultAudioEndpoint failed: %08x\n", hr); + WARN("GetDefaultAudioEndpoint failed: %08lx\n", hr); release_mmdevenum(devenum, init_hr); return DSERR_NODRIVER; } @@ -357,7 +357,7 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow, DEVICE_STATE_ACTIVE, &coll); if(FAILED(hr)){ - WARN("EnumAudioEndpoints failed: %08x\n", hr); + WARN("EnumAudioEndpoints failed: %08lx\n", hr); release_mmdevenum(devenum, init_hr); return hr; } @@ -366,7 +366,7 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) if(FAILED(hr)){ IMMDeviceCollection_Release(coll); release_mmdevenum(devenum, init_hr); - WARN("GetCount failed: %08x\n", hr); + WARN("GetCount failed: %08lx\n", hr); return hr; }
@@ -412,7 +412,7 @@ static BOOL send_device(IMMDevice *device, GUID *guid,
hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); + WARN("OpenPropertyStore failed: %08lx\n", hr); return TRUE; }
@@ -426,7 +426,7 @@ static BOOL send_device(IMMDevice *device, GUID *guid, (const PROPERTYKEY *)&DEVPKEY_Device_FriendlyName, &pv); if(FAILED(hr)){ IPropertyStore_Release(ps); - WARN("GetValue(FriendlyName) failed: %08x\n", hr); + WARN("GetValue(FriendlyName) failed: %08lx\n", hr); return TRUE; }
@@ -461,7 +461,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, DEVICE_STATE_ACTIVE, &coll); if(FAILED(hr)){ release_mmdevenum(devenum, init_hr); - WARN("EnumAudioEndpoints failed: %08x\n", hr); + WARN("EnumAudioEndpoints failed: %08lx\n", hr); return DS_OK; }
@@ -469,7 +469,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, if(FAILED(hr)){ IMMDeviceCollection_Release(coll); release_mmdevenum(devenum, init_hr); - WARN("GetCount failed: %08x\n", hr); + WARN("GetCount failed: %08lx\n", hr); return DS_OK; }
@@ -500,7 +500,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids,
hr = IMMDeviceCollection_Item(coll, i, &device); if(FAILED(hr)){ - WARN("Item failed: %08x\n", hr); + WARN("Item failed: %08lx\n", hr); continue; }
@@ -770,7 +770,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpvReserved); + TRACE("(%p %ld %p)\n", hInstDLL, fdwReason, lpvReserved);
switch (fdwReason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index cccfeba0f06..a3a9a066c31 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -107,7 +107,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -119,7 +119,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) fullduplex_destroy(This); @@ -154,7 +154,7 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_AddRef(IDirectSoundFullDuplex *if IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); ULONG ref = InterlockedIncrement(&This->refdsfd);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -166,7 +166,7 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_Release(IDirectSoundFullDuplex *i IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); ULONG ref = InterlockedDecrement(&This->refdsfd);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) fullduplex_destroy(This); @@ -183,7 +183,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDupl IDirectSoundCapture8 *dsc8 = NULL; HRESULT hr;
- TRACE("(%p,%s,%s,%p,%p,%p,%x,%p,%p)\n", This, debugstr_guid(capture_dev), + TRACE("(%p,%s,%s,%p,%p,%p,%lx,%p,%p)\n", This, debugstr_guid(capture_dev), debugstr_guid(render_dev), cbufdesc, bufdesc, hwnd, level, dscb8, dsb8);
if (!dscb8 || !dsb8) @@ -330,7 +330,7 @@ HRESULT WINAPI DirectSoundFullDuplexCreate(const GUID *capture_dev, const GUID * { HRESULT hr;
- TRACE("(%s,%s,%p,%p,%p,%x,%p,%p,%p,%p)\n", debugstr_guid(capture_dev), + TRACE("(%s,%s,%p,%p,%p,%lx,%p,%p,%p,%p)\n", debugstr_guid(capture_dev), debugstr_guid(render_dev), cbufdesc, bufdesc, hwnd, level, dsfd, dscb8, dsb8, outer_unk);
diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 1f91bc4dc0e..05b2bfbf8c3 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -47,7 +47,7 @@ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) double temp; TRACE("(%p)\n",volpan);
- TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan); + TRACE("Vol=%ld Pan=%ld\n", volpan->lVolume, volpan->lPan); /* the AmpFactors are expressed in 16.16 fixed point */
/* FIXME: use calculated vol and pan ampfactors */ @@ -56,7 +56,7 @@ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) temp = (double) (volpan->lVolume + (volpan->lPan < 0 ? volpan->lPan : 0)); volpan->dwTotalAmpFactor[1] = (ULONG) (pow(2.0, temp / 600.0) * 0xffff);
- TRACE("left = %x, right = %x\n", volpan->dwTotalAmpFactor[0], volpan->dwTotalAmpFactor[1]); + TRACE("left = %lx, right = %lx\n", volpan->dwTotalAmpFactor[0], volpan->dwTotalAmpFactor[1]); }
void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) @@ -64,7 +64,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) double left,right; TRACE("(%p)\n",volpan);
- TRACE("left=%x, right=%x\n",volpan->dwTotalAmpFactor[0],volpan->dwTotalAmpFactor[1]); + TRACE("left=%lx, right=%lx\n",volpan->dwTotalAmpFactor[0],volpan->dwTotalAmpFactor[1]); if (volpan->dwTotalAmpFactor[0]==0) left=-10000; else @@ -83,7 +83,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) if (volpan->lPan < -10000) volpan->lPan=-10000;
- TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan); + TRACE("Vol=%ld Pan=%ld\n", volpan->lVolume, volpan->lPan); }
/** @@ -142,7 +142,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) { dsb->mix_channels = ichannels; if (ichannels > 32) { - FIXME("Copying %u channels is unsupported, limiting to first 32\n", ichannels); + FIXME("Copying %lu channels is unsupported, limiting to first 32\n", ichannels); dsb->mix_channels = 32; } } @@ -193,7 +193,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) else { if (ichannels > 2) - FIXME("Conversion from %u to %u channels is not implemented, falling back to stereo\n", ichannels, ochannels); + FIXME("Conversion from %lu to %lu channels is not implemented, falling back to stereo\n", ichannels, ochannels); dsb->mix_channels = 2; } } @@ -248,7 +248,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len } }
- TRACE("Not stopped: first notify: %u (%u), left notify: %u (%u), range: [%u,%u)\n", + TRACE("Not stopped: first notify: %u (%lu), left notify: %u (%lu), range: [%lu,%lu)\n", first, dsb->notifies[first].dwOffset, left, dsb->notifies[left].dwOffset, playpos, (playpos + len) % dsb->buflen); @@ -259,7 +259,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len if(dsb->notifies[check].dwOffset >= playpos + len) break;
- TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); + TRACE("Signalling %p (%lu)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); SetEvent(dsb->notifies[check].hEventNotify); } } @@ -269,7 +269,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len if(dsb->notifies[check].dwOffset >= (playpos + len) % dsb->buflen) break;
- TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); + TRACE("Signalling %p (%lu)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); SetEvent(dsb->notifies[check].hEventNotify); } } @@ -492,7 +492,7 @@ static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames) UINT channels = dsb->device->pwfx->nChannels, chan;
TRACE("(%p,%d)\n",dsb,frames); - TRACE("left = %x, right = %x\n", dsb->volpan.dwTotalAmpFactor[0], + TRACE("left = %lx, right = %lx\n", dsb->volpan.dwTotalAmpFactor[0], dsb->volpan.dwTotalAmpFactor[1]);
if ((!(dsb->dsbd.dwFlags & DSBCAPS_CTRLPAN) || (dsb->volpan.lPan == 0)) && @@ -533,8 +533,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, float *ibuf; DWORD oldpos;
- TRACE("sec_mixpos=%d/%d\n", dsb->sec_mixpos, dsb->buflen); - TRACE("(%p, frames=%d)\n",dsb,frames); + TRACE("sec_mixpos=%ld/%ld\n", dsb->sec_mixpos, dsb->buflen); + TRACE("(%p, frames=%ld)\n",dsb,frames);
/* Resample buffer to temporary buffer specifically allocated for this purpose, if needed */ oldpos = dsb->sec_mixpos; @@ -573,8 +573,8 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD { DWORD primary_done = 0;
- TRACE("(%p, frames=%d)\n",dsb,frames); - TRACE("looping=%d, leadin=%d\n", dsb->playflags, dsb->leadin); + TRACE("(%p, frames=%ld)\n",dsb,frames); + TRACE("looping=%ld, leadin=%ld\n", dsb->playflags, dsb->leadin);
/* If leading in, only mix about 20 ms, and 'skip' mixing the rest, for more fluid pointer advancement */ /* FIXME: Is this needed? */ @@ -589,14 +589,14 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD
dsb->leadin = FALSE;
- TRACE("frames (primary) = %i\n", frames); + TRACE("frames (primary) = %li\n", frames);
/* First try to mix to the end of the buffer if possible * Theoretically it would allow for better optimization */ primary_done += DSOUND_MixInBuffer(dsb, mix_buffer, frames);
- TRACE("total mixed data=%d\n", primary_done); + TRACE("total mixed data=%ld\n", primary_done);
/* Report back the total prebuffered amount for this buffer */ return primary_done; @@ -620,14 +620,14 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff /* unless we find a running buffer, all have stopped */ *all_stopped = TRUE;
- TRACE("(frames %d)\n", frames); + TRACE("(frames %ld)\n", frames); for (i = 0; i < device->nrofbuffers; i++) { dsb = device->buffers[i];
- TRACE("MixToPrimary for %p, state=%d\n", dsb, dsb->state); + TRACE("MixToPrimary for %p, state=%ld\n", dsb, dsb->state);
if (dsb->buflen && dsb->state) { - TRACE("Checking %p, frames=%d\n", dsb, frames); + TRACE("Checking %p, frames=%ld\n", dsb, frames); AcquireSRWLockShared(&dsb->lock); if (dsb->state != STATE_STOPPED) {
@@ -664,7 +664,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes)
hr = IAudioRenderClient_GetBuffer(device->render, bytes / device->pwfx->nBlockAlign, &buffer); if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); return; }
@@ -672,7 +672,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes)
hr = IAudioRenderClient_ReleaseBuffer(device->render, bytes / device->pwfx->nBlockAlign, 0); if(FAILED(hr)) { - ERR("ReleaseBuffer failed: %08x\n", hr); + ERR("ReleaseBuffer failed: %08lx\n", hr); IAudioRenderClient_ReleaseBuffer(device->render, 0, 0); return; } @@ -705,7 +705,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device)
hr = IAudioClient_GetCurrentPadding(device->client, &pad_frames); if(FAILED(hr)){ - WARN("GetCurrentPadding failed: %08x\n", hr); + WARN("GetCurrentPadding failed: %08lx\n", hr); LeaveCriticalSection(&device->mixlock); return; } @@ -739,7 +739,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device)
hr = IAudioRenderClient_GetBuffer(device->render, frames, (BYTE **)&buffer); if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); LeaveCriticalSection(&device->mixlock); return; } @@ -759,7 +759,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device)
hr = IAudioRenderClient_ReleaseBuffer(device->render, frames, 0); if(FAILED(hr)) - ERR("ReleaseBuffer failed: %08x\n", hr); + ERR("ReleaseBuffer failed: %08lx\n", hr);
device->pad += frames * block; } else if (!device->stopped) { @@ -793,9 +793,9 @@ DWORD CALLBACK DSOUND_mixthread(void *p) */ ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); if (ret == WAIT_FAILED) - WARN("wait returned error %u %08x!\n", GetLastError(), GetLastError()); + WARN("wait returned error %lu %08lx!\n", GetLastError(), GetLastError()); else if (ret != WAIT_OBJECT_0) - WARN("wait returned %08x!\n", ret); + WARN("wait returned %08lx!\n", ret); if (!dev->ref) break;
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index e7da015a533..4f46f57926d 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -56,7 +56,7 @@ static DWORD speaker_config_to_channel_mask(DWORD speaker_config) return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; }
- WARN("unknown speaker_config %u\n", speaker_config); + WARN("unknown speaker_config %lu\n", speaker_config); return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; }
@@ -71,14 +71,14 @@ static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels)
hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &store); if (FAILED(hr)) { - WARN("IMMDevice_OpenPropertyStore failed: %08x\n", hr); + WARN("IMMDevice_OpenPropertyStore failed: %08lx\n", hr); return def; }
hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv);
if (FAILED(hr)) { - WARN("IPropertyStore_GetValue failed: %08x\n", hr); + WARN("IPropertyStore_GetValue failed: %08lx\n", hr); IPropertyStore_Release(store); return def; } @@ -188,7 +188,7 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client CoTaskMemFree(retwfe); } if (FAILED(hr)) { - WARN("IsFormatSupported failed: %08x\n", hr); + WARN("IsFormatSupported failed: %08lx\n", hr); HeapFree(GetProcessHeap(), 0, w); return hr; } @@ -263,7 +263,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx,
device->writelead = (wfx->nSamplesPerSec / 100) * wfx->nBlockAlign;
- TRACE("buflen: %u, frames %u\n", device->buflen, frames); + TRACE("buflen: %lu, frames %lu\n", device->buflen, frames);
if (!mixfloat) device->normfunction = normfunctions[wfx->wBitsPerSample/8 - 1]; @@ -299,7 +299,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) hres = IMMDevice_Activate(device->mmdevice, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void **)&client); if(FAILED(hres)){ - WARN("Activate failed: %08x\n", hres); + WARN("Activate failed: %08lx\n", hres); return hres; }
@@ -314,13 +314,13 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 800000, 0, wfx, NULL); if(FAILED(hres)){ IAudioClient_Release(client); - ERR("Initialize failed: %08x\n", hres); + ERR("Initialize failed: %08lx\n", hres); return hres; }
hres = IAudioClient_SetEventHandle(client, device->sleepev); if (FAILED(hres)) { - WARN("SetEventHandle failed: %08x\n", hres); + WARN("SetEventHandle failed: %08lx\n", hres); goto err; }
@@ -335,17 +335,17 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) /* Now kick off the timer so the event fires periodically */ hres = IAudioClient_Start(client); if (FAILED(hres)) { - WARN("Start failed with %08x\n", hres); + WARN("Start failed with %08lx\n", hres); goto err; } hres = IAudioClient_GetStreamLatency(client, &period); if (FAILED(hres)) { - WARN("GetStreamLatency failed with %08x\n", hres); + WARN("GetStreamLatency failed with %08lx\n", hres); goto err; } hres = IAudioClient_GetBufferSize(client, &acbuf_frames); if (FAILED(hres)) { - WARN("GetBufferSize failed with %08x\n", hres); + WARN("GetBufferSize failed with %08lx\n", hres); goto err; }
@@ -354,7 +354,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave)
aclen_frames = min(acbuf_frames, 3 * frag_frames);
- TRACE("period %u ms frag_frames %u buf_frames %u\n", period_ms, frag_frames, aclen_frames); + TRACE("period %lu ms frag_frames %lu buf_frames %u\n", period_ms, frag_frames, aclen_frames);
hres = DSOUND_PrimaryOpen(device, wfx, aclen_frames, forcewave); if(FAILED(hres)) @@ -375,7 +375,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return S_OK;
err_service: - WARN("GetService failed: %08x\n", hres); + WARN("GetService failed: %08lx\n", hres); err: device->speaker_config = oldspeakerconfig; DSOUND_ParseSpeakerConfig(device); @@ -396,7 +396,7 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) EnterCriticalSection(&(device->mixlock));
if(device->primary && (device->primary->ref || device->primary->numIfaces)) - WARN("Destroying primary buffer while references held (%u %u)\n", device->primary->ref, device->primary->numIfaces); + WARN("Destroying primary buffer while references held (%lu %lu)\n", device->primary->ref, device->primary->numIfaces);
HeapFree(GetProcessHeap(), 0, device->primary); device->primary = NULL; @@ -453,8 +453,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe WARN("invalid parameter: passed_fmt==NULL!\n"); return DSERR_INVALIDPARAM; } - TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," - "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", + TRACE("(formattag=0x%04x,chans=%d,samplerate=%ld," + "bytespersec=%ld,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", passed_fmt->wFormatTag, passed_fmt->nChannels, passed_fmt->nSamplesPerSec, passed_fmt->nAvgBytesPerSec, passed_fmt->nBlockAlign, passed_fmt->wBitsPerSample, passed_fmt->cbSize); @@ -539,7 +539,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LO float fvol; int i;
- TRACE("(%p,%d)\n", iface, vol); + TRACE("(%p,%ld)\n", iface, vol);
if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { WARN("control unavailable\n"); @@ -547,7 +547,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LO }
if ((vol > DSBVOLUME_MAX) || (vol < DSBVOLUME_MIN)) { - WARN("invalid parameter: vol = %d\n", vol); + WARN("invalid parameter: vol = %ld\n", vol); return DSERR_INVALIDPARAM; }
@@ -559,7 +559,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LO hr = IAudioStreamVolume_GetChannelVolume(device->volume, i, &fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("GetChannelVolume failed: %08x\n", hr); + WARN("GetChannelVolume failed: %08lx\n", hr); return hr; } } else @@ -579,7 +579,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LO hr = IAudioStreamVolume_SetChannelVolume(device->volume, i, fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("SetChannelVolume failed: %08x\n", hr); + WARN("SetChannelVolume failed: %08lx\n", hr); return hr; } } @@ -619,7 +619,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetVolume(IDirectSoundBuffer8 *iface, LO hr = IAudioStreamVolume_GetChannelVolume(device->volume, i, &fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("GetChannelVolume failed: %08x\n", hr); + WARN("GetChannelVolume failed: %08lx\n", hr); return hr; } } else @@ -639,7 +639,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetVolume(IDirectSoundBuffer8 *iface, LO static HRESULT WINAPI PrimaryBufferImpl_SetFrequency(IDirectSoundBuffer8 *iface, DWORD freq) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); - TRACE("(%p,%d)\n",This,freq); + TRACE("(%p,%ld)\n",This,freq);
/* You cannot set the frequency of the primary buffer */ WARN("control unavailable\n"); @@ -651,10 +651,10 @@ static HRESULT WINAPI PrimaryBufferImpl_Play(IDirectSoundBuffer8 *iface, DWORD r { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; - TRACE("(%p,%08x,%08x,%08x)\n", iface, reserved1, reserved2, flags); + TRACE("(%p,%08lx,%08lx,%08lx)\n", iface, reserved1, reserved2, flags);
if (!(flags & DSBPLAY_LOOPING)) { - WARN("invalid parameter: flags = %08x\n", flags); + WARN("invalid parameter: flags = %08lx\n", flags); return DSERR_INVALIDPARAM; }
@@ -678,7 +678,7 @@ static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer8 *iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); return ref; @@ -707,7 +707,7 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer8 *iface) if(!ref) capped_refcount_dec(&This->numIfaces);
- TRACE("(%p) primary ref %d\n", This, ref); + TRACE("(%p) primary ref %ld\n", This, ref);
return ref; } @@ -747,7 +747,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer8 * LeaveCriticalSection(&(device->mixlock)); /* **** */
- TRACE("playpos = %d, writepos = %d (%p, time=%d)\n", playpos?*playpos:0, writepos?*writepos:0, device, GetTickCount()); + TRACE("playpos = %ld, writepos = %ld (%p, time=%ld)\n", playpos?*playpos:0, writepos?*writepos:0, device, GetTickCount()); return DS_OK; }
@@ -766,7 +766,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetStatus(IDirectSoundBuffer8 *iface, DW if (!device->stopped) *status |= DSBSTATUS_PLAYING | DSBSTATUS_LOOPING;
- TRACE("status=%x\n", *status); + TRACE("status=%lx\n", *status); return DS_OK; }
@@ -777,7 +777,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer8 *iface, WA DWORD size; IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; - TRACE("(%p,%p,%d,%p)\n", iface, lpwf, wfsize, wfwritten); + TRACE("(%p,%p,%ld,%p)\n", iface, lpwf, wfsize, wfwritten);
size = sizeof(WAVEFORMATEX) + device->primary_pwfx->cbSize;
@@ -811,7 +811,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD w HRESULT hres; IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; - TRACE("(%p,%d,%d,%p,%p,%p,%p,0x%08x) at %d\n", + TRACE("(%p,%ld,%ld,%p,%p,%p,%p,0x%08lx) at %ld\n", iface, writecursor, writebytes, @@ -846,13 +846,13 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD w writebytes = device->buflen;
if (writecursor >= device->buflen) { - WARN("Invalid parameter, writecursor: %u >= buflen: %u\n", + WARN("Invalid parameter, writecursor: %lu >= buflen: %lu\n", writecursor, device->buflen); return DSERR_INVALIDPARAM; }
if (writebytes > device->buflen) { - WARN("Invalid parameter, writebytes: %u > buflen: %u\n", + WARN("Invalid parameter, writebytes: %lu > buflen: %lu\n", writebytes, device->buflen); return DSERR_INVALIDPARAM; } @@ -864,7 +864,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD w *(LPBYTE*)lplpaudioptr2 = NULL; if (audiobytes2) *audiobytes2 = 0; - TRACE("->%d.0\n",writebytes); + TRACE("->%ld.0\n",writebytes); } else { *(LPBYTE*)lplpaudioptr1 = device->buffer+writecursor; *audiobytes1 = device->buflen-writecursor; @@ -872,7 +872,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD w *(LPBYTE*)lplpaudioptr2 = device->buffer; if (audiobytes2) *audiobytes2 = writebytes-(device->buflen-writecursor); - TRACE("->%d.%d\n",*audiobytes1,audiobytes2?*audiobytes2:0); + TRACE("->%ld.%ld\n",*audiobytes1,audiobytes2?*audiobytes2:0); } return DS_OK; } @@ -880,7 +880,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD w static HRESULT WINAPI PrimaryBufferImpl_SetCurrentPosition(IDirectSoundBuffer8 *iface, DWORD newpos) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); - TRACE("(%p,%d)\n",This,newpos); + TRACE("(%p,%ld)\n",This,newpos);
/* You cannot set the position of the primary buffer */ WARN("invalid call\n"); @@ -895,7 +895,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG HRESULT hr; int i;
- TRACE("(%p,%d)\n", iface, pan); + TRACE("(%p,%ld)\n", iface, pan);
if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { WARN("control unavailable\n"); @@ -903,7 +903,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG }
if ((pan > DSBPAN_RIGHT) || (pan < DSBPAN_LEFT)) { - WARN("invalid parameter: pan = %d\n", pan); + WARN("invalid parameter: pan = %ld\n", pan); return DSERR_INVALIDPARAM; }
@@ -915,7 +915,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG hr = IAudioStreamVolume_GetChannelVolume(device->volume, i, &fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("GetChannelVolume failed: %08x\n", hr); + WARN("GetChannelVolume failed: %08lx\n", hr); return hr; } } else @@ -935,7 +935,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG hr = IAudioStreamVolume_SetChannelVolume(device->volume, i, fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("SetChannelVolume failed: %08x\n", hr); + WARN("SetChannelVolume failed: %08lx\n", hr); return hr; } } @@ -975,7 +975,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetPan(IDirectSoundBuffer8 *iface, LONG hr = IAudioStreamVolume_GetChannelVolume(device->volume, i, &fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); - WARN("GetChannelVolume failed: %08x\n", hr); + WARN("GetChannelVolume failed: %08lx\n", hr); return hr; } } else @@ -997,7 +997,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer8 *iface, void { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; - TRACE("(%p,%p,%d,%p,%d)\n", iface, p1, x1, p2, x2); + TRACE("(%p,%p,%ld,%p,%ld)\n", iface, p1, x1, p2, x2);
if (device->priolevel != DSSCL_WRITEPRIMARY) { WARN("failed priority check!\n"); @@ -1035,7 +1035,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFrequency(IDirectSoundBuffer8 *iface, }
*freq = device->pwfx->nSamplesPerSec; - TRACE("-> %d\n", *freq); + TRACE("-> %ld\n", *freq);
return DS_OK; } @@ -1060,7 +1060,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCaps(IDirectSoundBuffer8 *iface, DSBC }
if (caps->dwSize < sizeof(*caps)) { - WARN("invalid parameter: caps->dwSize = %d\n", caps->dwSize); + WARN("invalid parameter: caps->dwSize = %ld\n", caps->dwSize); return DSERR_INVALIDPARAM; }
@@ -1203,8 +1203,8 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * device->ds3dl_need_recalc = TRUE;
TRACE("Created primary buffer at %p\n", dsb); - TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," - "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", + TRACE("(formattag=0x%04x,chans=%d,samplerate=%ld," + "bytespersec=%ld,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", device->pwfx->wFormatTag, device->pwfx->nChannels, device->pwfx->nSamplesPerSec, device->pwfx->nAvgBytesPerSec, device->pwfx->nBlockAlign, device->pwfx->wBitsPerSample, diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 959256f8c4e..74d66cad68e 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -80,7 +80,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref); return ref; }
@@ -88,7 +88,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -124,7 +124,7 @@ static HRESULT DSPROPERTY_WaveDeviceMappingW( PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA ppd = pPropData; struct search_data search;
- TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned);
if (!ppd) { @@ -164,7 +164,7 @@ static HRESULT DSPROPERTY_WaveDeviceMappingA( DWORD len; HRESULT hr;
- TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned);
if (!ppd || !ppd->DeviceName) { @@ -201,7 +201,7 @@ static HRESULT DSPROPERTY_DescriptionW( PROPVARIANT pv; HRESULT hr;
- TRACE("pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned);
TRACE("DeviceId=%s\n",debugstr_guid(&ppd->DeviceId)); @@ -233,7 +233,7 @@ static HRESULT DSPROPERTY_DescriptionW( hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &ps); if(FAILED(hr)){ IMMDevice_Release(mmdevice); - WARN("OpenPropertyStore failed: %08x\n", hr); + WARN("OpenPropertyStore failed: %08lx\n", hr); return hr; }
@@ -242,7 +242,7 @@ static HRESULT DSPROPERTY_DescriptionW( if(FAILED(hr)){ IPropertyStore_Release(ps); IMMDevice_Release(mmdevice); - WARN("GetValue(FriendlyName) failed: %08x\n", hr); + WARN("GetValue(FriendlyName) failed: %08lx\n", hr); return hr; }
@@ -257,7 +257,7 @@ static HRESULT DSPROPERTY_DescriptionW(
if (pcbReturned) { *pcbReturned = sizeof(*ppd); - TRACE("*pcbReturned=%d\n", *pcbReturned); + TRACE("*pcbReturned=%ld\n", *pcbReturned); }
return S_OK; @@ -306,7 +306,7 @@ static HRESULT DSPROPERTY_EnumerateW( PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA ppd = pPropData; HRESULT hr;
- TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned);
if (pcbReturned) @@ -501,7 +501,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( PULONG pcbReturned ) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); - TRACE("(iface=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + TRACE("(iface=%p,guidPropSet=%s,dwPropID=%lu,pInstanceData=%p,cbInstanceData=%lu,pPropData=%p,cbPropData=%lu,pcbReturned=%p)\n", This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned);
if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) { @@ -523,7 +523,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( case DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: return DSPROPERTY_EnumerateW(pPropData,cbPropData,pcbReturned); default: - FIXME("unsupported ID: %d\n",dwPropID); + FIXME("unsupported ID: %ld\n",dwPropID); break; } } else { @@ -532,7 +532,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get(
if (pcbReturned) { *pcbReturned = 0; - FIXME("*pcbReturned=%d\n", *pcbReturned); + FIXME("*pcbReturned=%ld\n", *pcbReturned); }
return E_PROP_ID_UNSUPPORTED; @@ -549,7 +549,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Set( { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface);
- FIXME("(%p,%s,%d,%p,%d,%p,%d), stub!\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData); + FIXME("(%p,%s,%ld,%p,%ld,%p,%ld), stub!\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData); return E_PROP_ID_UNSUPPORTED; }
@@ -560,7 +560,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport( PULONG pTypeSupport ) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); - TRACE("(%p,%s,%d,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport); + TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) { switch (dwPropID) { @@ -589,7 +589,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport( *pTypeSupport = KSPROPERTY_SUPPORT_GET; return S_OK; default: - FIXME("unsupported ID: %d\n",dwPropID); + FIXME("unsupported ID: %ld\n",dwPropID); break; } } else { diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 06dbf58ca0b..48febdeb307 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -216,7 +216,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb)
/* attenuation proportional to the distance squared, converted to millibels as in lVolume*/ lVolume -= log10(flDistance/dsb->ds3db_ds3db.flMinDistance * flDistance/dsb->ds3db_ds3db.flMinDistance)*1000; - TRACE("dist. att: Distance = %f, MinDistance = %f => adjusting volume %d to %f\n", flDistance, dsb->ds3db_ds3db.flMinDistance, dsb->ds3db_lVolume, lVolume); + TRACE("dist. att: Distance = %f, MinDistance = %f => adjusting volume %ld to %f\n", flDistance, dsb->ds3db_ds3db.flMinDistance, dsb->ds3db_lVolume, lVolume);
/* conning */ /* sometimes it happens that vConeOrientation vector = (0,0,0); in this case angle is "nan" and it's useless*/ @@ -252,7 +252,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) /* this probably isn't the right thing, but it's ok for the time being */ lVolume += ((flAngle - dwInsideConeAngle)/(dwOutsideConeAngle - dwInsideConeAngle)) * dsb->ds3db_ds3db.lConeOutsideVolume; } - TRACE("conning: Angle = %f deg; InsideConeAngle(/2) = %d deg; OutsideConeAngle(/2) = %d deg; ConeOutsideVolume = %d => adjusting volume to %f\n", + TRACE("conning: Angle = %f deg; InsideConeAngle(/2) = %ld deg; OutsideConeAngle(/2) = %ld deg; ConeOutsideVolume = %ld => adjusting volume to %f\n", flAngle, dsb->ds3db_ds3db.dwInsideConeAngle/2, dsb->ds3db_ds3db.dwOutsideConeAngle/2, dsb->ds3db_ds3db.lConeOutsideVolume, lVolume); } dsb->volpan.lVolume = lVolume; @@ -286,7 +286,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) if (flAngle < -M_PI) flAngle += 2*M_PI; } - TRACE("panning: Angle = %f rad, lPan = %d\n", flAngle, dsb->volpan.lPan); + TRACE("panning: Angle = %f rad, lPan = %ld\n", flAngle, dsb->volpan.lPan);
/* FIXME: Doppler Effect disabled since i have no idea which frequency to change and how to do it */ if(0) @@ -312,7 +312,7 @@ if(0) /* formula taken from Gianicoli D.: Physics, 4th edition: */ /* FIXME: replace dsb->freq with appropriate frequency ! */ flFreq = dsb->freq * ((DEFAULT_VELOCITY + flListenerVel)/(DEFAULT_VELOCITY + flBufferVel)); - TRACE("doppler: Buffer velocity (component) = %f, Listener velocity (component) = %f => Doppler shift: %d Hz -> %f Hz\n", + TRACE("doppler: Buffer velocity (component) = %f, Listener velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", flBufferVel, flListenerVel, dsb->freq, flFreq); /* FIXME: replace following line with correct frequency setting ! */ dsb->freq = flFreq; @@ -395,7 +395,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(IDirectSound3DBuffer *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref3D);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -408,7 +408,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(IDirectSound3DBuffer *iface IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref3D);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -430,7 +430,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetAllParameters(IDirectSound3DBu }
if (lpDs3dBuffer->dwSize < sizeof(*lpDs3dBuffer)) { - WARN("invalid parameter: lpDs3dBuffer->dwSize = %d\n",lpDs3dBuffer->dwSize); + WARN("invalid parameter: lpDs3dBuffer->dwSize = %ld\n",lpDs3dBuffer->dwSize); return DSERR_INVALIDPARAM; }
@@ -444,7 +444,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeAngles(IDirectSound3DBuffe { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
- TRACE("returning: Inside Cone Angle = %d degrees; Outside Cone Angle = %d degrees\n", + TRACE("returning: Inside Cone Angle = %ld degrees; Outside Cone Angle = %ld degrees\n", This->ds3db_ds3db.dwInsideConeAngle, This->ds3db_ds3db.dwOutsideConeAngle); *lpdwInsideConeAngle = This->ds3db_ds3db.dwInsideConeAngle; *lpdwOutsideConeAngle = This->ds3db_ds3db.dwOutsideConeAngle; @@ -469,7 +469,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOutsideVolume(IDirectSound { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
- TRACE("returning: Cone Outside Volume = %d\n", This->ds3db_ds3db.lConeOutsideVolume); + TRACE("returning: Cone Outside Volume = %ld\n", This->ds3db_ds3db.lConeOutsideVolume); *lplConeOutsideVolume = This->ds3db_ds3db.lConeOutsideVolume; return DS_OK; } @@ -499,7 +499,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetMode(IDirectSound3DBuffer *ifa { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
- TRACE("returning: Mode = %d\n", This->ds3db_ds3db.dwMode); + TRACE("returning: Mode = %ld\n", This->ds3db_ds3db.dwMode); *lpdwMode = This->ds3db_ds3db.dwMode; return DS_OK; } @@ -532,7 +532,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters(IDirectSound3DBu IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); DWORD status = DSERR_INVALIDPARAM;
- TRACE("(%p,%p,%x)\n",iface,lpcDs3dBuffer,dwApply); + TRACE("(%p,%p,%lx)\n",iface,lpcDs3dBuffer,dwApply);
if (lpcDs3dBuffer == NULL) { WARN("invalid parameter: lpcDs3dBuffer == NULL\n"); @@ -540,11 +540,11 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters(IDirectSound3DBu }
if (lpcDs3dBuffer->dwSize != sizeof(DS3DBUFFER)) { - WARN("invalid parameter: lpcDs3dBuffer->dwSize = %d\n", lpcDs3dBuffer->dwSize); + WARN("invalid parameter: lpcDs3dBuffer->dwSize = %ld\n", lpcDs3dBuffer->dwSize); return status; }
- TRACE("setting: all parameters; dwApply = %d\n", dwApply); + TRACE("setting: all parameters; dwApply = %ld\n", dwApply); This->ds3db_ds3db = *lpcDs3dBuffer;
if (dwApply == DS3D_IMMEDIATE) @@ -562,7 +562,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeAngles(IDirectSound3DBuffe { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
- TRACE("setting: Inside Cone Angle = %d; Outside Cone Angle = %d; dwApply = %d\n", + TRACE("setting: Inside Cone Angle = %ld; Outside Cone Angle = %ld; dwApply = %ld\n", dwInsideConeAngle, dwOutsideConeAngle, dwApply); This->ds3db_ds3db.dwInsideConeAngle = dwInsideConeAngle; This->ds3db_ds3db.dwOutsideConeAngle = dwOutsideConeAngle; @@ -577,7 +577,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOrientation(IDirectSound3D { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
- TRACE("setting: Cone Orientation vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); + TRACE("setting: Cone Orientation vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply); This->ds3db_ds3db.vConeOrientation.x = x; This->ds3db_ds3db.vConeOrientation.y = y; This->ds3db_ds3db.vConeOrientation.z = z; @@ -595,7 +595,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOutsideVolume(IDirectSound { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
- TRACE("setting: ConeOutsideVolume = %d; dwApply = %d\n", lConeOutsideVolume, dwApply); + TRACE("setting: ConeOutsideVolume = %ld; dwApply = %ld\n", lConeOutsideVolume, dwApply); This->ds3db_ds3db.lConeOutsideVolume = lConeOutsideVolume; if (dwApply == DS3D_IMMEDIATE) { @@ -611,7 +611,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMaxDistance(IDirectSound3DBuff { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
- TRACE("setting: MaxDistance = %f; dwApply = %d\n", fMaxDistance, dwApply); + TRACE("setting: MaxDistance = %f; dwApply = %ld\n", fMaxDistance, dwApply); This->ds3db_ds3db.flMaxDistance = fMaxDistance; if (dwApply == DS3D_IMMEDIATE) { @@ -627,7 +627,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMinDistance(IDirectSound3DBuff { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
- TRACE("setting: MinDistance = %f; dwApply = %d\n", fMinDistance, dwApply); + TRACE("setting: MinDistance = %f; dwApply = %ld\n", fMinDistance, dwApply); This->ds3db_ds3db.flMinDistance = fMinDistance; if (dwApply == DS3D_IMMEDIATE) { @@ -643,7 +643,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetMode(IDirectSound3DBuffer *ifa { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
- TRACE("setting: Mode = %d; dwApply = %d\n", dwMode, dwApply); + TRACE("setting: Mode = %ld; dwApply = %ld\n", dwMode, dwApply); This->ds3db_ds3db.dwMode = dwMode; if (dwApply == DS3D_IMMEDIATE) { @@ -659,7 +659,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetPosition(IDirectSound3DBuffer { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
- TRACE("setting: Position vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); + TRACE("setting: Position vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply); This->ds3db_ds3db.vPosition.x = x; This->ds3db_ds3db.vPosition.y = y; This->ds3db_ds3db.vPosition.z = z; @@ -677,7 +677,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetVelocity(IDirectSound3DBuffer { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
- TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); + TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply); This->ds3db_ds3db.vVelocity.x = x; This->ds3db_ds3db.vVelocity.y = y; This->ds3db_ds3db.vVelocity.z = z; @@ -743,7 +743,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *if IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); ULONG ref = InterlockedIncrement(&This->ref3D);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -760,7 +760,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_Release(IDirectSound3DListener *i if(!ref) capped_refcount_dec(&This->numIfaces);
- TRACE("(%p) ref %d\n", This, ref); + TRACE("(%p) ref %ld\n", This, ref);
return ref; } @@ -779,7 +779,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_GetAllParameter(IDirectSound3DL }
if (lpDS3DL->dwSize < sizeof(*lpDS3DL)) { - WARN("invalid parameter: lpDS3DL->dwSize = %d\n",lpDS3DL->dwSize); + WARN("invalid parameter: lpDS3DL->dwSize = %ld\n",lpDS3DL->dwSize); return DSERR_INVALIDPARAM; }
@@ -856,7 +856,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetAllParameters(IDirectSound3D { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface);
- TRACE("setting: all parameters; dwApply = %d\n", dwApply); + TRACE("setting: all parameters; dwApply = %ld\n", dwApply); This->device->ds3dl = *lpcDS3DL; if (dwApply == DS3D_IMMEDIATE) { @@ -872,7 +872,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetDistanceFactor(IDirectSound3 { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface);
- TRACE("setting: Distance Factor = %f; dwApply = %d\n", fDistanceFactor, dwApply); + TRACE("setting: Distance Factor = %f; dwApply = %ld\n", fDistanceFactor, dwApply); This->device->ds3dl.flDistanceFactor = fDistanceFactor; if (dwApply == DS3D_IMMEDIATE) { @@ -888,7 +888,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetDopplerFactor(IDirectSound3D { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface);
- TRACE("setting: Doppler Factor = %f; dwApply = %d\n", fDopplerFactor, dwApply); + TRACE("setting: Doppler Factor = %f; dwApply = %ld\n", fDopplerFactor, dwApply); This->device->ds3dl.flDopplerFactor = fDopplerFactor; if (dwApply == DS3D_IMMEDIATE) { @@ -905,7 +905,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetOrientation(IDirectSound3DLi { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface);
- TRACE("setting: Front vector = (%f,%f,%f); Top vector = (%f,%f,%f); dwApply = %d\n", + TRACE("setting: Front vector = (%f,%f,%f); Top vector = (%f,%f,%f); dwApply = %ld\n", xFront, yFront, zFront, xTop, yTop, zTop, dwApply); This->device->ds3dl.vOrientFront.x = xFront; This->device->ds3dl.vOrientFront.y = yFront; @@ -927,7 +927,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetPosition(IDirectSound3DListe { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface);
- TRACE("setting: Position vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); + TRACE("setting: Position vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply); This->device->ds3dl.vPosition.x = x; This->device->ds3dl.vPosition.y = y; This->device->ds3dl.vPosition.z = z; @@ -945,7 +945,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetRolloffFactor(IDirectSound3D { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface);
- TRACE("setting: Rolloff Factor = %f; dwApply = %d\n", fRolloffFactor, dwApply); + TRACE("setting: Rolloff Factor = %f; dwApply = %ld\n", fRolloffFactor, dwApply); This->device->ds3dl.flRolloffFactor = fRolloffFactor; if (dwApply == DS3D_IMMEDIATE) { @@ -961,7 +961,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetVelocity(IDirectSound3DListe { IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface);
- TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply); + TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply); This->device->ds3dl.vVelocity.x = x; This->device->ds3dl.vVelocity.y = y; This->device->ds3dl.vVelocity.z = z;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dsquery/Makefile.in | 1 - dlls/dsquery/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in index 757d62b006b..611e6011575 100644 --- a/dlls/dsquery/Makefile.in +++ b/dlls/dsquery/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsquery.dll IMPORTS = uuid diff --git a/dlls/dsquery/main.c b/dlls/dsquery/main.c index 545ec36f321..06fe1e6e5f5 100644 --- a/dlls/dsquery/main.c +++ b/dlls/dsquery/main.c @@ -66,7 +66,7 @@ static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) struct query_class_factory *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) increasing refcount to %u\n", iface, ref); + TRACE("(%p) increasing refcount to %lu\n", iface, ref); return ref; } @@ -76,7 +76,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) struct query_class_factory *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) decreasing refcount to %u\n", iface, ref); + TRACE("(%p) decreasing refcount to %lu\n", iface, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -144,7 +144,7 @@ static ULONG WINAPI CommonQuery_AddRef(ICommonQuery *iface) struct common_query *This = impl_from_ICommonQuery(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) increasing refcount to %u\n", iface, ref); + TRACE("(%p) increasing refcount to %lu\n", iface, ref); return ref; } @@ -154,7 +154,7 @@ static ULONG WINAPI CommonQuery_Release(ICommonQuery *iface) struct common_query *This = impl_from_ICommonQuery(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) decreasing refcount to %u\n", iface, ref); + TRACE("(%p) decreasing refcount to %lu\n", iface, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dssenh/Makefile.in | 1 - dlls/dssenh/main.c | 56 ++++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 42859c9ab3c..909f2e3010c 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dssenh.dll IMPORTS = bcrypt crypt32 advapi32 diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 8344b5a321b..51a29e0d61a 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -131,7 +131,7 @@ static const WCHAR *map_keyspec_to_keypair_name( DWORD keyspec ) name = L"SignatureKeyPair"; break; default: - ERR( "invalid key spec %u\n", keyspec ); + ERR( "invalid key spec %lu\n", keyspec ); return NULL; } return name; @@ -267,7 +267,7 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags struct container *ret; char name[MAX_PATH]; - TRACE( "%p, %s, %08x, %p\n", ret_prov, debugstr_a(container), flags, vtable ); + TRACE( "%p, %s, %08lx, %p\n", ret_prov, debugstr_a(container), flags, vtable ); if (container && *container) { @@ -311,7 +311,7 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags return TRUE; default: - FIXME( "unsupported flags %08x\n", flags ); + FIXME( "unsupported flags %08lx\n", flags ); return FALSE; } @@ -324,7 +324,7 @@ BOOL WINAPI CPReleaseContext( HCRYPTPROV hprov, DWORD flags ) { struct container *container = (struct container *)hprov; - TRACE( "%p, %08x\n", (void *)hprov, flags ); + TRACE( "%p, %08lx\n", (void *)hprov, flags ); if (container->magic != MAGIC_CONTAINER) return FALSE; destroy_container( container ); @@ -407,13 +407,13 @@ static BOOL generate_key( struct container *container, ALG_ID algid, DWORD bitle if ((status = BCryptGenerateKeyPair( key->alg_handle, &key->handle, bitlen, 0 ))) { - ERR( "failed to generate key %08x\n", status ); + ERR( "failed to generate key %08lx\n", status ); destroy_key( key ); return FALSE; } if ((status = BCryptFinalizeKeyPair( key->handle, 0 ))) { - ERR( "failed to finalize key %08x\n", status ); + ERR( "failed to finalize key %08lx\n", status ); destroy_key( key ); return FALSE; } @@ -448,7 +448,7 @@ BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *re struct container *container = (struct container *)hprov; ULONG i, bitlen = HIWORD(flags) ? HIWORD(flags) : 1024; - TRACE( "%p, %08x, %08x, %p\n", (void *)hprov, algid, flags, ret_key ); + TRACE( "%p, %08x, %08lx, %p\n", (void *)hprov, algid, flags, ret_key ); if (container->magic != MAGIC_CONTAINER) return FALSE; @@ -512,7 +512,7 @@ static BOOL import_key_dss2( struct container *container, ALG_ID algid, const BY break; default: - FIXME( "unsupported key magic %08x\n", pubkey->magic ); + FIXME( "unsupported key magic %08lx\n", pubkey->magic ); return FALSE; } @@ -520,7 +520,7 @@ static BOOL import_key_dss2( struct container *container, ALG_ID algid, const BY if ((status = BCryptImportKeyPair( key->alg_handle, NULL, type, &key->handle, (UCHAR *)data, len, 0 ))) { - TRACE( "failed to import key %08x\n", status ); + TRACE( "failed to import key %08lx\n", status ); destroy_key( key ); return FALSE; } @@ -583,7 +583,7 @@ static BOOL import_key_dss3( struct container *container, ALG_ID algid, const BY break; default: - FIXME( "unsupported key magic %08x\n", pubkey->magic ); + FIXME( "unsupported key magic %08lx\n", pubkey->magic ); return FALSE; } @@ -628,7 +628,7 @@ static BOOL import_key_dss3( struct container *container, ALG_ID algid, const BY if ((status = BCryptImportKeyPair( key->alg_handle, NULL, BCRYPT_DSA_PUBLIC_BLOB, &key->handle, (UCHAR *)blob, size, 0 ))) { - WARN( "failed to import key %08x\n", status ); + WARN( "failed to import key %08lx\n", status ); destroy_key( key ); heap_free( blob ); return FALSE; @@ -646,7 +646,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE const BLOBHEADER *hdr; BOOL ret; - TRACE( "%p, %p, %u, %p, %08x, %p\n", (void *)hprov, data, len, (void *)hpubkey, flags, ret_key ); + TRACE( "%p, %p, %lu, %p, %08lx, %p\n", (void *)hprov, data, len, (void *)hpubkey, flags, ret_key ); if (container->magic != MAGIC_CONTAINER) return FALSE; if (len < sizeof(*hdr)) return FALSE; @@ -682,7 +682,7 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW struct key *key = (struct key *)hkey; const WCHAR *type; - TRACE( "%p, %p, %p, %08x, %08x, %p, %p\n", (void *)hprov, (void *)hkey, (void *)hexpkey, blobtype, flags, + TRACE( "%p, %p, %p, %08lx, %08lx, %p, %p\n", (void *)hprov, (void *)hkey, (void *)hexpkey, blobtype, flags, data, len ); if (key->magic != MAGIC_KEY) return FALSE; @@ -693,7 +693,7 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW } if (flags) { - FIXME( "flags %08x not supported\n", flags ); + FIXME( "flags %08lx not supported\n", flags ); return FALSE; } @@ -708,7 +708,7 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW break; default: - FIXME( "blob type %u not supported\n", blobtype ); + FIXME( "blob type %lu not supported\n", blobtype ); return FALSE; } @@ -719,7 +719,7 @@ BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, D { struct key *key = (struct key *)hkey, *ret; - TRACE( "%p, %p, %p, %08x, %p\n", (void *)hprov, (void *)hkey, reserved, flags, ret_key ); + TRACE( "%p, %p, %p, %08lx, %p\n", (void *)hprov, (void *)hkey, reserved, flags, ret_key ); if (key->magic != MAGIC_KEY) return FALSE; @@ -733,7 +733,7 @@ BOOL WINAPI CPGetUserKey( HCRYPTPROV hprov, DWORD keyspec, HCRYPTKEY *ret_key ) struct container *container = (struct container *)hprov; BOOL ret = FALSE; - TRACE( "%p, %08x, %p\n", (void *)hprov, keyspec, ret_key ); + TRACE( "%p, %08lx, %p\n", (void *)hprov, keyspec, ret_key ); if (container->magic != MAGIC_CONTAINER) return FALSE; @@ -761,7 +761,7 @@ BOOL WINAPI CPGenRandom( HCRYPTPROV hprov, DWORD len, BYTE *buffer ) { struct container *container = (struct container *)hprov; - TRACE( "%p, %u, %p\n", (void *)hprov, len, buffer ); + TRACE( "%p, %lu, %p\n", (void *)hprov, len, buffer ); if (container->magic != MAGIC_CONTAINER) return FALSE; @@ -816,7 +816,7 @@ BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD { struct hash *hash; - TRACE( "%p, %08x, %p, %08x, %p\n", (void *)hprov, algid, (void *)hkey, flags, ret_hash ); + TRACE( "%p, %08x, %p, %08lx, %p\n", (void *)hprov, algid, (void *)hkey, flags, ret_hash ); switch (algid) { @@ -882,7 +882,7 @@ BOOL WINAPI CPDuplicateHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD *reserved { struct hash *hash = (struct hash *)hhash, *ret; - TRACE( "%p, %p, %p, %08x, %p\n", (void *)hprov, (void *)hhash, reserved, flags, ret_hash ); + TRACE( "%p, %p, %p, %08lx, %p\n", (void *)hprov, (void *)hhash, reserved, flags, ret_hash ); if (hash->magic != MAGIC_HASH) return FALSE; @@ -895,7 +895,7 @@ BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DW { struct hash *hash = (struct hash *)hhash; - TRACE("%p, %p, %p, %u, %08x\n", (void *)hprov, (void *)hhash, data, len, flags ); + TRACE("%p, %p, %p, %lu, %08lx\n", (void *)hprov, (void *)hhash, data, len, flags ); if (hash->magic != MAGIC_HASH) return FALSE; @@ -911,7 +911,7 @@ BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYT { struct hash *hash = (struct hash *)hhash; - TRACE( "%p, %p, %08x, %p, %p, %08x\n", (void *)hprov, (void *)hhash, param, data, len, flags ); + TRACE( "%p, %p, %08lx, %p, %p, %08lx\n", (void *)hprov, (void *)hhash, param, data, len, flags ); if (hash->magic != MAGIC_HASH) return FALSE; @@ -954,7 +954,7 @@ BOOL WINAPI CPSetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, con { struct hash *hash = (struct hash *)hhash; - TRACE( "%p, %p, %08x, %p, %08x\n", (void *)hprov, (void *)hhash, param, data, flags ); + TRACE( "%p, %p, %08lx, %p, %08lx\n", (void *)hprov, (void *)hhash, param, data, flags ); if (hash->magic != MAGIC_HASH) return FALSE; @@ -965,7 +965,7 @@ BOOL WINAPI CPSetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, con return TRUE; default: - FIXME( "param %u not supported\n", param ); + FIXME( "param %lu not supported\n", param ); SetLastError( NTE_BAD_TYPE ); return FALSE; } @@ -983,7 +983,7 @@ static DWORD get_signature_length( DWORD algid ) case AT_SIGNATURE: case CALG_DSS_SIGN: return 40; default: - FIXME( "unhandled algorithm %u\n", algid ); + FIXME( "unhandled algorithm %lu\n", algid ); return 0; } } @@ -996,7 +996,7 @@ BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const struct hash *hash = (struct hash *)hhash; ULONG len; - TRACE( "%p, %p, %u, %s, %08x, %p, %p\n", (void *)hprov, (void *)hhash, keyspec, debugstr_w(desc), flags, sig, + TRACE( "%p, %p, %lu, %s, %08lx, %p, %p\n", (void *)hprov, (void *)hhash, keyspec, debugstr_w(desc), flags, sig, siglen ); if (container->magic != MAGIC_CONTAINER || !container->sign_key) return FALSE; @@ -1018,13 +1018,13 @@ BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *s struct hash *hash = (struct hash *)hhash; struct key *key = (struct key *)hpubkey; - TRACE( "%p, %p, %p, %u %p, %s, %08x\n", (void *)hprov, (void *)hhash, sig, siglen, (void *)hpubkey, + TRACE( "%p, %p, %p, %lu %p, %s, %08lx\n", (void *)hprov, (void *)hhash, sig, siglen, (void *)hpubkey, debugstr_w(desc), flags ); if (hash->magic != MAGIC_HASH || key->magic != MAGIC_KEY) return FALSE; if (flags) { - FIXME( "flags %08x not supported\n", flags ); + FIXME( "flags %08lx not supported\n", flags ); return FALSE; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dsuiext/Makefile.in | 1 - dlls/dsuiext/dsuiext.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dsuiext/Makefile.in b/dlls/dsuiext/Makefile.in index da0ee1f37b2..d3d663bf0c3 100644 --- a/dlls/dsuiext/Makefile.in +++ b/dlls/dsuiext/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsuiext.dll IMPORTS = ole32 uuid diff --git a/dlls/dsuiext/dsuiext.c b/dlls/dsuiext/dsuiext.c index fc16bf90bbf..762f7596e73 100644 --- a/dlls/dsuiext/dsuiext.c +++ b/dlls/dsuiext/dsuiext.c @@ -85,7 +85,7 @@ static ULONG WINAPI dispspec_Release(IDsDisplaySpecifier *iface) static HRESULT WINAPI dispspec_SetServer(IDsDisplaySpecifier *iface, LPCWSTR server, LPCWSTR user, LPCWSTR password, DWORD flags) { - FIXME("%p,%s,%s,%p,%08x: stub\n", iface, debugstr_w(server), debugstr_w(user), password, flags); + FIXME("%p,%s,%s,%p,%08lx: stub\n", iface, debugstr_w(server), debugstr_w(user), password, flags); return E_NOTIMPL; } @@ -105,14 +105,14 @@ static HRESULT WINAPI dispspec_GetDisplaySpecifier(IDsDisplaySpecifier *iface, L static HRESULT WINAPI dispspec_GetIconLocation(IDsDisplaySpecifier *iface, LPCWSTR object, DWORD flags, LPWSTR buffer, INT size, INT *id) { - FIXME("%p,%s,%08x,%p,%d,%p: stub\n", iface, debugstr_w(object), flags, buffer, size, id); + FIXME("%p,%s,%08lx,%p,%d,%p: stub\n", iface, debugstr_w(object), flags, buffer, size, id); return E_NOTIMPL; } static HICON WINAPI dispspec_GetIcon(IDsDisplaySpecifier *iface, LPCWSTR object, DWORD flags, INT cx, INT cy) { - FIXME("%p,%s,%08x,%dx%d: stub\n", iface, debugstr_w(object), flags, cx, cy); + FIXME("%p,%s,%08lx,%dx%d: stub\n", iface, debugstr_w(object), flags, cx, cy); return 0; } @@ -133,7 +133,7 @@ static HRESULT WINAPI dispspec_GetFriendlyAttributeName(IDsDisplaySpecifier *ifa static BOOL WINAPI dispspec_IsClassContainer(IDsDisplaySpecifier *iface, LPCWSTR object, LPCWSTR path, DWORD flags) { - FIXME("%p,%s,%s,%08x: stub\n", iface, debugstr_w(object), debugstr_w(path), flags); + FIXME("%p,%s,%s,%08lx: stub\n", iface, debugstr_w(object), debugstr_w(path), flags); return FALSE; } @@ -147,7 +147,7 @@ static HRESULT WINAPI dispspec_GetClassCreationInfo(IDsDisplaySpecifier *iface, static HRESULT WINAPI dispspec_EnumClassAttributes(IDsDisplaySpecifier *iface, LPCWSTR object, LPDSENUMATTRIBUTES cb, LPARAM param) { - FIXME("%p,%s,%p,%08lx: stub\n", iface, debugstr_w(object), cb, param); + FIXME("%p,%s,%p,%08Ix: stub\n", iface, debugstr_w(object), cb, param); return E_NOTIMPL; } @@ -237,7 +237,7 @@ static ULONG WINAPI factory_AddRef(IClassFactory *iface) class_factory *factory = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&factory->ref); - TRACE("(%p) ref %u\n", iface, ref); + TRACE("(%p) ref %lu\n", iface, ref); return ref; } @@ -247,7 +247,7 @@ static ULONG WINAPI factory_Release(IClassFactory *iface) class_factory *factory = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&factory->ref); - TRACE("(%p) ref %u\n", iface, ref); + TRACE("(%p) ref %lu\n", iface, ref); if (!ref) heap_free(factory);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dwmapi/Makefile.in | 1 - dlls/dwmapi/dwmapi_main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in index 4891fab88b1..e63dbc2ea00 100644 --- a/dlls/dwmapi/Makefile.in +++ b/dlls/dwmapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dwmapi.dll IMPORTLIB = dwmapi diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6a66aa51dad..cec20220ec2 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -115,7 +115,7 @@ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attr { static BOOL once; - if (!once++) FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); + if (!once++) FIXME("(%p, %lx, %p, %lx) stub\n", hwnd, attributenum, attribute, size); return S_OK; } @@ -197,7 +197,7 @@ BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, */ HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) { - FIXME("(%p %d %p %d) stub\n", hwnd, attribute, pv_attribute, size); + FIXME("(%p %ld %p %ld) stub\n", hwnd, attribute, pv_attribute, size); return E_NOTIMPL; } @@ -265,7 +265,7 @@ HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params */ HRESULT WINAPI DwmSetIconicLivePreviewBitmap(HWND hwnd, HBITMAP hbmp, POINT *pos, DWORD flags) { - FIXME("(%p %p %p %x) stub\n", hwnd, hbmp, pos, flags); + FIXME("(%p %p %p %lx) stub\n", hwnd, hbmp, pos, flags); return S_OK; }; @@ -274,7 +274,7 @@ HRESULT WINAPI DwmSetIconicLivePreviewBitmap(HWND hwnd, HBITMAP hbmp, POINT *pos */ HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags) { - FIXME("(%p %p %x) stub\n", hwnd, hbmp, flags); + FIXME("(%p %p %lx) stub\n", hwnd, hbmp, flags); return S_OK; };
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dwrite/Makefile.in | 1 - dlls/dwrite/analyzer.c | 16 +++++----- dlls/dwrite/font.c | 76 +++++++++++++++++++++++----------------------- dlls/dwrite/format.c | 8 ++--- dlls/dwrite/gdiinterop.c | 22 +++++++------ dlls/dwrite/layout.c | 40 ++++++++++++------------ dlls/dwrite/main.c | 20 ++++++------ dlls/dwrite/opentype.c | 6 ++-- 8 files changed, 94 insertions(+), 95 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index ec7e5b401c2..f5332cea713 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dwrite.dll IMPORTLIB = dwrite UNIXLIB = dwrite.so diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 13ccf8e4434..7ffcfa8070c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1093,7 +1093,7 @@ static void get_number_substitutes(IDWriteNumberSubstitution *substitution, BOOL case 1: default: if (value != 1) - WARN("Unknown IDIGITSUBSTITUTION value %u, locale %s.\n", value, debugstr_w(numbersubst->locale)); + WARN("Unknown IDIGITSUBSTITUTION value %lu, locale %s.\n", value, debugstr_w(numbersubst->locale)); } } else @@ -1905,7 +1905,7 @@ static ULONG WINAPI dwritenumbersubstitution_AddRef(IDWriteNumberSubstitution *i struct dwrite_numbersubstitution *object = impl_from_IDWriteNumberSubstitution(iface); ULONG refcount = InterlockedIncrement(&object->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -1915,7 +1915,7 @@ static ULONG WINAPI dwritenumbersubstitution_Release(IDWriteNumberSubstitution * struct dwrite_numbersubstitution *object = impl_from_IDWriteNumberSubstitution(iface); ULONG refcount = InterlockedDecrement(&object->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -2122,7 +2122,7 @@ static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback, hr = fallback_map_characters(*mapped_font, text, length, mapped_length); if (FAILED(hr)) - WARN("Mapping with fallback family %s failed, hr %#x.\n", debugstr_w(mapping->families[i]), hr); + WARN("Mapping with fallback family %s failed, hr %#lx.\n", debugstr_w(mapping->families[i]), hr); if (!*mapped_length) { IDWriteFont_Release(*mapped_font); @@ -2247,7 +2247,7 @@ static ULONG WINAPI customfontfallback_AddRef(IDWriteFontFallback1 *iface) struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback1(iface); ULONG refcount = InterlockedIncrement(&fallback->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -2257,7 +2257,7 @@ static ULONG WINAPI customfontfallback_Release(IDWriteFontFallback1 *iface) struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback1(iface); ULONG refcount = InterlockedDecrement(&fallback->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -2320,7 +2320,7 @@ static ULONG WINAPI fontfallbackbuilder_AddRef(IDWriteFontFallbackBuilder *iface struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); ULONG refcount = InterlockedIncrement(&fallbackbuilder->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -2331,7 +2331,7 @@ static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *ifac ULONG refcount = InterlockedDecrement(&fallbackbuilder->refcount); size_t i; - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4b32bf1e0de..93adb65ec76 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -817,7 +817,7 @@ static ULONG WINAPI dwritefontface_AddRef(IDWriteFontFace5 *iface) struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); ULONG refcount = InterlockedIncrement(&fontface->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -828,7 +828,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) ULONG refcount = InterlockedDecrement(&fontface->refcount); struct release_font_object_params params = { fontface->font_object }; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -2240,7 +2240,7 @@ static ULONG WINAPI dwritefont_AddRef(IDWriteFont3 *iface) struct dwrite_font *font = impl_from_IDWriteFont3(iface); ULONG refcount = InterlockedIncrement(&font->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -2250,7 +2250,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont3 *iface) struct dwrite_font *font = impl_from_IDWriteFont3(iface); ULONG refcount = InterlockedDecrement(&font->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -2608,7 +2608,7 @@ static ULONG WINAPI dwritefontlist_AddRef(IDWriteFontList2 *iface) struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface); ULONG refcount = InterlockedIncrement(&fontlist->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -2618,7 +2618,7 @@ static ULONG WINAPI dwritefontlist_Release(IDWriteFontList2 *iface) struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface); ULONG refcount = InterlockedDecrement(&fontlist->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -2775,7 +2775,7 @@ static ULONG WINAPI dwritefontfamily_AddRef(IDWriteFontFamily2 *iface) struct dwrite_fontfamily *family = impl_from_IDWriteFontFamily2(iface); ULONG refcount = InterlockedIncrement(&family->refcount); - TRACE("%p, %u.\n", iface, refcount); + TRACE("%p, %lu.\n", iface, refcount); return refcount; } @@ -2785,7 +2785,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily2 *iface) struct dwrite_fontfamily *family = impl_from_IDWriteFontFamily2(iface); ULONG refcount = InterlockedDecrement(&family->refcount); - TRACE("%p, %u.\n", iface, refcount); + TRACE("%p, %lu.\n", iface, refcount); if (!refcount) { @@ -3241,7 +3241,7 @@ static ULONG WINAPI dwritefontcollection_AddRef(IDWriteFontCollection3 *iface) struct dwrite_fontcollection *collection = impl_from_IDWriteFontCollection3(iface); ULONG refcount = InterlockedIncrement(&collection->refcount); - TRACE("%p, refcount %d.\n", collection, refcount); + TRACE("%p, refcount %ld.\n", collection, refcount); return refcount; } @@ -3252,7 +3252,7 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection3 *iface) ULONG refcount = InterlockedDecrement(&collection->refcount); size_t i; - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -4690,7 +4690,7 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat /* Unsupported formats are skipped. */ hr = opentype_analyze_font(stream, &supported, &file_type, &face_type, &face_count); if (FAILED(hr) || !supported || face_count == 0) { - TRACE("Unsupported font (%p, 0x%08x, %d, %u)\n", file, hr, supported, face_count); + TRACE("Unsupported font (%p, 0x%08lx, %d, %u)\n", file, hr, supported, face_count); IDWriteFontFileStream_Release(stream); IDWriteFontFile_Release(file); hr = S_OK; @@ -5022,7 +5022,7 @@ static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrit /* Unsupported formats are skipped. */ hr = opentype_analyze_font(stream, &supported, &file_type, &face_type, &face_count); if (FAILED(hr) || !supported || face_count == 0) { - TRACE("Unsupported font (%p, 0x%08x, %d, %u)\n", file, hr, supported, face_count); + TRACE("Unsupported font (%p, 0x%08lx, %d, %u)\n", file, hr, supported, face_count); IDWriteFontFileStream_Release(stream); IDWriteFontFile_Release(file); return S_FALSE; @@ -5139,7 +5139,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 { hr = eudc_collection_add_family(factory, collection, L"", L"EUDC.TTE"); if (hr != S_OK) - WARN("failed to add global default EUDC font, 0x%08x\n", hr); + WARN("failed to add global default EUDC font, 0x%08lx\n", hr); } /* EUDC collection offers simulated faces too */ @@ -5174,7 +5174,7 @@ static ULONG WINAPI dwritefontfile_AddRef(IDWriteFontFile *iface) struct dwrite_fontfile *file = impl_from_IDWriteFontFile(iface); ULONG refcount = InterlockedIncrement(&file->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -5184,7 +5184,7 @@ static ULONG WINAPI dwritefontfile_Release(IDWriteFontFile *iface) struct dwrite_fontfile *file = impl_from_IDWriteFontFile(iface); ULONG refcount = InterlockedDecrement(&file->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -5552,7 +5552,7 @@ static ULONG WINAPI localfontfilestream_AddRef(IDWriteFontFileStream *iface) struct dwrite_localfontfilestream *stream = impl_from_IDWriteFontFileStream(iface); ULONG refcount = InterlockedIncrement(&stream->refcount); - TRACE_(dwrite_file)("%p, refcount %d.\n", iface, refcount); + TRACE_(dwrite_file)("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -5569,7 +5569,7 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) struct dwrite_localfontfilestream *stream = impl_from_IDWriteFontFileStream(iface); ULONG refcount = InterlockedDecrement(&stream->refcount); - TRACE_(dwrite_file)("%p, refcount %d.\n", iface, refcount); + TRACE_(dwrite_file)("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -5691,7 +5691,7 @@ static ULONG WINAPI localfontfileloader_AddRef(IDWriteLocalFontFileLoader *iface struct dwrite_localfontfileloader *loader = impl_from_IDWriteLocalFontFileLoader(iface); ULONG refcount = InterlockedIncrement(&loader->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -5701,7 +5701,7 @@ static ULONG WINAPI localfontfileloader_Release(IDWriteLocalFontFileLoader *ifac struct dwrite_localfontfileloader *loader = impl_from_IDWriteLocalFontFileLoader(iface); ULONG refcount = InterlockedDecrement(&loader->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -5721,7 +5721,7 @@ static HRESULT create_local_cached_stream(const void *key, UINT32 key_size, stru file = CreateFileW(refkey->name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (file == INVALID_HANDLE_VALUE) { - WARN_(dwrite_file)("Failed to open the file %s, error %d.\n", debugstr_w(refkey->name), GetLastError()); + WARN_(dwrite_file)("Failed to open the file %s, error %ld.\n", debugstr_w(refkey->name), GetLastError()); return E_FAIL; } @@ -5734,7 +5734,7 @@ static HRESULT create_local_cached_stream(const void *key, UINT32 key_size, stru file_ptr = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); CloseHandle(mapping); if (!file_ptr) { - ERR("mapping failed, file size %s, error %d\n", wine_dbgstr_longlong(size.QuadPart), GetLastError()); + ERR("mapping failed, file size %s, error %ld\n", wine_dbgstr_longlong(size.QuadPart), GetLastError()); return E_FAIL; } @@ -5916,7 +5916,7 @@ static ULONG WINAPI glyphrunanalysis_AddRef(IDWriteGlyphRunAnalysis *iface) struct dwrite_glyphrunanalysis *analysis = impl_from_IDWriteGlyphRunAnalysis(iface); ULONG refcount = InterlockedIncrement(&analysis->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -5926,7 +5926,7 @@ static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface) struct dwrite_glyphrunanalysis *analysis = impl_from_IDWriteGlyphRunAnalysis(iface); ULONG refcount = InterlockedDecrement(&analysis->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -6365,7 +6365,7 @@ static ULONG WINAPI colorglyphenum_AddRef(IDWriteColorGlyphRunEnumerator1 *iface struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); ULONG refcount = InterlockedIncrement(&glyphenum->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -6375,7 +6375,7 @@ static ULONG WINAPI colorglyphenum_Release(IDWriteColorGlyphRunEnumerator1 *ifac struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); ULONG refcount = InterlockedDecrement(&glyphenum->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -6465,7 +6465,7 @@ static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphen HRESULT hr = IDWriteFontFace5_GetPaletteEntries(glyphenum->fontface, glyphenum->palette, colorrun->paletteIndex, 1, &colorrun->runColor); if (FAILED(hr)) - WARN("failed to get palette entry, fontface %p, palette %u, index %u, 0x%08x\n", glyphenum->fontface, + WARN("failed to get palette entry, fontface %p, palette %u, index %u, 0x%08lx\n", glyphenum->fontface, glyphenum->palette, colorrun->paletteIndex, hr); } /* found a glyph position new color run starts from, origin is "original origin + distance to this glyph" */ @@ -6693,7 +6693,7 @@ static ULONG WINAPI fontfacereference_AddRef(IDWriteFontFaceReference1 *iface) struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); ULONG refcount = InterlockedIncrement(&reference->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -6703,7 +6703,7 @@ static ULONG WINAPI fontfacereference_Release(IDWriteFontFaceReference1 *iface) struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); ULONG refcount = InterlockedDecrement(&reference->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -7000,7 +7000,7 @@ static ULONG WINAPI inmemoryfilestream_AddRef(IDWriteFontFileStream *iface) struct dwrite_inmemory_filestream *stream = inmemory_impl_from_IDWriteFontFileStream(iface); ULONG refcount = InterlockedIncrement(&stream->refcount); - TRACE_(dwrite_file)("%p, refcount %u.\n", iface, refcount); + TRACE_(dwrite_file)("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -7010,7 +7010,7 @@ static ULONG WINAPI inmemoryfilestream_Release(IDWriteFontFileStream *iface) struct dwrite_inmemory_filestream *stream = inmemory_impl_from_IDWriteFontFileStream(iface); ULONG refcount = InterlockedDecrement(&stream->refcount); - TRACE_(dwrite_file)("%p, refcount %u.\n", iface, refcount); + TRACE_(dwrite_file)("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -7101,7 +7101,7 @@ static ULONG WINAPI inmemoryfontfileloader_AddRef(IDWriteInMemoryFontFileLoader struct dwrite_inmemory_fileloader *loader = impl_from_IDWriteInMemoryFontFileLoader(iface); ULONG refcount = InterlockedIncrement(&loader->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -7112,7 +7112,7 @@ static ULONG WINAPI inmemoryfontfileloader_Release(IDWriteInMemoryFontFileLoader ULONG refcount = InterlockedDecrement(&loader->refcount); size_t i; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -7255,7 +7255,7 @@ static ULONG WINAPI dwritefontresource_AddRef(IDWriteFontResource *iface) struct dwrite_fontresource *resource = impl_from_IDWriteFontResource(iface); ULONG refcount = InterlockedIncrement(&resource->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -7265,7 +7265,7 @@ static ULONG WINAPI dwritefontresource_Release(IDWriteFontResource *iface) struct dwrite_fontresource *resource = impl_from_IDWriteFontResource(iface); ULONG refcount = InterlockedDecrement(&resource->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -7458,7 +7458,7 @@ static ULONG WINAPI dwritefontset_AddRef(IDWriteFontSet3 *iface) struct dwrite_fontset *set = impl_from_IDWriteFontSet3(iface); ULONG refcount = InterlockedIncrement(&set->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -7543,7 +7543,7 @@ static ULONG WINAPI dwritefontset_Release(IDWriteFontSet3 *iface) ULONG refcount = InterlockedDecrement(&set->refcount); unsigned int i; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -8015,7 +8015,7 @@ static ULONG WINAPI dwritefontsetbuilder_AddRef(IDWriteFontSetBuilder2 *iface) struct dwrite_fontset_builder *builder = impl_from_IDWriteFontSetBuilder2(iface); ULONG refcount = InterlockedIncrement(&builder->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -8026,7 +8026,7 @@ static ULONG WINAPI dwritefontsetbuilder_Release(IDWriteFontSetBuilder2 *iface) ULONG refcount = InterlockedDecrement(&builder->refcount); unsigned int i; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { diff --git a/dlls/dwrite/format.c b/dlls/dwrite/format.c index 01f7b7f8786..133ca87e97f 100644 --- a/dlls/dwrite/format.c +++ b/dlls/dwrite/format.c @@ -239,7 +239,7 @@ static ULONG WINAPI dwritetextformat_AddRef(IDWriteTextFormat3 *iface) struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); ULONG refcount = InterlockedIncrement(&format->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -249,7 +249,7 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat3 *iface) struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); ULONG refcount = InterlockedDecrement(&format->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -772,7 +772,7 @@ static ULONG WINAPI dwritetrimmingsign_AddRef(IDWriteInlineObject *iface) struct dwrite_trimmingsign *sign = impl_from_IDWriteInlineObject(iface); ULONG refcount = InterlockedIncrement(&sign->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -782,7 +782,7 @@ static ULONG WINAPI dwritetrimmingsign_Release(IDWriteInlineObject *iface) struct dwrite_trimmingsign *sign = impl_from_IDWriteInlineObject(iface); ULONG refcount = InterlockedDecrement(&sign->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 703b1e8170c..2fec7e9fff1 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -251,7 +251,7 @@ static ULONG WINAPI rendertarget_AddRef(IDWriteBitmapRenderTarget1 *iface) struct rendertarget *target = impl_from_IDWriteBitmapRenderTarget1(iface); ULONG refcount = InterlockedIncrement(&target->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -261,7 +261,7 @@ static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget1 *iface) struct rendertarget *target = impl_from_IDWriteBitmapRenderTarget1(iface); ULONG refcount = InterlockedDecrement(&target->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -352,7 +352,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac RECT target_rect, bounds; HRESULT hr; - TRACE("%p, %.8e, %.8e, %d, %p, %p, 0x%08x, %p.\n", iface, originX, originY, + TRACE("%p, %.8e, %.8e, %d, %p, %p, 0x%08lx, %p.\n", iface, originX, originY, measuring_mode, run, params, color, bbox_ret); SetRectEmpty(bbox_ret); @@ -364,7 +364,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac return E_INVALIDARG; if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace3, (void **)&fontface))) { - WARN("Failed to get IDWriteFontFace2 interface, hr %#x.\n", hr); + WARN("Failed to get IDWriteFontFace2 interface, hr %#lx.\n", hr); return hr; } @@ -435,7 +435,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac gridfitmode, target->antialiasmode, originX, originY, &analysis); if (FAILED(hr)) { - WARN("failed to create analysis instance, 0x%08x\n", hr); + WARN("failed to create analysis instance, 0x%08lx\n", hr); return hr; } @@ -445,7 +445,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac if (FAILED(hr) || IsRectEmpty(&bounds)) { hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &bounds); if (FAILED(hr)) { - WARN("GetAlphaTextureBounds() failed, 0x%08x\n", hr); + WARN("GetAlphaTextureBounds() failed, 0x%08lx\n", hr); IDWriteGlyphRunAnalysis_Release(analysis); return hr; } @@ -655,7 +655,7 @@ static ULONG WINAPI gdiinterop_AddRef(IDWriteGdiInterop1 *iface) struct gdiinterop *interop = impl_from_IDWriteGdiInterop1(iface); LONG refcount = InterlockedIncrement(&interop->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -665,7 +665,7 @@ static ULONG WINAPI gdiinterop_Release(IDWriteGdiInterop1 *iface) struct gdiinterop *interop = impl_from_IDWriteGdiInterop1(iface); LONG refcount = InterlockedDecrement(&interop->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -860,7 +860,7 @@ static HRESULT WINAPI gdiinterop1_CreateFontFromLOGFONT(IDWriteGdiInterop1 *ifac else { hr = IDWriteFactory5_GetSystemFontCollection((IDWriteFactory5 *)interop->factory, FALSE, (IDWriteFontCollection1 **)&collection, FALSE); if (FAILED(hr)) { - ERR("failed to get system font collection: 0x%08x.\n", hr); + ERR("failed to get system font collection: 0x%08lx.\n", hr); return hr; } } @@ -958,7 +958,7 @@ static ULONG WINAPI memresourcestream_AddRef(IDWriteFontFileStream *iface) struct memresource_stream *stream = impl_from_IDWriteFontFileStream(iface); ULONG refcount = InterlockedIncrement(&stream->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -968,7 +968,7 @@ static ULONG WINAPI memresourcestream_Release(IDWriteFontFileStream *iface) struct memresource_stream *stream = impl_from_IDWriteFontFileStream(iface); ULONG refcount = InterlockedDecrement(&stream->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) free(stream); diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d4aa49c6a6c..ba80c3f70e8 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -582,7 +582,7 @@ static void layout_get_font_metrics(struct dwrite_textlayout *layout, IDWriteFon if (is_layout_gdi_compatible(layout)) { HRESULT hr = IDWriteFontFace_GetGdiCompatibleMetrics(fontface, emsize, layout->ppdip, &layout->transform, fontmetrics); if (FAILED(hr)) - WARN("failed to get compat metrics, 0x%08x\n", hr); + WARN("failed to get compat metrics, 0x%08lx\n", hr); } else IDWriteFontFace_GetMetrics(fontface, fontmetrics); @@ -651,7 +651,7 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) if (FAILED(hr = IDWriteFactory5_GetSystemFontCollection((IDWriteFactory5 *)layout->factory, FALSE, (IDWriteFontCollection1 **)&sys_collection, FALSE))) { - WARN("Failed to get system collection, hr %#x.\n", hr); + WARN("Failed to get system collection, hr %#lx.\n", hr); return hr; } @@ -661,7 +661,7 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) } else { if (FAILED(hr = IDWriteFactory7_GetSystemFontFallback(layout->factory, &fallback))) { - WARN("Failed to get system fallback, hr %#x.\n", hr); + WARN("Failed to get system fallback, hr %#lx.\n", hr); goto fatal; } } @@ -691,7 +691,7 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) hr = IDWriteFont_CreateFontFace(font, &run->run.fontFace); IDWriteFont_Release(font); if (FAILED(hr)) { - WARN("Failed to create font face, hr %#x.\n", hr); + WARN("Failed to create font face, hr %#lx.\n", hr); break; } @@ -720,7 +720,7 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) &font, &scale); if (FAILED(hr)) { - WARN("%s: failed to map family %s, collection %p, hr %#x.\n", debugstr_rundescr(&run->descr), + WARN("%s: failed to map family %s, collection %p, hr %#lx.\n", debugstr_rundescr(&run->descr), debugstr_w(range->fontfamily), range->collection, hr); goto fatal; } @@ -728,7 +728,7 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) hr = IDWriteFont_CreateFontFace(font, &run->run.fontFace); IDWriteFont_Release(font); if (FAILED(hr)) { - WARN("Failed to create font face, hr %#x.\n", hr); + WARN("Failed to create font face, hr %#lx.\n", hr); goto fatal; } @@ -942,7 +942,7 @@ static HRESULT layout_shape_get_glyphs(struct dwrite_textlayout *layout, struct } if (FAILED(hr)) - WARN("%s: shaping failed, hr %#x.\n", debugstr_rundescr(&run->descr), hr); + WARN("%s: shaping failed, hr %#lx.\n", debugstr_rundescr(&run->descr), hr); run->run.glyphIndices = run->glyphs; run->descr.clusterMap = run->clustermap; @@ -1056,7 +1056,7 @@ static HRESULT layout_shape_get_positions(struct dwrite_textlayout *layout, stru { memset(run->advances, 0, run->glyphcount * sizeof(*run->advances)); memset(run->offsets, 0, run->glyphcount * sizeof(*run->offsets)); - WARN("%s: failed to get glyph placement info, hr %#x.\n", debugstr_rundescr(&run->descr), hr); + WARN("%s: failed to get glyph placement info, hr %#lx.\n", debugstr_rundescr(&run->descr), hr); } if (SUCCEEDED(hr)) @@ -1116,12 +1116,12 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) layout->cluster_count = 0; if (FAILED(hr = layout_itemize(layout))) { - WARN("Itemization failed, hr %#x.\n", hr); + WARN("Itemization failed, hr %#lx.\n", hr); return hr; } if (FAILED(hr = layout_resolve_fonts(layout))) { - WARN("Failed to resolve layout fonts, hr %#x.\n", hr); + WARN("Failed to resolve layout fonts, hr %#lx.\n", hr); return hr; } @@ -1164,7 +1164,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) } if (FAILED(hr = layout_shape_run(layout, run))) - WARN("%s: shaping failed, hr %#x.\n", debugstr_rundescr(&run->descr), hr); + WARN("%s: shaping failed, hr %#lx.\n", debugstr_rundescr(&run->descr), hr); /* baseline derived from font metrics */ layout_get_font_metrics(layout, run->run.fontFace, run->run.fontEmSize, &fontmetrics); @@ -1202,7 +1202,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) if (FAILED(hr = IDWriteTextAnalyzer2_AnalyzeLineBreakpoints(analyzer, (IDWriteTextAnalysisSource *)&layout->IDWriteTextAnalysisSource1_iface, 0, layout->len, (IDWriteTextAnalysisSink *)&layout->IDWriteTextAnalysisSink1_iface))) - WARN("Line breakpoints analysis failed, hr %#x.\n", hr); + WARN("Line breakpoints analysis failed, hr %#lx.\n", hr); } free(layout->actual_breakpoints); @@ -1290,7 +1290,7 @@ static void layout_get_erun_font_metrics(struct dwrite_textlayout *layout, struc &layout->transform, metrics); if (FAILED(hr)) - WARN("failed to get font metrics, 0x%08x\n", hr); + WARN("failed to get font metrics, 0x%08lx\n", hr); } else IDWriteFontFace_GetMetrics(erun->run->u.regular.run.fontFace, metrics); @@ -1926,7 +1926,7 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust append_trimming_run = TRUE; } else - WARN("Failed to get trimming sign metrics, lines won't be trimmed, hr %#x.\n", hr); + WARN("Failed to get trimming sign metrics, lines won't be trimmed, hr %#lx.\n", hr); width = trimmed_width + sign_metrics.width; } @@ -2862,7 +2862,7 @@ static ULONG WINAPI dwritetextlayout_AddRef(IDWriteTextLayout4 *iface) struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout4(iface); ULONG refcount = InterlockedIncrement(&layout->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -2872,7 +2872,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout4 *iface) struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout4(iface); ULONG refcount = InterlockedDecrement(&layout->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -3715,7 +3715,7 @@ static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout if (FAILED(hr = compute_glyph_origins(&glyph_run, layout->measuringmode, baseline_origin, &layout->transform, origins))) { - WARN("Failed to compute glyph origins, hr %#x.\n", hr); + WARN("Failed to compute glyph origins, hr %#lx.\n", hr); free(origins); return; } @@ -3751,7 +3751,7 @@ static void layout_get_inlineobj_bbox(struct dwrite_textlayout *layout, struct l HRESULT hr; if (FAILED(hr = IDWriteInlineObject_GetMetrics(run->object, &metrics))) { - WARN("Failed to get inline object metrics, hr %#x.\n", hr); + WARN("Failed to get inline object metrics, hr %#lx.\n", hr); memset(bbox, 0, sizeof(*bbox)); return; } @@ -5303,7 +5303,7 @@ static ULONG WINAPI dwritetypography_AddRef(IDWriteTypography *iface) struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); ULONG refcount = InterlockedIncrement(&typography->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -5313,7 +5313,7 @@ static ULONG WINAPI dwritetypography_Release(IDWriteTypography *iface) struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); ULONG refcount = InterlockedDecrement(&typography->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 26415201d91..82dc34a0cdc 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -104,7 +104,7 @@ static ULONG WINAPI renderingparams_AddRef(IDWriteRenderingParams3 *iface) struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); ULONG refcount = InterlockedIncrement(¶ms->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -114,7 +114,7 @@ static ULONG WINAPI renderingparams_Release(IDWriteRenderingParams3 *iface) struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); ULONG refcount = InterlockedDecrement(¶ms->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) free(params); @@ -299,7 +299,7 @@ static ULONG WINAPI localizedstrings_AddRef(IDWriteLocalizedStrings *iface) struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); ULONG refcount = InterlockedIncrement(&strings->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -310,7 +310,7 @@ static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) ULONG refcount = InterlockedDecrement(&strings->refcount); size_t i; - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -715,7 +715,7 @@ static IDWriteFontCollection1 *factory_get_system_collection(struct dwritefactor if (FAILED(hr = get_system_fontcollection(&factory->IDWriteFactory7_iface, &collection))) { - WARN("Failed to create system font collection, hr %#x.\n", hr); + WARN("Failed to create system font collection, hr %#lx.\n", hr); return NULL; } @@ -754,7 +754,7 @@ static ULONG WINAPI dwritefactory_AddRef(IDWriteFactory7 *iface) struct dwritefactory *factory = impl_from_IDWriteFactory7(iface); ULONG refcount = InterlockedIncrement(&factory->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -764,7 +764,7 @@ static ULONG WINAPI dwritefactory_Release(IDWriteFactory7 *iface) struct dwritefactory *factory = impl_from_IDWriteFactory7(iface); ULONG refcount = InterlockedDecrement(&factory->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) release_dwritefactory(factory); @@ -968,7 +968,7 @@ HRESULT factory_get_cached_fontface(IDWriteFactory7 *iface, IDWriteFontFile * co if (cached_key_size == key_size && !memcmp(cached_key, key, key_size)) { if (FAILED(hr = IDWriteFontFace5_QueryInterface(cached->fontface, riid, obj))) - WARN("Failed to get %s from fontface, hr %#x.\n", debugstr_guid(riid), hr); + WARN("Failed to get %s from fontface, hr %#lx.\n", debugstr_guid(riid), hr); TRACE("returning cached fontface %p\n", cached->fontface); break; @@ -1335,7 +1335,7 @@ static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory7 *ifac if (FAILED(hr = get_eudc_fontcollection(iface, &eudc_collection))) { *collection = NULL; - WARN("Failed to get EUDC collection, hr %#x.\n", hr); + WARN("Failed to get EUDC collection, hr %#lx.\n", hr); return hr; } @@ -1634,7 +1634,7 @@ static HRESULT create_system_fontset(IDWriteFactory7 *factory, REFIID riid, void if (i != j && !wcsicmp(paths[i], paths[j])) continue; if (FAILED(hr = IDWriteFontSetBuilder2_AddFontFile(builder, paths[i])) && hr != DWRITE_E_FILEFORMAT) - WARN("Failed to add font file, hr %#x, path %s.\n", hr, debugstr_w(paths[i])); + WARN("Failed to add font file, hr %#lx, path %s.\n", hr, debugstr_w(paths[i])); j = i; } diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 5bac32f9ee7..f04b70db193 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1777,7 +1777,7 @@ void dwrite_cmap_init(struct dwrite_cmap *cmap, IDWriteFontFile *file, unsigned /* For fontface stream is already available and preset. */ if (!cmap->stream && FAILED(hr = get_filestream_from_file(file, &cmap->stream))) { - WARN("Failed to get file stream, hr %#x.\n", hr); + WARN("Failed to get file stream, hr %#lx.\n", hr); goto failed; } @@ -2274,7 +2274,7 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la case OPENTYPE_PLATFORM_WIN: if (!LCIDToLocaleName(MAKELCID(lang_id, SORT_DEFAULT), locale, locale_len, 0)) { - FIXME("failed to get locale name for lcid=0x%08x\n", MAKELCID(lang_id, SORT_DEFAULT)); + FIXME("failed to get locale name for lcid=0x%08lx\n", MAKELCID(lang_id, SORT_DEFAULT)); wcscpy(locale, L"en-US"); } break; @@ -2488,7 +2488,7 @@ static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc version = table_read_be_dword(&meta, 0); if (version != 1) { - WARN("Unexpected meta table version %d.\n", version); + WARN("Unexpected meta table version %ld.\n", version); goto end; }
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dxdiagn/Makefile.in | 1 - dlls/dxdiagn/container.c | 8 ++++---- dlls/dxdiagn/dxdiag_main.c | 2 +- dlls/dxdiagn/provider.c | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index 218b77f9ff5..127981e8183 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxdiagn.dll IMPORTS = strmiids dxguid uuid d3d9 ddraw dsound version ole32 oleaut32 user32 advapi32 diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 7a5a7e9d0a5..efc8cba448e 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -56,7 +56,7 @@ static ULONG WINAPI IDxDiagContainerImpl_AddRef(IDxDiagContainer *iface) IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); DXDIAGN_LockModule(); @@ -68,7 +68,7 @@ static ULONG WINAPI IDxDiagContainerImpl_Release(IDxDiagContainer *iface) IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); if (!refCount) { IDxDiagProvider_Release(This->pProv); @@ -101,7 +101,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(IDxDiagContai IDxDiagContainerImpl_Container *p; DWORD i = 0; - TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszContainer, cchContainer); + TRACE("(%p, %lu, %p, %lu)\n", iface, dwIndex, pwszContainer, cchContainer); if (NULL == pwszContainer || 0 == cchContainer) { return E_INVALIDARG; @@ -214,7 +214,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(IDxDiagContainer *iface IDxDiagContainerImpl_Property *p; DWORD i = 0; - TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszPropName, cchPropName); + TRACE("(%p, %lu, %p, %lu)\n", iface, dwIndex, pwszPropName, cchPropName); if (NULL == pwszPropName || 0 == cchPropName) { return E_INVALIDARG; diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c index 0f57b94281f..90e769cd81f 100644 --- a/dlls/dxdiagn/dxdiag_main.c +++ b/dlls/dxdiagn/dxdiag_main.c @@ -42,7 +42,7 @@ LONG DXDIAGN_refCount = 0; /* At process attach */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved); + TRACE("%p,%lx,%p\n", hInstDLL, fdwReason, lpvReserved); if (fdwReason == DLL_PROCESS_ATTACH) { dxdiagn_instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index aaffb5c213d..8479d59fefe 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -84,7 +84,7 @@ static ULONG WINAPI IDxDiagProviderImpl_AddRef(IDxDiagProvider *iface) IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); DXDIAGN_LockModule(); @@ -96,7 +96,7 @@ static ULONG WINAPI IDxDiagProviderImpl_Release(IDxDiagProvider *iface) IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); if (!refCount) { free_information_tree(This->info_root); @@ -825,7 +825,7 @@ static const WCHAR *vendor_id_to_manufacturer_string(DWORD vendor_id) return vendors[i].name; } - FIXME("Unknown PCI vendor ID 0x%04x.\n", vendor_id); + FIXME("Unknown PCI vendor ID 0x%04lx.\n", vendor_id); return L"Unknown"; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/explorerframe/Makefile.in | 1 - dlls/explorerframe/explorerframe_main.c | 4 ++-- dlls/explorerframe/nstc.c | 34 ++++++++++++++++--------------- dlls/explorerframe/taskbarlist.c | 6 +++-- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index e37e3353ca8..18d054c7fad 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = explorerframe.dll IMPORTS = uuid ole32 comctl32 shell32 user32 diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index d0d8fd19e9b..efaaae0ae39 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -45,7 +45,7 @@ LONG EFRAME_refCount = 0; */ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p, 0x%x, %p\n", hinst, fdwReason, fImpLoad); + TRACE("%p, 0x%lx, %p\n", hinst, fdwReason, fImpLoad); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -61,7 +61,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) */ HRESULT WINAPI DllCanUnloadNow(void) { - TRACE("refCount is %d\n", EFRAME_refCount); + TRACE("refCount is %ld\n", EFRAME_refCount); return EFRAME_refCount ? S_FALSE : S_OK; } diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 0698e6fa065..cd4cf0388ee 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -192,7 +192,7 @@ static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs, NSTCSTYLE nstcs_mask, DWORD *new_style) { DWORD old_style, tv_mask = 0; - TRACE("%p, %x, %x, %p\n", This, nstcs, nstcs_mask, new_style); + TRACE("%p, %lx, %lx, %p\n", This, nstcs, nstcs_mask, new_style); if(This->hwnd_tv) old_style = GetWindowLongPtrW(This->hwnd_tv, GWL_STYLE); @@ -232,7 +232,7 @@ static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs, *new_style = (old_style & ~tv_mask) | (*new_style & tv_mask); - TRACE("old: %08x, new: %08x\n", old_style, *new_style); + TRACE("old: %08lx, new: %08lx\n", old_style, *new_style); return old_style^*new_style; } @@ -700,7 +700,7 @@ static LRESULT on_wm_mbuttonup(NSTC2Impl *This, WPARAM wParam, LPARAM lParam) TVHITTESTINFO tvhit; IShellItem *psi; HRESULT hr; - TRACE("%p (%lx, %lx)\n", This, wParam, lParam); + TRACE("%p (%Ix, %Ix)\n", This, wParam, lParam); tvhit.pt.x = (int)(short)LOWORD(lParam); tvhit.pt.y = (int)(short)HIWORD(lParam); @@ -724,7 +724,7 @@ static LRESULT on_kbd_event(NSTC2Impl *This, UINT uMsg, WPARAM wParam, LPARAM lP { IShellItem *psi; HTREEITEM hitem; - TRACE("%p : %d, %lx, %lx\n", This, uMsg, wParam, lParam); + TRACE("%p : %d, %Ix, %Ix\n", This, uMsg, wParam, lParam); /* Handled by the client? */ if(FAILED(events_OnKeyboardInput(This, uMsg, wParam, lParam))) @@ -837,7 +837,7 @@ static ULONG WINAPI NSTC2_fnAddRef(INameSpaceTreeControl2* iface) NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("%p - ref %d\n", This, ref); + TRACE("%p - ref %ld\n", This, ref); return ref; } @@ -847,7 +847,7 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface) NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("%p - ref: %d\n", This, ref); + TRACE("%p - ref: %ld\n", This, ref); if(!ref) { @@ -871,10 +871,10 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, RECT rc; static const WCHAR NSTC2_CLASS_NAME[] = L"NamespaceTreeControl"; - TRACE("%p (%p, %p, %x)\n", This, hwndParent, prc, nstcsFlags); + TRACE("%p (%p, %p, %lx)\n", This, hwndParent, prc, nstcsFlags); if(nstcsFlags & unsupported_styles) - FIXME("0x%08x contains the unsupported style(s) 0x%08x\n", + FIXME("0x%08lx contains the unsupported style(s) 0x%08lx\n", nstcsFlags, nstcsFlags & unsupported_styles); This->style = nstcsFlags; @@ -949,7 +949,7 @@ static HRESULT WINAPI NSTC2_fnTreeUnadvise(INameSpaceTreeControl2* iface, DWORD { NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); - TRACE("%p (%x)\n", This, cookie); + TRACE("%p (%lx)\n", This, cookie); /* The cookie is ignored. */ @@ -987,7 +987,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, HTREEITEM add_after_hitem; int i; - TRACE("%p, %d, %p, %x, %x, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif); + TRACE("%p, %d, %p, %lx, %lx, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif); new_root = heap_alloc(sizeof(*new_root)); if(!new_root) @@ -1045,7 +1045,7 @@ static HRESULT WINAPI NSTC2_fnAppendRoot(INameSpaceTreeControl2* iface, { NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); UINT root_count; - TRACE("%p, %p, %x, %x, %p\n", + TRACE("%p, %p, %lx, %lx, %p\n", This, psiRoot, grfEnumFlags, grfRootStyle, pif); root_count = list_count(&This->roots); @@ -1151,7 +1151,7 @@ static HRESULT WINAPI NSTC2_fnSetItemState(INameSpaceTreeControl2* iface, TVITEMEXW tvi; HTREEITEM hitem; - TRACE("%p (%p, %x, %x)\n", This, psi, nstcisMask, nstcisFlags); + TRACE("%p (%p, %lx, %lx)\n", This, psi, nstcisMask, nstcisFlags); hitem = treeitem_from_shellitem(This, psi); if(!hitem) return E_INVALIDARG; @@ -1213,7 +1213,7 @@ static HRESULT WINAPI NSTC2_fnGetItemState(INameSpaceTreeControl2* iface, NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); HTREEITEM hitem; TVITEMEXW tvi; - TRACE("%p (%p, %x, %p)\n", This, psi, nstcisMask, pnstcisFlags); + TRACE("%p (%p, %lx, %p)\n", This, psi, nstcisMask, pnstcisFlags); hitem = treeitem_from_shellitem(This, psi); if(!hitem) @@ -1425,7 +1425,7 @@ static HRESULT WINAPI NSTC2_fnSetControlStyle(INameSpaceTreeControl2* iface, NSTCS_SINGLECLICKEXPAND | NSTCS_NOREPLACEOPEN | NSTCS_NOORDERSTREAM | NSTCS_FAVORITESMODE | NSTCS_EMPTYTEXT | NSTCS_ALLOWJUNCTIONS | NSTCS_SHOWTABSBUTTON | NSTCS_SHOWDELETEBUTTON | NSTCS_SHOWREFRESHBUTTON; - TRACE("%p (%x, %x)\n", This, nstcsMask, nstcsStyle); + TRACE("%p (%lx, %lx)\n", This, nstcsMask, nstcsStyle); /* Fail if there is an attempt to set an unknown style. */ if(nstcsMask & ~(tv_style_flags | host_style_flags | nstc_flags)) @@ -1455,7 +1455,7 @@ static HRESULT WINAPI NSTC2_fnSetControlStyle(INameSpaceTreeControl2* iface, } if((nstcsStyle & nstcsMask) & unsupported_styles) - FIXME("mask & style (0x%08x) contains unsupported style(s): 0x%08x\n", + FIXME("mask & style (0x%08lx) contains unsupported style(s): 0x%08lx\n", (nstcsStyle & nstcsMask), (nstcsStyle & nstcsMask) & unsupported_styles); @@ -1470,7 +1470,7 @@ static HRESULT WINAPI NSTC2_fnGetControlStyle(INameSpaceTreeControl2* iface, NSTCSTYLE *pnstcsStyle) { NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); - TRACE("%p (%x, %p)\n", This, nstcsMask, pnstcsStyle); + TRACE("%p (%lx, %p)\n", This, nstcsMask, pnstcsStyle); *pnstcsStyle = (This->style & nstcsMask); @@ -1485,7 +1485,7 @@ static HRESULT WINAPI NSTC2_fnSetControlStyle2(INameSpaceTreeControl2* iface, TRACE("%p (%x, %x)\n", This, nstcsMask, nstcsStyle); if((nstcsStyle & nstcsMask) & unsupported_styles2) - FIXME("mask & style (0x%08x) contains unsupported style(s): 0x%08x\n", + FIXME("mask & style (0x%08x) contains unsupported style(s): 0x%08lx\n", (nstcsStyle & nstcsMask), (nstcsStyle & nstcsMask) & unsupported_styles2); diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 7e1f5b92c5b..b4bc104cd6b 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList4 *iface) struct taskbar_list *This = impl_from_ITaskbarList4(iface); ULONG refcount = InterlockedIncrement(&This->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %lu\n", This, refcount); return refcount; } @@ -77,7 +77,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList4 *iface) struct taskbar_list *This = impl_from_ITaskbarList4(iface); ULONG refcount = InterlockedDecrement(&This->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %lu\n", This, refcount); if (!refcount) { @@ -190,7 +190,7 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_SetTabActive(ITaskbarList4 *iface, HWND hwndMDI, DWORD dwReserved) { - FIXME("iface %p, hwndTab %p, hwndMDI %p, dwReserved %x stub!\n", iface, hwndTab, hwndMDI, dwReserved); + FIXME("iface %p, hwndTab %p, hwndMDI %p, dwReserved %lx stub!\n", iface, hwndTab, hwndMDI, dwReserved); return E_NOTIMPL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/faultrep/Makefile.in | 1 - dlls/faultrep/faultrep.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/faultrep/Makefile.in b/dlls/faultrep/Makefile.in index b28485eb9d8..9e054425781 100644 --- a/dlls/faultrep/Makefile.in +++ b/dlls/faultrep/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = faultrep.dll IMPORTLIB = faultrep IMPORTS = advapi32 diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c index e45f3e0a2d1..b9207426970 100644 --- a/dlls/faultrep/faultrep.c +++ b/dlls/faultrep/faultrep.c @@ -100,6 +100,6 @@ BOOL WINAPI AddERExcludedApplicationA(LPCSTR lpAppFileName) */ EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS pep, DWORD dwOpt) { - FIXME("%p 0x%x stub\n", pep, dwOpt); + FIXME("%p 0x%lx stub\n", pep, dwOpt); return frrvOk; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/fltlib/Makefile.in | 1 - dlls/fltlib/fltlib.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/fltlib/Makefile.in b/dlls/fltlib/Makefile.in index f7281c69c9d..d969421644a 100644 --- a/dlls/fltlib/Makefile.in +++ b/dlls/fltlib/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fltlib.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c index 5af6bbb13c9..a6cf060b3d1 100644 --- a/dlls/fltlib/fltlib.c +++ b/dlls/fltlib/fltlib.c @@ -33,7 +33,7 @@ HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOption LPSECURITY_ATTRIBUTES lpSecurityAttributes, HANDLE *hPort) { - FIXME("(%s, %d, %p, %d, %p, %p) stub\n", debugstr_w(lpPortName), dwOptions, + FIXME("(%s, %ld, %p, %ld, %p, %p) stub\n", debugstr_w(lpPortName), dwOptions, lpContext, dwSizeOfContext, lpSecurityAttributes, hPort); *hPort = INVALID_HANDLE_VALUE; @@ -46,7 +46,7 @@ HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOption HRESULT WINAPI FilterFindFirst(DWORD class, LPVOID buffer, DWORD size, LPDWORD bytes_returned, LPHANDLE handle) { - FIXME("(%u, %p, %u, %p, %p) stub\n", class, buffer, size, bytes_returned, handle); + FIXME("(%lu, %p, %lu, %p, %p) stub\n", class, buffer, size, bytes_returned, handle); return HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS); }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/fntcache/Makefile.in | 1 - dlls/fntcache/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/fntcache/Makefile.in b/dlls/fntcache/Makefile.in index d87c7c2d4ea..dbc72506fe3 100644 --- a/dlls/fntcache/Makefile.in +++ b/dlls/fntcache/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fntcache.dll IMPORTS = advapi32 diff --git a/dlls/fntcache/main.c b/dlls/fntcache/main.c index 0f8508652f2..baa06916068 100644 --- a/dlls/fntcache/main.c +++ b/dlls/fntcache/main.c @@ -50,7 +50,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, void *event_d SetEvent( stop_event ); return NO_ERROR; default: - FIXME( "got service ctrl %x\n", ctrl ); + FIXME( "got service ctrl %lx\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/fontsub/Makefile.in | 1 - dlls/fontsub/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/fontsub/Makefile.in b/dlls/fontsub/Makefile.in index 1c4a4c47481..338af096ccb 100644 --- a/dlls/fontsub/Makefile.in +++ b/dlls/fontsub/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fontsub.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c index 17bc0c7cc70..1f99c86d953 100644 --- a/dlls/fontsub/main.c +++ b/dlls/fontsub/main.c @@ -31,7 +31,7 @@ ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, u const unsigned short *keep_list, const unsigned short keep_len, CFP_ALLOCPROC allocproc, CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved) { - FIXME("(%p %u %p %p %p %#x %u %u %u %u %u %p %u %p %p %p %p): stub\n", src, src_len, dest, dest_len, + FIXME("(%p %lu %p %p %p %#x %u %u %u %u %u %p %u %p %p %p %p): stub\n", src, src_len, dest, dest_len, written, flags, face_index, format, lang, platform, encoding, keep_list, keep_len, allocproc, reallocproc, freeproc, reserved);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/fusion/Makefile.in | 1 - dlls/fusion/asmcache.c | 22 +++++++++++----------- dlls/fusion/asmenum.c | 8 ++++---- dlls/fusion/asmname.c | 16 ++++++++-------- dlls/fusion/fusion.c | 2 +- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 71d3166500e..093b64c0d32 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fusion.dll IMPORTS = bcrypt dbghelp shlwapi version user32 diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 94a61ea255c..b9cb505de86 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -182,7 +182,7 @@ static ULONG WINAPI IAssemblyCacheImpl_AddRef(IAssemblyCache *iface) IAssemblyCacheImpl *This = impl_from_IAssemblyCache(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); + TRACE("(%p)->(ref before = %lu)\n", This, refCount - 1); return refCount; } @@ -192,7 +192,7 @@ static ULONG WINAPI IAssemblyCacheImpl_Release(IAssemblyCache *iface) IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); ULONG refCount = InterlockedDecrement( &cache->ref ); - TRACE("(%p)->(ref before = %u)\n", cache, refCount + 1); + TRACE("(%p)->(ref before = %lu)\n", cache, refCount + 1); if (!refCount) { @@ -226,7 +226,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface ULONG disp; DWORD len; - TRACE("(%p, 0%08x, %s, %p, %p)\n", iface, dwFlags, + TRACE("(%p, 0%08lx, %s, %p, %p)\n", iface, dwFlags, debugstr_w(pszAssemblyName), pRefData, pulDisposition); if (pRefData) @@ -305,7 +305,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_QueryAssemblyInfo(IAssemblyCache *iface IAssemblyEnum *asmenum = NULL; HRESULT hr; - TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, + TRACE("(%p, %ld, %s, %p)\n", iface, dwFlags, debugstr_w(pszAssemblyName), pAsmInfo); if (pAsmInfo) @@ -364,7 +364,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyCacheItem(IAssemblyCache { IAssemblyCacheItemImpl *item; - FIXME("(%p, %d, %p, %p, %s) semi-stub!\n", iface, dwFlags, pvReserved, + FIXME("(%p, %ld, %p, %p, %s) semi-stub!\n", iface, dwFlags, pvReserved, ppAsmItem, debugstr_w(pszAssemblyName)); if (!ppAsmItem) @@ -435,7 +435,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, DWORD i, count = 0, src_len, dst_len = ARRAY_SIZE(format_v40); HRESULT hr; - TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, + TRACE("(%p, %ld, %s, %p)\n", iface, dwFlags, debugstr_w(pszManifestFilePath), pRefData); if (!pszManifestFilePath || !*pszManifestFilePath) @@ -553,7 +553,7 @@ HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved { IAssemblyCacheImpl *cache; - TRACE("(%p, %d)\n", ppAsmCache, dwReserved); + TRACE("(%p, %ld)\n", ppAsmCache, dwReserved); if (!ppAsmCache) return E_INVALIDARG; @@ -607,7 +607,7 @@ static ULONG WINAPI IAssemblyCacheItemImpl_AddRef(IAssemblyCacheItem *iface) IAssemblyCacheItemImpl *This = impl_from_IAssemblyCacheItem(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); + TRACE("(%p)->(ref before = %lu)\n", This, refCount - 1); return refCount; } @@ -617,7 +617,7 @@ static ULONG WINAPI IAssemblyCacheItemImpl_Release(IAssemblyCacheItem *iface) IAssemblyCacheItemImpl *This = impl_from_IAssemblyCacheItem(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); + TRACE("(%p)->(ref before = %lu)\n", This, refCount + 1); if (!refCount) heap_free(This); @@ -633,7 +633,7 @@ static HRESULT WINAPI IAssemblyCacheItemImpl_CreateStream(IAssemblyCacheItem *if IStream **ppIStream, ULARGE_INTEGER *puliMaxSize) { - FIXME("(%p, %d, %s, %d, %d, %p, %p) stub!\n", iface, dwFlags, + FIXME("(%p, %ld, %s, %ld, %ld, %p, %p) stub!\n", iface, dwFlags, debugstr_w(pszStreamName), dwFormat, dwFormatFlags, ppIStream, puliMaxSize); return E_NOTIMPL; @@ -643,7 +643,7 @@ static HRESULT WINAPI IAssemblyCacheItemImpl_Commit(IAssemblyCacheItem *iface, DWORD dwFlags, ULONG *pulDisposition) { - FIXME("(%p, %d, %p) stub!\n", iface, dwFlags, pulDisposition); + FIXME("(%p, %ld, %p) stub!\n", iface, dwFlags, pulDisposition); return E_NOTIMPL; } diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 35f8099e822..d545e2533b5 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -84,7 +84,7 @@ static ULONG WINAPI IAssemblyEnumImpl_AddRef(IAssemblyEnum *iface) IAssemblyEnumImpl *This = impl_from_IAssemblyEnum(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); + TRACE("(%p)->(ref before = %lu)\n", This, refCount - 1); return refCount; } @@ -95,7 +95,7 @@ static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) ULONG refCount = InterlockedDecrement(&This->ref); struct list *item, *cursor; - TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); + TRACE("(%p)->(ref before = %lu)\n", This, refCount + 1); if (!refCount) { @@ -122,7 +122,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_GetNextAssembly(IAssemblyEnum *iface, IAssemblyEnumImpl *asmenum = impl_from_IAssemblyEnum(iface); ASMNAME *asmname; - TRACE("(%p, %p, %p, %d)\n", iface, pvReserved, ppName, dwFlags); + TRACE("(%p, %p, %p, %ld)\n", iface, pvReserved, ppName, dwFlags); if (!ppName) return E_INVALIDARG; @@ -466,7 +466,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, IAssemblyEnumImpl *asmenum; HRESULT hr; - TRACE("(%p, %p, %p, %08x, %p)\n", pEnum, pUnkReserved, + TRACE("(%p, %p, %p, %08lx, %p)\n", pEnum, pUnkReserved, pName, dwFlags, pvReserved); if (!pEnum) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 966a8f20eb4..8a6531df0b8 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -100,7 +100,7 @@ static ULONG WINAPI IAssemblyNameImpl_AddRef(IAssemblyName *iface) IAssemblyNameImpl *This = impl_from_IAssemblyName(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); + TRACE("(%p)->(ref before = %lu)\n", This, refCount - 1); return refCount; } @@ -110,7 +110,7 @@ static ULONG WINAPI IAssemblyNameImpl_Release(IAssemblyName *iface) IAssemblyNameImpl *This = impl_from_IAssemblyName(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); + TRACE("(%p)->(ref before = %lu)\n", This, refCount + 1); if (!refCount) { @@ -130,7 +130,7 @@ static HRESULT WINAPI IAssemblyNameImpl_SetProperty(IAssemblyName *iface, LPVOID pvProperty, DWORD cbProperty) { - FIXME("(%p, %d, %p, %d) stub!\n", iface, PropertyId, pvProperty, cbProperty); + FIXME("(%p, %ld, %p, %ld) stub!\n", iface, PropertyId, pvProperty, cbProperty); return E_NOTIMPL; } @@ -142,7 +142,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); DWORD size; - TRACE("(%p, %d, %p, %p)\n", iface, PropertyId, pvProperty, pcbProperty); + TRACE("(%p, %ld, %p, %p)\n", iface, PropertyId, pvProperty, pcbProperty); size = *pcbProperty; switch (PropertyId) @@ -268,7 +268,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, WCHAR verstr[30], *cultureval = NULL; DWORD size; - TRACE("(%p, %p, %p, %d)\n", iface, szDisplayName, + TRACE("(%p, %p, %p, %ld)\n", iface, szDisplayName, pccDisplayName, dwDisplayFlags); if (dwDisplayFlags == 0) @@ -398,7 +398,7 @@ static HRESULT WINAPI IAssemblyNameImpl_Reserved(IAssemblyName *iface, DWORD cbReserved, LPVOID *ppReserved) { - TRACE("(%p, %s, %p, %p, %s, %s, %p, %d, %p)\n", iface, + TRACE("(%p, %s, %p, %p, %s, %s, %p, %ld, %p)\n", iface, debugstr_guid(refIID), pUnkReserved1, pUnkReserved2, debugstr_w(szReserved), wine_dbgstr_longlong(llReserved), pvReserved, cbReserved, ppReserved); @@ -459,7 +459,7 @@ static HRESULT WINAPI IAssemblyNameImpl_IsEqual(IAssemblyName *iface, IAssemblyNameImpl *name1 = impl_from_IAssemblyName(iface); IAssemblyNameImpl *name2 = impl_from_IAssemblyName(pName); - TRACE("(%p, %p, 0x%08x)\n", iface, pName, flags); + TRACE("(%p, %p, 0x%08lx)\n", iface, pName, flags); if (!pName) return S_FALSE; if (flags & ~ASM_CMPF_IL_ALL) FIXME("unsupported flags\n"); @@ -798,7 +798,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, IAssemblyNameImpl *name; HRESULT hr; - TRACE("(%p, %s, %08x, %p)\n", ppAssemblyNameObj, + TRACE("(%p, %s, %08lx, %p)\n", ppAssemblyNameObj, debugstr_w(szAssemblyName), dwFlags, pvReserved); if (!ppAssemblyNameObj) diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index 0787bf0f2ac..c7d3f3bca00 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -66,7 +66,7 @@ HRESULT WINAPI CreateInstallReferenceEnum(IInstallReferenceEnum **ppRefEnum, IAssemblyName *pName, DWORD dwFlags, LPVOID pvReserved) { - FIXME("(%p, %p, %08x, %p) stub!\n", ppRefEnum, pName, dwFlags, pvReserved); + FIXME("(%p, %p, %08lx, %p) stub!\n", ppRefEnum, pName, dwFlags, pvReserved); return E_NOTIMPL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/gameux/Makefile.in | 1 - dlls/gameux/gameexplorer.c | 6 +++--- dlls/gameux/gamestatistics.c | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index 1edc4213a6e..b541ae9470b 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = gameux.dll IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 shlwapi diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 5fdacacf4b2..c0513fc65cb 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -536,7 +536,7 @@ static HRESULT GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, CloseHandle(thread); if(ret != WAIT_OBJECT_0) { - ERR("Wait failed (%#x).\n", ret); + ERR("Wait failed (%#lx).\n", ret); hr = E_FAIL; goto done; } @@ -818,7 +818,7 @@ static ULONG WINAPI GameExplorerImpl_AddRef(IGameExplorer *iface) ref = InterlockedIncrement(&This->ref); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); return ref; } @@ -828,7 +828,7 @@ static ULONG WINAPI GameExplorerImpl_Release(IGameExplorer *iface) LONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if(ref == 0) { diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 1696ee1e76a..4e120936f21 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -672,7 +672,7 @@ static ULONG WINAPI GameStatisticsImpl_AddRef(IGameStatistics *iface) ref = InterlockedIncrement(&This->ref); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); return ref; } @@ -682,7 +682,7 @@ static ULONG WINAPI GameStatisticsImpl_Release(IGameStatistics *iface) LONG ref; ref = InterlockedDecrement( &This->ref ); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if ( ref == 0 ) { @@ -1028,7 +1028,7 @@ static ULONG WINAPI GameStatisticsMgrImpl_AddRef(IGameStatisticsMgr *iface) ref = InterlockedIncrement(&This->ref); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); return ref; } @@ -1038,7 +1038,7 @@ static ULONG WINAPI GameStatisticsMgrImpl_Release(IGameStatisticsMgr *iface) LONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ref=%d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if ( ref == 0 ) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/dc.c | 18 +++++++++--------- dlls/gdi32/emfdc.c | 6 +++--- dlls/gdi32/enhmetafile.c | 32 ++++++++++++++++---------------- dlls/gdi32/icm.c | 10 +++++----- dlls/gdi32/metadc.c | 2 +- dlls/gdi32/metafile.c | 12 ++++++------ dlls/gdi32/objects.c | 10 +++++----- dlls/gdi32/text.c | 18 +++++++++--------- dlls/gdi32/uniscribe/opentype.c | 6 +++--- dlls/gdi32/uniscribe/usp10.c | 12 ++++++------ 11 files changed, 64 insertions(+), 64 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 381b2b9a87f..3e0495f877b 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_GDI32_ +EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = advapi32 win32u diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index d609185be76..b00fff167cb 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1366,7 +1366,7 @@ BOOL WINAPI AngleArc( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_angle, FL { DC_ATTR *dc_attr; - TRACE( "%p, (%d, %d), %u, %f, %f\n", hdc, x, y, radius, start_angle, sweep_angle ); + TRACE( "%p, (%d, %d), %lu, %f, %f\n", hdc, x, y, radius, start_angle, sweep_angle ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_AngleArc( dc_attr, x, y, radius, start_angle, sweep_angle )) @@ -1478,7 +1478,7 @@ BOOL WINAPI PolyPolyline( HDC hdc, const POINT *points, const DWORD *counts, DWO { DC_ATTR *dc_attr; - TRACE( "%p, %p, %p, %u\n", hdc, points, counts, polylines ); + TRACE( "%p, %p, %p, %lu\n", hdc, points, counts, polylines ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolyPolyline( dc_attr, points, counts, polylines )) return FALSE; @@ -1492,7 +1492,7 @@ BOOL WINAPI PolyBezier( HDC hdc, const POINT *points, DWORD count ) { DC_ATTR *dc_attr; - TRACE( "%p, %p, %u\n", hdc, points, count ); + TRACE( "%p, %p, %lu\n", hdc, points, count ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolyBezier( dc_attr, points, count )) return FALSE; @@ -1506,7 +1506,7 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT *points, DWORD count ) { DC_ATTR *dc_attr; - TRACE( "%p, %p, %u\n", hdc, points, count ); + TRACE( "%p, %p, %lu\n", hdc, points, count ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolyBezierTo( dc_attr, points, count )) return FALSE; @@ -1520,7 +1520,7 @@ BOOL WINAPI PolylineTo( HDC hdc, const POINT *points, DWORD count ) { DC_ATTR *dc_attr; - TRACE( "%p, %p, %u\n", hdc, points, count ); + TRACE( "%p, %p, %lu\n", hdc, points, count ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolylineTo( dc_attr, points, count )) return FALSE; @@ -1534,7 +1534,7 @@ BOOL WINAPI PolyDraw( HDC hdc, const POINT *points, const BYTE *types, DWORD cou { DC_ATTR *dc_attr; - TRACE( "%p, %p, %p, %u\n", hdc, points, types, count ); + TRACE( "%p, %p, %p, %lu\n", hdc, points, types, count ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolyDraw( dc_attr, points, types, count )) return FALSE; @@ -1609,7 +1609,7 @@ BOOL WINAPI ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT fill_type { DC_ATTR *dc_attr; - TRACE( "%p, (%d, %d), %08x, %x\n", hdc, x, y, color, fill_type ); + TRACE( "%p, (%d, %d), %08lx, %x\n", hdc, x, y, color, fill_type ); if (is_meta_dc( hdc )) return METADC_ExtFloodFill( hdc, x, y, color, fill_type ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; @@ -1633,7 +1633,7 @@ BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, { DC_ATTR *dc_attr; - TRACE( "%p vert_array:%p nvert:%d grad_array:%p ngrad:%d\n", hdc, vert_array, + TRACE( "%p vert_array:%p nvert:%ld grad_array:%p ngrad:%ld\n", hdc, vert_array, nvert, grad_array, ngrad ); if (!(dc_attr = get_dc_attr( hdc ))) @@ -2155,7 +2155,7 @@ INT WINAPI StartDocW( HDC hdc, const DOCINFOW *doc ) { DC_ATTR *dc_attr; - TRACE("DocName %s, Output %s, Datatype %s, fwType %#x\n", + TRACE("DocName %s, Output %s, Datatype %s, fwType %#lx\n", debugstr_w(doc->lpszDocName), debugstr_w(doc->lpszOutput), debugstr_w(doc->lpszDatatype), doc->fwType); diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index d0b9033722c..eec700de327 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -51,7 +51,7 @@ static BOOL emfdc_record( struct emf *emf, EMR *emr ) DWORD len, size; ENHMETAHEADER *emh; - TRACE( "record %d, size %d\n", emr->iType, emr->nSize ); + TRACE( "record %ld, size %ld\n", emr->iType, emr->nSize ); assert( !(emr->nSize & 3) ); @@ -252,7 +252,7 @@ static BOOL emf_parse_user_bitmapinfo( BITMAPINFOHEADER *dst, const BITMAPINFOHE } else { - WARN( "(%u): unknown/wrong size for header\n", info->biSize ); + WARN( "(%lu): unknown/wrong size for header\n", info->biSize ); return FALSE; } @@ -1204,7 +1204,7 @@ BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *r size = sizeof(*emr) + ((count+1) & ~1) * sizeof(WCHAR) + count * sizeof(INT); - TRACE( "%s %s count %d size = %d\n", debugstr_wn(str, count), + TRACE( "%s %s count %d size = %ld\n", debugstr_wn(str, count), wine_dbgstr_rect(rect), count, size ); emr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 4b1ccaa9206..336f2d389fd 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -201,7 +201,7 @@ static const char *get_emr_name(DWORD type) unsigned int i; for(i = 0; i < ARRAY_SIZE(emr_names); i++) if(type == emr_names[i].type) return emr_names[i].name; - TRACE("Unknown record type %d\n", type); + TRACE("Unknown record type %ld\n", type); return NULL; } @@ -274,13 +274,13 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on if (emh->dSignature != ENHMETA_SIGNATURE || (emh->nBytes & 3)) /* refuse to load unaligned EMF as Windows does */ { - WARN("Invalid emf header type 0x%08x sig 0x%08x.\n", + WARN("Invalid emf header type 0x%08lx sig 0x%08lx.\n", emh->iType, emh->dSignature); return 0; } if (filesize < emh->nBytes) { - WARN("File truncated (got %u bytes, header says %u)\n", emh->nBytes, filesize); + WARN("File truncated (got %lu bytes, header says %lu)\n", emh->nBytes, filesize); return 0; } @@ -881,7 +881,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_RESTOREDC: { const EMRRESTOREDC *pRestoreDC = (const EMRRESTOREDC *)mr; - TRACE("EMR_RESTORE: %d\n", pRestoreDC->iRelative); + TRACE("EMR_RESTORE: %ld\n", pRestoreDC->iRelative); if (RestoreDC( hdc, pRestoreDC->iRelative )) EMF_RestoreDC( info, pRestoreDC->iRelative ); break; @@ -889,7 +889,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_INTERSECTCLIPRECT: { const EMRINTERSECTCLIPRECT *pClipRect = (const EMRINTERSECTCLIPRECT *)mr; - TRACE("EMR_INTERSECTCLIPRECT: rect %d,%d - %d, %d\n", + TRACE("EMR_INTERSECTCLIPRECT: rect %ld,%ld - %ld, %ld\n", pClipRect->rclClip.left, pClipRect->rclClip.top, pClipRect->rclClip.right, pClipRect->rclClip.bottom); IntersectClipRect(hdc, pClipRect->rclClip.left, pClipRect->rclClip.top, @@ -1222,7 +1222,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( rc.top = pExtTextOutA->emrtext.rcl.top; rc.right = pExtTextOutA->emrtext.rcl.right; rc.bottom = pExtTextOutA->emrtext.rcl.bottom; - TRACE("EMR_EXTTEXTOUTA: x,y = %d, %d. rect = %s. flags %08x\n", + TRACE("EMR_EXTTEXTOUTA: x,y = %ld, %ld. rect = %s. flags %08lx\n", pExtTextOutA->emrtext.ptlReference.x, pExtTextOutA->emrtext.ptlReference.y, wine_dbgstr_rect(&rc), pExtTextOutA->emrtext.fOptions); @@ -1258,7 +1258,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( rc.top = pExtTextOutW->emrtext.rcl.top; rc.right = pExtTextOutW->emrtext.rcl.right; rc.bottom = pExtTextOutW->emrtext.rcl.bottom; - TRACE("EMR_EXTTEXTOUTW: x,y = %d, %d. rect = %s. flags %08x\n", + TRACE("EMR_EXTTEXTOUTW: x,y = %ld, %ld. rect = %s. flags %08lx\n", pExtTextOutW->emrtext.ptlReference.x, pExtTextOutW->emrtext.ptlReference.y, wine_dbgstr_rect(&rc), pExtTextOutW->emrtext.fOptions); @@ -1490,7 +1490,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( if (info->state.mode == MM_ISOTROPIC) EMF_FixIsotropic(hdc, info); - TRACE("EMRSCALEVIEWPORTEXTEX %d/%d %d/%d\n", + TRACE("EMRSCALEVIEWPORTEXTEX %ld/%ld %ld/%ld\n", lpScaleViewportExtEx->xNum,lpScaleViewportExtEx->xDenom, lpScaleViewportExtEx->yNum,lpScaleViewportExtEx->yDenom); @@ -1518,7 +1518,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( if (info->state.mode == MM_ISOTROPIC) EMF_FixIsotropic(hdc, info); - TRACE("EMRSCALEWINDOWEXTEX %d/%d %d/%d\n", + TRACE("EMRSCALEWINDOWEXTEX %ld/%ld %ld/%ld\n", lpScaleWindowExtEx->xNum,lpScaleWindowExtEx->xDenom, lpScaleWindowExtEx->yNum,lpScaleWindowExtEx->yDenom); @@ -1553,7 +1553,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( EMF_Update_MF_Xform(hdc, info); break; default: - FIXME("Unknown imode %d\n", lpModifyWorldTrans->iMode); + FIXME("Unknown imode %ld\n", lpModifyWorldTrans->iMode); break; } break; @@ -1952,7 +1952,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( { const EMRSTRETCHBLT *pStretchBlt = (const EMRSTRETCHBLT *)mr; - TRACE("EMR_STRETCHBLT: %d, %d %dx%d -> %d, %d %dx%d. rop %08x offBitsSrc %d\n", + TRACE("EMR_STRETCHBLT: %ld, %ld %ldx%ld -> %ld, %ld %ldx%ld. rop %08lx offBitsSrc %ld\n", pStretchBlt->xSrc, pStretchBlt->ySrc, pStretchBlt->cxSrc, pStretchBlt->cySrc, pStretchBlt->xDest, pStretchBlt->yDest, pStretchBlt->cxDest, pStretchBlt->cyDest, pStretchBlt->dwRop, pStretchBlt->offBitsSrc); @@ -1996,7 +1996,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( { const EMRALPHABLEND *pAlphaBlend = (const EMRALPHABLEND *)mr; - TRACE("EMR_ALPHABLEND: %d, %d %dx%d -> %d, %d %dx%d. blendfn %08x offBitsSrc %d\n", + TRACE("EMR_ALPHABLEND: %ld, %ld %ldx%ld -> %ld, %ld %ldx%ld. blendfn %08lx offBitsSrc %ld\n", pAlphaBlend->xSrc, pAlphaBlend->ySrc, pAlphaBlend->cxSrc, pAlphaBlend->cySrc, pAlphaBlend->xDest, pAlphaBlend->yDest, pAlphaBlend->cxDest, pAlphaBlend->cyDest, pAlphaBlend->dwRop, pAlphaBlend->offBitsSrc); @@ -2475,7 +2475,7 @@ BOOL WINAPI EnumEnhMetaFile( double xSrcPixSize, ySrcPixSize, xscale, yscale; XFORM xform; - TRACE("rect: %s. rclFrame: (%d,%d)-(%d,%d)\n", wine_dbgstr_rect(lpRect), + TRACE("rect: %s. rclFrame: (%ld,%ld)-(%ld,%ld)\n", wine_dbgstr_rect(lpRect), emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, emh->rclFrame.bottom); @@ -2525,7 +2525,7 @@ BOOL WINAPI EnumEnhMetaFile( if (hdc && IS_WIN9X() && emr_produces_output(emr->iType)) EMF_Update_MF_Xform(hdc, info); - TRACE("Calling EnumFunc with record %s, size %d\n", get_emr_name(emr->iType), emr->nSize); + TRACE("Calling EnumFunc with record %s, size %ld\n", get_emr_name(emr->iType), emr->nSize); ret = (*callback)(hdc, ht, emr, emh->nHandles, (LPARAM)data); offset += emr->nSize; } @@ -2722,7 +2722,7 @@ static INT CALLBACK cbEnhPaletteCopy( HDC a, EMF_PaletteCopy* info = (EMF_PaletteCopy*)lpData; DWORD dwNumPalToCopy = min( lpEof->nPalEntries, info->cEntries ); - TRACE( "copying 0x%08x palettes\n", dwNumPalToCopy ); + TRACE( "copying 0x%08lx palettes\n", dwNumPalToCopy ); memcpy( info->lpPe, (LPCSTR)lpEof + lpEof->offPalEntries, sizeof( *(info->lpPe) ) * dwNumPalToCopy ); @@ -2877,7 +2877,7 @@ HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, const BYTE *lpbBuffer, HDC if (lpmfp) { - TRACE("mm = %d %dx%d\n", lpmfp->mm, lpmfp->xExt, lpmfp->yExt); + TRACE("mm = %ld %ldx%ld\n", lpmfp->mm, lpmfp->xExt, lpmfp->yExt); mm = lpmfp->mm; xExt = lpmfp->xExt; diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index d36c5135521..549c09c16b0 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -71,7 +71,7 @@ INT WINAPI EnumICMProfilesW(HDC hdc, ICMENUMPROCW func, LPARAM lparam) WCHAR profile[MAX_PATH]; DWORD size = ARRAYSIZE(profile); - TRACE( "%p, %p, 0x%08lx\n", hdc, func, lparam ); + TRACE( "%p, %p, 0x%08Ix\n", hdc, func, lparam ); if (!func) return -1; if (!__wine_get_icm_profile( hdc, FALSE, &size, profile )) return -1; @@ -139,7 +139,7 @@ BOOL WINAPI GetICMProfileW(HDC hdc, LPDWORD size, LPWSTR filename) */ BOOL WINAPI GetLogColorSpaceA(HCOLORSPACE colorspace, LPLOGCOLORSPACEA buffer, DWORD size) { - FIXME("%p %p 0x%08x stub\n", colorspace, buffer, size); + FIXME("%p %p 0x%08lx stub\n", colorspace, buffer, size); return FALSE; } @@ -148,7 +148,7 @@ BOOL WINAPI GetLogColorSpaceA(HCOLORSPACE colorspace, LPLOGCOLORSPACEA buffer, D */ BOOL WINAPI GetLogColorSpaceW(HCOLORSPACE colorspace, LPLOGCOLORSPACEW buffer, DWORD size) { - FIXME("%p %p 0x%08x stub\n", colorspace, buffer, size); + FIXME("%p %p 0x%08lx stub\n", colorspace, buffer, size); return FALSE; } @@ -197,7 +197,7 @@ BOOL WINAPI SetICMProfileW(HDC hdc, LPWSTR filename) */ BOOL WINAPI UpdateICMRegKeyA(DWORD reserved, LPSTR cmid, LPSTR filename, UINT command) { - FIXME("0x%08x, %s, %s, 0x%08x stub\n", reserved, debugstr_a(cmid), debugstr_a(filename), command); + FIXME("0x%08lx, %s, %s, 0x%08x stub\n", reserved, debugstr_a(cmid), debugstr_a(filename), command); return TRUE; } @@ -206,6 +206,6 @@ BOOL WINAPI UpdateICMRegKeyA(DWORD reserved, LPSTR cmid, LPSTR filename, UINT co */ BOOL WINAPI UpdateICMRegKeyW(DWORD reserved, LPWSTR cmid, LPWSTR filename, UINT command) { - FIXME("0x%08x, %s, %s, 0x%08x stub\n", reserved, debugstr_w(cmid), debugstr_w(filename), command); + FIXME("0x%08lx, %s, %s, 0x%08x stub\n", reserved, debugstr_w(cmid), debugstr_w(filename), command); return TRUE; } diff --git a/dlls/gdi32/metadc.c b/dlls/gdi32/metadc.c index d2260f6702e..2f5842ea90a 100644 --- a/dlls/gdi32/metadc.c +++ b/dlls/gdi32/metadc.c @@ -752,7 +752,7 @@ static BOOL metadc_stretchblt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT mr->rdFunction = type; bmi = (BITMAPINFO *)&mr->rdParm[bitmap_offset]; bmi->bmiHeader = src_info.bmiHeader; - TRACE( "size = %u rop=%x\n", size, rop ); + TRACE( "size = %u rop=%lx\n", size, rop ); ret = GetDIBits( hdc_src, bitmap, 0, src_info.bmiHeader.biHeight, (BYTE *)bmi + bmi_size, bmi, DIB_RGB_COLORS ); diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 3a49ec6be3d..50910956e1d 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -398,10 +398,10 @@ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) while (offset < mh->mtSize * 2) { mr = (METARECORD *)((char *)mh + offset); - TRACE("offset=%04x,size=%08x\n", + TRACE("offset=%04x,size=%08lx\n", offset, mr->rdSize); if (mr->rdSize < 3) { /* catch illegal record sizes */ - TRACE("Entry got size %d at offset %d, total mf length is %d\n", + TRACE("Entry got size %ld at offset %d, total mf length is %ld\n", mr->rdSize,offset,mh->mtSize*2); break; } @@ -454,7 +454,7 @@ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM l HBRUSH hBrush; HFONT hFont; - TRACE("(%p,%p,%p,%lx)\n", hdc, hmf, lpEnumFunc, lpData); + TRACE("(%p,%p,%p,%Ix)\n", hdc, hmf, lpEnumFunc, lpData); if (!mh) return FALSE; @@ -1386,8 +1386,8 @@ static BOOL MF_Play_MetaExtTextOut(HDC hdc, METARECORD *mr) if (dx) for (i = 0; i < s1; i++) dx[i] = dxx[i]; } else { - TRACE("%s len: %d\n", sot, mr->rdSize); - WARN("Please report: ExtTextOut len=%d slen=%d rdSize=%d opt=%04x\n", + TRACE("%s len: %ld\n", sot, mr->rdSize); + WARN("Please report: ExtTextOut len=%ld slen=%d rdSize=%ld opt=%04x\n", len, s1, mr->rdSize, mr->rdParm[3]); dxx = NULL; /* shouldn't happen -- but if, we continue with NULL */ } @@ -1400,7 +1400,7 @@ static BOOL MF_Play_MetaExtTextOut(HDC hdc, METARECORD *mr) s1, dx); /* length, dx array */ if (dx) { - TRACE("%s len: %d dx0: %d\n", sot, mr->rdSize, dx[0]); + TRACE("%s len: %ld dx0: %d\n", sot, mr->rdSize, dx[0]); HeapFree( GetProcessHeap(), 0, dx ); } return TRUE; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 50240b7b29a..f578543b937 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -152,7 +152,7 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle ) { DWORD type = get_object_type( handle ); - TRACE( "%p -> %u\n", handle, type ); + TRACE( "%p -> %lu\n", handle, type ); switch (type) { @@ -1044,7 +1044,7 @@ INT WINAPI EnumObjects( HDC hdc, INT type, GOBJENUMPROC enum_func, LPARAM param LOGPEN pen; LOGBRUSH brush; - TRACE( "%p %d %p %08lx\n", hdc, type, enum_func, param ); + TRACE( "%p %d %p %08Ix\n", hdc, type, enum_func, param ); switch(type) { @@ -1057,7 +1057,7 @@ INT WINAPI EnumObjects( HDC hdc, INT type, GOBJENUMPROC enum_func, LPARAM param pen.lopnWidth.y = 0; pen.lopnColor = solid_colors[i]; retval = enum_func( &pen, param ); - TRACE( "solid pen %08x, ret=%d\n", solid_colors[i], retval ); + TRACE( "solid pen %08lx, ret=%d\n", solid_colors[i], retval ); if (!retval) break; } break; @@ -1070,7 +1070,7 @@ INT WINAPI EnumObjects( HDC hdc, INT type, GOBJENUMPROC enum_func, LPARAM param brush.lbColor = solid_colors[i]; brush.lbHatch = 0; retval = enum_func( &brush, param ); - TRACE( "solid brush %08x, ret=%d\n", solid_colors[i], retval ); + TRACE( "solid brush %08lx, ret=%d\n", solid_colors[i], retval ); if (!retval) break; } @@ -1130,7 +1130,7 @@ BOOL WINAPI LineDDA( INT x_start, INT y_start, INT x_end, INT y_end, INT dx = x_end - x_start; INT dy = y_end - y_start; - TRACE( "(%d, %d), (%d, %d), %p, %lx\n", x_start, y_start, + TRACE( "(%d, %d), (%d, %d), %p, %Ix\n", x_start, y_start, x_end, y_end, callback, lparam ); if (dx < 0) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index b6bec086d75..c0807276f42 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -371,7 +371,7 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ DWORD cMaxGlyphs = 0; BOOL doGlyphs = TRUE; - TRACE("%s, %d, 0x%08x lpOutString=%p, lpOrder=%p\n", + TRACE("%s, %d, 0x%08lx lpOutString=%p, lpOrder=%p\n", debugstr_wn(lpString, uCount), uCount, dwFlags, lpOutString, lpOrder); @@ -622,7 +622,7 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ if (res == USP_E_SCRIPT_NOT_IN_FONT) TRACE("Unable to shape with currently selected font\n"); else - FIXME("Unable to shape string (%x)\n",res); + FIXME("Unable to shape string (%lx)\n",res); j = nItems; doGlyphs = FALSE; HeapFree(GetProcessHeap(), 0, *lpGlyphs); @@ -1135,7 +1135,7 @@ DWORD WINAPI GetCharacterPlacementW( HDC hdc, const WCHAR *str, INT count, INT m SIZE size; DWORD ret = 0; - TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(str, count), count, max_extent, flags); + TRACE("%s, %d, %d, 0x%08lx\n", debugstr_wn(str, count), count, max_extent, flags); if (!count) return 0; @@ -1143,14 +1143,14 @@ DWORD WINAPI GetCharacterPlacementW( HDC hdc, const WCHAR *str, INT count, INT m if (!result) return GetTextExtentPoint32W( hdc, str, count, &size ) ? MAKELONG(size.cx, size.cy) : 0; - TRACE( "lStructSize=%d, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n" + TRACE( "lStructSize=%ld, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n" "lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n", result->lStructSize, result->lpOutString, result->lpOrder, result->lpDx, result->lpCaretPos, result->lpClass, result->lpGlyphs, result->nGlyphs, result->nMaxFit ); if (flags & ~(GCP_REORDER | GCP_USEKERNING)) - FIXME( "flags 0x%08x ignored\n", flags ); + FIXME( "flags 0x%08lx ignored\n", flags ); if (result->lpClass) FIXME( "classes not implemented\n" ); if (result->lpCaretPos && (flags & GCP_REORDER)) @@ -1243,7 +1243,7 @@ DWORD WINAPI GetCharacterPlacementA( HDC hdc, const char *str, INT count, INT ma DWORD ret; UINT font_cp; - TRACE( "%s, %d, %d, 0x%08x\n", debugstr_an(str, count), count, max_extent, flags ); + TRACE( "%s, %d, %d, 0x%08lx\n", debugstr_an(str, count), count, max_extent, flags ); strW = text_mbtowc( hdc, str, count, &countW, &font_cp ); @@ -1942,7 +1942,7 @@ DWORD WINAPI GetGlyphIndicesA( HDC hdc, const char *str, INT count, WORD *indice WCHAR *strW; INT countW; - TRACE( "(%p, %s, %d, %p, 0x%x)\n", hdc, debugstr_an(str, count), count, indices, flags ); + TRACE( "(%p, %s, %d, %p, 0x%lx)\n", hdc, debugstr_an(str, count), count, indices, flags ); strW = text_mbtowc( hdc, str, count, &countW, NULL ); ret = NtGdiGetGlyphIndicesW( hdc, strW, countW, indices, flags ); @@ -2460,7 +2460,7 @@ BOOL WINAPI RemoveFontResourceExW( const WCHAR *str, DWORD flags, void *dv ) */ BOOL WINAPI GetFontResourceInfoW( const WCHAR *str, DWORD *size, void *buffer, DWORD type ) { - FIXME( "%s %p(%d) %p %d\n", debugstr_w(str), size, size ? *size : 0, buffer, type ); + FIXME( "%s %p(%ld) %p %ld\n", debugstr_w(str), size, size ? *size : 0, buffer, type ); return FALSE; } @@ -2668,7 +2668,7 @@ BOOL WINAPI CreateScalableFontResourceW( DWORD hidden, const WCHAR *resource_fil WCHAR path[MAX_PATH]; BOOL ret; - TRACE("(%d, %s, %s, %s)\n", hidden, debugstr_w(resource_file), + TRACE("(%ld, %s, %s, %s)\n", hidden, debugstr_w(resource_file), debugstr_w(font_file), debugstr_w(font_path) ); if (!font_file) goto done; diff --git a/dlls/gdi32/uniscribe/opentype.c b/dlls/gdi32/uniscribe/opentype.c index a7a81acbe61..c44639cb993 100644 --- a/dlls/gdi32/uniscribe/opentype.c +++ b/dlls/gdi32/uniscribe/opentype.c @@ -1638,7 +1638,7 @@ static void GPOS_convert_design_units_to_device(const OUTLINETEXTMETRICW *otm, c { int emHeight = otm->otmTextMetrics.tmAscent + otm->otmTextMetrics.tmDescent - otm->otmTextMetrics.tmInternalLeading; - TRACE("emHeight %i lfWidth %i\n",emHeight, logfont->lfWidth); + TRACE("emHeight %i lfWidth %li\n",emHeight, logfont->lfWidth); *devX = (desX * emHeight) / (double)otm->otmEMSquare; *devY = (desY * emHeight) / (double)otm->otmEMSquare; if (logfont->lfWidth) @@ -2607,7 +2607,7 @@ static void usp10_script_cache_add_script_list(ScriptCache *script_cache, if (!(count = GET_BE_WORD(list->ScriptCount))) return; - TRACE("Adding %lu scripts.\n", count); + TRACE("Adding %Iu scripts.\n", count); initial_count = script_cache->script_count; for (i = 0; i < count; ++i) @@ -2725,7 +2725,7 @@ static void usp10_script_add_language_list(LoadedScript *script, if (!(count = GET_BE_WORD(list->LangSysCount))) return; - TRACE("Adding %lu languages.\n", count); + TRACE("Adding %Iu languages.\n", count); initial_count = script->language_count; for (i = 0; i < count; ++i) diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c index cceb9dcb48a..a5637dbf645 100644 --- a/dlls/gdi32/uniscribe/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -864,7 +864,7 @@ static DWORD decode_surrogate_pair(const WCHAR *str, unsigned int index, unsigne if (index < end-1 && IS_SURROGATE_PAIR(str[index],str[index+1])) { DWORD ch = 0x10000 + ((str[index] - 0xd800) << 10) + (str[index+1] - 0xdc00); - TRACE("Surrogate Pair %x %x => %x\n",str[index], str[index+1], ch); + TRACE("Surrogate Pair %x %x => %lx\n",str[index], str[index+1], ch); return ch; } return 0; @@ -1125,7 +1125,7 @@ HRESULT WINAPI ScriptRecordDigitSubstitution(LCID locale, SCRIPT_DIGITSUBSTITUTE { DWORD plgid, sub; - TRACE("0x%x, %p\n", locale, sds); + TRACE("0x%lx, %p\n", locale, sds); /* This implementation appears to be correct for all languages, but it's * not clear if sds->DigitSubstitute is ever set to anything except @@ -1908,7 +1908,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, BYTE *BidiLevel; WCHAR *iString = NULL; - TRACE("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p)\n", + TRACE("(%p,%p,%d,%d,%d,0x%lx,%d,%p,%p,%p,%p,%p,%p)\n", hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth, psControl, psState, piDx, pTabdef, pbInClass, pssa); @@ -2251,7 +2251,7 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, &analysis->glyphs[iItem].piAdvance[iGlyph], NULL, &analysis->glyphs[iItem].pGoffset[iGlyph]); - TRACE("ScriptTextOut hr=%08x\n", hr); + TRACE("ScriptTextOut hr=%08lx\n", hr); if (fSelected) { @@ -3000,7 +3000,7 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) enum usp10_script script; unsigned int i, consumed; - TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag); + TRACE("(%s,%d,0x%lx)\n", debugstr_wn(chars, len), len, flag); if (!chars || len < 0) return E_INVALIDARG; @@ -3481,7 +3481,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars HRESULT hr; int i; - TRACE("(%p,%p,%s,%d,0x%x,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars), + TRACE("(%p,%p,%s,%d,0x%lx,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars), cChars, dwFlags, pwOutGlyphs); if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr;
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/gdi.exe16/Makefile.in | 1 - dlls/gdi.exe16/gdi.c | 10 +++++----- dlls/gdi.exe16/printdrv.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in index 25a39a42cf0..21850e2e660 100644 --- a/dlls/gdi.exe16/Makefile.in +++ b/dlls/gdi.exe16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = gdi.exe16 IMPORTS = user32 advapi32 gdi32 win32u diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 9afa4532fde..b4bcd1c2228 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -548,7 +548,7 @@ static struct window_surface *create_surface( const BITMAPINFO *info ) surface->bits = (char *)info + surface->info_size; memcpy( &surface->info, info, surface->info_size ); - TRACE( "created %p %ux%u for info %p bits %p\n", + TRACE( "created %p %lux%lu for info %p bits %p\n", surface, surface->header.rect.right, surface->header.rect.bottom, info, surface->bits ); return &surface->header; } @@ -2138,7 +2138,7 @@ void WINAPI PlayMetaFileRecord16( HDC16 hdc, HANDLETABLE16 *ht, METARECORD *mr, */ BOOL16 WINAPI SetDCHook16( HDC16 hdc16, FARPROC16 hookProc, DWORD dwHookData ) { - FIXME( "%04x %p %x: not supported\n", hdc16, hookProc, dwHookData ); + FIXME( "%04x %p %lx: not supported\n", hdc16, hookProc, dwHookData ); return FALSE; } @@ -2204,7 +2204,7 @@ UINT16 WINAPI GetBoundsRect16( HDC16 hdc, LPRECT16 rect, UINT16 flags) */ WORD WINAPI EngineEnumerateFont16(LPSTR fontname, FARPROC16 proc, DWORD data ) { - FIXME("(%s,%p,%x),stub\n",fontname,proc,data); + FIXME("(%s,%p,%lx),stub\n",fontname,proc,data); return 0; } @@ -2251,7 +2251,7 @@ WORD WINAPI EngineRealizeFont16(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform */ WORD WINAPI EngineRealizeFontExt16(LONG l1, LONG l2, LONG l3, LONG l4) { - FIXME("(%08x,%08x,%08x,%08x),stub\n",l1,l2,l3,l4); + FIXME("(%08lx,%08lx,%08lx,%08lx),stub\n",l1,l2,l3,l4); return 0; } @@ -3668,7 +3668,7 @@ BOOL16 WINAPI SetLayout16( HDC16 hdc, DWORD layout ) */ BOOL16 WINAPI SetSolidBrush16(HBRUSH16 hBrush, COLORREF newColor ) { - FIXME( "%04x %08x no longer supported\n", hBrush, newColor ); + FIXME( "%04x %08lx no longer supported\n", hBrush, newColor ); return FALSE; } diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index b0e1e316008..b7c09b31821 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -355,7 +355,7 @@ INT16 WINAPI EndSpoolPage16(HPJOB16 hJob) */ DWORD WINAPI GetSpoolJob16(int nOption, LONG param) { - TRACE("In GetSpoolJob param 0x%x noption %d\n",param, nOption); + TRACE("In GetSpoolJob param 0x%lx noption %d\n",param, nOption); return 0; } @@ -509,7 +509,7 @@ DWORD WINAPI DrvSetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile, TRACE("profile %s\n",lpProfile); else TRACE("profile %p\n",lpProfile); - TRACE("lpType %08x\n",lpType); + TRACE("lpType %08lx\n",lpType); if ((!lpPrinter) || (!lpProfile) || (PtrToUlong(lpProfile) == INT_PD_DEFAULT_MODEL) || (HIWORD(lpProfile) &&
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/gdiplus/Makefile.in | 1 - dlls/gdiplus/brush.c | 22 +++++++++++----------- dlls/gdiplus/font.c | 16 ++++++++-------- dlls/gdiplus/gdiplus.c | 6 +++--- dlls/gdiplus/graphics.c | 6 +++--- dlls/gdiplus/image.c | 16 ++++++++-------- dlls/gdiplus/imageattributes.c | 4 ++-- dlls/gdiplus/metafile.c | 8 ++++---- dlls/gdiplus/pen.c | 4 ++-- dlls/gdiplus/region.c | 18 +++++++++--------- 10 files changed, 50 insertions(+), 51 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index da0e8751c88..c87ec5ba827 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = gdiplus.dll IMPORTLIB = gdiplus IMPORTS = uuid shlwapi ole32 oleaut32 user32 gdi32 diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index dc8ac7f7349..582c5f80bc1 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -271,7 +271,7 @@ GpStatus get_hatch_data(GpHatchStyle hatchstyle, const unsigned char **result) */ GpStatus WINGDIPAPI GdipCreateHatchBrush(GpHatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) { - TRACE("(%d, %d, %d, %p)\n", hatchstyle, forecol, backcol, brush); + TRACE("(%d, %ld, %ld, %p)\n", hatchstyle, forecol, backcol, brush); if(!brush) return InvalidParameter; @@ -372,7 +372,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, GpStatus stat; GpRectF rect; - TRACE("(%s, %s, %x, %x, %d, %p)\n", debugstr_pointf(startpoint), + TRACE("(%s, %s, %lx, %lx, %d, %p)\n", debugstr_pointf(startpoint), debugstr_pointf(endpoint), startcolor, endcolor, wrap, line); if(!line || !startpoint || !endpoint || wrap == WrapModeClamp) @@ -415,7 +415,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushI(GDIPCONST GpPoint* startpoint, GpPointF stF; GpPointF endF; - TRACE("(%p, %p, %x, %x, %d, %p)\n", startpoint, endpoint, + TRACE("(%p, %p, %lx, %lx, %d, %p)\n", startpoint, endpoint, startcolor, endcolor, wrap, line); if(!startpoint || !endpoint) @@ -435,7 +435,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, { float angle; - TRACE("(%s, %x, %x, %d, %d, %p)\n", debugstr_rectf(rect), startcolor, endcolor, mode, + TRACE("(%s, %lx, %lx, %d, %d, %p)\n", debugstr_rectf(rect), startcolor, endcolor, mode, wrap, line); if(!line || !rect) @@ -468,7 +468,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, { GpRectF rectF; - TRACE("(%p, %x, %x, %d, %d, %p)\n", rect, startcolor, endcolor, mode, + TRACE("(%p, %lx, %lx, %d, %d, %p)\n", rect, startcolor, endcolor, mode, wrap, line); set_rect(&rectF, rect->X, rect->Y, rect->Width, rect->Height); @@ -487,7 +487,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect REAL sin_angle, cos_angle, sin_cos_angle; GpPointF start, end; - TRACE("(%s, %x, %x, %.2f, %d, %d, %p)\n", debugstr_rectf(rect), startcolor, endcolor, angle, isAngleScalable, + TRACE("(%s, %lx, %lx, %.2f, %d, %d, %p)\n", debugstr_rectf(rect), startcolor, endcolor, angle, isAngleScalable, wrap, line); if (!rect || !line || wrap == WrapModeClamp) @@ -586,7 +586,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect* rect ARGB startcolor, ARGB endcolor, REAL angle, BOOL isAngleScalable, GpWrapMode wrap, GpLineGradient **line) { - TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, + TRACE("(%p, %lx, %lx, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, wrap, line); return GdipCreateLineBrushFromRectI(rect, startcolor, endcolor, LinearGradientModeForwardDiagonal, @@ -752,7 +752,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, */ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) { - TRACE("(%x, %p)\n", color, sf); + TRACE("(%lx, %p)\n", color, sf); if(!sf) return InvalidParameter; @@ -1652,7 +1652,7 @@ GpStatus WINGDIPAPI GdipGetPathGradientPresetBlendCount(GpPathGradient *brush, GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, ARGB argb) { - TRACE("(%p, %x)\n", grad, argb); + TRACE("(%p, %lx)\n", grad, argb); if(!grad || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; @@ -1920,7 +1920,7 @@ GpStatus WINGDIPAPI GdipTranslatePathGradientTransform(GpPathGradient *grad, GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) { - TRACE("(%p, %x)\n", sf, argb); + TRACE("(%p, %lx)\n", sf, argb); if(!sf) return InvalidParameter; @@ -1965,7 +1965,7 @@ GpStatus WINGDIPAPI GdipSetTextureWrapMode(GpTexture *brush, GpWrapMode wrapmode GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient *brush, ARGB color1, ARGB color2) { - TRACE("(%p, %x, %x)\n", brush, color1, color2); + TRACE("(%p, %lx, %lx)\n", brush, color1, color2); if(!brush || brush->brush.bt != BrushTypeLinearGradient) return InvalidParameter; diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 44431ea2ac8..6529f94bc1f 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -354,7 +354,7 @@ GpStatus WINGDIPAPI GdipGetFontSize(GpFont *font, REAL *size) if (!(font && size)) return InvalidParameter; *size = get_font_size(font); - TRACE("%s,%d => %f\n", debugstr_w(font->family->FamilyName), font->otm.otmTextMetrics.tmHeight, *size); + TRACE("%s,%ld => %f\n", debugstr_w(font->family->FamilyName), font->otm.otmTextMetrics.tmHeight, *size); return Ok; } @@ -398,7 +398,7 @@ GpStatus WINGDIPAPI GdipGetFontStyle(GpFont *font, INT *style) return InvalidParameter; *style = get_font_style(font); - TRACE("%s,%d => %d\n", debugstr_w(font->family->FamilyName), font->otm.otmTextMetrics.tmHeight, *style); + TRACE("%s,%ld => %d\n", debugstr_w(font->family->FamilyName), font->otm.otmTextMetrics.tmHeight, *style); return Ok; } @@ -421,7 +421,7 @@ GpStatus WINGDIPAPI GdipGetFontUnit(GpFont *font, Unit *unit) if (!(font && unit)) return InvalidParameter; *unit = font->unit; - TRACE("%s,%d => %d\n", debugstr_w(font->family->FamilyName), font->otm.otmTextMetrics.tmHeight, *unit); + TRACE("%s,%ld => %d\n", debugstr_w(font->family->FamilyName), font->otm.otmTextMetrics.tmHeight, *unit); return Ok; } @@ -509,7 +509,7 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW lf->lfPitchAndFamily = 0; lstrcpyW(lf->lfFaceName, font->family->FamilyName); - TRACE("=> %s,%d\n", debugstr_w(lf->lfFaceName), lf->lfHeight); + TRACE("=> %s,%ld\n", debugstr_w(lf->lfFaceName), lf->lfHeight); return Ok; } @@ -561,7 +561,7 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font, if (!graphics) { *height = font_height; - TRACE("%s,%d => %f\n", + TRACE("%s,%ld => %f\n", debugstr_w(font->family->FamilyName), font->otm.otmTextMetrics.tmHeight, *height); return Ok; } @@ -571,7 +571,7 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font, *height = pixels_to_units(font_height, graphics->unit, dpi, graphics->printer_display); - TRACE("%s,%d(unit %d) => %f\n", + TRACE("%s,%ld(unit %d) => %f\n", debugstr_w(font->family->FamilyName), font->otm.otmTextMetrics.tmHeight, graphics->unit, *height); return Ok; } @@ -612,7 +612,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, *height = (REAL)line_spacing * font_size / (REAL)em_height; - TRACE("%s,%d => %f\n", + TRACE("%s,%ld => %f\n", debugstr_w(font->family->FamilyName), font->otm.otmTextMetrics.tmHeight, *height); return Ok; @@ -1489,7 +1489,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, return OutOfMemory; font = AddFontMemResourceEx((void*)memory, length, NULL, &count); - TRACE("%s: %p/%u\n", debugstr_w(name), font, count); + TRACE("%s: %p/%lu\n", debugstr_w(name), font, count); if (!font || !count) ret = InvalidParameter; else diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 7c4c68f162f..e77d4a9e21f 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -49,7 +49,7 @@ static Status WINAPI NotificationHook(ULONG_PTR *token) static void WINAPI NotificationUnhook(ULONG_PTR token) { - TRACE("%ld\n", token); + TRACE("%Id\n", token); } /***************************************************** @@ -57,7 +57,7 @@ static void WINAPI NotificationUnhook(ULONG_PTR token) */ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { - TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + TRACE("(%p, %ld, %p)\n", hinst, reason, reserved); switch(reason) { @@ -115,7 +115,7 @@ GpStatus WINAPI GdiplusNotificationHook(ULONG_PTR *token) void WINAPI GdiplusNotificationUnhook(ULONG_PTR token) { - FIXME("%ld\n", token); + FIXME("%Id\n", token); NotificationUnhook(token); } diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 65cdf96510d..a9f7a464ce3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -297,7 +297,7 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) TRACE("dashes are: "); for(i = 0; i < numdashes; i++){ dash_array[i] = gdip_round(width * pen->dashes[i]); - TRACE("%d, ", dash_array[i]); + TRACE("%ld, ", dash_array[i]); } TRACE("\n and the pen style is %x\n", pen->style); @@ -3132,7 +3132,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image BOOL do_resampling = FALSE; BOOL use_software = FALSE; - TRACE("graphics: %.2fx%.2f dpi, fmt %#x, scale %f, image: %.2fx%.2f dpi, fmt %#x, color %08x\n", + TRACE("graphics: %.2fx%.2f dpi, fmt %#x, scale %f, image: %.2fx%.2f dpi, fmt %#x, color %08lx\n", graphics->xres, graphics->yres, graphics->image && graphics->image->type == ImageTypeBitmap ? ((GpBitmap *)graphics->image)->format : 0, graphics->scale, image->xres, image->yres, bitmap->format, @@ -5049,7 +5049,7 @@ GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics *graphics, ARGB color) GpRectF wnd_rect; CompositingMode prev_comp_mode; - TRACE("(%p, %x)\n", graphics, color); + TRACE("(%p, %lx)\n", graphics, color); if(!graphics) return InvalidParameter; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a7297047308..6be6c4ff216 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1455,7 +1455,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO* info, height = abs(info->bmiHeader.biHeight); stride = ((info->bmiHeader.biWidth * info->bmiHeader.biBitCount + 31) >> 3) & ~3; - TRACE("height %u, stride %u, image size %u\n", height, stride, height * stride); + TRACE("height %lu, stride %lu, image size %lu\n", height, stride, height * stride); memcpy(bmbits, bits, height * stride); @@ -1519,7 +1519,7 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, LPBYTE bits; BOOL unlock; - TRACE("(%p,%p,%x)\n", bitmap, hbmReturn, background); + TRACE("(%p,%p,%lx)\n", bitmap, hbmReturn, background); if (!bitmap || !hbmReturn) return InvalidParameter; if (!image_lock(&bitmap->image, &unlock)) return ObjectBusy; @@ -2540,7 +2540,7 @@ GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage *image, PROPID propid, UINT IWICMetadataReader *reader; PROPVARIANT id, value; - TRACE("(%p,%#x,%p)\n", image, propid, size); + TRACE("(%p,%#lx,%p)\n", image, propid, size); if (!size || !image) return InvalidParameter; @@ -2688,7 +2688,7 @@ GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID propid, UINT size IWICMetadataReader *reader; PROPVARIANT id, value; - TRACE("(%p,%#x,%u,%p)\n", image, propid, size, buffer); + TRACE("(%p,%#lx,%u,%p)\n", image, propid, size, buffer); if (!image || !buffer) return InvalidParameter; @@ -4319,7 +4319,7 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res } } - TRACE("no match for %i byte signature %x %x %x %x %x %x %x %x\n", bytesread, + TRACE("no match for %lu byte signature %x %x %x %x %x %x %x %x\n", bytesread, signature[0],signature[1],signature[2],signature[3], signature[4],signature[5],signature[6],signature[7]); @@ -4444,7 +4444,7 @@ GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage *image, PROPID propId) { static int calls; - TRACE("(%p,%u)\n", image, propId); + TRACE("(%p,%lu)\n", image, propId); if(!image) return InvalidParameter; @@ -4461,7 +4461,7 @@ GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage *image, GDIPCONST PropertyItem* if (!image || !item) return InvalidParameter; - TRACE("(%p,%p:%#x,%u,%u,%p)\n", image, item, item->id, item->type, item->length, item->value); + TRACE("(%p,%p:%#lx,%u,%lu,%p)\n", image, item, item->id, item->type, item->length, item->value); if(!(calls++)) FIXME("not implemented\n"); @@ -5252,7 +5252,7 @@ static PixelFormat get_16bpp_format(HBITMAP hbm) } else { - FIXME("unrecognized bitfields %x,%x,%x\n", bmh.bV4RedMask, + FIXME("unrecognized bitfields %lx,%lx,%lx\n", bmh.bV4RedMask, bmh.bV4GreenMask, bmh.bV4BlueMask); result = PixelFormatUndefined; } diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index ab197a4f616..63bdb206a37 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -129,7 +129,7 @@ GpStatus WINGDIPAPI GdipGetImageAttributesAdjustedPalette(GpImageAttributes *ima GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag, ARGB colorLow, ARGB colorHigh) { - TRACE("(%p,%u,%i,%08x,%08x)\n", imageattr, type, enableFlag, colorLow, colorHigh); + TRACE("(%p,%u,%i,%08lx,%08lx)\n", imageattr, type, enableFlag, colorLow, colorHigh); if(!imageattr || type >= ColorAdjustTypeCount) return InvalidParameter; @@ -176,7 +176,7 @@ GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes *imageat GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes *imageAttr, WrapMode wrap, ARGB argb, BOOL clamp) { - TRACE("(%p,%u,%08x,%i)\n", imageAttr, wrap, argb, clamp); + TRACE("(%p,%u,%08lx,%i)\n", imageAttr, wrap, argb, clamp); if(!imageAttr || wrap > WrapModeClamp) return InvalidParameter; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 1b4bba18048..90ef39e34d6 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1777,7 +1777,7 @@ static GpStatus metafile_deserialize_image(const BYTE *record_data, UINT data_si break; } default: - WARN("Invalid bitmap type %d.\n", bitmapdata->Type); + WARN("Invalid bitmap type %ld.\n", bitmapdata->Type); return InvalidParameter; } break; @@ -1810,7 +1810,7 @@ static GpStatus metafile_deserialize_image(const BYTE *record_data, UINT data_si break; } default: - FIXME("metafile type %d not supported.\n", metafiledata->Type); + FIXME("metafile type %ld not supported.\n", metafiledata->Type); return NotImplemented; } break; @@ -1980,7 +1980,7 @@ static GpStatus metafile_read_region_node(struct memory_buffer *mbuf, GpRegion * *count += 1; return Ok; default: - FIXME("element type %#x is not supported\n", *type); + FIXME("element type %#lx is not supported\n", *type); break; } @@ -2151,7 +2151,7 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si break; } default: - FIXME("brush type %u is not supported.\n", data->Type); + FIXME("brush type %lu is not supported.\n", data->Type); return NotImplemented; } diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 156f90a19d4..32579adc484 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -139,7 +139,7 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, REAL width, GpUnit unit, GpBrush *brush; GpStatus status; - TRACE("(%x, %.2f, %d, %p)\n", color, width, unit, pen); + TRACE("(%lx, %.2f, %d, %p)\n", color, width, unit, pen); GdipCreateSolidFill(color, (GpSolidFill **)(&brush)); status = GdipCreatePen2(brush, width, unit, pen); @@ -512,7 +512,7 @@ GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) GpStatus WINGDIPAPI GdipSetPenColor(GpPen *pen, ARGB argb) { - TRACE("(%p, %x)\n", pen, argb); + TRACE("(%p, %lx)\n", pen, argb); if(!pen) return InvalidParameter; diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 0f14e8aae32..bbffbdd8d11 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -772,7 +772,7 @@ static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, regio type = buffer_read(mbuf, sizeof(*type)); if (!type) return Ok; - TRACE("type %#x\n", *type); + TRACE("type %#lx\n", *type); node->type = *type; @@ -844,7 +844,7 @@ static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, regio } if (!VALID_MAGIC(path_header->magic)) { - ERR("invalid path header magic %#x\n", path_header->magic); + ERR("invalid path header magic %#lx\n", path_header->magic); return InvalidParameter; } @@ -866,7 +866,7 @@ static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, regio path->pathdata.Count = path_header->count; if (path_header->flags & ~FLAGS_INTPATH) - FIXME("unhandled path flags %#x\n", path_header->flags); + FIXME("unhandled path flags %#lx\n", path_header->flags); if (path_header->flags & FLAGS_INTPATH) { @@ -876,7 +876,7 @@ static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, regio pt = buffer_read(mbuf, sizeof(*pt) * path_header->count); if (!pt) { - ERR("failed to read packed %u path points\n", path_header->count); + ERR("failed to read packed %lu path points\n", path_header->count); return InvalidParameter; } @@ -893,7 +893,7 @@ static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, regio ptf = buffer_read(mbuf, sizeof(*ptf) * path_header->count); if (!ptf) { - ERR("failed to read %u path points\n", path_header->count); + ERR("failed to read %lu path points\n", path_header->count); return InvalidParameter; } memcpy(path->pathdata.Points, ptf, sizeof(*ptf) * path_header->count); @@ -902,7 +902,7 @@ static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, regio types = buffer_read(mbuf, path_header->count); if (!types) { - ERR("failed to read %u path types\n", path_header->count); + ERR("failed to read %lu path types\n", path_header->count); return InvalidParameter; } memcpy(path->pathdata.Types, types, path_header->count); @@ -910,7 +910,7 @@ static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, regio { if (!buffer_read(mbuf, 4 - (path_header->count & 3))) { - ERR("failed to read rounding %u bytes\n", 4 - (path_header->count & 3)); + ERR("failed to read rounding %lu bytes\n", 4 - (path_header->count & 3)); return InvalidParameter; } } @@ -925,7 +925,7 @@ static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, regio return Ok; default: - FIXME("element type %#x is not supported\n", *type); + FIXME("element type %#lx is not supported\n", *type); break; } @@ -1174,7 +1174,7 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap return Ok; } default: - FIXME("GdipGetRegionHRgn unimplemented for region type=%x\n", element->type); + FIXME("GdipGetRegionHRgn unimplemented for region type=%lx\n", element->type); *hrgn = NULL; return NotImplemented; }
Signed-off-by: Esme Povirk <esme(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/gphoto2.ds/Makefile.in | 1 - dlls/gphoto2.ds/capability.c | 6 +++--- dlls/gphoto2.ds/gphoto2_main.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index c1f6978947f..bff1ac48133 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = gphoto2.ds UNIXLIB = gphoto2.so IMPORTS = $(JPEG_PE_LIBS) comctl32 user32 gdi32 advapi32 diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c index f2d250c7418..dbbf2a04855 100644 --- a/dlls/gphoto2.ds/capability.c +++ b/dlls/gphoto2.ds/capability.c @@ -187,7 +187,7 @@ static TW_BOOL GPHOTO2_OneValueSet32 (pTW_CAPABILITY pCapability, TW_UINT32 valu { pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); - TRACE("-> %d\n", value); + TRACE("-> %ld\n", value); if (pCapability->hContainer) { @@ -250,7 +250,7 @@ static TW_BOOL GPHOTO2_EnumGet16 (pTW_CAPABILITY pCapability, int *nrofvalues, T *nrofvalues = pVal->NumItems; *values = HeapAlloc( GetProcessHeap(), 0, sizeof(TW_UINT16)*pVal->NumItems); memcpy (*values, pVal->ItemList, sizeof(TW_UINT16)*(*nrofvalues)); - FIXME("Current Index %d, Default Index %d\n", pVal->CurrentIndex, pVal->DefaultIndex); + FIXME("Current Index %ld, Default Index %ld\n", pVal->CurrentIndex, pVal->DefaultIndex); GlobalUnlock (pCapability->hContainer); return TRUE; } @@ -302,7 +302,7 @@ static TW_UINT16 GPHOTO2_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 act if (!GPHOTO2_OneValueGet32 (pCapability, &xfermechtemp)) return TWCC_LOWMEMORY; activeDS.capXferMech = xfermechtemp; - TRACE("xfermech is %d\n", xfermechtemp); + TRACE("xfermech is %ld\n", xfermechtemp); return TWCC_SUCCESS; } else if (pCapability->ConType == TWON_ENUMERATION) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 5689ad94190..68c628b4d89 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -481,7 +481,7 @@ unixlib_handle_t gphoto2_handle = 0; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { @@ -943,7 +943,7 @@ DS_Entry ( pTW_IDENTITY pOrigin, { TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ - TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); + TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); switch (DG) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/hal/Makefile.in | 1 - dlls/hal/hal.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index aa3f1ff023a..63211a18d7d 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hal.dll IMPORTLIB = hal IMPORTS = ntoskrnl diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 55a8891b6fa..e339f21ab6c 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -161,20 +161,20 @@ void WINAPI WRITE_PORT_UCHAR(UCHAR *port, UCHAR value) void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { - FIXME("(%p %d) stub!\n", port, value); + FIXME("(%p %ld) stub!\n", port, value); } #endif /* __i386__ || __arm__ || __arm64__ */ ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) { - FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); + FIXME("(%u %lu %lu %p %lu) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); /* Claim that there is no such bus */ return 0; } ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length) { - FIXME("(%u %u %u %p %u %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); + FIXME("(%u %lu %lu %p %lu %lu) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); /* Claim that there is no such bus */ return 0; } @@ -182,7 +182,7 @@ ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, U BOOLEAN WINAPI HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, PULONG AddressSpace, PPHYSICAL_ADDRESS TranslatedAddress) { - FIXME("(%d %d %s %p %p) stub!\n", InterfaceType, BusNumber, + FIXME("(%d %ld %s %p %p) stub!\n", InterfaceType, BusNumber, wine_dbgstr_longlong(BusAddress.QuadPart), AddressSpace, TranslatedAddress); return FALSE; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/hhctrl.ocx/Makefile.in | 1 - dlls/hhctrl.ocx/chm.c | 38 +++++++++++++++++++------------------- dlls/hhctrl.ocx/help.c | 8 ++++---- dlls/hhctrl.ocx/hhctrl.c | 6 +++--- dlls/hhctrl.ocx/search.c | 6 +++--- dlls/hhctrl.ocx/webbrowser.c | 6 +++--- 6 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 11dbc80e939..ef1876648c9 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hhctrl.ocx IMPORTLIB = htmlhelp IMPORTS = uuid advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 4d7b3a5a7f9..3a9a8fa9e7a 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -55,7 +55,7 @@ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) pos.QuadPart = offset & ~BLOCK_MASK; hres = IStream_Seek(chm->strings_stream, pos, STREAM_SEEK_SET, NULL); if(FAILED(hres)) { - WARN("Seek failed: %08x\n", hres); + WARN("Seek failed: %08lx\n", hres); return NULL; } @@ -64,7 +64,7 @@ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) hres = IStream_Read(chm->strings_stream, chm->strings[offset >> BLOCK_BITS], BLOCK_SIZE, &read); if(FAILED(hres)) { - WARN("Read failed: %08x\n", hres); + WARN("Read failed: %08lx\n", hres); heap_free(chm->strings[offset >> BLOCK_BITS]); chm->strings[offset >> BLOCK_BITS] = NULL; return NULL; @@ -72,7 +72,7 @@ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) } str = chm->strings[offset >> BLOCK_BITS] + (offset & BLOCK_MASK); - TRACE("offset %#x => %s\n", offset, debugstr_a(str)); + TRACE("offset %#lx => %s\n", offset, debugstr_a(str)); return str; } @@ -92,12 +92,12 @@ static BOOL ReadChmSystem(CHMInfo *chm) hres = IStorage_OpenStream(chm->pStorage, wszSYSTEM, NULL, STGM_READ, 0, &stream); if(FAILED(hres)) { - WARN("Could not open #SYSTEM stream: %08x\n", hres); + WARN("Could not open #SYSTEM stream: %08lx\n", hres); return FALSE; } IStream_Read(stream, &ver, sizeof(ver), &read); - TRACE("version is %x\n", ver); + TRACE("version is %lx\n", ver); buf = heap_alloc(8*sizeof(DWORD)); buf_size = 8*sizeof(DWORD); @@ -132,7 +132,7 @@ static BOOL ReadChmSystem(CHMInfo *chm) break; case 0x4: /* TODO: Currently only the Locale ID is loaded from this field */ - TRACE("Locale is: %d\n", *(LCID*)&buf[0]); + TRACE("Locale is: %ld\n", *(LCID*)&buf[0]); if(!GetLocaleInfoW(*(LCID*)&buf[0], LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (WCHAR *)&chm->codePage, sizeof(chm->codePage)/sizeof(WCHAR))) chm->codePage = CP_ACP; @@ -150,13 +150,13 @@ static BOOL ReadChmSystem(CHMInfo *chm) TRACE("Version is %s\n", debugstr_an(buf, entry.len)); break; case 0xa: - TRACE("Time is %08x\n", *(DWORD*)buf); + TRACE("Time is %08lx\n", *(DWORD*)buf); break; case 0xc: - TRACE("Number of info types: %d\n", *(DWORD*)buf); + TRACE("Number of info types: %ld\n", *(DWORD*)buf); break; case 0xf: - TRACE("Check sum: %x\n", *(DWORD*)buf); + TRACE("Check sum: %lx\n", *(DWORD*)buf); break; default: TRACE("unhandled code %x, size %x\n", entry.code, entry.len); @@ -181,13 +181,13 @@ LPWSTR FindContextAlias(CHMInfo *chm, DWORD index) hres = IStorage_OpenStream(chm->pStorage, wszIVB, NULL, STGM_READ, 0, &ivb_stream); if(FAILED(hres)) { - WARN("Could not open #IVB stream: %08x\n", hres); + WARN("Could not open #IVB stream: %08lx\n", hres); return NULL; } hres = IStream_Read(ivb_stream, &size, sizeof(size), &read); if(FAILED(hres)) { - WARN("Read failed: %08x\n", hres); + WARN("Read failed: %08lx\n", hres); IStream_Release(ivb_stream); return NULL; } @@ -196,7 +196,7 @@ LPWSTR FindContextAlias(CHMInfo *chm, DWORD index) hres = IStream_Read(ivb_stream, buf, size, &read); IStream_Release(ivb_stream); if(FAILED(hres)) { - WARN("Read failed: %08x\n", hres); + WARN("Read failed: %08lx\n", hres); heap_free(buf); return NULL; } @@ -261,7 +261,7 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override) DWORD merge = override ? src->fsValidMembers : src->fsValidMembers & ~dst->fsValidMembers; if (unhandled_params) - FIXME("Unsupported fsValidMembers fields: 0x%x\n", unhandled_params); + FIXME("Unsupported fsValidMembers fields: 0x%lx\n", unhandled_params); dst->fsValidMembers |= merge; if (dst->cbStruct == 0) @@ -543,7 +543,7 @@ IStream *GetChmStream(CHMInfo *info, LPCWSTR parent_chm, ChmPath *chm_file) chm_file->chm_file ? chm_file->chm_file : parent_chm, NULL, STGM_READ | STGM_SHARE_DENY_WRITE, NULL, 0, &storage); if(FAILED(hres)) { - WARN("Could not open storage: %08x\n", hres); + WARN("Could not open storage: %08lx\n", hres); return NULL; } }else { @@ -554,7 +554,7 @@ IStream *GetChmStream(CHMInfo *info, LPCWSTR parent_chm, ChmPath *chm_file) hres = IStorage_OpenStream(storage, chm_file->chm_index, NULL, STGM_READ, 0, &stream); IStorage_Release(storage); if(FAILED(hres)) - WARN("Could not open stream: %08x\n", hres); + WARN("Could not open stream: %08lx\n", hres); return stream; } @@ -583,7 +583,7 @@ WCHAR *GetDocumentTitle(CHMInfo *info, LPCWSTR document) hres = IStorage_OpenStream(storage, document, NULL, STGM_READ, 0, &str); IStorage_Release(storage); if(FAILED(hres)) - WARN("Could not open stream: %08x\n", hres); + WARN("Could not open stream: %08lx\n", hres); stream_init(&stream, str); strbuf_init(&node); @@ -635,20 +635,20 @@ CHMInfo *OpenCHM(LPCWSTR szFile) hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, &IID_IITStorage, (void **) &ret->pITStorage) ; if(FAILED(hres)) { - WARN("Could not create ITStorage: %08x\n", hres); + WARN("Could not create ITStorage: %08lx\n", hres); return CloseCHM(ret); } hres = IITStorage_StgOpenStorage(ret->pITStorage, szFile, NULL, STGM_READ | STGM_SHARE_DENY_WRITE, NULL, 0, &ret->pStorage); if(FAILED(hres)) { - WARN("Could not open storage: %08x\n", hres); + WARN("Could not open storage: %08lx\n", hres); return CloseCHM(ret); } hres = IStorage_OpenStream(ret->pStorage, wszSTRINGS, NULL, STGM_READ, 0, &ret->strings_stream); if(FAILED(hres)) { - WARN("Could not open #STRINGS stream: %08x\n", hres); + WARN("Could not open #STRINGS stream: %08lx\n", hres); /* It's not critical, so we pass */ } diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index e9957a86e73..d76dfd4d94f 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -201,7 +201,7 @@ static HRESULT navigate_url(HHInfo *info, LPCWSTR surl) VariantClear(&url); if(FAILED(hres)) - TRACE("Navigation failed: %08x\n", hres); + TRACE("Navigation failed: %08lx\n", hres); return hres; } @@ -242,7 +242,7 @@ static BOOL AppendFullPathURL(LPCWSTR file, LPWSTR buf, LPCWSTR index) TRACE("%s %p %s\n", debugstr_w(file), buf, debugstr_w(index)); if (!GetFullPathNameW(file, ARRAY_SIZE(full_path), full_path, NULL)) { - WARN("GetFullPathName failed: %u\n", GetLastError()); + WARN("GetFullPathName failed: %lu\n", GetLastError()); return FALSE; } @@ -272,7 +272,7 @@ static void DoSync(HHInfo *info) if (FAILED(hres)) { - WARN("get_LocationURL failed: %08x\n", hres); + WARN("get_LocationURL failed: %08lx\n", hres); return; } @@ -954,7 +954,7 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw HHWIN_BUTTON_FAVORITES | HHWIN_BUTTON_JUMP1 | HHWIN_BUTTON_JUMP2 | HHWIN_BUTTON_ZOOM | HHWIN_BUTTON_TOC_NEXT | HHWIN_BUTTON_TOC_PREV); if (unsupported) - FIXME("got asked for unsupported buttons: %06x\n", unsupported); + FIXME("got asked for unsupported buttons: %06lx\n", unsupported); if (dwButtonFlags & HHWIN_BUTTON_EXPAND) { diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index b1ccabb2c0e..d0f73e5a784 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -44,7 +44,7 @@ BOOL hh_process = FALSE; BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p,%d,%p)\n", hInstance, fdwReason, lpvReserved); + TRACE("(%p,%ld,%p)\n", hInstance, fdwReason, lpvReserved); switch (fdwReason) { @@ -158,7 +158,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat { WCHAR fullname[MAX_PATH]; - TRACE("(%p, %s, command=%s, data=%lx)\n", + TRACE("(%p, %s, command=%s, data=%Ix)\n", caller, debugstr_w( filename ), command_to_string( command ), data); @@ -345,7 +345,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat else heap_free(window); - TRACE("Changing WINTYPE, fsValidMembers=0x%x\n", wintype->fsValidMembers); + TRACE("Changing WINTYPE, fsValidMembers=0x%lx\n", wintype->fsValidMembers); MergeChmProperties(wintype, info, TRUE); UpdateHelpWindow(info); diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index 75bbc2e4ba2..56d9a898005 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -83,7 +83,7 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * hres = IStorage_OpenStream(pStorage, file, NULL, STGM_READ, 0, &temp_stream); if(FAILED(hres)) { - FIXME("Could not open '%s' stream: %08x\n", debugstr_w(file), hres); + FIXME("Could not open '%s' stream: %08lx\n", debugstr_w(file), hres); goto cleanup; } @@ -162,7 +162,7 @@ static SearchItem *SearchCHM_Storage(SearchItem *item, IStorage *pStorage, hres = IStorage_EnumElements(pStorage, 0, NULL, 0, &elem); if(hres != S_OK) { - FIXME("Could not enumerate '/' storage elements: %08x\n", hres); + FIXME("Could not enumerate '/' storage elements: %08lx\n", hres); return NULL; } while (IEnumSTATSTG_Next(elem, 1, &entries, &retr) == NOERROR) @@ -206,7 +206,7 @@ static SearchItem *SearchCHM_Folder(SearchItem *item, IStorage *pStorage, hres = IStorage_OpenStorage(pStorage, folder, NULL, STGM_READ, NULL, 0, &temp_storage); if(FAILED(hres)) { - FIXME("Could not open '%s' storage object: %08x\n", debugstr_w(folder), hres); + FIXME("Could not open '%s' storage object: %08lx\n", debugstr_w(folder), hres); return NULL; } item = SearchCHM_Storage(item, temp_storage, needle); diff --git a/dlls/hhctrl.ocx/webbrowser.c b/dlls/hhctrl.ocx/webbrowser.c index e44c4ecd9de..3b662bd4bf5 100644 --- a/dlls/hhctrl.ocx/webbrowser.c +++ b/dlls/hhctrl.ocx/webbrowser.c @@ -64,7 +64,7 @@ static ULONG STDMETHODCALLTYPE Site_AddRef(IOleClientSite *iface) WebBrowserContainer *This = impl_from_IOleClientSite(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -74,7 +74,7 @@ static ULONG STDMETHODCALLTYPE Site_Release(IOleClientSite *iface) WebBrowserContainer *This = impl_from_IOleClientSite(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { if(This->ole_obj) @@ -164,7 +164,7 @@ static HRESULT STDMETHODCALLTYPE UI_ShowContextMenu(IDocHostUIHandler *iface, DW DWORD cmdid, menu_id = 0; HMENU menu, submenu; - TRACE("(%p)->(%d %s)\n", This, dwID, wine_dbgstr_point(ppt)); + TRACE("(%p)->(%ld %s)\n", This, dwID, wine_dbgstr_point(ppt)); menu = LoadMenuW(hhctrl_hinstance, MAKEINTRESOURCEW(MENU_WEBBROWSER)); if (!menu)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/hlink/Makefile.in | 1 - dlls/hlink/browse_ctx.c | 18 +++++++++--------- dlls/hlink/extserv.c | 8 ++++---- dlls/hlink/hlink_main.c | 26 +++++++++++++------------- dlls/hlink/link.c | 30 +++++++++++++++--------------- 5 files changed, 41 insertions(+), 42 deletions(-) diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in index 1c42ad5fded..4aeb7619911 100644 --- a/dlls/hlink/Makefile.in +++ b/dlls/hlink/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hlink.dll IMPORTLIB = hlink IMPORTS = uuid shell32 ole32 advapi32 diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 3fe6885422c..58a43b180fc 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -68,7 +68,7 @@ static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface) HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -78,7 +78,7 @@ static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, ref + 1); + TRACE("(%p)->(count=%lu)\n", This, ref + 1); if (!ref) { @@ -107,7 +107,7 @@ static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, IRunningObjectTable *ROT; HRESULT hr; - FIXME("(%p)->(%i %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister); + FIXME("(%p)->(%li %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister); hr = CreateItemMoniker(NULL, L"WINEHLINK", &mon); if (FAILED(hr)) @@ -156,7 +156,7 @@ static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface, IRunningObjectTable *ROT; HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); - FIXME("(%p)->(%i)\n", This, dwRegister); + FIXME("(%p)->(%li)\n", This, dwRegister); GetRunningObjectTable(0, &ROT); r = IRunningObjectTable_Revoke(ROT, dwRegister); @@ -226,7 +226,7 @@ static HRESULT WINAPI IHlinkBC_OnNavigateHlink(IHlinkBrowseContext *iface, { HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); - FIXME("(%p)->(%i %p %s %s %p)\n", This, grfHLNF, pmkTarget, + FIXME("(%p)->(%li %p %s %s %p)\n", This, grfHLNF, pmkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID); return S_OK; @@ -254,7 +254,7 @@ static struct link_entry *context_get_entry(HlinkBCImpl *ctxt, ULONG hlid) entry = list_head(&ctxt->links); break; default: - WARN("unknown id 0x%x\n", hlid); + WARN("unknown id 0x%lx\n", hlid); entry = NULL; } @@ -269,7 +269,7 @@ static HRESULT WINAPI IHlinkBC_UpdateHlink(IHlinkBrowseContext* iface, IHlink *link; HRESULT hr; - TRACE("(%p)->(0x%x %p %s %s)\n", This, hlid, target, debugstr_w(location), debugstr_w(friendly_name)); + TRACE("(%p)->(0x%lx %p %s %s)\n", This, hlid, target, debugstr_w(location), debugstr_w(friendly_name)); if (!entry) return E_INVALIDARG; @@ -303,7 +303,7 @@ static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid, HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); struct link_entry *link; - TRACE("(%p)->(0x%x %p)\n", This, hlid, ret); + TRACE("(%p)->(0x%lx %p)\n", This, hlid, ret); link = context_get_entry(This, hlid); if (!link) @@ -320,7 +320,7 @@ static HRESULT WINAPI IHlinkBC_SetCurrentHlink(IHlinkBrowseContext* iface, ULONG HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); struct link_entry *link; - TRACE("(%p)->(0x%08x)\n", This, hlid); + TRACE("(%p)->(0x%08lx)\n", This, hlid); link = context_get_entry(This, hlid); if (!link) diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index c9154e95c25..7a5f62246f4 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -76,7 +76,7 @@ static ULONG WINAPI ExtServUnk_AddRef(IUnknown *iface) ExtensionService *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -86,7 +86,7 @@ static ULONG WINAPI ExtServUnk_Release(IUnknown *iface) ExtensionService *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { heap_free(This->username); @@ -179,7 +179,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, { ExtensionService *This = impl_from_IHttpNegotiate(iface); - TRACE("(%p)->(%s %s %x %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, + TRACE("(%p)->(%s %s %lx %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, pszAdditionalHeaders); if(!pszAdditionalHeaders) @@ -194,7 +194,7 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD dwRe { ExtensionService *This = impl_from_IHttpNegotiate(iface); - TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), + TRACE("(%p)->(%ld %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); *pszAdditionalRequestHeaders = NULL; diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index c730616fbe6..5087eae6106 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -51,7 +51,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, IHlink *hl = NULL; HRESULT r; - TRACE("%p %s %s %p %i %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation), + TRACE("%p %s %s %p %li %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj); @@ -85,7 +85,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, WCHAR *hash, *tgt; const WCHAR *loc; - TRACE("%s %s %s %p %i %p %s %p\n", debugstr_w(pwzTarget), + TRACE("%s %s %s %p %li %p %s %p\n", debugstr_w(pwzTarget), debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj); @@ -163,7 +163,7 @@ HRESULT WINAPI HlinkNavigate(IHlink *phl, IHlinkFrame *phlFrame, { HRESULT r = S_OK; - TRACE("%p %p %i %p %p %p\n", phl, phlFrame, grfHLNF, pbc, pbsc, phlbc); + TRACE("%p %p %li %p %p %p\n", phl, phlFrame, grfHLNF, pbc, pbsc, phlbc); if (phlFrame) r = IHlinkFrame_Navigate(phlFrame, grfHLNF, pbc, pbsc, phl); @@ -182,7 +182,7 @@ HRESULT WINAPI HlinkOnNavigate( IHlinkFrame *phlFrame, { HRESULT r; - TRACE("%p %p %i %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget, + TRACE("%p %p %li %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID); r = IHlinkBrowseContext_OnNavigateHlink(phlbc, grfHLNF, pmkTarget, @@ -202,7 +202,7 @@ HRESULT WINAPI HlinkCreateFromData(IDataObject *piDataObj, IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter, REFIID riid, void **ppvObj) { - FIXME("%p, %p, %d, %p, %s, %p\n", piDataObj, pihlsite, dwSiteData, + FIXME("%p, %p, %ld, %p, %s, %p\n", piDataObj, pihlsite, dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj); *ppvObj = NULL; return E_NOTIMPL; @@ -228,7 +228,7 @@ HRESULT WINAPI HlinkNavigateToStringReference( LPCWSTR pwzTarget, HRESULT r; IHlink *hlink = NULL; - TRACE("%s %s %p %08x %p %08x %p %p %p\n", + TRACE("%s %s %p %08lx %p %08lx %p %p %p\n", debugstr_w(pwzTarget), debugstr_w(pwzLocation), pihlsite, dwSiteData, pihlframe, grfHLNF, pibc, pibsc, pihlbc); @@ -271,7 +271,7 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) WCHAR *buf; HKEY hkey; - TRACE("(%u %p)\n", uReference, ppwzReference); + TRACE("(%lu %p)\n", uReference, ppwzReference); *ppwzReference = NULL; @@ -290,7 +290,7 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) res = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Internet Explorer\\Main", &hkey); if(res != ERROR_SUCCESS) { - WARN("Could not open key: %u\n", res); + WARN("Could not open key: %lu\n", res); return HRESULT_FROM_WIN32(res); } @@ -301,7 +301,7 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) res = RegQueryValueExW(hkey, value_name, NULL, &type, (PBYTE)buf, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS) { - WARN("Could not query value %s: %u\n", debugstr_w(value_name), res); + WARN("Could not query value %s: %lu\n", debugstr_w(value_name), res); CoTaskMemFree(buf); return HRESULT_FROM_WIN32(res); } @@ -315,7 +315,7 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) */ HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTranslatedURL) { - FIXME("(%s %08x %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL); + FIXME("(%s %08lx %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL); return E_NOTIMPL; } @@ -327,7 +327,7 @@ HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *frame, IHlinkBrowseContext *bc, { HRESULT hr; - TRACE("(%p %p 0x%x %p %s %s)\n", frame, bc, hlid, target, debugstr_w(location), debugstr_w(friendly_name)); + TRACE("(%p %p 0x%lx %p %s %s)\n", frame, bc, hlid, target, debugstr_w(location), debugstr_w(friendly_name)); if (!frame && !bc) return E_INVALIDARG; @@ -391,7 +391,7 @@ HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER pimkReference, DWORD reserve void *obj = NULL; HRESULT hres; - TRACE("(%p %x %p %d %p %p %p)\n", pimkReference, reserved, pibc, cFmtetc, rgFmtetc, pibsc, pimkBase); + TRACE("(%p %lx %p %ld %p %p %p)\n", pimkReference, reserved, pibc, cFmtetc, rgFmtetc, pibsc, pimkBase); if(cFmtetc || rgFmtetc || pimkBase) FIXME("Unsupported args\n"); @@ -402,7 +402,7 @@ HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER pimkReference, DWORD reserve hres = IMoniker_IsSystemMoniker(pimkReference, &mksys); if(SUCCEEDED(hres) && mksys != MKSYS_URLMONIKER) - WARN("sysmk = %x\n", mksys); + WARN("sysmk = %lx\n", mksys); /* FIXME: What is it for? */ CreateBindCtx(0, &bctx); diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 134f3aefd81..fb8015d8db2 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -154,7 +154,7 @@ static ULONG WINAPI IHlink_fnAddRef (IHlink* iface) HlinkImpl *This = impl_from_IHlink(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -164,7 +164,7 @@ static ULONG WINAPI IHlink_fnRelease (IHlink* iface) HlinkImpl *This = impl_from_IHlink(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount + 1); + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); if (refCount) return refCount; @@ -185,7 +185,7 @@ static HRESULT WINAPI IHlink_fnSetHlinkSite( IHlink* iface, { HlinkImpl *This = impl_from_IHlink(iface); - TRACE("(%p)->(%p %i)\n", This, pihlSite, dwSiteData); + TRACE("(%p)->(%p %li)\n", This, pihlSite, dwSiteData); if (This->Site) IHlinkSite_Release(This->Site); @@ -221,7 +221,7 @@ static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface, { HlinkImpl *This = impl_from_IHlink(iface); - TRACE("(%p)->(%i %p %s)\n", This, rfHLSETF, pmkTarget, + TRACE("(%p)->(%li %p %s)\n", This, rfHLSETF, pmkTarget, debugstr_w(pwzLocation)); if(rfHLSETF == 0) @@ -260,7 +260,7 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface, { HlinkImpl *This = impl_from_IHlink(iface); - TRACE("(%p)->(%i %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget), + TRACE("(%p)->(%li %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget), debugstr_w(pwzLocation)); if(grfHLSETF > (HLINKSETF_TARGET | HLINKSETF_LOCATION) && @@ -324,7 +324,7 @@ static HRESULT WINAPI IHlink_fnGetMonikerReference(IHlink* iface, { HlinkImpl *This = impl_from_IHlink(iface); - TRACE("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppimkTarget, + TRACE("(%p) -> (%li %p %p)\n", This, dwWhichRef, ppimkTarget, ppwzLocation); if (ppimkTarget) @@ -349,7 +349,7 @@ static HRESULT WINAPI IHlink_fnGetStringReference (IHlink* iface, { HlinkImpl *This = impl_from_IHlink(iface); - TRACE("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation); + TRACE("(%p) -> (%li %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation); if(dwWhichRef != -1 && dwWhichRef & ~(HLINKGETREF_DEFAULT | HLINKGETREF_ABSOLUTE | HLINKGETREF_RELATIVE)) { @@ -410,7 +410,7 @@ static HRESULT WINAPI IHlink_fnGetFriendlyName (IHlink* iface, { HlinkImpl *This = impl_from_IHlink(iface); - TRACE("(%p) -> (%i %p)\n", This, grfHLFNAMEF, ppwzFriendlyName); + TRACE("(%p) -> (%li %p)\n", This, grfHLFNAMEF, ppwzFriendlyName); /* FIXME: Only using explicitly set and cached friendly names */ @@ -485,7 +485,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink *iface, DWORD flags, IBindCtx *us IMoniker *mon = NULL; HRESULT r; - TRACE("hlink %p, flags %#x, user_bind_ctx %p, bind_callback %p, browse_ctx %p.\n", + TRACE("hlink %p, flags %#lx, user_bind_ctx %p, bind_callback %p, browse_ctx %p.\n", This, flags, user_bind_ctx, bind_callback, browse_ctx); if (This->async_bind_ctx) @@ -765,7 +765,7 @@ static HRESULT read_hlink_string(IStream *pStm, LPWSTR *out_str) if (FAILED(hr)) return hr; if (read != sizeof(len)) return STG_E_READFAULT; - TRACE("read len %d\n", len); + TRACE("read len %ld\n", len); str = heap_alloc(len * sizeof(WCHAR)); if (!str) return E_OUTOFMEMORY; @@ -802,7 +802,7 @@ static HRESULT WINAPI IPersistStream_fnLoad(IPersistStream* iface, goto end; } if (hdr[1] & ~HLINK_SAVE_ALL) - FIXME("unknown flag(s) 0x%x\n", hdr[1] & ~HLINK_SAVE_ALL); + FIXME("unknown flag(s) 0x%lx\n", hdr[1] & ~HLINK_SAVE_ALL); if (hdr[1] & HLINK_SAVE_TARGET_FRAME_PRESENT) { @@ -1002,7 +1002,7 @@ static HRESULT WINAPI bind_callback_OnStartBinding(IBindStatusCallback *iface, { HlinkImpl *hlink = impl_from_IBindStatusCallback(iface); - TRACE("hlink %p, reserved %#x, binding %p.\n", hlink, reserved, binding); + TRACE("hlink %p, reserved %#lx, binding %p.\n", hlink, reserved, binding); if (hlink->bind_callback) return IBindStatusCallback_OnStartBinding(hlink->bind_callback, reserved, binding); @@ -1019,7 +1019,7 @@ static HRESULT WINAPI bind_callback_OnLowResource(IBindStatusCallback *iface, DW { HlinkImpl *hlink = impl_from_IBindStatusCallback(iface); - TRACE("hlink %p, reserved %#x.\n", hlink, reserved); + TRACE("hlink %p, reserved %#lx.\n", hlink, reserved); if (hlink->bind_callback) return IBindStatusCallback_OnLowResource(hlink->bind_callback, reserved); @@ -1031,7 +1031,7 @@ static HRESULT WINAPI bind_callback_OnProgress(IBindStatusCallback *iface, { HlinkImpl *hlink = impl_from_IBindStatusCallback(iface); - TRACE("hlink %p, progress %u, max %u, status %u, text %s.\n", + TRACE("hlink %p, progress %lu, max %lu, status %lu, text %s.\n", hlink, progress, max, status, debugstr_w(text)); if (hlink->bind_callback) @@ -1076,7 +1076,7 @@ static HRESULT WINAPI bind_callback_GetBindInfo(IBindStatusCallback *iface, static HRESULT WINAPI bind_callback_OnDataAvailable(IBindStatusCallback *iface, DWORD flags, DWORD size, FORMATETC *formatetc, STGMEDIUM *stgmed) { - FIXME("iface %p, flags %#x, size %d, formatetc %p, stgmed %p, stub!\n", + FIXME("iface %p, flags %#lx, size %ld, formatetc %p, stgmed %p, stub!\n", iface, flags, size, formatetc, stgmed); return E_NOTIMPL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/hnetcfg/Makefile.in | 1 - dlls/hnetcfg/apps.c | 16 ++++++----- dlls/hnetcfg/hnetcfg.c | 2 + dlls/hnetcfg/manager.c | 8 +++--- dlls/hnetcfg/policy.c | 22 ++++++++------- dlls/hnetcfg/port.c | 66 +++++++++++++++++++++++----------------------- dlls/hnetcfg/profile.c | 6 ++-- dlls/hnetcfg/service.c | 12 ++++---- 8 files changed, 66 insertions(+), 67 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 926eec4e476..0ff7c511eb4 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hnetcfg.dll IMPORTS = oleaut32 ole32 advapi32 mpr uuid DELAYIMPORTS = ws2_32 winhttp shcore xmllite diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 9f0b30cd28a..842ead499fb 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -130,7 +130,7 @@ HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) hr = LoadRegTypeLib( &LIBID_NetFwPublicTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &lib ); if (FAILED(hr)) { - ERR("LoadRegTypeLib failed: %08x\n", hr); + ERR("LoadRegTypeLib failed: %08lx\n", hr); return hr; } if (InterlockedCompareExchangePointer( (void **)&typelib, lib, NULL )) @@ -143,7 +143,7 @@ HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) hr = ITypeLib_GetTypeInfoOfGuid( typelib, tid_id[tid], &info ); if (FAILED(hr)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_id[tid]), hr); + ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_id[tid]), hr); return hr; } if (InterlockedCompareExchangePointer( (void **)(typeinfo + tid), info, NULL )) @@ -174,7 +174,7 @@ static HRESULT WINAPI fw_app_GetTypeInfo( { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo( INetFwAuthorizedApplication_tid, ppTInfo ); } @@ -190,7 +190,7 @@ static HRESULT WINAPI fw_app_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( INetFwAuthorizedApplication_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -216,7 +216,7 @@ static HRESULT WINAPI fw_app_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( INetFwAuthorizedApplication_tid, &typeinfo ); @@ -519,7 +519,7 @@ static HRESULT WINAPI fw_apps_GetTypeInfo( { fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); - TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo( INetFwAuthorizedApplications_tid, ppTInfo ); } @@ -535,7 +535,7 @@ static HRESULT WINAPI fw_apps_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( INetFwAuthorizedApplications_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -561,7 +561,7 @@ static HRESULT WINAPI fw_apps_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( INetFwAuthorizedApplications_tid, &typeinfo ); diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index 96b86e690e8..70c49d6806a 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -118,7 +118,7 @@ static hnetcfg_cf upnpnat_cf = { { &hnetcfg_cf_vtbl }, IUPnPNAT_create }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { - TRACE("(0x%p, %d, %p)\n", hInstDLL, fdwReason, reserved); + TRACE("(0x%p, %ld, %p)\n", hInstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index fda69729901..fe93a3a8da0 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -106,7 +106,7 @@ static HRESULT WINAPI fw_manager_GetTypeInfo( { fw_manager *This = impl_from_INetFwMgr( iface ); - TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo( INetFwMgr_tid, ppTInfo ); } @@ -122,7 +122,7 @@ static HRESULT WINAPI fw_manager_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( INetFwMgr_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -148,7 +148,7 @@ static HRESULT WINAPI fw_manager_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( INetFwMgr_tid, &typeinfo ); @@ -202,7 +202,7 @@ static HRESULT WINAPI fw_manager_IsPortAllowed( { fw_manager *This = impl_from_INetFwMgr( iface ); - FIXME("%p, %s, %u, %d, %s, %u, %p, %p\n", This, debugstr_w(imageFileName), + FIXME("%p, %s, %u, %ld, %s, %u, %p, %p\n", This, debugstr_w(imageFileName), ipVersion, portNumber, debugstr_w(localAddress), ipProtocol, allowed, restricted); return E_NOTIMPL; } diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index 7bdc1563d90..3426fc82304 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -129,7 +129,7 @@ static HRESULT WINAPI netfw_rules_GetTypeInfo( { fw_rules *This = impl_from_INetFwRules( iface ); - TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo( INetFwRules_tid, ppTInfo ); } @@ -145,7 +145,7 @@ static HRESULT WINAPI netfw_rules_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( INetFwRules_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -171,7 +171,7 @@ static HRESULT WINAPI netfw_rules_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( INetFwRules_tid, &typeinfo ); @@ -340,7 +340,7 @@ static HRESULT WINAPI fw_policy_GetTypeInfo( { fw_policy *This = impl_from_INetFwPolicy( iface ); - TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo( INetFwPolicy_tid, ppTInfo ); } @@ -356,7 +356,7 @@ static HRESULT WINAPI fw_policy_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( INetFwPolicy_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -382,7 +382,7 @@ static HRESULT WINAPI fw_policy_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( INetFwPolicy_tid, &typeinfo ); @@ -505,7 +505,7 @@ static HRESULT WINAPI fwpolicy2_GetTypeInfo(INetFwPolicy2 *iface, UINT iTInfo, L { fw_policy2 *This = impl_from_INetFwPolicy2( iface ); - TRACE("%p %u %u %p\n", This, iTInfo, lcid, info); + TRACE("%p %u %lu %p\n", This, iTInfo, lcid, info); return get_typeinfo( INetFwPolicy2_tid, info ); } @@ -516,7 +516,7 @@ static HRESULT WINAPI fwpolicy2_GetIDsOfNames(INetFwPolicy2 *iface, REFIID riid, ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( INetFwPolicy2_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -534,7 +534,7 @@ static HRESULT WINAPI fwpolicy2_Invoke(INetFwPolicy2 *iface, DISPID dispIdMember ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( INetFwPolicy2_tid, &typeinfo ); @@ -661,7 +661,7 @@ static HRESULT WINAPI fwpolicy2_EnableRuleGroup(INetFwPolicy2 *iface, LONG bitma { fw_policy2 *This = impl_from_INetFwPolicy2( iface ); - FIXME("%p %d %s %d\n", This, bitmask, debugstr_w(group), enable); + FIXME("%p %ld %s %d\n", This, bitmask, debugstr_w(group), enable); return E_NOTIMPL; } @@ -669,7 +669,7 @@ static HRESULT WINAPI fwpolicy2_IsRuleGroupEnabled(INetFwPolicy2 *iface, LONG bi { fw_policy2 *This = impl_from_INetFwPolicy2( iface ); - FIXME("%p %d %s %p\n", This, bitmask, debugstr_w(group), enabled); + FIXME("%p %ld %s %p\n", This, bitmask, debugstr_w(group), enabled); return E_NOTIMPL; } diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 47bfc16be79..bda9455a2b5 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -319,7 +319,7 @@ static BOOL open_gateway_connection(void) upnp_gateway_connection.connection = WinHttpConnect ( upnp_gateway_connection.session, hostname, url.nPort, 0 ); if (!upnp_gateway_connection.connection) { - WARN( "WinHttpConnect error %u.\n", GetLastError() ); + WARN( "WinHttpConnect error %lu.\n", GetLastError() ); return FALSE; } return TRUE; @@ -344,13 +344,13 @@ static BOOL get_control_url(void) if (!WinHttpSendRequest( request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0 )) { - WARN( "Error sending request %u.\n", GetLastError() ); + WARN( "Error sending request %lu.\n", GetLastError() ); WinHttpCloseHandle( request ); return FALSE; } if (!WinHttpReceiveResponse(request, NULL)) { - WARN( "Error receiving response %u.\n", GetLastError() ); + WARN( "Error receiving response %lu.\n", GetLastError() ); WinHttpCloseHandle( request ); return FALSE; } @@ -358,7 +358,7 @@ static BOOL get_control_url(void) if (!WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL) || status != HTTP_STATUS_OK ) { - WARN( "Error response from server, error %u, http status %u.\n", GetLastError(), status ); + WARN( "Error response from server, error %lu, http status %lu.\n", GetLastError(), status ); WinHttpCloseHandle( request ); return FALSE; } @@ -456,12 +456,12 @@ static BOOL request_service( const WCHAR *function, const struct xml_value_desc upnp_gateway_connection.version, function ); if (!WinHttpSendRequest( request, request_headers, -1, request_data, request_len, request_len, 0 )) { - WARN( "Error sending request %u.\n", GetLastError() ); + WARN( "Error sending request %lu.\n", GetLastError() ); goto done; } if (!WinHttpReceiveResponse(request, NULL)) { - WARN( "Error receiving response %u.\n", GetLastError() ); + WARN( "Error receiving response %lu.\n", GetLastError() ); goto done; } size = sizeof(*http_status); @@ -607,7 +607,7 @@ static void update_mapping_list(void) new_mappings[index].enabled = VARIANT_FALSE; new_mappings[index].descr = mapping_move_bstr( &mapping_desc[PM_DESC].value ); - TRACE( "%s %s %s:%u -> %s:%u, enabled %d.\n", debugstr_w(new_mappings[index].descr), + TRACE( "%s %s %s:%lu -> %s:%lu, enabled %d.\n", debugstr_w(new_mappings[index].descr), debugstr_w(new_mappings[index].protocol), debugstr_w(new_mappings[index].external_ip), new_mappings[index].external, debugstr_w(new_mappings[index].client), new_mappings[index].internal, new_mappings[index].enabled ); @@ -638,7 +638,7 @@ static BOOL remove_port_mapping( LONG port, BSTR protocol ) NULL, 0, &status, &error_str ); if (ret && status != HTTP_STATUS_OK) { - WARN( "status %u, server returned error %s.\n", status, debugstr_w(error_str) ); + WARN( "status %lu, server returned error %s.\n", status, debugstr_w(error_str) ); SysFreeString( error_str ); ret = FALSE; } @@ -680,7 +680,7 @@ static BOOL add_port_mapping( LONG external, BSTR protocol, LONG internal, BSTR NULL, 0, &status, &error_str ); if (ret && status != HTTP_STATUS_OK) { - WARN( "status %u, server returned error %s.\n", status, debugstr_w(error_str) ); + WARN( "status %lu, server returned error %s.\n", status, debugstr_w(error_str) ); SysFreeString( error_str ); ret = FALSE; } @@ -940,7 +940,7 @@ static HRESULT WINAPI static_port_mapping_GetTypeInfo( { struct static_port_mapping *mapping = impl_from_IStaticPortMapping( iface ); - TRACE("%p %u %u %p\n", mapping, iTInfo, lcid, ppTInfo); + TRACE("%p %u %lu %p\n", mapping, iTInfo, lcid, ppTInfo); return get_typeinfo( IStaticPortMapping_tid, ppTInfo ); } @@ -956,7 +956,7 @@ static HRESULT WINAPI static_port_mapping_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", mapping, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", mapping, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( IStaticPortMapping_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -982,7 +982,7 @@ static HRESULT WINAPI static_port_mapping_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", mapping, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", mapping, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( IStaticPortMapping_tid, &typeinfo ); @@ -1121,7 +1121,7 @@ static HRESULT WINAPI static_port_mapping_EditInternalPort( IStaticPortMapping *iface, LONG value ) { - FIXME( "iface %p, value %d stub.\n", iface, value ); + FIXME( "iface %p, value %ld stub.\n", iface, value ); return E_NOTIMPL; } @@ -1225,7 +1225,7 @@ static HRESULT WINAPI port_mapping_enum_Next( IEnumVARIANT *iface, ULONG celt, V unsigned int i, count; HRESULT ret; - TRACE( "iface %p, celt %u, var %p, fetched %p.\n", iface, celt, var, fetched ); + TRACE( "iface %p, celt %lu, var %p, fetched %p.\n", iface, celt, var, fetched ); if (fetched) *fetched = 0; if (!celt) return S_OK; @@ -1261,7 +1261,7 @@ static HRESULT WINAPI port_mapping_enum_Skip( IEnumVARIANT *iface, ULONG celt ) struct port_mapping_enum *mapping_enum = impl_from_IEnumVARIANT( iface ); unsigned int count = get_port_mapping_count(); - TRACE( "iface %p, celt %u.\n", iface, celt ); + TRACE( "iface %p, celt %lu.\n", iface, celt ); mapping_enum->index += celt; return mapping_enum->index <= count ? S_OK : S_FALSE; @@ -1395,7 +1395,7 @@ static HRESULT WINAPI static_ports_GetTypeInfo( { struct static_port_mapping_collection *ports = impl_from_IStaticPortMappingCollection( iface ); - TRACE("%p %u %u %p\n", ports, iTInfo, lcid, ppTInfo); + TRACE("%p %u %lu %p\n", ports, iTInfo, lcid, ppTInfo); return get_typeinfo( IStaticPortMappingCollection_tid, ppTInfo ); } @@ -1411,7 +1411,7 @@ static HRESULT WINAPI static_ports_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", ports, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", ports, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( IStaticPortMappingCollection_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -1437,7 +1437,7 @@ static HRESULT WINAPI static_ports_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", ports, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", ports, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( IStaticPortMappingCollection_tid, &typeinfo ); @@ -1471,7 +1471,7 @@ static HRESULT WINAPI static_ports_get_Item( struct port_mapping mapping_data; HRESULT ret; - TRACE( "iface %p, port %d, protocol %s.\n", iface, port, debugstr_w(protocol) ); + TRACE( "iface %p, port %ld, protocol %s.\n", iface, port, debugstr_w(protocol) ); if (!mapping) return E_POINTER; *mapping = NULL; @@ -1499,7 +1499,7 @@ static HRESULT WINAPI static_ports_Remove( LONG port, BSTR protocol ) { - TRACE( "iface %p, port %d, protocol %s.\n", iface, port, debugstr_w(protocol) ); + TRACE( "iface %p, port %ld, protocol %s.\n", iface, port, debugstr_w(protocol) ); if (!is_valid_protocol( protocol )) return E_INVALIDARG; if (port < 0 || port > 65535) return E_INVALIDARG; @@ -1522,7 +1522,7 @@ static HRESULT WINAPI static_ports_Add( struct port_mapping mapping_data; HRESULT ret; - TRACE( "iface %p, external %d, protocol %s, internal %d, client %s, enabled %d, descritption %s, mapping %p.\n", + TRACE( "iface %p, external %ld, protocol %s, internal %ld, client %s, enabled %d, descritption %s, mapping %p.\n", iface, external, debugstr_w(protocol), internal, debugstr_w(client), enabled, debugstr_w(description), mapping ); @@ -1667,7 +1667,7 @@ static HRESULT WINAPI fw_port_GetTypeInfo( { fw_port *This = impl_from_INetFwOpenPort( iface ); - TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo( INetFwOpenPort_tid, ppTInfo ); } @@ -1683,7 +1683,7 @@ static HRESULT WINAPI fw_port_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( INetFwOpenPort_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -1709,7 +1709,7 @@ static HRESULT WINAPI fw_port_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( INetFwOpenPort_tid, &typeinfo ); @@ -1809,7 +1809,7 @@ static HRESULT WINAPI fw_port_put_Port( { fw_port *This = impl_from_INetFwOpenPort( iface ); - TRACE("%p %d\n", This, portNumber); + TRACE("%p %ld\n", This, portNumber); This->port = portNumber; return S_OK; } @@ -2007,7 +2007,7 @@ static HRESULT WINAPI fw_ports_GetTypeInfo( { fw_ports *This = impl_from_INetFwOpenPorts( iface ); - TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo( INetFwOpenPorts_tid, ppTInfo ); } @@ -2023,7 +2023,7 @@ static HRESULT WINAPI fw_ports_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( INetFwOpenPorts_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -2049,7 +2049,7 @@ static HRESULT WINAPI fw_ports_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( INetFwOpenPorts_tid, &typeinfo ); @@ -2091,7 +2091,7 @@ static HRESULT WINAPI fw_ports_Remove( { fw_ports *This = impl_from_INetFwOpenPorts( iface ); - FIXME("%p, %d, %u\n", This, portNumber, ipProtocol); + FIXME("%p, %ld, %u\n", This, portNumber, ipProtocol); return E_NOTIMPL; } @@ -2104,7 +2104,7 @@ static HRESULT WINAPI fw_ports_Item( HRESULT hr; fw_ports *This = impl_from_INetFwOpenPorts( iface ); - FIXME("%p, %d, %u, %p\n", This, portNumber, ipProtocol, openPort); + FIXME("%p, %ld, %u, %p\n", This, portNumber, ipProtocol, openPort); hr = NetFwOpenPort_create( NULL, (void **)openPort ); if (SUCCEEDED(hr)) @@ -2226,7 +2226,7 @@ static HRESULT WINAPI upnpnat_GetTypeInfo(IUPnPNAT *iface, UINT iTInfo, LCID lci { upnpnat *This = impl_from_IUPnPNAT( iface ); - TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo( IUPnPNAT_tid, ppTInfo ); } @@ -2237,7 +2237,7 @@ static HRESULT WINAPI upnpnat_GetIDsOfNames(IUPnPNAT *iface, REFIID riid, LPOLES ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( IUPnPNAT_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -2256,7 +2256,7 @@ static HRESULT WINAPI upnpnat_Invoke(IUPnPNAT *iface, DISPID dispIdMember, REFII ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( IUPnPNAT_tid, &typeinfo ); diff --git a/dlls/hnetcfg/profile.c b/dlls/hnetcfg/profile.c index 63f6d0cc7ed..ee34519bbb7 100644 --- a/dlls/hnetcfg/profile.c +++ b/dlls/hnetcfg/profile.c @@ -106,7 +106,7 @@ static HRESULT WINAPI fw_profile_GetTypeInfo( { fw_profile *This = impl_from_INetFwProfile( iface ); - TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo( INetFwProfile_tid, ppTInfo ); } @@ -122,7 +122,7 @@ static HRESULT WINAPI fw_profile_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo( INetFwProfile_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -148,7 +148,7 @@ static HRESULT WINAPI fw_profile_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo( INetFwProfile_tid, &typeinfo ); diff --git a/dlls/hnetcfg/service.c b/dlls/hnetcfg/service.c index 122d9797bab..0ba15158f5d 100644 --- a/dlls/hnetcfg/service.c +++ b/dlls/hnetcfg/service.c @@ -105,7 +105,7 @@ static HRESULT WINAPI fw_service_GetTypeInfo( { fw_service *This = impl_from_INetFwService( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + FIXME("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -119,7 +119,7 @@ static HRESULT WINAPI fw_service_GetIDsOfNames( { fw_service *This = impl_from_INetFwService( iface ); - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; } @@ -136,7 +136,7 @@ static HRESULT WINAPI fw_service_Invoke( { fw_service *This = impl_from_INetFwService( iface ); - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + FIXME("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -375,7 +375,7 @@ static HRESULT WINAPI fw_services_GetTypeInfo( { fw_services *This = impl_from_INetFwServices( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + FIXME("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -389,7 +389,7 @@ static HRESULT WINAPI fw_services_GetIDsOfNames( { fw_services *This = impl_from_INetFwServices( iface ); - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; } @@ -406,7 +406,7 @@ static HRESULT WINAPI fw_services_Invoke( { fw_services *This = impl_from_INetFwServices( iface ); - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + FIXME("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/httpapi/Makefile.in | 1 - dlls/httpapi/httpapi_main.c | 54 ++++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/httpapi/Makefile.in b/dlls/httpapi/Makefile.in index ea9c4223059..94020e9c17e 100644 --- a/dlls/httpapi/Makefile.in +++ b/dlls/httpapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = httpapi.dll IMPORTLIB = httpapi IMPORTS = advapi32 diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 52fa6cc1d80..4d2d307ffcb 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -53,12 +53,12 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved { SC_HANDLE manager, service; - TRACE("version %u.%u, flags %#x, reserved %p.\n", version.HttpApiMajorVersion, + TRACE("version %u.%u, flags %#lx, reserved %p.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, flags, reserved); if (flags & ~HTTP_INITIALIZE_SERVER) { - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); return ERROR_SUCCESS; } @@ -67,14 +67,14 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved if (!(service = OpenServiceW(manager, L"http", SERVICE_START))) { - ERR("Failed to open HTTP service, error %u.\n", GetLastError()); + ERR("Failed to open HTTP service, error %lu.\n", GetLastError()); CloseServiceHandle(manager); return GetLastError(); } if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) { - ERR("Failed to start HTTP service, error %u.\n", GetLastError()); + ERR("Failed to start HTTP service, error %lu.\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(manager); return GetLastError(); @@ -100,7 +100,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved */ ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) { - FIXME( "(0x%x, %p): stub!\n", flags, reserved ); + FIXME( "(0x%lx, %p): stub!\n", flags, reserved ); return NO_ERROR; } @@ -123,7 +123,7 @@ ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) ULONG WINAPI HttpDeleteServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, PVOID config, ULONG length, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + FIXME( "(%p, %d, %p, %ld, %p): stub!\n", handle, type, config, length, overlapped ); return NO_ERROR; } @@ -150,7 +150,7 @@ ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_I PVOID query, ULONG query_len, PVOID buffer, ULONG buffer_len, PULONG data_len, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p, %d, %p, %p): stub!\n", handle, type, query, query_len, + FIXME( "(%p, %d, %p, %ld, %p, %ld, %p, %p): stub!\n", handle, type, query, query_len, buffer, buffer_len, data_len, overlapped ); return ERROR_FILE_NOT_FOUND; } @@ -174,7 +174,7 @@ ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_I ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, PVOID config, ULONG length, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + FIXME( "(%p, %d, %p, %ld, %p): stub!\n", handle, type, config, length, overlapped ); return NO_ERROR; } @@ -197,7 +197,7 @@ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) UNICODE_STRING string; IO_STATUS_BLOCK iosb; - TRACE("handle %p, reserved %#x.\n", handle, reserved); + TRACE("handle %p, reserved %#lx.\n", handle, reserved); if (!handle) return ERROR_INVALID_PARAMETER; @@ -289,11 +289,11 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ULONG ret = ERROR_SUCCESS; OVERLAPPED sync_ovl; - TRACE("queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", + TRACE("queue %p, id %s, flags %#lx, buffer %p, size %#lx, ret_size %p, ovl %p.\n", queue, wine_dbgstr_longlong(id), flags, buffer, size, ret_size, ovl); if (flags) - FIXME("Ignoring flags %#x.\n", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!ovl) { @@ -334,11 +334,11 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag ULONG ret = ERROR_SUCCESS; OVERLAPPED sync_ovl; - TRACE("queue %p, id %s, flags %#x, request %p, size %#x, ret_size %p, ovl %p.\n", + TRACE("queue %p, id %s, flags %#lx, request %p, size %#lx, ret_size %p, ovl %p.\n", queue, wine_dbgstr_longlong(id), flags, request, size, ret_size, ovl); if (flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY) - FIXME("Ignoring flags %#x.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY); + FIXME("Ignoring flags %#lx.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY); if (size < sizeof(HTTP_REQUEST_V1)) return ERROR_INSUFFICIENT_BUFFER; @@ -426,15 +426,15 @@ ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, char *p, dummy[12]; USHORT i; - TRACE("queue %p, id %s, flags %#x, response %p, cache_policy %p, " - "ret_size %p, reserved1 %p, reserved2 %#x, ovl %p, log_data %p.\n", + TRACE("queue %p, id %s, flags %#lx, response %p, cache_policy %p, " + "ret_size %p, reserved1 %p, reserved2 %#lx, ovl %p, log_data %p.\n", queue, wine_dbgstr_longlong(id), flags, response, cache_policy, ret_size, reserved1, reserved2, ovl, log_data); if (flags) - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); if (response->s.Flags) - FIXME("Unhandled response flags %#x.\n", response->s.Flags); + FIXME("Unhandled response flags %#lx.\n", response->s.Flags); if (cache_policy) WARN("Ignoring cache_policy.\n"); if (log_data) @@ -563,7 +563,7 @@ ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION version, HTTP_SERVER_SESSIO { struct server_session *session; - TRACE("version %u.%u, id %p, reserved %u.\n", version.HttpApiMajorVersion, + TRACE("version %u.%u, id %p, reserved %lu.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved); if (!id) @@ -613,7 +613,7 @@ ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROU struct server_session *session; struct url_group *group; - TRACE("session_id %s, group_id %p, reserved %#x.\n", + TRACE("session_id %s, group_id %p, reserved %#lx.\n", wine_dbgstr_longlong(session_id), group_id, reserved); if (!(session = get_server_session(session_id))) @@ -655,7 +655,7 @@ ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY { struct url_group *group = get_url_group(id); - TRACE("id %s, property %u, value %p, length %u.\n", + TRACE("id %s, property %u, value %p, length %lu.\n", wine_dbgstr_longlong(id), property, value, length); switch (property) @@ -687,7 +687,7 @@ ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, { struct url_group *group = get_url_group(id); - TRACE("id %s, url %s, context %s, reserved %#x.\n", wine_dbgstr_longlong(id), + TRACE("id %s, url %s, context %s, reserved %#lx.\n", wine_dbgstr_longlong(id), debugstr_w(url), wine_dbgstr_longlong(context), reserved); if (group->url) @@ -713,13 +713,13 @@ ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, U { struct url_group *group = get_url_group(id); - TRACE("id %s, url %s, flags %#x.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags); + TRACE("id %s, url %s, flags %#lx.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags); if (!group->url) return ERROR_FILE_NOT_FOUND; if (flags) - FIXME("Ignoring flags %#x.\n", flags); + FIXME("Ignoring flags %#lx.\n", flags); heap_free(group->url); group->url = NULL; @@ -740,14 +740,14 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, UNICODE_STRING string; IO_STATUS_BLOCK iosb; - TRACE("version %u.%u, name %s, sa %p, flags %#x, handle %p.\n", + TRACE("version %u.%u, name %s, sa %p, flags %#lx, handle %p.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, debugstr_w(name), sa, flags, handle); if (name) FIXME("Unhandled name %s.\n", debugstr_w(name)); if (flags) - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; @@ -775,7 +775,7 @@ ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2) { - FIXME("queue %p, property %u, value %p, length %u, reserved1 %#x, reserved2 %p, stub!\n", + FIXME("queue %p, property %u, value %p, length %lu, reserved1 %#lx, reserved2 %p, stub!\n", queue, property, value, length, reserved1, reserved2); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -786,7 +786,7 @@ ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY prop ULONG WINAPI HttpSetServerSessionProperty(HTTP_SERVER_SESSION_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length) { - TRACE("id %s, property %u, value %p, length %u.\n", + TRACE("id %s, property %u, value %p, length %lu.\n", wine_dbgstr_longlong(id), property, value, length); switch (property)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/http.sys/Makefile.in | 1 - dlls/http.sys/http.c | 16 ++++++++-------- dlls/http.sys/request.h | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/http.sys/Makefile.in b/dlls/http.sys/Makefile.in index b8740120e84..b79f11cf930 100644 --- a/dlls/http.sys/Makefile.in +++ b/dlls/http.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = http.sys IMPORTS = ntoskrnl ws2_32 diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index e655edfeea2..523c70ee12c 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -510,10 +510,10 @@ static void receive_data(struct connection *conn) ioctlsocket(conn->socket, FIONREAD, &available); if (available) { - TRACE("%u more bytes of data available, trying with larger buffer.\n", available); + TRACE("%lu more bytes of data available, trying with larger buffer.\n", available); if (!(conn->buffer = heap_realloc(conn->buffer, conn->len + available))) { - ERR("Failed to allocate %u bytes of memory.\n", conn->len + available); + ERR("Failed to allocate %lu bytes of memory.\n", conn->len + available); close_connection(conn); return; } @@ -730,7 +730,7 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) struct connection *conn; NTSTATUS ret; - TRACE("addr %s, id %s, flags %#x, bits %u.\n", wine_dbgstr_longlong(params->addr), + TRACE("addr %s, id %s, flags %#lx, bits %lu.\n", wine_dbgstr_longlong(params->addr), wine_dbgstr_longlong(params->id), params->flags, params->bits); EnterCriticalSection(&http_cs); @@ -821,13 +821,13 @@ static NTSTATUS http_receive_body(struct request_queue *queue, IRP *irp) struct connection *conn; NTSTATUS ret; - TRACE("id %s, bits %u.\n", wine_dbgstr_longlong(params->id), params->bits); + TRACE("id %s, bits %lu.\n", wine_dbgstr_longlong(params->id), params->bits); EnterCriticalSection(&http_cs); if ((conn = get_connection(params->id))) { - TRACE("%u bits remaining.\n", conn->content_len); + TRACE("%lu bits remaining.\n", conn->content_len); if (conn->content_len) { @@ -875,7 +875,7 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) ret = http_receive_body(queue, irp); break; default: - FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); + FIXME("Unhandled ioctl %#lx.\n", stack->Parameters.DeviceIoControl.IoControlCode); ret = STATUS_NOT_IMPLEMENTED; } @@ -987,12 +987,12 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) RtlInitUnicodeString(&string, L"\\Device\\Http"); attr.ObjectName = &string; if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) - ERR("Failed to create \\Device\\Http directory, status %#x.\n", ret); + ERR("Failed to create \\Device\\Http directory, status %#lx.\n", ret); RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) { - ERR("Failed to create request queue device, status %#x.\n", ret); + ERR("Failed to create request queue device, status %#lx.\n", ret); NtClose(directory_obj); return ret; } diff --git a/dlls/http.sys/request.h b/dlls/http.sys/request.h index a1b77b67dc5..f044db3bb2c 100644 --- a/dlls/http.sys/request.h +++ b/dlls/http.sys/request.h @@ -167,7 +167,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) irp_size += unk_headers_count * sizeof(struct http_unknown_header); - TRACE("Need %u bytes, have %u.\n", irp_size, output_len); + TRACE("Need %lu bytes, have %lu.\n", irp_size, output_len); irp->IoStatus.Information = irp_size; memset(irp->AssociatedIrp.SystemBuffer, 0, output_len);
participants (5)
-
Andrew Eikum -
Eric Pouech -
Esme Povirk (she/they) -
Huw Davies -
Nikolay Sivov