[ros-diffs] [akhaldi] 71566: [MPR_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sun Jun  5 19:35:47 2016
New Revision: 71566

URL: http://svn.reactos.org/svn/reactos?rev=71566&view=rev
Log:
[MPR_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/rostests/winetests/mpr/mpr.c

Modified: trunk/rostests/winetests/mpr/mpr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mpr/mpr.c?rev=7…
==============================================================================
--- trunk/rostests/winetests/mpr/mpr.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/mpr/mpr.c	[iso-8859-1] Sun Jun  5 19:35:47 2016
@@ -101,25 +101,23 @@
         info_size = sizeof(buffer);
         ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
                 buffer, &info_size);
-        todo_wine{
-        if(drive_type == DRIVE_REMOTE)
+        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)
+        if(drive_type == DRIVE_REMOTE)
+            todo_wine
             ok(ret == WN_BAD_VALUE, "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,13 @@
         ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
                 NULL, &info_size);
 
-        todo_wine{
         if(((GetVersion() & 0x8000ffff) == 0x00000004) || /* NT40 */
            (drive_type == DRIVE_REMOTE))
+            todo_wine
             ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n",
ret);
         else
             ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE,
-                "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA,
ret);        }
+                "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA,
ret);
 
         fail_size = sizeof(driveA) / sizeof(char) - 1;
         ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
@@ -149,13 +147,13 @@
         info_size = sizeof(buffer);
         ret = WNetGetUniversalNameW(driveW, REMOTE_NAME_INFO_LEVEL,
                 buffer, &info_size);
-
-        if(drive_type == DRIVE_REMOTE)
-            todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed:
%08x\n", ret);
+        todo_wine{
+        if(drive_type == DRIVE_REMOTE)
+            ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n",
ret);
         else
             ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH,
                 "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA,
ret);
-
+        }
         ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size);
     }
 }