From 0fe6b951ac961820eb2846d928d28acf5a88bf54 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Sun, 10 Dec 2006 13:32:35 +0000
Subject: [PATCH] Fixed all hack in createsurface, we still have some bugs and
 do not create surface as we should. but we lest create a single primary
 surface.

svn path=/trunk/; revision=25113
---
 reactos/dll/directx/ddraw/main/ddraw_main.c | 58 +++++++++++++++------
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/reactos/dll/directx/ddraw/main/ddraw_main.c b/reactos/dll/directx/ddraw/main/ddraw_main.c
index b6d7907e7cd..3a2f39209db 100644
--- a/reactos/dll/directx/ddraw/main/ddraw_main.c
+++ b/reactos/dll/directx/ddraw/main/ddraw_main.c
@@ -184,8 +184,7 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
 	LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
     LPDDRAWI_DDRAWSURFACE_INT That; 
 	DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface;
-	DDHAL_CREATESURFACEDATA mDdCreateSurface;
-	LPDDRAWI_DDRAWSURFACE_MORE SurfaceMore;
+	DDHAL_CREATESURFACEDATA mDdCreateSurface;	
 	
 	/* 
 	 * check if pUnkOuter is NULL if it is not fail 
@@ -266,6 +265,17 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
 		DxHeapMemFree(That);
 		return DDERR_OUTOFMEMORY;
 	}
+
+	That->lpLcl->lpSurfMore->slist = DxHeapMemAlloc(sizeof(LPDDRAWI_DDRAWSURFACE_LCL)<<1);
+	if (That->lpLcl->lpSurfMore->slist == NULL)
+	{
+		/* shall we free it if it fail ?? */
+		DxHeapMemFree(That->lpLcl->lpSurfMore);
+		DxHeapMemFree(That->lpLcl);
+		DxHeapMemFree(That);
+		return DDERR_OUTOFMEMORY;
+	}
+
 	
 	/* setup some value */
 	*ppSurf = (LPDIRECTDRAWSURFACE7)That;
@@ -276,6 +286,7 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
 	That->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);
 	That->lpLcl->lpSurfMore->lpDD_int = This;
 	That->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl;
+	That->lpLcl->lpSurfMore->slist[0] = That->lpLcl;
 	That->lpLcl->dwProcessId = GetCurrentProcessId();
 
 	/* this two line should be move to startup code */
@@ -301,16 +312,14 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
 	mDdCreateSurface.ddRVal =  DDERR_GENERIC;
 	mDdCreateSurface.dwSCnt = That->dwIntRefCnt + 1; // is this correct 
 	mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD;
-	//mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist;
-	//mDdCreateSurface.lplpSList = &That->lpLcl;
+		
+	mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist;
 		
     if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
 	{  
-	   DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1];
        
 	   This->lpLcl->lpPrimary = That;
-	   That->lpLcl->lpSurfMore->slist = mpPrimaryLocals;
-                                                         
+
        if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) 
        {   
            return DDERR_NOTINITIALIZED;
@@ -320,16 +329,33 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
        {
            return DDERR_NOTINITIALIZED;
        }
-                 
-	   That->lpLcl->lpGbl->wWidth  = This->lpLcl->lpGbl->vmiData.dwDisplayWidth;
-       That->lpLcl->lpGbl->wHeight = This->lpLcl->lpGbl->vmiData.dwDisplayHeight;
-       That->lpLcl->lpGbl->lPitch  = This->lpLcl->lpGbl->vmiData.lDisplayPitch;
-                   
-       That->lpLcl->dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA;
-       That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps;
+       
+	   /* FIXME 
+	    * check the value from pDDSD and use it as size 
+		*/
 
-       mpPrimaryLocals[0] = That->lpLcl;
-                       
+	   if (This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN)
+	   {
+			That->lpLcl->lpGbl->wWidth  = This->lpLcl->lpGbl->vmiData.dwDisplayWidth;
+			That->lpLcl->lpGbl->wHeight = This->lpLcl->lpGbl->vmiData.dwDisplayHeight;
+			That->lpLcl->lpGbl->lPitch  = This->lpLcl->lpGbl->vmiData.lDisplayPitch;
+	   }
+	   else
+	   {
+		    RECT rect;
+			
+			if(GetWindowRect((HWND)This->lpLcl->hWnd, &rect))
+			{			   
+			   That->lpLcl->lpGbl->wWidth  = rect.right - rect.left;
+			   That->lpLcl->lpGbl->wHeight = rect.bottom - rect.top;
+			   That->lpLcl->lpGbl->lPitch  = This->lpLcl->lpGbl->vmiData.lDisplayPitch;
+			}
+	   }
+
+                   
+       // That->lpLcl->dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA;
+       That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps;
+                             
        mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist;
      
        if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED)