Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-26 17:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

small ceanup in hal startup process

Browse source 
svn path=/trunk/; revision=18901
This commit is contained in:
Magnus Olsen 2005-10-30 23:29:40 +00:00
parent 068f8ec126
commit b8baa8476b
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/lib/ddraw/hal/ddraw_hal.c
View file

@ -49,9 +49,8 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
NULL, NULL,
NULL, NULL,
NULL )) NULL ))
{ {
OutputDebugString(L"First DdQueryDirectDrawObject failed"); return DD_FALSE;
return 1;
} }
This->HalInfo.vmiData.pvmList = HeapAlloc(GetProcessHeap(), 0, sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); This->HalInfo.vmiData.pvmList = HeapAlloc(GetProcessHeap(), 0, sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps);
@ -71,9 +70,8 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
This->DirectDrawGlobal.lpdwFourCC, This->DirectDrawGlobal.lpdwFourCC,
This->HalInfo.vmiData.pvmList This->HalInfo.vmiData.pvmList
)) ))
{ {
OutputDebugString(L"Second DdQueryDirectDrawObject failed"); return DD_FALSE;
return 1;
} }
/* Copy HalInfo to DirectDrawGlobal (Not complete)*/ /* Copy HalInfo to DirectDrawGlobal (Not complete)*/
@ -277,12 +275,7 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT); DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT);
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
/* Setup some info from the callbacks we got */
/* Setup some info from the callbacks we got */
/* FIXME do more callbacks and fill the gpl struct */
DDHAL_GETAVAILDRIVERMEMORYDATA mem; DDHAL_GETAVAILDRIVERMEMORYDATA mem;
mem.lpDD = &This->DirectDrawGlobal; mem.lpDD = &This->DirectDrawGlobal;
@ -290,9 +283,8 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree; This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree;
This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal; This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal;
/* Now all setup for HAL is done and we hopply do not have forget anything */ /* Now all setup for HAL is done */
return DD_OK; return DD_OK;
} }