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

Change EnumDisplayModes to use EnumDisplaySettingsEx because Nvidia does not set lpModeInfo in DDHALINFO.

Browse source 
svn path=/trunk/; revision=26868
This commit is contained in:
Maarten Bosma 2007-05-22 12:39:59 +00:00
parent 6545618504
commit f31403fe80
1 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,39 +16,49 @@ Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags,
LPDDSURFACEDESC2 pDDSD, LPVOID pContext, LPDDENUMMODESCALLBACK2 pCallback) LPDDSURFACEDESC2 pDDSD, LPVOID pContext, LPDDENUMMODESCALLBACK2 pCallback)
{ {
LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
INT iMode = 0;
DEVMODE DevMode;
DX_WINDBG_trace(); DX_WINDBG_trace();
if(!pCallback) if(!pCallback)
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
// FIXME: Process DDEDM_STANDARDVGAMODES flag DevMode.dmSize = sizeof(DEVMODE);
DevMode.dmDriverExtra = 0;
int i; while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0) == TRUE)
for (i=0; i<This->lpLcl->lpGbl->dwNumModes; i++)
{ {
DDSURFACEDESC2 SurfaceDesc; DDSURFACEDESC2 SurfaceDesc;
// FIXME: do we need to set/test more sturcture members ? iMode++;
SurfaceDesc.dwSize = sizeof (DDSURFACEDESC2); SurfaceDesc.dwSize = sizeof (DDSURFACEDESC2);
SurfaceDesc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT; SurfaceDesc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT;
SurfaceDesc.dwHeight = This->lpLcl->lpGbl->lpModeInfo[i].dwWidth; SurfaceDesc.dwHeight = DevMode.dmPelsHeight;
SurfaceDesc.dwWidth = This->lpLcl->lpGbl->lpModeInfo[i].dwHeight; SurfaceDesc.dwWidth = DevMode.dmPelsWidth;
SurfaceDesc.lPitch = This->lpLcl->lpGbl->lpModeInfo[i].lPitch; SurfaceDesc.lPitch = DevMode.dmPelsWidth * DevMode.dmBitsPerPel / 8;
SurfaceDesc.dwRefreshRate = This->lpLcl->lpGbl->lpModeInfo[i].wRefreshRate; SurfaceDesc.dwRefreshRate = DevMode.dmDisplayFrequency;
SurfaceDesc.ddpfPixelFormat.dwSize = sizeof (DDPIXELFORMAT); SurfaceDesc.ddpfPixelFormat.dwSize = sizeof (DDPIXELFORMAT);
SurfaceDesc.ddpfPixelFormat.dwFlags = DDPF_RGB; SurfaceDesc.ddpfPixelFormat.dwFlags = DDPF_RGB;
SurfaceDesc.ddpfPixelFormat.dwRBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwRBitMask; // FIXME: get these
SurfaceDesc.ddpfPixelFormat.dwGBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwGBitMask; /*
SurfaceDesc.ddpfPixelFormat.dwBBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwBBitMask; SurfaceDesc.ddpfPixelFormat.dwRBitMask =
SurfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwAlphaBitMask; SurfaceDesc.ddpfPixelFormat.dwGBitMask =
SurfaceDesc.ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpGbl->lpModeInfo[i].dwBPP; SurfaceDesc.ddpfPixelFormat.dwBBitMask =
SurfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask =
*/
SurfaceDesc.ddpfPixelFormat.dwRGBBitCount = DevMode.dmBitsPerPel;
// 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)
{ {
continue; //continue; // FIXME2: what is SurfaceDesc.dwRefreshRate supposed to be set to ?
} }
// FIXME: Take case when DDEDM_STANDARDVGAMODES flag is not set in account
if(pDDSD) if(pDDSD)
{ {
if(pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwHeight != SurfaceDesc.dwHeight) if(pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwHeight != SurfaceDesc.dwHeight)
@ -67,7 +77,8 @@ Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags,
continue; // FIXME: test for the other members of ddpfPixelFormat as well continue; // FIXME: test for the other members of ddpfPixelFormat as well
} }
(*pCallback)(&SurfaceDesc, pContext); if((*pCallback)(&SurfaceDesc, pContext) == DDENUMRET_CANCEL)
return DD_OK;
} }
return DD_OK; return DD_OK;