Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-12 18:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing two fail from wine gdi32 test, When HDC is NULL to NtGdiCreateDIBitmap we need create a hdc and delete the hdc when we are done.

Browse source 
svn path=/trunk/; revision=22010
This commit is contained in:
Magnus Olsen 2006-05-24 16:54:51 +00:00
parent 8954d82145
commit 050efa1da2
1 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
reactos/subsystems/win32/win32k/objects/dibobj.c
View file

@ -759,16 +759,40 @@ HBITMAP STDCALL NtGdiCreateDIBitmap(HDC hDc, const BITMAPINFOHEADER *Header,
PDC Dc; PDC Dc;
HBITMAP Bmp; HBITMAP Bmp;
Dc = DC_LockDc(hDc);
if (NULL == Dc) if (NULL == hDc)
{ {
hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE);
if (hDc == NULL)
{
SetLastWin32Error(ERROR_INVALID_HANDLE);
return NULL;
}
Dc = DC_LockDc(hDc);
if (Dc == NULL)
{
NtGdiDeleteObjectApp(hDc);
SetLastWin32Error(ERROR_INVALID_HANDLE); SetLastWin32Error(ERROR_INVALID_HANDLE);
return NULL; return NULL;
} }
Bmp = IntCreateDIBitmap(Dc, Header, Init, Bits, Data, ColorUse); Bmp = IntCreateDIBitmap(Dc, Header, Init, Bits, Data, ColorUse);
DC_UnlockDc(Dc); DC_UnlockDc(Dc);
NtGdiDeleteObjectApp(hDc);
}
else
{
Dc = DC_LockDc(hDc);
if (Dc == NULL)
{
SetLastWin32Error(ERROR_INVALID_HANDLE);
return NULL;
}
Bmp = IntCreateDIBitmap(Dc, Header, Init, Bits, Data, ColorUse);
DC_UnlockDc(Dc);
}
return Bmp; return Bmp;
} }