Module: wine Branch: master Commit: 905821fc695803ac359c28b91a7436e6f2054c98 URL: https://gitlab.winehq.org/wine/wine/-/commit/905821fc695803ac359c28b91a7436e...
Author: Huw Davies huw@codeweavers.com Date: Tue Nov 29 08:40:43 2022 +0000
ntdll: Fix -Wformat warnings on macOS.
---
dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/serial.c | 2 +- dlls/ntdll/unix/sync.c | 2 +- dlls/ntdll/unix/system.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 328040bbda6..6f1709f4713 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1563,7 +1563,7 @@ static WCHAR *build_command_line( WCHAR **wargv ) *p = 0; if (p - ret >= 32767) { - ERR( "command line too long (%zu)\n", p - ret ); + ERR( "command line too long (%u)\n", (int)(p - ret) ); NtTerminateProcess( GetCurrentProcess(), 1 ); } return ret; diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 45fda0f33db..d8f492fcc64 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -555,7 +555,7 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) } break; #else /* Don't have linux/serial.h or lack TIOCSSERIAL */ - ERR("baudrate %d\n", sbr->BaudRate); + ERR("baudrate %d\n", (int)sbr->BaudRate); return STATUS_NOT_SUPPORTED; #endif /* Don't have linux/serial.h or lack TIOCSSERIAL */ } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index f80a2945cef..650e32a7d41 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2352,7 +2352,7 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid )
if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) return NULL; - if (InterlockedCompareExchange( (int *)&entry->sem, sem, 0 )) + if (InterlockedCompareExchange( (LONG *)&entry->sem, sem, 0 )) semaphore_destroy( mach_task_self(), sem ); } #else diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 603f778bd97..2dc99316f9c 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1023,13 +1023,13 @@ static NTSTATUS create_logical_proc_info(void) /* for 'data', max_len is the array count. for 'dataex', max_len is in bytes */ static NTSTATUS create_logical_proc_info(void) { - DWORD pkgs_no, cores_no, lcpu_no, lcpu_per_core, cores_per_package, assoc; - DWORD cache_ctrs[10] = {0}; + unsigned int pkgs_no, cores_no, lcpu_no, lcpu_per_core, cores_per_package, assoc; + unsigned int cache_ctrs[10] = {0}; ULONG_PTR all_cpus_mask = 0; CACHE_DESCRIPTOR cache[10]; LONGLONG cache_size, cache_line_size, cache_sharing[10]; size_t size; - DWORD p,i,j,k; + unsigned int p, i, j, k;
lcpu_no = peb->NumberOfProcessors;
@@ -1806,7 +1806,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON return ret; } default: - FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", sfti->ProviderSignature); + FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", (unsigned int)sfti->ProviderSignature); return STATUS_NOT_IMPLEMENTED; } }