backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Fixed a crash in CreateDIBitmap when BITMAPINFO is null

Browse Source
This commit is contained in:
narzoul 2023-03-01 00:24:28 +01:00
parent 841cf3307f
commit bbf926162b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DDrawCompat/Gdi/DcFunctions.cpp
View File

@ -304,12 +304,11 @@ namespace
const void* lpbInit, const BITMAPINFO* lpbmi, UINT fuUsage) const void* lpbInit, const BITMAPINFO* lpbmi, UINT fuUsage)
{ {
LOG_FUNC("CreateDIBitmap", hdc, lpbmih, fdwInit, lpbInit, lpbmi, fuUsage); LOG_FUNC("CreateDIBitmap", hdc, lpbmih, fdwInit, lpbInit, lpbmi, fuUsage);
const DWORD CBM_CREATDIB = 2; if (!g_disableDibRedirection && lpbmih && Gdi::isDisplayDc(hdc))
if (!g_disableDibRedirection && !(fdwInit & CBM_CREATDIB) && lpbmih && Gdi::isDisplayDc(hdc))
{ {
HBITMAP bitmap = Gdi::VirtualScreen::createOffScreenDib( HBITMAP bitmap = Gdi::VirtualScreen::createOffScreenDib(
lpbmi->bmiHeader.biWidth, lpbmi->bmiHeader.biHeight, Win32::DisplayMode::getBpp()); lpbmih->biWidth, lpbmih->biHeight, Win32::DisplayMode::getBpp());
if (bitmap && lpbInit && lpbmi) if ((fdwInit & CBM_INIT) && bitmap && lpbInit && lpbmi)
{ {
SetDIBits(hdc, bitmap, 0, std::abs(lpbmi->bmiHeader.biHeight), lpbInit, lpbmi, fuUsage); SetDIBits(hdc, bitmap, 0, std::abs(lpbmi->bmiHeader.biHeight), lpbInit, lpbmi, fuUsage);
} }