mirror of
https://github.com/reactos/wine.git
synced 2024-11-25 12:49:45 +00:00
Get rid of a few 16-bit exports in gdi32.
This commit is contained in:
parent
7fc37b1670
commit
7fd58cb13f
@ -426,12 +426,9 @@
|
||||
@ stdcall DrvSetPrinterData16(str str long ptr long)
|
||||
@ stdcall ExcludeVisRect16(long long long long long)
|
||||
@ stdcall GetDCState16(long)
|
||||
@ stdcall InquireVisRgn16(long)
|
||||
@ stdcall IntersectVisRect16(long long long long long)
|
||||
@ stdcall IsDCCurrentPalette16(long)
|
||||
@ stdcall OpenJob16(str str long)
|
||||
@ stdcall RestoreVisRgn16(long)
|
||||
@ stdcall SaveVisRgn16(long)
|
||||
@ stdcall SelectVisRgn16(long long)
|
||||
@ stdcall SetDCHook(long ptr long)
|
||||
@ stdcall SetDCOrg16(long long long)
|
||||
|
@ -377,7 +377,8 @@ BOOL TTYDRV_GetDC( HWND hwnd, HDC hdc, HRGN hrgn, DWORD flags )
|
||||
|
||||
SetDCOrg16( HDC_16(hdc), org.x, org.y );
|
||||
|
||||
if (SetHookFlags16( HDC_16(hdc), DCHF_VALIDATEVISRGN )) /* DC was dirty */
|
||||
if (SetHookFlags16( HDC_16(hdc), DCHF_VALIDATEVISRGN ) || /* DC was dirty */
|
||||
( flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN) ))
|
||||
{
|
||||
if (flags & DCX_PARENTCLIP)
|
||||
{
|
||||
@ -410,25 +411,15 @@ BOOL TTYDRV_GetDC( HWND hwnd, HDC hdc, HRGN hrgn, DWORD flags )
|
||||
hrgnVisible = DCE_GetVisRgn( hwnd, flags, 0, 0 );
|
||||
OffsetRgn( hrgnVisible, org.x, org.y );
|
||||
}
|
||||
|
||||
/* apply additional region operation (if any) */
|
||||
if( flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN) )
|
||||
CombineRgn( hrgnVisible, hrgnVisible, hrgn,
|
||||
(flags & DCX_INTERSECTRGN) ? RGN_AND : RGN_DIFF );
|
||||
|
||||
SelectVisRgn16( HDC_16(hdc), HRGN_16(hrgnVisible) );
|
||||
}
|
||||
|
||||
/* apply additional region operation (if any) */
|
||||
|
||||
if( flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN) )
|
||||
{
|
||||
if( !hrgnVisible ) hrgnVisible = CreateRectRgn( 0, 0, 0, 0 );
|
||||
|
||||
TRACE("\tsaved VisRgn, clipRgn = %p\n", hrgn);
|
||||
|
||||
SaveVisRgn16( HDC_16(hdc) );
|
||||
CombineRgn( hrgnVisible, hrgn, 0, RGN_COPY );
|
||||
OffsetRgn( hrgnVisible, org.x, org.y );
|
||||
CombineRgn( hrgnVisible, HRGN_32(InquireVisRgn16(HDC_16(hdc))), hrgnVisible,
|
||||
(flags & DCX_INTERSECTRGN) ? RGN_AND : RGN_DIFF );
|
||||
SelectVisRgn16(HDC_16(hdc), HRGN_16(hrgnVisible));
|
||||
}
|
||||
|
||||
if (hrgnVisible) DeleteObject( hrgnVisible );
|
||||
|
||||
WIN_ReleaseWndPtr( wndPtr );
|
||||
|
Loading…
Reference in New Issue
Block a user