Alexandre Julliard : mmsystem: Consistently use %I printf format for ULONG_PTR values.
Module: wine Branch: master Commit: 6368a46aa0ad739c5d0fb1637b08550c24f36b32 URL: https://gitlab.winehq.org/wine/wine/-/commit/6368a46aa0ad739c5d0fb1637b08550... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:44:06 2022 +0100 mmsystem: Consistently use %I printf format for ULONG_PTR values. --- dlls/mmsystem.dll16/driver.c | 14 +++++++------- dlls/mmsystem.dll16/mci16.c | 2 +- dlls/mmsystem.dll16/message16.c | 14 +++++++------- dlls/mmsystem.dll16/mmsystem.c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mmsystem.dll16/driver.c b/dlls/mmsystem.dll16/driver.c index 05d45fee10e..b26dbb796d9 100644 --- a/dlls/mmsystem.dll16/driver.c +++ b/dlls/mmsystem.dll16/driver.c @@ -97,7 +97,7 @@ static inline LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg, WORD args[8]; DWORD ret; - TRACE("Before CallDriverProc proc=%p driverID=%08lx wMsg=%04x p1=%08lx p2=%08lx\n", + TRACE("Before CallDriverProc proc=%p driverID=%08lx wMsg=%04x p1=%08Ix p2=%08Ix\n", lpDrv->lpDrvProc, lpDrv->dwDriverID, msg, lParam1, lParam2); args[7] = HIWORD(lpDrv->dwDriverID); @@ -120,7 +120,7 @@ LRESULT WINAPI DrvSendMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1, LPA LPWINE_DRIVER lpDrv; LRESULT retval = 0; - TRACE("(%04x, %04X, %08lX, %08lX)\n", hDriver, msg, lParam1, lParam2); + TRACE("(%04x, %04X, %08Ix, %08Ix)\n", hDriver, msg, lParam1, lParam2); if ((lpDrv = DRIVER_FindFromHDrvr16(hDriver)) != NULL) { retval = DRIVER_SendMessage(lpDrv, msg, lParam1, lParam2); @@ -128,7 +128,7 @@ LRESULT WINAPI DrvSendMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1, LPA WARN("Bad driver handle %u\n", hDriver); } - TRACE("retval = %ld\n", retval); + TRACE("retval = %Id\n", retval); return retval; } @@ -211,7 +211,7 @@ static LPWINE_DRIVER DRIVER_TryOpenDriver16(LPSTR lpFileName, LPARAM lParam2) DRIVERPROC16 lpProc; LPSTR ptr; - TRACE("('%s', %08lX);\n", lpFileName, lParam2); + TRACE("('%s', %08Ix);\n", lpFileName, lParam2); if (strlen(lpFileName) < 1) return lpDrv; @@ -252,7 +252,7 @@ HDRVR16 WINAPI DrvOpen16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lPara LPWINE_DRIVER lpDrv = NULL; char drvName[128]; - TRACE("(%s, %s, %08lX);\n", debugstr_a(lpDriverName), debugstr_a(lpSectionName), lParam2); + TRACE("(%s, %s, %08Ix);\n", debugstr_a(lpDriverName), debugstr_a(lpSectionName), lParam2); if (!lpDriverName || !*lpDriverName) return 0; @@ -284,7 +284,7 @@ LRESULT WINAPI DrvClose16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2) { LPWINE_DRIVER lpDrv; - TRACE("(%04x, %08lX, %08lX);\n", hDrvr, lParam1, lParam2); + TRACE("(%04x, %08Ix, %08Ix);\n", hDrvr, lParam1, lParam2); if ((lpDrv = DRIVER_FindFromHDrvr16(hDrvr)) != NULL) { DRIVER_SendMessage(lpDrv, DRV_CLOSE, lParam1, lParam2); @@ -321,7 +321,7 @@ HMODULE16 WINAPI DrvGetModuleHandle16(HDRVR16 hDrvr) LRESULT WINAPI DrvDefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LPARAM lParam1, LPARAM lParam2) { - TRACE("devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx\n", + TRACE("devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08Ix lP2=0x%08Ix\n", dwDevID, hDriv, wMsg, lParam1, lParam2); switch(wMsg) { diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index 8acd5fe436d..599e7edc31b 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -680,7 +680,7 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD BOOL to32; DWORD_PTR dwParam2 = p2; - TRACE("(%04X, %s, %08lX, %08lX)\n", wDevID, MCI_MessageToString(wMsg), dwParam1, dwParam2); + TRACE("(%04X, %s, %08lx, %08Ix)\n", wDevID, MCI_MessageToString(wMsg), dwParam1, dwParam2); switch (wMsg) { case MCI_CLOSE: diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index 5a722bb6691..b12b9b94327 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -217,7 +217,7 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (DWORD wMsg, DWORD_PTR* lp case MODM_CACHEPATCHES: case MODM_CACHEDRUMPATCHES: default: - FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%Ix,%Ix]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -284,7 +284,7 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_UnMap16To32W(DWORD wMsg, DWORD_PTR* l case MODM_CACHEPATCHES: case MODM_CACHEDRUMPATCHES: default: - FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%Ix,%Ix]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -427,7 +427,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveIn_Map16To32W (DWORD wMsg, DWORD_PTR* lp ret = MMSYSTEM_MAP_OK; break; default: - FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%Ix,%Ix]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -497,7 +497,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveIn_UnMap16To32W(DWORD wMsg, DWORD_PTR* lp } break; default: - FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%Ix,%Ix]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -646,7 +646,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveOut_Map16To32W (DWORD wMsg, DWORD_PTR* l ret = MMSYSTEM_MAP_OK; break; default: - FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%Ix,%Ix]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -726,7 +726,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveOut_UnMap16To32W(DWORD wMsg, DWORD_PTR* l } break; default: - FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%Ix,%Ix]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -980,7 +980,7 @@ DWORD MMSYSTDRV_Message(void* h, UINT msg, DWORD_PTR param1, DWORD_PTR param2) break; case MMSYSTEM_MAP_OK: case MMSYSTEM_MAP_OKMEM: - TRACE("Calling message(msg=%u p1=0x%08lx p2=0x%08lx)\n", + TRACE("Calling message(msg=%u p1=0x%08Ix p2=0x%08Ix)\n", msg, param1, param2); switch (thunk->kind) { diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 3538d942bc4..59480292224 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -2026,7 +2026,7 @@ LRESULT WINAPI mmThreadCreate16(FARPROC16 fpThreadAddr, LPHANDLE16 lpHndl, DWORD if (lpHndl) *lpHndl = hndl; - TRACE("ok => %ld\n", ret); + TRACE("ok => %Id\n", ret); return ret; }
participants (1)
-
Alexandre Julliard