Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-09 04:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add call to DdReenableDirectDrawObject (GdiEntry10) where it is needed.

Browse source 
svn path=/trunk/; revision=18927
This commit is contained in:
Maarten Bosma 2005-11-01 12:02:12 +00:00
parent b7d56ed0e3
commit 416daf8bd1
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,8 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc))
return DDERR_INVALIDPARAMS;
BOOL dummy;
DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy);
/* alloc all the space */
This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
@ -226,7 +228,6 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
DriverInfo.dwExpectedSize = sizeof(DDNONLOCALVIDMEMCAPS);
This->HalInfo.GetDriverInfo(&DriverInfo);
/* Get the NTCallbacks */
/* Fill in wher
DriverInfo.guidInfo = GUID_NTCallbacks;
@ -476,8 +477,11 @@ HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD
{
return DDERR_NODRIVERSUPPORT;
}
BOOL dummy;
DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy);
return mode.ddRVal
return mode.ddRVal;
}
#endif

13
reactos/lib/ddraw/main/ddraw_main.c
View file

@ -82,16 +82,19 @@ HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hw
HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight,
DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags)
{
DWORD ret;
IDirectDrawImpl* This = (IDirectDrawImpl*)iface;
/* FIXME implement hal setMode */
if((ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight,
dwBPP, dwRefreshRate, dwFlags)) == DD_OK)
if(Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight,
dwBPP, dwRefreshRate, dwFlags) == DD_OK)
{
return ret;
return DD_OK;
}
ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags);
DWORD ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags);
BOOL dummy;
DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy);
return ret;
}