[PATCH 01/21] dlls/wiaservc: enable compilation with long types
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wiaservc/Makefile.in | 1 - dlls/wiaservc/service.c | 6 +++--- dlls/wiaservc/wiadevmgr.c | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wiaservc/Makefile.in b/dlls/wiaservc/Makefile.in index 9d71d10423e..c2ba299c4e3 100644 --- a/dlls/wiaservc/Makefile.in +++ b/dlls/wiaservc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wiaservc.dll IMPORTS = uuid ole32 advapi32 diff --git a/dlls/wiaservc/service.c b/dlls/wiaservc/service.c index 524181f72a0..3d2ba148ea1 100644 --- a/dlls/wiaservc/service.c +++ b/dlls/wiaservc/service.c @@ -69,7 +69,7 @@ ServiceHandler(DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context) SetEvent(stop_event); break; default: - FIXME("ignoring handle service ctrl %x\n", ctrl); + FIXME("ignoring handle service ctrl %lx\n", ctrl); UpdateStatus(status.dwCurrentState, NO_ERROR, 0); break; } @@ -107,7 +107,7 @@ StartCount(void) VOID WINAPI ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) { - TRACE("(%d, %p)\n", dwArgc, lpszArgv); + TRACE("(%ld, %p)\n", dwArgc, lpszArgv); stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); if (!stop_event) { @@ -117,7 +117,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) status_handle = RegisterServiceCtrlHandlerExW(L"stisvc", ServiceHandler, NULL); if (!status_handle) { - ERR("failed to register handler: %u\n", GetLastError()); + ERR("failed to register handler: %lu\n", GetLastError()); return; } diff --git a/dlls/wiaservc/wiadevmgr.c b/dlls/wiaservc/wiadevmgr.c index 58720ef361a..e0156b7f5a2 100644 --- a/dlls/wiaservc/wiadevmgr.c +++ b/dlls/wiaservc/wiadevmgr.c @@ -67,7 +67,7 @@ static ULONG WINAPI enumwiadevinfo_AddRef(IEnumWIA_DEV_INFO *iface) { enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -76,7 +76,7 @@ static ULONG WINAPI enumwiadevinfo_Release(IEnumWIA_DEV_INFO *iface) enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -87,7 +87,7 @@ static HRESULT WINAPI enumwiadevinfo_Next(IEnumWIA_DEV_INFO *iface, ULONG count, { enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); - FIXME("(%p, %d, %p, %p): stub\n", This, count, elem, fetched); + FIXME("(%p, %ld, %p, %p): stub\n", This, count, elem, fetched); *fetched = 0; return E_NOTIMPL; @@ -97,7 +97,7 @@ static HRESULT WINAPI enumwiadevinfo_Skip(IEnumWIA_DEV_INFO *iface, ULONG count) { enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); - FIXME("(%p, %u): stub\n", This, count); + FIXME("(%p, %lu): stub\n", This, count); return E_NOTIMPL; } @@ -182,7 +182,7 @@ static HRESULT WINAPI wiadevmgr_EnumDeviceInfo(IWiaDevMgr *iface, LONG flag, IEn wiadevmgr *This = impl_from_IWiaDevMgr(iface); enumwiadevinfo *enuminfo; - TRACE("(%p)->(%x, %p)\n", This, flag, ret); + TRACE("(%p)->(%lx, %p)\n", This, flag, ret); *ret = NULL; @@ -208,7 +208,7 @@ static HRESULT WINAPI wiadevmgr_SelectDeviceDlg(IWiaDevMgr *iface, HWND hwndPare LONG lFlags, BSTR *pbstrDeviceID, IWiaItem **ppItemRoot) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, %p, %d, 0x%x, %p, %p): stub\n", This, hwndParent, lDeviceType, lFlags, pbstrDeviceID, ppItemRoot); + FIXME("(%p, %p, %ld, 0x%lx, %p, %p): stub\n", This, hwndParent, lDeviceType, lFlags, pbstrDeviceID, ppItemRoot); return E_NOTIMPL; } @@ -216,7 +216,7 @@ static HRESULT WINAPI wiadevmgr_SelectDeviceDlgID(IWiaDevMgr *iface, HWND hwndPa LONG lFlags, BSTR *pbstrDeviceID) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, %p, %d, 0x%x, %p): stub\n", This, hwndParent, lDeviceType, lFlags, pbstrDeviceID); + FIXME("(%p, %p, %ld, 0x%lx, %p): stub\n", This, hwndParent, lDeviceType, lFlags, pbstrDeviceID); return E_NOTIMPL; } @@ -225,7 +225,7 @@ static HRESULT WINAPI wiadevmgr_GetImageDlg(IWiaDevMgr *iface, HWND hwndParent, BSTR bstrFilename, GUID *pguidFormat) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, %p, %d, 0x%x, %d, %p, %s, %s): stub\n", This, hwndParent, lDeviceType, lFlags, + FIXME("(%p, %p, %ld, 0x%lx, %ld, %p, %s, %s): stub\n", This, hwndParent, lDeviceType, lFlags, lIntent, pItemRoot, debugstr_w(bstrFilename), debugstr_guid(pguidFormat)); return E_NOTIMPL; } @@ -235,7 +235,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackProgram(IWiaDevMgr *iface, BSTR bstrName, BSTR bstrDescription, BSTR bstrIcon) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, 0x%x, %s, %s, %s, %s, %s, %s): stub\n", This, lFlags, debugstr_w(bstrDeviceID), + FIXME("(%p, 0x%lx, %s, %s, %s, %s, %s, %s): stub\n", This, lFlags, debugstr_w(bstrDeviceID), debugstr_guid(pEventGUID), debugstr_w(bstrCommandline), debugstr_w(bstrName), debugstr_w(bstrDescription), debugstr_w(bstrIcon)); return E_NOTIMPL; @@ -246,7 +246,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackInterface(IWiaDevMgr *iface IUnknown **pEventObject) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, 0x%x, %s, %s, %p, %p): stub\n", This, lFlags, debugstr_w(bstrDeviceID), + FIXME("(%p, 0x%lx, %s, %s, %p, %p): stub\n", This, lFlags, debugstr_w(bstrDeviceID), debugstr_guid(pEventGUID), pIWiaEventCallback, pEventObject); return E_NOTIMPL; } @@ -256,7 +256,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackCLSID(IWiaDevMgr *iface, LO BSTR bstrDescription, BSTR bstrIcon) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, 0x%x, %s, %s, %s, %s, %s, %s): stub\n", This, lFlags, debugstr_w(bstrDeviceID), + FIXME("(%p, 0x%lx, %s, %s, %s, %s, %s, %s): stub\n", This, lFlags, debugstr_w(bstrDeviceID), debugstr_guid(pEventGUID), debugstr_guid(pClsID), debugstr_w(bstrName), debugstr_w(bstrDescription), debugstr_w(bstrIcon)); return E_NOTIMPL; @@ -265,7 +265,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackCLSID(IWiaDevMgr *iface, LO static HRESULT WINAPI wiadevmgr_AddDeviceDlg(IWiaDevMgr *iface, HWND hwndParent, LONG lFlags) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, %p, 0x%x): stub\n", This, hwndParent, lFlags); + FIXME("(%p, %p, 0x%lx): stub\n", This, hwndParent, lFlags); return E_NOTIMPL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wimgapi/Makefile.in | 1 - dlls/wimgapi/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wimgapi/Makefile.in b/dlls/wimgapi/Makefile.in index 75b83cf31ee..7b4216e54cc 100644 --- a/dlls/wimgapi/Makefile.in +++ b/dlls/wimgapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wimgapi.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/wimgapi/main.c b/dlls/wimgapi/main.c index 87496e92f96..7c39b01a5cc 100644 --- a/dlls/wimgapi/main.c +++ b/dlls/wimgapi/main.c @@ -43,7 +43,7 @@ BOOL WINAPI WIMGetMountedImages(PWIM_MOUNT_LIST list, DWORD *length) HANDLE WINAPI WIMCreateFile(WCHAR *path, DWORD access, DWORD creation, DWORD flags, DWORD compression, DWORD *result) { - FIXME("(%s %d %d %d %d %p) stub\n", debugstr_w(path), access, creation, flags, compression, result); + FIXME("(%s %ld %ld %ld %ld %p) stub\n", debugstr_w(path), access, creation, flags, compression, result); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return NULL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/win87em.dll16/Makefile.in | 1 - dlls/win87em.dll16/win87em.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/win87em.dll16/Makefile.in b/dlls/win87em.dll16/Makefile.in index b4a9ebea56b..b40ceb0c68d 100644 --- a/dlls/win87em.dll16/Makefile.in +++ b/dlls/win87em.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = win87em.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/win87em.dll16/win87em.c b/dlls/win87em.dll16/win87em.c index c8d454516f1..9a0029b98e9 100644 --- a/dlls/win87em.dll16/win87em.c +++ b/dlls/win87em.dll16/win87em.c @@ -101,7 +101,7 @@ static void WIN87_Init( CONTEXT *context ) */ void WINAPI _fpMath( CONTEXT *context ) { - TRACE("(cs:eip=%04x:%04x es=%04x bx=%04x ax=%04x dx=%04x)\n", + TRACE("(cs:eip=%04lx:%04lx es=%04lx bx=%04lx ax=%04lx dx=%04lx)\n", context->SegCs, context->Eip, context->SegEs, context->Ebx, context->Eax, context->Edx ); @@ -174,7 +174,7 @@ void WINAPI _fpMath( CONTEXT *context ) */ /* FIXME: could someone who really understands asm() fix this please? --AJ */ /* __asm__("fistp %0;wait" : "=m" (dw) : : "memory"); */ - TRACE("On top of stack was %d\n",dw); + TRACE("On top of stack was %ld\n",dw); context->Eax = (context->Eax & ~0xffff) | LOWORD(dw); context->Edx = (context->Edx & ~0xffff) | HIWORD(dw); }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windowscodecs/Makefile.in | 1 dlls/windowscodecs/bitmap.c | 12 +++-- dlls/windowscodecs/bmpdecode.c | 10 ++-- dlls/windowscodecs/bmpencode.c | 8 ++- dlls/windowscodecs/clipper.c | 4 +- dlls/windowscodecs/clsfactory.c | 6 +-- dlls/windowscodecs/colorcontext.c | 4 +- dlls/windowscodecs/colortransform.c | 4 +- dlls/windowscodecs/converter.c | 4 +- dlls/windowscodecs/ddsformat.c | 16 +++---- dlls/windowscodecs/decoder.c | 10 ++-- dlls/windowscodecs/encoder.c | 12 +++-- dlls/windowscodecs/fliprotate.c | 4 +- dlls/windowscodecs/gifformat.c | 16 +++---- dlls/windowscodecs/icoformat.c | 14 +++--- dlls/windowscodecs/imgfactory.c | 22 +++++----- dlls/windowscodecs/info.c | 30 +++++++------ dlls/windowscodecs/libjpeg.c | 4 +- dlls/windowscodecs/libtiff.c | 2 - dlls/windowscodecs/metadatahandler.c | 16 +++---- dlls/windowscodecs/metadataquery.c | 24 +++++----- dlls/windowscodecs/palette.c | 4 +- dlls/windowscodecs/propertybag.c | 12 +++-- dlls/windowscodecs/scaler.c | 4 +- dlls/windowscodecs/stream.c | 76 +++++++++++++++++---------------- dlls/windowscodecs/tgaformat.c | 12 +++-- dlls/windowscodecs/wincodecs_common.c | 2 - dlls/wmphoto/Makefile.in | 1 dlls/wmphoto/main.c | 2 - 29 files changed, 167 insertions(+), 169 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index cd4c428c54f..068730971e8 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windowscodecs.dll IMPORTLIB = windowscodecs IMPORTS = $(TIFF_PE_LIBS) $(JPEG_PE_LIBS) $(PNG_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32 diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index bd09c74941b..28acbeef298 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -146,7 +146,7 @@ static ULONG WINAPI BitmapLockImpl_AddRef(IWICBitmapLock *iface) BitmapLockImpl *This = impl_from_IWICBitmapLock(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -156,7 +156,7 @@ static ULONG WINAPI BitmapLockImpl_Release(IWICBitmapLock *iface) BitmapLockImpl *This = impl_from_IWICBitmapLock(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -267,7 +267,7 @@ static ULONG WINAPI BitmapImpl_AddRef(IWICBitmap *iface) BitmapImpl *This = impl_from_IWICBitmap(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -277,7 +277,7 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) BitmapImpl *This = impl_from_IWICBitmap(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -369,7 +369,7 @@ static HRESULT WINAPI BitmapImpl_Lock(IWICBitmap *iface, const WICRect *prcLock, BitmapLockImpl *result; WICRect rc; - TRACE("(%p,%s,%x,%p)\n", iface, debug_wic_rect(prcLock), flags, ppILock); + TRACE("(%p,%s,%lx,%p)\n", iface, debug_wic_rect(prcLock), flags, ppILock); if (!(flags & (WICBitmapLockRead|WICBitmapLockWrite)) || !ppILock) return E_INVALIDARG; @@ -596,7 +596,7 @@ static HRESULT WINAPI IMILBitmapImpl_unknown1(IMILBitmap *iface, void **ppv) static HRESULT WINAPI IMILBitmapImpl_Lock(IMILBitmap *iface, const WICRect *rc, DWORD flags, IWICBitmapLock **lock) { BitmapImpl *This = impl_from_IMILBitmap(iface); - TRACE("(%p,%p,%08x,%p)\n", iface, rc, flags, lock); + TRACE("(%p,%p,%08lx,%p)\n", iface, rc, flags, lock); return IWICBitmap_Lock(&This->IWICBitmap_iface, rc, flags, lock); } diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 888f41a6138..b7ea464d125 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -858,7 +858,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) } else /* struct is compatible with BITMAPINFOHEADER */ { - TRACE("bitmap header=%i compression=%i depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount); + TRACE("bitmap header=%li compression=%li depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount); switch(This->bih.bV5Compression) { case BI_RGB: @@ -932,7 +932,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) { This->read_data_func = BmpFrameDecode_ReadUncompressed; This->pixelformat = &GUID_WICPixelFormatUndefined; - FIXME("unsupported bitfields type depth=%i red=%x green=%x blue=%x alpha=%x\n", + FIXME("unsupported bitfields type depth=%i red=%lx green=%lx blue=%lx alpha=%lx\n", This->bih.bV5BitCount, This->bih.bV5RedMask, This->bih.bV5GreenMask, This->bih.bV5BlueMask, This->bih.bV5AlphaMask); } break; @@ -941,7 +941,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) This->bitsperpixel = 0; This->read_data_func = BmpFrameDecode_ReadUnsupported; This->pixelformat = &GUID_WICPixelFormatUndefined; - FIXME("unsupported bitmap type header=%i compression=%i depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount); + FIXME("unsupported bitmap type header=%li compression=%li depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount); break; } } @@ -996,7 +996,7 @@ static ULONG WINAPI BmpDecoder_AddRef(IWICBitmapDecoder *iface) BmpDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -1006,7 +1006,7 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface) BmpDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index e87d66a2e63..cd981ee9d3b 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -110,7 +110,7 @@ static ULONG WINAPI BmpFrameEncode_AddRef(IWICBitmapFrameEncode *iface) BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -120,7 +120,7 @@ static ULONG WINAPI BmpFrameEncode_Release(IWICBitmapFrameEncode *iface) BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -466,7 +466,7 @@ static ULONG WINAPI BmpEncoder_AddRef(IWICBitmapEncoder *iface) BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -476,7 +476,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c index 02e0d967f52..c89aee3af36 100644 --- a/dlls/windowscodecs/clipper.c +++ b/dlls/windowscodecs/clipper.c @@ -72,7 +72,7 @@ static ULONG WINAPI BitmapClipper_AddRef(IWICBitmapClipper *iface) BitmapClipper *This = impl_from_IWICBitmapClipper(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -82,7 +82,7 @@ static ULONG WINAPI BitmapClipper_Release(IWICBitmapClipper *iface) BitmapClipper *This = impl_from_IWICBitmapClipper(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index c122f8c14bc..d69e5dc4a6d 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -112,7 +112,7 @@ static ULONG WINAPI ClassFactoryImpl_AddRef(IClassFactory *iface) ClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -122,7 +122,7 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface) ClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -203,7 +203,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) else ret = WIC_DllGetClassObject(rclsid, iid, ppv); - TRACE("<-- %08X\n", ret); + TRACE("<-- %08lX\n", ret); return ret; } diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 239fd0fb2c3..72e879fca84 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -72,7 +72,7 @@ static ULONG WINAPI ColorContext_AddRef(IWICColorContext *iface) ColorContext *This = impl_from_IWICColorContext(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -82,7 +82,7 @@ static ULONG WINAPI ColorContext_Release(IWICColorContext *iface) ColorContext *This = impl_from_IWICColorContext(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { diff --git a/dlls/windowscodecs/colortransform.c b/dlls/windowscodecs/colortransform.c index e8065950bc6..cc7f1258d14 100644 --- a/dlls/windowscodecs/colortransform.c +++ b/dlls/windowscodecs/colortransform.c @@ -70,7 +70,7 @@ static ULONG WINAPI ColorTransform_AddRef(IWICColorTransform *iface) ColorTransform *This = impl_from_IWICColorTransform(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -80,7 +80,7 @@ static ULONG WINAPI ColorTransform_Release(IWICColorTransform *iface) ColorTransform *This = impl_from_IWICColorTransform(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index c321627885b..a401d1cdc4a 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1559,7 +1559,7 @@ static ULONG WINAPI FormatConverter_AddRef(IWICFormatConverter *iface) FormatConverter *This = impl_from_IWICFormatConverter(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -1569,7 +1569,7 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface) FormatConverter *This = impl_from_IWICFormatConverter(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 5a947a898b9..62cd0dc3f7c 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -780,7 +780,7 @@ static ULONG WINAPI DdsFrameDecode_AddRef(IWICBitmapFrameDecode *iface) DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -790,7 +790,7 @@ static ULONG WINAPI DdsFrameDecode_Release(IWICBitmapFrameDecode *iface) DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { if (This->pixel_data != This->block_data) HeapFree(GetProcessHeap(), 0, This->pixel_data); @@ -1087,7 +1087,7 @@ static ULONG WINAPI DdsDecoder_AddRef(IWICBitmapDecoder *iface) DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -1097,7 +1097,7 @@ static ULONG WINAPI DdsDecoder_Release(IWICBitmapDecoder *iface) DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -1550,7 +1550,7 @@ static ULONG WINAPI DdsFrameEncode_AddRef(IWICBitmapFrameEncode *iface) DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -1560,7 +1560,7 @@ static ULONG WINAPI DdsFrameEncode_Release(IWICBitmapFrameEncode *iface) DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -1950,7 +1950,7 @@ static ULONG WINAPI DdsEncoder_AddRef(IWICBitmapEncoder *iface) DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -1960,7 +1960,7 @@ static ULONG WINAPI DdsEncoder_Release(IWICBitmapEncoder *iface) DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { This->lock.DebugInfo->Spare[0] = 0; diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index 2cd5a2d148f..769dc779f13 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -74,7 +74,7 @@ static ULONG WINAPI CommonDecoder_AddRef(IWICBitmapDecoder *iface) CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -84,7 +84,7 @@ static ULONG WINAPI CommonDecoder_Release(IWICBitmapDecoder *iface) CommonDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -296,7 +296,7 @@ static ULONG WINAPI CommonDecoderFrame_AddRef(IWICBitmapFrameDecode *iface) CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -306,7 +306,7 @@ static ULONG WINAPI CommonDecoderFrame_Release(IWICBitmapFrameDecode *iface) CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -762,7 +762,7 @@ static HRESULT WINAPI CommonDecoder_GetFrame(IWICBitmapDecoder *iface, if (SUCCEEDED(hr)) { - TRACE("-> %ux%u, %u-bit pixelformat=%s res=%f,%f colors=%u contexts=%u\n", + TRACE("-> %ux%u, %u-bit pixelformat=%s res=%f,%f colors=%lu contexts=%lu\n", result->decoder_frame.width, result->decoder_frame.height, result->decoder_frame.bpp, wine_dbgstr_guid(&result->decoder_frame.pixel_format), result->decoder_frame.dpix, result->decoder_frame.dpiy, diff --git a/dlls/windowscodecs/encoder.c b/dlls/windowscodecs/encoder.c index a213e7d14d0..238ab2ae630 100644 --- a/dlls/windowscodecs/encoder.c +++ b/dlls/windowscodecs/encoder.c @@ -116,7 +116,7 @@ static ULONG WINAPI CommonEncoderFrame_AddRef(IWICBitmapFrameEncode *iface) CommonEncoderFrame *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -126,7 +126,7 @@ static ULONG WINAPI CommonEncoderFrame_Release(IWICBitmapFrameEncode *iface) CommonEncoderFrame *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -177,7 +177,7 @@ static HRESULT WINAPI CommonEncoderFrame_Initialize(IWICBitmapFrameEncode *iface options.filter = V_UI1(val); if (options.filter > WICPngFilterAdaptive) { - WARN("Unrecognized filter option value %u.\n", options.filter); + WARN("Unrecognized filter option value %lu.\n", options.filter); options.filter = WICPngFilterUnspecified; } break; @@ -310,7 +310,7 @@ static HRESULT WINAPI CommonEncoderFrame_SetPixelFormat(IWICBitmapFrameEncode *i if (SUCCEEDED(hr)) { - TRACE("<-- %s bpp=%i indexed=%i\n", wine_dbgstr_guid(&pixel_format), bpp, indexed); + TRACE("<-- %s bpp=%li indexed=%i\n", wine_dbgstr_guid(&pixel_format), bpp, indexed); *pPixelFormat = pixel_format; This->encoder_frame.pixel_format = pixel_format; This->encoder_frame.bpp = bpp; @@ -528,7 +528,7 @@ static ULONG WINAPI CommonEncoder_AddRef(IWICBitmapEncoder *iface) CommonEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -538,7 +538,7 @@ static ULONG WINAPI CommonEncoder_Release(IWICBitmapEncoder *iface) CommonEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index 842c342af23..55114a981e7 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -74,7 +74,7 @@ static ULONG WINAPI FlipRotator_AddRef(IWICBitmapFlipRotator *iface) FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -84,7 +84,7 @@ static ULONG WINAPI FlipRotator_Release(IWICBitmapFlipRotator *iface) FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index d84d16f277b..4bd0772810d 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -646,7 +646,7 @@ static ULONG WINAPI GifFrameDecode_AddRef(IWICBitmapFrameDecode *iface) GifFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -656,7 +656,7 @@ static ULONG WINAPI GifFrameDecode_Release(IWICBitmapFrameDecode *iface) GifFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -1045,7 +1045,7 @@ static ULONG WINAPI GifDecoder_AddRef(IWICBitmapDecoder *iface) GifDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -1055,7 +1055,7 @@ static ULONG WINAPI GifDecoder_Release(IWICBitmapDecoder *iface) GifDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -1526,7 +1526,7 @@ static ULONG WINAPI GifFrameEncode_AddRef(IWICBitmapFrameEncode *iface) GifFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("%p -> %u\n", iface, ref); + TRACE("%p -> %lu\n", iface, ref); return ref; } @@ -1535,7 +1535,7 @@ static ULONG WINAPI GifFrameEncode_Release(IWICBitmapFrameEncode *iface) GifFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p -> %u\n", iface, ref); + TRACE("%p -> %lu\n", iface, ref); if (!ref) { @@ -2171,7 +2171,7 @@ static ULONG WINAPI GifEncoder_AddRef(IWICBitmapEncoder *iface) GifEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("%p -> %u\n", iface, ref); + TRACE("%p -> %lu\n", iface, ref); return ref; } @@ -2180,7 +2180,7 @@ static ULONG WINAPI GifEncoder_Release(IWICBitmapEncoder *iface) GifEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p -> %u\n", iface, ref); + TRACE("%p -> %lu\n", iface, ref); if (!ref) { diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 391880be4bc..6127a73f392 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -109,7 +109,7 @@ static ULONG WINAPI IcoFrameDecode_AddRef(IWICBitmapFrameDecode *iface) IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -119,7 +119,7 @@ static ULONG WINAPI IcoFrameDecode_Release(IWICBitmapFrameDecode *iface) IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -463,7 +463,7 @@ static ULONG WINAPI IcoDecoder_AddRef(IWICBitmapDecoder *iface) IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -473,7 +473,7 @@ static ULONG WINAPI IcoDecoder_Release(IWICBitmapDecoder *iface) IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -545,7 +545,7 @@ static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p hr = IStream_Stat(pIStream, &statstg, STATFLAG_NONAME); if (FAILED(hr)) { - WARN("Stat() failed, hr %#x.\n", hr); + WARN("Stat() failed, hr %#lx.\n", hr); goto end; } @@ -714,7 +714,7 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, hr = ReadIcoPng((IStream*)substream, result); break; default: - FIXME("Unrecognized ICO frame magic: %x\n", magic); + FIXME("Unrecognized ICO frame magic: %lx\n", magic); hr = E_FAIL; break; } @@ -733,7 +733,7 @@ fail: HeapFree(GetProcessHeap(), 0, result); if (substream) IWICStream_Release(substream); if (SUCCEEDED(hr)) hr = E_FAIL; - TRACE("<-- %x\n", hr); + TRACE("<-- %lx\n", hr); return hr; } diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 7e10fc37875..c7e101e3d62 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -83,7 +83,7 @@ static ULONG WINAPI ImagingFactory_AddRef(IWICImagingFactory2 *iface) ImagingFactory *This = impl_from_IWICImagingFactory2(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -93,7 +93,7 @@ static ULONG WINAPI ImagingFactory_Release(IWICImagingFactory2 *iface) ImagingFactory *This = impl_from_IWICImagingFactory2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -109,7 +109,7 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename( IWICStream *stream; HRESULT hr; - TRACE("(%p,%s,%s,%u,%u,%p)\n", iface, debugstr_w(wzFilename), + TRACE("(%p,%s,%s,%lu,%u,%p)\n", iface, debugstr_w(wzFilename), debugstr_guid(pguidVendor), dwDesiredAccess, metadataOptions, ppIDecoder); hr = StreamImpl_Create(&stream); @@ -230,13 +230,13 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( BYTE data[4]; ULONG bytesread; - WARN("failed to load from a stream %#x\n", res); + WARN("failed to load from a stream %#lx\n", res); seek.QuadPart = 0; if (IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL) == S_OK) { if (IStream_Read(pIStream, data, 4, &bytesread) == S_OK) - WARN("first %i bytes of stream=%x %x %x %x\n", bytesread, data[0], data[1], data[2], data[3]); + WARN("first %li bytes of stream=%x %x %x %x\n", bytesread, data[0], data[1], data[2], data[3]); } } *ppIDecoder = NULL; @@ -251,7 +251,7 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFileHandle( IWICStream *stream; HRESULT hr; - TRACE("(%p,%lx,%s,%u,%p)\n", iface, hFile, debugstr_guid(pguidVendor), + TRACE("(%p,%Ix,%s,%u,%p)\n", iface, hFile, debugstr_guid(pguidVendor), metadataOptions, ppIDecoder); hr = StreamImpl_Create(&stream); @@ -709,7 +709,7 @@ static BOOL get_16bpp_format(HBITMAP hbm, WICPixelFormatGUID *format) } else { - FIXME("unrecognized bitfields %x,%x,%x\n", bmh.bV4RedMask, + FIXME("unrecognized bitfields %lx,%lx,%lx\n", bmh.bV4RedMask, bmh.bV4GreenMask, bmh.bV4BlueMask); ret = FALSE; } @@ -981,7 +981,7 @@ failed: static HRESULT WINAPI ImagingFactory_CreateComponentEnumerator(IWICImagingFactory2 *iface, DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) { - TRACE("(%p,%u,%u,%p)\n", iface, componentTypes, options, ppIEnumUnknown); + TRACE("(%p,%lu,%lu,%p)\n", iface, componentTypes, options, ppIEnumUnknown); return CreateComponentEnumerator(componentTypes, options, ppIEnumUnknown); } @@ -1249,7 +1249,7 @@ static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromReader(IWICComponent static HRESULT WINAPI ComponentFactory_CreateMetadataReader(IWICComponentFactory *iface, REFGUID format, const GUID *vendor, DWORD options, IStream *stream, IWICMetadataReader **reader) { - FIXME("%p,%s,%s,%x,%p,%p: stub\n", iface, debugstr_guid(format), debugstr_guid(vendor), + FIXME("%p,%s,%s,%lx,%p,%p: stub\n", iface, debugstr_guid(format), debugstr_guid(vendor), options, stream, reader); return E_NOTIMPL; } @@ -1267,7 +1267,7 @@ static HRESULT WINAPI ComponentFactory_CreateMetadataReaderFromContainer(IWICCom BOOL matches; LARGE_INTEGER zero; - TRACE("%p,%s,%s,%x,%p,%p\n", iface, debugstr_guid(format), debugstr_guid(vendor), + TRACE("%p,%s,%s,%lx,%p,%p\n", iface, debugstr_guid(format), debugstr_guid(vendor), options, stream, reader); if (!format || !stream || !reader) @@ -1385,7 +1385,7 @@ start: static HRESULT WINAPI ComponentFactory_CreateMetadataWriter(IWICComponentFactory *iface, REFGUID format, const GUID *vendor, DWORD options, IWICMetadataWriter **writer) { - FIXME("%p,%s,%s,%x,%p: stub\n", iface, debugstr_guid(format), debugstr_guid(vendor), options, writer); + FIXME("%p,%s,%s,%lx,%p: stub\n", iface, debugstr_guid(format), debugstr_guid(vendor), options, writer); return E_NOTIMPL; } diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 7a9ecf52b5a..3b674a3e2f1 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -232,7 +232,7 @@ static ULONG WINAPI BitmapDecoderInfo_AddRef(IWICBitmapDecoderInfo *iface) BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); ULONG ref = InterlockedIncrement(&This->base.ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -242,7 +242,7 @@ static ULONG WINAPI BitmapDecoderInfo_Release(IWICBitmapDecoderInfo *iface) BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); ULONG ref = InterlockedDecrement(&This->base.ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -716,7 +716,7 @@ static ULONG WINAPI BitmapEncoderInfo_AddRef(IWICBitmapEncoderInfo *iface) BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); ULONG ref = InterlockedIncrement(&This->base.ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -726,7 +726,7 @@ static ULONG WINAPI BitmapEncoderInfo_Release(IWICBitmapEncoderInfo *iface) BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); ULONG ref = InterlockedDecrement(&This->base.ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -1006,7 +1006,7 @@ static ULONG WINAPI FormatConverterInfo_AddRef(IWICFormatConverterInfo *iface) FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); ULONG ref = InterlockedIncrement(&This->base.ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -1016,7 +1016,7 @@ static ULONG WINAPI FormatConverterInfo_Release(IWICFormatConverterInfo *iface) FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); ULONG ref = InterlockedDecrement(&This->base.ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -1220,7 +1220,7 @@ static ULONG WINAPI PixelFormatInfo_AddRef(IWICPixelFormatInfo2 *iface) PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); ULONG ref = InterlockedIncrement(&This->base.ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -1230,7 +1230,7 @@ static ULONG WINAPI PixelFormatInfo_Release(IWICPixelFormatInfo2 *iface) PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); ULONG ref = InterlockedDecrement(&This->base.ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -1531,7 +1531,7 @@ static ULONG WINAPI MetadataReaderInfo_AddRef(IWICMetadataReaderInfo *iface) MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); ULONG ref = InterlockedIncrement(&This->base.ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -1540,7 +1540,7 @@ static ULONG WINAPI MetadataReaderInfo_Release(IWICMetadataReaderInfo *iface) MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); ULONG ref = InterlockedDecrement(&This->base.ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (!ref) { @@ -2180,7 +2180,7 @@ static ULONG WINAPI ComponentEnum_AddRef(IEnumUnknown *iface) ComponentEnum *This = impl_from_IEnumUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -2191,7 +2191,7 @@ static ULONG WINAPI ComponentEnum_Release(IEnumUnknown *iface) ULONG ref = InterlockedDecrement(&This->ref); ComponentEnumItem *cursor, *cursor2; - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -2217,7 +2217,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, ComponentEnumItem *item; HRESULT hr=S_OK; - TRACE("(%p,%u,%p,%p)\n", iface, celt, rgelt, pceltFetched); + TRACE("(%p,%lu,%p,%p)\n", iface, celt, rgelt, pceltFetched); EnterCriticalSection(&This->lock); while (num_fetched<celt) @@ -2245,7 +2245,7 @@ static HRESULT WINAPI ComponentEnum_Skip(IEnumUnknown *iface, ULONG celt) ULONG i; HRESULT hr=S_OK; - TRACE("(%p,%u)\n", iface, celt); + TRACE("(%p,%lu)\n", iface, celt); EnterCriticalSection(&This->lock); for (i=0; i<celt; i++) @@ -2346,7 +2346,7 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn HRESULT hr=S_OK; CLSID clsid; - if (options) FIXME("ignoring flags %x\n", options); + if (options) FIXME("ignoring flags %lx\n", options); res = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &clsidkey); if (res != ERROR_SUCCESS) diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c index bca7a1f277d..8611269d04b 100644 --- a/dlls/windowscodecs/libjpeg.c +++ b/dlls/windowscodecs/libjpeg.c @@ -413,7 +413,7 @@ static boolean dest_mgr_empty_output_buffer(j_compress_ptr cinfo) if (hr != S_OK || byteswritten == 0) { - ERR("Failed writing data, hr=%x\n", hr); + ERR("Failed writing data, hr=%lx\n", hr); return FALSE; } @@ -434,7 +434,7 @@ static void dest_mgr_term_destination(j_compress_ptr cinfo) sizeof(This->dest_buffer) - This->dest_mgr.free_in_buffer, &byteswritten); if (hr != S_OK || byteswritten == 0) - ERR("Failed writing data, hr=%x\n", hr); + ERR("Failed writing data, hr=%lx\n", hr); } } diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 202eb7cc083..c4676601c2c 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -975,7 +975,7 @@ static HRESULT CDECL tiff_decoder_copy_pixels(struct decoder* iface, UINT frame, if (FAILED(hr)) { - TRACE("<-- 0x%x\n", hr); + TRACE("<-- 0x%lx\n", hr); return hr; } } diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 128514f6a31..b0b682b6d9b 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -107,7 +107,7 @@ static ULONG WINAPI MetadataHandler_AddRef(IWICMetadataWriter *iface) MetadataHandler *This = impl_from_IWICMetadataWriter(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -117,7 +117,7 @@ static ULONG WINAPI MetadataHandler_Release(IWICMetadataWriter *iface) MetadataHandler *This = impl_from_IWICMetadataWriter(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -354,7 +354,7 @@ static HRESULT WINAPI MetadataHandler_LoadEx(IWICPersistStream *iface, MetadataItem *new_items=NULL; DWORD item_count=0; - TRACE("(%p,%p,%s,%x)\n", iface, pIStream, debugstr_guid(pguidPreferredVendor), dwPersistOptions); + TRACE("(%p,%p,%s,%lx)\n", iface, pIStream, debugstr_guid(pguidPreferredVendor), dwPersistOptions); EnterCriticalSection(&This->lock); @@ -376,7 +376,7 @@ static HRESULT WINAPI MetadataHandler_LoadEx(IWICPersistStream *iface, static HRESULT WINAPI MetadataHandler_SaveEx(IWICPersistStream *iface, IStream *pIStream, DWORD dwPersistOptions, BOOL fClearDirty) { - FIXME("(%p,%p,%x,%i): stub\n", iface, pIStream, dwPersistOptions, fClearDirty); + FIXME("(%p,%p,%lx,%i): stub\n", iface, pIStream, dwPersistOptions, fClearDirty); return E_NOTIMPL; } @@ -462,7 +462,7 @@ static ULONG WINAPI MetadataHandlerEnum_AddRef(IWICEnumMetadataItem *iface) MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -472,7 +472,7 @@ static ULONG WINAPI MetadataHandlerEnum_Release(IWICEnumMetadataItem *iface) MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -492,7 +492,7 @@ static HRESULT WINAPI MetadataHandlerEnum_Next(IWICEnumMetadataItem *iface, HRESULT hr=S_FALSE; ULONG i; - TRACE("(%p,%i)\n", iface, celt); + TRACE("(%p,%li)\n", iface, celt); EnterCriticalSection(&This->parent->lock); @@ -986,7 +986,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, } break; default: - FIXME("loading field of type %d, count %u is not implemented\n", type, count); + FIXME("loading field of type %d, count %lu is not implemented\n", type, count); break; } return S_OK; diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index ed80d26d54f..c4df29a2a01 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -74,7 +74,7 @@ static ULONG WINAPI mqr_AddRef(IWICMetadataQueryReader *iface) { QueryReader *This = impl_from_IWICMetadataQueryReader(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", This, ref); + TRACE("(%p) refcount=%lu\n", This, ref); return ref; } @@ -82,7 +82,7 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface) { QueryReader *This = impl_from_IWICMetadataQueryReader(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", This, ref); + TRACE("(%p) refcount=%lu\n", This, ref); if (!ref) { IWICMetadataBlockReader_Release(This->block); @@ -210,7 +210,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc hr = get_token(&next_elem, id, schema, idx); if (hr != S_OK) { - TRACE("get_token error %#x\n", hr); + TRACE("get_token error %#lx\n", hr); return hr; } elem->len = (end - start) + next_elem.len; @@ -286,7 +286,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc hr = get_token(&next_elem, &next_id, &next_schema, &next_idx); if (hr != S_OK) { - TRACE("get_token error %#x\n", hr); + TRACE("get_token error %#lx\n", hr); return hr; } elem->len = (end - start + 1) + next_elem.len; @@ -346,7 +346,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc hr = get_token(&next_elem, &next_id, &next_schema, &next_idx); if (hr != S_OK) { - TRACE("get_token error %#x\n", hr); + TRACE("get_token error %#lx\n", hr); PropVariantClear(id); PropVariantClear(schema); return hr; @@ -491,7 +491,7 @@ static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCW hr = get_token(&elem, &tk_id, &tk_schema, &index); if (hr != S_OK) { - WARN("get_token error %#x\n", hr); + WARN("get_token error %#lx\n", hr); break; } TRACE("parsed %d characters: %s, index %d\n", elem.len, wine_dbgstr_wn(elem.str, elem.len), index); @@ -631,7 +631,7 @@ static ULONG WINAPI string_enumerator_AddRef(IEnumString *iface) struct string_enumerator *this = impl_from_IEnumString(iface); ULONG ref = InterlockedIncrement(&this->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -641,7 +641,7 @@ static ULONG WINAPI string_enumerator_Release(IEnumString *iface) struct string_enumerator *this = impl_from_IEnumString(iface); ULONG ref = InterlockedDecrement(&this->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) free(this); @@ -651,7 +651,7 @@ static ULONG WINAPI string_enumerator_Release(IEnumString *iface) static HRESULT WINAPI string_enumerator_Next(IEnumString *iface, ULONG count, LPOLESTR *strings, ULONG *ret) { - FIXME("iface %p, count %u, strings %p, ret %p stub.\n", iface, count, strings, ret); + FIXME("iface %p, count %lu, strings %p, ret %p stub.\n", iface, count, strings, ret); if (!strings || !ret) return E_INVALIDARG; @@ -669,7 +669,7 @@ static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface) static HRESULT WINAPI string_enumerator_Skip(IEnumString *iface, ULONG count) { - FIXME("iface %p, count %u stub.\n", iface, count); + FIXME("iface %p, count %lu stub.\n", iface, count); return count ? S_FALSE : S_OK; } @@ -789,7 +789,7 @@ static ULONG WINAPI mqw_AddRef(IWICMetadataQueryWriter *iface) QueryWriter *writer = impl_from_IWICMetadataQueryWriter(iface); ULONG ref = InterlockedIncrement(&writer->ref); - TRACE("writer %p, refcount=%u\n", writer, ref); + TRACE("writer %p, refcount=%lu\n", writer, ref); return ref; } @@ -799,7 +799,7 @@ static ULONG WINAPI mqw_Release(IWICMetadataQueryWriter *iface) QueryWriter *writer = impl_from_IWICMetadataQueryWriter(iface); ULONG ref = InterlockedDecrement(&writer->ref); - TRACE("writer %p, refcount=%u.\n", writer, ref); + TRACE("writer %p, refcount=%lu.\n", writer, ref); if (!ref) { diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 051a5944eb2..5d00a291df5 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -74,7 +74,7 @@ static ULONG WINAPI PaletteImpl_AddRef(IWICPalette *iface) PaletteImpl *This = impl_from_IWICPalette(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -84,7 +84,7 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) PaletteImpl *This = impl_from_IWICPalette(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index 71b26309140..5e62a214c33 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -72,7 +72,7 @@ static ULONG WINAPI PropertyBag_AddRef(IPropertyBag2 *iface) PropertyBag *This = impl_from_IPropertyBag2(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -82,7 +82,7 @@ static ULONG WINAPI PropertyBag_Release(IPropertyBag2 *iface) PropertyBag *This = impl_from_IPropertyBag2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -128,7 +128,7 @@ static HRESULT WINAPI PropertyBag_Read(IPropertyBag2 *iface, ULONG cProperties, ULONG i; PropertyBag *This = impl_from_IPropertyBag2(iface); - TRACE("(%p,%u,%p,%p,%p,%p)\n", iface, cProperties, pPropBag, pErrLog, pvarValue, phrError); + TRACE("(%p,%lu,%p,%p,%p,%p)\n", iface, cProperties, pPropBag, pErrLog, pvarValue, phrError); for (i=0; i < cProperties; i++) { @@ -163,7 +163,7 @@ static HRESULT WINAPI PropertyBag_Write(IPropertyBag2 *iface, ULONG cProperties, ULONG i; PropertyBag *This = impl_from_IPropertyBag2(iface); - TRACE("(%p,%u,%p,%p)\n", iface, cProperties, pPropBag, pvarValue); + TRACE("(%p,%lu,%p,%p)\n", iface, cProperties, pPropBag, pvarValue); for (i=0; i < cProperties; i++) { @@ -233,7 +233,7 @@ static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iP ULONG i; PropertyBag *This = impl_from_IPropertyBag2(iface); - TRACE("(%p,%u,%u,%p,%p)\n", iface, iProperty, cProperties, pPropBag, pcProperties); + TRACE("(%p,%lu,%lu,%p,%p)\n", iface, iProperty, cProperties, pPropBag, pcProperties); if (iProperty >= This->prop_count && iProperty > 0) return WINCODEC_ERR_VALUEOUTOFRANGE; @@ -260,7 +260,7 @@ static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iP static HRESULT WINAPI PropertyBag_LoadObject(IPropertyBag2 *iface, LPCOLESTR pstrName, DWORD dwHint, IUnknown *pUnkObject, IErrorLog *pErrLog) { - FIXME("(%p,%s,%u,%p,%p): stub\n", iface, debugstr_w(pstrName), dwHint, pUnkObject, pErrLog); + FIXME("(%p,%s,%lu,%p,%p): stub\n", iface, debugstr_w(pstrName), dwHint, pUnkObject, pErrLog); return E_NOTIMPL; } diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index cb4490c8136..f8f81c0a990 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -89,7 +89,7 @@ static ULONG WINAPI BitmapScaler_AddRef(IWICBitmapScaler *iface) BitmapScaler *This = impl_from_IWICBitmapScaler(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -99,7 +99,7 @@ static ULONG WINAPI BitmapScaler_Release(IWICBitmapScaler *iface) BitmapScaler *This = impl_from_IWICBitmapScaler(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 68b9148bd5e..a1138c8626a 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -76,7 +76,7 @@ static ULONG WINAPI StreamOnMemory_AddRef(IStream *iface) StreamOnMemory *This = StreamOnMemory_from_IStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -86,7 +86,7 @@ static ULONG WINAPI StreamOnMemory_Release(IStream *iface) StreamOnMemory *This = StreamOnMemory_from_IStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { This->lock.DebugInfo->Spare[0] = 0; @@ -102,7 +102,7 @@ static HRESULT WINAPI StreamOnMemory_Read(IStream *iface, StreamOnMemory *This = StreamOnMemory_from_IStream(iface); ULONG uBytesRead; - TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbRead); + TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbRead); if (!pv) return E_INVALIDARG; @@ -123,7 +123,7 @@ static HRESULT WINAPI StreamOnMemory_Write(IStream *iface, StreamOnMemory *This = StreamOnMemory_from_IStream(iface); HRESULT hr; - TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbWritten); + TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbWritten); if (!pv) return E_INVALIDARG; @@ -149,7 +149,7 @@ static HRESULT WINAPI StreamOnMemory_Seek(IStream *iface, LARGE_INTEGER NewPosition; HRESULT hr=S_OK; - TRACE("(%p, %s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); + TRACE("(%p, %s, %ld, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); EnterCriticalSection(&This->lock); if (dwOrigin == STREAM_SEEK_SET) NewPosition.QuadPart = dlibMove.QuadPart; @@ -192,7 +192,7 @@ static HRESULT WINAPI StreamOnMemory_CopyTo(IStream *iface, static HRESULT WINAPI StreamOnMemory_Commit(IStream *iface, DWORD grfCommitFlags) { - TRACE("(%p, %#x)\n", iface, grfCommitFlags); + TRACE("(%p, %#lx)\n", iface, grfCommitFlags); return S_OK; } @@ -207,7 +207,7 @@ static HRESULT WINAPI StreamOnMemory_Revert(IStream *iface) static HRESULT WINAPI StreamOnMemory_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), + TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); return E_NOTIMPL; } @@ -216,7 +216,7 @@ static HRESULT WINAPI StreamOnMemory_LockRegion(IStream *iface, static HRESULT WINAPI StreamOnMemory_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), + TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); return E_NOTIMPL; } @@ -225,7 +225,7 @@ static HRESULT WINAPI StreamOnMemory_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { StreamOnMemory *This = StreamOnMemory_from_IStream(iface); - TRACE("(%p, %p, %#x)\n", This, pstatstg, grfStatFlag); + TRACE("(%p, %p, %#lx)\n", This, pstatstg, grfStatFlag); if (!pstatstg) return E_INVALIDARG; @@ -310,7 +310,7 @@ static ULONG WINAPI StreamOnFileHandle_AddRef(IStream *iface) StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -320,7 +320,7 @@ static ULONG WINAPI StreamOnFileHandle_Release(IStream *iface) StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { IWICStream_Release(This->stream); @@ -335,7 +335,7 @@ static HRESULT WINAPI StreamOnFileHandle_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) { StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); - TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbRead); + TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbRead); return IWICStream_Read(This->stream, pv, cb, pcbRead); } @@ -343,7 +343,7 @@ static HRESULT WINAPI StreamOnFileHandle_Read(IStream *iface, static HRESULT WINAPI StreamOnFileHandle_Write(IStream *iface, void const *pv, ULONG cb, ULONG *pcbWritten) { - ERR("(%p, %p, %u, %p)\n", iface, pv, cb, pcbWritten); + ERR("(%p, %p, %lu, %p)\n", iface, pv, cb, pcbWritten); return HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED); } @@ -351,7 +351,7 @@ static HRESULT WINAPI StreamOnFileHandle_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); - TRACE("(%p, %s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); + TRACE("(%p, %s, %ld, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); return IWICStream_Seek(This->stream, dlibMove, dwOrigin, plibNewPosition); } @@ -373,7 +373,7 @@ static HRESULT WINAPI StreamOnFileHandle_CopyTo(IStream *iface, static HRESULT WINAPI StreamOnFileHandle_Commit(IStream *iface, DWORD grfCommitFlags) { - TRACE("(%p, %#x)\n", iface, grfCommitFlags); + TRACE("(%p, %#lx)\n", iface, grfCommitFlags); return S_OK; } @@ -386,7 +386,7 @@ static HRESULT WINAPI StreamOnFileHandle_Revert(IStream *iface) static HRESULT WINAPI StreamOnFileHandle_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), + TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); return E_NOTIMPL; } @@ -394,7 +394,7 @@ static HRESULT WINAPI StreamOnFileHandle_LockRegion(IStream *iface, static HRESULT WINAPI StreamOnFileHandle_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), + TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); return E_NOTIMPL; } @@ -403,7 +403,7 @@ static HRESULT WINAPI StreamOnFileHandle_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); - TRACE("(%p, %p, %#x)\n", This, pstatstg, grfStatFlag); + TRACE("(%p, %p, %#lx)\n", This, pstatstg, grfStatFlag); return IWICStream_Stat(This->stream, pstatstg, grfStatFlag); } @@ -485,7 +485,7 @@ static ULONG WINAPI StreamOnStreamRange_AddRef(IStream *iface) StreamOnStreamRange *This = StreamOnStreamRange_from_IStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -495,7 +495,7 @@ static ULONG WINAPI StreamOnStreamRange_Release(IStream *iface) StreamOnStreamRange *This = StreamOnStreamRange_from_IStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { This->lock.DebugInfo->Spare[0] = 0; @@ -515,7 +515,7 @@ static HRESULT WINAPI StreamOnStreamRange_Read(IStream *iface, ULARGE_INTEGER OldPosition; LARGE_INTEGER SetPosition; - TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbRead); + TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbRead); if (!pv) return E_INVALIDARG; @@ -558,7 +558,7 @@ static HRESULT WINAPI StreamOnStreamRange_Write(IStream *iface, ULARGE_INTEGER OldPosition; LARGE_INTEGER SetPosition; ULONG uBytesWritten=0; - TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbWritten); + TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbWritten); if (!pv) return E_INVALIDARG; @@ -600,7 +600,7 @@ static HRESULT WINAPI StreamOnStreamRange_Seek(IStream *iface, ULARGE_INTEGER NewPosition, actual_size; HRESULT hr=S_OK; STATSTG statstg; - TRACE("(%p, %s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); + TRACE("(%p, %s, %ld, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); EnterCriticalSection(&This->lock); actual_size = This->max_size; @@ -655,7 +655,7 @@ static HRESULT WINAPI StreamOnStreamRange_Commit(IStream *iface, DWORD grfCommitFlags) { StreamOnStreamRange *This = StreamOnStreamRange_from_IStream(iface); - TRACE("(%p, %#x)\n", This, grfCommitFlags); + TRACE("(%p, %#lx)\n", This, grfCommitFlags); return IStream_Commit(This->stream, grfCommitFlags); } @@ -670,7 +670,7 @@ static HRESULT WINAPI StreamOnStreamRange_Revert(IStream *iface) static HRESULT WINAPI StreamOnStreamRange_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), + TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); return E_NOTIMPL; } @@ -679,7 +679,7 @@ static HRESULT WINAPI StreamOnStreamRange_LockRegion(IStream *iface, static HRESULT WINAPI StreamOnStreamRange_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - TRACE("(%p, %s, %s, %d)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), + TRACE("(%p, %s, %s, %ld)\n", iface, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); return E_NOTIMPL; } @@ -689,7 +689,7 @@ static HRESULT WINAPI StreamOnStreamRange_Stat(IStream *iface, { StreamOnStreamRange *This = StreamOnStreamRange_from_IStream(iface); HRESULT hr; - TRACE("(%p, %p, %#x)\n", This, pstatstg, grfStatFlag); + TRACE("(%p, %p, %#lx)\n", This, pstatstg, grfStatFlag); if (!pstatstg) return E_INVALIDARG; @@ -781,7 +781,7 @@ static ULONG WINAPI IWICStreamImpl_AddRef(IWICStream *iface) IWICStreamImpl *This = impl_from_IWICStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -791,7 +791,7 @@ static ULONG WINAPI IWICStreamImpl_Release(IWICStream *iface) IWICStreamImpl *This = impl_from_IWICStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { if (This->pStream) IStream_Release(This->pStream); @@ -804,7 +804,7 @@ static HRESULT WINAPI IWICStreamImpl_Read(IWICStream *iface, void *pv, ULONG cb, ULONG *pcbRead) { IWICStreamImpl *This = impl_from_IWICStream(iface); - TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbRead); + TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbRead); if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; return IStream_Read(This->pStream, pv, cb, pcbRead); @@ -814,7 +814,7 @@ static HRESULT WINAPI IWICStreamImpl_Write(IWICStream *iface, void const *pv, ULONG cb, ULONG *pcbWritten) { IWICStreamImpl *This = impl_from_IWICStream(iface); - TRACE("(%p, %p, %u, %p)\n", This, pv, cb, pcbWritten); + TRACE("(%p, %p, %lu, %p)\n", This, pv, cb, pcbWritten); if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; return IStream_Write(This->pStream, pv, cb, pcbWritten); @@ -824,7 +824,7 @@ static HRESULT WINAPI IWICStreamImpl_Seek(IWICStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { IWICStreamImpl *This = impl_from_IWICStream(iface); - TRACE("(%p, %s, %d, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), + TRACE("(%p, %s, %ld, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; @@ -855,7 +855,7 @@ static HRESULT WINAPI IWICStreamImpl_Commit(IWICStream *iface, DWORD grfCommitFlags) { IWICStreamImpl *This = impl_from_IWICStream(iface); - TRACE("(%p, %#x)\n", This, grfCommitFlags); + TRACE("(%p, %#lx)\n", This, grfCommitFlags); if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; return IStream_Commit(This->pStream, grfCommitFlags); @@ -874,7 +874,7 @@ static HRESULT WINAPI IWICStreamImpl_LockRegion(IWICStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { IWICStreamImpl *This = impl_from_IWICStream(iface); - TRACE("(%p, %s, %s, %d)\n", This, wine_dbgstr_longlong(libOffset.QuadPart), + TRACE("(%p, %s, %s, %ld)\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; @@ -885,7 +885,7 @@ static HRESULT WINAPI IWICStreamImpl_UnlockRegion(IWICStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { IWICStreamImpl *This = impl_from_IWICStream(iface); - TRACE("(%p, %s, %s, %d)\n", This, wine_dbgstr_longlong(libOffset.QuadPart), + TRACE("(%p, %s, %s, %ld)\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; @@ -896,7 +896,7 @@ static HRESULT WINAPI IWICStreamImpl_Stat(IWICStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { IWICStreamImpl *This = impl_from_IWICStream(iface); - TRACE("(%p, %p, %#x)\n", This, pstatstg, grfStatFlag); + TRACE("(%p, %p, %#lx)\n", This, pstatstg, grfStatFlag); if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; return IStream_Stat(This->pStream, pstatstg, grfStatFlag); @@ -942,7 +942,7 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromFilename(IWICStream *iface, DWORD dwMode; IStream *stream; - TRACE("(%p, %s, %u)\n", iface, debugstr_w(wzFileName), dwDesiredAccess); + TRACE("(%p, %s, %lu)\n", iface, debugstr_w(wzFileName), dwDesiredAccess); if (This->pStream) return WINCODEC_ERR_WRONGSTATE; @@ -989,7 +989,7 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromMemory(IWICStream *iface, { IWICStreamImpl *This = impl_from_IWICStream(iface); StreamOnMemory *pObject; - TRACE("(%p, %p, %u)\n", iface, pbBuffer, cbBufferSize); + TRACE("(%p, %p, %lu)\n", iface, pbBuffer, cbBufferSize); if (!pbBuffer) return E_INVALIDARG; if (This->pStream) return WINCODEC_ERR_WRONGSTATE; diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index 7d76582c0fb..f545cc6cffb 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -152,7 +152,7 @@ static ULONG WINAPI TgaDecoder_AddRef(IWICBitmapDecoder *iface) TgaDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -162,7 +162,7 @@ static ULONG WINAPI TgaDecoder_Release(IWICBitmapDecoder *iface) TgaDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -222,7 +222,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p hr = IStream_Read(pIStream, &This->header, sizeof(tga_header), &bytesread); if (SUCCEEDED(hr) && bytesread != sizeof(tga_header)) { - TRACE("got only %u bytes\n", bytesread); + TRACE("got only %lu bytes\n", bytesread); hr = E_FAIL; } if (FAILED(hr)) goto end; @@ -294,7 +294,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p hr = IStream_Read(pIStream, &footer, sizeof(tga_footer), &bytesread); if (SUCCEEDED(hr) && bytesread != sizeof(tga_footer)) { - TRACE("got only %u footer bytes\n", bytesread); + TRACE("got only %lu footer bytes\n", bytesread); hr = E_FAIL; } @@ -326,7 +326,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p hr = IStream_Read(pIStream, &This->extension_area, sizeof(tga_extension_area), &bytesread); if (SUCCEEDED(hr) && bytesread != sizeof(tga_extension_area)) { - TRACE("got only %u extension area bytes\n", bytesread); + TRACE("got only %lu extension area bytes\n", bytesread); hr = E_FAIL; } if (SUCCEEDED(hr) && This->extension_area.size < 495) @@ -639,7 +639,7 @@ static HRESULT WINAPI TgaDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, hr = IStream_Read(This->stream, colormap_data, This->colormap_length, &bytesread); if (SUCCEEDED(hr) && bytesread != This->colormap_length) { - WARN("expected %i bytes in colormap, got %i\n", This->colormap_length, bytesread); + WARN("expected %li bytes in colormap, got %li\n", This->colormap_length, bytesread); hr = E_FAIL; } } diff --git a/dlls/windowscodecs/wincodecs_common.c b/dlls/windowscodecs/wincodecs_common.c index 1b146908be9..1eb7994f944 100644 --- a/dlls/windowscodecs/wincodecs_common.c +++ b/dlls/windowscodecs/wincodecs_common.c @@ -115,7 +115,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, hr = WICConvertBitmapSource(format, source, &converted_source); if (FAILED(hr)) { - ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr); + ERR("Failed to convert source, target format %s, %#lx\n", debugstr_guid(format), hr); return E_NOTIMPL; } diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in index 3cdd523668e..cb095120e94 100644 --- a/dlls/wmphoto/Makefile.in +++ b/dlls/wmphoto/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmphoto.dll IMPORTS = $(JXR_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi EXTRAINCL = $(JXR_PE_CFLAGS) diff --git a/dlls/wmphoto/main.c b/dlls/wmphoto/main.c index 6de6119d212..6765688be75 100644 --- a/dlls/wmphoto/main.c +++ b/dlls/wmphoto/main.c @@ -129,7 +129,7 @@ HMODULE windowscodecs_module = 0; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("instance %p, reason %d, reserved %p\n", instance, reason, reserved); + TRACE("instance %p, reason %ld, reserved %p\n", instance, reason, reserved); switch (reason) {
Signed-off-by: Esme Povirk <esme(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windows.devices.enumeration/Makefile.in | 1 - dlls/windows.devices.enumeration/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/windows.devices.enumeration/Makefile.in b/dlls/windows.devices.enumeration/Makefile.in index dcac3c204c7..a2058b3d002 100644 --- a/dlls/windows.devices.enumeration/Makefile.in +++ b/dlls/windows.devices.enumeration/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.devices.enumeration.dll IMPORTS = combase uuid diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c index a2a13861a88..0e44251de08 100644 --- a/dlls/windows.devices.enumeration/main.c +++ b/dlls/windows.devices.enumeration/main.c @@ -82,7 +82,7 @@ static ULONG STDMETHODCALLTYPE windows_devices_enumeration_AddRef( { struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -91,7 +91,7 @@ static ULONG STDMETHODCALLTYPE windows_devices_enumeration_Release( { struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windows.globalization/Makefile.in | 1 - dlls/windows.globalization/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/windows.globalization/Makefile.in b/dlls/windows.globalization/Makefile.in index 84e78eb2842..d29c44ea746 100644 --- a/dlls/windows.globalization/Makefile.in +++ b/dlls/windows.globalization/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.globalization.dll IMPORTS = combase uuid diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index e8fcd46ef63..3e5a59bde14 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE hstring_vector_AddRef(IVectorView_HSTRING *iface) { struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -95,7 +95,7 @@ static ULONG STDMETHODCALLTYPE hstring_vector_Release(IVectorView_HSTRING *iface { struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); if (ref == 0) { while (impl->count--) WindowsDeleteString(impl->values[impl->count]); @@ -275,7 +275,7 @@ static ULONG STDMETHODCALLTYPE windows_globalization_AddRef( { struct windows_globalization *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -284,7 +284,7 @@ static ULONG STDMETHODCALLTYPE windows_globalization_Release( { struct windows_globalization *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windows.media.devices/Makefile.in | 1 - dlls/windows.media.devices/main.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/windows.media.devices/Makefile.in b/dlls/windows.media.devices/Makefile.in index cbeb55cba42..b4cdb69900e 100644 --- a/dlls/windows.media.devices/Makefile.in +++ b/dlls/windows.media.devices/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.media.devices.dll IMPORTS = combase diff --git a/dlls/windows.media.devices/main.c b/dlls/windows.media.devices/main.c index c4b5b647877..0bec5f2ea46 100644 --- a/dlls/windows.media.devices/main.c +++ b/dlls/windows.media.devices/main.c @@ -109,7 +109,7 @@ static ULONG STDMETHODCALLTYPE windows_media_devices_AddRef( { struct windows_media_devices *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -118,7 +118,7 @@ static ULONG STDMETHODCALLTYPE windows_media_devices_Release( { struct windows_media_devices *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -181,14 +181,14 @@ static HRESULT get_default_device_id(EDataFlow direction, AudioDeviceRole role, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum); if (FAILED(hr)) { - WARN("Failed to create MMDeviceEnumerator: %08x\n", hr); + WARN("Failed to create MMDeviceEnumerator: %08lx\n", hr); return hr; } hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, direction, mmdev_role, &dev); if (FAILED(hr)) { - WARN("GetDefaultAudioEndpoint failed: %08x\n", hr); + WARN("GetDefaultAudioEndpoint failed: %08lx\n", hr); IMMDeviceEnumerator_Release(devenum); return hr; } @@ -196,7 +196,7 @@ static HRESULT get_default_device_id(EDataFlow direction, AudioDeviceRole role, hr = IMMDevice_GetId(dev, &devid); if (FAILED(hr)) { - WARN("GetId failed: %08x\n", hr); + WARN("GetId failed: %08lx\n", hr); IMMDevice_Release(dev); IMMDeviceEnumerator_Release(devenum); return hr; @@ -217,7 +217,7 @@ static HRESULT get_default_device_id(EDataFlow direction, AudioDeviceRole role, hr = WindowsCreateString(s, wcslen(s), device_id_hstr); if (FAILED(hr)) - WARN("WindowsCreateString failed: %08x\n", hr); + WARN("WindowsCreateString failed: %08lx\n", hr); heap_free(s);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windows.media.speech/Makefile.in | 1 - dlls/windows.media.speech/main.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index fc01608d62c..9fbff8e132f 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.media.speech.dll IMPORTS = combase uuid diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index b607f9a8203..d14d06773f7 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE vector_view_voice_information_AddRef( { struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -90,7 +90,7 @@ static ULONG STDMETHODCALLTYPE vector_view_voice_information_Release( { struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -222,7 +222,7 @@ static ULONG STDMETHODCALLTYPE speech_synthesizer_AddRef( struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -233,7 +233,7 @@ static ULONG STDMETHODCALLTYPE speech_synthesizer_Release( struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) free(impl); @@ -326,7 +326,7 @@ static ULONG STDMETHODCALLTYPE closable_AddRef( struct speech_synthesizer *impl = impl_from_IClosable(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -337,7 +337,7 @@ static ULONG STDMETHODCALLTYPE closable_Release( struct speech_synthesizer *impl = impl_from_IClosable(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) free(impl); @@ -442,7 +442,7 @@ static ULONG STDMETHODCALLTYPE windows_media_speech_AddRef( { struct windows_media_speech *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -451,7 +451,7 @@ static ULONG STDMETHODCALLTYPE windows_media_speech_Release( { struct windows_media_speech *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wineps.drv/Makefile.in | 1 - dlls/wineps.drv/bitblt.c | 2 +- dlls/wineps.drv/builtin.c | 8 ++++---- dlls/wineps.drv/color.c | 2 +- dlls/wineps.drv/download.c | 4 ++-- dlls/wineps.drv/driver.c | 6 +++--- dlls/wineps.drv/escape.c | 10 +++++----- dlls/wineps.drv/font.c | 2 +- dlls/wineps.drv/graphics.c | 2 +- dlls/wineps.drv/init.c | 18 +++++++++--------- dlls/wineps.drv/pen.c | 2 +- dlls/wineps.drv/ppd.c | 4 ++-- dlls/wineps.drv/ps.c | 8 ++++---- dlls/wineps.drv/type1.c | 10 +++++----- dlls/wineps.drv/type42.c | 22 +++++++++++----------- 15 files changed, 50 insertions(+), 51 deletions(-) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index 1bf67a6a2c2..c7282d8a06e 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineps.drv IMPORTS = user32 gdi32 winspool advapi32 diff --git a/dlls/wineps.drv/bitblt.c b/dlls/wineps.drv/bitblt.c index 710b1b8a828..4fa7f9cdbf8 100644 --- a/dlls/wineps.drv/bitblt.c +++ b/dlls/wineps.drv/bitblt.c @@ -60,7 +60,7 @@ BOOL CDECL PSDRV_PatBlt(PHYSDEV dev, struct bitblt_coords *dst, DWORD dwRop) return TRUE; } default: - FIXME("Unsupported rop %06x\n", dwRop); + FIXME("Unsupported rop %06lx\n", dwRop); return FALSE; } } diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 11ba2154148..8b00bc7ad40 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -68,7 +68,7 @@ static VOID ScaleFont(const AFM *afm, LONG lfHeight, PSFONT *font, USHORT usUnitsPerEm, usWinAscent, usWinDescent; SHORT sAscender, sDescender, sLineGap, sAvgCharWidth; - TRACE("'%s' %i\n", afm->FontName, lfHeight); + TRACE("'%s' %li\n", afm->FontName, lfHeight); if (lfHeight < 0) /* match em height */ { @@ -142,9 +142,9 @@ static VOID ScaleFont(const AFM *afm, LONG lfHeight, PSFONT *font, font->strikeoutPosition = tm->tmAscent / 2; font->strikeoutThickness = font->underlineThickness; - TRACE("Selected PS font '%s' size %d weight %d.\n", afm->FontName, + TRACE("Selected PS font '%s' size %d weight %ld.\n", afm->FontName, font->size.xx, tm->tmWeight ); - TRACE("H = %d As = %d Des = %d IL = %d EL = %d\n", tm->tmHeight, + TRACE("H = %ld As = %ld Des = %ld IL = %ld EL = %ld\n", tm->tmHeight, tm->tmAscent, tm->tmDescent, tm->tmInternalLeading, tm->tmExternalLeading); } @@ -308,7 +308,7 @@ const AFMMETRICS *PSDRV_UVMetrics(LONG UV, const AFM *afm) if (needle == NULL) { - WARN("No glyph for U+%.4X in %s\n", UV, afm->FontName); + WARN("No glyph for U+%.4lX in %s\n", UV, afm->FontName); needle = afm->Metrics; } diff --git a/dlls/wineps.drv/color.c b/dlls/wineps.drv/color.c index 42fe57c2a02..6a28e4c748b 100644 --- a/dlls/wineps.drv/color.c +++ b/dlls/wineps.drv/color.c @@ -73,7 +73,7 @@ void PSDRV_CreateColor( PHYSDEV dev, PSCOLOR *pscolor, COLORREF wincolor ) float r, g, b; if(ctype != 0 && ctype != 2) - FIXME("Colour is %08x\n", wincolor); + FIXME("Colour is %08lx\n", wincolor); r = (wincolor & 0xff) / 256.0; g = ((wincolor >> 8) & 0xff) / 256.0; diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 3e720bf195b..e8c3299e17c 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -655,14 +655,14 @@ static void get_post2_custom_glyph_name(BYTE *post2header, DWORD size, WORD inde name_offset += name_length; if(name_offset + sizeof(BYTE) > size) { - FIXME("Pascal name offset '%d' exceeds PostScript Format 2 table size (%d)\n", + FIXME("Pascal name offset '%d' exceeds PostScript Format 2 table size (%ld)\n", name_offset + 1, size); return; } name_length = (post2header + name_offset)[0]; if(name_offset + name_length > size) { - FIXME("Pascal name offset '%d' exceeds PostScript Format 2 table size (%d)\n", + FIXME("Pascal name offset '%d' exceeds PostScript Format 2 table size (%ld)\n", name_offset + name_length, size); return; } diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 6d083b2a8c7..3b0300f3fd2 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -456,7 +456,7 @@ INT WINAPI DrvDocumentProperties(HWND hwnd, const WCHAR *device, DEVMODEW *outpu { PRINTERINFO *pi; - TRACE("(hwnd=%p, Device='%s', devOut=%p, devIn=%p, Mode=%04x)\n", + TRACE("(hwnd=%p, Device='%s', devOut=%p, devIn=%p, Mode=%04lx)\n", hwnd, debugstr_w(device), output, input, mode); if (!(pi = PSDRV_FindPrinterInfo(device))) return -1; @@ -468,7 +468,7 @@ INT WINAPI DrvDocumentProperties(HWND hwnd, const WCHAR *device, DEVMODEW *outpu /* If DM_MODIFY is set, change settings in accordance with lpdmInput */ if ((mode & DM_MODIFY) && input) { - TRACE("DM_MODIFY set. devIn->dmFields = %08x\n", input->dmFields); + TRACE("DM_MODIFY set. devIn->dmFields = %08lx\n", input->dmFields); PSDRV_MergeDevmodes(pi->Devmode, (PSDRV_DEVMODE *)input, pi); } @@ -681,7 +681,7 @@ DWORD WINAPI DrvDeviceCapabilities(HANDLE printer, WCHAR *device_name, WORD capa ret = 0; if(pi->ppd->DefaultDuplex && pi->ppd->DefaultDuplex->WinDuplex != 0) ret = 1; - TRACE("DC_DUPLEX: returning %d\n", ret); + TRACE("DC_DUPLEX: returning %ld\n", ret); break; case DC_EMF_COMPLIANT: diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 10eb68a4234..0149e192520 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -69,7 +69,7 @@ INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_dat return 0; } else { DWORD num = (cbInput < sizeof(DWORD)) ? *(const USHORT *)in_data : *(const DWORD *)in_data; - TRACE("QUERYESCSUPPORT for %d\n", num); + TRACE("QUERYESCSUPPORT for %ld\n", num); switch(num) { case NEXTBAND: @@ -112,7 +112,7 @@ INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_dat return FALSE; /* suppress the FIXME below */ default: - FIXME("QUERYESCSUPPORT(%d) - not supported.\n", num); + FIXME("QUERYESCSUPPORT(%ld) - not supported.\n", num); return FALSE; } } @@ -149,7 +149,7 @@ INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_dat { DRAWPATRECT *dpr = (DRAWPATRECT*)in_data; - FIXME("DRAWPATTERNRECT(pos (%d,%d), size %dx%d, style %d, pattern %x), stub!\n", + FIXME("DRAWPATTERNRECT(pos (%ld,%ld), size %ldx%ld, style %d, pattern %x), stub!\n", dpr->ptPosition.x, dpr->ptPosition.y, dpr->ptSize.x, dpr->ptSize.y, dpr->wStyle, dpr->wPattern @@ -453,7 +453,7 @@ INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) if (!OpenPrinterW( physDev->pi->friendly_name, &physDev->job.hprinter, &prn_def )) { - WARN("OpenPrinter(%s, ...) failed: %d\n", + WARN("OpenPrinter(%s, ...) failed: %ld\n", debugstr_w(physDev->pi->friendly_name), GetLastError()); return 0; } @@ -474,7 +474,7 @@ INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) is done during winspool.drv,ScheduleJob */ physDev->job.id = StartDocPrinterW(physDev->job.hprinter, 1, (LPBYTE) &di); if(!physDev->job.id) { - WARN("StartDocPrinter() failed: %d\n", GetLastError()); + WARN("StartDocPrinter() failed: %ld\n", GetLastError()); ClosePrinter(physDev->job.hprinter); return 0; } diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index cfb3669fd36..ebe6fb6b07a 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -50,7 +50,7 @@ HFONT CDECL PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) *aa_flags = GGO_BITMAP; /* no anti-aliasing on printer devices */ - TRACE("FaceName = %s Height = %d Italic = %d Weight = %d\n", + TRACE("FaceName = %s Height = %ld Italic = %d Weight = %ld\n", debugstr_w(lf.lfFaceName), lf.lfHeight, lf.lfItalic, lf.lfWeight); diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 27c0ba45edf..45f20728183 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -110,7 +110,7 @@ BOOL CDECL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT botto { char buf[256]; - sprintf(buf, "N %d %d %d %d B\n", rect.right - rect.left, rect.bottom - rect.top, rect.left, rect.top); + sprintf(buf, "N %ld %ld %ld %ld B\n", rect.right - rect.left, rect.bottom - rect.top, rect.left, rect.top); write_spool(dev, buf, strlen(buf)); physDev->job.passthrough_state = passthrough_had_rect; return TRUE; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 9e32bf31d1f..27260e95507 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -108,7 +108,7 @@ static const struct gdi_dc_funcs psdrv_funcs; */ 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) { @@ -187,7 +187,7 @@ while (0) CHECK_FIELD(DM_DITHERTYPE); CHECK_FIELD(DM_PANNINGWIDTH); CHECK_FIELD(DM_PANNINGHEIGHT); - if (fields) TRACE(" %#x", fields); + if (fields) TRACE(" %#lx", fields); TRACE("\n"); #undef CHECK_FIELD } @@ -205,7 +205,7 @@ static void dump_devmode(const DEVMODEW *dm) TRACE("dmDriverVersion: 0x%04x\n", dm->dmDriverVersion); TRACE("dmSize: 0x%04x\n", dm->dmSize); TRACE("dmDriverExtra: 0x%04x\n", dm->dmDriverExtra); - TRACE("dmFields: 0x%04x\n", dm->dmFields); + TRACE("dmFields: 0x%04lx\n", dm->dmFields); dump_fields(dm->dmFields); TRACE("dmOrientation: %d\n", dm->dmOrientation); TRACE("dmPaperSize: %d\n", dm->dmPaperSize); @@ -222,9 +222,9 @@ static void dump_devmode(const DEVMODEW *dm) TRACE("dmCollate: %d\n", dm->dmCollate); TRACE("dmFormName: %s\n", debugstr_w(dm->dmFormName)); TRACE("dmLogPixels %u\n", dm->dmLogPixels); - TRACE("dmBitsPerPel %u\n", dm->dmBitsPerPel); - TRACE("dmPelsWidth %u\n", dm->dmPelsWidth); - TRACE("dmPelsHeight %u\n", dm->dmPelsHeight); + TRACE("dmBitsPerPel %lu\n", dm->dmBitsPerPel); + TRACE("dmPelsWidth %lu\n", dm->dmPelsWidth); + TRACE("dmPelsHeight %lu\n", dm->dmPelsHeight); } static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) @@ -307,13 +307,13 @@ static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) physDev->ImageableArea.top = physDev->PageSize.cy = physDev->Devmode->dmPublic.dmPaperLength * physDev->logPixelsY / 254; } else { - FIXME("Odd dmFields %x\n", physDev->Devmode->dmPublic.dmFields); + FIXME("Odd dmFields %lx\n", physDev->Devmode->dmPublic.dmFields); SetRectEmpty(&physDev->ImageableArea); physDev->PageSize.cx = 0; physDev->PageSize.cy = 0; } - TRACE("ImageableArea = %s: PageSize = %dx%d\n", wine_dbgstr_rect(&physDev->ImageableArea), + TRACE("ImageableArea = %s: PageSize = %ldx%ld\n", wine_dbgstr_rect(&physDev->ImageableArea), physDev->PageSize.cx, physDev->PageSize.cy); /* these are in device units */ @@ -671,7 +671,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) lstrcpyW( pi->friendly_name, name ); if (OpenPrinterW( pi->friendly_name, &hPrinter, NULL ) == 0) { - ERR ("OpenPrinter failed with code %i\n", GetLastError ()); + ERR ("OpenPrinter failed with code %li\n", GetLastError ()); goto fail; } diff --git a/dlls/wineps.drv/pen.c b/dlls/wineps.drv/pen.c index 992d38f8f48..c0dcb51abda 100644 --- a/dlls/wineps.drv/pen.c +++ b/dlls/wineps.drv/pen.c @@ -60,7 +60,7 @@ HPEN CDECL PSDRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern * logpen.lopnColor = elp->elpColor; } - TRACE("hpen = %p colour = %08x\n", hpen, logpen.lopnColor); + TRACE("hpen = %p colour = %08lx\n", hpen, logpen.lopnColor); physDev->pen.width = logpen.lopnWidth.x; if ((logpen.lopnStyle & PS_GEOMETRIC) || (physDev->pen.width > 1)) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 03267c43702..37d651438a1 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -758,7 +758,7 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) SIZE sz; if(parse_resolution(tuple.value, &sz)) { - TRACE("DefaultResolution %dx%d\n", sz.cx, sz.cy); + TRACE("DefaultResolution %ldx%ld\n", sz.cx, sz.cy); ppd->DefaultResolution = sz.cx; } else @@ -772,7 +772,7 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) { RESOLUTION *res; - TRACE("Resolution %dx%d, invocation %s\n", sz.cx, sz.cy, tuple.value); + TRACE("Resolution %ldx%ld, invocation %s\n", sz.cx, sz.cy, tuple.value); res = HeapAlloc( GetProcessHeap(), 0, sizeof(*res) ); res->resx = sz.cx; diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index f88d44a829d..7f7841d7ca7 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -168,7 +168,7 @@ static const char psarc[] = /* x, y, w, h, ang1, ang2 */ "tmpmtrx setmatrix\n"; static const char pscurveto[] = /* x1, y1, x2, y2, x3, y3 */ -"%d %d %d %d %d %d curveto\n"; +"%ld %ld %ld %ld %ld %ld curveto\n"; static const char psgsave[] = "gsave\n"; @@ -207,7 +207,7 @@ static const char psrotate[] = /* ang */ "%.1f rotate\n"; static const char psarrayput[] = -"%s %d %d put\n"; +"%s %d %ld put\n"; static const char psarraydef[] = "/%s %d array def\n"; @@ -680,7 +680,7 @@ BOOL PSDRV_WriteSetPen(PHYSDEV dev) if (physDev->pen.dash_len) { for (i = pos = 0; i < physDev->pen.dash_len; i++) - pos += sprintf( buf + pos, " %u", physDev->pen.dash[i] ); + pos += sprintf( buf + pos, " %lu", physDev->pen.dash[i] ); buf[0] = '['; sprintf(buf + pos, "] %u setdash\n", 0); } @@ -963,7 +963,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U INT w, h, x, y, w_mult, h_mult, abs_height = abs( bmi->bmiHeader.biHeight ); COLORREF map[2]; - TRACE( "size %dx%dx%d\n", + TRACE( "size %ldx%ldx%d\n", bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, bmi->bmiHeader.biBitCount); if(bmi->bmiHeader.biBitCount != 1) { diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index 67b31f4cc98..f31c6dd3bee 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -77,8 +77,8 @@ TYPE1 *T1_download_header(PHYSDEV dev, char *ps_name, RECT *bbox, UINT emsize) " /FontName /%s def\n" " /Encoding 256 array 0 1 255{1 index exch /.notdef put} for def\n" " /PaintType 0 def\n" - " /FontMatrix [1 %d div 0 0 1 %d div 0 0] def\n" - " /FontBBox [%d %d %d %d] def\n" + " /FontMatrix [1 %ld div 0 0 1 %ld div 0 0] def\n" + " /FontBBox [%ld %ld %ld %ld] def\n" " /FontType 1 def\n" " /Private 7 dict begin\n" " /RD {string currentfile exch readhexstring pop} def\n" @@ -545,12 +545,12 @@ BOOL T1_download_glyph(PHYSDEV dev, DOWNLOAD *pdl, DWORD index, char *glyph_name "/%s findfont dup\n" "/Private get begin\n" "/CharStrings get begin\n" - "/%s %d RD\n"; + "/%s %ld RD\n"; static const char glyph_def_end[] = "ND\n" "end end\n"; - TRACE("%d %s\n", index, glyph_name); + TRACE("%ld %s\n", index, glyph_name); assert(pdl->type == Type1); t1 = pdl->typeinfo.Type1; @@ -649,7 +649,7 @@ BOOL T1_download_glyph(PHYSDEV dev, DOWNLOAD *pdl, DWORD index, char *glyph_name buf = HeapAlloc(GetProcessHeap(), 0, sizeof(glyph_def_begin) + strlen(pdl->ps_name) + strlen(glyph_name) + 100); - sprintf(buf, "%%%%glyph %04x\n", index); + sprintf(buf, "%%%%glyph %04lx\n", index); PSDRV_WriteSpool(dev, buf, strlen(buf)); len = str_get_bytes(charstring, &bytes); diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index 4ef7929c8fb..13b5c627e38 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -157,13 +157,13 @@ TYPE42 *T42_download_header(PHYSDEV dev, char *ps_name, " currentdict end def\n" " /sfnts [\n"; static const char TT_offset_table[] = "<00010000%04x%04x%04x%04x\n"; - static const char TT_table_dir_entry[] = "%08x%08x%08x%08x\n"; + static const char TT_table_dir_entry[] = "%08lx%08lx%08lx%08lx\n"; static const char storage[] ="]\nhavetype42gdir{pop}{{string} forall}ifelse\n"; static const char end[] = "] def\n" "havetype42gdir{/GlyphDirectory 256 dict def\n" " sfnts 0 get dup\n" - " %d <6c6f6378000000000000000000000000> putinterval\n" /* replace loca entry with dummy locx */ - " %d <676c6678000000000000000000000000> putinterval\n" /* replace glyf entry with dummy glfx */ + " %ld <6c6f6378000000000000000000000000> putinterval\n" /* replace loca entry with dummy locx */ + " %ld <676c6678000000000000000000000000> putinterval\n" /* replace glyf entry with dummy glfx */ " }if\n" "currentdict end dup /FontName get exch definefont pop\n"; @@ -190,7 +190,7 @@ TYPE42 *T42_download_header(PHYSDEV dev, char *ps_name, t42->maxp_tab = i; } if(i < num_of_tables) { - TRACE("Table %d has length %d. Will use Type 1 font instead.\n", i, t42->tables[i].len); + TRACE("Table %ld has length %ld. Will use Type 1 font instead.\n", i, t42->tables[i].len); T42_free(t42); return NULL; } @@ -265,7 +265,7 @@ TYPE42 *T42_download_header(PHYSDEV dev, char *ps_name, PSDRV_WriteSpool(dev, "[ ", 2); for(i = 1; t42->glyf_blocks[i]; i++) { - sprintf(buf,"%d ", t42->glyf_blocks[i] - t42->glyf_blocks[i-1] + 1); + sprintf(buf,"%ld ", t42->glyf_blocks[i] - t42->glyf_blocks[i-1] + 1); /* again add one byte for old PostScript rips */ PSDRV_WriteSpool(dev, buf, strlen(buf)); if(i % 8 == 0) @@ -291,16 +291,16 @@ BOOL T42_download_glyph(PHYSDEV dev, DOWNLOAD *pdl, DWORD index, static const char glyph_def[] = "/%s findfont exch 1 index\n" "havetype42gdir\n" - "{/GlyphDirectory get begin %d exch def end}\n" + "{/GlyphDirectory get begin %ld exch def end}\n" "{/sfnts get 4 index get 3 index 2 index putinterval pop}\n" "ifelse\n" "/CharStrings get\n" "begin\n" - " /%s %d def\n" + " /%s %ld def\n" "end\n" "pop pop\n"; - TRACE("%d %s\n", index, glyph_name); + TRACE("%ld %s\n", index, glyph_name); assert(pdl->type == Type42); t42 = pdl->typeinfo.Type42; @@ -315,7 +315,7 @@ BOOL T42_download_glyph(PHYSDEV dev, DOWNLOAD *pdl, DWORD index, } if(!get_glyf_pos(t42, index, &start, &end)) return FALSE; - TRACE("start = %x end = %x\n", start, end); + TRACE("start = %lx end = %lx\n", start, end); if(GET_BE_WORD(t42->tables[t42->glyf_tab].data + start) == 0xffff) { /* Composite glyph */ @@ -327,7 +327,7 @@ BOOL T42_download_glyph(PHYSDEV dev, DOWNLOAD *pdl, DWORD index, sg_flags = GET_BE_WORD(sg_start); sg_index = GET_BE_WORD(sg_start + 2); - TRACE("Sending subglyph %04x for glyph %04x\n", sg_index, index); + TRACE("Sending subglyph %04lx for glyph %04lx\n", sg_index, index); get_glyph_name(dev->hdc, sg_index, sg_name); T42_download_glyph(dev, pdl, sg_index, sg_name); sg_start += 4; @@ -352,7 +352,7 @@ BOOL T42_download_glyph(PHYSDEV dev, DOWNLOAD *pdl, DWORD index, /* we don't have a string for the gdir and glyf tables, but we do have a string for the TT header. So the offset we need is tables - 2 */ - sprintf(buf, "%d %d\n", t42->num_of_written_tables - 2 + i, start - t42->glyf_blocks[i-1]); + sprintf(buf, "%ld %ld\n", t42->num_of_written_tables - 2 + i, start - t42->glyf_blocks[i-1]); PSDRV_WriteSpool(dev, buf, strlen(buf)); PSDRV_WriteSpool(dev, "<", 1);
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wing.dll16/Makefile.in | 1 - dlls/wing.dll16/wing.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wing.dll16/Makefile.in b/dlls/wing.dll16/Makefile.in index af007d4c641..d9b936ea98a 100644 --- a/dlls/wing.dll16/Makefile.in +++ b/dlls/wing.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wing.dll16 IMPORTS = gdi32 EXTRADLLFLAGS = -m16 diff --git a/dlls/wing.dll16/wing.c b/dlls/wing.dll16/wing.c index 98cee565405..44c2f40eb1c 100644 --- a/dlls/wing.dll16/wing.c +++ b/dlls/wing.dll16/wing.c @@ -173,7 +173,7 @@ HBITMAP16 WINAPI WinGCreateBitmap16(HDC16 hdc, BITMAPINFO *bmpi, SEGPTR *bits) LPVOID bits32; HBITMAP hbitmap; - TRACE("(%d,%p,%p): create %dx%dx%d bitmap\n", hdc, bmpi, bits, + TRACE("(%d,%p,%p): create %ldx%ldx%d bitmap\n", hdc, bmpi, bits, bmpi->bmiHeader.biWidth, bmpi->bmiHeader.biHeight, bmpi->bmiHeader.biPlanes); hbitmap = CreateDIBSection( HDC_32(hdc), bmpi, DIB_RGB_COLORS, &bits32, 0, 0 ); @@ -278,7 +278,7 @@ HPALETTE16 WINAPI WinGCreateHalfTonePalette16(void) HBRUSH16 WINAPI WinGCreateHalfToneBrush16(HDC16 winDC, COLORREF col, WING_DITHER_TYPE type) { - TRACE("(%d,%d,%d)\n", winDC, col, type); + TRACE("(%d,%ld,%d)\n", winDC, col, type); return HBRUSH_16( CreateSolidBrush( col )); }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wininet/Makefile.in | 1 dlls/wininet/cookie.c | 28 ++++---- dlls/wininet/dialogs.c | 24 +++---- dlls/wininet/ftp.c | 34 +++++----- dlls/wininet/http.c | 104 +++++++++++++++--------------- dlls/wininet/internet.c | 146 +++++++++++++++++++++--------------------- dlls/wininet/netconnection.c | 28 ++++---- dlls/wininet/urlcache.c | 106 +++++++++++++++--------------- dlls/wininet/utility.c | 4 + 9 files changed, 237 insertions(+), 238 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index b3c497fd67f..7e8111f811d 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = $(ZLIB_PE_LIBS) mpr shlwapi shell32 user32 ws2_32 advapi32 diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 6def9ebf9d9..7db5f4d2f5b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -355,7 +355,7 @@ static BOOL load_persistent_cookie(substr_t domain, substr_t path) pbeg = strchr(pend+1, '\n'); if(!pbeg) break; - sscanf(pbeg, "%u %u %u %u %u", &flags, &expiry.dwLowDateTime, &expiry.dwHighDateTime, + sscanf(pbeg, "%lu %lu %lu %lu %lu", &flags, &expiry.dwLowDateTime, &expiry.dwHighDateTime, &create.dwLowDateTime, &create.dwHighDateTime); /* skip "*\n" */ @@ -481,7 +481,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) } heap_free(dyn_buf); - sprintf(buf, "\n%u\n%u\n%u\n%u\n%u\n*\n", cookie_container->flags, + sprintf(buf, "\n%lu\n%lu\n%lu\n%lu\n%lu\n*\n", cookie_container->flags, cookie_container->expiry.dwLowDateTime, cookie_container->expiry.dwHighDateTime, cookie_container->create.dwLowDateTime, cookie_container->create.dwHighDateTime); if(!WriteFile(cookie_handle, buf, strlen(buf), &bytes_written, NULL)) { @@ -730,10 +730,10 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, DWORD res; BOOL ret; - TRACE("(%s, %s, %p, %p, %x, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize, flags, reserved); + TRACE("(%s, %s, %p, %p, %lx, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize, flags, reserved); if (flags & ~INTERNET_COOKIE_HTTPONLY) - FIXME("flags 0x%08x not supported\n", flags); + FIXME("flags 0x%08lx not supported\n", flags); if (!lpszUrl) { @@ -759,7 +759,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, if(cookie_set.cnt) { if(!lpCookieData || cookie_set.string_len+1 > *lpdwSize) { *lpdwSize = (cookie_set.string_len + 1) * sizeof(WCHAR); - TRACE("returning %u\n", *lpdwSize); + TRACE("returning %lu\n", *lpdwSize); if(lpCookieData) { SetLastError(ERROR_INSUFFICIENT_BUFFER); ret = FALSE; @@ -809,7 +809,7 @@ BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName, DWORD len, size = 0; BOOL r; - TRACE("(%s %s %p %p(%u) %x %p)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), + TRACE("(%s %s %p %p(%lu) %lx %p)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), lpCookieData, lpdwSize, lpdwSize ? *lpdwSize : 0, flags, reserved); url = heap_strdupAtoW(lpszUrl); @@ -915,7 +915,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D BOOL expired = FALSE, update_persistent = FALSE; DWORD cookie_flags = 0, len; - TRACE("%s %s %s=%s %x\n", debugstr_wn(domain.str, domain.len), debugstr_wn(path.str, path.len), + TRACE("%s %s %s=%s %lx\n", debugstr_wn(domain.str, domain.len), debugstr_wn(path.str, path.len), debugstr_wn(name.str, name.len), debugstr_wn(data.str, data.len), flags); memset(&expiry,0,sizeof(expiry)); @@ -1076,11 +1076,11 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, substr_t host, path, name, data; BOOL ret; - TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName), + TRACE("(%s, %s, %s, %lx, %Ix)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName), debugstr_w(lpCookieData), flags, reserved); if (flags & ~INTERNET_COOKIE_HTTPONLY) - FIXME("flags %x not supported\n", flags); + FIXME("flags %lx not supported\n", flags); if (!lpszUrl || !lpCookieData) { @@ -1164,7 +1164,7 @@ DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR WCHAR *data, *url, *name; DWORD r; - TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_a(lpszURL), debugstr_a(lpszCookieName), + TRACE("(%s, %s, %s, %lx, %Ix)\n", debugstr_a(lpszURL), debugstr_a(lpszCookieName), debugstr_a(lpszCookieData), dwFlags, dwReserved); url = heap_strdupAtoW(lpszURL); @@ -1203,7 +1203,7 @@ BOOL WINAPI InternetClearAllPerSiteCookieDecisions( VOID ) BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, ULONG *pcSiteNameSize, ULONG *pdwDecision, ULONG dwIndex ) { - FIXME("(%s, %p, %p, 0x%08x) stub\n", + FIXME("(%s, %p, %p, 0x%08lx) stub\n", debugstr_a(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex); return FALSE; } @@ -1221,7 +1221,7 @@ BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, ULONG *pcSite BOOL WINAPI InternetEnumPerSiteCookieDecisionW( LPWSTR pszSiteName, ULONG *pcSiteNameSize, ULONG *pdwDecision, ULONG dwIndex ) { - FIXME("(%s, %p, %p, 0x%08x) stub\n", + FIXME("(%s, %p, %p, 0x%08lx) stub\n", debugstr_w(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex); return FALSE; } @@ -1249,7 +1249,7 @@ BOOL WINAPI InternetGetPerSiteCookieDecisionW( LPCWSTR pwchHostName, ULONG *pRes */ BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecision ) { - FIXME("(%s, 0x%08x) stub\n", debugstr_a(pchHostName), dwDecision); + FIXME("(%s, 0x%08lx) stub\n", debugstr_a(pchHostName), dwDecision); return FALSE; } @@ -1258,7 +1258,7 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecis */ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDecision ) { - FIXME("(%s, 0x%08x) stub\n", debugstr_w(pchHostName), dwDecision); + FIXME("(%s, 0x%08lx) stub\n", debugstr_w(pchHostName), dwDecision); return FALSE; } diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index a48c75865ac..abd8621e76c 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -214,7 +214,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( if( uMsg == WM_INITDIALOG ) { - TRACE("WM_INITDIALOG (%08lx)\n", lParam); + TRACE("WM_INITDIALOG (%08Ix)\n", lParam); /* save the parameter list */ params = (struct WININET_ErrorDlgParams*) lParam; @@ -289,7 +289,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( if( uMsg == WM_INITDIALOG ) { - TRACE("WM_INITDIALOG (%08lx)\n", lParam); + TRACE("WM_INITDIALOG (%08Ix)\n", lParam); /* save the parameter list */ params = (struct WININET_ErrorDlgParams*) lParam; @@ -366,7 +366,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( if( uMsg == WM_INITDIALOG ) { - TRACE("WM_INITDIALOG (%08lx)\n", lParam); + TRACE("WM_INITDIALOG (%08Ix)\n", lParam); /* save the parameter list */ params = (struct WININET_ErrorDlgParams*) lParam; @@ -390,7 +390,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( LoadStringW( WININET_hModule, IDS_CERT_ERRORS, buf, 1024 ); break; default: - FIXME( "No message for error %d\n", params->dwError ); + FIXME( "No message for error %ld\n", params->dwError ); buf[0] = '\0'; } @@ -472,7 +472,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, http_request_t *req = NULL; DWORD res = ERROR_SUCCESS; - TRACE("%p %p %d %08x %p\n", hWnd, hRequest, dwError, dwFlags, lppvData); + TRACE("%p %p %ld %08lx %p\n", hWnd, hRequest, dwError, dwFlags, lppvData); if( !hWnd && !(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI) ) return ERROR_INVALID_HANDLE; @@ -510,7 +510,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, hWnd, WININET_PasswordDialog, (LPARAM) ¶ms ); break; default: - WARN("unhandled status %u\n", req->status_code); + WARN("unhandled status %lu\n", req->status_code); } break; } @@ -531,7 +531,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, } if( dwFlags & ~FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) - FIXME("%08x contains unsupported flags.\n", dwFlags); + FIXME("%08lx contains unsupported flags.\n", dwFlags); res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_INVCERTDLG ), hWnd, WININET_InvalidCertificateDialog, (LPARAM) ¶ms ); @@ -542,7 +542,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = ERROR_HTTP_COOKIE_DECLINED; break; } - FIXME("Need to display dialog for error %d\n", dwError); + FIXME("Need to display dialog for error %ld\n", dwError); res = ERROR_CANCELLED; break; @@ -556,7 +556,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, case ERROR_INTERNET_MIXED_SECURITY: case ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR: if(!(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI)) - FIXME("Need to display dialog for error %d\n", dwError); + FIXME("Need to display dialog for error %ld\n", dwError); res = ERROR_CANCELLED; break; @@ -566,14 +566,14 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = ERROR_SUCCESS; break; } - FIXME("Need to display dialog for error %d\n", dwError); + FIXME("Need to display dialog for error %ld\n", dwError); res = ERROR_CANCELLED; break; case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: case ERROR_INTERNET_POST_IS_NON_SECURE: if (!(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI)) - FIXME("Need to display dialog for error %d\n", dwError); + FIXME("Need to display dialog for error %ld\n", dwError); res = ERROR_SUCCESS; break; @@ -611,7 +611,7 @@ BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) */ DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE cert, DWORD len, LPSTR szlistbox, LPDWORD listbox) { - FIXME("stub: %p %d %s %p\n", cert, len, debugstr_a(szlistbox), listbox); + FIXME("stub: %p %ld %s %p\n", cert, len, debugstr_a(szlistbox), listbox); return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 05236972b26..80efeb2bf37 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1203,7 +1203,7 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW DWORD bytes_written; if (!WriteFile(file->cache_file_handle, buffer, *read, &bytes_written, NULL)) - WARN("WriteFile failed: %u\n", GetLastError()); + WARN("WriteFile failed: %lu\n", GetLastError()); } return error; } @@ -1254,11 +1254,11 @@ static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, ULONG unread = 0; int retval; - TRACE("(%p %p %x %lx)\n", file, available, flags, ctx); + TRACE("(%p %p %lx %Ix)\n", file, available, flags, ctx); retval = ioctlsocket(file->nDataSocket, FIONREAD, &unread); if (!retval) - TRACE("%d bytes of queued, but unread data\n", unread); + TRACE("%ld bytes of queued, but unread data\n", unread); *available = unread; @@ -1386,7 +1386,7 @@ static HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (lpwh->cache_file_handle == INVALID_HANDLE_VALUE) { - WARN("Could not create cache file: %u\n", GetLastError()); + WARN("Could not create cache file: %lu\n", GetLastError()); heap_free(lpwh->cache_file); lpwh->cache_file = NULL; } @@ -1486,7 +1486,7 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, appinfo_t *hIC = NULL; HINTERNET r = NULL; - TRACE("(%p,%s,0x%08x,0x%08x,0x%08lx)\n", hFtpSession, + TRACE("(%p,%s,0x%08lx,0x%08lx,0x%08Ix)\n", hFtpSession, debugstr_w(lpszFileName), fdwAccess, dwFlags, dwContext); lpwfs = (ftp_session_t*) get_handle_object( hFtpSession ); @@ -2217,7 +2217,7 @@ BOOL WINAPI FtpCommandA( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags BOOL r; WCHAR *cmdW; - TRACE("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags, + TRACE("%p %d 0x%08lx %s 0x%08Ix %p\n", hConnect, fExpectResponse, dwFlags, debugstr_a(lpszCommand), dwContext, phFtpCommand); if (fExpectResponse) @@ -2256,7 +2256,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags DWORD len, nBytesSent= 0; INT nResCode, nRC = 0; - TRACE("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags, + TRACE("%p %d 0x%08lx %s 0x%08Ix %p\n", hConnect, fExpectResponse, dwFlags, debugstr_w(lpszCommand), dwContext, phFtpCommand); if (!lpszCommand || !lpszCommand[0]) @@ -2302,7 +2302,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags strcat(cmd, szCRLF); len--; - TRACE("Sending (%s) len(%d)\n", debugstr_a(cmd), len); + TRACE("Sending (%s) len(%ld)\n", debugstr_a(cmd), len); while ((nBytesSent < len) && (nRC != -1)) { nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); @@ -2711,7 +2711,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], dwParamLen ? " " : "", dwParamLen ? lpszParam : "", szCRLF); - TRACE("Sending (%s) len(%d)\n", debugstr_a(buf), len); + TRACE("Sending (%s) len(%ld)\n", debugstr_a(buf), len); while((nBytesSent < len) && (nRC != -1)) { nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0); @@ -2725,7 +2725,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, &nBytesSent, sizeof(DWORD)); } - TRACE("Sent %d bytes\n", nBytesSent); + TRACE("Sent %ld bytes\n", nBytesSent); return (nRC != -1); } @@ -3307,13 +3307,13 @@ static BOOL FTP_SendData(ftp_session_t *lpwfs, INT nDataSocket, HANDLE hFile) nSeconds = e_long_time - s_long_time; if( nSeconds / 60 > 0 ) { - TRACE( "%d bytes of %d bytes (%d%%) in %d min %d sec estimated remaining time %d sec\n", + TRACE( "%ld bytes of %ld bytes (%ld%%) in %ld min %ld sec estimated remaining time %ld sec\n", nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds / 60, nSeconds % 60, (fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent ); } else { - TRACE( "%d bytes of %d bytes (%d%%) in %d sec estimated remaining time %d sec\n", + TRACE( "%ld bytes of %ld bytes (%ld%%) in %ld sec estimated remaining time %ld sec\n", nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds, (fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent); } @@ -3442,7 +3442,7 @@ static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data WIN32_FIND_DATAW *find_data = data; DWORD res = ERROR_SUCCESS; - TRACE("index(%d) size(%d)\n", find->index, find->size); + TRACE("index(%ld) size(%ld)\n", find->index, find->size); ZeroMemory(find_data, sizeof(WIN32_FIND_DATAW)); @@ -3450,7 +3450,7 @@ static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data FTP_ConvertFileProp(&find->lpafp[find->index], find_data); find->index++; - TRACE("Name: %s\nSize: %d\n", debugstr_w(find_data->cFileName), find_data->nFileSizeLow); + TRACE("Name: %s\nSize: %ld\n", debugstr_w(find_data->cFileName), find_data->nFileSizeLow); }else { res = ERROR_NO_MORE_FILES; } @@ -3545,7 +3545,7 @@ static HINTERNET FTP_ReceiveFileList(ftp_session_t *lpwfs, INT nSocket, LPCWSTR LPFILEPROPERTIESW lpafp = NULL; LPWININETFTPFINDNEXTW lpwfn = NULL; - TRACE("(%p,%d,%s,%p,%08lx)\n", lpwfs, nSocket, debugstr_w(lpszSearchFile), lpFindFileData, dwContext); + TRACE("(%p,%d,%s,%p,%08Ix)\n", lpwfs, nSocket, debugstr_w(lpszSearchFile), lpFindFileData, dwContext); if (FTP_ParseDirectory(lpwfs, nSocket, lpszSearchFile, &lpafp, &dwSize)) { @@ -3567,7 +3567,7 @@ static HINTERNET FTP_ReceiveFileList(ftp_session_t *lpwfs, INT nSocket, LPCWSTR } } - TRACE("Matched %d files\n", dwSize); + TRACE("Matched %ld files\n", dwSize); return lpwfn ? lpwfn->hdr.hInternet : NULL; } @@ -3743,7 +3743,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT else { lpfp->bIsDirectory = FALSE; lpfp->nSize = atol(pszToken); - TRACE("Size: %d\n", lpfp->nSize); + TRACE("Size: %ld\n", lpfp->nSize); } pszToken = strtok(NULL, szSpace); diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c493137896a..55698467cda 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -371,7 +371,7 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW int zres; DWORD res = ERROR_SUCCESS; - TRACE("(%d %x)\n", size, allow_blocking); + TRACE("(%ld %x)\n", size, allow_blocking); while(size && !gzip_stream->end_of_data) { if(!gzip_stream->buf_size) { @@ -418,7 +418,7 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW allow_blocking = FALSE; } - TRACE("read %u bytes\n", ret_read); + TRACE("read %lu bytes\n", ret_read); if(ret_read) res = ERROR_SUCCESS; *read = ret_read; @@ -1052,7 +1052,7 @@ static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue, } if (sec_status != SEC_E_OK) { - WARN("AcquireCredentialsHandleW for scheme %s failed with error 0x%08x\n", + WARN("AcquireCredentialsHandleW for scheme %s failed with error 0x%08lx\n", debugstr_w(pAuthInfo->scheme), sec_status); heap_free(pAuthInfo->scheme); heap_free(pAuthInfo); @@ -1176,7 +1176,7 @@ static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue, } else { - ERR("InitializeSecurityContextW returned error 0x%08x\n", sec_status); + ERR("InitializeSecurityContextW returned error 0x%08lx\n", sec_status); heap_free(out.pvBuffer); destroy_authinfo(pAuthInfo); *ppAuthInfo = NULL; @@ -1275,7 +1275,7 @@ BOOL WINAPI HttpAddRequestHeadersW(HINTERNET hHttpRequest, http_request_t *request; DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; - TRACE("%p, %s, %u, %08x\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); + TRACE("%p, %s, %lu, %08lx\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); if (!lpszHeader) return TRUE; @@ -1307,7 +1307,7 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest, WCHAR *headers = NULL; BOOL r; - TRACE("%p, %s, %u, %08x\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); + TRACE("%p, %s, %lu, %08lx\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); if(lpszHeader) headers = heap_strndupAtoW(lpszHeader, dwHeaderLength, &dwHeaderLength); @@ -1391,7 +1391,7 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, LPWSTR szVersion = NULL, szReferrer = NULL, *szAcceptTypes = NULL; HINTERNET rc = NULL; - TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession, + TRACE("(%p, %s, %s, %s, %s, %p, %08lx, %08Ix)\n", hHttpSession, debugstr_a(lpszVerb), debugstr_a(lpszObjectName), debugstr_a(lpszVersion), debugstr_a(lpszReferrer), lpszAcceptTypes, dwFlags, dwContext); @@ -2067,7 +2067,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe flags = is_valid_netconn(req->netconn) ? req->netconn->security_flags : req->security_flags | req->server->security_flags; *(DWORD *)buffer = flags; - TRACE("INTERNET_OPTION_SECURITY_FLAGS %x\n", flags); + TRACE("INTERNET_OPTION_SECURITY_FLAGS %lx\n", flags); return ERROR_SUCCESS; } @@ -2245,7 +2245,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe "%s:\t(null)\r\n" "%s:\t(null)\r\n" "%s:\t(null)\r\n" - "%s:\t%s (%u %s)", + "%s:\t%s (%lu %s)", subject, info.lpszSubjectInfo, issuer, info.lpszIssuerInfo, effective, start_date, start_time, @@ -2263,7 +2263,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe "%s:\t(null)\r\n" "%s:\t(null)\r\n" "%s:\t(null)\r\n" - "%s:\t%s (%u %s)", + "%s:\t%s (%lu %s)", subject, info.lpszSubjectInfo, issuer, info.lpszIssuerInfo, effective, start_date, start_time, @@ -2305,7 +2305,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe if(!req->status_code) flags |= INTERNET_REQFLAG_NO_HEADERS; - TRACE("INTERNET_OPTION_REQUEST_FLAGS returning %x\n", flags); + TRACE("INTERNET_OPTION_REQUEST_FLAGS returning %lx\n", flags); *size = sizeof(DWORD); *(DWORD*)buffer = flags; @@ -2359,7 +2359,7 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, if (!buffer || size != sizeof(DWORD)) return ERROR_INVALID_PARAMETER; flags = *(DWORD *)buffer; - TRACE("INTERNET_OPTION_SECURITY_FLAGS %08x\n", flags); + TRACE("INTERNET_OPTION_SECURITY_FLAGS %08lx\n", flags); flags &= SECURITY_SET_MASK; req->security_flags |= flags; if(is_valid_netconn(req->netconn)) @@ -2425,7 +2425,7 @@ static void commit_cache_entry(http_request_t *req) if(res) req->req_file->is_committed = TRUE; else - WARN("CommitUrlCacheEntry failed: %u\n", GetLastError()); + WARN("CommitUrlCacheEntry failed: %lu\n", GetLastError()); heap_free(header); } @@ -2497,7 +2497,7 @@ static void create_cache_entry(http_request_t *req) b = CreateUrlCacheEntryW(url, req->contentLength == ~0 ? 0 : req->contentLength, NULL, file_name, 0); if(!b) { - WARN("Could not create cache entry: %08x\n", GetLastError()); + WARN("Could not create cache entry: %08lx\n", GetLastError()); return; } @@ -2507,7 +2507,7 @@ static void create_cache_entry(http_request_t *req) req->hCacheFile = CreateFileW(file_name, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if(req->hCacheFile == INVALID_HANDLE_VALUE) { - WARN("Could not create file: %u\n", GetLastError()); + WARN("Could not create file: %lu\n", GetLastError()); req->hCacheFile = NULL; return; } @@ -2517,7 +2517,7 @@ static void create_cache_entry(http_request_t *req) b = WriteFile(req->hCacheFile, req->read_buf+req->read_pos, req->read_size, &written, NULL); if(!b) - FIXME("WriteFile failed: %u\n", GetLastError()); + FIXME("WriteFile failed: %lu\n", GetLastError()); if(req->data_stream->vtbl->end_of_data(req->data_stream, req)) commit_cache_entry(req); @@ -2580,7 +2580,7 @@ static DWORD read_line( http_request_t *req, LPSTR buffer, DWORD *len ) if ((res = read_more_data( req, -1 ))) { - WARN( "read failed %u\n", res ); + WARN( "read failed %lu\n", res ); LeaveCriticalSection( &req->read_section ); return res; } @@ -2626,7 +2626,7 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD bres = WriteFile(req->hCacheFile, buf, *read, &written, NULL); if(!bres) - FIXME("WriteFile failed: %u\n", GetLastError()); + FIXME("WriteFile failed: %lu\n", GetLastError()); } if((res == ERROR_SUCCESS && !*read) || req->data_stream->vtbl->end_of_data(req->data_stream, req)) @@ -2657,7 +2657,7 @@ static DWORD refill_read_buffer(http_request_t *req, BOOL allow_blocking, DWORD req->read_size += read; - TRACE("read %u bytes, read_size %u\n", read, req->read_size); + TRACE("read %lu bytes, read_size %lu\n", read, req->read_size); if(read_bytes) *read_bytes = read; return res; @@ -2687,7 +2687,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, } } - TRACE("res %u read %u bytes\n", res, ret); + TRACE("res %lu read %u bytes\n", res, ret); *read = ret; return res; } @@ -2802,7 +2802,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, }else if (ch >= 'A' && ch <= 'F') { chunked_stream->chunk_size = chunked_stream->chunk_size * 16 + ch - 'A' + 10; }else if (ch == ';' || ch == '\r' || ch == '\n') { - TRACE("reading %u byte chunk\n", chunked_stream->chunk_size); + TRACE("reading %lu byte chunk\n", chunked_stream->chunk_size); chunked_stream->buf_size++; chunked_stream->buf_pos--; if(req->contentLength == ~0) req->contentLength = chunked_stream->chunk_size; @@ -2886,7 +2886,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(res != ERROR_SUCCESS) return res; - TRACE("read %d bytes\n", ret_read); + TRACE("read %ld bytes\n", ret_read); *read = ret_read; return ERROR_SUCCESS; } @@ -3025,7 +3025,7 @@ static void HTTP_ReceiveRequestData(http_request_t *req) LeaveCriticalSection( &req->read_section ); if(res != WSAEWOULDBLOCK && (res != ERROR_SUCCESS || !read)) { - WARN("res %u read %u, closing connection\n", res, read); + WARN("res %lu read %lu, closing connection\n", res, read); http_release_netconn(req, FALSE); } @@ -3064,7 +3064,7 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * LeaveCriticalSection( &req->read_section ); *read = ret_read; - TRACE( "retrieved %u bytes (res %u)\n", ret_read, res ); + TRACE( "retrieved %lu bytes (res %lu)\n", ret_read, res ); if(res != WSAEWOULDBLOCK) { if(res != ERROR_SUCCESS) @@ -3108,7 +3108,7 @@ static void async_read_file_proc(task_header_t *hdr) http_request_t *req = (http_request_t*)task->hdr.hdr; DWORD res = ERROR_SUCCESS, read = task->read_pos, complete_arg = 0; - TRACE("req %p buf %p size %u read_pos %u ret_read %p\n", req, task->buf, task->size, task->read_pos, task->ret_read); + TRACE("req %p buf %p size %lu read_pos %lu ret_read %p\n", req, task->buf, task->size, task->read_pos, task->ret_read); if(task->buf) { DWORD read_bytes; @@ -3129,7 +3129,7 @@ static void async_read_file_proc(task_header_t *hdr) http_release_netconn(req, drain_content(req, FALSE) == ERROR_SUCCESS); } - TRACE("res %u read %u\n", res, read); + TRACE("res %lu read %lu\n", res, read); if(task->ret_read) *task->ret_read = read; @@ -3166,10 +3166,10 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buf, DWORD size, DWORD DWORD res = ERROR_SUCCESS, read = 0, cread, error = ERROR_SUCCESS; BOOL allow_blocking, notify_received = FALSE; - TRACE("(%p %p %u %x)\n", req, buf, size, flags); + TRACE("(%p %p %lu %lx)\n", req, buf, size, flags); if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) - FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); + FIXME("these dwFlags aren't implemented: 0x%lx\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); allow_blocking = !(req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC); @@ -3252,10 +3252,10 @@ static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, DWORD res = ERROR_SUCCESS, avail = 0, error = ERROR_SUCCESS; BOOL allow_blocking, notify_received = FALSE; - TRACE("(%p %p %x %lx)\n", req, available, flags, ctx); + TRACE("(%p %p %lx %Ix)\n", req, available, flags, ctx); if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) - FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); + FIXME("these dwFlags aren't implemented: 0x%lx\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); *available = 0; allow_blocking = !(req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC); @@ -3405,7 +3405,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, URL_ESCAPE_SPACES_ONLY); if (rc != S_OK) { - ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(lpszObjectName),rc); + ERR("Unable to escape string!(%s) (%ld)\n",debugstr_w(lpszObjectName),rc); lstrcpyW(request->path,lpszObjectName); } }else { @@ -3463,7 +3463,7 @@ HINTERNET WINAPI HttpOpenRequestW(HINTERNET hHttpSession, HINTERNET handle = NULL; DWORD res; - TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession, + TRACE("(%p, %s, %s, %s, %s, %p, %08lx, %08Ix)\n", hHttpSession, debugstr_w(lpszVerb), debugstr_w(lpszObjectName), debugstr_w(lpszVersion), debugstr_w(lpszReferrer), lpszAcceptTypes, dwFlags, dwContext); @@ -3797,7 +3797,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, } *(DWORD *)lpBuffer = value; - TRACE(" returning number: %u\n", *(DWORD *)lpBuffer); + TRACE(" returning number: %lu\n", *(DWORD *)lpBuffer); } else if (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME && lpBuffer) { @@ -3945,7 +3945,7 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel, DWORD info = dwInfoLevel & HTTP_QUERY_HEADER_MASK; DWORD i; - TRACE("(%p, 0x%08x)--> %d\n", hHttpRequest, dwInfoLevel, info); + TRACE("(%p, 0x%08lx)--> %ld\n", hHttpRequest, dwInfoLevel, info); TRACE(" Attribute:"); for (i = 0; i < ARRAY_SIZE(query_flags); i++) { if (query_flags[i].val == info) { @@ -3954,7 +3954,7 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel, } } if (i == ARRAY_SIZE(query_flags)) { - TRACE(" Unknown (%08x)", info); + TRACE(" Unknown (%08lx)", info); } TRACE(" Modifier:"); @@ -3966,7 +3966,7 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel, } if (info_mod) { - TRACE(" Unknown (%08x)", info_mod); + TRACE(" Unknown (%08lx)", info_mod); } TRACE("\n"); } @@ -3987,7 +3987,7 @@ lend: if( request ) WININET_Release( &request->hdr ); - TRACE("%u <--\n", res); + TRACE("%lu <--\n", res); SetLastError(res); return res == ERROR_SUCCESS; @@ -4010,7 +4010,7 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHttpRequest, DWORD dwInfoLevel, DWORD len; WCHAR* bufferW; - TRACE("%p %x\n", hHttpRequest, dwInfoLevel); + TRACE("%p %lx\n", hHttpRequest, dwInfoLevel); if((dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) || (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME)) @@ -4220,13 +4220,13 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); rc = UrlEscapeW(path, dummy, &needed, URL_ESCAPE_SPACES_ONLY); if (rc != E_POINTER) - ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); + ERR("Unable to escape string!(%s) (%ld)\n",debugstr_w(path),rc); request->path = heap_alloc(needed*sizeof(WCHAR)); rc = UrlEscapeW(path, request->path, &needed, URL_ESCAPE_SPACES_ONLY); if (rc != S_OK) { - ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); + ERR("Unable to escape string!(%s) (%ld)\n",debugstr_w(path),rc); lstrcpyW(request->path, path); } heap_free(path); @@ -4849,7 +4849,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) (request->hdr.ErrorMask & INTERNET_ERROR_MASK_COMBINED_SEC_CERT) != 0, request->connect_timeout, &netconn); if(res != ERROR_SUCCESS) { - ERR("create_netconn failed: %u\n", res); + ERR("create_netconn failed: %lu\n", res); return res; } @@ -5040,7 +5040,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, res = NETCON_send(request->netconn, ascii_req, len, 0, &cnt); heap_free( ascii_req ); if(res != ERROR_SUCCESS) { - TRACE("send failed: %u\n", res); + TRACE("send failed: %lu\n", res); if(!reusing_connection) break; http_release_netconn(request, FALSE); @@ -5341,7 +5341,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ BOOL WINAPI HttpEndRequestA(HINTERNET hRequest, LPINTERNET_BUFFERSA lpBuffersOut, DWORD dwFlags, DWORD_PTR dwContext) { - TRACE("(%p, %p, %08x, %08lx)\n", hRequest, lpBuffersOut, dwFlags, dwContext); + TRACE("(%p, %p, %08lx, %08Ix)\n", hRequest, lpBuffersOut, dwFlags, dwContext); if (lpBuffersOut) { @@ -5384,7 +5384,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, http_request_t *request; DWORD res; - TRACE("%p %p %x %lx -->\n", hRequest, lpBuffersOut, dwFlags, dwContext); + TRACE("%p %p %lx %Ix -->\n", hRequest, lpBuffersOut, dwFlags, dwContext); if (lpBuffersOut) { @@ -5418,7 +5418,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, res = HTTP_HttpEndRequestW(request, dwFlags, dwContext); WININET_Release( &request->hdr ); - TRACE("%u <--\n", res); + TRACE("%lu <--\n", res); if(res != ERROR_SUCCESS) SetLastError(res); return res == ERROR_SUCCESS; @@ -5444,7 +5444,7 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET hRequest, DWORD headerlen; LPWSTR header = NULL; - TRACE("(%p, %p, %p, %08x, %08lx)\n", hRequest, lpBuffersIn, + TRACE("(%p, %p, %p, %08lx, %08Ix)\n", hRequest, lpBuffersIn, lpBuffersOut, dwFlags, dwContext); if (lpBuffersIn) @@ -5499,7 +5499,7 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, appinfo_t *hIC; DWORD res; - TRACE("(%p, %p, %p, %08x, %08lx)\n", hRequest, lpBuffersIn, + TRACE("(%p, %p, %p, %08lx, %08Ix)\n", hRequest, lpBuffersIn, lpBuffersOut, dwFlags, dwContext); request = (http_request_t*) get_handle_object( hRequest ); @@ -5592,7 +5592,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, appinfo_t *hIC = NULL; DWORD res = ERROR_SUCCESS; - TRACE("%p, %s, %i, %p, %i)\n", hHttpRequest, + TRACE("%p, %s, %li, %p, %li)\n", hHttpRequest, debugstr_wn(lpszHeaders, dwHeaderLength), dwHeaderLength, lpOptional, dwOptionalLength); request = (http_request_t*) get_handle_object( hHttpRequest ); @@ -6113,7 +6113,7 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR BOOL request_only = !!(dwModifier & HTTP_ADDHDR_FLAG_REQ); DWORD res = ERROR_HTTP_INVALID_HEADER; - TRACE("--> %s: %s - 0x%08x\n", debugstr_w(field), debugstr_w(value), dwModifier); + TRACE("--> %s: %s - 0x%08lx\n", debugstr_w(field), debugstr_w(value), dwModifier); EnterCriticalSection( &request->headers_section ); @@ -6229,7 +6229,7 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR res = ERROR_OUTOFMEMORY; } } - TRACE("<-- %d\n", res); + TRACE("<-- %ld\n", res); LeaveCriticalSection( &request->headers_section ); return res; } @@ -6266,7 +6266,7 @@ static INT HTTP_GetCustomHeaderIndex(http_request_t *request, LPCWSTR lpszField, if (index >= request->nCustHeaders) index = -1; - TRACE("Return: %d\n", index); + TRACE("Return: %ld\n", index); return index; } @@ -6334,6 +6334,6 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *request, DWORD index) */ BOOL WINAPI IsHostInProxyBypassList(INTERNET_SCHEME scheme, LPCSTR szHost, DWORD length) { - FIXME("STUB: scheme=%d host=%s length=%d\n", scheme, szHost, length); + FIXME("STUB: scheme=%d host=%s length=%ld\n", scheme, szHost, length); return FALSE; } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 59fae2fbc95..c17916bb2bd 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -163,7 +163,7 @@ void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t si object_header_t *WININET_AddRef( object_header_t *info ) { ULONG refs = InterlockedIncrement(&info->refs); - TRACE("%p -> refcount = %d\n", info, refs ); + TRACE("%p -> refcount = %ld\n", info, refs ); return info; } @@ -179,7 +179,7 @@ object_header_t *get_handle_object( HINTERNET hinternet ) LeaveCriticalSection( &WININET_cs ); - TRACE("handle %ld -> %p\n", handle, info); + TRACE("handle %Id -> %p\n", handle, info); return info; } @@ -205,7 +205,7 @@ static void invalidate_handle(object_header_t *info) BOOL WININET_Release( object_header_t *info ) { ULONG refs = InterlockedDecrement(&info->refs); - TRACE( "object %p refcount = %d\n", info, refs ); + TRACE( "object %p refcount = %ld\n", info, refs ); if( !refs ) { invalidate_handle(info); @@ -259,7 +259,7 @@ BOOL WININET_Release( object_header_t *info ) 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) { case DLL_PROCESS_ATTACH: @@ -755,7 +755,7 @@ static void dump_INTERNET_FLAGS(DWORD dwFlags) } } if (dwFlags) - TRACE(" Unknown flags (%08x)\n", dwFlags); + TRACE(" Unknown flags (%08lx)\n", dwFlags); else TRACE("\n"); } @@ -987,7 +987,7 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, DWORD i; const char *access_type_str = "Unknown"; - TRACE("(%s, %i, %s, %s, %i)\n", debugstr_w(lpszAgent), dwAccessType, + TRACE("(%s, %li, %s, %s, %li)\n", debugstr_w(lpszAgent), dwAccessType, debugstr_w(lpszProxy), debugstr_w(lpszProxyBypass), dwFlags); for (i = 0; i < ARRAY_SIZE(access_type); i++) { if (access_type[i].val == dwAccessType) { @@ -1051,7 +1051,7 @@ HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent, DWORD dwAccessType, WCHAR *szAgent, *szProxy, *szBypass; HINTERNET rc; - TRACE("(%s, 0x%08x, %s, %s, 0x%08x)\n", debugstr_a(lpszAgent), + TRACE("(%s, 0x%08lx, %s, %s, 0x%08lx)\n", debugstr_a(lpszAgent), dwAccessType, debugstr_a(lpszProxy), debugstr_a(lpszProxyBypass), dwFlags); szAgent = heap_strdupAtoW(lpszAgent); @@ -1170,7 +1170,7 @@ BOOL WINAPI InternetGetLastResponseInfoW(LPDWORD lpdwError, */ BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved) { - TRACE("(%p, 0x%08x)\n", lpdwStatus, dwReserved); + TRACE("(%p, 0x%08lx)\n", lpdwStatus, dwReserved); return InternetGetConnectedStateExW(lpdwStatus, NULL, 0, dwReserved); } @@ -1206,7 +1206,7 @@ BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved) BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnectionName, DWORD dwNameLen, DWORD dwReserved) { - TRACE("(%p, %p, %d, 0x%08x)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved); + TRACE("(%p, %p, %ld, 0x%08lx)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved); /* Must be zero */ if(dwReserved) @@ -1237,7 +1237,7 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD lpdwStatus, LPSTR lpszConnectio LPWSTR lpwszConnectionName = NULL; BOOL rc; - TRACE("(%p, %p, %d, 0x%08x)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved); + TRACE("(%p, %p, %ld, 0x%08lx)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved); if (lpszConnectionName && dwNameLen > 0) lpwszConnectionName = heap_alloc(dwNameLen * sizeof(WCHAR)); @@ -1272,7 +1272,7 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet, HINTERNET rc = NULL; DWORD res = ERROR_SUCCESS; - TRACE("(%p, %s, %u, %s, %p, %u, %x, %lx)\n", hInternet, debugstr_w(lpszServerName), + TRACE("(%p, %s, %u, %s, %p, %lu, %lx, %Ix)\n", hInternet, debugstr_w(lpszServerName), nServerPort, debugstr_w(lpszUserName), lpszPassword, dwService, dwFlags, dwContext); if (!lpszServerName) @@ -1439,7 +1439,7 @@ BOOL WINAPI InternetCloseHandle(HINTERNET hInternet) static BOOL set_url_component(WCHAR **component, DWORD *component_length, const WCHAR *value, DWORD len) { - TRACE("%s (%d)\n", debugstr_wn(value, len), len); + TRACE("%s (%ld)\n", debugstr_wn(value, len), len); if (!*component_length) return TRUE; @@ -1518,7 +1518,7 @@ BOOL WINAPI InternetCrackUrlA(const char *url, DWORD url_length, DWORD flags, UR WCHAR *url_w = NULL; BOOL ret; - TRACE("(%s %u %x %p)\n", url_length ? debugstr_an(url, url_length) : debugstr_a(url), url_length, flags, ret_comp); + TRACE("(%s %lu %lx %p)\n", url_length ? debugstr_an(url, url_length) : debugstr_a(url), url_length, flags, ret_comp); if (!url || !*url || !ret_comp || ret_comp->dwStructSize != sizeof(URL_COMPONENTSA)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -1609,7 +1609,7 @@ static INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, DWORD nMaxCmp) { int i; - TRACE("%s %d\n",debugstr_wn(lpszScheme, nMaxCmp), nMaxCmp); + TRACE("%s %ld\n",debugstr_wn(lpszScheme, nMaxCmp), nMaxCmp); if(lpszScheme==NULL) return INTERNET_SCHEME_UNKNOWN; @@ -1642,7 +1642,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF LPCWSTR lpszap; LPCWSTR lpszcp = NULL, lpszNetLoc; - TRACE("(%s %u %x %p)\n", + TRACE("(%s %lu %lx %p)\n", lpszUrl ? debugstr_wn(lpszUrl, dwUrlLength ? dwUrlLength : lstrlenW(lpszUrl)) : "(null)", dwUrlLength, dwFlags, lpUC); @@ -1994,7 +1994,7 @@ BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer, { HRESULT hr; - TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_a(lpszUrl), lpszBuffer, + TRACE("(%s, %p, %p, 0x%08lx) buffer length: %ld\n", debugstr_a(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); dwFlags = convert_url_canonicalization_flags(dwFlags); @@ -2020,7 +2020,7 @@ BOOL WINAPI InternetCanonicalizeUrlW(LPCWSTR lpszUrl, LPWSTR lpszBuffer, { HRESULT hr; - TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_w(lpszUrl), lpszBuffer, + TRACE("(%s, %p, %p, 0x%08lx) buffer length: %ld\n", debugstr_w(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); dwFlags = convert_url_canonicalization_flags(dwFlags); @@ -2109,7 +2109,7 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW( DWORD WINAPI InternetSetFilePointer(HINTERNET hFile, LONG lDistanceToMove, PVOID pReserved, DWORD dwMoveContext, DWORD_PTR dwContext) { - FIXME("(%p %d %p %d %lx): stub\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext); + FIXME("(%p %ld %p %ld %Ix): stub\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext); SetLastError(ERROR_INTERNET_INVALID_OPERATION); return INVALID_SET_FILE_POINTER; @@ -2131,7 +2131,7 @@ BOOL WINAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer, object_header_t *lpwh; BOOL res; - TRACE("(%p %p %d %p)\n", hFile, lpBuffer, dwNumOfBytesToWrite, lpdwNumOfBytesWritten); + TRACE("(%p %p %ld %p)\n", hFile, lpBuffer, dwNumOfBytesToWrite, lpdwNumOfBytesWritten); lpwh = get_handle_object( hFile ); if (!lpwh) { @@ -2171,7 +2171,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, object_header_t *hdr; DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; - TRACE("%p %p %d %p\n", hFile, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead); + TRACE("%p %p %ld %p\n", hFile, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead); hdr = get_handle_object(hFile); if (!hdr) { @@ -2187,7 +2187,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, WININET_Release(hdr); - TRACE("-- %s (%u) (bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", res, + TRACE("-- %s (%lu) (bytes read: %ld)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", res, pdwNumOfBytesRead ? *pdwNumOfBytesRead : -1); SetLastError(res); @@ -2227,7 +2227,7 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu object_header_t *hdr; DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; - TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffersOut, dwFlags, dwContext); + TRACE("(%p %p 0x%lx 0x%Ix)\n", hFile, lpBuffersOut, dwFlags, dwContext); if (lpBuffersOut->dwStructSize != sizeof(*lpBuffersOut)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -2246,7 +2246,7 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu WININET_Release(hdr); - TRACE("-- %s (%u, bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", + TRACE("-- %s (%lu, bytes read: %ld)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", res, lpBuffersOut->dwBufferLength); if(res != ERROR_SUCCESS) @@ -2265,7 +2265,7 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, object_header_t *hdr; DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; - TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffer, dwFlags, dwContext); + TRACE("(%p %p 0x%lx 0x%Ix)\n", hFile, lpBuffer, dwFlags, dwContext); if (!lpBuffer || lpBuffer->dwStructSize != sizeof(*lpBuffer)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -2284,7 +2284,7 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, WININET_Release(hdr); - TRACE("-- %s (%u, bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", + TRACE("-- %s (%lu, bytes read: %ld)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", res, lpBuffer->dwBufferLength); if(res != ERROR_SUCCESS) @@ -2331,7 +2331,7 @@ static WCHAR *detect_proxy_autoconfig_url_dhcp(void) for (ptr = adapters; ptr; ptr = ptr->Next) { MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) ); - TRACE( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled ); + TRACE( "adapter '%s' type %lu dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled ); if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; /* FIXME: also skip adapters where DHCP is disabled */ @@ -2621,12 +2621,12 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: - FIXME("Unhandled dwOption %d\n", optionW->dwOption); + FIXME("Unhandled dwOption %ld\n", optionW->dwOption); memset(&optionW->Value, 0, sizeof(optionW->Value)); break; default: - FIXME("Unknown dwOption %d\n", optionW->dwOption); + FIXME("Unknown dwOption %ld\n", optionW->dwOption); res = ERROR_INVALID_PARAMETER; break; } @@ -2654,7 +2654,7 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u return ERROR_SUCCESS; } - FIXME("Stub for %d\n", option); + FIXME("Stub for %ld\n", option); return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; } @@ -2683,7 +2683,7 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * case INTERNET_OPTION_MAX_CONNS_PER_SERVER: case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: - WARN("Called on global option %u\n", option); + WARN("Called on global option %lu\n", option); return ERROR_INTERNET_INVALID_OPERATION; } @@ -2707,7 +2707,7 @@ BOOL WINAPI InternetQueryOptionW(HINTERNET hInternet, DWORD dwOption, object_header_t *hdr; DWORD res = ERROR_INVALID_HANDLE; - TRACE("%p %d %p %p\n", hInternet, dwOption, lpBuffer, lpdwBufferLength); + TRACE("%p %ld %p %p\n", hInternet, dwOption, lpBuffer, lpdwBufferLength); if(hInternet) { hdr = get_handle_object(hInternet); @@ -2740,7 +2740,7 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption, object_header_t *hdr; DWORD res = ERROR_INVALID_HANDLE; - TRACE("%p %d %p %p\n", hInternet, dwOption, lpBuffer, lpdwBufferLength); + TRACE("%p %ld %p %p\n", hInternet, dwOption, lpBuffer, lpdwBufferLength); if(hInternet) { hdr = get_handle_object(hInternet); @@ -2765,11 +2765,11 @@ DWORD INET_SetOption(object_header_t *hdr, DWORD option, void *buf, DWORD size) collect_connections(COLLECT_CONNECTIONS); return ERROR_SUCCESS; case INTERNET_OPTION_CALLBACK: - WARN("Not settable option %u\n", option); + WARN("Not settable option %lu\n", option); return ERROR_INTERNET_OPTION_NOT_SETTABLE; case INTERNET_OPTION_MAX_CONNS_PER_SERVER: case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: - WARN("Called on global option %u\n", option); + WARN("Called on global option %lu\n", option); return ERROR_INTERNET_INVALID_OPERATION; case INTERNET_OPTION_REFRESH: return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; @@ -2782,7 +2782,7 @@ static DWORD set_global_option(DWORD option, void *buf, DWORD size) { switch(option) { case INTERNET_OPTION_CALLBACK: - WARN("Not global option %u\n", option); + WARN("Not global option %lu\n", option); return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; case INTERNET_OPTION_MAX_CONNS_PER_SERVER: @@ -2824,7 +2824,7 @@ static DWORD set_global_option(DWORD option, void *buf, DWORD size) if(size != sizeof(ULONG)) return ERROR_INTERNET_BAD_OPTION_LENGTH; - FIXME("%08x\n", *(ULONG*)buf); + FIXME("%08lx\n", *(ULONG*)buf); return ERROR_SUCCESS; } @@ -2848,7 +2848,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, BOOL ret = TRUE; DWORD res; - TRACE("(%p %d %p %d)\n", hInternet, dwOption, lpBuffer, dwBufferLength); + TRACE("(%p %ld %p %ld)\n", hInternet, dwOption, lpBuffer, dwBufferLength); lpwhh = (object_header_t*) get_handle_object( hInternet ); if(lpwhh) @@ -2871,7 +2871,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_HTTP_VERSION: { HTTP_VERSION_INFO* pVersion=(HTTP_VERSION_INFO*)lpBuffer; - FIXME("Option INTERNET_OPTION_HTTP_VERSION(%d,%d): STUB\n",pVersion->dwMajorVersion,pVersion->dwMinorVersion); + FIXME("Option INTERNET_OPTION_HTTP_VERSION(%ld,%ld): STUB\n",pVersion->dwMajorVersion,pVersion->dwMinorVersion); } break; case INTERNET_OPTION_ERROR_MASK: @@ -2888,7 +2888,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, SetLastError(ERROR_INTERNET_BAD_OPTION_LENGTH); ret = FALSE; } else { - TRACE("INTERNET_OPTION_ERROR_MASK: %x\n", *(ULONG*)lpBuffer); + TRACE("INTERNET_OPTION_ERROR_MASK: %lx\n", *(ULONG*)lpBuffer); lpwhh->ErrorMask = *(ULONG*)lpBuffer; } } @@ -2938,25 +2938,25 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_CODEPAGE: { ULONG codepage = *(ULONG *)lpBuffer; - FIXME("Option INTERNET_OPTION_CODEPAGE (%d): STUB\n", codepage); + FIXME("Option INTERNET_OPTION_CODEPAGE (%ld): STUB\n", codepage); } break; case INTERNET_OPTION_REQUEST_PRIORITY: { ULONG priority = *(ULONG *)lpBuffer; - FIXME("Option INTERNET_OPTION_REQUEST_PRIORITY (%d): STUB\n", priority); + FIXME("Option INTERNET_OPTION_REQUEST_PRIORITY (%ld): STUB\n", priority); } break; case INTERNET_OPTION_CONNECT_TIMEOUT: { ULONG connecttimeout = *(ULONG *)lpBuffer; - FIXME("Option INTERNET_OPTION_CONNECT_TIMEOUT (%d): STUB\n", connecttimeout); + FIXME("Option INTERNET_OPTION_CONNECT_TIMEOUT (%ld): STUB\n", connecttimeout); } break; case INTERNET_OPTION_DATA_RECEIVE_TIMEOUT: { ULONG receivetimeout = *(ULONG *)lpBuffer; - FIXME("Option INTERNET_OPTION_DATA_RECEIVE_TIMEOUT (%d): STUB\n", receivetimeout); + FIXME("Option INTERNET_OPTION_DATA_RECEIVE_TIMEOUT (%ld): STUB\n", receivetimeout); } break; case INTERNET_OPTION_RESET_URLCACHE_SESSION: @@ -2981,13 +2981,13 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_DATA_SEND_TIMEOUT: { ULONG timeout = *(ULONG *)lpBuffer; - FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT/DATA_SEND_TIMEOUT %d\n", timeout); + FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT/DATA_SEND_TIMEOUT %ld\n", timeout); break; } case INTERNET_OPTION_CONNECT_RETRIES: { ULONG retries = *(ULONG *)lpBuffer; - FIXME("INTERNET_OPTION_CONNECT_RETRIES %d\n", retries); + FIXME("INTERNET_OPTION_CONNECT_RETRIES %ld\n", retries); break; } case INTERNET_OPTION_CONTEXT_VALUE: @@ -3078,7 +3078,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, else { if(option->Value.dwValue != PROXY_TYPE_DIRECT) - FIXME("Unhandled flags: 0x%x\n", option->Value.dwValue); + FIXME("Unhandled flags: 0x%lx\n", option->Value.dwValue); pi.proxyEnabled = 0; } break; @@ -3094,11 +3094,11 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: - FIXME("Unhandled dwOption %d\n", option->dwOption); + FIXME("Unhandled dwOption %ld\n", option->dwOption); break; default: - FIXME("Unknown dwOption %d\n", option->dwOption); + FIXME("Unknown dwOption %ld\n", option->dwOption); SetLastError(ERROR_INVALID_PARAMETER); break; } @@ -3113,7 +3113,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; } default: - FIXME("Option %d STUB\n",dwOption); + FIXME("Option %ld STUB\n",dwOption); SetLastError(ERROR_INTERNET_INVALID_OPTION); ret = FALSE; break; @@ -3226,7 +3226,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, optW->Value.ftValue = optA->Value.ftValue; break; default: - WARN("Unknown PER_CONN dwOption: %d, guessing at conversion to Wide\n", optA->dwOption); + WARN("Unknown PER_CONN dwOption: %ld, guessing at conversion to Wide\n", optA->dwOption); optW->Value.dwValue = optA->Value.dwValue; break; } @@ -3275,7 +3275,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, BOOL WINAPI InternetSetOptionExA(HINTERNET hInternet, DWORD dwOption, LPVOID lpBuffer, DWORD dwBufferLength, DWORD dwFlags) { - FIXME("Flags %08x ignored\n", dwFlags); + FIXME("Flags %08lx ignored\n", dwFlags); return InternetSetOptionA( hInternet, dwOption, lpBuffer, dwBufferLength ); } @@ -3285,7 +3285,7 @@ BOOL WINAPI InternetSetOptionExA(HINTERNET hInternet, DWORD dwOption, BOOL WINAPI InternetSetOptionExW(HINTERNET hInternet, DWORD dwOption, LPVOID lpBuffer, DWORD dwBufferLength, DWORD dwFlags) { - FIXME("Flags %08x ignored\n", dwFlags); + FIXME("Flags %08lx ignored\n", dwFlags); if( dwFlags & ~ISO_VALID_FLAGS ) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -3310,7 +3310,7 @@ BOOL WINAPI InternetTimeFromSystemTimeA( const SYSTEMTIME* time, DWORD format, L BOOL ret; WCHAR stringW[INTERNET_RFC1123_BUFSIZE]; - TRACE( "%p 0x%08x %p 0x%08x\n", time, format, string, size ); + TRACE( "%p 0x%08lx %p 0x%08lx\n", time, format, string, size ); if (!time || !string || format != INTERNET_RFC1123_FORMAT) { @@ -3335,7 +3335,7 @@ BOOL WINAPI InternetTimeFromSystemTimeA( const SYSTEMTIME* time, DWORD format, L */ BOOL WINAPI InternetTimeFromSystemTimeW( const SYSTEMTIME* time, DWORD format, LPWSTR string, DWORD size ) { - TRACE( "%p 0x%08x %p 0x%08x\n", time, format, string, size ); + TRACE( "%p 0x%08lx %p 0x%08lx\n", time, format, string, size ); if (!time || !string || format != INTERNET_RFC1123_FORMAT) { @@ -3369,7 +3369,7 @@ BOOL WINAPI InternetTimeToSystemTimeA( LPCSTR string, SYSTEMTIME* time, DWORD re BOOL ret = FALSE; WCHAR *stringW; - TRACE( "%s %p 0x%08x\n", debugstr_a(string), time, reserved ); + TRACE( "%s %p 0x%08lx\n", debugstr_a(string), time, reserved ); stringW = heap_strdupAtoW(string); if (stringW) @@ -3389,7 +3389,7 @@ BOOL WINAPI InternetTimeToSystemTimeW( LPCWSTR string, SYSTEMTIME* time, DWORD r const WCHAR *s = string; WCHAR *end; - TRACE( "%s %p 0x%08x\n", debugstr_w(string), time, reserved ); + TRACE( "%s %p 0x%08lx\n", debugstr_w(string), time, reserved ); if (!string || !time) return FALSE; @@ -3482,7 +3482,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe INTERNET_PORT port; int status = -1; - FIXME("(%s %x %x)\n", debugstr_w(lpszUrl), dwFlags, dwReserved); + FIXME("(%s %lx %lx)\n", debugstr_w(lpszUrl), dwFlags, dwReserved); /* * Crack or set the Address @@ -3616,7 +3616,7 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, HINTERNET client = NULL, client1 = NULL; DWORD res; - TRACE("(%p, %s, %s, %08x, %08x, %08lx)\n", hIC, debugstr_w(lpszUrl), debugstr_w(lpszHeaders), + TRACE("(%p, %s, %s, %08lx, %08lx, %08Ix)\n", hIC, debugstr_w(lpszUrl), debugstr_w(lpszHeaders), dwHeadersLength, dwFlags, dwContext); urlComponents.dwHostNameLength = 1; @@ -3734,7 +3734,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, appinfo_t *hIC = NULL; if (TRACE_ON(wininet)) { - TRACE("(%p, %s, %s, %08x, %08x, %08lx)\n", hInternet, debugstr_w(lpszUrl), debugstr_w(lpszHeaders), + TRACE("(%p, %s, %s, %08lx, %08lx, %08Ix)\n", hInternet, debugstr_w(lpszUrl), debugstr_w(lpszHeaders), dwHeadersLength, dwFlags, dwContext); TRACE(" flags :"); dump_INTERNET_FLAGS(dwFlags); @@ -3971,7 +3971,7 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, object_header_t *hdr; DWORD res; - TRACE("(%p %p %x %lx)\n", hFile, lpdwNumberOfBytesAvailable, dwFlags, dwContext); + TRACE("(%p %p %lx %Ix)\n", hFile, lpdwNumberOfBytesAvailable, dwFlags, dwContext); hdr = get_handle_object( hFile ); if (!hdr) { @@ -4132,7 +4132,7 @@ BOOL WINAPI InternetCombineUrlA(LPCSTR lpszBaseUrl, LPCSTR lpszRelativeUrl, { HRESULT hr=S_OK; - TRACE("(%s, %s, %p, %p, 0x%08x)\n", debugstr_a(lpszBaseUrl), debugstr_a(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags); + TRACE("(%s, %s, %p, %p, 0x%08lx)\n", debugstr_a(lpszBaseUrl), debugstr_a(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags); /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ dwFlags ^= ICU_NO_ENCODE; @@ -4158,7 +4158,7 @@ BOOL WINAPI InternetCombineUrlW(LPCWSTR lpszBaseUrl, LPCWSTR lpszRelativeUrl, { HRESULT hr=S_OK; - TRACE("(%s, %s, %p, %p, 0x%08x)\n", debugstr_w(lpszBaseUrl), debugstr_w(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags); + TRACE("(%s, %s, %p, %p, 0x%08lx)\n", debugstr_w(lpszBaseUrl), debugstr_w(lpszRelativeUrl), lpszBuffer, lpdwBufferLength, dwFlags); /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ dwFlags ^= ICU_NO_ENCODE; @@ -4373,7 +4373,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags, LPWSTR urlW = NULL; URL_COMPONENTSW urlCompW; - TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); + TRACE("(%p,%ld,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); if (!lpUrlComponents || lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { @@ -4438,7 +4438,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, static const WCHAR slashSlashW[] = {'/','/'}; - TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); + TRACE("(%p,%ld,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); if (!lpUrlComponents || lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { @@ -4580,7 +4580,7 @@ static DWORD zone_preference = 3; */ DWORD WINAPI PrivacySetZonePreferenceW( DWORD zone, DWORD type, DWORD template, LPCWSTR preference ) { - FIXME( "%x %x %x %s: stub\n", zone, type, template, debugstr_w(preference) ); + FIXME( "%lx %lx %lx %s: stub\n", zone, type, template, debugstr_w(preference) ); zone_preference = template; return 0; @@ -4592,7 +4592,7 @@ DWORD WINAPI PrivacySetZonePreferenceW( DWORD zone, DWORD type, DWORD template, DWORD WINAPI PrivacyGetZonePreferenceW( DWORD zone, DWORD type, LPDWORD template, LPWSTR preference, LPDWORD length ) { - FIXME( "%x %x %p %p %p: stub\n", zone, type, template, preference, length ); + FIXME( "%lx %lx %p %p %p: stub\n", zone, type, template, preference, length ); if (template) *template = zone_preference; return 0; @@ -4664,7 +4664,7 @@ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags, DWORD_PTR* lpdwConnection, DWORD dwReserved ) { - FIXME("(%p, %p, 0x%08x, %p, 0x%08x) stub\n", hwndParent, lpszConnectoid, dwFlags, + FIXME("(%p, %p, 0x%08lx, %p, 0x%08lx) stub\n", hwndParent, lpszConnectoid, dwFlags, lpdwConnection, dwReserved); return ERROR_SUCCESS; } @@ -4672,26 +4672,26 @@ DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags DWORD WINAPI InternetDialW( HWND hwndParent, LPWSTR lpszConnectoid, DWORD dwFlags, DWORD_PTR* lpdwConnection, DWORD dwReserved ) { - FIXME("(%p, %p, 0x%08x, %p, 0x%08x) stub\n", hwndParent, lpszConnectoid, dwFlags, + FIXME("(%p, %p, 0x%08lx, %p, 0x%08lx) stub\n", hwndParent, lpszConnectoid, dwFlags, lpdwConnection, dwReserved); return ERROR_SUCCESS; } BOOL WINAPI InternetGoOnlineA( LPSTR lpszURL, HWND hwndParent, DWORD dwReserved ) { - FIXME("(%s, %p, 0x%08x) stub\n", debugstr_a(lpszURL), hwndParent, dwReserved); + FIXME("(%s, %p, 0x%08lx) stub\n", debugstr_a(lpszURL), hwndParent, dwReserved); return TRUE; } BOOL WINAPI InternetGoOnlineW( LPWSTR lpszURL, HWND hwndParent, DWORD dwReserved ) { - FIXME("(%s, %p, 0x%08x) stub\n", debugstr_w(lpszURL), hwndParent, dwReserved); + FIXME("(%s, %p, 0x%08lx) stub\n", debugstr_w(lpszURL), hwndParent, dwReserved); return TRUE; } DWORD WINAPI InternetHangUp( DWORD_PTR dwConnection, DWORD dwReserved ) { - FIXME("(0x%08lx, 0x%08x) stub\n", dwConnection, dwReserved); + FIXME("(0x%08Ix, 0x%08lx) stub\n", dwConnection, dwReserved); return ERROR_SUCCESS; } @@ -4705,13 +4705,13 @@ BOOL WINAPI CreateMD5SSOHash( PWSTR pszChallengeInfo, PWSTR pwszRealm, PWSTR pws BOOL WINAPI ResumeSuspendedDownload( HINTERNET hInternet, DWORD dwError ) { - FIXME("(%p, 0x%08x) stub\n", hInternet, dwError); + FIXME("(%p, 0x%08lx) stub\n", hInternet, dwError); return FALSE; } BOOL WINAPI InternetQueryFortezzaStatus(DWORD *a, DWORD_PTR b) { - FIXME("(%p, %08lx) stub\n", a, b); + FIXME("(%p, %08Ix) stub\n", a, b); return FALSE; } diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 71ce3401cdd..f89493967a2 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -81,7 +81,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR } if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { - WARN("error status %x\n", chain->TrustStatus.dwErrorStatus & ~supportedErrors); + WARN("error status %lx\n", chain->TrustStatus.dwErrorStatus & ~supportedErrors); err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; errors &= supportedErrors; if(!conn->mask_errors) @@ -181,9 +181,9 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_CN_INVALID; }else if(policyStatus.dwError) { - WARN("policyStatus.dwError %x\n", policyStatus.dwError); + WARN("policyStatus.dwError %lx\n", policyStatus.dwError); if(conn->mask_errors) - WARN("unknown error flags for policy status %x\n", policyStatus.dwError); + WARN("unknown error flags for policy status %lx\n", policyStatus.dwError); err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; } }else { @@ -192,7 +192,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR } if(err) { - WARN("failed %u\n", err); + WARN("failed %lu\n", err); CertFreeCertificateChain(chain); if(conn->server->cert_chain) { CertFreeCertificateChain(conn->server->cert_chain); @@ -251,7 +251,7 @@ static BOOL ensure_cred_handle(void) LeaveCriticalSection(&init_sechandle_cs); if(res != SEC_E_OK) { - WARN("Failed: %08x\n", res); + WARN("Failed: %08lx\n", res); return FALSE; } @@ -269,7 +269,7 @@ static BOOL WINAPI winsock_startup(INIT_ONCE *once, void *param, void **context) if(res == ERROR_SUCCESS) winsock_loaded = TRUE; else - ERR("WSAStartup failed: %u\n", res); + ERR("WSAStartup failed: %lu\n", res); return TRUE; } @@ -474,7 +474,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode if(out_buf.cbBuffer) { assert(status == SEC_I_CONTINUE_NEEDED); - TRACE("sending %u bytes\n", out_buf.cbBuffer); + TRACE("sending %lu bytes\n", out_buf.cbBuffer); size = sock_send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); if(size != out_buf.cbBuffer) { @@ -522,13 +522,13 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode break; } - TRACE("recv %lu bytes\n", size); + TRACE("recv %Iu bytes\n", size); in_bufs[0].cbBuffer += size; in_bufs[0].pvBuffer = read_buf; status = InitializeSecurityContextW(cred, &ctx, connection->server->name, isc_req_flags, 0, 0, &in_desc, 0, NULL, &out_desc, &attrs, NULL); - TRACE("InitializeSecurityContext ret %08x\n", status); + TRACE("InitializeSecurityContext ret %08lx\n", status); if(status == SEC_E_OK) { if(SecIsValidHandle(&connection->ssl_ctx)) @@ -549,7 +549,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode res = netconn_verify_cert(connection, cert, cert->hCertStore); CertFreeCertificateContext(cert); if(res != ERROR_SUCCESS) { - WARN("cert verify failed: %u\n", res); + WARN("cert verify failed: %lu\n", res); break; } }else { @@ -569,7 +569,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode heap_free(read_buf); if(status != SEC_E_OK || res != ERROR_SUCCESS) { - WARN("Failed to establish SSL connection: %08x (%u)\n", status, res); + WARN("Failed to establish SSL connection: %08lx (%lu)\n", status, res); heap_free(connection->ssl_buf); connection->ssl_buf = NULL; return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; @@ -775,7 +775,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, BOOL blo buf_len += size; continue; default: - WARN("failed: %08x\n", res); + WARN("failed: %08lx\n", res); return ERROR_INTERNET_CONNECTION_ABORTED; } } while(res != SEC_E_OK); @@ -862,7 +862,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, i } }while(!size && !eof); - TRACE("received %ld bytes\n", size); + TRACE("received %Id bytes\n", size); *recvd = size; return res; } @@ -898,7 +898,7 @@ int NETCON_GetCipherStrength(netconn_t *connection) res = QueryContextAttributesW(&connection->ssl_ctx, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); if(res != SEC_E_OK) - WARN("QueryContextAttributesW failed: %08x\n", res); + WARN("QueryContextAttributesW failed: %08lx\n", res); return res == SEC_E_OK ? conn_info.dwCipherStrength : 0; } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 22d0f5bf11d..8b175ea2b3c 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -291,7 +291,7 @@ static DWORD urlcache_entry_alloc(urlcache_header *header, DWORD blocks_needed, { DWORD index; - TRACE("Found free blocks starting at no. %d (0x%x)\n", block, ENTRY_START_OFFSET+block*BLOCKSIZE); + TRACE("Found free blocks starting at no. %ld (0x%lx)\n", block, ENTRY_START_OFFSET+block*BLOCKSIZE); for(index=0; index<blocks_needed; index++) urlcache_block_alloc(header->allocation_table, block+index); @@ -650,7 +650,7 @@ static DWORD cache_container_open_index(cache_container *container, DWORD blocks if(!container->mapping) { - ERR("Couldn't create file mapping (error is %d)\n", GetLastError()); + ERR("Couldn't create file mapping (error is %ld)\n", GetLastError()); ReleaseMutex(container->mutex); return GetLastError(); } @@ -711,7 +711,7 @@ static BOOL cache_containers_add(const char *cache_prefix, LPCWSTR path, if ((pContainer->mutex = CreateMutexW(NULL, FALSE, mutex_name)) == NULL) { - ERR("couldn't create mutex (error is %d)\n", GetLastError()); + ERR("couldn't create mutex (error is %ld)\n", GetLastError()); heap_free(pContainer->path); heap_free(pContainer); return FALSE; @@ -758,7 +758,7 @@ static void cache_containers_init(void) if (!SHGetSpecialFolderPathW(NULL, wszCachePath, DefaultContainerData[i].nFolder, TRUE)) { - ERR("Couldn't get path for default container %u\n", i); + ERR("Couldn't get path for default container %lu\n", i); continue; } path_len = lstrlenW(wszCachePath); @@ -893,7 +893,7 @@ static urlcache_header* cache_container_lock_index(cache_container *pContainer) if (!pIndexData) { ReleaseMutex(pContainer->mutex); - ERR("Couldn't MapViewOfFile. Error: %d\n", GetLastError()); + ERR("Couldn't MapViewOfFile. Error: %ld\n", GetLastError()); return NULL; } pHeader = (urlcache_header*)pIndexData; @@ -917,13 +917,13 @@ static urlcache_header* cache_container_lock_index(cache_container *pContainer) if (!pIndexData) { ReleaseMutex(pContainer->mutex); - ERR("Couldn't MapViewOfFile. Error: %d\n", GetLastError()); + ERR("Couldn't MapViewOfFile. Error: %ld\n", GetLastError()); return NULL; } pHeader = (urlcache_header*)pIndexData; } - TRACE("Signature: %s, file size: %d bytes\n", pHeader->signature, pHeader->size); + TRACE("Signature: %s, file size: %ld bytes\n", pHeader->signature, pHeader->size); for (index = 0; index < pHeader->dirs_no; index++) { @@ -1507,7 +1507,7 @@ static BOOL urlcache_find_hash_entry(const urlcache_header *pHeader, LPCSTR lpsz int i; if (pHashEntry->id != id++) { - ERR("Error: not right hash table number (%d) expected %d\n", pHashEntry->id, id); + ERR("Error: not right hash table number (%ld) expected %ld\n", pHashEntry->id, id); continue; } /* make sure that it is in fact a hash entry */ @@ -1599,7 +1599,7 @@ static DWORD urlcache_hash_entry_create(urlcache_header *pHeader, LPCSTR lpszUrl if (pHashEntry->id != id++) { - ERR("not right hash table number (%d) expected %d\n", pHashEntry->id, id); + ERR("not right hash table number (%ld) expected %ld\n", pHashEntry->id, id); break; } /* make sure that it is in fact a hash entry */ @@ -1644,7 +1644,7 @@ static BOOL urlcache_enum_hash_tables(const urlcache_header *pHeader, DWORD *id, for (*ppHashEntry = urlcache_get_hash_table(pHeader, pHeader->hash_table_off); *ppHashEntry; *ppHashEntry = urlcache_get_hash_table(pHeader, (*ppHashEntry)->next)) { - TRACE("looking at hash table number %d\n", (*ppHashEntry)->id); + TRACE("looking at hash table number %ld\n", (*ppHashEntry)->id); if ((*ppHashEntry)->id != *id) continue; /* make sure that it is in fact a hash entry */ @@ -1655,7 +1655,7 @@ static BOOL urlcache_enum_hash_tables(const urlcache_header *pHeader, DWORD *id, continue; } - TRACE("hash table number %d found\n", *id); + TRACE("hash table number %ld found\n", *id); return TRUE; } return FALSE; @@ -1681,10 +1681,10 @@ static BOOL urlcache_enum_hash_table_entries(const urlcache_header *pHeader, con continue; *ppHashEntry = &pHashEntry->hash_table[*index]; - TRACE("entry found %d\n", *index); + TRACE("entry found %ld\n", *index); return TRUE; } - TRACE("no more entries (%d)\n", *index); + TRACE("no more entries (%ld)\n", *index); return FALSE; } @@ -1763,10 +1763,10 @@ static BOOL urlcache_get_entry_info(const char *url, void *entry_info, cache_container *container; DWORD error; - TRACE("(%s, %p, %p, %x, %x)\n", debugstr_a(url), entry_info, size, flags, unicode); + TRACE("(%s, %p, %p, %lx, %x)\n", debugstr_a(url), entry_info, size, flags, unicode); if(flags & ~GET_INSTALLED_ENTRY) - FIXME("ignoring unsupported flags: %x\n", flags); + FIXME("ignoring unsupported flags: %lx\n", flags); error = cache_containers_find(url, &container); if(error != ERROR_SUCCESS) { @@ -1913,7 +1913,7 @@ static int urlcache_encode_url(const WCHAR *url, char *encoded_url, int encoded_ return 0; len += part_len; - TRACE("got (%d)%s\n", len, debugstr_a(encoded_url)); + TRACE("got (%ld)%s\n", len, debugstr_a(encoded_url)); return len; } @@ -1995,7 +1995,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA(LPCSTR lpszUrlName, cache_container *pContainer; DWORD error; - TRACE("(%s, %p, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, dwFieldControl); + TRACE("(%s, %p, 0x%08lx)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, dwFieldControl); error = cache_containers_find(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) @@ -2341,7 +2341,7 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) cache_container *container; DWORD path_len, err; - TRACE("(%s, %x, %x)\n", debugstr_w(cache_path), size, filter); + TRACE("(%s, %lx, %lx)\n", debugstr_w(cache_path), size, filter); if(size<1 || size>100) { SetLastError(ERROR_INVALID_PARAMETER); @@ -2450,7 +2450,7 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) delete_factor = delete_factor*rate_no/100; delete_factor = rate[delete_factor]; - TRACE("deleting files with rating %d or less\n", delete_factor); + TRACE("deleting files with rating %ld or less\n", delete_factor); hash_table_off = 0; while(urlcache_next_entry(header, &hash_table_off, &hash_table_entry, &hash_entry, &entry)) { @@ -2516,7 +2516,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA(LPCSTR lpszUrlName, DWORD dwReserved) cache_container *pContainer; DWORD error; - TRACE("(%s, 0x%08x)\n", debugstr_a(lpszUrlName), dwReserved); + TRACE("(%s, 0x%08lx)\n", debugstr_a(lpszUrlName), dwReserved); if (dwReserved) { @@ -2676,7 +2676,7 @@ static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_ full_path_len = MAX_PATH * sizeof(WCHAR); if(!urlcache_create_file_pathW(container, header, file_name, cache_dir, full_path, &full_path_len, TRUE)) { - WARN("Failed to get full path for filename %s, needed %u bytes.\n", + WARN("Failed to get full path for filename %s, needed %lu bytes.\n", debugstr_a(file_name), full_path_len); cache_container_unlock_index(container, header); return FALSE; @@ -2764,7 +2764,7 @@ BOOL WINAPI CreateUrlCacheEntryA(LPCSTR lpszUrlName, DWORD dwExpectedFileSize, WCHAR file_name[MAX_PATH]; if(dwReserved) - FIXME("dwReserved 0x%08x\n", dwReserved); + FIXME("dwReserved 0x%08lx\n", dwReserved); if(!urlcache_entry_create(lpszUrlName, lpszFileExtension, file_name)) return FALSE; @@ -2784,7 +2784,7 @@ BOOL WINAPI CreateUrlCacheEntryW(LPCWSTR lpszUrlName, DWORD dwExpectedFileSize, BOOL ret; if(dwReserved) - FIXME("dwReserved 0x%08x\n", dwReserved); + FIXME("dwReserved 0x%08lx\n", dwReserved); if(lpszFileExtension) { ext = heap_strdupWtoUTF8(lpszFileExtension); @@ -2827,7 +2827,7 @@ static BOOL urlcache_entry_commit(const char *url, const WCHAR *file_name, DWORD exempt_delta = 0; DWORD error; - TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n", debugstr_a(url), debugstr_w(file_name), + TRACE("(%s, %s, ..., ..., %lx, %p, %ld, %s, %s)\n", debugstr_a(url), debugstr_w(file_name), entry_type, header_info, header_size, debugstr_a(file_ext), debugstr_a(original_url)); if(entry_type & STICKY_CACHE_ENTRY && !file_name) { @@ -3141,7 +3141,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamA(LPCSTR lpszUrlName, stream_handle *stream; HANDLE file; - TRACE("(%s, %p, %p, %x, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, + TRACE("(%s, %p, %p, %x, 0x%08lx)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved); if(!RetrieveUrlCacheEntryFileA(lpszUrlName, lpCacheEntryInfo, @@ -3187,7 +3187,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW(LPCWSTR lpszUrlName, stream_handle *stream; HANDLE file; - TRACE("(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, + TRACE("(%s, %p, %p, %x, 0x%08lx)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved); if(!(len = urlcache_encode_url(lpszUrlName, NULL, 0))) @@ -3321,13 +3321,13 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) BOOL WINAPI DeleteUrlCacheContainerA(DWORD d1, DWORD d2) { - FIXME("(0x%08x, 0x%08x) stub\n", d1, d2); + FIXME("(0x%08lx, 0x%08lx) stub\n", d1, d2); return TRUE; } BOOL WINAPI DeleteUrlCacheContainerW(DWORD d1, DWORD d2) { - FIXME("(0x%08x, 0x%08x) stub\n", d1, d2); + FIXME("(0x%08lx, 0x%08lx) stub\n", d1, d2); return TRUE; } @@ -3337,7 +3337,7 @@ BOOL WINAPI DeleteUrlCacheContainerW(DWORD d1, DWORD d2) BOOL WINAPI CreateUrlCacheContainerA(DWORD d1, DWORD d2, DWORD d3, DWORD d4, DWORD d5, DWORD d6, DWORD d7, DWORD d8) { - FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x) stub\n", + FIXME("(0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx) stub\n", d1, d2, d3, d4, d5, d6, d7, d8); return TRUE; } @@ -3348,7 +3348,7 @@ BOOL WINAPI CreateUrlCacheContainerA(DWORD d1, DWORD d2, DWORD d3, DWORD d4, BOOL WINAPI CreateUrlCacheContainerW(DWORD d1, DWORD d2, DWORD d3, DWORD d4, DWORD d5, DWORD d6, DWORD d7, DWORD d8) { - FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x) stub\n", + FIXME("(0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx) stub\n", d1, d2, d3, d4, d5, d6, d7, d8); return TRUE; } @@ -3358,7 +3358,7 @@ BOOL WINAPI CreateUrlCacheContainerW(DWORD d1, DWORD d2, DWORD d3, DWORD d4, */ HANDLE WINAPI FindFirstUrlCacheContainerA( LPVOID p1, LPVOID p2, LPVOID p3, DWORD d1 ) { - FIXME("(%p, %p, %p, 0x%08x) stub\n", p1, p2, p3, d1 ); + FIXME("(%p, %p, %p, 0x%08lx) stub\n", p1, p2, p3, d1 ); return NULL; } @@ -3367,7 +3367,7 @@ HANDLE WINAPI FindFirstUrlCacheContainerA( LPVOID p1, LPVOID p2, LPVOID p3, DWOR */ HANDLE WINAPI FindFirstUrlCacheContainerW( LPVOID p1, LPVOID p2, LPVOID p3, DWORD d1 ) { - FIXME("(%p, %p, %p, 0x%08x) stub\n", p1, p2, p3, d1 ); + FIXME("(%p, %p, %p, 0x%08lx) stub\n", p1, p2, p3, d1 ); return NULL; } @@ -3401,7 +3401,7 @@ HANDLE WINAPI FindFirstUrlCacheEntryExA( LPVOID lpReserved3 ) { - FIXME("(%s, 0x%08x, 0x%08x, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern), + FIXME("(%s, 0x%08lx, 0x%08lx, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern), dwFlags, dwFilter, wine_dbgstr_longlong(GroupId), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3); SetLastError(ERROR_FILE_NOT_FOUND); @@ -3420,7 +3420,7 @@ HANDLE WINAPI FindFirstUrlCacheEntryExW( LPVOID lpReserved3 ) { - FIXME("(%s, 0x%08x, 0x%08x, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern), + FIXME("(%s, 0x%08lx, 0x%08lx, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern), dwFlags, dwFilter, wine_dbgstr_longlong(GroupId), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3); SetLastError(ERROR_FILE_NOT_FOUND); @@ -3642,7 +3642,7 @@ BOOL WINAPI FindCloseUrlCache(HANDLE hEnumHandle) HANDLE WINAPI FindFirstUrlCacheGroup( DWORD dwFlags, DWORD dwFilter, LPVOID lpSearchCondition, DWORD dwSearchCondition, GROUPID* lpGroupId, LPVOID lpReserved ) { - FIXME("(0x%08x, 0x%08x, %p, 0x%08x, %p, %p) stub\n", dwFlags, dwFilter, lpSearchCondition, + FIXME("(0x%08lx, 0x%08lx, %p, 0x%08lx, %p, %p) stub\n", dwFlags, dwFilter, lpSearchCondition, dwSearchCondition, lpGroupId, lpReserved); return NULL; } @@ -3687,7 +3687,7 @@ BOOL WINAPI FindNextUrlCacheGroup( HANDLE hFind, GROUPID* lpGroupId, LPVOID lpRe */ INTERNETAPI GROUPID WINAPI CreateUrlCacheGroup(DWORD dwFlags, LPVOID lpReserved) { - FIXME("(0x%08x, %p): stub\n", dwFlags, lpReserved); + FIXME("(0x%08lx, %p): stub\n", dwFlags, lpReserved); return FALSE; } @@ -3697,7 +3697,7 @@ INTERNETAPI GROUPID WINAPI CreateUrlCacheGroup(DWORD dwFlags, LPVOID lpReserved) */ BOOL WINAPI DeleteUrlCacheGroup(GROUPID GroupId, DWORD dwFlags, LPVOID lpReserved) { - FIXME("(0x%s, 0x%08x, %p) stub\n", + FIXME("(0x%s, 0x%08lx, %p) stub\n", wine_dbgstr_longlong(GroupId), dwFlags, lpReserved); return FALSE; } @@ -3708,7 +3708,7 @@ BOOL WINAPI DeleteUrlCacheGroup(GROUPID GroupId, DWORD dwFlags, LPVOID lpReserve */ BOOL WINAPI DeleteWpadCacheForNetworks(DWORD unk1) { - FIXME("(%d) stub\n", unk1); + FIXME("(%ld) stub\n", unk1); return FALSE; } @@ -3720,7 +3720,7 @@ BOOL WINAPI SetUrlCacheEntryGroupA(LPCSTR lpszUrlName, DWORD dwFlags, GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes, LPVOID lpReserved) { - FIXME("(%s, 0x%08x, 0x%s, %p, 0x%08x, %p) stub\n", + FIXME("(%s, 0x%08lx, 0x%s, %p, 0x%08lx, %p) stub\n", debugstr_a(lpszUrlName), dwFlags, wine_dbgstr_longlong(GroupId), pbGroupAttributes, cbGroupAttributes, lpReserved); SetLastError(ERROR_FILE_NOT_FOUND); @@ -3735,7 +3735,7 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes, LPVOID lpReserved) { - FIXME("(%s, 0x%08x, 0x%s, %p, 0x%08x, %p) stub\n", + FIXME("(%s, 0x%08lx, 0x%s, %p, 0x%08lx, %p) stub\n", debugstr_w(lpszUrlName), dwFlags, wine_dbgstr_longlong(GroupId), pbGroupAttributes, cbGroupAttributes, lpReserved); SetLastError(ERROR_FILE_NOT_FOUND); @@ -3767,7 +3767,7 @@ static cache_container *find_container(DWORD flags) break; default: - FIXME("flags %08x not handled\n", flags); + FIXME("flags %08lx not handled\n", flags); break; } } @@ -3783,7 +3783,7 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD s cache_container *container; DWORD error; - FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + FIXME("(%p, %p, %lx): semi-stub\n", info, size, flags); if (!info || !(container = find_container(flags))) { @@ -3823,7 +3823,7 @@ BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD s { INTERNET_CACHE_CONFIG_INFOW infoW; - TRACE("(%p, %p, %x)\n", info, size, flags); + TRACE("(%p, %p, %lx)\n", info, size, flags); if (!info) { @@ -3853,7 +3853,7 @@ BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttr LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, LPDWORD lpdwGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p, %p) stub\n", + FIXME("(0x%s, 0x%08lx, 0x%08lx, %p, %p, %p) stub\n", wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpdwGroupInfo, lpReserved); return FALSE; @@ -3863,7 +3863,7 @@ BOOL WINAPI GetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttr LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, LPDWORD lpdwGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p, %p) stub\n", + FIXME("(0x%s, 0x%08lx, 0x%08lx, %p, %p, %p) stub\n", wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpdwGroupInfo, lpReserved); return FALSE; @@ -3872,7 +3872,7 @@ BOOL WINAPI GetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttr BOOL WINAPI SetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p) stub\n", + FIXME("(0x%s, 0x%08lx, 0x%08lx, %p, %p) stub\n", wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpReserved); return TRUE; } @@ -3880,20 +3880,20 @@ BOOL WINAPI SetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttr BOOL WINAPI SetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p) stub\n", + FIXME("(0x%s, 0x%08lx, 0x%08lx, %p, %p) stub\n", wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpReserved); return TRUE; } BOOL WINAPI SetUrlCacheConfigInfoA( LPINTERNET_CACHE_CONFIG_INFOA lpCacheConfigInfo, DWORD dwFieldControl ) { - FIXME("(%p, 0x%08x) stub\n", lpCacheConfigInfo, dwFieldControl); + FIXME("(%p, 0x%08lx) stub\n", lpCacheConfigInfo, dwFieldControl); return TRUE; } BOOL WINAPI SetUrlCacheConfigInfoW( LPINTERNET_CACHE_CONFIG_INFOW lpCacheConfigInfo, DWORD dwFieldControl ) { - FIXME("(%p, 0x%08x) stub\n", lpCacheConfigInfo, dwFieldControl); + FIXME("(%p, 0x%08lx) stub\n", lpCacheConfigInfo, dwFieldControl); return TRUE; } @@ -3949,12 +3949,12 @@ BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR url, DWORD dwFlags, FILETIME* pftLast cache_container *pContainer; BOOL expired; - TRACE("(%s, %08x, %p)\n", debugstr_a(url), dwFlags, pftLastModified); + TRACE("(%s, %08lx, %p)\n", debugstr_a(url), dwFlags, pftLastModified); if (!url || !pftLastModified) return TRUE; if (dwFlags) - FIXME("unknown flags 0x%08x\n", dwFlags); + FIXME("unknown flags 0x%08lx\n", dwFlags); /* Any error implies that the URL is expired, i.e. not in the cache */ if (cache_containers_find(url, &pContainer)) @@ -4051,7 +4051,7 @@ BOOL WINAPI GetDiskInfoA(PCSTR path, PDWORD cluster_size, PDWORDLONG free, PDWOR */ DWORD WINAPI RegisterUrlCacheNotification(LPVOID a, DWORD b, DWORD c, DWORD d, DWORD e, DWORD f) { - FIXME("(%p %x %x %x %x %x)\n", a, b, c, d, e, f); + FIXME("(%p %lx %lx %lx %lx %lx)\n", a, b, c, d, e, f); return 0; } @@ -4060,7 +4060,7 @@ DWORD WINAPI RegisterUrlCacheNotification(LPVOID a, DWORD b, DWORD c, DWORD d, D */ BOOL WINAPI IncrementUrlCacheHeaderData(DWORD index, LPDWORD data) { - FIXME("(%u, %p)\n", index, data); + FIXME("(%lu, %p)\n", index, data); return FALSE; } diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index ba58c264c92..96d9d520ad9 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -225,7 +225,7 @@ static const char *debugstr_status_info(DWORD status, void *info) switch(status) { case INTERNET_STATUS_REQUEST_COMPLETE: { INTERNET_ASYNC_RESULT *iar = info; - return wine_dbg_sprintf("{%s, %d}", wine_dbgstr_longlong(iar->dwResult), iar->dwError); + return wine_dbg_sprintf("{%s, %ld}", wine_dbgstr_longlong(iar->dwResult), iar->dwError); } default: return wine_dbg_sprintf("%p", info); @@ -264,7 +264,7 @@ void INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR context, DWORD status } } - TRACE(" callback(%p) (%p (%p), %08lx, %d (%s), %s, %d)\n", + TRACE(" callback(%p) (%p (%p), %08Ix, %ld (%s), %s, %ld)\n", hdr->lpfnStatusCB, hdr->hInternet, hdr, context, status, get_callback_name(status), debugstr_status_info(status, new_info), info_len);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/winmm/Makefile.in | 2 - dlls/winmm/driver.c | 18 ++--- dlls/winmm/joystick.c | 24 +++--- dlls/winmm/lolvldrv.c | 16 ++-- dlls/winmm/mci.c | 70 +++++++++---------- dlls/winmm/mmio.c | 48 ++++++------- dlls/winmm/playsound.c | 14 ++-- dlls/winmm/time.c | 2 - dlls/winmm/waveform.c | 178 ++++++++++++++++++++++++------------------------ dlls/winmm/winmm.c | 50 +++++++------ 10 files changed, 211 insertions(+), 211 deletions(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index 0d1791b68e6..c515a3aba2e 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_WINMM_ +EXTRADEFS = -D_WINMM_ MODULE = winmm.dll IMPORTLIB = winmm IMPORTS = uuid user32 advapi32 ole32 msacm32 diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 0ddc81dc717..f8e20f09327 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -125,10 +125,10 @@ static inline LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg, { LRESULT ret; - TRACE("Before call32 proc=%p drvrID=%08lx hDrv=%p wMsg=%04x p1=%08lx p2=%08lx\n", + TRACE("Before call32 proc=%p drvrID=%08Ix hDrv=%p wMsg=%04x p1=%08Ix p2=%08Ix\n", lpDrv->lpDrvProc, lpDrv->dwDriverID, lpDrv, msg, lParam1, lParam2); ret = lpDrv->lpDrvProc(lpDrv->dwDriverID, (HDRVR)lpDrv, msg, lParam1, lParam2); - TRACE("After call32 proc=%p drvrID=%08lx hDrv=%p wMsg=%04x p1=%08lx p2=%08lx => %08lx\n", + TRACE("After call32 proc=%p drvrID=%08Ix hDrv=%p wMsg=%04x p1=%08Ix p2=%08Ix => %08Ix\n", lpDrv->lpDrvProc, lpDrv->dwDriverID, lpDrv, msg, lParam1, lParam2, ret); return ret; @@ -144,14 +144,14 @@ LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LPARAM lParam1, LPWINE_DRIVER lpDrv; LRESULT retval = 0; - TRACE("(%p, %04X, %08lX, %08lX)\n", hDriver, msg, lParam1, lParam2); + TRACE("(%p, %04X, %08IX, %08IX)\n", hDriver, msg, lParam1, lParam2); if ((lpDrv = DRIVER_FindFromHDrvr(hDriver)) != NULL) { retval = DRIVER_SendMessage(lpDrv, msg, lParam1, lParam2); } else { WARN("Bad driver handle %p\n", hDriver); } - TRACE("retval = %ld\n", retval); + TRACE("retval = %Id\n", retval); return retval; } @@ -278,7 +278,7 @@ LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2) LPWSTR ptr; LPCSTR cause = 0; - TRACE("(%s, %08lX);\n", debugstr_w(fn), lParam2); + TRACE("(%s, %08IX);\n", debugstr_w(fn), lParam2); if ((ptr = wcschr(fn, ' ')) != NULL) { *ptr++ = '\0'; @@ -382,7 +382,7 @@ HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lPar WCHAR libName[MAX_PATH + 1]; LPCWSTR lsn = lpSectionName; - TRACE("(%s, %s, 0x%08lx);\n", + TRACE("(%s, %s, 0x%08Ix);\n", debugstr_w(lpDriverName), debugstr_w(lpSectionName), lParam); DRIVER_Dump("BEFORE:"); @@ -418,7 +418,7 @@ LRESULT WINAPI CloseDriver(HDRVR hDrvr, LPARAM lParam1, LPARAM lParam2) BOOL ret; LPWINE_DRIVER lpDrv; - TRACE("(%p, %08lX, %08lX);\n", hDrvr, lParam1, lParam2); + TRACE("(%p, %08IX, %08IX);\n", hDrvr, lParam1, lParam2); DRIVER_Dump("BEFORE:"); @@ -545,7 +545,7 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, DWORD_PTR dwParam2) { BOOL ret = FALSE; - TRACE("(%08lX, %s %04X, %p, %04X, %08lX, %08lX, %08lX)\n", + TRACE("(%08IX, %s %04lX, %p, %04lX, %08IX, %08IX, %08IX)\n", dwCallBack, DRIVER_getCallback(uFlags), uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2); if (!dwCallBack) return ret; @@ -594,7 +594,7 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, break; #endif default: - WARN("Unknown callback type %d\n", uFlags & DCB_TYPEMASK); + WARN("Unknown callback type %ld\n", uFlags & DCB_TYPEMASK); return FALSE; } if (ret) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 5a6e1203513..52094504186 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -156,7 +156,7 @@ static BOOL WINAPI joystick_load_once( INIT_ONCE *once, void *param, void **cont { HRESULT hr = DirectInput8Create( hWinMM32Instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void **)&dinput, NULL ); - if (FAILED(hr)) ERR( "Could not create dinput instance, hr %#x\n", hr ); + if (FAILED(hr)) ERR( "Could not create dinput instance, hr %#lx\n", hr ); return TRUE; } @@ -191,7 +191,7 @@ static void find_joysticks(void) index = 0; IDirectInput8_EnumDevices( dinput, DI8DEVCLASS_ALL, enum_instances, &index, DIEDFL_ATTACHEDONLY ); - TRACE( "found %u device instances\n", index ); + TRACE( "found %lu device instances\n", index ); while (index--) { @@ -205,18 +205,18 @@ static void find_joysticks(void) } if (!(event = CreateEventW( NULL, FALSE, FALSE, NULL ))) - WARN( "could not event for device, error %u\n", GetLastError() ); + WARN( "could not event for device, error %lu\n", GetLastError() ); else if (FAILED(hr = IDirectInput8_CreateDevice( dinput, &instances[index].guidInstance, &device, NULL ))) - WARN( "could not create device %s instance, hr %#x\n", + WARN( "could not create device %s instance, hr %#lx\n", debugstr_guid( &instances[index].guidInstance ), hr ); else if (FAILED(hr = IDirectInputDevice8_SetEventNotification( device, event ))) - WARN( "SetEventNotification device %p hr %#x\n", device, hr ); + WARN( "SetEventNotification device %p hr %#lx\n", device, hr ); else if (FAILED(hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_NONEXCLUSIVE|DISCL_BACKGROUND ))) - WARN( "SetCooperativeLevel device %p hr %#x\n", device, hr ); + WARN( "SetCooperativeLevel device %p hr %#lx\n", device, hr ); else if (FAILED(hr = IDirectInputDevice8_SetDataFormat( device, &data_format ))) - WARN( "SetDataFormat device %p hr %#x\n", device, hr ); + WARN( "SetDataFormat device %p hr %#lx\n", device, hr ); else if (FAILED(hr = IDirectInputDevice8_Acquire( device ))) - WARN( "Acquire device %p hr %#x\n", device, hr ); + WARN( "Acquire device %p hr %#lx\n", device, hr ); else { TRACE( "opened device %p event %p\n", device, event ); @@ -295,7 +295,7 @@ static void CALLBACK joystick_timer( HWND hwnd, UINT msg, UINT_PTR timer, DWORD */ MMRESULT WINAPI joyConfigChanged(DWORD flags) { - FIXME( "flags %#x stub!\n", flags ); + FIXME( "flags %#lx stub!\n", flags ); if (flags) return JOYERR_PARMS; return JOYERR_NOERROR; } @@ -351,13 +351,13 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, JOYCAPSW *caps, U if (!(device = joysticks[id].device)) res = JOYERR_PARMS; else if (FAILED(hr = IDirectInputDevice8_GetCapabilities( device, &dicaps ))) { - WARN( "GetCapabilities device %p returned %#x\n", device, hr ); + WARN( "GetCapabilities device %p returned %#lx\n", device, hr ); res = JOYERR_PARMS; } else { hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &diprop.diph ); - if (FAILED(hr)) WARN( "GetProperty device %p returned %#x\n", device, hr ); + if (FAILED(hr)) WARN( "GetProperty device %p returned %#lx\n", device, hr ); else { caps->wMid = LOWORD(diprop.dwData); @@ -487,7 +487,7 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx( UINT id, JOYINFOEX *info ) res = JOYERR_PARMS; else if (FAILED(hr = IDirectInputDevice8_GetDeviceState( device, sizeof(struct joystick_state), &state ))) { - WARN( "GetDeviceState device %p returned %#x\n", device, hr ); + WARN( "GetDeviceState device %p returned %#lx\n", device, hr ); res = JOYERR_PARMS; } else diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index d3bd5536976..ff7e83398f1 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -97,7 +97,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, WINE_MM_DRIVER_PART* part; WINE_LLTYPE* llType = &llTypes[mld->type]; - TRACE("(%s %d %u 0x%08lx 0x%08lx 0x%08lx)\n", + TRACE("(%s %d %u 0x%08Ix 0x%08Ix 0x%08Ix)\n", llTypes[mld->type].typestr, mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); @@ -119,7 +119,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, assert(part->fnMessage32); - TRACE("Calling message(dev=%d msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx)\n", + TRACE("Calling message(dev=%d msg=%u usr=0x%08Ix p1=0x%08Ix p2=0x%08Ix)\n", mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); ret = part->fnMessage32(mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); TRACE("=> %s\n", WINMM_ErrorToString(ret)); @@ -195,7 +195,7 @@ DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwFlags) DWORD dwRet = MMSYSERR_BADDEVICEID; DWORD_PTR dwInstance; WINE_LLTYPE* llType = &llTypes[mld->type]; - TRACE("(%p, %04x, 0x%08lx, 0x%08x)\n", mld, wMsg, dwParam1, dwFlags); + TRACE("(%p, %04x, 0x%08Ix, 0x%08lx)\n", mld, wMsg, dwParam1, dwFlags); mld->dwDriverInstance = (DWORD_PTR)&dwInstance; @@ -286,7 +286,7 @@ UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, { WINE_MM_DRIVER* lpDrv = &MMDrvs[mld->mmdIndex]; - TRACE("(%p, %04x, %08lx, %08lx)\n", mld, uMsg, dwParam1, dwParam2); + TRACE("(%p, %04x, %08Ix, %08Ix)\n", mld, uMsg, dwParam1, dwParam2); /* all those function calls are undocumented */ switch (uMsg) { @@ -505,20 +505,20 @@ static void MMDRV_Init(void) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum); if(FAILED(hr)){ - ERR("CoCreateInstance failed: %08x\n", hr); + ERR("CoCreateInstance failed: %08lx\n", hr); goto exit; } hr = IMMDeviceEnumerator_GetDevice(devenum, L"Wine info device", &device); IMMDeviceEnumerator_Release(devenum); if(FAILED(hr)){ - ERR("GetDevice failed: %08x\n", hr); + ERR("GetDevice failed: %08lx\n", hr); goto exit; } hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); if(FAILED(hr)){ - ERR("OpenPropertyStore failed: %08x\n", hr); + ERR("OpenPropertyStore failed: %08lx\n", hr); IMMDevice_Release(device); goto exit; } @@ -528,7 +528,7 @@ static void MMDRV_Init(void) IPropertyStore_Release(ps); IMMDevice_Release(device); if(FAILED(hr)){ - ERR("GetValue failed: %08x\n", hr); + ERR("GetValue failed: %08lx\n", hr); goto exit; } diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 8e43dcc0f62..2aa74fd4127 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1112,7 +1112,7 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, break; case MCI_FLAG: *dwFlags |= flg; - TRACE("flag=%08x\n", flg); + TRACE("flag=%08lx\n", flg); break; case MCI_HWND: case MCI_HPAL: @@ -1122,13 +1122,13 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, data[offset] |= flg; *dwFlags |= cflg; inCst = FALSE; - TRACE("flag=%08x constant=%08x\n", cflg, flg); + TRACE("flag=%08lx constant=%08lx\n", cflg, flg); } else { *dwFlags |= flg; if (!MCI_GetDWord(&(data[offset]), &args)) { return MCIERR_BAD_INTEGER; } - TRACE("flag=%08x int=%d\n", flg, data[offset]); + TRACE("flag=%08lx int=%ld\n", flg, data[offset]); } break; case MCI_RECT: @@ -1140,13 +1140,13 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, !MCI_GetDWord(&(data[offset+3]), &args)) { return MCIERR_BAD_INTEGER; } - TRACE("flag=%08x for rectangle\n", flg); + TRACE("flag=%08lx for rectangle\n", flg); break; case MCI_STRING: *dwFlags |= flg; if ((dwRet = MCI_GetString((LPWSTR*)&data[offset], &args))) return dwRet; - TRACE("flag=%08x string=%s\n", flg, debugstr_w(*(LPWSTR*)&data[offset])); + TRACE("flag=%08lx string=%s\n", flg, debugstr_w(*(LPWSTR*)&data[offset])); break; default: ERR("oops\n"); } @@ -1287,7 +1287,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret swprintf(lpstrRet, uRetLen, L"%d %d %d %d", data[0], data[1], data[2], data[3]); break; } - default: FIXME("Unknown MCI return type %d\n", retType); + default: FIXME("Unknown MCI return type %ld\n", retType); } } return LOWORD(dwRet); @@ -1486,7 +1486,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, offset += sizeof(DWORD_PTR); break; default: - FIXME("Unknown MCI return type %d\n", retType); + FIXME("Unknown MCI return type %ld\n", retType); dwRet = MCIERR_PARSER_INTERNAL; goto errCleanUp; } @@ -1546,7 +1546,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, break; } - TRACE("[%d, %s, %08x, %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x]\n", + TRACE("[%d, %s, %08lx, %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx]\n", wmd ? wmd->wDeviceID : uDevID, MCI_MessageToString(wMsg), dwFlags, data.dw[0], data.dw[1], data.dw[2], data.dw[3], data.dw[4], data.dw[5], data.dw[6], data.dw[7], data.dw[8], data.dw[9]); @@ -1559,11 +1559,11 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, dwRet = MCI_SendCommand(wmd ? wmd->wDeviceID : uDevID, wMsg, dwFlags, (DWORD_PTR)&data); } if (!LOWORD(dwRet)) { - TRACE("=> 1/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); + TRACE("=> 1/ %lx (%s)\n", dwRet, debugstr_w(lpstrRet)); dwRet = MCI_HandleReturnValues(dwRet, wmd, retType, &data.generic, lpstrRet, uRetLen); - TRACE("=> 2/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); + TRACE("=> 2/ %lx (%s)\n", dwRet, debugstr_w(lpstrRet)); } else - TRACE("=> %x\n", dwRet); + TRACE("=> %lx\n", dwRet); errCleanUp: if (auto_open) { @@ -1625,7 +1625,7 @@ BOOL WINAPI mciExecute(LPCSTR lpstrCommand) ret = mciSendStringA(lpstrCommand, strRet, sizeof(strRet), 0); if (ret != 0) { if (!mciGetErrorStringA(ret, strRet, sizeof(strRet))) { - sprintf(strRet, "Unknown MCI error (%d)", ret); + sprintf(strRet, "Unknown MCI error (%ld)", ret); } MessageBoxA(0, strRet, "Error in mciExecute()", MB_OK); } @@ -1703,7 +1703,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) DWORD dwRet; LPWINE_MCIDRIVER wmd = NULL; - TRACE("(%08X, %p)\n", dwParam, lpParms); + TRACE("(%08lX, %p)\n", dwParam, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; /* only two low bytes are generic, the other ones are dev type specific */ @@ -1711,7 +1711,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) MCI_OPEN_ALIAS|MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID| \ MCI_NOTIFY|MCI_WAIT) if ((dwParam & ~WINE_MCIDRIVER_SUPP) != 0) - FIXME("Unsupported yet dwFlags=%08X\n", dwParam); + FIXME("Unsupported yet dwFlags=%08lX\n", dwParam); #undef WINE_MCIDRIVER_SUPP strDevTyp[0] = 0; @@ -1801,13 +1801,13 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) } if ((dwRet = MCI_FinishOpen(wmd, lpParms, dwParam))) { - TRACE("Failed to open driver (MCI_OPEN_DRIVER) [%08x], closing\n", dwRet); + TRACE("Failed to open driver (MCI_OPEN_DRIVER) [%08lx], closing\n", dwRet); /* FIXME: is dwRet the correct ret code ? */ goto errCleanUp; } /* only handled devices fall through */ - TRACE("wDevID=%04X wDeviceID=%d dwRet=%d\n", wmd->wDeviceID, lpParms->wDeviceID, dwRet); + TRACE("wDevID=%04X wDeviceID=%d dwRet=%ld\n", wmd->wDeviceID, lpParms->wDeviceID, dwRet); return 0; errCleanUp: @@ -1823,7 +1823,7 @@ static DWORD MCI_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) DWORD dwRet; LPWINE_MCIDRIVER wmd; - TRACE("(%04x, %08X, %p)\n", wDevID, dwParam, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwParam, lpParms); /* Every device must handle MCI_NOTIFY on its own. */ if ((UINT16)wDevID == (UINT16)MCI_ALL_DEVICE_ID) { @@ -1891,7 +1891,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (lpParms->lpstrReturn == NULL) return MCIERR_PARAM_OVERFLOW; - TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n", + TRACE("(%08x, %08lX, %p[num=%ld, wDevTyp=%u])\n", uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType); if ((WORD)MCI_ALL_DEVICE_ID == LOWORD(uDevID)) uDevID = MCI_ALL_DEVICE_ID; /* Be compatible with Win9x */ @@ -1945,7 +1945,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm } } *(DWORD*)lpParms->lpstrReturn = cnt; - TRACE("(%d) => '%d'\n", lpParms->dwNumber, *(DWORD*)lpParms->lpstrReturn); + TRACE("(%ld) => '%ld'\n", lpParms->dwNumber, *(DWORD*)lpParms->lpstrReturn); ret = MCI_INTEGER_RETURNED; /* return ret; Only Win9x sends a notification in this case. */ break; @@ -1958,7 +1958,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm ret = (uDevID == MCI_ALL_DEVICE_ID) ? MCIERR_CANNOT_USE_ALL : MCIERR_INVALID_DEVICE_NAME; } - TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); + TRACE("(%ld) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; case MCI_SYSINFO_NAME: s = NULL; @@ -1981,7 +1981,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm LeaveCriticalSection(&WINMM_cs); ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, s) : MCIERR_OUTOFRANGE; } else if (MCI_ALL_DEVICE_ID == uDevID) { - TRACE("MCI_SYSINFO_NAME: device #%d\n", lpParms->dwNumber); + TRACE("MCI_SYSINFO_NAME: device #%ld\n", lpParms->dwNumber); if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, wszHklmMci, 0, KEY_QUERY_VALUE, &hKey ) == ERROR_SUCCESS) { if (RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, @@ -1997,7 +1997,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm if (!s) { if (GetPrivateProfileStringW(L"MCI", 0, L"", buf, ARRAY_SIZE(buf), L"system.ini")) { for (p = buf; *p; p += lstrlenW(p) + 1, cnt++) { - TRACE("%d: %s\n", cnt, debugstr_w(p)); + TRACE("%ld: %s\n", cnt, debugstr_w(p)); if (cnt == lpParms->dwNumber - 1) { s = p; break; @@ -2018,10 +2018,10 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm ret = 0; } } - TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); + TRACE("(%ld) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; default: - TRACE("Unsupported flag value=%08x\n", dwFlags); + TRACE("Unsupported flag value=%08lx\n", dwFlags); ret = MCIERR_UNRECOGNIZED_KEYWORD; } if ((dwFlags & MCI_NOTIFY) && HRESULT_CODE(ret)==0) @@ -2039,7 +2039,7 @@ static DWORD MCI_Break(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms) if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - TRACE("(%08x, %08X, vkey %04X, hwnd %p)\n", wDevID, dwFlags, + TRACE("(%08x, %08lX, vkey %04X, hwnd %p)\n", wDevID, dwFlags, lpParms->nVirtKey, lpParms->hwndBreak); dwRet = MCI_SendCommandFrom32(wDevID, MCI_BREAK, dwFlags, (DWORD_PTR)lpParms); @@ -2131,7 +2131,7 @@ static LRESULT MCI_CleanUp(LRESULT dwRet, UINT wMsg, DWORD_PTR dwParam2) LPMCI_GETDEVCAPS_PARMS lmgp; lmgp = (LPMCI_GETDEVCAPS_PARMS)dwParam2; - TRACE("Changing %08x to %08x\n", lmgp->dwReturn, LOWORD(lmgp->dwReturn)); + TRACE("Changing %08lx to %08x\n", lmgp->dwReturn, LOWORD(lmgp->dwReturn)); lmgp->dwReturn = LOWORD(lmgp->dwReturn); } break; @@ -2154,7 +2154,7 @@ static LRESULT MCI_CleanUp(LRESULT dwRet, UINT wMsg, DWORD_PTR dwParam2) LPMCI_STATUS_PARMS lsp; lsp = (LPMCI_STATUS_PARMS)dwParam2; - TRACE("Changing %08lx to %08x\n", lsp->dwReturn, LOWORD(lsp->dwReturn)); + TRACE("Changing %08Ix to %08x\n", lsp->dwReturn, LOWORD(lsp->dwReturn)); lsp->dwReturn = LOWORD(lsp->dwReturn); } break; @@ -2175,7 +2175,7 @@ static LRESULT MCI_CleanUp(LRESULT dwRet, UINT wMsg, DWORD_PTR dwParam2) break; default: if (HIWORD(dwRet)) { - FIXME("Got non null hiword for dwRet=0x%08lx for command %s\n", + FIXME("Got non null hiword for dwRet=0x%08Ix for command %s\n", dwRet, MCI_MessageToString(wMsg)); } break; @@ -2253,7 +2253,7 @@ BOOL WINAPI mciSetDriverData(MCIDEVICEID uDeviceID, DWORD_PTR data) { LPWINE_MCIDRIVER wmd; - TRACE("(%04x, %08lx)\n", uDeviceID, data); + TRACE("(%04x, %08Ix)\n", uDeviceID, data); wmd = MCI_GetDriver(uDeviceID); @@ -2274,12 +2274,12 @@ DWORD WINAPI mciSendCommandW(MCIDEVICEID wDevID, UINT wMsg, DWORD_PTR dwParam1, { DWORD dwRet; - TRACE("(%08x, %s, %08lx, %08lx)\n", + TRACE("(%08x, %s, %08Ix, %08Ix)\n", wDevID, MCI_MessageToString(wMsg), dwParam1, dwParam2); dwRet = MCI_SendCommand(wDevID, wMsg, dwParam1, dwParam2); dwRet = MCI_CleanUp(dwRet, wMsg, dwParam2); - TRACE("=> %08x\n", dwRet); + TRACE("=> %08lx\n", dwRet); return dwRet; } @@ -2291,7 +2291,7 @@ DWORD WINAPI mciSendCommandA(MCIDEVICEID wDevID, UINT wMsg, DWORD_PTR dwParam1, DWORD ret; int mapped; - TRACE("(%08x, %s, %08lx, %08lx)\n", + TRACE("(%08x, %s, %08Ix, %08Ix)\n", wDevID, MCI_MessageToString(wMsg), dwParam1, dwParam2); mapped = MCI_MapMsgAtoW(wMsg, dwParam1, &dwParam2); @@ -2338,7 +2338,7 @@ static UINT WINAPI MCI_DefYieldProc(MCIDEVICEID wDevID, DWORD data) INT16 ret; MSG msg; - TRACE("(0x%04x, 0x%08x)\n", wDevID, data); + TRACE("(0x%04x, 0x%08lx)\n", wDevID, data); if ((HIWORD(data) != 0 && HWND_16(GetActiveWindow()) != HIWORD(data)) || (GetAsyncKeyState(LOWORD(data)) & 1) == 0) { @@ -2359,7 +2359,7 @@ BOOL WINAPI mciSetYieldProc(MCIDEVICEID uDeviceID, YIELDPROC fpYieldProc, DWORD { LPWINE_MCIDRIVER wmd; - TRACE("(%u, %p, %08x)\n", uDeviceID, fpYieldProc, dwYieldData); + TRACE("(%u, %p, %08lx)\n", uDeviceID, fpYieldProc, dwYieldData); if (!(wmd = MCI_GetDriver(uDeviceID))) { WARN("Bad uDeviceID\n"); @@ -2396,7 +2396,7 @@ UINT WINAPI mciGetDeviceIDFromElementIDW(DWORD dwElementID, LPCWSTR lpstrType) /* FIXME: that's rather strange, there is no * mciGetDeviceIDFromElementID32A in winmm.spec */ - FIXME("(%u, %s) stub\n", dwElementID, debugstr_w(lpstrType)); + FIXME("(%lu, %s) stub\n", dwElementID, debugstr_w(lpstrType)); return 0; } diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 1255cf69da2..352da62a215 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -97,7 +97,7 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, { LRESULT ret = MMSYSERR_NOERROR; - TRACE("(%p, %X, 0x%lx, 0x%lx);\n", lpmmioinfo, uMessage, lParam1, lParam2); + TRACE("(%p, %X, 0x%Ix, 0x%Ix);\n", lpmmioinfo, uMessage, lParam1, lParam2); switch (uMessage) { case MMIOM_OPEN: @@ -206,7 +206,7 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, static LRESULT CALLBACK mmioMemIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, LPARAM lParam1, LPARAM lParam2) { - TRACE("(%p,0x%04x,0x%08lx,0x%08lx)\n", lpmmioinfo, uMessage, lParam1, lParam2); + TRACE("(%p,0x%04x,0x%08Ix,0x%08Ix)\n", lpmmioinfo, uMessage, lParam1, lParam2); switch (uMessage) { @@ -310,7 +310,7 @@ static LPMMIOPROC MMIO_InstallIOProc(FOURCC fccIOProc, LPMMIOPROC pIOProc, struct IOProcList* pListNode; struct IOProcList** ppListNode; - TRACE("(%08x, %p, %08X, %s)\n", fccIOProc, pIOProc, dwFlags, is_unicode ? "unicode" : "ansi"); + TRACE("(%08lx, %p, %08lX, %s)\n", fccIOProc, pIOProc, dwFlags, is_unicode ? "unicode" : "ansi"); if (dwFlags & MMIO_GLOBALPROC) FIXME("Global procedures not implemented\n"); @@ -563,7 +563,7 @@ static LONG MMIO_GrabNextBuffer(LPWINE_MMIO wm, int for_read) { LONG size = wm->info.cchBuffer; - TRACE("bo=%x do=%x\n", + TRACE("bo=%lx do=%lx\n", wm->info.lBufOffset, wm->info.lDiskOffset); wm->info.lBufOffset = wm->info.lDiskOffset; @@ -590,10 +590,10 @@ static LONG MMIO_GrabNextBuffer(LPWINE_MMIO wm, int for_read) static MMRESULT MMIO_SetBuffer(WINE_MMIO* wm, void* pchBuffer, LONG cchBuffer, UINT uFlags) { - TRACE("(%p %p %d %u)\n", wm, pchBuffer, cchBuffer, uFlags); + TRACE("(%p %p %ld %u)\n", wm, pchBuffer, cchBuffer, uFlags); if (cchBuffer > 0xFFFF) - WARN("Untested handling of huge mmio buffers (%d >= 64k)\n", cchBuffer); + WARN("Untested handling of huge mmio buffers (%ld >= 64k)\n", cchBuffer); if (MMIO_Flush(wm, 0) != MMSYSERR_NOERROR) return MMIOERR_CANNOTWRITE; @@ -634,7 +634,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, MMIOINFO mmioinfo; DWORD pos; - TRACE("(%s, %p, %08X, %s);\n", debugstr_a(szFileName), refmminfo, dwOpenFlags, is_unicode ? "unicode" : "ansi"); + TRACE("(%s, %p, %08lX, %s);\n", debugstr_a(szFileName), refmminfo, dwOpenFlags, is_unicode ? "unicode" : "ansi"); if (!refmminfo) { refmminfo = &mmioinfo; @@ -801,7 +801,7 @@ LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch) LPWINE_MMIO wm; LONG count; - TRACE("(%p, %p, %d);\n", hmmio, pch, cch); + TRACE("(%p, %p, %ld);\n", hmmio, pch, cch); if ((wm = MMIO_Get(hmmio)) == NULL) return -1; @@ -842,7 +842,7 @@ LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch) mmioSeek(hmmio, 0, SEEK_CUR); } - TRACE("count=%d\n", count); + TRACE("count=%ld\n", count); return count; } @@ -854,7 +854,7 @@ LONG WINAPI mmioWrite(HMMIO hmmio, HPCSTR pch, LONG cch) LPWINE_MMIO wm; LONG count; - TRACE("(%p, %p, %d);\n", hmmio, pch, cch); + TRACE("(%p, %p, %ld);\n", hmmio, pch, cch); if ((wm = MMIO_Get(hmmio)) == NULL) return -1; @@ -895,7 +895,7 @@ LONG WINAPI mmioWrite(HMMIO hmmio, HPCSTR pch, LONG cch) wm->info.lBufOffset = wm->info.lDiskOffset; } - TRACE("bytes written=%d\n", count); + TRACE("bytes written=%ld\n", count); return count; } @@ -907,7 +907,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) LPWINE_MMIO wm; LONG offset; - TRACE("(%p, %08X, %d);\n", hmmio, lOffset, iOrigin); + TRACE("(%p, %08lX, %d);\n", hmmio, lOffset, iOrigin); if ((wm = MMIO_Get(hmmio)) == NULL) return MMSYSERR_INVALHANDLE; @@ -966,7 +966,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) else wm->info.pchNext = wm->info.pchBuffer + (offset - wm->info.lBufOffset); - TRACE("=> %d\n", offset); + TRACE("=> %ld\n", offset); return offset; } @@ -1019,7 +1019,7 @@ MMRESULT WINAPI mmioSetBuffer(HMMIO hmmio, LPSTR pchBuffer, LONG cchBuffer, UINT { LPWINE_MMIO wm; - TRACE("(hmmio=%p, pchBuf=%p, cchBuf=%d, uFlags=%#08x)\n", + TRACE("(hmmio=%p, pchBuf=%p, cchBuf=%ld, uFlags=%#08x)\n", hmmio, pchBuffer, cchBuffer, uFlags); if ((wm = MMIO_Get(hmmio)) == NULL) @@ -1154,7 +1154,7 @@ static LRESULT MMIO_SendMessage(HMMIO hmmio, UINT uMessage, LPARAM lParam1, { LPWINE_MMIO wm; - TRACE("(%p, %u, %ld, %ld, %s)\n", hmmio, uMessage, lParam1, lParam2, is_unicode ? "unicode" : "ansi"); + TRACE("(%p, %u, %Id, %Id, %s)\n", hmmio, uMessage, lParam1, lParam2, is_unicode ? "unicode" : "ansi"); if (uMessage < MMIOM_USER) return MMSYSERR_INVALPARAM; @@ -1190,10 +1190,10 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, return MMSYSERR_INVALPARAM; dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR); - TRACE("dwOldPos=%d\n", dwOldPos); + TRACE("dwOldPos=%ld\n", dwOldPos); if (lpckParent != NULL) { - TRACE("seek inside parent at %d !\n", lpckParent->dwDataOffset); + TRACE("seek inside parent at %ld !\n", lpckParent->dwDataOffset); /* EPP: was dwOldPos = mmioSeek(hmmio,lpckParent->dwDataOffset,SEEK_SET); */ if (dwOldPos < lpckParent->dwDataOffset || dwOldPos >= lpckParent->dwDataOffset + lpckParent->cksize) { @@ -1242,7 +1242,7 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, } lpck->dwDataOffset = dwOldPos + 2 * sizeof(DWORD); - TRACE("ckid=%s fcc=%s cksize=%08X !\n", + TRACE("ckid=%s fcc=%s cksize=%08lX !\n", debugstr_an((LPCSTR)&lpck->ckid, 4), srchType ? debugstr_an((LPCSTR)&lpck->fccType, 4) : "<na>", lpck->cksize); @@ -1266,7 +1266,7 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, mmioSeek(hmmio, lpck->dwDataOffset, SEEK_SET); lpck->fccType = 0; } - TRACE("lpck: ckid=%s, cksize=%d, dwDataOffset=%d fccType=%08X (%s)!\n", + TRACE("lpck: ckid=%s, cksize=%ld, dwDataOffset=%ld fccType=%08lX (%s)!\n", debugstr_an((LPSTR)&lpck->ckid, 4), lpck->cksize, lpck->dwDataOffset, lpck->fccType, srchType ? debugstr_an((LPSTR)&lpck->fccType, 4):""); return MMSYSERR_NOERROR; @@ -1284,10 +1284,10 @@ MMRESULT WINAPI mmioAscend(HMMIO hmmio, LPMMCKINFO lpck, UINT uFlags) TRACE("Chunk is dirty, checking if chunk's size is correct\n"); dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR); - TRACE("dwOldPos=%d lpck->dwDataOffset = %d\n", dwOldPos, lpck->dwDataOffset); + TRACE("dwOldPos=%ld lpck->dwDataOffset = %ld\n", dwOldPos, lpck->dwDataOffset); dwNewSize = dwOldPos - lpck->dwDataOffset; if (dwNewSize != lpck->cksize) { - TRACE("Nope: lpck->cksize=%d dwNewSize=%d\n", lpck->cksize, dwNewSize); + TRACE("Nope: lpck->cksize=%ld dwNewSize=%ld\n", lpck->cksize, dwNewSize); lpck->cksize = dwNewSize; /* pad odd size with 0 */ @@ -1318,7 +1318,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) TRACE("(%p, %p, %04X);\n", hmmio, lpck, uFlags); dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR); - TRACE("dwOldPos=%d\n", dwOldPos); + TRACE("dwOldPos=%ld\n", dwOldPos); if (uFlags == MMIO_CREATELIST) lpck->ckid = FOURCC_LIST; @@ -1335,7 +1335,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) lpck->dwFlags = MMIO_DIRTY; ix = mmioWrite(hmmio, (LPSTR)lpck, size); - TRACE("after mmioWrite ix = %d req = %d, errno = %d\n", ix, size, errno); + TRACE("after mmioWrite ix = %ld req = %ld, errno = %d\n", ix, size, errno); if (ix < size) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return CannotWrite\n"); @@ -1355,7 +1355,7 @@ MMRESULT WINAPI mmioRenameA(LPCSTR szFileName, LPCSTR szNewFileName, struct IOProcList tmp; FOURCC fcc; - TRACE("(%s, %s, %p, %08X);\n", + TRACE("(%s, %s, %p, %08lX);\n", debugstr_a(szFileName), debugstr_a(szNewFileName), lpmmioinfo, dwFlags); /* If both params are NULL, then parse the file name */ diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index d74e5a7af4a..0858f958583 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -159,7 +159,7 @@ static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg, break; case WOM_DONE: InterlockedIncrement(&s->dwEventCount); - TRACE("Returning waveHdr=%lx\n", dwParam1); + TRACE("Returning waveHdr=%Ix\n", dwParam1); SetEvent(s->hEvent); break; default: @@ -344,7 +344,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) if (mmioDescend(hmmio, &ckMainRIFF, NULL, 0)) goto errCleanUp; - TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08X\n", + TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&ckMainRIFF.ckid, (LPSTR)&ckMainRIFF.fccType, ckMainRIFF.cksize); if ((ckMainRIFF.ckid != FOURCC_RIFF) || @@ -355,7 +355,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) if (mmioDescend(hmmio, &mmckInfo, &ckMainRIFF, MMIO_FINDCHUNK)) goto errCleanUp; - TRACE("Chunk Found ckid=%.4s fccType=%08x cksize=%08X\n", + TRACE("Chunk Found ckid=%.4s fccType=%08lx cksize=%08lX\n", (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); @@ -366,8 +366,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag); TRACE("nChannels=%d\n", lpWaveFormat->nChannels); - TRACE("nSamplesPerSec=%d\n", lpWaveFormat->nSamplesPerSec); - TRACE("nAvgBytesPerSec=%d\n", lpWaveFormat->nAvgBytesPerSec); + TRACE("nSamplesPerSec=%ld\n", lpWaveFormat->nSamplesPerSec); + TRACE("nAvgBytesPerSec=%ld\n", lpWaveFormat->nAvgBytesPerSec); TRACE("nBlockAlign=%d\n", lpWaveFormat->nBlockAlign); TRACE("wBitsPerSample=%u !\n", lpWaveFormat->wBitsPerSample); @@ -378,7 +378,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) if (mmioDescend(hmmio, &mmckInfo, &ckMainRIFF, MMIO_FINDCHUNK)) goto errCleanUp; - TRACE("Chunk Found ckid=%.4s fccType=%08x cksize=%08X\n", + TRACE("Chunk Found ckid=%.4s fccType=%08lx cksize=%08lX\n", (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -469,7 +469,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo { WINE_PLAYSOUND* wps = NULL; - TRACE("pszSound='%p' hmod=%p fdwSound=%08X\n", + TRACE("pszSound='%p' hmod=%p fdwSound=%08lX\n", pszSound, hmod, fdwSound); /* SND_NOWAIT is ignored in w95/2k/xp. */ diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 634b5df7923..e00b5ca7b54 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -271,7 +271,7 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, WORD new_id = 0; int i; - TRACE("(%u, %u, %p, %08lX, %04X);\n", wDelay, wResol, lpFunc, dwUser, wFlags); + TRACE("(%u, %u, %p, %08IX, %04X);\n", wDelay, wResol, lpFunc, dwUser, wFlags); if (wDelay < MMSYSTIME_MININTERVAL || wDelay > MMSYSTIME_MAXINTERVAL) return 0; diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 66444ee82dc..ecd2acb8b28 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -737,18 +737,18 @@ static HRESULT reroute_mapper_device(WINMM_Device *device, BOOL is_out) hr = IAudioClient_Stop(device->client); if(FAILED(hr)) - WARN("Stop failed: %08x\n", hr); + WARN("Stop failed: %08lx\n", hr); hr = IAudioClock_GetFrequency(device->clock, &clock_freq); if(FAILED(hr)){ - WARN("GetFrequency failed: %08x\n", hr); + WARN("GetFrequency failed: %08lx\n", hr); LeaveCriticalSection(&device->lock); return hr; } hr = IAudioClock_GetPosition(device->clock, &clock_pos, NULL); if(FAILED(hr)){ - WARN("GetPosition failed: %08x\n", hr); + WARN("GetPosition failed: %08lx\n", hr); LeaveCriticalSection(&device->lock); return hr; } @@ -852,7 +852,7 @@ static HRESULT WINMM_InitMMDevices(void) hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(devenum, &g_notif); if(FAILED(hr)) - WARN("RegisterEndpointNotificationCallback failed: %08x\n", hr); + WARN("RegisterEndpointNotificationCallback failed: %08lx\n", hr); hr = WINMM_EnumDevices(&g_out_mmdevices, &g_out_map, &g_outmmdevices_count, eRender, devenum); @@ -890,7 +890,7 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt, HRESULT hr; MMRESULT mr; - TRACE("format: %u, channels: %u, sample rate: %u, bit depth: %u\n", + TRACE("format: %u, channels: %u, sample rate: %lu, bit depth: %lu\n", WAVE_FORMAT_PCM, channels, freq, bits_per_samp); target.wFormatTag = WAVE_FORMAT_PCM; @@ -929,7 +929,7 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, AC_BUFLEN, 0, &target, &device->parent->session); if(hr != S_OK){ - WARN("Initialize failed: %08x\n", hr); + WARN("Initialize failed: %08lx\n", hr); acmStreamClose(device->acm_handle, 0); device->acm_handle = NULL; return MMSYSERR_ERROR; @@ -1073,7 +1073,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, hr = IMMDeviceEnumerator_GetDevice(g_devenum, device->parent->dev_id, &device->device); if(FAILED(hr)){ - WARN("Device %s (%s) unavailable: %08x\n", + WARN("Device %s (%s) unavailable: %08lx\n", wine_dbgstr_w(device->parent->dev_id), wine_dbgstr_w(device->parent->out_caps.szPname), hr); ret = MMSYSERR_NODRIVER; @@ -1084,7 +1084,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, hr = IMMDevice_Activate(device->device, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&device->client); if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); + WARN("Activate failed: %08lx\n", hr); ret = hr2mmr(hr); if(ret == MMSYSERR_ERROR) ret = MMSYSERR_NOTENABLED; @@ -1114,7 +1114,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, device->orig_fmt->nBlockAlign = device->orig_fmt->nChannels * device->orig_fmt->wBitsPerSample/8; } if (device->orig_fmt->nAvgBytesPerSec != device->orig_fmt->nSamplesPerSec * device->orig_fmt->nBlockAlign) { - WARN("Fixing bad nAvgBytesPerSec (%u)\n", device->orig_fmt->nAvgBytesPerSec); + WARN("Fixing bad nAvgBytesPerSec (%lu)\n", device->orig_fmt->nAvgBytesPerSec); device->orig_fmt->nAvgBytesPerSec = device->orig_fmt->nSamplesPerSec * device->orig_fmt->nBlockAlign; } }else{ @@ -1146,7 +1146,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, if(ret != MMSYSERR_NOERROR || info->flags & WAVE_FORMAT_QUERY) goto error; }else{ - WARN("Initialize failed: %08x\n", hr); + WARN("Initialize failed: %08lx\n", hr); ret = hr2mmr(hr); goto error; } @@ -1158,14 +1158,14 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, hr = IAudioClient_GetService(device->client, &IID_IAudioClock, (void**)&device->clock); if(FAILED(hr)){ - WARN("GetService failed: %08x\n", hr); + WARN("GetService failed: %08lx\n", hr); goto error; } if(!device->event){ device->event = CreateEventW(NULL, FALSE, FALSE, NULL); if(!device->event){ - WARN("CreateEvent failed: %08x\n", hr); + WARN("CreateEvent failed: %08lx\n", hr); goto error; } @@ -1188,7 +1188,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, hr = IAudioClient_SetEventHandle(device->client, device->event); if(FAILED(hr)){ - WARN("SetEventHandle failed: %08x\n", hr); + WARN("SetEventHandle failed: %08lx\n", hr); goto error; } @@ -1287,14 +1287,14 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) hr = IAudioClient_GetService(device->client, &IID_IAudioRenderClient, (void**)&device->render); if(FAILED(hr)){ - ERR("GetService failed: %08x\n", hr); + ERR("GetService failed: %08lx\n", hr); goto error; } hr = IAudioClient_GetService(device->client, &IID_IAudioStreamVolume, (void**)&device->volume); if(FAILED(hr)){ - ERR("GetService failed: %08x\n", hr); + ERR("GetService failed: %08lx\n", hr); goto error; } @@ -1376,7 +1376,7 @@ static LRESULT WID_Open(WINMM_OpenInfo *info) hr = IAudioClient_GetService(device->client, &IID_IAudioCaptureClient, (void**)&device->capture); if(FAILED(hr)){ - WARN("GetService failed: %08x\n", hr); + WARN("GetService failed: %08lx\n", hr); goto error; } @@ -1583,13 +1583,13 @@ static WAVEHDR *WOD_MarkDoneHeaders(WINMM_Device *device) hr = IAudioClock_GetFrequency(device->clock, &clock_freq); if(FAILED(hr)){ - WARN("GetFrequency failed: %08x\n", hr); + WARN("GetFrequency failed: %08lx\n", hr); return NULL; } hr = IAudioClock_GetPosition(device->clock, &clock_pos, NULL); if(FAILED(hr)){ - WARN("GetPosition failed: %08x\n", hr); + WARN("GetPosition failed: %08lx\n", hr); return NULL; } @@ -1653,13 +1653,13 @@ static void WOD_PushData(WINMM_Device *device) hr = IAudioClient_GetBufferSize(device->client, &bufsize); if(FAILED(hr)){ - WARN("GetBufferSize failed: %08x\n", hr); + WARN("GetBufferSize failed: %08lx\n", hr); goto exit; } hr = IAudioClient_GetCurrentPadding(device->client, &pad); if(FAILED(hr)){ - WARN("GetCurrentPadding failed: %08x\n", hr); + WARN("GetCurrentPadding failed: %08lx\n", hr); goto exit; } @@ -1692,7 +1692,7 @@ static void WOD_PushData(WINMM_Device *device) hr = IAudioRenderClient_GetBuffer(device->render, avail_frames, &data); if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); goto exit; } @@ -1746,7 +1746,7 @@ static void WOD_PushData(WINMM_Device *device) hr = IAudioRenderClient_ReleaseBuffer(device->render, avail_frames, 0); if(FAILED(hr)){ - WARN("ReleaseBuffer failed: %08x\n", hr); + WARN("ReleaseBuffer failed: %08lx\n", hr); goto exit; } @@ -1784,7 +1784,7 @@ static void WID_PullACMData(WINMM_Device *device) &flags, NULL, NULL); if(hr != S_OK){ if(FAILED(hr)) - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); return; } @@ -1819,7 +1819,7 @@ static void WID_PullACMData(WINMM_Device *device) hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet); if(FAILED(hr)) - WARN("ReleaseBuffer failed: %08x\n", hr); + WARN("ReleaseBuffer failed: %08lx\n", hr); device->played_frames += packet; } @@ -1892,7 +1892,7 @@ static void WID_PullData(WINMM_Device *device) &flags, NULL, NULL); if(hr != S_OK){ if(FAILED(hr)) - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); else /* AUDCLNT_S_BUFFER_EMPTY success code */ IAudioCaptureClient_ReleaseBuffer(device->capture, 0); goto exit; @@ -1923,7 +1923,7 @@ static void WID_PullData(WINMM_Device *device) hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_len); if(FAILED(hr)) - WARN("ReleaseBuffer failed: %08x\n", hr); + WARN("ReleaseBuffer failed: %08lx\n", hr); if(packet > 0) WARN("losing %u frames\n", packet); @@ -1959,7 +1959,7 @@ static MMRESULT WINMM_BeginPlaying(WINMM_Device *device) hr = IAudioClient_Start(device->client); if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ device->stopped = TRUE; - WARN("Start failed: %08x\n", hr); + WARN("Start failed: %08lx\n", hr); return MMSYSERR_ERROR; } } @@ -1975,7 +1975,7 @@ static LRESULT WINMM_Pause(WINMM_Device *device) hr = IAudioClient_Stop(device->client); if(FAILED(hr)){ - WARN("Stop failed: %08x\n", hr); + WARN("Stop failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -2000,7 +2000,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) hr = IAudioClient_Stop(device->client); if(FAILED(hr)){ LeaveCriticalSection(&device->lock); - WARN("Stop failed: %08x\n", hr); + WARN("Stop failed: %08lx\n", hr); return MMSYSERR_ERROR; } device->stopped = TRUE; @@ -2123,7 +2123,7 @@ static MMRESULT WINMM_SetupMMDeviceVolume(WINMM_MMDevice *mmdevice) hr = IMMDeviceEnumerator_GetDevice(g_devenum, mmdevice->dev_id, &device); if(FAILED(hr)){ - WARN("Device %s (%s) unavailable: %08x\n", + WARN("Device %s (%s) unavailable: %08lx\n", wine_dbgstr_w(mmdevice->dev_id), wine_dbgstr_w(mmdevice->out_caps.szPname), hr); return MMSYSERR_ERROR; @@ -2132,7 +2132,7 @@ static MMRESULT WINMM_SetupMMDeviceVolume(WINMM_MMDevice *mmdevice) hr = IMMDevice_Activate(device, &IID_IAudioSessionManager, CLSCTX_INPROC_SERVER, NULL, (void**)&sesman); if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); + WARN("Activate failed: %08lx\n", hr); IMMDevice_Release(device); return MMSYSERR_ERROR; } @@ -2143,7 +2143,7 @@ static MMRESULT WINMM_SetupMMDeviceVolume(WINMM_MMDevice *mmdevice) FALSE, &mmdevice->volume); IAudioSessionManager_Release(sesman); if(FAILED(hr)){ - WARN("GetSimpleAudioVolume failed: %08x\n", hr); + WARN("GetSimpleAudioVolume failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -2186,7 +2186,7 @@ static LRESULT MXD_GetControlDetails(WINMM_ControlDetails *details) hr = ISimpleAudioVolume_GetMasterVolume(mmdevice->volume, &vol); if(FAILED(hr)){ - WARN("GetMasterVolume failed: %08x\n", hr); + WARN("GetMasterVolume failed: %08lx\n", hr); LeaveCriticalSection(&mmdevice->lock); return MMSYSERR_ERROR; } @@ -2205,7 +2205,7 @@ static LRESULT MXD_GetControlDetails(WINMM_ControlDetails *details) hr = ISimpleAudioVolume_GetMute(mmdevice->volume, &mute); if(FAILED(hr)){ - WARN("GetMute failed: %08x\n", hr); + WARN("GetMute failed: %08lx\n", hr); LeaveCriticalSection(&mmdevice->lock); return MMSYSERR_ERROR; } @@ -2269,7 +2269,7 @@ static LRESULT MXD_SetControlDetails(WINMM_ControlDetails *details) hr = ISimpleAudioVolume_SetMasterVolume(mmdevice->volume, vol, NULL); if(FAILED(hr)){ - WARN("SetMasterVolume failed: %08x\n", hr); + WARN("SetMasterVolume failed: %08lx\n", hr); LeaveCriticalSection(&mmdevice->lock); return MMSYSERR_ERROR; } @@ -2288,7 +2288,7 @@ static LRESULT MXD_SetControlDetails(WINMM_ControlDetails *details) hr = ISimpleAudioVolume_SetMute(mmdevice->volume, mute, NULL); if(FAILED(hr)){ - WARN("SetMute failed: %08x\n", hr); + WARN("SetMute failed: %08lx\n", hr); LeaveCriticalSection(&mmdevice->lock); return MMSYSERR_ERROR; } @@ -2342,13 +2342,13 @@ static LRESULT DRV_QueryDeviceInterface(WINMM_QueryInterfaceInfo *info) hr = IMMDeviceEnumerator_GetDevice(g_devenum, mmdevice->dev_id, &device); if(FAILED(hr)){ - WARN("Device %s unavailable: %08x\n", wine_dbgstr_w(mmdevice->dev_id), hr); + WARN("Device %s unavailable: %08lx\n", wine_dbgstr_w(mmdevice->dev_id), hr); return MMSYSERR_ERROR; } hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); + WARN("OpenPropertyStore failed: %08lx\n", hr); IMMDevice_Release(device); return MMSYSERR_ERROR; } @@ -2356,7 +2356,7 @@ static LRESULT DRV_QueryDeviceInterface(WINMM_QueryInterfaceInfo *info) PropVariantInit(&pv); hr = IPropertyStore_GetValue(ps, &deviceinterface_key, &pv); if(FAILED(hr)){ - WARN("GetValue failed: %08x\n", hr); + WARN("GetValue failed: %08lx\n", hr); IPropertyStore_Release(ps); IMMDevice_Release(device); return MMSYSERR_ERROR; @@ -2449,7 +2449,7 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); if(FAILED(hr)){ - WARN("CoInitializeEx failed: %08x\n", hr); + WARN("CoInitializeEx failed: %08lx\n", hr); FreeLibraryAndExitThread(g_devthread_module, 1); } @@ -2462,7 +2462,7 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&g_devenum); if(FAILED(hr)){ - WARN("CoCreateInstance failed: %08x\n", hr); + WARN("CoCreateInstance failed: %08lx\n", hr); CoUninitialize(); FreeLibraryAndExitThread(g_devthread_module, 1); } @@ -2470,7 +2470,7 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) g_devices_hwnd = CreateWindowW(L"Message", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL); if(!g_devices_hwnd){ - WARN("CreateWindow failed: %d\n", GetLastError()); + WARN("CreateWindow failed: %ld\n", GetLastError()); CoUninitialize(); FreeLibraryAndExitThread(g_devthread_module, 1); } @@ -2499,7 +2499,7 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) else WID_PullData(device); }else - WARN("Unexpected MsgWait result 0x%x, GLE: %d\n", wait, + WARN("Unexpected MsgWait result 0x%lx, GLE: %ld\n", wait, GetLastError()); if(WINMM_DevicesThreadDone()){ TRACE("Quitting devices thread\n"); @@ -2603,7 +2603,7 @@ UINT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, WAVEOUTCAPSW wocW; UINT ret; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -2635,7 +2635,7 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, WAVEOUTCAPSW mapper_caps, *caps; HRESULT hr; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -2735,7 +2735,7 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, WINMM_OpenInfo info; WINMM_CBInfo cb_info; - TRACE("(%p, %u, %p, %lx, %lx, %08x)\n", lphWaveOut, uDeviceID, lpFormat, + TRACE("(%p, %u, %p, %Ix, %Ix, %08lx)\n", lphWaveOut, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags); if(!lphWaveOut && !(dwFlags & WAVE_FORMAT_QUERY)) @@ -2864,7 +2864,7 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) return WAVERR_STILLPLAYING; } - TRACE("dwBufferLength: %u\n", header->dwBufferLength); + TRACE("dwBufferLength: %lu\n", header->dwBufferLength); if(device->acm_handle){ ACMSTREAMHEADER *ash = (ACMSTREAMHEADER*)header->reserved; @@ -3015,7 +3015,7 @@ UINT WINAPI waveOutGetPitch(HWAVEOUT hWaveOut, LPDWORD lpdw) */ UINT WINAPI waveOutSetPitch(HWAVEOUT hWaveOut, DWORD dw) { - TRACE("(%p, %08x)\n", hWaveOut, dw); + TRACE("(%p, %08lx)\n", hWaveOut, dw); return MMSYSERR_NOTSUPPORTED; } @@ -3035,7 +3035,7 @@ UINT WINAPI waveOutGetPlaybackRate(HWAVEOUT hWaveOut, LPDWORD lpdw) */ UINT WINAPI waveOutSetPlaybackRate(HWAVEOUT hWaveOut, DWORD dw) { - TRACE("(%p, %08x)\n", hWaveOut, dw); + TRACE("(%p, %08lx)\n", hWaveOut, dw); return MMSYSERR_NOTSUPPORTED; } @@ -3063,7 +3063,7 @@ UINT WINAPI waveOutGetVolume(HWAVEOUT hWaveOut, DWORD *out) hr = IAudioStreamVolume_GetChannelCount(device->volume, &channels); if(FAILED(hr)){ LeaveCriticalSection(&device->lock); - WARN("GetChannelCount failed: %08x\n", hr); + WARN("GetChannelCount failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -3077,7 +3077,7 @@ UINT WINAPI waveOutGetVolume(HWAVEOUT hWaveOut, DWORD *out) if(FAILED(hr)){ LeaveCriticalSection(&device->lock); HeapFree(GetProcessHeap(), 0, vols); - WARN("GetAllVolumes failed: %08x\n", hr); + WARN("GetAllVolumes failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -3102,7 +3102,7 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) float *vols; HRESULT hr; - TRACE("(%p, %08x)\n", hWaveOut, in); + TRACE("(%p, %08lx)\n", hWaveOut, in); device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut); @@ -3112,7 +3112,7 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) hr = IAudioStreamVolume_GetChannelCount(device->volume, &channels); if(FAILED(hr)){ LeaveCriticalSection(&device->lock); - WARN("GetChannelCount failed: %08x\n", hr); + WARN("GetChannelCount failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -3126,7 +3126,7 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) if(FAILED(hr)){ LeaveCriticalSection(&device->lock); HeapFree(GetProcessHeap(), 0, vols); - WARN("GetAllVolumes failed: %08x\n", hr); + WARN("GetAllVolumes failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -3138,7 +3138,7 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) if(FAILED(hr)){ LeaveCriticalSection(&device->lock); HeapFree(GetProcessHeap(), 0, vols); - WARN("SetAllVolumes failed: %08x\n", hr); + WARN("SetAllVolumes failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -3255,7 +3255,7 @@ static UINT get_device_interface(UINT msg, BOOL is_out, UINT index, WCHAR *out, UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%p, %u, %lx, %lx)\n", hWaveOut, uMessage, dwParam1, dwParam2); + TRACE("(%p, %u, %Ix, %Ix)\n", hWaveOut, uMessage, dwParam1, dwParam2); switch(uMessage){ case DRV_QUERYFUNCTIONINSTANCEIDSIZE: @@ -3317,7 +3317,7 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi WAVEINCAPSW mapper_caps, *caps; HRESULT hr; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -3364,7 +3364,7 @@ UINT WINAPI waveInGetDevCapsA(UINT_PTR uDeviceID, LPWAVEINCAPSA lpCaps, UINT uSi UINT ret; WAVEINCAPSW wicW; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -3397,7 +3397,7 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, WINMM_OpenInfo info; WINMM_CBInfo cb_info; - TRACE("(%p, %x, %p, %lx, %lx, %08x)\n", lphWaveIn, uDeviceID, lpFormat, + TRACE("(%p, %x, %p, %Ix, %Ix, %08lx)\n", lphWaveIn, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags); if(!lphWaveIn && !(dwFlags & WAVE_FORMAT_QUERY)) @@ -3661,7 +3661,7 @@ UINT WINAPI waveInGetID(HWAVEIN hWaveIn, UINT* lpuDeviceID) UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%p, %u, %ld, %ld)\n", hWaveIn, uMessage, dwParam1, dwParam2); + TRACE("(%p, %u, %Id, %Id)\n", hWaveIn, uMessage, dwParam1, dwParam2); switch(uMessage){ case DRV_QUERYFUNCTIONINSTANCEIDSIZE: @@ -3722,7 +3722,7 @@ UINT WINAPI mixerGetDevCapsA(UINT_PTR uDeviceID, LPMIXERCAPSA lpCaps, UINT uSize MIXERCAPSW micW; UINT ret; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -3752,7 +3752,7 @@ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize MIXERCAPSW caps; HRESULT hr; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -3801,7 +3801,7 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, MMRESULT mr; HRESULT hr; - TRACE("(%p, %d, %lx, %lx, %x)\n", lphMix, uDeviceID, dwCallback, + TRACE("(%p, %d, %Ix, %Ix, %lx)\n", lphMix, uDeviceID, dwCallback, dwInstance, fdwOpen); hr = WINMM_InitMMDevices(); @@ -3851,7 +3851,7 @@ UINT WINAPI mixerGetID(HMIXEROBJ hmix, LPUINT lpid, DWORD fdwID) WINMM_MMDevice *mmdevice; HRESULT hr; - TRACE("(%p, %p, %x)\n", hmix, lpid, fdwID); + TRACE("(%p, %p, %lx)\n", hmix, lpid, fdwID); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -3878,7 +3878,7 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW { WINMM_ControlDetails details; - TRACE("(%p, %p, %x)\n", hmix, lpmcdW, fdwDetails); + TRACE("(%p, %p, %lx)\n", hmix, lpmcdW, fdwDetails); if(!WINMM_StartDevicesThread()) return MMSYSERR_NODRIVER; @@ -3886,7 +3886,7 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW if(!lpmcdW || !lpmcdW->paDetails) return MMSYSERR_INVALPARAM; - TRACE("dwControlID: %u\n", lpmcdW->dwControlID); + TRACE("dwControlID: %lu\n", lpmcdW->dwControlID); details.hmix = hmix; details.details = lpmcdW; @@ -3904,7 +3904,7 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA { UINT ret = MMSYSERR_NOTSUPPORTED; - TRACE("(%p, %p, %08x)\n", hmix, lpmcdA, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hmix, lpmcdA, fdwDetails); if (lpmcdA == NULL || lpmcdA->cbStruct != sizeof(*lpmcdA)) return MMSYSERR_INVALPARAM; @@ -3949,7 +3949,7 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA } break; default: - WARN("Unsupported fdwDetails=0x%08x\n", fdwDetails); + WARN("Unsupported fdwDetails=0x%08lx\n", fdwDetails); } return ret; @@ -3965,7 +3965,7 @@ UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA, DWORD ret; unsigned int i; - TRACE("(%p, %p, %x)\n", hmix, lpmlcA, fdwControls); + TRACE("(%p, %p, %lx)\n", hmix, lpmlcA, fdwControls); if (lpmlcA == NULL || lpmlcA->cbStruct != sizeof(*lpmlcA) || lpmlcA->cbmxctrl != sizeof(MIXERCONTROLA)) @@ -4064,7 +4064,7 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, WINMM_MMDevice *mmdevice; HRESULT hr; - TRACE("(%p, %p, %08x)\n", hmix, lpmlcW, fdwControls); + TRACE("(%p, %p, %08lx)\n", hmix, lpmlcW, fdwControls); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -4075,16 +4075,16 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, MIXER_GETLINECONTROLSF_ONEBYTYPE | MIXER_OBJECTF_HMIXER | MIXER_OBJECTF_MIXER)){ - WARN("Unknown GetLineControls flag: %x\n", fdwControls); + WARN("Unknown GetLineControls flag: %lx\n", fdwControls); return MMSYSERR_INVALFLAG; } if(!lpmlcW || lpmlcW->cbStruct < sizeof(*lpmlcW) || !lpmlcW->pamxctrl) return MMSYSERR_INVALPARAM; - TRACE("dwLineID: %u\n", lpmlcW->dwLineID); - TRACE("dwControl: %x\n", lpmlcW->u.dwControlID); - TRACE("cControls: %u\n", lpmlcW->cControls); + TRACE("dwLineID: %lu\n", lpmlcW->dwLineID); + TRACE("dwControl: %lx\n", lpmlcW->u.dwControlID); + TRACE("cControls: %lu\n", lpmlcW->cControls); mmdevice = WINMM_GetMixerMMDevice(hmix, fdwControls, NULL); if(!mmdevice) @@ -4250,7 +4250,7 @@ static UINT WINMM_GetComponentTypeLineInfo(WINMM_MMDevice *mmdevice, return WINMM_GetSourceLineInfo(mmdevice, mmdev_index, info, flags); } - TRACE("Returning INVALLINE on this component type: %u\n", + TRACE("Returning INVALLINE on this component type: %lu\n", info->dwComponentType); return MIXERR_INVALLINE; @@ -4269,7 +4269,7 @@ static UINT WINMM_GetLineIDLineInfo(WINMM_MMDevice *mmdevice, return WINMM_GetSourceLineInfo(mmdevice, mmdev_index, info, flags); } - TRACE("Returning INVALLINE on this dwLineID: %u\n", info->dwLineID); + TRACE("Returning INVALLINE on this dwLineID: %lu\n", info->dwLineID); return MIXERR_INVALLINE; } @@ -4282,7 +4282,7 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo WINMM_MMDevice *mmdevice; HRESULT hr; - TRACE("(%p, %p, %x)\n", hmix, lpmliW, fdwInfo); + TRACE("(%p, %p, %lx)\n", hmix, lpmliW, fdwInfo); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -4291,11 +4291,11 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo if(!lpmliW || lpmliW->cbStruct < sizeof(MIXERLINEW)) return MMSYSERR_INVALPARAM; - TRACE("dwDestination: %u\n", lpmliW->dwDestination); - TRACE("dwSource: %u\n", lpmliW->dwSource); - TRACE("dwLineID: %u\n", lpmliW->dwLineID); - TRACE("fdwLine: 0x%x\n", lpmliW->fdwLine); - TRACE("dwComponentType: 0x%x\n", lpmliW->dwComponentType); + TRACE("dwDestination: %lu\n", lpmliW->dwDestination); + TRACE("dwSource: %lu\n", lpmliW->dwSource); + TRACE("dwLineID: %lu\n", lpmliW->dwLineID); + TRACE("fdwLine: 0x%lx\n", lpmliW->fdwLine); + TRACE("dwComponentType: 0x%lx\n", lpmliW->dwComponentType); if(fdwInfo & ~(MIXER_GETLINEINFOF_COMPONENTTYPE | MIXER_GETLINEINFOF_DESTINATION | @@ -4304,7 +4304,7 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo MIXER_GETLINEINFOF_TARGETTYPE | MIXER_OBJECTF_HMIXER | MIXER_OBJECTF_MIXER)){ - WARN("Unknown GetLineInfo flag: %x\n", fdwInfo); + WARN("Unknown GetLineInfo flag: %lx\n", fdwInfo); return MMSYSERR_INVALFLAG; } @@ -4330,7 +4330,7 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo return MIXERR_INVALLINE; } - TRACE("Returning INVALFLAG on these flags: %x\n", fdwInfo); + TRACE("Returning INVALFLAG on these flags: %lx\n", fdwInfo); return MMSYSERR_INVALFLAG; } @@ -4343,7 +4343,7 @@ UINT WINAPI mixerGetLineInfoA(HMIXEROBJ hmix, LPMIXERLINEA lpmliA, MIXERLINEW mliW; UINT ret; - TRACE("(%p, %p, %x)\n", hmix, lpmliA, fdwInfo); + TRACE("(%p, %p, %lx)\n", hmix, lpmliA, fdwInfo); if (lpmliA == NULL || lpmliA->cbStruct != sizeof(*lpmliA)) return MMSYSERR_INVALPARAM; @@ -4371,7 +4371,7 @@ UINT WINAPI mixerGetLineInfoA(HMIXEROBJ hmix, LPMIXERLINEA lpmliA, MultiByteToWideChar(CP_ACP, 0, lpmliA->Target.szPname, -1, mliW.Target.szPname, ARRAY_SIZE(mliW.Target.szPname)); break; default: - WARN("Unsupported fdwControls=0x%08x\n", fdwInfo); + WARN("Unsupported fdwControls=0x%08lx\n", fdwInfo); return MMSYSERR_INVALFLAG; } @@ -4412,7 +4412,7 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, WINMM_ControlDetails details; UINT ret; - TRACE("(%p, %p, %x)\n", hmix, lpmcd, fdwDetails); + TRACE("(%p, %p, %lx)\n", hmix, lpmcd, fdwDetails); if((fdwDetails & MIXER_SETCONTROLDETAILSF_QUERYMASK) == MIXER_SETCONTROLDETAILSF_CUSTOM) @@ -4424,7 +4424,7 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, if(!WINMM_StartDevicesThread()) return MMSYSERR_NODRIVER; - TRACE("dwControlID: %u\n", lpmcd->dwControlID); + TRACE("dwControlID: %lu\n", lpmcd->dwControlID); details.hmix = hmix; details.details = lpmcd; @@ -4441,7 +4441,7 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, */ DWORD WINAPI mixerMessage(HMIXER hmix, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%p, %d, %lx, %lx)\n", hmix, uMsg, dwParam1, dwParam2); + TRACE("(%p, %d, %Ix, %Ix)\n", hmix, uMsg, dwParam1, dwParam2); return MMSYSERR_NOTSUPPORTED; } diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index aa2dd50c4c1..31567d33c4f 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -136,7 +136,7 @@ const char* WINMM_ErrorToString(MMRESULT error) */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, fImpLoad); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -206,7 +206,7 @@ UINT WINAPI auxGetDevCapsW(UINT_PTR uDeviceID, LPAUXCAPSW lpCaps, UINT uSize) { LPWINE_MLD wmld; - TRACE("(%04lX, %p, %d) !\n", uDeviceID, lpCaps, uSize); + TRACE("(%04IX, %p, %d) !\n", uDeviceID, lpCaps, uSize); if (lpCaps == NULL) return MMSYSERR_INVALPARAM; @@ -263,7 +263,7 @@ UINT WINAPI auxSetVolume(UINT uDeviceID, DWORD dwVolume) { LPWINE_MLD wmld; - TRACE("(%04X, %u) !\n", uDeviceID, dwVolume); + TRACE("(%04X, %lu) !\n", uDeviceID, dwVolume); if ((wmld = MMDRV_Get((HANDLE)(DWORD_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; @@ -299,7 +299,7 @@ UINT WINAPI midiOutGetDevCapsW(UINT_PTR uDeviceID, LPMIDIOUTCAPSW lpCaps, { LPWINE_MLD wmld; - TRACE("(%lu, %p, %u);\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u);\n", uDeviceID, lpCaps, uSize); if (lpCaps == NULL) return MMSYSERR_INVALPARAM; @@ -425,7 +425,7 @@ MMRESULT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, LPWINE_MIDI lpwm; MMRESULT dwRet; - TRACE("(%p, %d, %08lX, %08lX, %08X);\n", + TRACE("(%p, %d, %08IX, %08IX, %08lX);\n", lphMidiOut, uDeviceID, dwCallback, dwInstance, dwFlags); if (lphMidiOut != NULL) *lphMidiOut = 0; @@ -513,7 +513,7 @@ UINT WINAPI midiOutShortMsg(HMIDIOUT hMidiOut, DWORD dwMsg) { LPWINE_MLD wmld; - TRACE("(%p, %08X)\n", hMidiOut, dwMsg); + TRACE("(%p, %08lX)\n", hMidiOut, dwMsg); if ((wmld = MMDRV_Get(hMidiOut, MMDRV_MIDIOUT, FALSE)) == NULL) return MMSYSERR_INVALHANDLE; @@ -574,7 +574,7 @@ UINT WINAPI midiOutSetVolume(HMIDIOUT hMidiOut, DWORD dwVolume) { LPWINE_MLD wmld; - TRACE("(%p, %d);\n", hMidiOut, dwVolume); + TRACE("(%p, %ld);\n", hMidiOut, dwVolume); if ((wmld = MMDRV_Get(hMidiOut, MMDRV_MIDIOUT, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; @@ -628,7 +628,7 @@ UINT WINAPI midiOutMessage(HMIDIOUT hMidiOut, UINT uMessage, { LPWINE_MLD wmld; - TRACE("(%p, %04X, %08lX, %08lX)\n", hMidiOut, uMessage, dwParam1, dwParam2); + TRACE("(%p, %04X, %08IX, %08IX)\n", hMidiOut, uMessage, dwParam1, dwParam2); if ((wmld = MMDRV_Get(hMidiOut, MMDRV_MIDIOUT, FALSE)) == NULL) { /* HACK... */ @@ -666,7 +666,7 @@ UINT WINAPI midiInGetDevCapsW(UINT_PTR uDeviceID, LPMIDIINCAPSW lpCaps, UINT uSi { LPWINE_MLD wmld; - TRACE("(%ld, %p, %d);\n", uDeviceID, lpCaps, uSize); + TRACE("(%Id, %p, %d);\n", uDeviceID, lpCaps, uSize); if (lpCaps == NULL) return MMSYSERR_INVALPARAM; @@ -711,7 +711,7 @@ MMRESULT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, LPWINE_MIDI lpwm; MMRESULT dwRet; - TRACE("(%p, %d, %08lX, %08lX, %08X);\n", + TRACE("(%p, %d, %08IX, %08IX, %08lX);\n", lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags); if (lphMidiIn != NULL) *lphMidiIn = 0; @@ -881,7 +881,7 @@ UINT WINAPI midiInMessage(HMIDIIN hMidiIn, UINT uMessage, { LPWINE_MLD wmld; - TRACE("(%p, %04X, %08lX, %08lX)\n", hMidiIn, uMessage, dwParam1, dwParam2); + TRACE("(%p, %04X, %08IX, %08IX)\n", hMidiIn, uMessage, dwParam1, dwParam2); if ((wmld = MMDRV_Get(hMidiIn, MMDRV_MIDIIN, FALSE)) == NULL) return MMSYSERR_INVALHANDLE; @@ -1129,7 +1129,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI lpMidiStrm->dwStartTicks = timeGetTime(); lpMidiHdr = (LPMIDIHDR)msg->lParam; lpData = (LPBYTE)lpMidiHdr->lpData; - TRACE("Adding %s lpMidiHdr=%p [lpData=0x%p dwBytesRecorded=%u/%u dwFlags=0x%08x size=%lu]\n", + TRACE("Adding %s lpMidiHdr=%p [lpData=0x%p dwBytesRecorded=%lu/%lu dwFlags=0x%08lx size=%Iu]\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", lpMidiHdr, lpData, lpMidiHdr->dwBytesRecorded, lpMidiHdr->dwBufferLength, lpMidiHdr->dwFlags, msg->wParam); @@ -1155,7 +1155,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI if (((LPMIDIEVENT)lpData)->dwStreamID != 0 && ((LPMIDIEVENT)lpData)->dwStreamID != 0xFFFFFFFF && ((LPMIDIEVENT)lpData)->dwStreamID != lpMidiStrm->dwStreamID) { - FIXME("Dropping bad %s lpMidiHdr (streamID=%08x)\n", + FIXME("Dropping bad %s lpMidiHdr (streamID=%08lx)\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", ((LPMIDIEVENT)lpData)->dwStreamID); lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; @@ -1235,7 +1235,7 @@ start_header: dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->position_usec / 1000; - TRACE("%u/%u/%u\n", dwToGo, timeGetTime(), me->dwDeltaTime); + TRACE("%lu/%lu/%lu\n", dwToGo, timeGetTime(), me->dwDeltaTime); while (dwToGo - (dwCurrTC = timeGetTime()) <= MAXLONG) { if (MsgWaitForMultipleObjects(0, NULL, FALSE, dwToGo - dwCurrTC, QS_ALLINPUT) == WAIT_OBJECT_0) { /* got a message, handle it */ @@ -1368,7 +1368,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, LPWINE_MIDI lpwm; HMIDIOUT hMidiOut; - TRACE("(%p, %p, %d, 0x%08lx, 0x%08lx, 0x%08x)!\n", + TRACE("(%p, %p, %ld, 0x%08Ix, 0x%08Ix, 0x%08lx)!\n", lphMidiStrm, lpuDeviceID, cMidi, dwCallback, dwInstance, fdwOpen); if (cMidi != 1 || lphMidiStrm == NULL || lpuDeviceID == NULL) @@ -1496,7 +1496,7 @@ static MMRESULT midistream_post_message_and_wait(WINE_MIDIStream* lpMidiStrm, UI ret = WaitForMultipleObjects(ARRAY_SIZE(hObjects), hObjects, FALSE, INFINITE); if (ret != WAIT_OBJECT_0) { CloseHandle(hObjects[0]); - WARN("bad WaitForSingleObject (%u)\n", ret); + WARN("bad WaitForSingleObject (%lu)\n", ret); return MMSYSERR_ERROR; } } @@ -1562,7 +1562,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm pulses = midistream_get_current_pulse(lpMidiStrm); lpMMT->u.midi.songptrpos = (pulses + tdiv/8) / (tdiv/4); if (!lpMMT->u.midi.songptrpos && pulses) lpMMT->u.midi.songptrpos++; - TRACE("=> song position %d (pulses %u, tdiv %u)\n", lpMMT->u.midi.songptrpos, pulses, tdiv); + TRACE("=> song position %ld (pulses %lu, tdiv %lu)\n", lpMMT->u.midi.songptrpos, pulses, tdiv); break; } /* fall through */ @@ -1572,18 +1572,18 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm /* fall through to alternative format */ case TIME_MS: lpMMT->u.ms = midistream_get_playing_position(lpMidiStrm); - TRACE("=> %d ms\n", lpMMT->u.ms); + TRACE("=> %ld ms\n", lpMMT->u.ms); break; case TIME_TICKS: lpMMT->u.ticks = midistream_get_current_pulse(lpMidiStrm); - TRACE("=> %d ticks\n", lpMMT->u.ticks); + TRACE("=> %ld ticks\n", lpMMT->u.ticks); break; default: FIXME("Unsupported time type %x\n", lpMMT->wType); /* use TIME_MS instead */ lpMMT->wType = TIME_MS; lpMMT->u.ms = midistream_get_playing_position(lpMidiStrm); - TRACE("=> %d ms\n", lpMMT->u.ms); + TRACE("=> %ld ms\n", lpMMT->u.ms); break; } LeaveCriticalSection(&lpMidiStrm->lock); @@ -1599,7 +1599,7 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD WINE_MIDIStream* lpMidiStrm; MMRESULT ret = MMSYSERR_NOERROR; - TRACE("(%p, %p, %x)\n", hMidiStrm, lpPropData, dwProperty); + TRACE("(%p, %p, %lx)\n", hMidiStrm, lpPropData, dwProperty); if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) { ret = MMSYSERR_INVALHANDLE; @@ -1613,10 +1613,10 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD ret = MMSYSERR_INVALPARAM; } else if (dwProperty & MIDIPROP_SET) { lpMidiStrm->dwTempo = mpt->dwTempo; - TRACE("Setting tempo to %d\n", mpt->dwTempo); + TRACE("Setting tempo to %ld\n", mpt->dwTempo); } else if (dwProperty & MIDIPROP_GET) { mpt->dwTempo = lpMidiStrm->dwTempo; - TRACE("Getting tempo <= %d\n", mpt->dwTempo); + TRACE("Getting tempo <= %ld\n", mpt->dwTempo); } LeaveCriticalSection(&lpMidiStrm->lock); } else if (dwProperty & MIDIPROP_TIMEDIV) { @@ -1628,14 +1628,14 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD EnterCriticalSection(&lpMidiStrm->lock); if (lpMidiStrm->status != MSM_STATUS_PLAYING) { lpMidiStrm->dwTimeDiv = mptd->dwTimeDiv; - TRACE("Setting time div to %d\n", mptd->dwTimeDiv); + TRACE("Setting time div to %ld\n", mptd->dwTimeDiv); } else ret = MMSYSERR_INVALPARAM; LeaveCriticalSection(&lpMidiStrm->lock); } else if (dwProperty & MIDIPROP_GET) { mptd->dwTimeDiv = lpMidiStrm->dwTimeDiv; - TRACE("Getting time div <= %d\n", mptd->dwTimeDiv); + TRACE("Getting time div <= %ld\n", mptd->dwTimeDiv); } } else { ret = MMSYSERR_INVALPARAM;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/winscard/Makefile.in | 1 - dlls/winscard/winscard.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winscard/Makefile.in b/dlls/winscard/Makefile.in index e162e6d3cda..89449698b66 100644 --- a/dlls/winscard/Makefile.in +++ b/dlls/winscard/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winscard.dll IMPORTLIB = winscard diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index d524483ffc3..accbaf75c3d 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -34,7 +34,7 @@ const SCARD_IO_REQUEST g_rgSCardRawPci = { SCARD_PROTOCOL_RAW, 8 }; 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) { @@ -84,14 +84,14 @@ LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT context, LPCWSTR reader, LPCWSTR LONG WINAPI SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext) { - FIXME("(%x,%p,%p,%p) stub\n", dwScope, pvReserved1, pvReserved2, phContext); + FIXME("(%lx,%p,%p,%p) stub\n", dwScope, pvReserved1, pvReserved2, phContext); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } LONG WINAPI SCardIsValidContext(SCARDCONTEXT context) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } @@ -105,21 +105,21 @@ LONG WINAPI SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, LPCGUID rgguid LONG WINAPI SCardReleaseContext(SCARDCONTEXT context) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } LONG WINAPI SCardStatusA(SCARDHANDLE context, LPSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } LONG WINAPI SCardStatusW(SCARDHANDLE context, LPWSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState,LPDWORD pdwProtocol,LPBYTE pbAtr,LPDWORD pcbArtLen) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } @@ -131,19 +131,19 @@ void WINAPI SCardReleaseStartedEvent(void) LONG WINAPI SCardListReadersA(SCARDCONTEXT context, const CHAR *groups, CHAR *readers, DWORD *buflen) { - FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); + FIXME("(%Ix, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); return SCARD_E_NO_READERS_AVAILABLE; } LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *buflen) { - FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); + FIXME("(%Ix, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); return SCARD_E_NO_READERS_AVAILABLE; } LONG WINAPI SCardCancel(SCARDCONTEXT context) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/winsta/Makefile.in | 1 - dlls/winsta/main.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winsta/Makefile.in b/dlls/winsta/Makefile.in index 19d7066367a..dcf29b6ccb1 100644 --- a/dlls/winsta/Makefile.in +++ b/dlls/winsta/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winsta.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 9ec4d64d0b6..8e054f14314 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsta); BOOLEAN WINAPI WinStationQueryInformationA( HANDLE server, ULONG logon_id, WINSTATIONINFOCLASS class, void *info, ULONG len, ULONG *ret_len ) { - FIXME( "%p %u %u %p %u %p\n", server, logon_id, class, info, len, ret_len ); + FIXME( "%p %lu %u %p %lu %p\n", server, logon_id, class, info, len, ret_len ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -38,14 +38,14 @@ BOOLEAN WINAPI WinStationQueryInformationA( HANDLE server, ULONG logon_id, WINST BOOLEAN WINAPI WinStationQueryInformationW( HANDLE server, ULONG logon_id, WINSTATIONINFOCLASS class, void *info, ULONG len, ULONG *ret_len ) { - FIXME( "%p %u %u %p %u %p\n", server, logon_id, class, info, len, ret_len ); + FIXME( "%p %lu %u %p %lu %p\n", server, logon_id, class, info, len, ret_len ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } BOOLEAN WINAPI WinStationRegisterConsoleNotification( HANDLE server, HWND hwnd, ULONG flags ) { - FIXME( "%p %p 0x%x\n", server, hwnd, flags ); + FIXME( "%p %p 0x%lx\n", server, hwnd, flags ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -60,7 +60,7 @@ BOOLEAN WINAPI WinStationUnRegisterConsoleNotification( HANDLE server, HWND hwnd BOOLEAN WINAPI WinStationGetAllProcesses( HANDLE server, ULONG level, ULONG *process_count, PTS_ALL_PROCESSES_INFO *info ) { - FIXME( "%p %u %p %p\n", server, level, process_count, info ); + FIXME( "%p %lu %p %p\n", server, level, process_count, info ); *process_count = 0; SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; @@ -69,7 +69,7 @@ BOOLEAN WINAPI WinStationGetAllProcesses( HANDLE server, ULONG level, BOOLEAN WINAPI WinStationGetProcessSid( HANDLE server, ULONG process_id, FILETIME *process_start_time, PVOID process_user_sid, PULONG sid_size ) { - FIXME( "(%p, %d, %p, %p, %p): stub\n", server, process_id, process_start_time, process_user_sid, sid_size); + FIXME( "(%p, %ld, %p, %p, %p): stub\n", server, process_id, process_start_time, process_user_sid, sid_size); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wintab32/Makefile.in | 1 - dlls/wintab32/context.c | 22 +++++++++++----------- dlls/wintab32/manager.c | 6 +++--- dlls/wintab32/wintab32.c | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index 56cfd6c2f41..050c78b86d3 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wintab32.dll IMPORTLIB = wintab32 IMPORTS = user32 advapi32 diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 2da04621934..58ba6b49074 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -102,7 +102,7 @@ static const char* DUMPBITS(int x) static inline void DUMPPACKET(WTPACKET packet) { - TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%x pkChanged: 0x%x pkSerialNumber: 0x%x pkCursor : %i pkButtons: %x pkX: %i pkY: %i pkZ: %i pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", + TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%lx pkChanged: 0x%lx pkSerialNumber: 0x%x pkCursor : %i pkButtons: %lx pkX: %li pkY: %li pkZ: %li pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", packet.pkContext, packet.pkStatus, packet.pkTime, packet.pkChanged, packet.pkSerialNumber, packet.pkCursor, packet.pkButtons, packet.pkX, packet.pkY, packet.pkZ, packet.pkNormalPressure, packet.pkTangentPressure, @@ -115,19 +115,19 @@ static inline void DUMPCONTEXT(LOGCONTEXTW lc) TRACE("Name: %s, Options: %x, Status: %x, Locks: %x, MsgBase: %x, Device: %x\n", wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice); TRACE("PktRate %x\n", lc.lcPktRate); - TRACE("PktData 0x%04x %s\n", lc.lcPktData, DUMPBITS(lc.lcPktData)); - TRACE("PktMode 0x%04x %s\n", lc.lcPktMode, DUMPBITS(lc.lcPktMode)); - TRACE("MovMask 0x%04x %s\n", lc.lcMoveMask, DUMPBITS(lc.lcMoveMask)); - TRACE("BtnDnMask: %x, BtnUpMask: %x\n", lc.lcBtnDnMask, lc.lcBtnUpMask); - TRACE("InOrgX: %i, InOrgY: %i, InOrgZ: %i\n", lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ); - TRACE("InExtX: %i, InExtY: %i, InExtZ: %i\n", lc.lcInExtX, lc.lcInExtY, lc.lcInExtZ); - TRACE("OutOrgX: %i, OutOrgY: %i, OutOrgZ: %i\n", lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ); - TRACE("OutExtX: %i, OutExtY: %i, OutExtZ: %i\n", lc.lcOutExtX, lc.lcOutExtY, lc.lcOutExtZ); - TRACE("SensX: %i, SensY: %i, SensZ: %i\n", lc.lcSensX, lc.lcSensY, lc.lcSensZ); + TRACE("PktData 0x%04lx %s\n", lc.lcPktData, DUMPBITS(lc.lcPktData)); + TRACE("PktMode 0x%04lx %s\n", lc.lcPktMode, DUMPBITS(lc.lcPktMode)); + TRACE("MovMask 0x%04lx %s\n", lc.lcMoveMask, DUMPBITS(lc.lcMoveMask)); + TRACE("BtnDnMask: %lx, BtnUpMask: %lx\n", lc.lcBtnDnMask, lc.lcBtnUpMask); + TRACE("InOrgX: %li, InOrgY: %li, InOrgZ: %li\n", lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ); + TRACE("InExtX: %li, InExtY: %li, InExtZ: %li\n", lc.lcInExtX, lc.lcInExtY, lc.lcInExtZ); + TRACE("OutOrgX: %li, OutOrgY: %li, OutOrgZ: %li\n", lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ); + TRACE("OutExtX: %li, OutExtY: %li, OutExtZ: %li\n", lc.lcOutExtX, lc.lcOutExtY, lc.lcOutExtZ); + TRACE("SensX: %li, SensY: %li, SensZ: %li\n", lc.lcSensX, lc.lcSensY, lc.lcSensZ); TRACE("SysMode: %i\n", lc.lcSysMode); TRACE("SysOrgX: %i, SysOrgY: %i\n", lc.lcSysOrgX, lc.lcSysOrgY); TRACE("SysExtX: %i, SysExtY: %i\n", lc.lcSysExtX, lc.lcSysExtY); - TRACE("SysSensX: %i, SysSensY: %i\n", lc.lcSysSensX, lc.lcSysSensY); + TRACE("SysSensX: %li, SysSensY: %li\n", lc.lcSysSensX, lc.lcSysSensY); } diff --git a/dlls/wintab32/manager.c b/dlls/wintab32/manager.c index d8d69554582..1a059f55f88 100644 --- a/dlls/wintab32/manager.c +++ b/dlls/wintab32/manager.c @@ -59,7 +59,7 @@ BOOL WINAPI WTMgrClose(HMGR hMgr) */ BOOL WINAPI WTMgrContextEnum(HMGR hMgr, WTENUMPROC lpEnumFunc, LPARAM lParam) { - FIXME("(%p, %p, %ld): stub\n", hMgr, lpEnumFunc, lParam); + FIXME("(%p, %p, %Id): stub\n", hMgr, lpEnumFunc, lParam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -190,7 +190,7 @@ BOOL WINAPI WTMgrPacketUnhook(HWTHOOK hHook) LRESULT WINAPI WTMgrPacketHookNext(HWTHOOK hHook, int nCode, WPARAM wParam, LPARAM lParam) { - FIXME("(%p, %d, %lu, %lu): stub\n", hHook, nCode, wParam, lParam); + FIXME("(%p, %d, %Iu, %Iu): stub\n", hHook, nCode, wParam, lParam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -243,7 +243,7 @@ BOOL WINAPI WTMgrCsrButtonMap(HMGR hMgr, UINT wCursor, BOOL WINAPI WTMgrCsrPressureBtnMarks(HMGR hMgr, UINT wCsr, DWORD dwNMarks, DWORD dwTMarks) { - FIXME("(%p, %u, %u, %u): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); + FIXME("(%p, %u, %lu, %lu): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index d56706b4223..b13c0573454 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -95,7 +95,7 @@ static HMODULE load_graphics_driver(void) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { - TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); + TRACE("%p, %lx, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH:
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wintab.dll16/Makefile.in | 1 - dlls/wintab.dll16/wintab.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wintab.dll16/Makefile.in b/dlls/wintab.dll16/Makefile.in index 7e39fc2ba69..05479200a09 100644 --- a/dlls/wintab.dll16/Makefile.in +++ b/dlls/wintab.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wintab.dll16 EXTRADLLFLAGS = -m16 -Wb,--main-module,wintab32.dll diff --git a/dlls/wintab.dll16/wintab.c b/dlls/wintab.dll16/wintab.c index cd8bcf6b66f..ccf5127c823 100644 --- a/dlls/wintab.dll16/wintab.c +++ b/dlls/wintab.dll16/wintab.c @@ -500,7 +500,7 @@ BOOL16 WINAPI WTMgrCsrButtonMap16(HMGR16 hMgr, UINT16 wCursor, BOOL16 WINAPI WTMgrCsrPressureBtnMarks16(HMGR16 hMgr, UINT16 wCsr, DWORD dwNMarks, DWORD dwTMarks) { - FIXME("(0x%04hx, %hu, %u, %u): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); + FIXME("(0x%04hx, %hu, %lu, %lu): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); return FALSE; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wintrust/Makefile.in | 1 dlls/wintrust/asn.c | 90 +++++++++++++++++++++-------------------- dlls/wintrust/crypt.c | 50 +++++++++++------------ dlls/wintrust/register.c | 4 +- dlls/wintrust/softpub.c | 36 ++++++++-------- dlls/wintrust/wintrust_main.c | 74 +++++++++++++++++----------------- 6 files changed, 127 insertions(+), 128 deletions(-) diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in index 01ace34cbb3..244f17f0728 100644 --- a/dlls/wintrust/Makefile.in +++ b/dlls/wintrust/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wintrust.dll IMPORTLIB = wintrust IMPORTS = crypt32 user32 advapi32 diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 72536e8b5b0..ef93c51de3b 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -100,7 +100,7 @@ static BOOL WINAPI CRYPT_AsnEncodeOctets(DWORD dwCertEncodingType, const CRYPT_DATA_BLOB *blob = pvStructInfo; DWORD bytesNeeded, lenBytes; - TRACE("(%d, %p), %p, %d\n", blob->cbData, blob->pbData, pbEncoded, + TRACE("(%ld, %p), %p, %ld\n", blob->cbData, blob->pbData, pbEncoded, *pcbEncoded); CRYPT_EncodeLen(blob->cbData, NULL, &lenBytes); @@ -131,7 +131,7 @@ BOOL WINAPI WVTAsn1SpcLinkEncode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + TRACE("(0x%08lx, %s, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); @@ -296,7 +296,7 @@ static BOOL CRYPT_AsnEncodeSequence(DWORD dwCertEncodingType, BOOL ret; DWORD i, dataLen = 0; - TRACE("%p, %d, %p, %d\n", items, cItem, pbEncoded, *pcbEncoded); + TRACE("%p, %ld, %p, %ld\n", items, cItem, pbEncoded, *pcbEncoded); for (i = 0, ret = TRUE; ret && i < cItem; i++) { ret = items[i].encodeFunc(dwCertEncodingType, NULL, @@ -472,7 +472,7 @@ BOOL WINAPI WVTAsn1SpcPeImageDataEncode(DWORD dwCertEncodingType, const SPC_PE_IMAGE_DATA *imageData = pvStructInfo; BOOL ret = FALSE; - TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + TRACE("(0x%08lx, %s, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); @@ -715,7 +715,7 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentEncode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + TRACE("(0x%08lx, %s, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); __TRY @@ -807,7 +807,7 @@ BOOL WINAPI WVTAsn1SpcSpOpusInfoEncode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + TRACE("(0x%08lx, %s, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); __TRY @@ -982,7 +982,7 @@ BOOL WINAPI WVTAsn1CatMemberInfoEncode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + TRACE("(0x%08lx, %s, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); __TRY @@ -1010,7 +1010,7 @@ BOOL WINAPI WVTAsn1CatNameValueEncode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + TRACE("(0x%08lx, %s, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); __TRY @@ -1060,7 +1060,7 @@ static BOOL WINAPI CRYPT_AsnEncodeBool(DWORD dwCertEncodingType, *pbEncoded++ = val ? 0xff : 0; ret = TRUE; } - TRACE("returning %d (%08x)\n", ret, GetLastError()); + TRACE("returning %d (%08lx)\n", ret, GetLastError()); return ret; } @@ -1070,7 +1070,7 @@ BOOL WINAPI WVTAsn1SpcFinancialCriteriaInfoEncode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + TRACE("(0x%08lx, %s, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); __TRY @@ -1174,7 +1174,7 @@ static BOOL WINAPI CRYPT_AsnDecodeOctets(DWORD dwCertEncodingType, BOOL ret; DWORD bytesNeeded, dataLen; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); if (!cbEncoded) @@ -1229,7 +1229,7 @@ static BOOL CRYPT_AsnDecodeSPCLinkInternal(DWORD dwCertEncodingType, BOOL ret = FALSE; DWORD bytesNeeded = sizeof(SPC_LINK), dataLen; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) @@ -1385,7 +1385,7 @@ BOOL WINAPI WVTAsn1SpcLinkDecode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); __TRY @@ -1486,7 +1486,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, DWORD i, decoded = 0; const BYTE *ptr = pbEncoded; - TRACE("%p, %d, %p, %d, %08x, %p, %p, %p\n", items, cItem, pbEncoded, + TRACE("%p, %ld, %p, %ld, %08lx, %p, %p, %p\n", items, cItem, pbEncoded, cbEncoded, dwFlags, pvStructInfo, nextData, cbDecoded); for (i = 0, ret = TRUE; ret && i < cItem; i++) @@ -1512,9 +1512,9 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, if (items[i].decodeFunc) { if (pvStructInfo) - TRACE("decoding item %d\n", i); + TRACE("decoding item %ld\n", i); else - TRACE("sizing item %d\n", i); + TRACE("sizing item %ld\n", i); ret = items[i].decodeFunc(dwCertEncodingType, NULL, ptr, 1 + nextItemLenBytes + nextItemLen, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, @@ -1529,30 +1529,30 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, /* Account for alignment padding */ items[i].size = ALIGN_DWORD_PTR(items[i].size); } - TRACE("item %d size: %d\n", i, items[i].size); + TRACE("item %ld size: %ld\n", i, items[i].size); if (nextData && items[i].hasPointer && items[i].size > items[i].minSize) nextData += items[i].size - items[i].minSize; ptr += 1 + nextItemLenBytes + nextItemLen; decoded += 1 + nextItemLenBytes + nextItemLen; - TRACE("item %d: decoded %d bytes\n", i, + TRACE("item %ld: decoded %ld bytes\n", i, 1 + nextItemLenBytes + nextItemLen); } else if (items[i].optional && GetLastError() == CRYPT_E_ASN1_BADTAG) { - TRACE("skipping optional item %d\n", i); + TRACE("skipping optional item %ld\n", i); items[i].size = items[i].minSize; SetLastError(NOERROR); ret = TRUE; } else - TRACE("item %d failed: %08x\n", i, + TRACE("item %ld failed: %08lx\n", i, GetLastError()); } else { - TRACE("item %d: decoded %d bytes\n", i, + TRACE("item %ld: decoded %ld bytes\n", i, 1 + nextItemLenBytes + nextItemLen); ptr += 1 + nextItemLenBytes + nextItemLen; decoded += 1 + nextItemLenBytes + nextItemLen; @@ -1561,12 +1561,12 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, } else if (items[i].optional) { - TRACE("skipping optional item %d\n", i); + TRACE("skipping optional item %ld\n", i); items[i].size = items[i].minSize; } else { - TRACE("item %d: tag %02x doesn't match expected %02x\n", + TRACE("item %ld: tag %02x doesn't match expected %02x\n", i, ptr[0], items[i].tag); SetLastError(CRYPT_E_ASN1_BADTAG); ret = FALSE; @@ -1575,12 +1575,12 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, } else if (items[i].optional) { - TRACE("missing optional item %d, skipping\n", i); + TRACE("missing optional item %ld, skipping\n", i); items[i].size = items[i].minSize; } else { - TRACE("not enough bytes for item %d, failing\n", i); + TRACE("not enough bytes for item %ld, failing\n", i); SetLastError(CRYPT_E_ASN1_CORRUPT); ret = FALSE; } @@ -1605,7 +1605,7 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, { BOOL ret; - TRACE("%p, %d, %p, %d, %08x, %p, %d, %p\n", items, cItem, pbEncoded, + TRACE("%p, %ld, %p, %ld, %08lx, %p, %ld, %p\n", items, cItem, pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo, startingPointer); if (pbEncoded[0] == ASN_SEQUENCE) @@ -1620,7 +1620,7 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, cbEncoded -= 1 + lenBytes; if (cbEncoded < dataLen) { - TRACE("dataLen %d exceeds cbEncoded %d, failing\n", dataLen, + TRACE("dataLen %ld exceeds cbEncoded %ld, failing\n", dataLen, cbEncoded); SetLastError(CRYPT_E_ASN1_CORRUPT); ret = FALSE; @@ -1630,7 +1630,7 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, cbEncoded, dwFlags, NULL, NULL, &cbDecoded); if (ret && cbDecoded != dataLen) { - TRACE("expected %d decoded, got %d, failing\n", dataLen, + TRACE("expected %ld decoded, got %ld, failing\n", dataLen, cbDecoded); SetLastError(CRYPT_E_ASN1_CORRUPT); ret = FALSE; @@ -1674,7 +1674,7 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, SetLastError(CRYPT_E_ASN1_BADTAG); ret = FALSE; } - TRACE("returning %d (%08x)\n", ret, GetLastError()); + TRACE("returning %d (%08lx)\n", ret, GetLastError()); return ret; } @@ -1684,7 +1684,7 @@ static BOOL WINAPI CRYPT_AsnDecodeBitsInternal(DWORD dwCertEncodingType, { BOOL ret; - TRACE("(%p, %d, 0x%08x, %p, %d)\n", pbEncoded, cbEncoded, dwFlags, + TRACE("(%p, %ld, 0x%08lx, %p, %ld)\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); if (pbEncoded[0] == ASN_BITSTRING) @@ -1738,7 +1738,7 @@ static BOOL WINAPI CRYPT_AsnDecodeBitsInternal(DWORD dwCertEncodingType, SetLastError(CRYPT_E_ASN1_BADTAG); ret = FALSE; } - TRACE("returning %d (%08x)\n", ret, GetLastError()); + TRACE("returning %d (%08lx)\n", ret, GetLastError()); return ret; } @@ -1791,7 +1791,7 @@ BOOL WINAPI WVTAsn1SpcPeImageDataDecode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); __TRY @@ -1824,7 +1824,7 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, BOOL ret = TRUE; DWORD dataLen; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) @@ -1924,7 +1924,7 @@ static BOOL WINAPI CRYPT_AsnDecodeOid(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); if (!cbEncoded) @@ -1944,7 +1944,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCopyBytes(DWORD dwCertEncodingType, BOOL ret = TRUE; DWORD bytesNeeded = sizeof(CRYPT_OBJID_BLOB); - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) @@ -1988,7 +1988,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAttributeTypeValue(DWORD dwCertEncodingType, offsetof(CRYPT_ATTRIBUTE_TYPE_VALUE, Value.pbData), 0 }, }; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), @@ -2011,7 +2011,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAlgorithmId(DWORD dwCertEncodingType, offsetof(CRYPT_ALGORITHM_IDENTIFIER, Parameters.pbData), 0 }, }; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), @@ -2039,7 +2039,7 @@ static BOOL WINAPI CRYPT_AsnDecodeSPCDigest(DWORD dwCertEncodingType, FALSE, TRUE, offsetof(struct SPCDigest, Digest.pbData), 0 }, }; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), @@ -2053,7 +2053,7 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentDecode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); __TRY @@ -2126,7 +2126,7 @@ static BOOL WINAPI CRYPT_AsnDecodeProgramName(DWORD dwCertEncodingType, BOOL ret = FALSE; DWORD dataLen; - TRACE("(%p, %d, %08x, %p, %d)\n", pbEncoded, cbEncoded, dwFlags, + TRACE("(%p, %ld, %08lx, %p, %ld)\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) @@ -2146,7 +2146,7 @@ BOOL WINAPI WVTAsn1SpcSpOpusInfoDecode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); __TRY @@ -2233,7 +2233,7 @@ BOOL WINAPI WVTAsn1CatMemberInfoDecode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); __TRY @@ -2265,7 +2265,7 @@ BOOL WINAPI WVTAsn1CatNameValueDecode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); __TRY @@ -2332,7 +2332,7 @@ static BOOL WINAPI CRYPT_AsnDecodeBool(DWORD dwCertEncodingType, *(BOOL *)pvStructInfo = pbEncoded[2] != 0; ret = TRUE; } - TRACE("returning %d (%08x)\n", ret, GetLastError()); + TRACE("returning %d (%08lx)\n", ret, GetLastError()); return ret; } @@ -2342,7 +2342,7 @@ BOOL WINAPI WVTAsn1SpcFinancialCriteriaInfoDecode(DWORD dwCertEncodingType, { BOOL ret = FALSE; - TRACE("(%p, %d, %08x, %p, %d)\n", pbEncoded, cbEncoded, dwFlags, + TRACE("(%p, %ld, %08lx, %p, %ld)\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); __TRY diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index fcf419c76d1..5d320c9a009 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -110,7 +110,7 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN *catAdmin, WCHAR catroot_dir[MAX_PATH]; struct catadmin *ca; - TRACE("%p %s %x\n", catAdmin, debugstr_guid(sys), dwFlags); + TRACE("%p %s %lx\n", catAdmin, debugstr_guid(sys), dwFlags); if (!catAdmin || dwFlags) { @@ -151,7 +151,7 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN *catAdmin, BOOL WINAPI CryptCATAdminAcquireContext2(HCATADMIN *catAdmin, const GUID *sys, const WCHAR *algorithm, const CERT_STRONG_SIGN_PARA *policy, DWORD flags) { - FIXME("%p %s %s %p %x stub\n", catAdmin, debugstr_guid(sys), debugstr_w(algorithm), policy, flags); + FIXME("%p %s %s %p %lx stub\n", catAdmin, debugstr_guid(sys), debugstr_w(algorithm), policy, flags); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -168,7 +168,7 @@ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, WCHAR *target; DWORD len; - TRACE("%p %s %s %d\n", catAdmin, debugstr_w(catalogFile), + TRACE("%p %s %s %ld\n", catAdmin, debugstr_w(catalogFile), debugstr_w(selectBaseName), flags); if (!selectBaseName) @@ -221,7 +221,7 @@ BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD* pcbHash, { BOOL ret = FALSE; - TRACE("%p %p %p %x\n", hFile, pcbHash, pbHash, dwFlags); + TRACE("%p %p %p %lx\n", hFile, pcbHash, pbHash, dwFlags); if (!hFile || !pcbHash || dwFlags) { @@ -291,7 +291,7 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, BYTE* pbHa DWORD size; BOOL ret; - TRACE("%p %p %d %x %p\n", hCatAdmin, pbHash, cbHash, dwFlags, phPrevCatInfo); + TRACE("%p %p %ld %lx %p\n", hCatAdmin, pbHash, cbHash, dwFlags, phPrevCatInfo); if (!ca || ca->magic != CATADMIN_MAGIC || !pbHash || cbHash != 20 || dwFlags) { @@ -354,14 +354,14 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, BYTE* pbHa hcat = CryptCATOpen(filename, CRYPTCAT_OPEN_EXISTING, prov, 0, 0); if (hcat == INVALID_HANDLE_VALUE) { - WARN("couldn't open %s (%u)\n", debugstr_w(filename), GetLastError()); + WARN("couldn't open %s (%lu)\n", debugstr_w(filename), GetLastError()); continue; } while ((member = CryptCATEnumerateMember(hcat, member))) { if (member->pIndirectData->Digest.cbData != cbHash) { - WARN("amount of hash bytes differs: %u/%u\n", member->pIndirectData->Digest.cbData, cbHash); + WARN("amount of hash bytes differs: %lu/%lu\n", member->pIndirectData->Digest.cbData, cbHash); continue; } if (!memcmp(member->pIndirectData->Digest.pbData, pbHash, cbHash)) @@ -416,7 +416,7 @@ BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN hCatAdmin, struct catinfo *ci = hCatInfo; struct catadmin *ca = hCatAdmin; - TRACE("%p %p %x\n", hCatAdmin, hCatInfo, dwFlags); + TRACE("%p %p %lx\n", hCatAdmin, hCatInfo, dwFlags); if (!ca || ca->magic != CATADMIN_MAGIC || !ci || ci->magic != CATINFO_MAGIC) { @@ -445,7 +445,7 @@ BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) { struct catadmin *ca = hCatAdmin; - TRACE("%p %x\n", hCatAdmin, dwFlags); + TRACE("%p %lx\n", hCatAdmin, dwFlags); if (!ca || ca->magic != CATADMIN_MAGIC) { @@ -476,7 +476,7 @@ BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN hCatAdmin, LPCWSTR pwszCatalogF { struct catadmin *ca = hCatAdmin; - TRACE("%p %s %x\n", hCatAdmin, debugstr_w(pwszCatalogFile), dwFlags); + TRACE("%p %s %lx\n", hCatAdmin, debugstr_w(pwszCatalogFile), dwFlags); if (!ca || ca->magic != CATADMIN_MAGIC) { @@ -520,7 +520,7 @@ BOOL WINAPI CryptCATAdminResolveCatalogPath(HCATADMIN hcatadmin, WCHAR *catalog_ static const WCHAR slashW[] = {'\\',0}; struct catadmin *ca = hcatadmin; - TRACE("%p %s %p %x\n", hcatadmin, debugstr_w(catalog_file), info, flags); + TRACE("%p %s %p %lx\n", hcatadmin, debugstr_w(catalog_file), info, flags); if (!ca || ca->magic != CATADMIN_MAGIC || !info || info->cbStruct != sizeof(*info) || flags) { @@ -701,7 +701,7 @@ CRYPTCATMEMBER * WINAPI CryptCATEnumerateMember(HANDLE hCatalog, CRYPTCATMEMBER if (attr->cValue != 1) { - ERR("Can't handle attr->cValue of %u\n", attr->cValue); + ERR("Can't handle attr->cValue of %lu\n", attr->cValue); continue; } if (!strcmp(attr->pszObjId, CAT_MEMBERINFO_OBJID)) @@ -836,7 +836,7 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info { struct catinfo *ci = hcatinfo; - TRACE("%p, %p, %x\n", hcatinfo, info, flags); + TRACE("%p, %p, %lx\n", hcatinfo, info, flags); if (!hcatinfo || hcatinfo == INVALID_HANDLE_VALUE || ci->magic != CATINFO_MAGIC || flags || !info || info->cbStruct != sizeof(*info)) @@ -854,7 +854,7 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *member, WCHAR *name, DWORD flags, DWORD size, BYTE *data) { - FIXME("catalog %p, member %p, name %s, flags %#x, size %u, data %p, stub!\n", + FIXME("catalog %p, member %p, name %s, flags %#lx, size %lu, data %p, stub!\n", catalog, member, debugstr_w(name), flags, size, data); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -867,7 +867,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *m CRYPTCATATTRIBUTE * WINAPI CryptCATPutCatAttrInfo(HANDLE catalog, WCHAR *name, DWORD flags, DWORD size, BYTE *data) { - FIXME("catalog %p, name %s, flags %#x, size %u, data %p, stub!\n", + FIXME("catalog %p, name %s, flags %#lx, size %lu, data %p, stub!\n", catalog, debugstr_w(name), flags, size, data); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -880,7 +880,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATPutCatAttrInfo(HANDLE catalog, CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data) { - FIXME("catalog %p, filename %s, member %s, subject %s, version %u, size %u, data %p, stub!\n", + FIXME("catalog %p, filename %s, member %s, subject %s, version %lu, size %lu, data %p, stub!\n", catalog, debugstr_w(filename), debugstr_w(member), debugstr_guid(subject), version, size, data); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -910,7 +910,7 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, struct cryptcat *cc; BOOL valid; - TRACE("filename %s, flags %#x, provider %#lx, version %#x, type %#x\n", + TRACE("filename %s, flags %#lx, provider %#Ix, version %#lx, type %#lx\n", debugstr_w(filename), flags, hProv, dwPublicVersion, dwEncodingType); if (!filename) @@ -1095,7 +1095,7 @@ static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, WIN_CERTIFICATE *pCert = NULL; HANDLE file; - TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, + TRACE("(%p %p %ld %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); if(pSubjectInfo->hFile && pSubjectInfo->hFile!=INVALID_HANDLE_VALUE) @@ -1256,7 +1256,7 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, BYTE buf[64]; DWORD cert_offset, cert_size, dwRead; - TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, + TRACE("(%p %p %ld %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); /* get basic offset & size info */ @@ -1342,9 +1342,9 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, } cert_offset = EndGetI32(buf+cfsigninfo_CertOffset); - TRACE("cert_offset: %d\n", cert_offset); + TRACE("cert_offset: %ld\n", cert_offset); cert_size = EndGetI32(buf+cfsigninfo_CertSize); - TRACE("cert_size: %d\n", cert_size); + TRACE("cert_size: %ld\n", cert_size); /* The redundant checks are to avoid wraparound */ if (cert_offset > cabsize || cert_size > cabsize || @@ -1394,7 +1394,7 @@ static BOOL WINTRUST_GetSignedMsgFromCatFile(SIP_SUBJECTINFO *pSubjectInfo, { BOOL ret; - TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, + TRACE("(%p %p %ld %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); if (!pbSignedDataMsg) @@ -1439,7 +1439,7 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn { BOOL ret; - TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, + TRACE("(%p %p %ld %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); if(!pSubjectInfo) @@ -1474,7 +1474,7 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEncodingType, DWORD* pdwIndex, DWORD cbSignedDataMsg, BYTE* pbSignedDataMsg) { - TRACE("(%p %d %p %d %p)\n", pSubjectInfo, pdwEncodingType, pdwIndex, + TRACE("(%p %ld %p %ld %p)\n", pSubjectInfo, pdwEncodingType, pdwIndex, cbSignedDataMsg, pbSignedDataMsg); if(!pSubjectInfo) { @@ -1498,7 +1498,7 @@ BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEnc BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD dwIndex) { - FIXME("(%p %d) stub\n", pSubjectInfo, dwIndex); + FIXME("(%p %ld) stub\n", pSubjectInfo, dwIndex); return FALSE; } diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index f2479e178f7..a5025ea3da1 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -242,7 +242,7 @@ BOOL WINAPI WintrustAddActionID( GUID* pgActionID, DWORD fdwFlags, LONG Res; LONG WriteActionError = ERROR_SUCCESS; - TRACE("%s %x %p\n", debugstr_guid(pgActionID), fdwFlags, psProvInfo); + TRACE("%s %lx %p\n", debugstr_guid(pgActionID), fdwFlags, psProvInfo); /* Some sanity checks. * We use the W2K3 last error as it makes more sense (W2K leaves the last error @@ -1134,7 +1134,7 @@ add_trust_providers: /* Create a dummy context to force creation of the MachineGuid registry key. */ ret = CryptAcquireContextW(&crypt_provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); if (ret) CryptReleaseContext(crypt_provider, 0); - else ERR("Failed to acquire cryptographic context: %u\n", GetLastError()); + else ERR("Failed to acquire cryptographic context: %lu\n", GetLastError()); /* If CryptRegisterRes is not S_OK it will always overrule the return value. */ if (CryptRegisterRes != S_OK) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 475f55a7507..53df5e7fe60 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -40,7 +40,7 @@ HRESULT WINAPI SoftpubDefCertInit(CRYPT_PROVIDER_DATA *data) if (data->padwTrustStepErrors && !data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_WVTINIT]) ret = S_OK; - TRACE("returning %08x\n", ret); + TRACE("returning %08lx\n", ret); return ret; } @@ -53,7 +53,7 @@ HRESULT WINAPI SoftpubInitialize(CRYPT_PROVIDER_DATA *data) if (data->padwTrustStepErrors && !data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_WVTINIT]) ret = S_OK; - TRACE("returning %08x\n", ret); + TRACE("returning %08lx\n", ret); return ret; } @@ -100,7 +100,7 @@ static DWORD SOFTPUB_OpenFile(CRYPT_PROVIDER_DATA *data) if (!err) GetFileTime(data->pWintrustData->u.pFile->hFile, &data->sftSystemTime, NULL, NULL); - TRACE("returning %d\n", err); + TRACE("returning %ld\n", err); return err; } @@ -136,7 +136,7 @@ static DWORD SOFTPUB_GetFileSubject(CRYPT_PROVIDER_DATA *data) } else data->u.pPDSip->gSubject = *data->pWintrustData->u.pFile->pgKnownSubject; - TRACE("returning %d\n", err); + TRACE("returning %ld\n", err); return err; } @@ -155,7 +155,7 @@ static DWORD SOFTPUB_GetSIP(CRYPT_PROVIDER_DATA *data) } else err = ERROR_OUTOFMEMORY; - TRACE("returning %d\n", err); + TRACE("returning %ld\n", err); return err; } @@ -206,7 +206,7 @@ static DWORD SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, err = GetLastError(); data->psPfns->pfnFree(buf); - TRACE("returning %d\n", err); + TRACE("returning %ld\n", err); return err; } @@ -393,7 +393,7 @@ static DWORD SOFTPUB_CreateStoreFromMessage(CRYPT_PROVIDER_DATA *data) } else err = GetLastError(); - TRACE("returning %d\n", err); + TRACE("returning %ld\n", err); return err; } @@ -460,7 +460,7 @@ static DWORD SOFTPUB_DecodeInnerContent(CRYPT_PROVIDER_DATA *data) err = GetLastError(); error: - TRACE("returning %d\n", err); + TRACE("returning %ld\n", err); data->psPfns->pfnFree(oid); data->psPfns->pfnFree(buf); return err; @@ -617,13 +617,13 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_LoadCatalogMessage(data); break; default: - FIXME("unimplemented for %d\n", data->pWintrustData->dwUnionChoice); + FIXME("unimplemented for %ld\n", data->pWintrustData->dwUnionChoice); err = ERROR_INVALID_PARAMETER; } if (err) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = err; - TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE, + TRACE("returning %ld (%08lx)\n", !err ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); return !err ? S_OK : S_FALSE; } @@ -885,7 +885,7 @@ BOOL WINAPI SoftpubCheckCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, { BOOL ret; - TRACE("(%p, %d, %d, %d)\n", data, idxSigner, fCounterSignerChain, + TRACE("(%p, %ld, %d, %ld)\n", data, idxSigner, fCounterSignerChain, idxCounterSigner); if (fCounterSignerChain) @@ -958,7 +958,7 @@ static DWORD WINTRUST_TrustStatusToError(DWORD errorStatus) error = CERT_E_INVALID_POLICY; else if (errorStatus) { - FIXME("unknown error status %08x\n", errorStatus); + FIXME("unknown error status %08lx\n", errorStatus); error = TRUST_E_SYSTEM_ERROR; } else @@ -1115,7 +1115,7 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) } if (err) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = err; - TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE, + TRACE("returning %ld (%08lx)\n", !err ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); return !err ? S_OK : S_FALSE; } @@ -1162,7 +1162,7 @@ HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data) end: if (err) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = err; - TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE, + TRACE("returning %ld (%08lx)\n", !err ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); return !err ? S_OK : S_FALSE; } @@ -1175,7 +1175,7 @@ HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *data) TRACE("(%p)\n", data); if (data->pWintrustData->dwUIChoice != WTD_UI_NONE) - FIXME("unimplemented for UI choice %d\n", + FIXME("unimplemented for UI choice %ld\n", data->pWintrustData->dwUIChoice); if (!data->csSigners) { @@ -1248,7 +1248,7 @@ HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *data) if (!ret) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_POLICYPROV] = policyStatus.dwError; - TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + TRACE("returning %ld (%08lx)\n", ret ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_POLICYPROV]); return ret ? S_OK : S_FALSE; } @@ -1290,7 +1290,7 @@ HRESULT WINAPI GenericChainFinalProv(CRYPT_PROVIDER_DATA *data) TRACE("(%p)\n", data); if (data->pWintrustData->dwUIChoice != WTD_UI_NONE) - FIXME("unimplemented for UI choice %d\n", + FIXME("unimplemented for UI choice %ld\n", data->pWintrustData->dwUIChoice); if (!data->csSigners) err = TRUST_E_NOSIGNATURE; @@ -1343,7 +1343,7 @@ HRESULT WINAPI GenericChainFinalProv(CRYPT_PROVIDER_DATA *data) } if (err != NO_ERROR) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_POLICYPROV] = err; - TRACE("returning %d (%08x)\n", err == NO_ERROR ? S_OK : S_FALSE, + TRACE("returning %ld (%08lx)\n", err == NO_ERROR ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_POLICYPROV]); return err == NO_ERROR ? S_OK : S_FALSE; } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 768522ea4a0..33695008b24 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -313,7 +313,7 @@ error: WINTRUST_Free(provData); done: - TRACE("returning %08x\n", err); + TRACE("returning %08lx\n", err); return err; } @@ -336,7 +336,7 @@ static LONG WINTRUST_DefaultClose(HWND hwnd, GUID *actionID, WINTRUST_Free(provData); data->hWVTStateData = NULL; } - TRACE("returning %08x\n", err); + TRACE("returning %08lx\n", err); return err; } @@ -349,7 +349,7 @@ static LONG WINTRUST_DefaultVerifyAndClose(HWND hwnd, GUID *actionID, err = WINTRUST_DefaultVerify(hwnd, actionID, data); WINTRUST_DefaultClose(hwnd, actionID, data); - TRACE("returning %08x\n", err); + TRACE("returning %08lx\n", err); return err; } @@ -444,7 +444,7 @@ static HRESULT WINAPI WINTRUST_CertVerifyObjTrust(CRYPT_PROVIDER_DATA *data) } break; default: - FIXME("unimplemented for %d\n", data->pWintrustData->dwUnionChoice); + FIXME("unimplemented for %ld\n", data->pWintrustData->dwUnionChoice); SetLastError(ERROR_INVALID_PARAMETER); ret = FALSE; } @@ -453,7 +453,7 @@ error: if (!ret) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = GetLastError(); - TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + TRACE("returning %ld (%08lx)\n", ret ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); return ret ? S_OK : S_FALSE; } @@ -504,7 +504,7 @@ error: WINTRUST_Free(provData); done: - TRACE("returning %08x\n", err); + TRACE("returning %08lx\n", err); return err; } @@ -517,7 +517,7 @@ static LONG WINTRUST_CertVerifyAndClose(HWND hwnd, GUID *actionID, err = WINTRUST_CertVerify(hwnd, actionID, data); WINTRUST_DefaultClose(hwnd, actionID, data); - TRACE("returning %08x\n", err); + TRACE("returning %08lx\n", err); return err; } @@ -546,7 +546,7 @@ static LONG WINTRUST_CertActionVerify(HWND hwnd, GUID *actionID, err = WINTRUST_DefaultClose(hwnd, actionID, data); break; default: - FIXME("unimplemented for %d\n", data->dwStateAction); + FIXME("unimplemented for %ld\n", data->dwStateAction); } return err; } @@ -556,7 +556,7 @@ static void dump_file_info(WINTRUST_FILE_INFO *pFile) TRACE("%p\n", pFile); if (pFile) { - TRACE("cbStruct: %d\n", pFile->cbStruct); + TRACE("cbStruct: %ld\n", pFile->cbStruct); TRACE("pcwszFilePath: %s\n", debugstr_w(pFile->pcwszFilePath)); TRACE("hFile: %p\n", pFile->hFile); TRACE("pgKnownSubject: %s\n", debugstr_guid(pFile->pgKnownSubject)); @@ -568,8 +568,8 @@ static void dump_catalog_info(WINTRUST_CATALOG_INFO *catalog) TRACE("%p\n", catalog); if (catalog) { - TRACE("cbStruct: %d\n", catalog->cbStruct); - TRACE("dwCatalogVersion: %d\n", catalog->dwCatalogVersion); + TRACE("cbStruct: %ld\n", catalog->cbStruct); + TRACE("dwCatalogVersion: %ld\n", catalog->dwCatalogVersion); TRACE("pcwszCatalogFilePath: %s\n", debugstr_w(catalog->pcwszCatalogFilePath)); TRACE("pcwszMemberTag: %s\n", debugstr_w(catalog->pcwszMemberTag)); @@ -577,7 +577,7 @@ static void dump_catalog_info(WINTRUST_CATALOG_INFO *catalog) debugstr_w(catalog->pcwszMemberFilePath)); TRACE("hMemberFile: %p\n", catalog->hMemberFile); TRACE("pbCalculatedFileHash: %p\n", catalog->pbCalculatedFileHash); - TRACE("cbCalculatedFileHash: %d\n", catalog->cbCalculatedFileHash); + TRACE("cbCalculatedFileHash: %ld\n", catalog->cbCalculatedFileHash); TRACE("pcCatalogContext: %p\n", catalog->pcCatalogContext); } } @@ -587,12 +587,12 @@ static void dump_blob_info(WINTRUST_BLOB_INFO *blob) TRACE("%p\n", blob); if (blob) { - TRACE("cbStruct: %d\n", blob->cbStruct); + TRACE("cbStruct: %ld\n", blob->cbStruct); TRACE("gSubject: %s\n", debugstr_guid(&blob->gSubject)); TRACE("pcwszDisplayName: %s\n", debugstr_w(blob->pcwszDisplayName)); - TRACE("cbMemObject: %d\n", blob->cbMemObject); + TRACE("cbMemObject: %ld\n", blob->cbMemObject); TRACE("pbMemObject: %p\n", blob->pbMemObject); - TRACE("cbMemSignedMsg: %d\n", blob->cbMemSignedMsg); + TRACE("cbMemSignedMsg: %ld\n", blob->cbMemSignedMsg); TRACE("pbMemSignedMsg: %p\n", blob->pbMemSignedMsg); } } @@ -602,10 +602,10 @@ static void dump_sgnr_info(WINTRUST_SGNR_INFO *sgnr) TRACE("%p\n", sgnr); if (sgnr) { - TRACE("cbStruct: %d\n", sgnr->cbStruct); + TRACE("cbStruct: %ld\n", sgnr->cbStruct); TRACE("pcwszDisplayName: %s\n", debugstr_w(sgnr->pcwszDisplayName)); TRACE("psSignerInfo: %p\n", sgnr->psSignerInfo); - TRACE("chStores: %d\n", sgnr->chStores); + TRACE("chStores: %ld\n", sgnr->chStores); } } @@ -614,11 +614,11 @@ static void dump_cert_info(WINTRUST_CERT_INFO *cert) TRACE("%p\n", cert); if (cert) { - TRACE("cbStruct: %d\n", cert->cbStruct); + TRACE("cbStruct: %ld\n", cert->cbStruct); TRACE("pcwszDisplayName: %s\n", debugstr_w(cert->pcwszDisplayName)); TRACE("psCertContext: %p\n", cert->psCertContext); - TRACE("chStores: %d\n", cert->chStores); - TRACE("dwFlags: %08x\n", cert->dwFlags); + TRACE("chStores: %ld\n", cert->chStores); + TRACE("dwFlags: %08lx\n", cert->dwFlags); TRACE("psftVerifyAsOf: %p\n", cert->psftVerifyAsOf); } } @@ -628,12 +628,12 @@ static void dump_wintrust_data(WINTRUST_DATA *data) TRACE("%p\n", data); if (data) { - TRACE("cbStruct: %d\n", data->cbStruct); + TRACE("cbStruct: %ld\n", data->cbStruct); TRACE("pPolicyCallbackData: %p\n", data->pPolicyCallbackData); TRACE("pSIPClientData: %p\n", data->pSIPClientData); - TRACE("dwUIChoice: %d\n", data->dwUIChoice); - TRACE("fdwRevocationChecks: %08x\n", data->fdwRevocationChecks); - TRACE("dwUnionChoice: %d\n", data->dwUnionChoice); + TRACE("dwUIChoice: %ld\n", data->dwUIChoice); + TRACE("fdwRevocationChecks: %08lx\n", data->fdwRevocationChecks); + TRACE("dwUnionChoice: %ld\n", data->dwUnionChoice); switch (data->dwUnionChoice) { case WTD_CHOICE_FILE: @@ -652,11 +652,11 @@ static void dump_wintrust_data(WINTRUST_DATA *data) dump_cert_info(data->u.pCert); break; } - TRACE("dwStateAction: %d\n", data->dwStateAction); + TRACE("dwStateAction: %ld\n", data->dwStateAction); TRACE("hWVTStateData: %p\n", data->hWVTStateData); TRACE("pwszURLReference: %s\n", debugstr_w(data->pwszURLReference)); - TRACE("dwProvFlags: %08x\n", data->dwProvFlags); - TRACE("dwUIContext: %d\n", data->dwUIContext); + TRACE("dwProvFlags: %08lx\n", data->dwProvFlags); + TRACE("dwUIContext: %ld\n", data->dwUIContext); } } @@ -728,12 +728,12 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) err = WINTRUST_DefaultClose(hwnd, ActionID, ActionData); break; default: - FIXME("unimplemented for %d\n", actionData->dwStateAction); + FIXME("unimplemented for %ld\n", actionData->dwStateAction); } } if (err) SetLastError(err); - TRACE("returning %08x\n", err); + TRACE("returning %08lx\n", err); return err; } @@ -755,7 +755,7 @@ CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain( { CRYPT_PROVIDER_SGNR *sgnr; - TRACE("(%p %d %d %d)\n", pProvData, idxSigner, fCounterSigner, + TRACE("(%p %ld %d %ld)\n", pProvData, idxSigner, fCounterSigner, idxCounterSigner); if (idxSigner >= pProvData->csSigners || !pProvData->pasSigners) @@ -780,7 +780,7 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain( { CRYPT_PROVIDER_CERT *cert; - TRACE("(%p %d)\n", pSgnr, idxCert); + TRACE("(%p %ld)\n", pSgnr, idxCert); if (idxCert >= pSgnr->csCertChain || !pSgnr->pasCertChain) return NULL; @@ -898,7 +898,7 @@ BOOL WINAPI WTHelperGetKnownUsages(DWORD action, PCCRYPT_OID_INFO **usages) { BOOL ret; - TRACE("(%d, %p)\n", action, usages); + TRACE("(%ld, %p)\n", action, usages); if (!usages) { @@ -920,7 +920,7 @@ BOOL WINAPI WTHelperGetKnownUsages(DWORD action, PCCRYPT_OID_INFO **usages) } else { - WARN("unknown action %d\n", action); + WARN("unknown action %ld\n", action); SetLastError(ERROR_INVALID_PARAMETER); ret = FALSE; } @@ -979,7 +979,7 @@ BOOL WINAPI WintrustSetRegPolicyFlags( DWORD dwPolicyFlags) HKEY key; LONG r; - TRACE("%x\n", dwPolicyFlags); + TRACE("%lx\n", dwPolicyFlags); r = RegCreateKeyExW(HKEY_CURRENT_USER, Software_Publishing, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL); @@ -1024,7 +1024,7 @@ BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, { BOOL ret = FALSE; - TRACE("(%p, %d, %d, %p)\n", data, fCounterSigner, idxSigner, sgnr); + TRACE("(%p, %d, %ld, %p)\n", data, fCounterSigner, idxSigner, sgnr); if (sgnr->cbStruct > sizeof(CRYPT_PROVIDER_SGNR)) { @@ -1077,7 +1077,7 @@ BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, { BOOL ret = FALSE; - TRACE("(%p, %d, %d, %d, %p)\n", data, idxSigner, fCounterSigner, + TRACE("(%p, %ld, %d, %ld, %p)\n", data, idxSigner, fCounterSigner, idxSigner, pCert2Add); if (fCounterSigner) @@ -1205,7 +1205,7 @@ HRESULT WINAPI FindCertsByIssuer(PCERT_CHAIN pCertChains, DWORD *pcbCertChains, DWORD *pcCertChains, BYTE* pbEncodedIssuerName, DWORD cbEncodedIssuerName, LPCWSTR pwszPurpose, DWORD dwKeySpec) { - FIXME("(%p, %p, %p, %p, %d, %s, %d): stub\n", pCertChains, pcbCertChains, + FIXME("(%p, %p, %p, %p, %ld, %s, %ld): stub\n", pCertChains, pcbCertChains, pcCertChains, pbEncodedIssuerName, cbEncodedIssuerName, debugstr_w(pwszPurpose), dwKeySpec); return E_FAIL;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wlanapi/Makefile.in | 1 - dlls/wlanapi/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wlanapi/Makefile.in b/dlls/wlanapi/Makefile.in index 8f219cc6148..312e5407800 100644 --- a/dlls/wlanapi/Makefile.in +++ b/dlls/wlanapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wlanapi.dll IMPORTLIB = wlanapi diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 07264c9e136..c3712662232 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -117,7 +117,7 @@ DWORD WINAPI WlanOpenHandle(DWORD client_version, void *reserved, DWORD *negotia struct wine_wlan *wlan; HANDLE ret_handle; - TRACE("(%u, %p, %p, %p)\n", client_version, reserved, negotiated_version, handle); + TRACE("(%lu, %p, %p, %p)\n", client_version, reserved, negotiated_version, handle); if (reserved || !negotiated_version || !handle) return ERROR_INVALID_PARAMETER; @@ -149,7 +149,7 @@ DWORD WINAPI WlanRegisterNotification(HANDLE handle, DWORD notify_source, BOOL i WLAN_NOTIFICATION_CALLBACK callback, void *context, void *reserved, DWORD *notify_prev) { - FIXME("(%p, %d, %d, %p, %p, %p, %p) stub\n", + FIXME("(%p, %ld, %d, %p, %p, %p, %p) stub\n", handle, notify_source, ignore_dup, callback, context, reserved, notify_prev); return ERROR_CALL_NOT_IMPLEMENTED; @@ -158,7 +158,7 @@ DWORD WINAPI WlanRegisterNotification(HANDLE handle, DWORD notify_source, BOOL i DWORD WINAPI WlanGetAvailableNetworkList(HANDLE handle, const GUID *guid, DWORD flags, void *reserved, WLAN_AVAILABLE_NETWORK_LIST **network_list) { - FIXME("(%p, %s, 0x%x, %p, %p) stub\n", + FIXME("(%p, %s, 0x%lx, %p, %p) stub\n", handle, wine_dbgstr_guid(guid), flags, reserved, network_list); return ERROR_CALL_NOT_IMPLEMENTED; @@ -211,7 +211,7 @@ void *WINAPI WlanAllocateMemory(DWORD size) { void *ret; - TRACE("(%d)\n", size); + TRACE("(%ld)\n", size); if (!size) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wmp/Makefile.in | 1 - dlls/wmp/events.c | 10 +++--- dlls/wmp/oleobj.c | 40 ++++++++++++------------ dlls/wmp/player.c | 84 +++++++++++++++++++++++++------------------------- dlls/wmp/wmp_main.c | 6 ++-- 5 files changed, 70 insertions(+), 71 deletions(-) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index 5f3cb501f92..0e17ee4b257 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmp.dll IMPORTS = oleaut32 ole32 urlmon shlwapi user32 gdi32 diff --git a/dlls/wmp/events.c b/dlls/wmp/events.c index 412eb307d1a..f541830773b 100644 --- a/dlls/wmp/events.c +++ b/dlls/wmp/events.c @@ -138,7 +138,7 @@ static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface) EnumConnections *This = impl_from_IEnumConnections(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -148,7 +148,7 @@ static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) EnumConnections *This = impl_from_IEnumConnections(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { IConnectionPoint_Release(&This->cp->IConnectionPoint_iface); @@ -163,7 +163,7 @@ static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConne EnumConnections *This = impl_from_IEnumConnections(iface); ULONG cnt = 0; - TRACE("(%p)->(%u %p %p)\n", This, cConnections, pgcd, pcFetched); + TRACE("(%p)->(%lu %p %p)\n", This, cConnections, pgcd, pcFetched); while(cConnections--) { while(This->iter < This->cp->sinks_size && !This->cp->sinks[This->iter]) @@ -186,7 +186,7 @@ static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConne static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG cConnections) { EnumConnections *This = impl_from_IEnumConnections(iface); - FIXME("(%p)->(%u)\n", This, cConnections); + FIXME("(%p)->(%lu)\n", This, cConnections); return E_NOTIMPL; } @@ -314,7 +314,7 @@ static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dw { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - TRACE("(%p)->(%d)\n", This, dwCookie); + TRACE("(%p)->(%ld)\n", This, dwCookie); if(!dwCookie || dwCookie > This->sinks_size || !This->sinks[dwCookie-1]) return CONNECT_E_NOCONNECTION; diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 04a9f204639..5eaa789f87f 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -170,7 +170,7 @@ static HRESULT activate_inplace(WindowsMediaPlayer *This) hres = IOleInPlaceSite_GetWindowContext(ipsite, &ip_frame, &ip_window, &posrect, &cliprect, &frameinfo); IOleInPlaceSite_Release(ipsite); if(FAILED(hres)) { - FIXME("GetWindowContext failed: %08x\n", hres); + FIXME("GetWindowContext failed: %08lx\n", hres); return hres; } @@ -291,7 +291,7 @@ static ULONG WINAPI OleObject_AddRef(IOleObject *iface) WindowsMediaPlayer *This = impl_from_IOleObject(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -301,7 +301,7 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) WindowsMediaPlayer *This = impl_from_IOleObject(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { release_client_site(This); @@ -365,10 +365,10 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - TRACE("(%p)->(%08x)\n", This, dwSaveOption); + TRACE("(%p)->(%08lx)\n", This, dwSaveOption); if(dwSaveOption) - FIXME("Unsupported option %d\n", dwSaveOption); + FIXME("Unsupported option %ld\n", dwSaveOption); if(This->hwnd) /* FIXME: Possibly hide window */ deactivate_window(This); @@ -378,14 +378,14 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p %d %p)->()\n", This, dwWhichMoniker, pmk); + FIXME("(%p %ld %p)->()\n", This, dwWhichMoniker, pmk); return E_NOTIMPL; } static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %d %p)\n", This, dwAssign, dwWhichMoniker, ppmk); + FIXME("(%p)->(%ld %ld %p)\n", This, dwAssign, dwWhichMoniker, ppmk); return E_NOTIMPL; } @@ -393,14 +393,14 @@ static HRESULT WINAPI OleObject_InitFromData(IOleObject *iface, IDataObject *pDa DWORD dwReserved) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p %x %d)\n", This, pDataObject, fCreation, dwReserved); + FIXME("(%p)->(%p %x %ld)\n", This, pDataObject, fCreation, dwReserved); return E_NOTIMPL; } static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwReserved, IDataObject **ppDataObject) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwReserved, ppDataObject); + FIXME("(%p)->(%ld %p)\n", This, dwReserved, ppDataObject); return E_NOTIMPL; } @@ -424,7 +424,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms return S_OK; default: - FIXME("Unsupported iVerb %d\n", iVerb); + FIXME("Unsupported iVerb %ld\n", iVerb); } return E_NOTIMPL; @@ -461,7 +461,7 @@ static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid) static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfType, LPOLESTR *pszUserType) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwFormOfType, pszUserType); + FIXME("(%p)->(%ld %p)\n", This, dwFormOfType, pszUserType); return E_NOTIMPL; } @@ -469,7 +469,7 @@ static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + TRACE("(%p)->(%ld %p)\n", This, dwDrawAspect, psizel); if(dwDrawAspect != DVASPECT_CONTENT) return DV_E_DVASPECT; @@ -482,7 +482,7 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + TRACE("(%p)->(%ld %p)\n", This, dwDrawAspect, psizel); if(dwDrawAspect != DVASPECT_CONTENT) return E_FAIL; @@ -501,7 +501,7 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, dwConnection); + FIXME("(%p)->(%ld)\n", This, dwConnection); return E_NOTIMPL; } @@ -516,7 +516,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - TRACE("(%p)->(%d %p)\n", This, dwAspect, pdwStatus); + TRACE("(%p)->(%ld %p)\n", This, dwAspect, pdwStatus); switch(dwAspect) { case DVASPECT_CONTENT: @@ -524,7 +524,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE; break; default: - FIXME("Unhandled aspect %d\n", dwAspect); + FIXME("Unhandled aspect %ld\n", dwAspect); return E_NOTIMPL; } @@ -648,7 +648,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_OnWindowMessage(IOleInPlaceObje UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *lpResult) { WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); - FIXME("(%p)->(%u %lu %lu %p)\n", This, msg, wParam, lParam, lpResult); + FIXME("(%p)->(%u %Iu %Iu %p)\n", This, msg, wParam, lParam, lpResult); return E_NOTIMPL; } @@ -714,7 +714,7 @@ static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) { WindowsMediaPlayer *This = impl_from_IOleControl(iface); - FIXME("(%p)->(%d)\n", This, dispID); + FIXME("(%p)->(%ld)\n", This, dispID); return E_NOTIMPL; } @@ -774,10 +774,10 @@ static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD { WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); - TRACE("(%p)->(%d %p)\n", This, dwGuidKind, pGUID); + TRACE("(%p)->(%ld %p)\n", This, dwGuidKind, pGUID); if(dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID) { - FIXME("Unexpected dwGuidKind %d\n", dwGuidKind); + FIXME("Unexpected dwGuidKind %ld\n", dwGuidKind); return E_INVALIDARG; } diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 1da81b17a26..7225e7130a9 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -104,7 +104,7 @@ static HRESULT WINAPI WMPPlayer4_GetTypeInfo(IWMPPlayer4 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -112,7 +112,7 @@ static HRESULT WINAPI WMPPlayer4_GetIDsOfNames(IWMPPlayer4 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; } @@ -121,7 +121,7 @@ static HRESULT WINAPI WMPPlayer4_Invoke(IWMPPlayer4 *iface, DISPID dispIdMember, EXCEPINFO *pExcepInfo, UINT *puArgErr) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -818,7 +818,7 @@ static HRESULT WINAPI WMPSettings_GetTypeInfo(IWMPSettings *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -826,7 +826,7 @@ static HRESULT WINAPI WMPSettings_GetIDsOfNames(IWMPSettings *iface, REFIID riid LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; } @@ -835,7 +835,7 @@ static HRESULT WINAPI WMPSettings_Invoke(IWMPSettings *iface, DISPID dispIdMembe EXCEPINFO *pExcepInfo, UINT *puArgErr) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -938,7 +938,7 @@ static HRESULT WINAPI WMPSettings_get_playCount(IWMPSettings *iface, LONG *p) static HRESULT WINAPI WMPSettings_put_playCount(IWMPSettings *iface, LONG v) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%d)\n", This, v); + FIXME("(%p)->(%ld)\n", This, v); return E_NOTIMPL; } @@ -966,7 +966,7 @@ static HRESULT WINAPI WMPSettings_get_balance(IWMPSettings *iface, LONG *p) static HRESULT WINAPI WMPSettings_put_balance(IWMPSettings *iface, LONG v) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%d)\n", This, v); + FIXME("(%p)->(%ld)\n", This, v); return E_NOTIMPL; } @@ -983,7 +983,7 @@ static HRESULT WINAPI WMPSettings_get_volume(IWMPSettings *iface, LONG *p) static HRESULT WINAPI WMPSettings_put_volume(IWMPSettings *iface, LONG v) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - TRACE("(%p)->(%d)\n", This, v); + TRACE("(%p)->(%ld)\n", This, v); This->volume = v; if (!This->filter_graph) return S_OK; @@ -1103,7 +1103,7 @@ static HRESULT WINAPI WMPNetwork_GetTypeInfo(IWMPNetwork *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -1111,7 +1111,7 @@ static HRESULT WINAPI WMPNetwork_GetIDsOfNames(IWMPNetwork *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; } @@ -1120,7 +1120,7 @@ static HRESULT WINAPI WMPNetwork_Invoke(IWMPNetwork *iface, DISPID dispIdMember, EXCEPINFO *pExcepInfo, UINT *puArgErr) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -1200,7 +1200,7 @@ static HRESULT WINAPI WMPNetwork_get_bufferingTime(IWMPNetwork *iface, LONG *plB static HRESULT WINAPI WMPNetwork_put_bufferingTime(IWMPNetwork *iface, LONG lBufferingTime) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%d)\n", This, lBufferingTime); + FIXME("(%p)->(%ld)\n", This, lBufferingTime); return E_NOTIMPL; } @@ -1235,7 +1235,7 @@ static HRESULT WINAPI WMPNetwork_getProxySettings(IWMPNetwork *iface, BSTR bstrP static HRESULT WINAPI WMPNetwork_setProxySettings(IWMPNetwork *iface, BSTR bstrProtocol, LONG lProxySetting) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%s, %d)\n", This, debugstr_w(bstrProtocol), lProxySetting); + FIXME("(%p)->(%s, %ld)\n", This, debugstr_w(bstrProtocol), lProxySetting); return E_NOTIMPL; } @@ -1263,7 +1263,7 @@ static HRESULT WINAPI WMPNetwork_getProxyPort(IWMPNetwork *iface, BSTR bstrProto static HRESULT WINAPI WMPNetwork_setProxyPort(IWMPNetwork *iface, BSTR bstrProtocol, LONG lProxyPort) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%s, %d)\n", This, debugstr_w(bstrProtocol), lProxyPort); + FIXME("(%p)->(%s, %ld)\n", This, debugstr_w(bstrProtocol), lProxyPort); return E_NOTIMPL; } @@ -1305,7 +1305,7 @@ static HRESULT WINAPI WMPNetwork_get_maxBandwidth(IWMPNetwork *iface, LONG *plMa static HRESULT WINAPI WMPNetwork_put_maxBandwidth(IWMPNetwork *iface, LONG lMaxBandwidth) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%d)\n", This, lMaxBandwidth); + FIXME("(%p)->(%ld)\n", This, lMaxBandwidth); return E_NOTIMPL; } @@ -1419,7 +1419,7 @@ static HRESULT WINAPI WMPControls_GetTypeInfo(IWMPControls *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -1427,7 +1427,7 @@ static HRESULT WINAPI WMPControls_GetIDsOfNames(IWMPControls *iface, REFIID riid LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; } @@ -1436,7 +1436,7 @@ static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMembe EXCEPINFO *pExcepInfo, UINT *puArgErr) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -1598,7 +1598,7 @@ static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBL hres = IMediaSeeking_GetCurrentPosition(This->media_seeking, ¤tPosition); *pdCurrentPosition = (DOUBLE) currentPosition / 10000000.0f; - TRACE("hres: %d, pos: %f\n", hres, *pdCurrentPosition); + TRACE("hres: %ld, pos: %f\n", hres, *pdCurrentPosition); return hres; } @@ -1663,7 +1663,7 @@ static HRESULT WINAPI WMPControls_get_currentMarker(IWMPControls *iface, LONG *p static HRESULT WINAPI WMPControls_put_currentMarker(IWMPControls *iface, LONG lMarker) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%d)\n", This, lMarker); + FIXME("(%p)->(%ld)\n", This, lMarker); return E_NOTIMPL; } @@ -1728,7 +1728,7 @@ static ULONG WINAPI WMPMedia_AddRef(IWMPMedia *iface) WMPMedia *This = impl_from_IWMPMedia(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -1738,7 +1738,7 @@ static ULONG WINAPI WMPMedia_Release(IWMPMedia *iface) WMPMedia *This = impl_from_IWMPMedia(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->url); @@ -1760,7 +1760,7 @@ static HRESULT WINAPI WMPMedia_GetTypeInfo(IWMPMedia *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -1768,7 +1768,7 @@ static HRESULT WINAPI WMPMedia_GetIDsOfNames(IWMPMedia *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; } @@ -1777,7 +1777,7 @@ static HRESULT WINAPI WMPMedia_Invoke(IWMPMedia *iface, DISPID dispIdMember, EXCEPINFO *pExcepInfo, UINT *puArgErr) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -1844,14 +1844,14 @@ static HRESULT WINAPI WMPMedia_get_markerCount(IWMPMedia *iface, LONG* pMarkerCo static HRESULT WINAPI WMPMedia_getMarkerTime(IWMPMedia *iface, LONG MarkerNum, DOUBLE *pMarkerTime) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%d, %p)\n", This, MarkerNum, pMarkerTime); + FIXME("(%p)->(%ld, %p)\n", This, MarkerNum, pMarkerTime); return E_NOTIMPL; } static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, BSTR *pbstrMarkerName) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%d, %p)\n", This, MarkerNum, pbstrMarkerName); + FIXME("(%p)->(%ld, %p)\n", This, MarkerNum, pbstrMarkerName); return E_NOTIMPL; } @@ -1882,7 +1882,7 @@ static HRESULT WINAPI WMPMedia_get_attributeCount(IWMPMedia *iface, LONG *plCoun static HRESULT WINAPI WMPMedia_getAttributeName(IWMPMedia *iface, LONG lIndex, BSTR *pbstrItemName) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%d, %p)\n", This, lIndex, pbstrItemName); + FIXME("(%p)->(%ld, %p)\n", This, lIndex, pbstrItemName); return E_NOTIMPL; } @@ -1903,7 +1903,7 @@ static HRESULT WINAPI WMPMedia_setItemInfo(IWMPMedia *iface, BSTR bstrItemName, static HRESULT WINAPI WMPMedia_getItemInfoByAtom(IWMPMedia *iface, LONG lAtom, BSTR *pbstrVal) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%d, %p)\n", This, lAtom, pbstrVal); + FIXME("(%p)->(%ld, %p)\n", This, lAtom, pbstrVal); return E_NOTIMPL; } @@ -1977,7 +1977,7 @@ static ULONG WINAPI WMPPlaylist_AddRef(IWMPPlaylist *iface) WMPPlaylist *This = impl_from_IWMPPlaylist(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -1987,7 +1987,7 @@ static ULONG WINAPI WMPPlaylist_Release(IWMPPlaylist *iface) WMPPlaylist *This = impl_from_IWMPPlaylist(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->url); @@ -2009,7 +2009,7 @@ static HRESULT WINAPI WMPPlaylist_GetTypeInfo(IWMPPlaylist *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -2017,7 +2017,7 @@ static HRESULT WINAPI WMPPlaylist_GetIDsOfNames(IWMPPlaylist *iface, REFIID riid LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; } @@ -2026,7 +2026,7 @@ static HRESULT WINAPI WMPPlaylist_Invoke(IWMPPlaylist *iface, DISPID dispIdMembe EXCEPINFO *pExcepInfo, UINT *puArgErr) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -2075,14 +2075,14 @@ static HRESULT WINAPI WMPPlaylist_get_attributeCount(IWMPPlaylist *iface, LONG * static HRESULT WINAPI WMPPlaylist_get_attributeName(IWMPPlaylist *iface, LONG index, BSTR *attribute_name) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%d %p)\n", This, index, attribute_name); + FIXME("(%p)->(%ld %p)\n", This, index, attribute_name); return E_NOTIMPL; } static HRESULT WINAPI WMPPlaylist_get_Item(IWMPPlaylist *iface, LONG index, IWMPMedia **media) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%d %p)\n", This, index, media); + FIXME("(%p)->(%ld %p)\n", This, index, media); return E_NOTIMPL; } @@ -2117,7 +2117,7 @@ static HRESULT WINAPI WMPPlaylist_clear(IWMPPlaylist *iface) static HRESULT WINAPI WMPPlaylist_insertItem(IWMPPlaylist *iface, LONG index, IWMPMedia *media) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%d %p)\n", This, index, media); + FIXME("(%p)->(%ld %p)\n", This, index, media); return E_NOTIMPL; } @@ -2138,7 +2138,7 @@ static HRESULT WINAPI WMPPlaylist_removeItem(IWMPPlaylist *iface, IWMPMedia *med static HRESULT WINAPI WMPPlaylist_moveItem(IWMPPlaylist *iface, LONG old_index, LONG new_index) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%d %d)\n", This, old_index, new_index); + FIXME("(%p)->(%ld %ld)\n", This, old_index, new_index); return E_NOTIMPL; } @@ -2177,7 +2177,7 @@ static LRESULT WINAPI player_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM do { hr = IMediaEvent_GetEvent(wmp->media_event, &event_code, &p1, &p2, 0); if (SUCCEEDED(hr)) { - TRACE("got event_code = 0x%02x\n", event_code); + TRACE("got event_code = 0x%02lx\n", event_code); IMediaEvent_FreeEventParams(wmp->media_event, event_code, p1, p2); /* For now we only handle EC_COMPLETE */ if (event_code == EC_COMPLETE) { @@ -2221,11 +2221,11 @@ BOOL init_player(WindowsMediaPlayer *wmp) wmp->msg_window = CreateWindowW( MAKEINTRESOURCEW(player_msg_class), NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, wmp_instance, wmp ); if (!wmp->msg_window) { - ERR("Failed to create message window, GetLastError: %d\n", GetLastError()); + ERR("Failed to create message window, GetLastError: %ld\n", GetLastError()); return FALSE; } if (!WM_WMPEVENT) { - ERR("Failed to register window message, GetLastError: %d\n", GetLastError()); + ERR("Failed to register window message, GetLastError: %ld\n", GetLastError()); return FALSE; } diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 931e737e527..1f2afd8b244 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -45,7 +45,7 @@ static HRESULT load_typelib(void) hr = LoadRegTypeLib(&LIBID_WMPLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if (FAILED(hr)) { - ERR("LoadRegTypeLib failed: %08x\n", hr); + ERR("LoadRegTypeLib failed: %08lx\n", hr); return hr; } @@ -68,7 +68,7 @@ HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if (FAILED(hr)) { - ERR("GetTypeInfoOfGuid (%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + ERR("GetTypeInfoOfGuid (%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hr); return hr; } @@ -146,7 +146,7 @@ static IClassFactory WMPFactory = { &WMPFactoryVtbl }; */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { - TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + TRACE("(%p %ld %p)\n", hInstDLL, fdwReason, lpv); switch(fdwReason) { case DLL_PROCESS_ATTACH:
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wmvcore/Makefile.in | 1 - dlls/wmvcore/wmvcore_main.c | 10 +++++----- dlls/wmvcore/writer.c | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 56dd85bb191..6aed828abae 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmvcore.dll IMPORTLIB = wmvcore IMPORTS = kernel32 diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index ff837921286..4be55cbb707 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -30,7 +30,7 @@ HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader); HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) { - TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + TRACE("reserved %p, rights %#lx, reader %p.\n", reserved, rights, reader); return winegstreamer_create_wm_async_reader(reader); } @@ -44,7 +44,7 @@ HRESULT WINAPI WMCreateReaderPriv(IWMReader **reader) HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) { - TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + TRACE("reserved %p, rights %#lx, reader %p.\n", reserved, rights, reader); return winegstreamer_create_wm_sync_reader(reader); } @@ -144,7 +144,7 @@ static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager2 *iface) WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -154,7 +154,7 @@ static ULONG WINAPI WMProfileManager_Release(IWMProfileManager2 *iface) WMProfileManager *This = impl_from_IWMProfileManager2(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); @@ -200,7 +200,7 @@ static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager2 static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager2 *iface, DWORD index, IWMProfile **ret) { WMProfileManager *This = impl_from_IWMProfileManager2(iface); - FIXME("(%p)->(%d %p)\n", This, index, ret); + FIXME("(%p)->(%ld %p)\n", This, index, ret); return E_NOTIMPL; } diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index 717984db1af..5c62cd35143 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -69,7 +69,7 @@ static ULONG WINAPI WMWriter_AddRef(IWMWriter *iface) WMWriter *This = impl_from_IWMWriter(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -79,7 +79,7 @@ static ULONG WINAPI WMWriter_Release(IWMWriter *iface) WMWriter *This = impl_from_IWMWriter(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); @@ -118,21 +118,21 @@ static HRESULT WINAPI WMWriter_GetInputCount(IWMWriter *iface, DWORD *pcInputs) static HRESULT WINAPI WMWriter_GetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps **input) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + FIXME("(%p)->(%ld %p)\n", This, dwInputNum, input); return E_NOTIMPL; } static HRESULT WINAPI WMWriter_SetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps *input) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + FIXME("(%p)->(%ld %p)\n", This, dwInputNum, input); return E_NOTIMPL; } static HRESULT WINAPI WMWriter_GetInputFormatCount(IWMWriter *iface, DWORD dwInputNumber, DWORD *pcFormat) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNumber, pcFormat); + FIXME("(%p)->(%ld %p)\n", This, dwInputNumber, pcFormat); return E_NOTIMPL; } @@ -140,7 +140,7 @@ static HRESULT WINAPI WMWriter_GetInputFormat(IWMWriter *iface, DWORD dwInputNum IWMInputMediaProps **props) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %d %p)\n", This, dwInputNumber, dwFormatNumber, props); + FIXME("(%p)->(%ld %ld %p)\n", This, dwInputNumber, dwFormatNumber, props); return E_NOTIMPL; } @@ -161,7 +161,7 @@ static HRESULT WINAPI WMWriter_EndWriting(IWMWriter *iface) static HRESULT WINAPI WMWriter_AllocateSample(IWMWriter *iface, DWORD size, INSSBuffer **sample) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, size, sample); + FIXME("(%p)->(%ld %p)\n", This, size, sample); return E_NOTIMPL; } @@ -169,7 +169,7 @@ static HRESULT WINAPI WMWriter_WriteSample(IWMWriter *iface, DWORD dwInputNum, Q DWORD flags, INSSBuffer *sample) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %s %x %p)\n", This, dwInputNum, wine_dbgstr_longlong(cnsSampleTime), flags, sample); + FIXME("(%p)->(%ld %s %lx %p)\n", This, dwInputNum, wine_dbgstr_longlong(cnsSampleTime), flags, sample); return E_NOTIMPL; } @@ -232,7 +232,7 @@ static HRESULT WINAPI WMWriterAdvanced_GetSinkCount(IWMWriterAdvanced3 *iface, D static HRESULT WINAPI WMWriterAdvanced_GetSink(IWMWriterAdvanced3 *iface, DWORD sink_num, IWMWriterSink **sink) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %p)\n", This, sink_num, sink); + FIXME("(%p)->(%lu %p)\n", This, sink_num, sink); return E_NOTIMPL; } @@ -254,7 +254,7 @@ static HRESULT WINAPI WMWriterAdvanced_WriteStreamSample(IWMWriterAdvanced3 *ifa QWORD sample_time, DWORD sample_send_time, QWORD sample_duration, DWORD flags, INSSBuffer *sample) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %u %s %x %p)\n", This, stream_num, wine_dbgstr_longlong(sample_time), + FIXME("(%p)->(%u %s %lu %s %lx %p)\n", This, stream_num, wine_dbgstr_longlong(sample_time), sample_send_time, wine_dbgstr_longlong(sample_duration), flags, sample); return E_NOTIMPL; } @@ -290,7 +290,7 @@ static HRESULT WINAPI WMWriterAdvanced_GetStatistics(IWMWriterAdvanced3 *iface, static HRESULT WINAPI WMWriterAdvanced_SetSyncTolerance(IWMWriterAdvanced3 *iface, DWORD window) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u)\n", This, window); + FIXME("(%p)->(%lu)\n", This, window); return E_NOTIMPL; } @@ -305,7 +305,7 @@ static HRESULT WINAPI WMWriterAdvanced2_GetInputSetting(IWMWriterAdvanced3 *ifac const WCHAR *name, WMT_ATTR_DATATYPE *time, BYTE *value, WORD *length) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %p %p %p)\n", This, input_num, debugstr_w(name), time, value, length); + FIXME("(%p)->(%lu %s %p %p %p)\n", This, input_num, debugstr_w(name), time, value, length); return E_NOTIMPL; } @@ -313,7 +313,7 @@ static HRESULT WINAPI WMWriterAdvanced2_SetInputSetting(IWMWriterAdvanced3 *ifac const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %d %p %u)\n", This, input_num, debugstr_w(name), type, value, length); + FIXME("(%p)->(%lu %s %d %p %u)\n", This, input_num, debugstr_w(name), type, value, length); return E_NOTIMPL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wnaspi32/Makefile.in | 1 - dlls/wnaspi32/aspi.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 6122ee8d8f6..5c3fa66e9d0 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wnaspi32.dll IMPORTLIB = wnaspi32 IMPORTS = advapi32 diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index 903c618f9ba..ae2d24489f6 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -74,7 +74,7 @@ int ASPI_GetNumControllers(void) } RegCloseKey(hkeyScsi); - TRACE("Returning %d host adapters\n", num_ha ); + TRACE("Returning %ld host adapters\n", num_ha ); return num_ha; }
participants (3)
-
Eric Pouech -
Esme Povirk (she/they) -
Huw Davies