[ros-diffs] [greatlrd] 25080: start writing on the createsurface code, current does not setup the interface right yet so we do not doing the callbacks yet

Author: greatlrd
Date: Thu Dec  7 19:46:33 2006
New Revision: 25080

URL: http://svn.reactos.org/svn/reactos?rev=25080&view=rev
Log:
start writing on the createsurface code, current does not setup the interface right yet so
we do not doing the callbacks yet

Added:
    trunk/reactos/dll/directx/ddraw/thunks/
      - copied from r25012, trunk/reactos/dll/directx/ddraw/thunks/
Modified:
    trunk/reactos/dll/directx/ddraw/main/ddraw_main.c

Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Thu Dec  7 19:46:33 2006
@@ -202,7 +202,8 @@
 	}
 
 	That->lpLcl =
(LPDDRAWI_DDRAWSURFACE_LCL)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_LCL));
-    
+    This->lpLcl->lpPrimary = That;
+
     if (That == NULL) 
 	{
         return E_OUTOFMEMORY;
@@ -214,15 +215,7 @@
 	That->lpLcl->lpGbl = &ddSurfGbl;
 	That->lpLcl->lpGbl->lpDD = &ddgbl;
 
-	Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)That);
-	
-	if (This->lpLcl->lpGbl->dsList == NULL)
-	{	
-		This->lpLcl->lpGbl->dsList = That;
 		
-	}
-      
-  
 	/* Code from wine cvs 24/7-2006 */
 
 	if (!(pDDSD->dwFlags & DDSD_CAPS))
@@ -253,16 +246,27 @@
 
 	DX_STUB_str("pDDSD->dwFlags ok");
 
-	/* own code now */
-
-    /* FIXME 	
-	   remove all old code for create a surface 
-	   for we need rewrite it 
-     */
+	/* own code now */   
           
     if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
-	{                         
-            DX_STUB_str( "Can not create primary surface");
+	{        
+		    /* we only create one surface it is primary */
+		    //LPDDRAWI_DDRAWSURFACE_LCL surf;
+
+		    DX_STUB_str( "Can not create primary surface well yet");
+
+			
+			if (That == NULL) 
+			{
+				return E_OUTOFMEMORY;
+			}
+
+			// This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface();
+            // This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface();
+			Main_DirectDraw_AddRef((LPDIRECTDRAW7)This);
+			Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)That);
+			return DD_OK;
+			
     }
     else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY)
     {       
@@ -720,7 +724,7 @@
 	/* This code should be a callback */
 	This->lpLcl->hWnd = hwnd;
 	This->lpLcl->hFocusWnd = hwnd;	
-	ReCreateDirectDraw(iface);
+	ReCreateDirectDraw((LPDIRECTDRAW*)iface);
 
     // TODO:                                                            
     // - create a scaner that check which driver we should get the HDC from