[ros-diffs] [akhaldi] 56630: [SPOOLSS_WINETEST] * Sync to Wine 1.5.4.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Sat May 19 14:15:59 2012
New Revision: 56630

URL: http://svn.reactos.org/svn/reactos?rev=56630&view=rev
Log:
[SPOOLSS_WINETEST]
* Sync to Wine 1.5.4.

Modified:
    trunk/rostests/winetests/spoolss/spoolss.c

Modified: trunk/rostests/winetests/spoolss/spoolss.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/spoolss/spoolss.c?rev=56630&r1=56629&r2=56630&view=diff
==============================================================================
--- trunk/rostests/winetests/spoolss/spoolss.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/spoolss/spoolss.c [iso-8859-1] Sat May 19 14:15:59 2012
@@ -60,6 +60,16 @@
     ptr = "SplInitializeWinSpoolDrv";
     pSplInitializeWinSpoolDrv = (void *) GetProcAddress(hspl, ptr);
     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";
@@ -198,10 +208,10 @@
 {
     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;
     }