Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

DD->GetCaps for hal are so complete we can do with current

Browse source 
startup process we are missing setting This->lpLcl->lpGbl->lpddNLVCaps

fixed a smaller bugs in caps data

svn path=/trunk/; revision=27214
This commit is contained in:
Magnus Olsen 2007-06-17 14:46:04 +00:00
parent d68da75a83
commit 487f93e2d7
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
View file

@ -519,19 +519,19 @@ Main_DirectDraw_GetCaps( LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps,
{ {
LPDDCAPS_DX5 myCaps = (LPDDCAPS_DX5) pDriverCaps; LPDDCAPS_DX5 myCaps = (LPDDCAPS_DX5) pDriverCaps;
/* FIXME This->lpLcl->lpGbl->lpddNLVCaps are not set in startup.c
if (This->lpLcl->lpGbl->lpddNLVCaps->dwSize == sizeof(DDNONLOCALVIDMEMCAPS))
{
memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS));
}
*/
memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS));
if (CoreCaps->dwSize == sizeof(DDCORECAPS)) if (CoreCaps->dwSize == sizeof(DDCORECAPS))
{ {
memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS));
} }
/* FIXME
DWORD dwNLVBCaps;
DWORD dwNLVBCaps2;
DWORD dwNLVBCKeyCaps;
DWORD dwNLVBFXCaps;
DWORD dwNLVBRops[DD_ROP_SPACE];
*/
myCaps->dwVidMemFree = dwFree; myCaps->dwVidMemFree = dwFree;
myCaps->dwVidMemTotal = dwTotal; myCaps->dwVidMemTotal = dwTotal;
myCaps->dwSize = sizeof(DDCAPS_DX5); myCaps->dwSize = sizeof(DDCAPS_DX5);
@ -545,6 +545,14 @@ Main_DirectDraw_GetCaps( LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps,
{ {
LPDDCAPS_DX7 myCaps = (LPDDCAPS_DX7) pDriverCaps; LPDDCAPS_DX7 myCaps = (LPDDCAPS_DX7) pDriverCaps;
/* FIXME This->lpLcl->lpGbl->lpddNLVCaps are not set in startup.c
if (This->lpLcl->lpGbl->lpddNLVCaps->dwSize == sizeof(DDNONLOCALVIDMEMCAPS))
{
memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS));
}
*/
memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS));
if (CoreCaps->dwSize == sizeof(DDCORECAPS)) if (CoreCaps->dwSize == sizeof(DDCORECAPS))
{ {
memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS));
@ -553,18 +561,10 @@ Main_DirectDraw_GetCaps( LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps,
myCaps->dwVidMemFree = dwFree; myCaps->dwVidMemFree = dwFree;
myCaps->dwVidMemTotal = dwTotal; myCaps->dwVidMemTotal = dwTotal;
/* FIXME myCaps->ddsCaps.dwCaps = myCaps->ddsOldCaps.dwCaps;
DWORD dwNLVBCaps; myCaps->ddsCaps.dwCaps2 = 0;
DWORD dwNLVBCaps2; myCaps->ddsCaps.dwCaps3 = 0;
DWORD dwNLVBCKeyCaps; myCaps->ddsCaps.dwCaps4 = 0;
DWORD dwNLVBFXCaps;
DWORD dwNLVBRops[DD_ROP_SPACE];
*/
myCaps->ddsCaps.dwCaps = ddscaps.dwCaps;
myCaps->ddsCaps.dwCaps2 = ddscaps.dwCaps2;
myCaps->ddsCaps.dwCaps3 = ddscaps.dwCaps3;
myCaps->ddsCaps.dwCaps4 = ddscaps.dwCaps4;
myCaps->dwSize = sizeof(DDCAPS_DX7); myCaps->dwSize = sizeof(DDCAPS_DX7);
} }
@ -699,7 +699,7 @@ IDirectDraw7Vtbl DirectDraw7_Vtable =
Main_DirectDraw_EnumDisplayModes, /* (EnumDisplayModes testing / devloping) */ Main_DirectDraw_EnumDisplayModes, /* (EnumDisplayModes testing / devloping) */
Main_DirectDraw_EnumSurfaces, Main_DirectDraw_EnumSurfaces,
Main_DirectDraw_FlipToGDISurface, Main_DirectDraw_FlipToGDISurface,
Main_DirectDraw_GetCaps, Main_DirectDraw_GetCaps, /* (GetCaps testing / devloping) */
Main_DirectDraw_GetDisplayMode, /* (GetDisplayMode testing / devloping) */ Main_DirectDraw_GetDisplayMode, /* (GetDisplayMode testing / devloping) */
Main_DirectDraw_GetFourCCCodes, /* (GetFourCCCodes done) */ Main_DirectDraw_GetFourCCCodes, /* (GetFourCCCodes done) */
Main_DirectDraw_GetGDISurface, Main_DirectDraw_GetGDISurface,