From: Huw Davies huw@codeweavers.com
--- dlls/winemac.drv/clipboard.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 4e6f4ac44ca..91e954d0ab5 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -192,12 +192,12 @@ static const struct /* The prefix prepended to a Win32 clipboard format name to make a Mac pasteboard type. */ static const CFStringRef registered_name_type_prefix = CFSTR("org.winehq.registered.");
-static DWORD clipboard_thread_id; +static unsigned int clipboard_thread_id; static HWND clipboard_hwnd; static BOOL is_clipboard_owner; static macdrv_window clipboard_cocoa_window; -static ULONG last_clipboard_update; -static DWORD last_get_seqno; +static unsigned int last_clipboard_update; +static unsigned int last_get_seqno; static WINE_CLIPFORMAT **current_mac_formats; static unsigned int nb_current_mac_formats;
@@ -285,7 +285,8 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type)
if (!NtUserGetClipboardFormatName(format->format_id, buffer, ARRAY_SIZE(buffer))) { - WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), RtlGetLastWin32Error()); + WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), + (unsigned int)RtlGetLastWin32Error()); free(format); return NULL; } @@ -1142,7 +1143,7 @@ NTSTATUS macdrv_dnd_get_data(void *arg) CFIndex i; CFStringRef type, best_type; WINE_CLIPFORMAT* best_format = NULL; - NTSTATUS status = STATUS_SUCCESS; + unsigned int status = STATUS_SUCCESS;
TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(params->format));
@@ -1563,7 +1564,7 @@ static void update_clipboard(void) static BOOL updating;
TRACE("is_clipboard_owner %d last_clipboard_update %u now %u\n", - is_clipboard_owner, last_clipboard_update, NtGetTickCount()); + is_clipboard_owner, last_clipboard_update, (unsigned int)NtGetTickCount());
if (updating) return; updating = TRUE; @@ -1599,7 +1600,7 @@ static BOOL init_clipboard(HWND hwnd) register_builtin_formats(); grab_win32_clipboard();
- TRACE("clipboard thread %04x running\n", GetCurrentThreadId()); + TRACE("clipboard thread %04x running\n", clipboard_thread_id); return TRUE; }
From: Huw Davies huw@codeweavers.com
--- dlls/winemac.drv/display.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index f24ada839ab..12e12d297d9 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -737,7 +737,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN struct display_mode_descriptor *desc; CGDisplayModeRef best_display_mode;
- TRACE("%p %s %p 0x%08x %p\n", displays, debugstr_w(primary_name), hwnd, flags, lpvoid); + TRACE("%p %s %p 0x%08x %p\n", displays, debugstr_w(primary_name), hwnd, (unsigned int)flags, lpvoid);
init_original_display_mode();
@@ -769,18 +769,18 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN }
if (mode->dmBitsPerPel != bpp) - TRACE("using default %d bpp instead of caller's request %d bpp\n", bpp, mode->dmBitsPerPel); + TRACE("using default %d bpp instead of caller's request %d bpp\n", bpp, (int)mode->dmBitsPerPel);
- TRACE("looking for %dx%dx%dbpp @%d Hz", mode->dmPelsWidth, mode->dmPelsHeight, - bpp, mode->dmDisplayFrequency); + TRACE("looking for %dx%dx%dbpp @%d Hz", (int)mode->dmPelsWidth, (int)mode->dmPelsHeight, + bpp, (int)mode->dmDisplayFrequency); TRACE(" %sstretched", mode->dmDisplayFixedOutput == DMDFO_STRETCH ? "" : "un"); TRACE(" %sinterlaced", mode->dmDisplayFlags & DM_INTERLACED ? "" : "non-"); TRACE("\n");
if (!(best_display_mode = find_best_display_mode(mode, display_modes, bpp, desc))) { - ERR("No matching mode found %ux%ux%d @%u!\n", mode->dmPelsWidth, mode->dmPelsHeight, - bpp, mode->dmDisplayFrequency); + ERR("No matching mode found %ux%ux%d @%u!\n", (unsigned int)mode->dmPelsWidth, (unsigned int)mode->dmPelsHeight, + bpp, (unsigned int)mode->dmDisplayFrequency); ret = DISP_CHANGE_BADMODE; } else if (!macdrv_set_display_mode(&macdrv_displays[0], best_display_mode)) @@ -913,11 +913,11 @@ BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, BOOL is_primary, LPDEVMOD macdrv_free_displays(displays);
TRACE("current mode -- %dx%d-%dx%dx%dbpp @%d Hz", - devmode->dmPosition.x, devmode->dmPosition.y, - devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel, - devmode->dmDisplayFrequency); + (int)devmode->dmPosition.x, (int)devmode->dmPosition.y, + (int)devmode->dmPelsWidth, (int)devmode->dmPelsHeight, (int)devmode->dmBitsPerPel, + (int)devmode->dmDisplayFrequency); if (devmode->dmDisplayOrientation) - TRACE(" rotated %u degrees", devmode->dmDisplayOrientation * 90); + TRACE(" rotated %u degrees", (unsigned int)devmode->dmDisplayOrientation * 90); if (devmode->dmDisplayFixedOutput == DMDFO_STRETCH) TRACE(" stretched"); if (devmode->dmDisplayFlags & DM_INTERLACED) @@ -1073,7 +1073,7 @@ static void init_registry_display_settings(void) DISPLAY_DEVICEW dd = {sizeof(dd)}; UNICODE_STRING str; DWORD i = 0; - LONG ret; + int ret;
while (!NtUserEnumDisplayDevices(NULL, i++, &dd, 0)) { @@ -1090,8 +1090,8 @@ static void init_registry_display_settings(void) }
TRACE("Device %s current display mode %ux%u %ubits %uHz at %d,%d.\n", - wine_dbgstr_w(dd.DeviceName), dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel, - dm.dmDisplayFrequency, dm.dmPosition.x, dm.dmPosition.y); + wine_dbgstr_w(dd.DeviceName), (unsigned int)dm.dmPelsWidth, (unsigned int)dm.dmPelsHeight, + (unsigned int)dm.dmBitsPerPel, (unsigned int)dm.dmDisplayFrequency, (int)dm.dmPosition.x, (int)dm.dmPosition.y);
ret = NtUserChangeDisplaySettings(&str, &dm, NULL, CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); @@ -1196,8 +1196,8 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage /* Initialize modes */ for (mode = modes; mode < modes + mode_count; mode++) { - TRACE("mode: %dx%dx%dbpp @%d Hz, %sstretched %sinterlaced\n", mode->dmPelsWidth, mode->dmPelsHeight, - mode->dmBitsPerPel, mode->dmDisplayFrequency, + TRACE("mode: %dx%dx%dbpp @%d Hz, %sstretched %sinterlaced\n", (int)mode->dmPelsWidth, (int)mode->dmPelsHeight, + (int)mode->dmBitsPerPel, (int)mode->dmDisplayFrequency, mode->dmDisplayFixedOutput == DMDFO_STRETCH ? "" : "un", mode->dmDisplayFlags & DM_INTERLACED ? "" : "non-"); device_manager->add_mode( mode, param );
From: Huw Davies huw@codeweavers.com
--- dlls/winemac.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 6ca46f55dff..11dcc1123a6 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -290,7 +290,7 @@ BOOL query_ime_char_rect(macdrv_query* query) void *himc = query->ime_char_rect.data; CFRange *range = &query->ime_char_rect.range; CGRect *rect = &query->ime_char_rect.rect; - struct ime_query_char_rect_result result = {0}; + struct ime_query_char_rect_result result = { .location = 0 }; struct ime_query_char_rect_params params; BOOL ret;
From: Huw Davies huw@codeweavers.com
--- dlls/winemac.drv/event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 11dcc1123a6..e4f76e2b0e1 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -519,8 +519,8 @@ NTSTATUS macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handles, struct macdrv_thread_data *data = macdrv_thread_data(); macdrv_event_mask event_mask = get_event_mask(mask);
- TRACE("count %d, handles %p, timeout %p, mask %x, flags %x\n", count, - handles, timeout, mask, flags); + TRACE("count %d, handles %p, timeout %p, mask %x, flags %x\n", (unsigned int)count, + handles, timeout, (unsigned int)mask, (unsigned int)flags);
if (!data) {
From: Huw Davies huw@codeweavers.com
--- dlls/winemac.drv/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index b43ea0b5dc7..1592bcad1a2 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -594,7 +594,7 @@ static void update_layout_list(void) struct layout *layout; int i;
- if (!InterlockedExchange(&macdrv_layout_list_needs_update, FALSE)) return; + if (!InterlockedExchange((LONG *)&macdrv_layout_list_needs_update, FALSE)) return;
sources = macdrv_create_input_source_list();
-
Huw Davies -
Huw Davies (＠huw)