[ros-diffs] [greatlrd] 25039: Fixed HALDD been setup right.

[greatlrd at svn.reactos.org]

Author: greatlrd
Date: Sun Dec  3 21:53:05 2006
New Revision: 25039

URL: http://svn.reactos.org/svn/reactos?rev=25039&view=rev
Log:
Fixed HALDD been setup right.

Modified:
    trunk/reactos/dll/directx/ddraw/startup.c

Modified: trunk/reactos/dll/directx/ddraw/startup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.c?rev=25039&r1=25038&r2=25039&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/startup.c (original)
+++ trunk/reactos/dll/directx/ddraw/startup.c Sun Dec  3 21:53:05 2006
@@ -668,8 +668,7 @@
     LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
 	DDHAL_GETDRIVERINFODATA DriverInfo;
 
-    DDHALINFO mHALInfo;
-    DDHAL_CALLBACKS mCallbacks;
+    DDHALINFO mHALInfo;    
     DDHAL_DDEXEBUFCALLBACKS mD3dBufferCallbacks;
     D3DHAL_CALLBACKS mD3dCallbacks;
     D3DHAL_GLOBALDRIVERDATA mD3dDriverData;
@@ -684,9 +683,13 @@
 	/* HAL Startup process */
     BOOL newmode = FALSE;	
 	    	
-
     RtlZeroMemory(&mHALInfo, sizeof(DDHALINFO));
-    RtlZeroMemory(&mCallbacks, sizeof(DDHAL_CALLBACKS));
+		
+	ddgbl.lpDDCBtmp = DxHeapMemAlloc(sizeof(DDHAL_CALLBACKS));
+    if ( ddgbl.lpDDCBtmp == NULL)
+	{
+		return DD_FALSE;
+	}
 
     /* 
       Startup DX HAL step one of three 
@@ -715,9 +718,9 @@
 
     if (!DdQueryDirectDrawObject(This->lpLcl->lpGbl,
                                  &mHALInfo,
-                                 &mCallbacks.HALDD,
-                                 &mCallbacks.HALDDSurface,
-                                 &mCallbacks.HALDDPalette, 
+								 &ddgbl.lpDDCBtmp->HALDD,
+                                 &ddgbl.lpDDCBtmp->HALDDSurface,
+                                 &ddgbl.lpDDCBtmp->HALDDPalette, 
                                  &mD3dCallbacks,
                                  &mD3dDriverData,
                                  &mD3dBufferCallbacks,
@@ -771,12 +774,12 @@
     if (!DdQueryDirectDrawObject(
                                     This->lpLcl->lpGbl,
                                     &mHALInfo,
-                                    &mCallbacks.HALDD,
-                                    &mCallbacks.HALDDSurface,
-                                    &mCallbacks.HALDDPalette, 
+                                    &ddgbl.lpDDCBtmp->HALDD,
+                                    &ddgbl.lpDDCBtmp->HALDDSurface,
+                                    &ddgbl.lpDDCBtmp->HALDDPalette, 
                                     &mD3dCallbacks,
                                     &mD3dDriverData,
-                                    &mCallbacks.HALDDExeBuf,
+                                    &ddgbl.lpDDCBtmp->HALDDExeBuf,
                                     (DDSURFACEDESC*)mpTextures,
                                     mpFourCC,
                                     mpvmList))
@@ -791,6 +794,7 @@
       return DD_FALSE;
     }
 
+		
    /*
       Copy over from HalInfo to DirectDrawGlobal
    */