Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:42:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix creation of display-compatible DCs

Browse source 
svn path=/trunk/; revision=6855
This commit is contained in:
Gé van Geldorp 2003-12-03 19:28:23 +00:00
parent 4db35a9424
commit e11e69e45f
1 changed files with 55 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

121
reactos/subsys/win32k/objects/dc.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: dc.c,v 1.104 2003/11/30 18:55:57 gvg Exp $ /* $Id: dc.c,v 1.105 2003/12/03 19:28:23 gvg Exp $
* *
* DC.C - Device context functions * DC.C - Device context functions
* *
@ -131,26 +131,38 @@ NtGdiCreateCompatableDC(HDC hDC)
{ {
PDC NewDC, OrigDC; PDC NewDC, OrigDC;
HBITMAP hBitmap; HBITMAP hBitmap;
HDC hNewDC; HDC hNewDC, DisplayDC;
HRGN hVisRgn; HRGN hVisRgn;
BITMAPOBJ *pb; BITMAPOBJ *pb;
PSURFGDI SurfGDI;
if (hDC == NULL) if (hDC == NULL)
{ {
return NtGdiCreateDC(L"DISPLAY", NULL, NULL, NULL); DisplayDC = NtGdiCreateDC(L"DISPLAY", NULL, NULL, NULL);
if (NULL == DisplayDC)
{
return NULL;
}
hDC = DisplayDC;
} }
/* Allocate a new DC based on the original DC's device */ /* Allocate a new DC based on the original DC's device */
OrigDC = DC_LockDc(hDC); OrigDC = DC_LockDc(hDC);
if (NULL == OrigDC) if (NULL == OrigDC)
{ {
if (NULL != DisplayDC)
{
NtGdiDeleteDC(DisplayDC);
}
return NULL; return NULL;
} }
hNewDC = DC_AllocDC(OrigDC->DriverName); hNewDC = DC_AllocDC(OrigDC->DriverName);
if (NULL == hNewDC) if (NULL == hNewDC)
{ {
if (NULL != DisplayDC)
{
NtGdiDeleteDC(DisplayDC);
}
return NULL; return NULL;
} }
NewDC = DC_LockDc( hNewDC ); NewDC = DC_LockDc( hNewDC );
@ -158,55 +170,38 @@ NtGdiCreateCompatableDC(HDC hDC)
/* Copy information from original DC to new DC */ /* Copy information from original DC to new DC */
NewDC->hSelf = NewDC; NewDC->hSelf = NewDC;
/* FIXME: Should this DC request its own PDEV? */ NewDC->PDev = OrigDC->PDev;
if(OrigDC == NULL) NewDC->DMW = OrigDC->DMW;
{ memcpy(NewDC->FillPatternSurfaces,
NewDC->PDev = PrimarySurface.PDev; OrigDC->FillPatternSurfaces,
memcpy(NewDC->FillPatternSurfaces, PrimarySurface.FillPatterns, sizeof OrigDC->FillPatternSurfaces);
sizeof(NewDC->FillPatternSurfaces)); NewDC->GDIInfo = OrigDC->GDIInfo;
NewDC->GDIInfo = &PrimarySurface.GDIInfo; NewDC->DevInfo = OrigDC->DevInfo;
NewDC->DevInfo = &PrimarySurface.DevInfo; NewDC->w.bitsPerPixel = OrigDC->w.bitsPerPixel;
SurfGDI = (PSURFGDI)AccessInternalObject((ULONG) PrimarySurface.Handle);
NewDC->w.bitsPerPixel = SurfGDI->BitsPerPixel;
}
else
{
NewDC->PDev = OrigDC->PDev;
NewDC->DMW = OrigDC->DMW;
memcpy(NewDC->FillPatternSurfaces,
OrigDC->FillPatternSurfaces,
sizeof OrigDC->FillPatternSurfaces);
NewDC->GDIInfo = OrigDC->GDIInfo;
NewDC->DevInfo = OrigDC->DevInfo;
NewDC->w.bitsPerPixel = OrigDC->w.bitsPerPixel;
}
/* DriverName is copied in the AllocDC routine */ /* DriverName is copied in the AllocDC routine */
if(OrigDC == NULL) NewDC->DeviceDriver = OrigDC->DeviceDriver;
{ NewDC->wndOrgX = OrigDC->wndOrgX;
NewDC->DeviceDriver = (HANDLE) PrimarySurface.VideoDeviceObject; NewDC->wndOrgY = OrigDC->wndOrgY;
} NewDC->wndExtX = OrigDC->wndExtX;
else NewDC->wndExtY = OrigDC->wndExtY;
{ NewDC->vportOrgX = OrigDC->vportOrgX;
NewDC->DeviceDriver = OrigDC->DeviceDriver; NewDC->vportOrgY = OrigDC->vportOrgY;
NewDC->wndOrgX = OrigDC->wndOrgX; NewDC->vportExtX = OrigDC->vportExtX;
NewDC->wndOrgY = OrigDC->wndOrgY; NewDC->vportExtY = OrigDC->vportExtY;
NewDC->wndExtX = OrigDC->wndExtX;
NewDC->wndExtY = OrigDC->wndExtY;
NewDC->vportOrgX = OrigDC->vportOrgX;
NewDC->vportOrgY = OrigDC->vportOrgY;
NewDC->vportExtX = OrigDC->vportExtX;
NewDC->vportExtY = OrigDC->vportExtY;
}
/* Create default bitmap */ /* Create default bitmap */
if (!(hBitmap = NtGdiCreateBitmap( 1, 1, 1, NewDC->w.bitsPerPixel, NULL ))) if (!(hBitmap = NtGdiCreateBitmap( 1, 1, 1, NewDC->w.bitsPerPixel, NULL )))
{ {
DC_UnlockDc( hDC ); DC_UnlockDc( hDC );
DC_UnlockDc( hNewDC ); DC_UnlockDc( hNewDC );
DC_FreeDC( hNewDC ); DC_FreeDC( hNewDC );
return NULL; if (NULL != DisplayDC)
} {
NtGdiDeleteDC(DisplayDC);
}
return NULL;
}
NewDC->w.flags = DC_MEMORY; NewDC->w.flags = DC_MEMORY;
NewDC->w.hBitmap = hBitmap; NewDC->w.hBitmap = hBitmap;
NewDC->w.hFirstBitmap = hBitmap; NewDC->w.hFirstBitmap = hBitmap;
@ -214,23 +209,17 @@ NtGdiCreateCompatableDC(HDC hDC)
NewDC->Surface = BitmapToSurf(pb); NewDC->Surface = BitmapToSurf(pb);
BITMAPOBJ_UnlockBitmap(hBitmap); BITMAPOBJ_UnlockBitmap(hBitmap);
if(OrigDC == NULL) NewDC->w.hPalette = OrigDC->w.hPalette;
{ NewDC->w.textColor = OrigDC->w.textColor;
NewDC->w.hPalette = NewDC->DevInfo->hpalDefault; NewDC->w.textAlign = OrigDC->w.textAlign;
} NewDC->w.backgroundColor = OrigDC->w.backgroundColor;
else NewDC->w.backgroundMode = OrigDC->w.backgroundMode;
{ DC_UnlockDc( hDC );
NewDC->w.hPalette = OrigDC->w.hPalette; if (NULL != DisplayDC)
NewDC->w.textColor = OrigDC->w.textColor; {
NewDC->w.textAlign = OrigDC->w.textAlign; NtGdiDeleteDC(DisplayDC);
NewDC->w.backgroundColor = OrigDC->w.backgroundColor; }
NewDC->w.backgroundMode = OrigDC->w.backgroundMode; DC_UnlockDc(hNewDC);
}
if (NULL != hDC)
{
DC_UnlockDc( hDC );
}
DC_UnlockDc( hNewDC );
hVisRgn = NtGdiCreateRectRgn(0, 0, 1, 1); hVisRgn = NtGdiCreateRectRgn(0, 0, 1, 1);
NtGdiSelectVisRgn(hNewDC, hVisRgn); NtGdiSelectVisRgn(hNewDC, hVisRgn);
@ -238,7 +227,7 @@ NtGdiCreateCompatableDC(HDC hDC)
DC_InitDC(hNewDC); DC_InitDC(hNewDC);
return hNewDC; return hNewDC;
} }
static BOOL FASTCALL static BOOL FASTCALL