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

fixing a smaller bug extream hard to find,

Browse source 
if we got two or more directdraw object we choice always the lates hDD not the object own hDD
use This->lpLcl->lpGbl->hDD = This->lpLcl->hDD; to set the object own hDD before call any dxhal api

svn path=/trunk/; revision=27070
This commit is contained in:
Magnus Olsen 2007-06-08 12:57:00 +00:00
parent 869f31838e
commit e248b95f9d
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c
View file

@ -177,6 +177,7 @@ Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeig
{ {
// Update Interals // Update Interals
BOOL ModeChanged; BOOL ModeChanged;
This->lpLcl->lpGbl->hDD = This->lpLcl->hDD;
DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged);
StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE);
} }
@ -203,6 +204,8 @@ Main_DirectDraw_RestoreDisplayMode (LPDIRECTDRAW7 iface)
// Update Interals // Update Interals
BOOL ModeChanged; BOOL ModeChanged;
This->lpLcl->lpGbl->hDD = This->lpLcl->hDD;
DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged);
StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE);
} }

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

@ -202,6 +202,8 @@ Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps,
memdata.ddRVal = DDERR_INVALIDPARAMS; memdata.ddRVal = DDERR_INVALIDPARAMS;
memcpy(&memdata.DDSCaps, ddscaps, sizeof(DDSCAPS2)); memcpy(&memdata.DDSCaps, ddscaps, sizeof(DDSCAPS2));
This->lpLcl->lpGbl->hDD = This->lpLcl->hDD;
if (This->lpLcl->lpDDCB->HALDDMiscellaneous.GetAvailDriverMemory(&memdata) == DDHAL_DRIVER_NOTHANDLED) if (This->lpLcl->lpDDCB->HALDDMiscellaneous.GetAvailDriverMemory(&memdata) == DDHAL_DRIVER_NOTHANDLED)
{ {
retVal = DDERR_NODIRECTDRAWHW; retVal = DDERR_NODIRECTDRAWHW;