[PATCH 0/1] MR4159: winemac.drv: Replace sprintf with snprintf to avoid deprecation warnings.

[PATCH 1/1] winemac.drv: Replace sprintf with snprintf to avoid deprecation warnings.

[Brendan Shanks]

From: Brendan Shanks

---
 dlls/winemac.drv/clipboard.c   | 2 +-
 dlls/winemac.drv/keyboard.c    | 2 +-
 dlls/winemac.drv/macdrv_main.c | 4 ++--
 dlls/winemac.drv/mouse.c       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c
index 91e954d0ab5..ef0c3ae9c25 100644
--- a/dlls/winemac.drv/clipboard.c
+++ b/dlls/winemac.drv/clipboard.c
@@ -569,7 +569,7 @@ static void *import_html(CFDataRef data, size_t *ret_size)
     if ((ret = malloc(total)))
     {
         char *p = ret;
-        p += sprintf(p, header, total - 1, len, len + size + 1 /* include the final \n in the data */);
+        p += snprintf(p, total, header, total - 1, len, len + size + 1 /* include the final \n in the data */);
         CFDataGetBytes(data, CFRangeMake(0, size), (UInt8*)p);
         strcpy(p + size, trailer);
         *ret_size = total;
diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c
index c1963daa56e..bf1daa7a5df 100644
--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -1361,7 +1361,7 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size)
             if (!len)
             {
                 char name[16];
-                len = sprintf(name, "Key 0x%02x", vkey);
+                len = snprintf(name, sizeof(name), "Key 0x%02x", vkey);
                 len = min(len + 1, size);
                 ascii_to_unicode(buffer, name, len);
                 if (len) buffer[--len] = 0;
diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
index 54c5ee6c93a..b40bf02f267 100644
--- a/dlls/winemac.drv/macdrv_main.c
+++ b/dlls/winemac.drv/macdrv_main.c
@@ -131,13 +131,13 @@ HKEY open_hkcu_key(const char *name)
             return 0;

sid = ((TOKEN_USER *)sid_data)->User.Sid;
-        len = sprintf(buffer, "\Registry\User\S-%u-%u", sid->Revision,
+        len = snprintf(buffer, sizeof(buffer), "\Registry\User\S-%u-%u", sid->Revision,
                       (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", (unsigned int)sid->SubAuthority[i]);
+            len += snprintf(buffer + len, sizeof(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/mouse.c b/dlls/winemac.drv/mouse.c
index 5c04c71e1dc..2f05a33a8b5 100644
--- a/dlls/winemac.drv/mouse.c
+++ b/dlls/winemac.drv/mouse.c
@@ -187,7 +187,7 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info)
     else
     {
         char buf[16];
-        sprintf(buf, "%hu", info->wResID);
+        snprintf(buf, sizeof(buf), "%hu", info->wResID);
         asciiz_to_unicode(p, buf);
     }