[SPOOLSS_WINETEST]

* Sync to Wine 1.5.4.

svn path=/trunk/; revision=56630

diff --git a/rostests/winetests/spoolss/spoolss.c b/rostests/winetests/spoolss/spoolss.c
index 6a2711e..acf2801 100644 (file)
--- a/rostests/winetests/spoolss/spoolss.c
+++ b/rostests/winetests/spoolss/spoolss.c
@@ -62,6 +62,16 @@ static LPCSTR load_functions(void)
     if (!pSplInitializeWinSpoolDrv) return ptr;
 
 
+    /* Calling BuildOtherNamesFromMachineName or SplInitializeWinSpoolDrv on
+     * Win7 results in a breakpoint exception. If you continue after hitting
+     * the breakpoint, the functions fail with ERROR_NOT_SUPPORTED. So we
+     * just skip the tests on Win7, since they won't provide any useful info.
+     * To detect Win7, we check whether UnloadDriver exists (it doesn't on
+     * Win7, but does exist on earlier Windows versions) */
+    ptr = "UnloadDriver";
+    if (GetProcAddress(hspl, ptr) == NULL) return ptr;
+
+
     ptr = "winspool.drv";
     hwinspool = LoadLibraryA(ptr);
     if (!hwinspool) return ptr;
@@ -198,10 +208,10 @@ START_TEST(spoolss)
 {
     LPCSTR ptr;
 
-    /* spoolss.dll does not exist on win9x */
+    /* The tests fail on Win7 (see comments in load_function() */
     ptr = load_functions();
     if (ptr) {
-        skip("%s not found\n", ptr);
+        win_skip("%s not found\n", ptr);
         return;
     }