dlls/ddraw/tests/ddrawmodes.c - Fix for Win2k

[Jakob Eriksson]

http://test.winehq.org/data/200503151000/2000_PaulVriensW2KProf/ddraw:ddrawmodes.txt

SetDisplayMode can return DDERR_UNSUPPORTED. If it does, we shouldn't
try to restore something either.



regards,
Jakob

-------------- next part --------------
Index: dlls/ddraw/tests/ddrawmodes.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/tests/ddrawmodes.c,v
retrieving revision 1.3
diff -u -r1.3 ddrawmodes.c
--- dlls/ddraw/tests/ddrawmodes.c	16 Feb 2004 20:23:58 -0000	1.3
+++ dlls/ddraw/tests/ddrawmodes.c	16 Mar 2005 09:11:38 -0000
@@ -135,10 +135,11 @@
             rc = IDirectDraw_SetDisplayMode(lpDD,
                 modes[i].dwWidth, modes[i].dwHeight,
                 modes[i].ddpfPixelFormat.UNION_MEMBER(1, dwRGBBitCount));
-            ok(rc==DD_OK,"SetDisplayMode returned: %lx\n",rc);
-            rc = IDirectDraw_RestoreDisplayMode(lpDD);
-            ok(rc==DD_OK,"RestoreDisplayMode returned: %lx\n",rc);
-            
+            ok(DD_OK==rc || DDERR_UNSUPPORTED==rc,"SetDisplayMode returned: %lx\n",rc);
+	    if (DD_OK==rc) {
+                rc = IDirectDraw_RestoreDisplayMode(lpDD);
+                ok(DD_OK==rc,"RestoreDisplayMode returned: %lx\n",rc);
+            }
         }
     }
 }