From: Pierre Schweitzer <pierre@reactos.org>
Date: Sat, 8 Dec 2018 10:42:23 +0000 (+0100)
Subject: [MPR] Sync with Wine Staging 3.17. CORE-15127
X-Git-Tag: 0.4.12-dev~23
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=e02f3356b160ab002a86240d8ffa0471a4b2a28f

[MPR] Sync with Wine Staging 3.17. CORE-15127
---

diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c
index bc492c2afec..09d144e595e 100644
--- a/dll/win32/mpr/wnet.c
+++ b/dll/win32/mpr/wnet.c
@@ -139,9 +139,8 @@ static void _tryLoadProvider(PCWSTR provider)
     HKEY hKey;
 
     TRACE("%s\n", debugstr_w(provider));
-    snprintfW(serviceName, sizeof(serviceName) / sizeof(WCHAR), serviceFmt,
-     servicePrefix, provider);
-    serviceName[sizeof(serviceName) / sizeof(WCHAR) - 1] = '\0';
+    snprintfW(serviceName, ARRAY_SIZE(serviceName), serviceFmt, servicePrefix, provider);
+    serviceName[ARRAY_SIZE(serviceName) - 1] = '\0';
     if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceName, 0, KEY_READ, &hKey) ==
      ERROR_SUCCESS)
     {
@@ -2373,7 +2372,7 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName,
             if (wideLocalName)
             {
                 WCHAR wideRemoteStatic[MAX_PATH];
-                DWORD wideRemoteSize = sizeof(wideRemoteStatic) / sizeof(WCHAR);
+                DWORD wideRemoteSize = ARRAY_SIZE(wideRemoteStatic);
 
                 MultiByteToWideChar(CP_ACP, 0, lpLocalName, -1, wideLocalName, len);
 
@@ -2659,6 +2658,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel,
         size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR);
         if (*lpBufferSize < size)
         {
+            *lpBufferSize = size;
             err = WN_MORE_DATA;
             break;
         }
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 262dd5743b8..03609ea0f74 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -98,7 +98,7 @@ reactos/dll/win32/mciwave             # Synced to WineStaging-3.3
 reactos/dll/win32/mgmtapi             # Synced to WineStaging-3.3
 reactos/dll/win32/mlang               # Synced to WineStaging-3.3
 reactos/dll/win32/mmdevapi            # Synced to WineStaging-3.3
-reactos/dll/win32/mpr                 # Synced to WineStaging-3.3
+reactos/dll/win32/mpr                 # Synced to WineStaging-3.17
 reactos/dll/win32/mprapi              # Synced to WineStaging-3.3
 reactos/dll/win32/msacm32             # Synced to WineStaging-3.3
 reactos/dll/win32/msacm32.drv         # Synced to WineStaging-3.3