[PSAPI_WINETEST]

* Fix MSVC build.
* Speedup build.
* Pierre, can you please consult with me before stepping on my toes (with improper syncs) ?

svn path=/trunk/; revision=60471

diff --git a/rostests/winetests/psapi/CMakeLists.txt b/rostests/winetests/psapi/CMakeLists.txt
index 343968f..8c00901 100644 (file)
--- a/rostests/winetests/psapi/CMakeLists.txt
+++ b/rostests/winetests/psapi/CMakeLists.txt
@@ -1,10 +1,5 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
 add_executable(psapi_winetest psapi_main.c testlist.c)
-target_link_libraries(psapi_winetest wine)
 set_module_type(psapi_winetest win32cui)
-add_importlibs(psapi_winetest psapi msvcrt kernel32 ntdll)
+add_importlibs(psapi_winetest msvcrt kernel32)
 add_cd_file(TARGET psapi_winetest DESTINATION reactos/bin FOR all)

diff --git a/rostests/winetests/psapi/psapi_main.c b/rostests/winetests/psapi/psapi_main.c
index 038d0f4..415c47a 100644 (file)
--- a/rostests/winetests/psapi/psapi_main.c
+++ b/rostests/winetests/psapi/psapi_main.c
@@ -102,12 +102,12 @@ static void test_EnumProcesses(void)
 
 static void test_EnumProcessModules(void)
 {
-    win_skip("Stack corruption - ROSTEST-122\n");
-    return;
-
     HMODULE hMod = GetModuleHandle(NULL);
     DWORD ret, cbNeeded = 0xdeadbeef;
 
+    win_skip("Stack corruption - ROSTEST-122\n");
+    return;
+
     SetLastError(0xdeadbeef);
     pEnumProcessModules(NULL, NULL, 0, &cbNeeded);
     ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError());

diff --git a/rostests/winetests/psapi/testlist.c b/rostests/winetests/psapi/testlist.c
index 2ceb361..ea32082 100644 (file)
--- a/rostests/winetests/psapi/testlist.c
+++ b/rostests/winetests/psapi/testlist.c
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_psapi_main(void);