commit 8d8703cb489c477260ebc360e683d40ac8070b4c
author Patrik Stridvall <ps@leissner.se> Thu Feb 04 14:05:38 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Feb 04 14:05:38 1999 +0000
tree 23ff394f3ce3d01e41dd662ee9b6cf4025b698fc
parent c6e6a9aff99daed073e35b1be48b4107e23a88f7

Moved some more code to the X11 driver.

windows/user.c

diff --git a/windows/user.c b/windows/user.c
index c7acd02..d8241b87 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -24,7 +24,9 @@
 #include "miscemu.h"
 #include "shell.h"
 #include "callback.h"
-#include "x11drv.h"
+#include "local.h"
+#include "class.h"
+#include "desktop.h"
 
 /***********************************************************************
  *           GetFreeSystemResources   (USER.284)
@@ -312,9 +314,9 @@
   FIXME(system, ": stub\n");
   if (devmode==NULL)
     FIXME(system,"   devmode=NULL (return to default mode)\n");
-  else if ( (devmode->dmBitsPerPel != DefaultDepthOfScreen(screen)) 
-	    || (devmode->dmPelsHeight != screenHeight)
-	    || (devmode->dmPelsWidth != screenWidth) )
+  else if ( (devmode->dmBitsPerPel != DESKTOP_GetScreenDepth()) 
+	    || (devmode->dmPelsHeight != DESKTOP_GetScreenHeight())
+	    || (devmode->dmPelsWidth != DESKTOP_GetScreenWidth()) )
 
   {
 
@@ -353,9 +355,9 @@
 
 	TRACE(system,"(%s,%ld,%p)\n",name,n,devmode);
 	if (n==0) {
-		devmode->dmBitsPerPel = DefaultDepthOfScreen(screen);
-		devmode->dmPelsHeight = screenHeight;
-		devmode->dmPelsWidth = screenWidth;
+		devmode->dmBitsPerPel = DESKTOP_GetScreenDepth();
+		devmode->dmPelsHeight = DESKTOP_GetScreenHeight();
+		devmode->dmPelsWidth = DESKTOP_GetScreenWidth();
 		return TRUE;
 	}
 	if ((n-1)<NRMODES*NRDEPTHS) {