[NTPRINT_WINETEST]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 30 Apr 2014 12:44:28 +0000 (12:44 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 30 Apr 2014 12:44:28 +0000 (12:44 +0000)
* Sync with Wine 1.7.17.
* Improve header inclusions.
* Speedup build.
* Remove redundant definitions.
CORE-8080

svn path=/trunk/; revision=63068

rostests/winetests/ntprint/CMakeLists.txt
rostests/winetests/ntprint/ntprint.c
rostests/winetests/ntprint/testlist.c

index 3ff4a90..ffa8c91 100644 (file)
@@ -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)
index cf9853d..e0bc01e 100644 (file)
@@ -70,6 +70,10 @@ static void test_PSetupCreateMonitorInfo(VOID)
 
     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 @@ static void test_PSetupDestroyMonitorInfo(VOID)
 
     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 @@ static void test_PSetupDestroyMonitorInfo(VOID)
     /* 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);
index 25fb277..1e11b97 100644 (file)
@@ -1,8 +1,5 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
 #include "wine/test.h"