backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00
Code Issues Projects Releases Activity

handle cases where DDSD_WIDTH and DDSD_HEIGHT passed to dd_EnumDisplayModes

Browse Source
This commit is contained in:
FunkyFr3sh 2024-08-28 10:24:00 +02:00
parent e79e076f0a
commit 0884be514d
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/dd.c
View File

@ -27,6 +27,7 @@ HRESULT dd_EnumDisplayModes(
{ {
dbg_dump_edm_flags(dwFlags); dbg_dump_edm_flags(dwFlags);
DDSURFACEDESC2 s = { 0 };
DWORD bpp_filter = 0; DWORD bpp_filter = 0;
if (lpDDSurfaceDesc) if (lpDDSurfaceDesc)
@ -46,12 +47,48 @@ HRESULT dd_EnumDisplayModes(
bpp_filter = lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount; bpp_filter = lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount;
break; break;
} }
if ((lpDDSurfaceDesc->dwFlags & DDSD_WIDTH) && (lpDDSurfaceDesc->dwFlags & DDSD_HEIGHT))
{
TRACE(" dwWidth=%u, dwHeight=%u\n", lpDDSurfaceDesc->dwWidth, lpDDSurfaceDesc->dwHeight);
s.dwSize = sizeof(DDSURFACEDESC);
s.dwFlags = DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT;
s.dwRefreshRate = 60;
s.dwHeight = lpDDSurfaceDesc->dwHeight;
s.dwWidth = lpDDSurfaceDesc->dwWidth;
s.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT);
s.ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB;
s.ddpfPixelFormat.dwRGBBitCount = 8;
if (lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount == 16)
{
s.ddpfPixelFormat.dwFlags = DDPF_RGB;
s.ddpfPixelFormat.dwRGBBitCount = 16;
s.ddpfPixelFormat.dwRBitMask = 0xF800;
s.ddpfPixelFormat.dwGBitMask = 0x07E0;
s.ddpfPixelFormat.dwBBitMask = 0x001F;
}
else if (lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount == 32)
{
s.ddpfPixelFormat.dwFlags = DDPF_RGB;
s.ddpfPixelFormat.dwRGBBitCount = 32;
s.ddpfPixelFormat.dwRBitMask = 0xFF0000;
s.ddpfPixelFormat.dwGBitMask = 0x00FF00;
s.ddpfPixelFormat.dwBBitMask = 0x0000FF;
}
s.lPitch = ((s.dwWidth * s.ddpfPixelFormat.dwRGBBitCount + 63) & ~63) >> 3;
lpEnumModesCallback((LPDDSURFACEDESC)&s, lpContext);
return DD_OK;
}
} }
} }
DWORD i = 0; DWORD i = 0;
DWORD res_count = 0; DWORD res_count = 0;
DDSURFACEDESC2 s;
/* Some games crash when you feed them with too many resolutions so we have to keep the list short */ /* Some games crash when you feed them with too many resolutions so we have to keep the list short */