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

Cover the most hal startup process it now time start implement hal in ddraw.dll

Browse source 
But we still does not doing the whole startup process right. 

svn path=/trunk/; revision=18862
This commit is contained in:
Magnus Olsen 2005-10-29 23:28:12 +00:00
parent cdea367eef
commit e01e983072
2 changed files with 54 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
reactos/lib/ddraw/hal/ddraw.c
View file

@ -135,6 +135,10 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
windows nt, it is in use for all os, and it always pont to windows nt, it is in use for all os, and it always pont to
DirectDrawGlobal.hDD */ DirectDrawGlobal.hDD */
/* FIXME add all callback that have been commect out to gpl */
/* FIXME free the memmor that being alloc when ddraw.dll exists */
/* FIXME add check for DriverInfo if the handle or not */
DDHAL_GETDRIVERINFODATA DriverInfo; DDHAL_GETDRIVERINFODATA DriverInfo;
memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA));
DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA);
@ -154,7 +158,7 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
DDHAL_DDMISCELLANEOUSCALLBACKS misc; DDHAL_DDMISCELLANEOUSCALLBACKS misc;
DriverInfo.guidInfo = GUID_D3DCallbacks; DriverInfo.guidInfo = GUID_D3DCallbacks;
DriverInfo.lpvData = &misc; DriverInfo.lpvData = &misc;
DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); DriverInfo.dwExpectedSize = sizeof();
This->HalInfo.GetDriverInfo( &DriverInfo);*/ This->HalInfo.GetDriverInfo( &DriverInfo);*/
/* Get the D3DCallbacks2 */ /* Get the D3DCallbacks2 */
@ -177,7 +181,7 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
/* Problem with include files /* Problem with include files
DriverInfo.guidInfo = GUID_D3DCaps; DriverInfo.guidInfo = GUID_D3DCaps;
DriverInfo.lpvData = &misc; DriverInfo.lpvData = &misc;
DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); DriverInfo.dwExpectedSize = sizeof();
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
*/ */
@ -191,21 +195,22 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
/* Get the D3DParseUnknownCommandCallback */ /* Get the D3DParseUnknownCommandCallback */
/* /* D3dDrawPrimitives2 callback where should it be fill in
DriverInfo.guidInfo = GUID_D3DParseUnknownCommandCallback; DriverInfo.guidInfo = GUID_D3DParseUnknownCommandCallback;
DriverInfo.lpvData = &misc; DriverInfo.lpvData = &misc;
DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); DriverInfo.dwExpectedSize = sizeof();
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
*/ */
/* Get the GetHeapAlignment */ /* Get the GetHeapAlignment */
/* /* where should it be fill in
DriverInfo.guidInfo = GUID_GetHeapAlignment; DriverInfo.guidInfo = GUID_GetHeapAlignment;
DriverInfo.lpvData = &misc; DriverInfo.lpvData = &misc;
DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); DriverInfo.dwExpectedSize = sizeof();
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
*/ */
/* Get the KernelCallbacks */ /* Get the KernelCallbacks */
DriverInfo.guidInfo = GUID_KernelCallbacks; DriverInfo.guidInfo = GUID_KernelCallbacks;
DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDKernel; DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDKernel;
@ -229,12 +234,13 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
/* Get the Miscellaneous2Callbacks */ /* Get the Miscellaneous2Callbacks */
/* /* Not in the DDRAWI_DIRECTDRAW_GBL we map it up as private
Contain CreatesurfaceEx and other nice callbacks */
DriverInfo.guidInfo = GUID_Miscellaneous2Callbacks; DriverInfo.guidInfo = GUID_Miscellaneous2Callbacks;
DriverInfo.lpvData = &misc; DriverInfo.lpvData = &This->Misc2Callback;
DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS);
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
*/
/* Get the MotionCompCallbacks */ /* Get the MotionCompCallbacks */
DriverInfo.guidInfo = GUID_MotionCompCallbacks; DriverInfo.guidInfo = GUID_MotionCompCallbacks;
@ -244,67 +250,78 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
/* Get the NonLocalVidMemCaps */ /* Get the NonLocalVidMemCaps */
/* This->DirectDrawGlobal.lpddNLVCaps = (LPDDNONLOCALVIDMEMCAPS)HeapAlloc(GetProcessHeap(), 0, sizeof(DDNONLOCALVIDMEMCAPS));
DriverInfo.guidInfo = GUID_NonLocalVidMemCaps; DriverInfo.guidInfo = GUID_NonLocalVidMemCaps;
DriverInfo.lpvData = &misc; DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpddNLVCaps;
DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); DriverInfo.dwExpectedSize = sizeof(DDNONLOCALVIDMEMCAPS);
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
*/
/* Get the NTCallbacks */ /* Get the NTCallbacks */
/* /* Fill in wher
DriverInfo.guidInfo = GUID_NTCallbacks; DriverInfo.guidInfo = GUID_NTCallbacks;
DriverInfo.lpvData = &misc; DriverInfo.lpvData = &misc;
DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); DriverInfo.dwExpectedSize = sizeof();
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
*/ */
/* Get the NTPrivateDriverCaps */ /* Get the NTPrivateDriverCaps */
/* /* Fill in wher
DriverInfo.guidInfo = GUID_NTPrivateDriverCaps; DriverInfo.guidInfo = GUID_NTPrivateDriverCaps;
DriverInfo.lpvData = &misc; DriverInfo.lpvData = &misc;
DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); DriverInfo.dwExpectedSize = sizeof();
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
*/ */
/* Get the UpdateNonLocalHeap */ /* Get the UpdateNonLocalHeap */
/* /* Fill in where
DriverInfo.guidInfo = GUID_UpdateNonLocalHeap; DriverInfo.guidInfo = GUID_UpdateNonLocalHeap;
DriverInfo.lpvData = &misc; DriverInfo.lpvData = &misc;
DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); DriverInfo.dwExpectedSize = sizeof();
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
*/ */
/* Get the VideoPortCallbacks */ /* Get the VideoPortCallbacks */
/* Problem with include files
DriverInfo.guidInfo = GUID_VideoPortCallbacks; DriverInfo.guidInfo = GUID_VideoPortCallbacks;
DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDVideoPort; DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDVideoPort;
DriverInfo.dwExpectedSize = sizeof(HALDDVideoPort); DriverInfo.dwExpectedSize = sizeof(DDHAL_DDVIDEOPORTCALLBACKS);
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
*/
/* Get the VideoPortCaps */ /* Get the VideoPortCaps */
/* This->DirectDrawGlobal.lpDDVideoPortCaps = (LPDDVIDEOPORTCAPS)HeapAlloc(GetProcessHeap(), 0, sizeof(DDVIDEOPORTCAPS));
DriverInfo.guidInfo = GUID_VideoPortCaps; DriverInfo.guidInfo = GUID_VideoPortCaps;
DriverInfo.lpvData = &misc; DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpDDVideoPortCaps;
DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); DriverInfo.dwExpectedSize = sizeof(DDVIDEOPORTCAPS);
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
*/
/* Get the ZPixelFormats */ /* Get the ZPixelFormats */
/* This->DirectDrawGlobal.lpZPixelFormats = (LPDDPIXELFORMAT)HeapAlloc(GetProcessHeap(), 0, sizeof(DDPIXELFORMAT));
DriverInfo.guidInfo = GUID_ZPixelFormats; DriverInfo.guidInfo = GUID_ZPixelFormats;
DriverInfo.lpvData = &misc; DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpZPixelFormats;
DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT);
This->HalInfo.GetDriverInfo( &DriverInfo); This->HalInfo.GetDriverInfo( &DriverInfo);
*/
/* FIXME add setup for one call ot get memmory */
/* Setup some info from the callbacks we got */
/* FIXME do more callbacks and fill the gpl struct */
DDHAL_GETAVAILDRIVERMEMORYDATA mem;
mem.lpDD = &This->DirectDrawGlobal;
This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemory(&mem);
This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree;
This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal;
/* now all insate of HAL is done and we hopply do not have forget anything*/
/* Now all setup for HAL is done and we hopply do not have forget anything */
return DD_OK; return DD_OK;
} }

1
reactos/lib/ddraw/rosdraw.h
View file

@ -20,6 +20,7 @@ typedef struct
IDirectDrawVtbl* lpVtbl_v1; IDirectDrawVtbl* lpVtbl_v1;
DDRAWI_DIRECTDRAW_GBL DirectDrawGlobal; DDRAWI_DIRECTDRAW_GBL DirectDrawGlobal;
DDHAL_DDMISCELLANEOUSCALLBACKS Misc2Callback;
DDHALINFO HalInfo; DDHALINFO HalInfo;
HWND window; HWND window;