From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 17 Mar 2018 12:25:29 +0000 (+0100)
Subject: [MPR_WINETEST] Sync with Wine Staging 3.3. CORE-14434
X-Git-Tag: 0.4.9-RC~546
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=0de65aae00b878d317621e28eac2b21da678dd2e

[MPR_WINETEST] Sync with Wine Staging 3.3. CORE-14434
---

diff --git a/modules/rostests/winetests/mpr/mpr.c b/modules/rostests/winetests/mpr/mpr.c
index 330e66bf89f..041afbf130c 100644
--- a/modules/rostests/winetests/mpr/mpr.c
+++ b/modules/rostests/winetests/mpr/mpr.c
@@ -101,25 +101,23 @@ static void test_WNetGetRemoteName(void)
         info_size = sizeof(buffer);
         ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
                 buffer, &info_size);
-        todo_wine{
         if(drive_type == DRIVE_REMOTE)
+            todo_wine
             ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret);
         else
             ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH,
                 "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret);
-        }
         ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size);
 
         fail_size = 0;
         ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
                 buffer, &fail_size);
-        todo_wine{
         if(drive_type == DRIVE_REMOTE)
+            todo_wine
             ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret);
         else
             ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH,
                 "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret);
-        }
         ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
                 buffer, NULL);
         todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret);
@@ -127,13 +125,12 @@ static void test_WNetGetRemoteName(void)
         ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
                 NULL, &info_size);
 
-        todo_wine {
         if(drive_type == DRIVE_REMOTE)
+            todo_wine
             ok(ret == WN_BAD_POINTER || ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret);
         else
             ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE,
                 "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret);
-        }
 
         fail_size = sizeof(driveA) / sizeof(char) - 1;
         ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,