[ros-diffs] [greatlrd] 27221: Time to cellbrate we got bltblt hal working again 1. Createsurface can only create one surface at moment 2. crash can occured if wrong param are being putin to createsurface for no error check are done. 3. createsurface are still under havy devloping

Author: greatlrd
Date: Mon Jun 18 03:43:21 2007
New Revision: 27221

URL: http://svn.reactos.org/svn/reactos?rev=27221&view=rev
Log:
Time to cellbrate we got bltblt hal working again

1. Createsurface can only create one surface at moment 
2. crash can occured if wrong param are being putin to createsurface for no error check
are done. 
3. createsurface are still under havy devloping 

Modified:
    trunk/reactos/dll/directx/ddraw/Surface/createsurface.c
    trunk/reactos/dll/directx/ddraw/Surface/surface_main.c

Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original)
+++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Jun 18 03:43:21 2007
@@ -121,8 +121,29 @@
 
         ThisSurfInt->lpLcl = ThisSurfLcl;
         ThisSurfLcl->lpGbl = ThisSurfaceGbl;
+
+        ThisSurfLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps;
+
         ThisSurfaceGbl->lpDD = pDDraw->lpLcl->lpGbl;
-        
+        ThisSurfaceGbl->lpDDHandle = pDDraw->lpLcl->lpGbl;
+
+        /* FIXME ? */
+        ThisSurfaceGbl->dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE;
+
+        if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
+        {
+            ThisSurfaceGbl->wWidth  =
pDDraw->lpLcl->lpGbl->vmiData.dwDisplayWidth;
+            ThisSurfaceGbl->wHeight =
pDDraw->lpLcl->lpGbl->vmiData.dwDisplayHeight;
+            ThisSurfaceGbl->lPitch  =
pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch;
+            ThisSurfaceGbl->dwLinearSize =
pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch;
+        }
+        else
+        {
+            ThisSurfaceGbl->wWidth  = (WORD)pDDSD->dwWidth;
+            ThisSurfaceGbl->wHeight = (WORD)pDDSD->dwHeight;
+            ThisSurfaceGbl->lPitch  = pDDSD->lPitch;
+            ThisSurfaceGbl->dwLinearSize = pDDSD->lPitch;
+        }
 
         /* FIXME set right version */
         ThisSurfInt->lpVtbl = &DirectDrawSurface7_Vtable;
@@ -135,6 +156,9 @@
 
         ThisSurfLcl->dwProcessId = GetCurrentProcessId();
 
+
+
+
         /* FIXME the lpLnk */
         /* FIXME the ref counter */
     }
@@ -142,10 +166,48 @@
 
     /* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */
 
+    /* FIXME bIsDifferentPixelFormat being set to true or false with automatic detcitons
*/
+    mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE;
+
+    mDdCanCreateSurface.lpDD = pDDraw->lpLcl->lpGbl;
+    mDdCanCreateSurface.CanCreateSurface =
pDDraw->lpLcl->lpDDCB->HALDD.CanCreateSurface;
+    mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD;
+    mDdCanCreateSurface.ddRVal = DDERR_GENERIC;
+
+    if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)==
DDHAL_DRIVER_NOTHANDLED) 
+    {
+        DX_STUB_str("mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED fail");
+        return DDERR_NOTINITIALIZED;
+    }
+
+   if (mDdCanCreateSurface.ddRVal != DD_OK)
+   {
+        DX_STUB_str("mDdCanCreateSurface fail");
+        return DDERR_NOTINITIALIZED;
+   }
+
+    mDdCreateSurface.lpDD = pDDraw->lpLcl->lpGbl;
+    mDdCreateSurface.CreateSurface =
pDDraw->lpLcl->lpGbl->lpDDCBtmp->HALDD.CreateSurface;
+    mDdCreateSurface.ddRVal =  DDERR_GENERIC;
+    mDdCreateSurface.dwSCnt = slist_int[0]->dwIntRefCnt + 1; // is this correct 
+    mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD;
+    mDdCreateSurface.lplpSList = slist_lcl;
+
+    if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) ==
DDHAL_DRIVER_NOTHANDLED)
+    {
+           return DDERR_NOTINITIALIZED;
+    }
+
+    if (mDdCreateSurface.ddRVal != DD_OK) 
+    {
+           return mDdCreateSurface.ddRVal;
+    }
 
     *ppSurf = &slist_int[0]->lpVtbl;
-    return DD_FALSE;
+    return DD_OK;
 }
+
+
 
 void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc)
 {

Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Mon Jun 18 03:43:21 2007
@@ -80,7 +80,7 @@
 
 	 DX_WINDBG_trace();
 
-     if ((
ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags 
+     if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags 
 		   & DDHAL_SURFCB32_BLT) != DDHAL_SURFCB32_BLT)
 	 {
 		 return DDERR_GENERIC;
@@ -95,7 +95,7 @@
      }   
 
 	 mDdBlt.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl;
-	 mDdBlt.Blt =
ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Blt;
+     mDdBlt.Blt =
ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HALDDSurface.Blt;
      mDdBlt.lpDDDestSurface = ThisDest->lpLcl->lpSurfMore->slist[0];
 
 	 ThisDest->lpLcl->lpSurfMore->slist[0]->hDC =