Author: akhaldi
Date: Fri Nov 20 10:46:02 2015
New Revision: 69958
URL:
http://svn.reactos.org/svn/reactos?rev=69958&view=rev
Log:
[MPR_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
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=6…
==============================================================================
--- trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] Fri Nov 20 10:46:02 2015
@@ -149,13 +149,13 @@
info_size = sizeof(buffer);
ret = WNetGetUniversalNameW(driveW, REMOTE_NAME_INFO_LEVEL,
buffer, &info_size);
- todo_wine{
- if(drive_type == DRIVE_REMOTE)
- ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n",
ret);
+
+ if(drive_type == DRIVE_REMOTE)
+ todo_wine 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);
}
}
@@ -199,10 +199,10 @@
ok(pce->nType == m_type, "nType, got %d, got %d\n", pce->nType,
m_type);
buf = (char*)pce->abResource;
- ok(strncmp(buf, m_resource, pce->cbResource)==0, "enumerated ressource
differs, got %.*s, expected %s\n", pce->cbResource, buf, m_resource);
+ ok(strncmp(buf, m_resource, pce->cbResource)==0, "enumerated resource
differs, got %.*s, expected %s\n", pce->cbResource, buf, m_resource);
buf += pce->cbResource;
- ok(strncmp(buf, m_password, pce->cbPassword)==0, "enumerated ressource
differs, got %.*s, expected %s\n", pce->cbPassword, buf, m_password);
+ ok(strncmp(buf, m_password, pce->cbPassword)==0, "enumerated resource
differs, got %.*s, expected %s\n", pce->cbPassword, buf, m_password);
m_callback_reached = 1;
return TRUE;