October 2006 - Wine-Commits

Michael Stefaniuc : vwin32.vxd: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 7, 2006

Oct. 7, 2006

Module: wine Branch: master Commit: 8c66e6d80ab5f47dfd129c274c419eaee6ba0a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c66e6d80ab5f47dfd129c274… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 23:01:41 2006 +0200 vwin32.vxd: Win64 printf format warning fixes. --- dlls/vwin32.vxd/Makefile.in | 1 - dlls/vwin32.vxd/vwin32.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/vwin32.vxd/Makefile.in b/dlls/vwin32.vxd/Makefile.in index 53fdc47..b7236a0 100644 --- a/dlls/vwin32.vxd/Makefile.in +++ b/dlls/vwin32.vxd/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = vwin32.vxd IMPORTS = winedos kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ vwin32.c diff --git a/dlls/vwin32.vxd/vwin32.c b/dlls/vwin32.vxd/vwin32.c index 3374d81..fdd5998 100644 --- a/dlls/vwin32.vxd/vwin32.c +++ b/dlls/vwin32.vxd/vwin32.c @@ -111,8 +111,8 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD BYTE intnum = 0; TRACE( "Control '%s': " - "eax=0x%08lx, ebx=0x%08lx, ecx=0x%08lx, " - "edx=0x%08lx, esi=0x%08lx, edi=0x%08lx\n", + "eax=0x%08x, ebx=0x%08x, ecx=0x%08x, " + "edx=0x%08x, esi=0x%08x, edi=0x%08x\n", (dwIoControlCode == VWIN32_DIOC_DOS_IOCTL)? "VWIN32_DIOC_DOS_IOCTL" : (dwIoControlCode == VWIN32_DIOC_DOS_INT25)? "VWIN32_DIOC_DOS_INT25" : (dwIoControlCode == VWIN32_DIOC_DOS_INT26)? "VWIN32_DIOC_DOS_INT26" : @@ -153,7 +153,7 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD return FALSE; default: - FIXME( "Unknown Control %ld\n", dwIoControlCode); + FIXME( "Unknown Control %d\n", dwIoControlCode); return FALSE; } } @@ -179,7 +179,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD servi { DWORD parm = stack32_pop(context); - FIXME("Get VMCPD Version(%08lx): partial stub!\n", parm); + FIXME("Get VMCPD Version(%08x): partial stub!\n", parm); /* FIXME: This is what Win98 returns, it may * not be correct in all situations. @@ -192,7 +192,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD servi DWORD callnum = stack32_pop(context); DWORD parm = stack32_pop(context); - TRACE("Int31/DPMI dispatch(%08lx)\n", callnum); + TRACE("Int31/DPMI dispatch(%08x)\n", callnum); context->Eax = callnum; context->Ecx = parm; @@ -205,7 +205,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD servi return callnum; /* FIXME: should really call INT_Int41Handler() */ } default: - FIXME("Unknown service %08lx\n", service); + FIXME("Unknown service %08x\n", service); return 0xffffffff; } }

1 0

Michael Stefaniuc : serialui: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 7, 2006

Oct. 7, 2006

Module: wine Branch: master Commit: 796a93ffc0c4d034cdf67bf72defebdfbfeec94c URL: http://source.winehq.org/git/wine.git/?a=commit;h=796a93ffc0c4d034cdf67bf72… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 23:01:28 2006 +0200 serialui: Win64 printf format warning fixes. --- dlls/serialui/Makefile.in | 1 - dlls/serialui/confdlg.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 1326d5f..bdd50f6 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = serialui.dll IMPORTLIB = libserialui.$(IMPLIBEXT) IMPORTS = user32 advapi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ confdlg.c diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index e1854d1..465c4e2 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -64,7 +64,7 @@ HMODULE SERIALUI_hModule = 0; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -177,13 +177,13 @@ static BOOL SERIALUI_GetConfItems(HWND h if( (!hControl) || (!lpdwVal)) { - TRACE("Couldn't get window handle for item %lx\n",id); + TRACE("Couldn't get window handle for item %x\n",id); return FALSE; } if(!GetWindowTextA(hControl, &lpEntry[0], sizeof(lpEntry))) { - TRACE("Couldn't get window text for item %lx\n",id); + TRACE("Couldn't get window text for item %x\n",id); return FALSE; } /* TRACE("%ld contains %s\n",id, lpEntry); */ @@ -293,7 +293,7 @@ static void SERIALUI_DialogInfoToDCB(HWN SERIALUI_GetConfItems( hDlg, IDC_DATA, &SERIALUI_Data2Str, &dwByteSize); SERIALUI_GetConfItems( hDlg, IDC_FLOW, &SERIALUI_Flow2Str, &dwFlowControl ); - TRACE("baud=%ld stop=%ld parity=%ld data=%ld flow=%ld\n", + TRACE("baud=%d stop=%d parity=%d data=%d flow=%d\n", dwBaudRate, dwStopBits, dwParity, dwByteSize, dwFlowControl); lpdcb->BaudRate = dwBaudRate; @@ -488,7 +488,7 @@ BOOL WINAPI drvSetDefaultCommConfigW( DWORD r,dwDCBSize; static const WCHAR fmt[] = {'%','s','\\','%','s',0 }; - TRACE("%p %p %lx\n",lpszDevice,lpCommConfig,dwSize); + TRACE("%p %p %x\n",lpszDevice,lpCommConfig,dwSize); if(!lpCommConfig) return FALSE; @@ -507,7 +507,7 @@ BOOL WINAPI drvSetDefaultCommConfigW( dwDCBSize = sizeof (DCB); r = RegSetValueExW( hKeyPort, lpszDCB, 0, REG_BINARY, (LPBYTE)&lpCommConfig->dcb,dwDCBSize); - TRACE("write key r=%ld\n",r); + TRACE("write key r=%d\n",r); RegCloseKey(hKeyPort); }

1 0

Michael Stefaniuc : winemp3.acm: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 7, 2006

Oct. 7, 2006

Module: wine Branch: master Commit: 72ed451be7b8bcbd3623455ec241889fcfb6b461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ed451be7b8bcbd3623455ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 23:01:20 2006 +0200 winemp3.acm: Win64 printf format warning fixes. --- dlls/winemp3.acm/Makefile.in | 1 - dlls/winemp3.acm/mpegl3.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winemp3.acm/Makefile.in b/dlls/winemp3.acm/Makefile.in index 391d9f7..38b5ace 100644 --- a/dlls/winemp3.acm/Makefile.in +++ b/dlls/winemp3.acm/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winemp3.acm IMPORTS = winmm user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ common.c \ diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 2c8fc3e..d9390ae 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -181,7 +181,7 @@ static void mp3_horse(PACMDRVSTREAMINSTA *ndst = dpos; buffered_after = get_num_buffered_bytes(&amd->mp); - TRACE("before %ld put %ld during %ld after %ld\n", buffered_before, *nsrc, buffered_during, buffered_after); + TRACE("before %d put %d during %d after %d\n", buffered_before, *nsrc, buffered_during, buffered_after); } /*********************************************************************** @@ -243,7 +243,7 @@ static LRESULT MPEG3_FormatTagDetails(PA } break; default: - WARN("Unsupported query %08lx\n", dwQuery); + WARN("Unsupported query %08x\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -320,12 +320,12 @@ static LRESULT MPEG3_FormatDetails(PACMF fill_in_wfx(afd->cbwfx, afd->pwfx, 192000); break; default: - WARN("Unsupported tag %08lx\n", afd->dwFormatTag); + WARN("Unsupported tag %08x\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; } break; default: - WARN("Unsupported query %08lx\n", dwQuery); + WARN("Unsupported query %08x\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; @@ -518,7 +518,7 @@ static LRESULT MPEG3_StreamSize(PACMDRVS } break; default: - WARN("Unsupported query %08lx\n", adss->fdwSize); + WARN("Unsupported query %08x\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -539,7 +539,7 @@ static LRESULT MPEG3_StreamConvert(PACMD ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag

1 0

Michael Stefaniuc : dxdiagn: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 7, 2006

Oct. 7, 2006

Module: wine Branch: master Commit: 5ecdbb1f85a99fe780e501167886b909392c99fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ecdbb1f85a99fe780e501167… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 23:01:04 2006 +0200 dxdiagn: Win64 printf format warning fixes. --- dlls/dxdiagn/Makefile.in | 1 - dlls/dxdiagn/container.c | 8 ++++---- dlls/dxdiagn/dxdiag_main.c | 2 +- dlls/dxdiagn/provider.c | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index be84046..e2cf511 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = dxdiagn.dll IMPORTS = version ole32 oleaut32 user32 advapi32 kernel32 EXTRALIBS = -lstrmiids -ldxguid -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ container.c \ diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 5feb7c5..184840b 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -48,7 +48,7 @@ static ULONG WINAPI IDxDiagContainerImpl IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); + TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); DXDIAGN_LockModule(); @@ -59,7 +59,7 @@ static ULONG WINAPI IDxDiagContainerImpl IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); + TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); if (!refCount) { HeapFree(GetProcessHeap(), 0, This); @@ -86,7 +86,7 @@ static HRESULT WINAPI IDxDiagContainerIm IDxDiagContainerImpl_SubContainer* p = NULL; DWORD i = 0; - TRACE("(%p, %lu, %s, %lu)\n", iface, dwIndex, debugstr_w(pwszContainer), cchContainer); + TRACE("(%p, %u, %s, %u)\n", iface, dwIndex, debugstr_w(pwszContainer), cchContainer); if (NULL == pwszContainer) { return E_INVALIDARG; @@ -182,7 +182,7 @@ static HRESULT WINAPI IDxDiagContainerIm IDxDiagContainerImpl_Property* p = NULL; DWORD i = 0; - FIXME("(%p, %lu, %s, %lu)\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); + FIXME("(%p, %u, %s, %u)\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); if (NULL == pwszPropName) { return E_INVALIDARG; diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c index 2279e0c..d202ae9 100644 --- a/dlls/dxdiagn/dxdiag_main.c +++ b/dlls/dxdiagn/dxdiag_main.c @@ -30,7 +30,7 @@ LONG DXDIAGN_refCount = 0; /* At process attach */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%lx,%p\n", hInstDLL, fdwReason, lpvReserved); + TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved); if (fdwReason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls(hInstDLL); } diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 56b2fc1..64425a2 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -54,7 +54,7 @@ static ULONG WINAPI IDxDiagProviderImpl_ IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); + TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); DXDIAGN_LockModule(); @@ -65,7 +65,7 @@ static ULONG WINAPI IDxDiagProviderImpl_ IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); + TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); if (!refCount) { HeapFree(GetProcessHeap(), 0, This);

1 0

Michael Stefaniuc : winmm/wineoss: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 7, 2006

Oct. 7, 2006

Module: wine Branch: master Commit: 10ee330a193411f240e7fdd36383f238331c9a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ee330a193411f240e7fdd36… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 22:59:51 2006 +0200 winmm/wineoss: Win64 printf format warning fixes. --- dlls/winmm/wineoss/Makefile.in | 1 dlls/winmm/wineoss/audio.c | 110 ++++++++++++++++++++-------------------- dlls/winmm/wineoss/dscapture.c | 54 ++++++++++---------- dlls/winmm/wineoss/dsrender.c | 44 ++++++++-------- dlls/winmm/wineoss/midi.c | 44 ++++++++-------- dlls/winmm/wineoss/mixer.c | 98 ++++++++++++++++++------------------ dlls/winmm/wineoss/mmaux.c | 6 +- 7 files changed, 178 insertions(+), 179 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10ee330a193411f240e7f…

1 0

Michael Stefaniuc : winmm/winealsa: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 7, 2006

Oct. 7, 2006

Module: wine Branch: master Commit: a0f541399a6a7b9805bfe0971c80174959449a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f541399a6a7b9805bfe0971… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 22:59:44 2006 +0200 winmm/winealsa: Win64 printf format warning fixes. --- dlls/winmm/winealsa/Makefile.in | 1 dlls/winmm/winealsa/audio.c | 166 ++++++++++++++++++++------------------- dlls/winmm/winealsa/midi.c | 40 +++++---- 3 files changed, 103 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0f541399a6a7b9805bfe…

1 0

Michael Stefaniuc : winmm/winearts: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 7, 2006

Oct. 7, 2006

Module: wine Branch: master Commit: fe0af93cb66cc9a89bcabc8a9a35c600cec2688e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0af93cb66cc9a89bcabc8a9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 22:59:23 2006 +0200 winmm/winearts: Win64 printf format warning fixes. --- dlls/winmm/winearts/Makefile.in | 1 dlls/winmm/winearts/audio.c | 80 ++++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe0af93cb66cc9a89bcab…

1 0

Michael Stefaniuc : winmm/winenas: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 7, 2006

Oct. 7, 2006

Module: wine Branch: master Commit: 6f6e054ffb7e4e238c92b85f6bab5d2b5f71f5a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6e054ffb7e4e238c92b85f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 22:58:44 2006 +0200 winmm/winenas: Win64 printf format warning fixes. --- dlls/winmm/winenas/Makefile.in | 1 - dlls/winmm/winenas/audio.c | 42 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/winmm/winenas/Makefile.in b/dlls/winmm/winenas/Makefile.in index 4a39c03..5a7d925 100644 --- a/dlls/winmm/winenas/Makefile.in +++ b/dlls/winmm/winenas/Makefile.in @@ -6,7 +6,6 @@ MODULE = winenas.drv IMPORTS = winmm user32 kernel32 EXTRAINCL = @X_CFLAGS@ EXTRALIBS = -ldxguid -luuid @NASLIBS@ -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ audio.c \ diff --git a/dlls/winmm/winenas/audio.c b/dlls/winmm/winenas/audio.c index 7856710..4b8eb1b 100644 --- a/dlls/winmm/winenas/audio.c +++ b/dlls/winmm/winenas/audio.c @@ -280,19 +280,19 @@ static const char* nas_state(unsigned in static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position, PCMWAVEFORMAT* format) { - TRACE("wType=%04X wBitsPerSample=%u nSamplesPerSec=%lu nChannels=%u nAvgBytesPerSec=%lu\n", + TRACE("wType=%04X wBitsPerSample=%u nSamplesPerSec=%u nChannels=%u nAvgBytesPerSec=%u\n", lpTime->wType, format->wBitsPerSample, format->wf.nSamplesPerSec, format->wf.nChannels, format->wf.nAvgBytesPerSec); - TRACE("Position in bytes=%lu\n", position); + TRACE("Position in bytes=%u\n", position); switch (lpTime->wType) { case TIME_SAMPLES: lpTime->u.sample = position / (format->wBitsPerSample / 8 * format->wf.nChannels); - TRACE("TIME_SAMPLES=%lu\n", lpTime->u.sample); + TRACE("TIME_SAMPLES=%u\n", lpTime->u.sample); break; case TIME_MS: lpTime->u.ms = 1000.0 * position / (format->wBitsPerSample / 8 * format->wf.nChannels * format->wf.nSamplesPerSec); - TRACE("TIME_MS=%lu\n", lpTime->u.ms); + TRACE("TIME_MS=%u\n", lpTime->u.ms); break; case TIME_SMPTE: lpTime->u.smpte.fps = 30; @@ -316,7 +316,7 @@ static DWORD bytes_to_mmtime(LPMMTIME lp /* fall through */ case TIME_BYTES: lpTime->u.cb = position; - TRACE("TIME_BYTES=%lu\n", lpTime->u.cb); + TRACE("TIME_BYTES=%u\n", lpTime->u.cb); break; } return MMSYSERR_NOERROR; @@ -580,7 +580,7 @@ static int NAS_RetrieveRingMessage(MSG_R */ static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2) { - TRACE("wMsg = 0x%04x dwParm1 = %04lX dwParam2 = %04lX\n", wMsg, dwParam1, dwParam2); + TRACE("wMsg = 0x%04x dwParm1 = %04X dwParam2 = %04X\n", wMsg, dwParam1, dwParam2); switch (wMsg) { case WOM_OPEN: @@ -628,7 +628,7 @@ static void wodPlayer_BeginWaveHdr(WINE_ WARN("Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr); TRACE("Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr); } else { - TRACE("Starting loop (%ldx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr); + TRACE("Starting loop (%dx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr); wwo->lpLoopPtr = lpWaveHdr; /* Windows does not touch WAVEHDR.dwLoops, * so we need to make an internal copy */ @@ -777,7 +777,7 @@ static void wodPlayer_ProcessMessages(WI HANDLE ev; while (NAS_RetrieveRingMessage(&wwo->msgRing, &msg, &param, &ev)) { - TRACE("Received %s %lx\n", wodPlayerCmdString[msg - WM_USER - 1], param); + TRACE("Received %s %x\n", wodPlayerCmdString[msg - WM_USER - 1], param); switch (msg) { case WINE_WM_PAUSING: wodPlayer_Reset(wwo, FALSE); @@ -871,7 +871,7 @@ static DWORD CALLBACK wodPlayer(LPVOID p */ static DWORD wodGetDevCaps(WORD wDevID, LPWAVEOUTCAPSW lpCaps, DWORD dwSize) { - TRACE("(%u, %p, %lu);\n", wDevID, lpCaps, dwSize); + TRACE("(%u, %p, %u);\n", wDevID, lpCaps, dwSize); if (lpCaps == NULL) return MMSYSERR_NOTENABLED; @@ -891,7 +891,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVE { WINE_WAVEOUT* wwo; - TRACE("wodOpen (%u, %p, %08lX);\n", wDevID, lpDesc, dwFlags); + TRACE("wodOpen (%u, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { WARN("Invalid Parameter !\n"); @@ -918,14 +918,14 @@ static DWORD wodOpen(WORD wDevID, LPWAVE lpDesc->lpFormat->nChannels == 0 || lpDesc->lpFormat->nSamplesPerSec == 0 || (lpDesc->lpFormat->wBitsPerSample!=8 && lpDesc->lpFormat->wBitsPerSample!=16)) { - WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%ld !\n", + WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n", lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels, lpDesc->lpFormat->nSamplesPerSec); return WAVERR_BADFORMAT; } if (dwFlags & WAVE_FORMAT_QUERY) { - TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%ld !\n", + TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n", lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels, lpDesc->lpFormat->nSamplesPerSec); return MMSYSERR_NOERROR; @@ -966,9 +966,9 @@ static DWORD wodOpen(WORD wDevID, LPWAVE } wwo->hStartUpEvent = INVALID_HANDLE_VALUE; - TRACE("stream=0x%lx, BufferSize=%ld\n", (long)wwo->AuServ, wwo->BufferSize); + TRACE("stream=0x%lx, BufferSize=%d\n", (long)wwo->AuServ, wwo->BufferSize); - TRACE("wBitsPerSample=%u nAvgBytesPerSec=%lu nSamplesPerSec=%lu nChannels=%u nBlockAlign=%u\n", + TRACE("wBitsPerSample=%u nAvgBytesPerSec=%u nSamplesPerSec=%u nChannels=%u nBlockAlign=%u\n", wwo->format.wBitsPerSample, wwo->format.wf.nAvgBytesPerSec, wwo->format.wf.nSamplesPerSec, wwo->format.wf.nChannels, wwo->format.wf.nBlockAlign); @@ -1017,7 +1017,7 @@ static DWORD wodClose(WORD wDevID) */ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) { - TRACE("(%u, %p, %08lX);\n", wDevID, lpWaveHdr, dwSize); + TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize); /* first, do the sanity checks... */ if (wDevID >= MAX_WAVEOUTDRV || AuServ == NULL) @@ -1119,7 +1119,7 @@ static DWORD wodGetPosition(WORD wDevID, { WINE_WAVEOUT* wwo; - TRACE("%u, %p, %lu);\n", wDevID, lpTime, uSize); + TRACE("%u, %p, %u);\n", wDevID, lpTime, uSize); if (wDevID >= MAX_WAVEOUTDRV || AuServ == NULL) { @@ -1180,7 +1180,7 @@ static DWORD wodSetVolume(WORD wDevID, D left = (LOWORD(dwParam) * 100) / 0xFFFFl; right = (HIWORD(dwParam) * 100) / 0xFFFFl; - TRACE("(%u, %08lX);\n", wDevID, dwParam); + TRACE("(%u, %08X);\n", wDevID, dwParam); WOutDev[wDevID].volume_left = left; WOutDev[wDevID].volume_right = right; @@ -1202,7 +1202,7 @@ static DWORD wodGetNumDevs(void) DWORD WINAPI NAS_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) { - TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + TRACE("(%u, %04X, %08X, %08X, %08X);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { case DRVM_INIT: @@ -1349,7 +1349,7 @@ event_handler(AuServer* aud, AuEvent* ev break; case AuElementNotifyKindState: - TRACE("ev: kind %s state %s->%s reason %s numbytes %ld freeB %lu\n", + TRACE("ev: kind %s state %s->%s reason %s numbytes %ld freeB %u\n", nas_elementnotify_kind(event->kind), nas_state(event->prev_state), nas_state(event->cur_state), @@ -1417,7 +1417,7 @@ static int nas_send_buffer(WINE_WAVEOUT* memcpy(newdata, wwo->SoundBuffer + len, wwo->BufferUsed - len); } - TRACE("envoye de %d bytes / %lu bytes / freeBytes %lu\n", len, wwo->BufferUsed, wwo->freeBytes); + TRACE("envoye de %d bytes / %lu bytes / freeBytes %u\n", len, wwo->BufferUsed, wwo->freeBytes); AuWriteElement(wwo->AuServ, wwo->AuFlow, 0, len, ptr, AuFalse, NULL); @@ -1490,7 +1490,7 @@ #else /* !HAVE_NAS */ */ DWORD WINAPI NAS_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) { - FIXME("(%u, %04X, %08lX, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); return MMSYSERR_NOTENABLED; } #endif

1 0

Michael Stefaniuc : winmm/wineesd: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 7, 2006

Oct. 7, 2006

Module: wine Branch: master Commit: c8ef239057861d82c3d48362c7e9e7f1447d5919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ef239057861d82c3d48362c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 22:59:08 2006 +0200 winmm/wineesd: Win64 printf format warning fixes. --- dlls/winmm/wineesd/Makefile.in | 1 - dlls/winmm/wineesd/audio.c | 80 ++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8ef239057861d82c3d48…

1 0

Michael Stefaniuc : winmm/winejack: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 7, 2006

Oct. 7, 2006

Module: wine Branch: master Commit: 3baeb485a03b554b9d27ff6b5723ea9f745f8fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3baeb485a03b554b9d27ff6b5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 22:58:56 2006 +0200 winmm/winejack: Win64 printf format warning fixes. --- dlls/winmm/winejack/Makefile.in | 1 - dlls/winmm/winejack/audio.c | 76 ++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3baeb485a03b554b9d27f…

1 0