[ros-diffs] [sedwards] 22055: remove another dud, sync psapi test to 0.9.14

Author: sedwards
Date: Fri May 26 21:35:11 2006
New Revision: 22055

URL: http://svn.reactos.ru/svn/reactos?rev=22055&view=rev
Log:
remove another dud, sync psapi test to 0.9.14

Added:
    trunk/reactos/regtests/winetests/psapi/psapi_main.c
Removed:
    trunk/reactos/regtests/winetests/foo
    trunk/reactos/regtests/winetests/psapi/module.c
Modified:
    trunk/reactos/regtests/winetests/psapi/psapi.rbuild
    trunk/reactos/regtests/winetests/psapi/testlist.c

Removed: trunk/reactos/regtests/winetests/foo
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/foo?rev=…
==============================================================================
--- trunk/reactos/regtests/winetests/foo (original)
+++ trunk/reactos/regtests/winetests/foo (removed)
@@ -1,49 +1,0 @@
-cp ~/wine/source/dlls/dnsapi
-cp ~/wine/source/dlls/wininet
-cp ~/wine/source/dlls/dsound
-cp ~/wine/source/dlls/msi
-cp ~/wine/source/dlls/version
-cp ~/wine/source/dlls/winspool
-cp ~/wine/source/dlls/msacm32
-cp ~/wine/source/dlls/oleaut32
-cp ~/wine/source/dlls/ntdll
-cp ~/wine/source/dlls/ws2_32
-cp ~/wine/source/dlls/msvcrtd
-cp ~/wine/source/dlls/psapi
-cp ~/wine/source/dlls/mlang
-cp ~/wine/source/dlls/netapi32
-cp ~/wine/source/dlls/quartz
-cp ~/wine/source/dlls/gdi
-cp ~/wine/source/dlls/shdocvw
-cp ~/wine/source/dlls/advapi32
-cp ~/wine/source/dlls/d3d8
-cp ~/wine/source/dlls/winmm
-cp ~/wine/source/dlls/dinput
-cp ~/wine/source/dlls/setupapi
-cp ~/wine/source/dlls/usp10
-cp ~/wine/source/dlls/rsabase
-cp ~/wine/source/dlls/lz32
-cp ~/wine/source/dlls/msxml3
-cp ~/wine/source/dlls/rpcrt4
-cp ~/wine/source/dlls/ole32
-cp ~/wine/source/dlls/mapi32
-cp ~/wine/source/dlls/iphlpapi
-cp ~/wine/source/dlls/advpack
-cp ~/wine/source/dlls/mscms
-cp ~/wine/source/dlls/comctl32
-cp ~/wine/source/dlls/mshtml
-cp ~/wine/source/dlls/rsaenh
-cp ~/wine/source/dlls/kernel
-cp ~/wine/source/dlls/d3d9
-cp ~/wine/source/dlls/shell32
-cp ~/wine/source/dlls/urlmon
-cp ~/wine/source/dlls/cabinet
-cp ~/wine/source/dlls/msvcrt
-cp ~/wine/source/dlls/winspool.drv
-cp ~/wine/source/dlls/ddraw
-cp ~/wine/source/dlls/shlwapi
-cp ~/wine/source/dlls/secur32
-cp ~/wine/source/dlls/user
-cp ~/wine/source/dlls/riched20
-cp ~/wine/source/dlls/crypt32
-

Removed: trunk/reactos/regtests/winetests/psapi/module.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/psapi/mo…
==============================================================================
--- trunk/reactos/regtests/winetests/psapi/module.c (original)
+++ trunk/reactos/regtests/winetests/psapi/module.c (removed)
@@ -1,161 +1,0 @@
-/*
- * Copyright (C) 2004 Stefan Leichter
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <stdarg.h>
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "psapi.h"
-
-/* Function ptrs */
-static HMODULE dll;
-static DWORD (WINAPI *pGetModuleBaseNameA)(HANDLE, HANDLE, LPSTR, DWORD);
-
-static void test_module_base_name(void)
-{   DWORD retval;
-    char buffer[MAX_PATH];
-    HMODULE self, modself;
-    DWORD exact;
-
-    if (!pGetModuleBaseNameA) return;
-
-    self = OpenProcess( PROCESS_QUERY_INFORMATION|PROCESS_VM_READ,
-			FALSE, GetCurrentProcessId());
-    if (!self) {
-	ok(0, "OpenProcess() failed\n");
-	return;
-    }
-    modself = GetModuleHandle(NULL);
-    if (!modself) {
-	ok(0, "GetModuleHandle() failed\n");
-	return;
-    }
-    exact = pGetModuleBaseNameA( self, modself, buffer, MAX_PATH);
-    if (!exact) {
-	ok(0, "GetModuleBaseNameA failed unexpected with error 0x%08lx\n",
-		GetLastError());
-	return;
-    }
-
-    SetLastError(ERROR_SUCCESS);
-    retval = pGetModuleBaseNameA( NULL, NULL, NULL, 0);
-    ok(!retval, "function result wrong, got %ld expected 0\n", retval);
-    ok( ERROR_INVALID_PARAMETER == GetLastError() ||
-	ERROR_INVALID_HANDLE == GetLastError(),
-	"last error wrong, got %ld expected ERROR_INVALID_PARAMETER/"
-	"ERROR_INVALID_HANDLE (98)\n", GetLastError());
-
-    SetLastError(ERROR_SUCCESS);
-    retval = pGetModuleBaseNameA( NULL, NULL, NULL, MAX_PATH);
-    ok(!retval, "function result wrong, got %ld expected 0\n", retval);
-    ok( ERROR_INVALID_PARAMETER == GetLastError() ||
-	ERROR_INVALID_HANDLE == GetLastError(),
-	"last error wrong, got %ld expected ERROR_INVALID_PARAMETER/"
-	"ERROR_INVALID_HANDLE (98)\n", GetLastError());
-
-    SetLastError(ERROR_SUCCESS);
-    retval = pGetModuleBaseNameA( NULL, NULL, buffer, 0);
-    ok(!retval, "function result wrong, got %ld expected 0\n", retval);
-    ok( ERROR_INVALID_PARAMETER == GetLastError() ||
-	ERROR_INVALID_HANDLE == GetLastError(),
-	"last error wrong, got %ld expected ERROR_INVALID_PARAMETER/"
-	"ERROR_INVALID_HANDLE (98)\n", GetLastError());
-
-    memset(buffer, 0, sizeof(buffer));
-    SetLastError(ERROR_SUCCESS);
-    retval = pGetModuleBaseNameA( NULL, NULL, buffer, 1);
-    ok(!retval, "function result wrong, got %ld expected 0\n", retval);
-    ok(ERROR_INVALID_HANDLE == GetLastError(),
-	"last error wrong, got %ld expected ERROR_INVALID_HANDLE\n",
-	GetLastError());
-
-    memset(buffer, 0, sizeof(buffer));
-    SetLastError(ERROR_SUCCESS);
-    retval = pGetModuleBaseNameA( self, NULL, buffer, 1);
-    ok(!retval || retval == 1,
-	"function result wrong, got %ld expected 0 (98)/1\n", retval);
-#ifndef __REACTOS__
-    ok((retval && ERROR_SUCCESS == GetLastError()) ||
-	(!retval && ERROR_MOD_NOT_FOUND == GetLastError()),
-	"last error wrong, got %ld expected ERROR_SUCCESS/"
-	"ERROR_MOD_NOT_FOUND (98)\n", GetLastError());
-#endif 
-    ok(1 == strlen(buffer) || !strlen(buffer),
-	"buffer content length wrong, got %d(%s) expected 0 (98,XP)/1\n",
-	strlen(buffer), buffer);
-
-    memset(buffer, 0, sizeof(buffer));
-    SetLastError(ERROR_SUCCESS);
-    retval = pGetModuleBaseNameA( self, modself, buffer, 1);
-#ifndef __REACTOS__
-    ok(retval == 1, "function result wrong, got %ld expected 1\n", retval);
-#endif
-    ok(ERROR_SUCCESS == GetLastError(),
-	"last error wrong, got %ld expected ERROR_SUCCESS\n",
-	GetLastError());
-    ok((!strlen(buffer)) || (1 == strlen(buffer)), 
-	"buffer content length wrong, got %d(%s) expected 0 (XP)/1\n",
-	strlen(buffer), buffer);
-
-    SetLastError(ERROR_SUCCESS);
-    memset(buffer, 0, sizeof(buffer));
-    retval = pGetModuleBaseNameA( self, NULL, buffer, exact);
-    ok( !retval || retval == exact, 
-	"function result wrong, got %ld expected 0 (98)/%ld\n", retval, exact);
-#ifndef __REACTOS__
-    ok( (retval && ERROR_SUCCESS == GetLastError()) ||
-	(!retval && ERROR_MOD_NOT_FOUND == GetLastError()),
-	"last error wrong, got %ld expected ERROR_SUCCESS/"
-	"ERROR_MOD_NOT_FOUND (98)\n", GetLastError());
-#endif
-    ok((retval && (exact == strlen(buffer) || exact -1 == strlen(buffer))) ||
-	(!retval && !strlen(buffer)),
-	"buffer content length wrong, got %d(%s) expected 0(98)/%ld(XP)/%ld\n",
-	strlen(buffer), buffer, exact -1, exact);
-
-    SetLastError(ERROR_SUCCESS);
-    memset(buffer, 0, sizeof(buffer));
-    retval = pGetModuleBaseNameA( self, modself, buffer, exact);
-    ok(retval == exact || retval == exact -1, 
-	"function result wrong, got %ld expected %ld(98)/%ld\n",
-	retval, exact -1, exact);
-    ok(ERROR_SUCCESS == GetLastError(),
-	"last error wrong, got %ld expected ERROR_SUCCESS\n",
-	GetLastError());
-    ok(exact == strlen(buffer) || exact -1 == strlen(buffer),
-	"buffer content length wrong, got %d(%s) expected %ld(98,XP)/%ld\n",
-	strlen(buffer), buffer, exact -1, exact);
-}
-
-START_TEST(module)
-{
-    dll = LoadLibrary("psapi.dll");
-    if (!dll) {
-	trace("LoadLibraryA(psapi.dll) failed: skipping tests with target module\n");
-	return;
-    }
-
-    pGetModuleBaseNameA = (void*) GetProcAddress(dll, "GetModuleBaseNameA");
-
-    test_module_base_name();
-
-    FreeLibrary(dll);
-}

Modified: trunk/reactos/regtests/winetests/psapi/psapi.rbuild
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/psapi/ps…
==============================================================================
--- trunk/reactos/regtests/winetests/psapi/psapi.rbuild (original)
+++ trunk/reactos/regtests/winetests/psapi/psapi.rbuild Fri May 26 21:35:11 2006
@@ -4,5 +4,5 @@
     <library>ntdll</library>
     <library>psapi</library>
     <file>testlist.c</file>
-    <file>module.c</file>
+    <file>psapi_main.c</file>
 </module>

Added: trunk/reactos/regtests/winetests/psapi/psapi_main.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/psapi/ps…
==============================================================================
--- trunk/reactos/regtests/winetests/psapi/psapi_main.c (added)
+++ trunk/reactos/regtests/winetests/psapi/psapi_main.c Fri May 26 21:35:11 2006
@@ -1,0 +1,325 @@
+/*
+ * Unit test suite for PSAPI
+ *
+ * Copyright (C) 2005 Felix Nawothnig
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "wine/test.h"
+#include "windows.h"
+#include "psapi.h"
+
+#define PSAPI_GET_PROC(func) \
+    p ## func = (void*)GetProcAddress(hpsapi, #func); \
+    if(!p ## func) { \
+        ok(0, "GetProcAddress(%s) failed\n", #func); \
+        FreeLibrary(hpsapi); \
+        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 %ld\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 %ld\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 BOOL  (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD);
+static DWORD (WINAPI *pGetMappedFileNameA)(HANDLE, LPVOID, LPSTR, DWORD);
+static DWORD (WINAPI *pGetProcessImageFileNameA)(HANDLE, LPSTR, 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 BOOL InitFunctionPtrs(HMODULE hpsapi)
+{
+    PSAPI_GET_PROC(EmptyWorkingSet);
+    PSAPI_GET_PROC(EnumProcessModules);
+    PSAPI_GET_PROC(EnumProcesses);
+    PSAPI_GET_PROC(GetModuleBaseNameA);
+    PSAPI_GET_PROC(GetModuleFileNameExA);
+    PSAPI_GET_PROC(GetModuleInformation);
+    PSAPI_GET_PROC(GetMappedFileNameA);
+    PSAPI_GET_PROC(GetProcessMemoryInfo);
+    PSAPI_GET_PROC(GetWsChanges);
+    PSAPI_GET_PROC(InitializeProcessForWsWatch);
+    PSAPI_GET_PROC(QueryWorkingSet);
+    /* GetProcessImageFileName is not exported on NT4 */
+    pGetProcessImageFileNameA =
+      (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA");
+    return TRUE;
+}
+
+static HANDLE hpSR, hpQI, hpVR, hpQV, hpAA;
+static const HANDLE hBad = (HANDLE)0xdeadbeef;
+
+static void test_EnumProcesses(void)
+{
+    DWORD pid, cbUsed = 0xdeadbeef;
+
+    if(w32_suc(pEnumProcesses(NULL, 0, &cbUsed)))
+        ok(cbUsed == 0, "cbUsed=%ld\n", cbUsed);
+    if(w32_suc(pEnumProcesses(&pid, 4, &cbUsed)))
+        ok(cbUsed == 4, "cbUsed=%ld\n", cbUsed);
+}
+
+static void test_EnumProcessModules(void)
+{
+    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)))
+        return;
+    ok(cbNeeded / sizeof(HMODULE) >= 3 && cbNeeded / sizeof(HMODULE) <= 5 *
sizeof(HMODULE),
+       "cbNeeded=%ld\n", cbNeeded);
+    ok(hMod == GetModuleHandle(NULL),
+       "hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL));
+}
+
+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);
+}
+
+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)));
+}
+
+static void test_GetMappedFileName(void)
+{
+    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);
+    if(!w32_suc(ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath))))
+        return;
+    ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%ld\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);
+}
+
+static void test_GetProcessImageFileName(void)
+{
+    HMODULE hMod = GetModuleHandle(NULL);
+    char szImgPath[MAX_PATH], szMapPath[MAX_PATH];
+    DWORD ret;
+
+    if(pGetProcessImageFileNameA == NULL)
+        return;
+
+    /* This function is available on WinXP+ only */
+    SetLastError(0xdeadbeef);
+    if(!pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath)))
+    {
+        if(GetLastError() == ERROR_INVALID_FUNCTION)
+	    trace("GetProcessImageFileName not implemented\n");
+	else if(GetLastError() == 0xdeadbeef)
+	    ok(0, "failed without error code\n");
+	else
+	    ok(0, "failed with %ld\n", GetLastError());
+
+        return;
+    }
+    
+    w32_err(pGetProcessImageFileNameA(NULL, szImgPath, sizeof(szImgPath)),
ERROR_INVALID_HANDLE);
+    w32_err(pGetProcessImageFileNameA(hpSR, szImgPath, sizeof(szImgPath)),
ERROR_ACCESS_DENIED);
+    w32_err(pGetProcessImageFileNameA(hpQI, szImgPath, 0), ERROR_INSUFFICIENT_BUFFER);
+    if(!w32_suc(ret = pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath))) ||
+       !w32_suc(pGetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath))))
+        return;
+    /* Windows returns 2*strlen-1 */
+    ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%ld\n",
szImgPath, ret);
+    ok(!strcmp(szImgPath, szMapPath),
+       "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath,
szMapPath);    
+}
+
+static void test_GetModuleFileNameEx(void)
+{
+    HMODULE hMod = GetModuleHandle(NULL);
+    char szModExPath[MAX_PATH+1], szModPath[MAX_PATH+1];
+    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;
+    ok(ret == strlen(szModExPath), "szModExPath=\"%s\" ret=%ld\n",
szModExPath, ret);
+    GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
+    ok(!strncmp(szModExPath, szModPath, MAX_PATH), 
+       "szModExPath=\"%s\" szModPath=\"%s\"\n",
szModExPath, szModPath);
+}
+
+static void test_GetModuleBaseName(void)
+{
+    HMODULE hMod = GetModuleHandle(NULL);
+    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))))
+        return;
+    ok(ret == strlen(szModBaseName), "szModBaseName=\"%s\"
ret=%ld\n", szModBaseName, ret);
+    GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
+    ok(!strcmp(strrchr(szModPath, '\\') + 1, szModBaseName),
+       "szModPath=\"%s\" szModBaseName=\"%s\"\n",
szModPath, szModBaseName);
+}
+
+static void test_ws_functions(void)
+{
+    PSAPI_WS_WATCH_INFORMATION wswi[4096];
+    ULONG_PTR pages[4096];
+    char *addr;
+    int i;
+    
+    todo_wine w32_err(pEmptyWorkingSet(NULL), ERROR_INVALID_HANDLE);
+    todo_wine w32_err(pEmptyWorkingSet(hpSR), ERROR_ACCESS_DENIED);
+    w32_suc(pEmptyWorkingSet(hpAA));
+    
+    todo_wine w32_err(pInitializeProcessForWsWatch(NULL), ERROR_INVALID_HANDLE);
+    w32_suc(pInitializeProcessForWsWatch(hpAA));
+    
+    if(!w32_suc(addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE)))
+        return;
+
+    if(!VirtualLock(addr, 1))
+    {
+        trace("locking failed (error=%ld) - skipping test\n", GetLastError());
+        goto free_page;
+    }
+	
+    todo_wine if(w32_suc(pQueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR))))
+    {
+       for(i = 0; i < pages[0]; i++)
+           if((pages[i+1] & ~0xfffL) == (ULONG_PTR)addr)
+	   {
+	       ok(1, "QueryWorkingSet found our page\n");
+	       goto test_gwsc;
+	   }
+       
+       ok(0, "QueryWorkingSet didn't find our page\n");
+    }
+
+test_gwsc:
+    todo_wine if(w32_suc(pGetWsChanges(hpQI, wswi, sizeof(wswi))))
+    {
+        for(i = 0; wswi[i].FaultingVa; i++)
+	    if(((ULONG_PTR)wswi[i].FaultingVa & ~0xfffL) == (ULONG_PTR)addr)
+	    {
+	        ok(1, "GetWsChanges found our page\n");
+		goto free_page;
+	    }
+
+	ok(0, "GetWsChanges didn't find our page\n");
+    }
+    
+free_page:
+    VirtualFree(addr, 0, MEM_RELEASE);
+}
+
+START_TEST(psapi_main)
+{
+    HMODULE hpsapi = LoadLibraryA("psapi.dll");
+    
+    if(!hpsapi)
+    {
+        trace("Could not load psapi.dll\n");
+        return;
+    }
+
+    if(InitFunctionPtrs(hpsapi))
+    {
+        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)
+        {
+	    test_EnumProcesses();
+	    test_EnumProcessModules();
+	    test_GetModuleInformation();
+	    test_GetProcessMemoryInfo();
+	    todo_wine test_GetMappedFileName();
+            todo_wine test_GetProcessImageFileName();
+            test_GetModuleFileNameEx();
+            test_GetModuleBaseName();
+	    test_ws_functions();
+	}
+	CloseHandle(hpSR);
+	CloseHandle(hpQI);
+	CloseHandle(hpVR);
+	CloseHandle(hpQV);
+	CloseHandle(hpAA);
+    }
+    
+    FreeLibrary(hpsapi);
+}

Modified: trunk/reactos/regtests/winetests/psapi/testlist.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/psapi/te…
==============================================================================
--- trunk/reactos/regtests/winetests/psapi/testlist.c (original)
+++ trunk/reactos/regtests/winetests/psapi/testlist.c Fri May 26 21:35:11 2006
@@ -10,6 +10,6 @@
 
 const struct test winetest_testlist[] =
 {
-//    { "psapi_main", func_psapi_main },
+    { "psapi_main", func_psapi_main },
     { 0, 0 }
 };