[ros-diffs] [pschweitzer] 60470: [PSAPI_WINETEST] Sync with Wine 1.7.1 CORE-7469 Tests for EnumProcessModules() have been skipped since they cause stack corruption ROSTESTS-122

Author: pschweitzer
Date: Mon Sep 30 06:27:03 2013
New Revision: 60470

URL: http://svn.reactos.org/svn/reactos?rev=60470&view=rev
Log:
[PSAPI_WINETEST]
Sync with Wine 1.7.1
CORE-7469

Tests for EnumProcessModules() have been skipped since they cause stack corruption
ROSTESTS-122

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_mai…
==============================================================================
--- trunk/rostests/winetests/psapi/psapi_main.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/psapi/psapi_main.c	[iso-8859-1] Mon Sep 30 06:27:03 2013
@@ -2,6 +2,7 @@
  * Unit test suite for PSAPI
  *
  * Copyright (C) 2005 Felix Nawothnig
+ * Copyright (C) 2012 Dmitry Timoshkov
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,18 +20,18 @@
  */
 
 #include <stdarg.h>
-#include <stdio.h>
-
-#include "windows.h"
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winnt.h"
+#include "winternl.h"
+#include "winnls.h"
+#include "psapi.h"
 #include "wine/test.h"
-#include "psapi.h"
-
-#define expect_eq_d(expected, actual) \
-    do { \
-      int value = (actual); \
-      ok((expected) == value, "Expected " #actual " to be %d ("
#expected ") is %d\n", \
-          (expected), value); \
-    } while (0)
 
 #define PSAPI_GET_PROC(func) \
     p ## func = (void*)GetProcAddress(hpsapi, #func); \
@@ -40,41 +41,22 @@
         return FALSE; \
     }
 
-/* All PSAPI functions return non-zero and call SetLastError() 
- * on failure so we can use some macros for convenience */
-
-#define w32_suc(x) \
-  (SetLastError(0xdeadbeef), \
-   (x) \
-     ? (ok(1, "succeeded\n"), 1) \
-     : GetLastError() == 0xdeadbeef \
-       ? (ok(0, "failed without error code\n"), 0) \
-       : (ok(0, "failed with %d\n", GetLastError()), 0))
-
-#define w32_err(x, e) \
-  (SetLastError(0xdeadbeef), \
-   (x) \
-     ? (ok(0, "expected error=%d but succeeded\n", e), 0) \
-     : GetLastError() == e \
-       ? (ok(1, "failed with %d\n", e), 1) \
-       : GetLastError() == 0xdeadbeef \
-         ? (ok(0, "failed without error code\n"), 0) \
-         : (ok(0, "expected error=%d but failed with %d\n", \
-	         e, GetLastError()), 0))
-
 static BOOL  (WINAPI *pEmptyWorkingSet)(HANDLE);
 static BOOL  (WINAPI *pEnumProcesses)(DWORD*, DWORD, DWORD*);
 static BOOL  (WINAPI *pEnumProcessModules)(HANDLE, HMODULE*, DWORD, LPDWORD);
 static DWORD (WINAPI *pGetModuleBaseNameA)(HANDLE, HMODULE, LPSTR, DWORD);
 static DWORD (WINAPI *pGetModuleFileNameExA)(HANDLE, HMODULE, LPSTR, DWORD);
+static DWORD (WINAPI *pGetModuleFileNameExW)(HANDLE, HMODULE, LPWSTR, DWORD);
 static BOOL  (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD);
 static DWORD (WINAPI *pGetMappedFileNameA)(HANDLE, LPVOID, LPSTR, DWORD);
+static DWORD (WINAPI *pGetMappedFileNameW)(HANDLE, LPVOID, LPWSTR, DWORD);
 static DWORD (WINAPI *pGetProcessImageFileNameA)(HANDLE, LPSTR, DWORD);
 static DWORD (WINAPI *pGetProcessImageFileNameW)(HANDLE, LPWSTR, DWORD);
 static BOOL  (WINAPI *pGetProcessMemoryInfo)(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD);
 static BOOL  (WINAPI *pGetWsChanges)(HANDLE, PPSAPI_WS_WATCH_INFORMATION, DWORD);
 static BOOL  (WINAPI *pInitializeProcessForWsWatch)(HANDLE);
 static BOOL  (WINAPI *pQueryWorkingSet)(HANDLE, PVOID, DWORD);
+static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T,
SIZE_T *);
       
 static BOOL InitFunctionPtrs(HMODULE hpsapi)
 {
@@ -83,8 +65,10 @@
     PSAPI_GET_PROC(EnumProcesses);
     PSAPI_GET_PROC(GetModuleBaseNameA);
     PSAPI_GET_PROC(GetModuleFileNameExA);
+    PSAPI_GET_PROC(GetModuleFileNameExW);
     PSAPI_GET_PROC(GetModuleInformation);
     PSAPI_GET_PROC(GetMappedFileNameA);
+    PSAPI_GET_PROC(GetMappedFileNameW);
     PSAPI_GET_PROC(GetProcessMemoryInfo);
     PSAPI_GET_PROC(GetWsChanges);
     PSAPI_GET_PROC(InitializeProcessForWsWatch);
@@ -94,6 +78,7 @@
       (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA");
     pGetProcessImageFileNameW =
       (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW");
+    pNtQueryVirtualMemory = (void
*)GetProcAddress(GetModuleHandle("ntdll.dll"),
"NtQueryVirtualMemory");
     return TRUE;
 }
 
@@ -102,51 +87,162 @@
 
 static void test_EnumProcesses(void)
 {
-    DWORD pid, cbUsed = 0xdeadbeef;
-
-    if(w32_suc(pEnumProcesses(NULL, 0, &cbUsed)))
-        ok(cbUsed == 0, "cbUsed=%d\n", cbUsed);
-    if(w32_suc(pEnumProcesses(&pid, 4, &cbUsed)))
-        ok(cbUsed == 4, "cbUsed=%d\n", cbUsed);
+    DWORD pid, ret, cbUsed = 0xdeadbeef;
+
+    SetLastError(0xdeadbeef);
+    ret = pEnumProcesses(NULL, 0, &cbUsed);
+    ok(ret == 1, "failed with %d\n", GetLastError());
+    ok(cbUsed == 0, "cbUsed=%d\n", cbUsed);
+
+    SetLastError(0xdeadbeef);
+    ret = pEnumProcesses(&pid, 4, &cbUsed);
+    ok(ret == 1, "failed with %d\n", GetLastError());
+    ok(cbUsed == 4, "cbUsed=%d\n", cbUsed);
 }
 
 static void test_EnumProcessModules(void)
 {
+    win_skip("Stack corruption - ROSTEST-122\n");
+    return;
+
     HMODULE hMod = GetModuleHandle(NULL);
-    DWORD cbNeeded = 0xdeadbeef;
-
-    w32_err(pEnumProcessModules(NULL, NULL, 0, &cbNeeded), ERROR_INVALID_HANDLE);
-    w32_err(pEnumProcessModules(hpQI, NULL, 0, &cbNeeded), ERROR_ACCESS_DENIED);
-    w32_suc(pEnumProcessModules(hpQV, NULL, 0, &cbNeeded));
-    if(!w32_suc(pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded)))
+    DWORD ret, cbNeeded = 0xdeadbeef;
+
+    SetLastError(0xdeadbeef);
+    pEnumProcessModules(NULL, NULL, 0, &cbNeeded);
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    pEnumProcessModules(hpQI, NULL, 0, &cbNeeded);
+    ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pEnumProcessModules(hpQI, &hMod, sizeof(HMODULE), NULL);
+    ok(!ret, "succeeded\n");
+    ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), NULL);
+    ok(!ret, "succeeded\n");
+    ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got
%d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pEnumProcessModules(hpQV, NULL, 0, &cbNeeded);
+    ok(ret == 1, "failed with %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded);
+    if(ret != 1)
         return;
-    ok(cbNeeded / sizeof(HMODULE) >= 3 && cbNeeded / sizeof(HMODULE) <= 5 *
sizeof(HMODULE),
-       "cbNeeded=%d\n", cbNeeded);
     ok(hMod == GetModuleHandle(NULL),
        "hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL));
+    ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE)
cbNeeded=%d\n", cbNeeded);
+    /* Windows sometimes has a bunch of extra dlls, presumably brought in by
+     * aclayers.dll.
+     */
+    if (cbNeeded < 4 * sizeof(HMODULE) || cbNeeded > 30 * sizeof(HMODULE))
+    {
+        HMODULE hmods[100];
+        int i;
+        ok(0, "cbNeeded=%d\n", cbNeeded);
+
+        pEnumProcessModules(hpQV, hmods, sizeof(hmods), &cbNeeded);
+        for (i = 0 ; i < cbNeeded/sizeof(*hmods); i++)
+        {
+            char path[1024];
+            GetModuleFileNameA(hmods[i], path, sizeof(path));
+            trace("i=%d hmod=%p path=[%s]\n", i, hmods[i], path);
+        }
+    }
 }
 
 static void test_GetModuleInformation(void)
 {
     HMODULE hMod = GetModuleHandle(NULL);
     MODULEINFO info;
-    
-    w32_err(pGetModuleInformation(NULL, hMod, &info, sizeof(info)),
ERROR_INVALID_HANDLE);
-    w32_err(pGetModuleInformation(hpQI, hMod, &info, sizeof(info)),
ERROR_ACCESS_DENIED);
-    w32_err(pGetModuleInformation(hpQV, hBad, &info, sizeof(info)),
ERROR_INVALID_HANDLE);
-    w32_err(pGetModuleInformation(hpQV, hMod, &info, sizeof(info)-1),
ERROR_INSUFFICIENT_BUFFER);
-    if(w32_suc(pGetModuleInformation(hpQV, hMod, &info, sizeof(info))))
-        ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n",
info.lpBaseOfDll, hMod);
+    DWORD ret;
+
+    SetLastError(0xdeadbeef);
+    pGetModuleInformation(NULL, hMod, &info, sizeof(info));
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    pGetModuleInformation(hpQI, hMod, &info, sizeof(info));
+    ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    pGetModuleInformation(hpQV, hBad, &info, sizeof(info));
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    pGetModuleInformation(hpQV, hMod, &info, sizeof(info)-1);
+    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected
error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetModuleInformation(hpQV, hMod, &info, sizeof(info));
+    ok(ret == 1, "failed with %d\n", GetLastError());
+    ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll,
hMod);
 }
 
 static void test_GetProcessMemoryInfo(void)
 {
     PROCESS_MEMORY_COUNTERS pmc;
-
-    w32_err(pGetProcessMemoryInfo(NULL, &pmc, sizeof(pmc)), ERROR_INVALID_HANDLE);
-    todo_wine w32_err(pGetProcessMemoryInfo(hpSR, &pmc, sizeof(pmc)),
ERROR_ACCESS_DENIED);
-    w32_err(pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)-1),
ERROR_INSUFFICIENT_BUFFER);
-    w32_suc(pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)));
+    DWORD ret;
+
+    SetLastError(0xdeadbeef);
+    ret = pGetProcessMemoryInfo(NULL, &pmc, sizeof(pmc));
+    ok(!ret, "GetProcessMemoryInfo should fail\n");
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetProcessMemoryInfo(hpSR, &pmc, sizeof(pmc));
+todo_wine
+    ok(!ret, "GetProcessMemoryInfo should fail\n");
+todo_wine
+    ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)-1);
+    ok(!ret, "GetProcessMemoryInfo should fail\n");
+    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected
error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc));
+    ok(ret == 1, "failed with %d\n", GetLastError());
+}
+
+static BOOL nt_get_mapped_file_name(HANDLE process, LPVOID addr, LPWSTR name, DWORD len)
+{
+    MEMORY_SECTION_NAME *section_name;
+    WCHAR *buf;
+    SIZE_T buf_len, ret_len;
+    NTSTATUS status;
+
+    if (!pNtQueryVirtualMemory) return FALSE;
+
+    buf_len = len * sizeof(WCHAR) + sizeof(MEMORY_SECTION_NAME);
+    buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf_len);
+
+    ret_len = 0xdeadbeef;
+    status = pNtQueryVirtualMemory(process, addr, MemorySectionName, buf, buf_len,
&ret_len);
+todo_wine
+    ok(!status, "NtQueryVirtualMemory error %x\n", status);
+    /* FIXME: remove once Wine is fixed */
+    if (status) return FALSE;
+
+    section_name = (MEMORY_SECTION_NAME *)buf;
+    ok(ret_len == section_name->SectionFileName.MaximumLength + sizeof(*section_name),
"got %lu, %u\n",
+       ret_len, section_name->SectionFileName.MaximumLength);
+    ok((char *)section_name->SectionFileName.Buffer == (char *)section_name +
sizeof(*section_name), "got %p, %p\n",
+       section_name, section_name->SectionFileName.Buffer);
+    ok(section_name->SectionFileName.MaximumLength ==
section_name->SectionFileName.Length + sizeof(WCHAR), "got %u, %u\n",
+       section_name->SectionFileName.MaximumLength,
section_name->SectionFileName.Length);
+    ok(section_name->SectionFileName.Length ==
lstrlenW(section_name->SectionFileName.Buffer) * sizeof(WCHAR), "got %u,
%u\n",
+       section_name->SectionFileName.Length,
lstrlenW(section_name->SectionFileName.Buffer));
+
+    memcpy(name, section_name->SectionFileName.Buffer,
section_name->SectionFileName.MaximumLength);
+    HeapFree(GetProcessHeap(), 0, buf);
+    return TRUE;
 }
 
 static void test_GetMappedFileName(void)
@@ -154,26 +250,156 @@
     HMODULE hMod = GetModuleHandle(NULL);
     char szMapPath[MAX_PATH], szModPath[MAX_PATH], *szMapBaseName;
     DWORD ret;
-    
-    w32_err(pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)),
ERROR_INVALID_HANDLE);
-    w32_err(pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)),
ERROR_ACCESS_DENIED);
+    char *base;
+    char temp_path[MAX_PATH], file_name[MAX_PATH], map_name[MAX_PATH],
device_name[MAX_PATH], drive[3];
+    WCHAR map_nameW[MAX_PATH], nt_map_name[MAX_PATH];
+    HANDLE hfile, hmap;
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath));
+    ok(!ret, "GetMappedFileName should fail\n");
+todo_wine
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath));
+    ok(!ret, "GetMappedFileName should fail\n");
+todo_wine
+    ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED
but got %d\n", GetLastError());
 
     SetLastError( 0xdeadbeef );
     ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath));
+todo_wine
     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
*/
-    if(!szMapBaseName || !*szMapBaseName)
-    {
-        ok(0, "szMapPath=\"%s\"\n", szMapPath);
-        return;
-    }
-    GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
-    ok(!strcmp(strrchr(szModPath, '\\'), szMapBaseName),
-       "szModPath=\"%s\" szMapBaseName=\"%s\"\n",
szModPath, szMapBaseName);
+    if (ret)
+    {
+        ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n",
szMapPath, ret);
+        todo_wine
+        ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n",
szMapPath);
+        szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for
us */
+        todo_wine
+        ok(szMapBaseName && *szMapBaseName,
"szMapPath=\"%s\"\n", szMapPath);
+        if (szMapBaseName)
+        {
+            GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
+            ok(!strcmp(strrchr(szModPath, '\\'), szMapBaseName),
+               "szModPath=\"%s\" szMapBaseName=\"%s\"\n",
szModPath, szMapBaseName);
+        }
+    }
+
+    GetTempPath(MAX_PATH, temp_path);
+    GetTempFileName(temp_path, "map", 0, file_name);
+
+    drive[0] = file_name[0];
+    drive[1] = ':';
+    drive[2] = 0;
+    SetLastError(0xdeadbeef);
+    ret = QueryDosDevice(drive, device_name, sizeof(device_name));
+    ok(ret, "QueryDosDevice error %d\n", GetLastError());
+    trace("%s -> %s\n", drive, device_name);
+
+    SetLastError(0xdeadbeef);
+    hfile = CreateFile(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
0, 0);
+    ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name,
GetLastError());
+    SetFilePointer(hfile, 0x4000, NULL, FILE_BEGIN);
+    SetEndOfFile(hfile);
+
+    SetLastError(0xdeadbeef);
+    hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL);
+    ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0);
+    ok(base != NULL, "MapViewOfFile error %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 0);
+    ok(!ret, "GetMappedFileName should fail\n");
+todo_wine
+    ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() ==
ERROR_INSUFFICIENT_BUFFER,
+       "wrong error %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameA(GetCurrentProcess(), base, 0, sizeof(map_name));
+    ok(!ret, "GetMappedFileName should fail\n");
+todo_wine
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER,
got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 1);
+todo_wine
+    ok(ret == 1, "GetMappedFileName error %d\n", GetLastError());
+    ok(!map_name[0] || broken(map_name[0] == device_name[0]) /* before win2k */,
"expected 0, got %c\n", map_name[0]);
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name));
+todo_wine {
+    ok(ret, "GetMappedFileName error %d\n", GetLastError());
+    ok(ret > strlen(device_name), "map_name should be longer than
device_name\n");
+    ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not
start with a device name: %s\n", map_name);
+}
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameW(GetCurrentProcess(), base, map_nameW,
sizeof(map_nameW)/sizeof(map_nameW[0]));
+todo_wine {
+    ok(ret, "GetMappedFileNameW error %d\n", GetLastError());
+    ok(ret > strlen(device_name), "map_name should be longer than
device_name\n");
+}
+    if (nt_get_mapped_file_name(GetCurrentProcess(), base, nt_map_name,
sizeof(nt_map_name)/sizeof(nt_map_name[0])))
+    {
+        ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does
not start with a device name: %s\n", map_name);
+        WideCharToMultiByte(CP_ACP, 0, map_nameW, -1, map_name, MAX_PATH, NULL, NULL);
+        ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does
not start with a device name: %s\n", map_name);
+    }
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name,
sizeof(map_name));
+todo_wine {
+    ok(ret, "GetMappedFileName error %d\n", GetLastError());
+    ok(ret > strlen(device_name), "map_name should be longer than
device_name\n");
+    ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not
start with a device name: %s\n", map_name);
+}
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x4000, map_name,
sizeof(map_name));
+    ok(!ret, "GetMappedFileName should fail\n");
+todo_wine
+    ok(GetLastError() == ERROR_UNEXP_NET_ERR, "expected ERROR_UNEXP_NET_ERR, got
%d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameA(GetCurrentProcess(), NULL, map_name, sizeof(map_name));
+    ok(!ret, "GetMappedFileName should fail\n");
+todo_wine
+    ok(GetLastError() == ERROR_UNEXP_NET_ERR, "expected ERROR_UNEXP_NET_ERR, got
%d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameA(0, base, map_name, sizeof(map_name));
+    ok(!ret, "GetMappedFileName should fail\n");
+todo_wine
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got
%d\n", GetLastError());
+
+    UnmapViewOfFile(base);
+    CloseHandle(hmap);
+    CloseHandle(hfile);
+    DeleteFile(file_name);
+
+    SetLastError(0xdeadbeef);
+    hmap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0,
4096, NULL);
+    ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0);
+    ok(base != NULL, "MapViewOfFile error %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name));
+    ok(!ret, "GetMappedFileName should fail\n");
+todo_wine
+    ok(GetLastError() == ERROR_FILE_INVALID, "expected ERROR_FILE_INVALID, got
%d\n", GetLastError());
+
+    UnmapViewOfFile(base);
+    CloseHandle(hmap);
 }
 
 static void test_GetProcessImageFileName(void)
@@ -181,7 +407,7 @@
     HMODULE hMod = GetModuleHandle(NULL);
     char szImgPath[MAX_PATH], szMapPath[MAX_PATH];
     WCHAR szImgPathW[MAX_PATH];
-    DWORD ret;
+    DWORD ret, ret1;
 
     if(pGetProcessImageFileNameA == NULL)
         return;
@@ -201,55 +427,116 @@
 	    todo_wine ok(0, "failed with %d\n", GetLastError());
     }
 
-    todo_wine w32_err(pGetProcessImageFileNameA(NULL, szImgPath, sizeof(szImgPath)),
ERROR_INVALID_HANDLE);
-    todo_wine w32_err(pGetProcessImageFileNameA(hpSR, szImgPath, sizeof(szImgPath)),
ERROR_ACCESS_DENIED);
-    todo_wine w32_err(pGetProcessImageFileNameA(hpQI, szImgPath, 0),
ERROR_INSUFFICIENT_BUFFER);
-    todo_wine
-    if(w32_suc(ret = pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath)))
&&
-       w32_suc(pGetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath)))) {
+    SetLastError(0xdeadbeef);
+    pGetProcessImageFileNameA(NULL, szImgPath, sizeof(szImgPath));
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    pGetProcessImageFileNameA(hpSR, szImgPath, sizeof(szImgPath));
+    ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    pGetProcessImageFileNameA(hpQI, szImgPath, 0);
+    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected
error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError());
+
+    ret = pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath));
+    ret1 = pGetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath));
+    if(ret && ret1)
+    {
         /* Windows returns 2*strlen-1 */
-        ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n",
szImgPath, ret);
-        ok(!strcmp(szImgPath, szMapPath),
-           "szImgPath=\"%s\" szMapPath=\"%s\"\n",
szImgPath, szMapPath);
-    }
-
-    w32_err(pGetProcessImageFileNameW(NULL, szImgPathW, sizeof(szImgPathW)),
ERROR_INVALID_HANDLE);
+        todo_wine ok(ret >= strlen(szImgPath), "szImgPath=\"%s\"
ret=%d\n", szImgPath, ret);
+        todo_wine ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\"
szMapPath=\"%s\"\n", szImgPath, szMapPath);
+    }
+
+    SetLastError(0xdeadbeef);
+    pGetProcessImageFileNameW(NULL, szImgPathW, sizeof(szImgPathW));
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE
but got %d\n", GetLastError());
+
     /* no information about correct buffer size returned: */
-    w32_err(pGetProcessImageFileNameW(hpQI, szImgPathW, 0), ERROR_INSUFFICIENT_BUFFER);
-    w32_err(pGetProcessImageFileNameW(hpQI, NULL, 0), ERROR_INSUFFICIENT_BUFFER);
+    SetLastError(0xdeadbeef);
+    pGetProcessImageFileNameW(hpQI, szImgPathW, 0);
+    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected
error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    pGetProcessImageFileNameW(hpQI, NULL, 0);
+    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected
error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError());
 
     /* correct call */
     memset(szImgPathW, 0xff, sizeof(szImgPathW));
     ret = pGetProcessImageFileNameW(hpQI, szImgPathW, sizeof(szImgPathW)/sizeof(WCHAR));
     ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n");
     ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned
an NT path.\n");
-    expect_eq_d(lstrlenW(szImgPathW), ret);
+    ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret,
lstrlenW(szImgPathW));
 
     /* boundary values of 'size' */
-    w32_err(pGetProcessImageFileNameW(hpQI, szImgPathW, ret),
ERROR_INSUFFICIENT_BUFFER);
+    SetLastError(0xdeadbeef);
+    pGetProcessImageFileNameW(hpQI, szImgPathW, ret);
+    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected
error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError());
 
     memset(szImgPathW, 0xff, sizeof(szImgPathW));
     ret = pGetProcessImageFileNameW(hpQI, szImgPathW, ret + 1);
     ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n");
     ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned
an NT path.\n");
-    expect_eq_d(lstrlenW(szImgPathW), ret);
+    ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret,
lstrlenW(szImgPathW));
 }
 
 static void test_GetModuleFileNameEx(void)
 {
     HMODULE hMod = GetModuleHandle(NULL);
     char szModExPath[MAX_PATH+1], szModPath[MAX_PATH+1];
+    WCHAR buffer[MAX_PATH];
     DWORD ret;
-    
-    w32_err(pGetModuleFileNameExA(NULL, hMod, szModExPath, sizeof(szModExPath)),
ERROR_INVALID_HANDLE);
-    w32_err(pGetModuleFileNameExA(hpQI, hMod, szModExPath, sizeof(szModExPath)),
ERROR_ACCESS_DENIED);
-    w32_err(pGetModuleFileNameExA(hpQV, hBad, szModExPath, sizeof(szModExPath)),
ERROR_INVALID_HANDLE);
-    if(!w32_suc(ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath,
sizeof(szModExPath))))
-        return;
+
+    SetLastError(0xdeadbeef);
+    ret = pGetModuleFileNameExA(NULL, hMod, szModExPath, sizeof(szModExPath));
+    ok( !ret, "GetModuleFileNameExA succeeded\n" );
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetModuleFileNameExA(hpQI, hMod, szModExPath, sizeof(szModExPath));
+    ok( !ret, "GetModuleFileNameExA succeeded\n" );
+    ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetModuleFileNameExA(hpQV, hBad, szModExPath, sizeof(szModExPath));
+    ok( !ret, "GetModuleFileNameExA succeeded\n" );
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE
but got %d\n", GetLastError());
+
+    ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, sizeof(szModExPath));
+    if(!ret)
+            return;
     ok(ret == strlen(szModExPath), "szModExPath=\"%s\" ret=%d\n",
szModExPath, ret);
     GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
     ok(!strncmp(szModExPath, szModPath, MAX_PATH), 
        "szModExPath=\"%s\" szModPath=\"%s\"\n",
szModExPath, szModPath);
+
+    SetLastError(0xdeadbeef);
+    memset( szModExPath, 0xcc, sizeof(szModExPath) );
+    ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 4 );
+    ok( ret == 4, "wrong length %u\n", ret );
+    ok( broken(szModExPath[3]) /*w2kpro*/ || strlen(szModExPath) == 3,
+        "szModExPath=\"%s\" ret=%d\n", szModExPath, ret );
+    ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 0 );
+    ok( ret == 0, "wrong length %u\n", ret );
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n",
GetLastError());
+
+    SetLastError(0xdeadbeef);
+    memset( buffer, 0xcc, sizeof(buffer) );
+    ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 4 );
+    ok( ret == 4, "wrong length %u\n", ret );
+    ok( broken(buffer[3]) /*w2kpro*/ || lstrlenW(buffer) == 3,
+        "buffer=%s ret=%d\n", wine_dbgstr_w(buffer), ret );
+    ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    buffer[0] = 0xcc;
+    ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 0 );
+    ok( ret == 0, "wrong length %u\n", ret );
+    ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError());
+    ok( buffer[0] == 0xcc, "buffer modified %s\n", wine_dbgstr_w(buffer) );
 }
 
 static void test_GetModuleBaseName(void)
@@ -258,10 +545,20 @@
     char szModPath[MAX_PATH], szModBaseName[MAX_PATH];
     DWORD ret;
 
-    w32_err(pGetModuleBaseNameA(NULL, hMod, szModBaseName, sizeof(szModBaseName)),
ERROR_INVALID_HANDLE);
-    w32_err(pGetModuleBaseNameA(hpQI, hMod, szModBaseName, sizeof(szModBaseName)),
ERROR_ACCESS_DENIED);
-    w32_err(pGetModuleBaseNameA(hpQV, hBad, szModBaseName, sizeof(szModBaseName)),
ERROR_INVALID_HANDLE);
-    if(!w32_suc(ret = pGetModuleBaseNameA(hpQV, NULL, szModBaseName,
sizeof(szModBaseName))))
+    SetLastError(0xdeadbeef);
+    pGetModuleBaseNameA(NULL, hMod, szModBaseName, sizeof(szModBaseName));
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    pGetModuleBaseNameA(hpQI, hMod, szModBaseName, sizeof(szModBaseName));
+    ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED
but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    pGetModuleBaseNameA(hpQV, hBad, szModBaseName, sizeof(szModBaseName));
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE
but got %d\n", GetLastError());
+
+    ret = pGetModuleBaseNameA(hpQV, NULL, szModBaseName, sizeof(szModBaseName));
+    if(!ret)
         return;
     ok(ret == strlen(szModBaseName), "szModBaseName=\"%s\" ret=%d\n",
szModBaseName, ret);
     GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
@@ -277,9 +574,17 @@
     unsigned int i;
     BOOL ret;
 
-    todo_wine w32_err(pEmptyWorkingSet(NULL), ERROR_INVALID_HANDLE);
-    todo_wine w32_err(pEmptyWorkingSet(hpSR), ERROR_ACCESS_DENIED);
-    w32_suc(pEmptyWorkingSet(hpAA));
+    SetLastError(0xdeadbeef);
+    pEmptyWorkingSet(NULL);
+    todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected
error=ERROR_INVALID_HANDLE but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    pEmptyWorkingSet(hpSR);
+    todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected
error=ERROR_ACCESS_DENIED but got %d\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = pEmptyWorkingSet(hpAA);
+    ok(ret == 1, "failed with %d\n", GetLastError());
 
     SetLastError( 0xdeadbeef );
     ret = pInitializeProcessForWsWatch( NULL );
@@ -293,9 +598,12 @@
         }
         ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n",
GetLastError() );
     }
-    w32_suc(pInitializeProcessForWsWatch(hpAA));
+    SetLastError(0xdeadbeef);
+    ret = pInitializeProcessForWsWatch(hpAA);
+    ok(ret == 1, "failed with %d\n", GetLastError());
     
-    if(!w32_suc(addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE)))
+    addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE);
+    if(!addr)
         return;
 
     *addr = 0; /* make sure it's paged in (needed on wow64) */
@@ -305,29 +613,35 @@
         goto free_page;
     }
 
-    todo_wine if(w32_suc(pQueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR))))
+    SetLastError(0xdeadbeef);
+    ret = pQueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR));
+    todo_wine ok(ret == 1, "failed with %d\n", GetLastError());
+    if(ret == 1)
     {
        for(i = 0; i < pages[0]; i++)
            if((pages[i+1] & ~0xfffL) == (ULONG_PTR)addr)
 	   {
-	       ok(1, "QueryWorkingSet found our page\n");
+	       todo_wine ok(ret == 1, "QueryWorkingSet found our page\n");
 	       goto test_gwsc;
 	   }
        
-       ok(0, "QueryWorkingSet didn't find our page\n");
+       todo_wine ok(0, "QueryWorkingSet didn't find our page\n");
     }
 
 test_gwsc:
-    todo_wine if(w32_suc(pGetWsChanges(hpQI, wswi, sizeof(wswi))))
+    SetLastError(0xdeadbeef);
+    ret = pGetWsChanges(hpQI, wswi, sizeof(wswi));
+    todo_wine ok(ret == 1, "failed with %d\n", GetLastError());
+    if(ret == 1)
     {
         for(i = 0; wswi[i].FaultingVa; i++)
 	    if(((ULONG_PTR)wswi[i].FaultingVa & ~0xfffL) == (ULONG_PTR)addr)
 	    {
-	        ok(1, "GetWsChanges found our page\n");
+	        todo_wine ok(ret == 1, "GetWsChanges found our page\n");
 		goto free_page;
 	    }
 
-	ok(0, "GetWsChanges didn't find our page\n");
+	todo_wine ok(0, "GetWsChanges didn't find our page\n");
     }
     
 free_page:
@@ -337,10 +651,10 @@
 START_TEST(psapi_main)
 {
     HMODULE hpsapi = LoadLibraryA("psapi.dll");
-    
+
     if(!hpsapi)
     {
-        trace("Could not load psapi.dll\n");
+        win_skip("Could not load psapi.dll\n");
         return;
     }
 
@@ -348,18 +662,19 @@
     {
         DWORD pid = GetCurrentProcessId();
 
-        w32_suc(hpSR = OpenProcess(STANDARD_RIGHTS_REQUIRED, FALSE, pid));
-        w32_suc(hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid));
-        w32_suc(hpVR = OpenProcess(PROCESS_VM_READ, FALSE, pid));
-        w32_suc(hpQV = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE,
pid));
-	w32_suc(hpAA = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid));
-        if(hpSR && hpQI && hpVR && hpQV && hpAA)
+    hpSR = OpenProcess(STANDARD_RIGHTS_REQUIRED, FALSE, pid);
+    hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
+    hpVR = OpenProcess(PROCESS_VM_READ, FALSE, pid);
+    hpQV = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid);
+    hpAA = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid);
+
+    if(hpSR && hpQI && hpVR && hpQV && hpAA)
         {
 	    test_EnumProcesses();
 	    test_EnumProcessModules();
 	    test_GetModuleInformation();
 	    test_GetProcessMemoryInfo();
-	    todo_wine test_GetMappedFileName();
+            test_GetMappedFileName();
             test_GetProcessImageFileName();
             test_GetModuleFileNameEx();
             test_GetModuleBaseName();