X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Fdll%2Fwin32%2Fgdi32%2Fobjects%2Fdc.c;h=eb9dcf2ff30371e8f65d83c7f0f6bebb1a076835;hp=ddc33e501f1b9689e1a7e44a96aa73760887b909;hb=684c3d3791b92777e7de259fbc6691161f6808c7;hpb=f5258132f4eef483cce5491037d4383f958ce1a2 diff --git a/reactos/dll/win32/gdi32/objects/dc.c b/reactos/dll/win32/gdi32/objects/dc.c index ddc33e501f1..eb9dcf2ff30 100644 --- a/reactos/dll/win32/gdi32/objects/dc.c +++ b/reactos/dll/win32/gdi32/objects/dc.c @@ -15,7 +15,7 @@ IntCreateDICW ( LPCWSTR lpwszDriver, { UNICODE_STRING Device, Output; HDC hDC = NULL; - BOOL Display = FALSE, Default = TRUE; + BOOL Display = FALSE, Default = FALSE; ULONG UMdhpdev = 0; HANDLE hspool = NULL; @@ -31,7 +31,7 @@ IntCreateDICW ( LPCWSTR lpwszDriver, if ((!lpwszDevice) && (!lpwszDriver)) { - Default = FALSE; // Ask Win32k to set Default device. + Default = TRUE; // Ask Win32k to set Default device. Display = TRUE; // Most likely to be DISPLAY. } else @@ -60,7 +60,7 @@ IntCreateDICW ( LPCWSTR lpwszDriver, DPRINT1("Not a DISPLAY device! %wZ\n", &Device); } - hDC = NtGdiOpenDCW( (Default ? &Device : NULL), + hDC = NtGdiOpenDCW( (Default ? NULL : &Device), (PDEVMODEW) lpInitData, (lpwszOutput ? &Output : NULL), iType, // DCW 0 and ICW 1. @@ -318,7 +318,7 @@ WINAPI DeleteObject(HGDIOBJ hObject) { UINT Type = 0; - + /* From Wine: DeleteObject does not SetLastError() on a null object */ if(!hObject) return FALSE; @@ -332,7 +332,7 @@ DeleteObject(HGDIOBJ hObject) Type = GDI_HANDLE_GET_TYPE(hObject); - if ((Type == GDI_OBJECT_TYPE_METAFILE) || + if ((Type == GDI_OBJECT_TYPE_METAFILE) || (Type == GDI_OBJECT_TYPE_ENHMETAFILE)) return FALSE; @@ -348,7 +348,7 @@ DeleteObject(HGDIOBJ hObject) case GDI_OBJECT_TYPE_METADC: return MFDRV_DeleteObject( hObject ); case GDI_OBJECT_TYPE_EMF: - { + { PLDC pLDC = GdiGetLDC(hObject); if ( !pLDC ) return FALSE; return EMFDRV_DeleteObject( hObject ); @@ -533,7 +533,7 @@ GetDeviceCaps(HDC hDC, return NtGdiGetDeviceCaps(hDC,i); } DPRINT("Device CAPS2\n"); - + switch (i) { case DRIVERVERSION: @@ -1603,7 +1603,7 @@ SelectObject(HDC hDC, #if 0 case GDI_OBJECT_TYPE_METADC: - return MFDRV_SelectObject( hDC, hGdiObj); + return MFDRV_SelectObject( hDC, hGdiObj); case GDI_OBJECT_TYPE_EMF: PLDC pLDC = GdiGetLDC(hDC); if ( !pLDC ) return NULL;