[ros-diffs] [cwittich] 45980: [PSAPI_WINETEST] sync psapi_winetest to wine 1.1.40

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sun Mar  7 10:34:40 2010
New Revision: 45980

URL: http://svn.reactos.org/svn/reactos?rev=45980&view=rev
Log:
[PSAPI_WINETEST]
sync psapi_winetest to wine 1.1.40

Modified:
    trunk/rostests/winetests/psapi/psapi_main.c

Modified: trunk/rostests/winetests/psapi/psapi_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/psapi_main.c?rev=45980&r1=45979&r2=45980&view=diff
==============================================================================
--- trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] Sun Mar  7 10:34:40 2010
@@ -157,8 +157,12 @@
     
     w32_err(pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)), ERROR_INVALID_HANDLE);
     w32_err(pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)), ERROR_ACCESS_DENIED);
-    if(!w32_suc(ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath))))
-        return;
+
+    SetLastError( 0xdeadbeef );
+    ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath));
+    ok( ret || broken(GetLastError() == ERROR_UNEXP_NET_ERR), /* win2k */
+        "GetMappedFileNameA failed with error %u\n", GetLastError() );
+    if (!ret) return;
     ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret);
     ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath);
     szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */