Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove GreatLordisms.

Browse source 
- Slightly improve NtGdiOpenDCW() code (without changing the logic). 

svn path=/trunk/; revision=31008
This commit is contained in:
Aleksey Bragin 2007-12-04 20:07:35 +00:00
parent 6f48e39be2
commit 6117db4db0
1 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
reactos/subsystems/win32/win32k/objects/dc.c
View file

@ -732,25 +732,7 @@ IntGdiCreateDC(PUNICODE_STRING Driver,
RtlInitUnicodeString(&StdDriver, L"DISPLAY"); RtlInitUnicodeString(&StdDriver, L"DISPLAY");
if (Driver != NULL) DPRINT("DriverName: %wZ, DeviceName: %wZ\n", Driver, Device);
{
DPRINT("NAME Driver: %wZ\n", Driver);
}
else
{
DPRINT("NAME Driver: NULL\n", Driver);
}
if (Driver != NULL)
{
DPRINT("NAME Device: %wZ\n", Device);
}
else
{
DPRINT("NAME Device: NULL\n", Device);
}
if (NULL == Driver || 0 == RtlCompareUnicodeString(Driver, &StdDriver, TRUE)) if (NULL == Driver || 0 == RtlCompareUnicodeString(Driver, &StdDriver, TRUE))
{ {
@ -792,12 +774,6 @@ IntGdiCreateDC(PUNICODE_STRING Driver,
return NtGdiCreateCompatibleDC(hDC); return NtGdiCreateCompatibleDC(hDC);
} }
if (Driver != NULL && Driver->Buffer != NULL)
{
if (Driver!=NULL)
DPRINT("NAME: %wZ\n", Driver);
}
/* Allocate a DC object */ /* Allocate a DC object */
if ((hNewDC = DC_AllocDC(Driver)) == NULL) if ((hNewDC = DC_AllocDC(Driver)) == NULL)
{ {
@ -922,10 +898,10 @@ NtGdiOpenDCW( PUNICODE_STRING Device,
} }
} }
Ret = IntGdiCreateDC(NULL == Device ? NULL : &SafeDevice, Ret = IntGdiCreateDC(Device ? &SafeDevice : NULL,
NULL, NULL,
NULL == pUMdhpdev ? NULL : &Dhpdev, pUMdhpdev ? &Dhpdev : NULL,
NULL == InitData ? NULL : &SafeInitData, InitData ? &SafeInitData : NULL,
(BOOL) iType); // FALSE 0 DCW, TRUE 1 ICW (BOOL) iType); // FALSE 0 DCW, TRUE 1 ICW
if (pUMdhpdev) pUMdhpdev = Dhpdev; if (pUMdhpdev) pUMdhpdev = Dhpdev;