December 2022 - Wine-commits

Alexandre Julliard : mmsystem: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 6368a46aa0ad739c5d0fb1637b08550c24f36b32 URL: https://gitlab.winehq.org/wine/wine/-/commit/6368a46aa0ad739c5d0fb1637b0855… 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; }

1 0

Alexandre Julliard : msacm: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 1c5e38f3ecfa2b41985390c25648afaa3d1efe20 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c5e38f3ecfa2b41985390c25648af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:44:38 2022 +0100 msacm: Consistently use %I printf format for ULONG_PTR values. --- dlls/msacm.dll16/msacm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msacm.dll16/msacm.c b/dlls/msacm.dll16/msacm.c index 30182c92b2f..c1590f82714 100644 --- a/dlls/msacm.dll16/msacm.c +++ b/dlls/msacm.dll16/msacm.c @@ -99,7 +99,7 @@ MMRESULT16 WINAPI acmDriverAdd16( LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule, LPARAM lParam, DWORD dwPriority, DWORD fdwAdd) { - FIXME("(%p, 0x%04x, %ld, %ld, %ld): stub\n", + FIXME("(%p, 0x%04x, %Id, %ld, %ld): stub\n", phadid, hinstModule, lParam, dwPriority, fdwAdd ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -145,7 +145,7 @@ MMRESULT16 WINAPI acmDriverClose16( LRESULT WINAPI acmDriverMessage16( HACMDRIVER16 had, UINT16 uMsg, LPARAM lParam1, LPARAM lParam2) { - FIXME("(0x%04x, %d, %ld, %ld): stub\n", + FIXME("(0x%04x, %d, %Id, %Id): stub\n", had, uMsg, lParam1, lParam2 ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

1 0

Alexandre Julliard : msvcrt: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 468d68d60d294abf618ee4f4bc39107d8034061c URL: https://gitlab.winehq.org/wine/wine/-/commit/468d68d60d294abf618ee4f4bc3910… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:45:06 2022 +0100 msvcrt: Consistently use %I printf format for ULONG_PTR values. --- dlls/msvcrt/except_i386.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 662b4ebadb0..d4d45c74d17 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -355,7 +355,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG if(TRACE_ON(seh)) { TRACE("detect rethrow: exception code: %lx\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) - TRACE("re-propagate: obj: %lx, type: %lx\n", + TRACE("re-propagate: obj: %Ix, type: %Ix\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } } @@ -588,7 +588,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if(TRACE_ON(seh)) { TRACE("detect rethrow: exception code: %lx\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) - TRACE("re-propagate: obj: %lx, type: %lx\n", + TRACE("re-propagate: obj: %Ix, type: %Ix\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } }

1 0

Alexandre Julliard : msvideo: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 73ebf69abfde4a9c9c12f82753f10633d569773a URL: https://gitlab.winehq.org/wine/wine/-/commit/73ebf69abfde4a9c9c12f82753f106… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:45:31 2022 +0100 msvideo: Consistently use %I printf format for ULONG_PTR values. --- dlls/msvideo.dll16/msvideo16.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 3a7a761382e..d2ee1275353 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -189,7 +189,7 @@ LRESULT VFWAPI ICGetInfo16(HIC16 hic, ICINFO16 * picinfo, DWORD cb) TRACE("(0x%08lx,%p,%ld)\n", (DWORD) hic, picinfo, cb); ret = ICSendMessage16(hic, ICM_GETINFO, (DWORD) picinfo, cb); - TRACE(" -> 0x%08lx\n", ret); + TRACE(" -> 0x%08Ix\n", ret); return ret; }

1 0

Alexandre Julliard : ntdll: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 4619a45f625995f6fd3d06ae1a138df570c22ab1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4619a45f625995f6fd3d06ae1a138d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:46:34 2022 +0100 ntdll: Consistently use %I printf format for ULONG_PTR values. --- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/tests/exception.c | 20 ++++++++++---------- dlls/ntdll/tests/info.c | 4 ++-- dlls/ntdll/tests/wow64.c | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 42baf9f99e6..9709be34f8c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -186,7 +186,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], (char*)rec->ExceptionInformation[1] ); else - MESSAGE( "wine: Call from %p to unimplemented function %s.%ld, aborting\n", + MESSAGE( "wine: Call from %p to unimplemented function %s.%Id, aborting\n", rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index cec541781db..4bf2e4ec78e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -689,9 +689,9 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram ok( rec->ExceptionCode == except->status || (except->alt_status != 0 && rec->ExceptionCode == except->alt_status), "%u: Wrong exception code %lx/%lx\n", entry, rec->ExceptionCode, except->status ); - ok( context->Eip == (DWORD_PTR)code_mem + except->offset, + ok( context->Eip == (DWORD)code_mem + except->offset, "%u: Unexpected eip %#lx/%#lx\n", entry, - context->Eip, (DWORD_PTR)code_mem + except->offset ); + context->Eip, (DWORD)code_mem + except->offset ); ok( rec->ExceptionAddress == (char*)context->Eip || (rec->ExceptionCode == STATUS_BREAKPOINT && rec->ExceptionAddress == (char*)context->Eip + 1), "%u: Unexpected exception address %p/%p\n", entry, @@ -727,14 +727,14 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram { for (i = 0; i < rec->NumberParameters; i++) ok( rec->ExceptionInformation[i] == except->params[i], - "%u: Wrong parameter %d: %lx/%lx\n", + "%u: Wrong parameter %d: %Ix/%lx\n", entry, i, rec->ExceptionInformation[i], except->params[i] ); } else { for (i = 0; i < rec->NumberParameters; i++) ok( rec->ExceptionInformation[i] == except->alt_params[i], - "%u: Wrong parameter %d: %lx/%lx\n", + "%u: Wrong parameter %d: %Ix/%lx\n", entry, i, rec->ExceptionInformation[i], except->alt_params[i] ); } @@ -1336,10 +1336,10 @@ static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R "exception code: %#lx, should be %#lx\n", rec->ExceptionCode, STATUS_FLOAT_MULTIPLE_TRAPS); ok( rec->NumberParameters == is_wow64 ? 2 : 1, "# of params: %li\n", rec->NumberParameters); - ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]); + ok( rec->ExceptionInformation[0] == 0, "param #1: %Ix, should be 0\n", rec->ExceptionInformation[0]); if (rec->NumberParameters == 2) ok( rec->ExceptionInformation[1] == ((XSAVE_FORMAT *)context->ExtendedRegisters)->MxCsr, - "param #1: %lx / %lx\n", rec->ExceptionInformation[1], + "param #1: %Ix / %lx\n", rec->ExceptionInformation[1], ((XSAVE_FORMAT *)context->ExtendedRegisters)->MxCsr); } context->Eip += 3; /* skip divps */ @@ -8187,14 +8187,14 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) ok(rec->NumberParameters == (is_wow64 ? 1 : 3), "ExceptionParameters is %ld instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Eax, - "expected ExceptionInformation[0] = %lx, got %lx\n", + "expected ExceptionInformation[0] = %lx, got %Ix\n", ExceptionInfo->ContextRecord->Eax, rec->ExceptionInformation[0]); if (!is_wow64) { ok(rec->ExceptionInformation[1] == 0x11111111, - "got ExceptionInformation[1] = %lx\n", rec->ExceptionInformation[1]); + "got ExceptionInformation[1] = %Ix\n", rec->ExceptionInformation[1]); ok(rec->ExceptionInformation[2] == 0x22222222, - "got ExceptionInformation[2] = %lx\n", rec->ExceptionInformation[2]); + "got ExceptionInformation[2] = %Ix\n", rec->ExceptionInformation[2]); } #else ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 0x2f, @@ -8537,7 +8537,7 @@ static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo) ok(rec->NumberParameters == (is_wow64 ? 1 : 3), "ExceptionParameters is %ld instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); ok(rec->ExceptionInformation[0] == 0, - "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); + "got ExceptionInformation[0] = %Ix\n", rec->ExceptionInformation[0]); ExceptionInfo->ContextRecord->Eip = (DWORD)code_mem + 2; #elif defined(__x86_64__) ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 1, diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 93259a0832c..f583f0d0a76 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -251,12 +251,12 @@ static void test_query_basic(void) ok( sbi.MmHighestPhysicalPage == sbi64.MmHighestPhysicalPage, "MmHighestPhysicalPage %lu / %lu\n", sbi.MmHighestPhysicalPage, sbi64.MmHighestPhysicalPage); ok( sbi.AllocationGranularity == (ULONG_PTR)sbi64.AllocationGranularity, - "AllocationGranularity %#lx / %#lx\n", sbi.AllocationGranularity, + "AllocationGranularity %#Ix / %#Ix\n", sbi.AllocationGranularity, (ULONG_PTR)sbi64.AllocationGranularity); ok( (ULONG_PTR)sbi.LowestUserAddress == sbi64.LowestUserAddress, "LowestUserAddress %p / %s\n", sbi.LowestUserAddress, wine_dbgstr_longlong(sbi64.LowestUserAddress)); ok( sbi.ActiveProcessorsAffinityMask == sbi64.ActiveProcessorsAffinityMask, - "ActiveProcessorsAffinityMask %#lx / %s\n", + "ActiveProcessorsAffinityMask %#Ix / %s\n", sbi.ActiveProcessorsAffinityMask, wine_dbgstr_longlong(sbi64.ActiveProcessorsAffinityMask)); ok( sbi.NumberOfProcessors == sbi64.NumberOfProcessors, "NumberOfProcessors %u / %u\n", sbi.NumberOfProcessors, sbi64.NumberOfProcessors); diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 5d6ab8ac6fa..b0f5dda5804 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1127,7 +1127,7 @@ static void test_iosb(void) ok( status == STATUS_PENDING, "NtFsControlFile returned %lx\n", status ); ok( U(iosb32).Status == 0x55555555, "status changed to %lx\n", U(iosb32).Status ); ok( U(iosb64).Pointer == PtrToUlong(&iosb32), "status changed to %lx\n", U(iosb64).Status ); - ok( iosb64.Information == 0xdeadbeef, "info changed to %lx\n", (ULONG_PTR)iosb64.Information ); + ok( iosb64.Information == 0xdeadbeef, "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); @@ -1135,7 +1135,7 @@ static void test_iosb(void) ok( U(iosb32).Status == 0, "Wrong iostatus %lx\n", U(iosb32).Status ); ok( U(iosb64).Pointer == PtrToUlong(&iosb32), "status changed to %lx\n", U(iosb64).Status ); - ok( iosb64.Information == 0xdeadbeef, "info changed to %lx\n", (ULONG_PTR)iosb64.Information ); + ok( iosb64.Information == 0xdeadbeef, "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); memset( &iosb32, 0x55, sizeof(iosb32) ); iosb64.Pointer = PtrToUlong( &iosb32 ); @@ -1153,9 +1153,9 @@ static void test_iosb(void) todo_wine { ok( U(iosb32).Status == STATUS_SUCCESS, "status changed to %lx\n", U(iosb32).Status ); - ok( iosb32.Information == sizeof(id), "info changed to %lx\n", iosb32.Information ); + ok( iosb32.Information == sizeof(id), "info changed to %Ix\n", iosb32.Information ); ok( U(iosb64).Pointer == PtrToUlong(&iosb32), "status changed to %lx\n", U(iosb64).Status ); - ok( iosb64.Information == 0xdeadbeef, "info changed to %lx\n", (ULONG_PTR)iosb64.Information ); + ok( iosb64.Information == 0xdeadbeef, "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); } ok( id == GetCurrentProcessId(), "wrong id %lx / %lx\n", id, GetCurrentProcessId() ); CloseHandle( client ); @@ -1181,9 +1181,9 @@ static void test_iosb(void) status = call_func64( func, ARRAY_SIZE(args), args ); ok( status == STATUS_SUCCESS, "NtFsControlFile returned %lx\n", status ); ok( U(iosb32).Status == 0x55555555, "status changed to %lx\n", U(iosb32).Status ); - ok( iosb32.Information == 0x55555555, "info changed to %lx\n", iosb32.Information ); + ok( iosb32.Information == 0x55555555, "info changed to %Ix\n", iosb32.Information ); ok( U(iosb64).Pointer == STATUS_SUCCESS, "status changed to %lx\n", U(iosb64).Status ); - ok( iosb64.Information == sizeof(id), "info changed to %lx\n", (ULONG_PTR)iosb64.Information ); + ok( iosb64.Information == sizeof(id), "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); ok( id == GetCurrentProcessId(), "wrong id %lx / %lx\n", id, GetCurrentProcessId() ); CloseHandle( client ); CloseHandle( server );

1 0

Alexandre Julliard : setupx: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 5289d0ef4e8e3190ae67728f3c2c7bbc57257e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/5289d0ef4e8e3190ae67728f3c2c7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:47:04 2022 +0100 setupx: Consistently use %I printf format for ULONG_PTR values. --- dlls/setupx.dll16/virtcopy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index 552db5a9895..1c3d04bdba3 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -267,7 +267,7 @@ static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC */ RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef) { - TRACE("(%p, %08lx)\n", vifproc, lparamMsgRef); + TRACE("(%p, %08Ix)\n", vifproc, lparamMsgRef); if (VCP_opened) return ERR_VCP_BUSY; @@ -517,7 +517,7 @@ RETERR16 WINAPI vcpDefCallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, { static int count = 0; if (count < 10) - FIXME("(%p, %04x, %04x, %08lx, %08lx) - what to do here ?\n", + FIXME("(%p, %04x, %04x, %08Ix, %08Ix) - what to do here ?\n", lpvObj, uMsg, wParam, lParam, lParamRef); count++; return OK; @@ -669,7 +669,7 @@ RETERR16 WINAPI vcpUICallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, RETERR16 res = VCPN_OK; if (count < 5) - FIXME("(%p, %04x, %04x, %08lx, %08lx) - semi-stub\n", + FIXME("(%p, %04x, %04x, %08Ix, %08Ix) - semi-stub\n", lpvObj, uMsg, wParam, lParam, lParamRef); count++; switch (uMsg)

1 0

Alexandre Julliard : shell: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 9f6b7eef4306b9c45729a93de58111f4cb6dd38c URL: https://gitlab.winehq.org/wine/wine/-/commit/9f6b7eef4306b9c45729a93de58111… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:47:28 2022 +0100 shell: Consistently use %I printf format for ULONG_PTR values. --- dlls/shell.dll16/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index 1b55478be7f..bc3cfdfc97d 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -470,7 +470,7 @@ DWORD WINAPI DoEnvironmentSubst16(LPSTR str,WORD length) */ static LRESULT WINAPI SHELL_HookProc(INT code, WPARAM wParam, LPARAM lParam) { - TRACE("%i, %x, %08lx\n", code, wParam, lParam ); + TRACE("%i, %x, %08Ix\n", code, wParam, lParam ); if (SHELL_hWnd) {

1 0

Alexandre Julliard : user.exe: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 3925f42452aab8075107936cae33a0e37a138d8b URL: https://gitlab.winehq.org/wine/wine/-/commit/3925f42452aab8075107936cae33a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:48:17 2022 +0100 user.exe: Consistently use %I printf format for ULONG_PTR values. --- dlls/user.exe16/bidi.c | 6 +++--- dlls/user.exe16/dialog.c | 2 +- dlls/user.exe16/message.c | 8 ++++---- dlls/user.exe16/user.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/user.exe16/bidi.c b/dlls/user.exe16/bidi.c index 7b91a322a10..6d346e26b3b 100644 --- a/dlls/user.exe16/bidi.c +++ b/dlls/user.exe16/bidi.c @@ -81,7 +81,7 @@ HWND16 WINAPI CreateDialogIndirectParamML16( HINSTANCE16 hinstWnd, LPCSTR lpDlgName, HINSTANCE16 hinstLoad ) { - FIXME( "( %04hx, %p, %04hx, %p, %08lx, %hu, %hu, %p, %04hx ): stub\n", + FIXME( "( %04hx, %p, %04hx, %p, %08Ix, %hu, %hu, %p, %04hx ): stub\n", hinstWnd, lpvDlgTmp, hwndOwner, dlgProc, lParamInit, iCodePage, iLang, lpDlgName, hinstLoad ); return 0; @@ -100,7 +100,7 @@ HWND16 WINAPI DialogBoxIndirectParamML16( HINSTANCE16 hinstWnd, LPCSTR lpDlgName, HINSTANCE16 hinstLoad ) { - FIXME( "( %04hx, %04hx, %04hx, %p, %08lx, %hu, %hu, %p, %04hx ): stub\n", + FIXME( "( %04hx, %04hx, %04hx, %p, %08Ix, %hu, %hu, %p, %04hx ): stub\n", hinstWnd, hglbDlgTemp, hwndOwner, dlgprc, lParamInit, iCodePage, iLang, lpDlgName, hinstLoad ); return 0; @@ -267,7 +267,7 @@ INT16 WINAPI MessageBoxEx16( HWND16 hwndParent, LPCSTR lpszText, LRESULT WINAPI QueryCodePage16( UINT16 idxLang, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) { - FIXME( "( %hu, %hu, %04hx, %08lx ): stub\n", idxLang, msg, wParam, lParam ); + FIXME( "( %hu, %hu, %04hx, %08Ix ): stub\n", idxLang, msg, wParam, lParam ); return 0; } diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 315f70dd6f3..b61ae5cd519 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -789,7 +789,7 @@ HWND16 WINAPI CreateDialogParam16( HINSTANCE16 hInst, LPCSTR dlgTemplate, HGLOBAL16 hmem; LPCVOID data; - TRACE("%04x,%s,%04x,%p,%ld\n", + TRACE("%04x,%s,%04x,%p,%Ix\n", hInst, debugstr_a(dlgTemplate), owner, dlgProc, param ); if (!(hRsrc = FindResource16( hInst, dlgTemplate, (LPSTR)RT_DIALOG ))) return 0; diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 9af217bf5f1..59c58ed9bd9 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1503,9 +1503,9 @@ LRESULT WINAPI SendMessage16( HWND16 hwnd16, UINT16 msg, WPARAM16 wparam, LPARAM if (!(winproc = (WNDPROC16)GetWindowLong16( hwnd16, GWLP_WNDPROC ))) return 0; - TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08lx\n", hwnd16, msg, wparam, lparam ); + TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08Ix\n", hwnd16, msg, wparam, lparam ); result = CallWindowProc16( winproc, hwnd16, msg, wparam, lparam ); - TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08lx returned %08lx\n", + TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08Ix returned %08Ix\n", hwnd16, msg, wparam, lparam, result ); } else /* map to 32-bit unicode for inter-thread/process message */ @@ -1730,9 +1730,9 @@ LONG WINAPI DispatchMessage16( const MSG16* msg ) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } - TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08lx\n", msg->hwnd, msg->message, msg->wParam, msg->lParam ); + TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08Ix\n", msg->hwnd, msg->message, msg->wParam, msg->lParam ); retval = CallWindowProc16( winproc, msg->hwnd, msg->message, msg->wParam, msg->lParam ); - TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08lx returned %08lx\n", + TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08Ix returned %08Ix\n", msg->hwnd, msg->message, msg->wParam, msg->lParam, retval ); return retval; } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 75b81b0ea05..e1b44d28101 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1619,7 +1619,7 @@ UINT16 WINAPI GetMenuState16( HMENU16 hMenu, UINT16 wItemID, UINT16 wFlags ) LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1, LPARAM lParam2) { - FIXME("(%04x, %04x, %08lx, %08lx): stub\n", hDriver, msg, lParam1, lParam2); + FIXME("(%04x, %04x, %08Ix, %08Ix): stub\n", hDriver, msg, lParam1, lParam2); return 0; } @@ -1629,7 +1629,7 @@ LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1, */ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam2) { - FIXME( "(%s, %s, %08lx): stub\n", debugstr_a(lpDriverName), debugstr_a(lpSectionName), lParam2); + FIXME( "(%s, %s, %08Ix): stub\n", debugstr_a(lpDriverName), debugstr_a(lpSectionName), lParam2); return 0; } @@ -1639,7 +1639,7 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP */ LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2) { - FIXME( "(%04x, %08lx, %08lx): stub\n", hDrvr, lParam1, lParam2); + FIXME( "(%04x, %08Ix, %08Ix): stub\n", hDrvr, lParam1, lParam2); return FALSE; } @@ -1660,7 +1660,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr) LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LPARAM lParam1, LPARAM lParam2) { - FIXME( "devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx: stub\n", + FIXME( "devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08Ix lP2=0x%08Ix: stub\n", dwDevID, hDriv, wMsg, lParam1, lParam2); return 0; }

1 0

Alexandre Julliard : wintab: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: dae4031a285eb0932e61257a1564e65a7e2a1241 URL: https://gitlab.winehq.org/wine/wine/-/commit/dae4031a285eb0932e61257a1564e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:48:43 2022 +0100 wintab: Consistently use %I printf format for ULONG_PTR values. --- dlls/wintab.dll16/wintab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wintab.dll16/wintab.c b/dlls/wintab.dll16/wintab.c index ccf5127c823..b5870228f03 100644 --- a/dlls/wintab.dll16/wintab.c +++ b/dlls/wintab.dll16/wintab.c @@ -329,7 +329,7 @@ BOOL16 WINAPI WTMgrClose16(HMGR16 hMgr) */ BOOL16 WINAPI WTMgrContextEnum16(HMGR16 hMgr, WTENUMPROC16 lpEnumFunc, LPARAM lParam) { - FIXME("(0x%04hx, %p, %ld): stub\n", hMgr, lpEnumFunc, lParam); + FIXME("(0x%04hx, %p, %Ix): stub\n", hMgr, lpEnumFunc, lParam); return FALSE; } @@ -444,7 +444,7 @@ BOOL16 WINAPI WTMgrPacketUnhook16(HWTHOOK16 hHook) LRESULT WINAPI WTMgrPacketHookDefProc16(INT16 nCode, WPARAM16 wParam, LPARAM lParam, LPWTHOOKPROC16 lplpFunc) { - FIXME("(%hd, %hu, %lu, %p): stub\n", nCode, wParam, lParam, lplpFunc); + FIXME("(%hd, %hu, %Iu, %p): stub\n", nCode, wParam, lParam, lplpFunc); return 0; } @@ -455,7 +455,7 @@ LRESULT WINAPI WTMgrPacketHookDefProc16(INT16 nCode, WPARAM16 wParam, LRESULT WINAPI WTMgrPacketHookNext16(HWTHOOK16 hHook, INT16 nCode, WPARAM16 wParam, LPARAM lParam) { - FIXME("(0x%04hx, %hd, %hu, %lu): stub\n", hHook, nCode, wParam, lParam); + FIXME("(0x%04hx, %hd, %hu, %Iu): stub\n", hHook, nCode, wParam, lParam); return 0; }

1 0

Alexandre Julliard : winecrt0: Include basetsd.h to get the _WIN64 definition.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 7585376ee88d07f6c67a16451548298d80fa9431 URL: https://gitlab.winehq.org/wine/wine/-/commit/7585376ee88d07f6c67a1645154829… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 12:22:09 2022 +0100 winecrt0: Include basetsd.h to get the _WIN64 definition. --- dlls/winecrt0/dll_soinit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winecrt0/dll_soinit.c b/dlls/winecrt0/dll_soinit.c index be02307c89d..e0ed9a1be1e 100644 --- a/dlls/winecrt0/dll_soinit.c +++ b/dlls/winecrt0/dll_soinit.c @@ -38,6 +38,7 @@ #ifdef HAVE_LINK_H # include <link.h> #endif +#include "basetsd.h" #ifdef __FreeBSD__

1 0