Huw Davies : winemac: Fix printf format warnings in display.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b46c60f4fad9dbee4d32848048251d11fb8981cd
URL:    https://gitlab.winehq.org/wine/wine/-/commit/b46c60f4fad9dbee4d32848048251d1...

Author: Huw Davies 
Date:   Mon Dec 12 13:27:24 2022 +0000

winemac: Fix printf format warnings in display.c.

---

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 );