Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 16:10:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixing another crash for -O3

Browse source 
svn path=/trunk/; revision=27045
This commit is contained in:
Magnus Olsen 2007-06-07 12:39:42 +00:00
parent 259286f6fc
commit 79583495ee
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,11 @@ Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags,
{ {
DX_STUB_str("here\n"); DX_STUB_str("here\n");
if(!pCallback) if
((!IsBadReadPtr(pCallback,sizeof(LPDDENUMMODESCALLBACK2))) ||
(!IsBadWritePtr(pCallback,sizeof(LPDDENUMMODESCALLBACK2))) ||
(!IsBadReadPtr(pDDSD,sizeof(DDSURFACEDESC2))) ||
(!IsBadWritePtr(pDDSD,sizeof(DDSURFACEDESC2))))
{ {
ret = DDERR_INVALIDPARAMS; ret = DDERR_INVALIDPARAMS;
} }
@ -67,6 +71,8 @@ Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags,
*/ */
SurfaceDesc.ddpfPixelFormat.dwRGBBitCount = DevMode.dmBitsPerPel; SurfaceDesc.ddpfPixelFormat.dwRGBBitCount = DevMode.dmBitsPerPel;
DX_STUB_str("here\n");
// FIXME1: This->lpLcl->lpGbl->dwMonitorFrequency is not set ! // FIXME1: This->lpLcl->lpGbl->dwMonitorFrequency is not set !
if(dwFlags & DDEDM_REFRESHRATES && SurfaceDesc.dwRefreshRate != This->lpLcl->lpGbl->dwMonitorFrequency) if(dwFlags & DDEDM_REFRESHRATES && SurfaceDesc.dwRefreshRate != This->lpLcl->lpGbl->dwMonitorFrequency)
{ {