Huw Davies : winemac: Fix remaining printf format warnings.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 027bd21b0c2b7d1f4560cccc4a00213a4167be8d
URL:    https://gitlab.winehq.org/wine/wine/-/commit/027bd21b0c2b7d1f4560cccc4a00213...

Author: Huw Davies 
Date:   Mon Dec 12 16:22:56 2022 +0000

winemac: Fix remaining printf format warnings.

---

dlls/winemac.drv/macdrv_main.c | 10 +++++-----
 dlls/winemac.drv/opengl.c      |  4 ++--
 dlls/winemac.drv/unixlib.h     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
index 39bd66f3211..eeed9a4bcbe 100644
--- a/dlls/winemac.drv/macdrv_main.c
+++ b/dlls/winemac.drv/macdrv_main.c
@@ -132,12 +132,12 @@ HKEY open_hkcu_key(const char *name)

sid = ((TOKEN_USER *)sid_data)->User.Sid;
         len = sprintf(buffer, "\Registry\User\S-%u-%u", sid->Revision,
-                       MAKELONG(MAKEWORD(sid->IdentifierAuthority.Value[5],
-                                         sid->IdentifierAuthority.Value[4]),
-                                MAKEWORD(sid->IdentifierAuthority.Value[3],
-                                         sid->IdentifierAuthority.Value[2])));
+                      (unsigned int)MAKELONG(MAKEWORD(sid->IdentifierAuthority.Value[5],
+                                                      sid->IdentifierAuthority.Value[4]),
+                                             MAKEWORD(sid->IdentifierAuthority.Value[3],
+                                                      sid->IdentifierAuthority.Value[2])));
         for (i = 0; i < sid->SubAuthorityCount; i++)
-            len += sprintf(buffer + len, "-%u", sid->SubAuthority[i]);
+            len += sprintf(buffer + len, "-%u", (unsigned int)sid->SubAuthority[i]);

ascii_to_unicode(bufferW, buffer, len);
         hkcu = reg_open_key(NULL, bufferW, len * sizeof(WCHAR));
diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index e1da34892ba..ff78b183360 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -76,7 +76,7 @@ struct wgl_context
     BOOL                    sharing;
     LONG                    update_swap_interval;
     LONG                    view_moved;
-    DWORD                   last_flush_time;
+    unsigned int            last_flush_time;
     UINT                    major;
 };

@@ -2222,7 +2222,7 @@ static void macdrv_glFlush(void)
     if (skip_single_buffer_flushes)
     {
         const pixel_format *pf = &pixel_formats[context->format - 1];
-        DWORD now = NtGetTickCount();
+        unsigned int now = NtGetTickCount();

TRACE("double buffer %d last flush time %d now %d\n", (int)pf->double_buffer,
               context->last_flush_time, now);
diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h
index 614e3ddb11a..07f0da4a6f3 100644
--- a/dlls/winemac.drv/unixlib.h
+++ b/dlls/winemac.drv/unixlib.h
@@ -87,7 +87,7 @@ struct init_params
 /* macdrv_notify_icon params */
 struct notify_icon_params
 {
-    DWORD msg;
+    unsigned int msg;
     struct _NOTIFYICONDATAW *data;
 };