[ros-diffs] [akhaldi] 63068: [NTPRINT_WINETEST] * Sync with Wine 1.7.17. * Improve header inclusions. * Speedup build. * Remove redundant definitions. CORE-8080

Author: akhaldi
Date: Wed Apr 30 12:44:28 2014
New Revision: 63068

URL: http://svn.reactos.org/svn/reactos?rev=63068&view=rev
Log:
[NTPRINT_WINETEST]
* Sync with Wine 1.7.17.
* Improve header inclusions.
* Speedup build.
* Remove redundant definitions.
CORE-8080

Modified:
    trunk/rostests/winetests/ntprint/CMakeLists.txt
    trunk/rostests/winetests/ntprint/ntprint.c
    trunk/rostests/winetests/ntprint/testlist.c

Modified: trunk/rostests/winetests/ntprint/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntprint/CMakeLis...
==============================================================================
--- trunk/rostests/winetests/ntprint/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntprint/CMakeLists.txt	[iso-8859-1] Wed Apr 30 12:44:28 2014
@@ -1,10 +1,5 @@
-
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)

add_executable(ntprint_winetest ntprint.c testlist.c)
-target_link_libraries(ntprint_winetest wine)
 set_module_type(ntprint_winetest win32cui)
-add_importlibs(ntprint_winetest msvcrt kernel32 ntdll)
+add_importlibs(ntprint_winetest msvcrt kernel32)
 add_cd_file(TARGET ntprint_winetest DESTINATION reactos/bin FOR all)

Modified: trunk/rostests/winetests/ntprint/ntprint.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntprint/ntprint....
==============================================================================
--- trunk/rostests/winetests/ntprint/ntprint.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntprint/ntprint.c	[iso-8859-1] Wed Apr 30 12:44:28 2014
@@ -70,6 +70,10 @@

SetLastError(0xdeadbeef);
     mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL);
+    if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) {
+        win_skip("The service 'Spooler' is required for many tests\n");
+        return;
+    }
     ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError());
     if (mi) pPSetupDestroyMonitorInfo(mi);

@@ -96,6 +100,10 @@

SetLastError(0xdeadbeef);
     mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL);
+    if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) {
+        win_skip("The service 'Spooler' is required for many tests\n");
+        return;
+    }
     ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError());

if (!mi) return;
@@ -105,7 +113,7 @@
     /* lasterror is returned */
     trace("returned with %u\n", GetLastError());

-    /* Try to destroy the handle twice crash with native ntprint.dll */
+    /* Trying to destroy the handle twice crashes with native ntprint.dll */
     if (0) {
         SetLastError(0xdeadbeef);
         pPSetupDestroyMonitorInfo(mi);

Modified: trunk/rostests/winetests/ntprint/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntprint/testlist...
==============================================================================
--- trunk/rostests/winetests/ntprint/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntprint/testlist.c	[iso-8859-1] Wed Apr 30 12:44:28 2014
@@ -1,7 +1,4 @@
 /* Automatically generated file; DO NOT EDIT!! */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>

#define STANDALONE
 #include "wine/test.h"