Module: wine Branch: master Commit: 4619a45f625995f6fd3d06ae1a138df570c22ab1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4619a45f625995f6fd3d06ae1a138df...
Author: Alexandre Julliard julliard@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 );
-
Alexandre Julliard