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

Author: akhaldi
Date: Mon Sep 30 08:10:07 2013
New Revision: 60471

URL: http://svn.reactos.org/svn/reactos?rev=60471&view=rev
Log:
[PSAPI_WINETEST]
* Fix MSVC build.
* Speedup build.
* Pierre, can you please consult with me before stepping on my toes (with improper syncs) ?

Modified:
    trunk/rostests/winetests/psapi/CMakeLists.txt
    trunk/rostests/winetests/psapi/psapi_main.c
    trunk/rostests/winetests/psapi/testlist.c

Modified: trunk/rostests/winetests/psapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/CMakeLists...
==============================================================================
--- trunk/rostests/winetests/psapi/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/psapi/CMakeLists.txt	[iso-8859-1] Mon Sep 30 08:10:07 2013
@@ -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)

Modified: trunk/rostests/winetests/psapi/psapi_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/psapi_main...
==============================================================================
--- trunk/rostests/winetests/psapi/psapi_main.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/psapi/psapi_main.c	[iso-8859-1] Mon Sep 30 08:10:07 2013
@@ -102,11 +102,11 @@

static void test_EnumProcessModules(void)
 {
+    HMODULE hMod = GetModuleHandle(NULL);
+    DWORD ret, cbNeeded = 0xdeadbeef;
+
     win_skip("Stack corruption - ROSTEST-122\n");
     return;
-
-    HMODULE hMod = GetModuleHandle(NULL);
-    DWORD ret, cbNeeded = 0xdeadbeef;

SetLastError(0xdeadbeef);
     pEnumProcessModules(NULL, NULL, 0, &cbNeeded);

Modified: trunk/rostests/winetests/psapi/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/testlist.c...
==============================================================================
--- trunk/rostests/winetests/psapi/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/psapi/testlist.c	[iso-8859-1] Mon Sep 30 08:10:07 2013
@@ -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);