Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 23:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed HALDD been setup right.

Browse source 
svn path=/trunk/; revision=25039
This commit is contained in:
Magnus Olsen 2006-12-03 18:53:05 +00:00
parent 076a9dd89e
commit 1de675a898
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
reactos/dll/directx/ddraw/startup.c
View file

@ -668,8 +668,7 @@ StartDirectDrawHal(LPDIRECTDRAW* iface)
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 @@ StartDirectDrawHal(LPDIRECTDRAW* iface)
/* 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 @@ StartDirectDrawHal(LPDIRECTDRAW* iface)
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 @@ StartDirectDrawHal(LPDIRECTDRAW* iface)
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 @@ StartDirectDrawHal(LPDIRECTDRAW* iface)
return DD_FALSE;
}
/*
Copy over from HalInfo to DirectDrawGlobal
*/