[ros-diffs] [greatlrd] 21511: sorry did commit wrong version for Dx dhal blt here is it. can blt a surface (not tested).

Author: greatlrd
Date: Fri Apr  7 22:08:45 2006
New Revision: 21511

URL: http://svn.reactos.ru/svn/reactos?rev=21511&view=rev
Log:
sorry did commit wrong version for Dx dhal blt here is it. can blt a surface (not tested).

Modified:
    trunk/reactos/dll/directx/ddraw/hal/surface_hal.c

Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfac...
==============================================================================
--- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original)
+++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Fri Apr  7 22:08:45 2006
@@ -232,7 +232,11 @@
         DDHAL_BLTDATA mDdBlt;
         IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;

-        //IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)src;
+        IDirectDrawSurfaceImpl* That = NULL;
+        if (src!=NULL)
+        {
+            That = (IDirectDrawSurfaceImpl*)src;
+        }
    
         if (This==NULL)
         {
@@ -268,10 +272,13 @@
         {
               memcpy(& mDdBlt.rDest, rSrc, sizeof(DDBLTFX));
         }
-
-   
-        // FIXME setup src surface 
-        mDdBlt.lpDDSrcSurface = NULL; //src->
+           
+        if (src != NULL)
+        {
+              mDdBlt.lpDDSrcSurface = That->Surf->mpPrimaryLocals[0];
+        }
+
+        //mDdBlt.lpDDSrcSurface = NULL; //src->

mDdBlt.lpDD = &This->owner->mDDrawGlobal;
         mDdBlt.Blt = This->owner->mCallbacks.HALDDSurface.Blt;