[PATCH] mpr/tests: Handle result from the AppV virtual drive

Detlef Riekenberg wine.dev at web.de
Fri Aug 3 12:16:35 CDT 2012


The microsoft application virtualization client creates a virtual drive
(defaults to "Q:" and has a drive type of DRIVE_FIXED).
The virtual drive is present all the time.
Browsing with a file manager is blocked for that drive.

--
By by ... Detlef
---
 dlls/mpr/tests/mpr.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c
index d54d80d..8ccce78 100644
--- a/dlls/mpr/tests/mpr.c
+++ b/dlls/mpr/tests/mpr.c
@@ -42,7 +42,11 @@ static void test_WNetGetUniversalName(void)
         if(drive_type == DRIVE_REMOTE)
             ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret);
         else
-            ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret);
+            /* WN_NO_NET_OR_BAD_PATH (DRIVE_FIXED) returned from the virtual drive (usual Q:)
+               created by the microsoft application virtualization client */
+            ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH),
+                "WNetGetUniversalNameA(%s, ...) returned %u (drive_type: %u)\n",
+                driveA, ret, drive_type);
 
         ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size);
 
@@ -53,7 +57,9 @@ static void test_WNetGetUniversalName(void)
         if(drive_type == DRIVE_REMOTE)
             ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret);
         else
-            ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameW gave wrong error: %08x\n", ret);
+            ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH),
+                "WNetGetUniversalNameW(%s, ...) returned %u (drive_type: %u)\n",
+                wine_dbgstr_w(driveW), ret, drive_type);
 
         ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size);
     }
-- 
1.7.5.4




More information about the wine-patches mailing list