Replace some 16-bit calls by their 32-bit equivalents.
This commit is contained in:
parent
f9037de2ae
commit
698ef15b19
|
@ -269,7 +269,7 @@ HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
|
||||||
bmpInfo,
|
bmpInfo,
|
||||||
(WORD)brush->logbrush.lbColor );
|
(WORD)brush->logbrush.lbColor );
|
||||||
BRUSH_SelectPatternBrush( dc, hBitmap );
|
BRUSH_SelectPatternBrush( dc, hBitmap );
|
||||||
DeleteObject16( hBitmap );
|
DeleteObject( hBitmap );
|
||||||
GlobalUnlock16( (HGLOBAL16)brush->logbrush.lbHatch );
|
GlobalUnlock16( (HGLOBAL16)brush->logbrush.lbHatch );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ HGDIOBJ X11DRV_SelectObject( DC *dc, HGDIOBJ handle )
|
||||||
ret = X11DRV_FONT_SelectObject( dc, handle, (FONTOBJ *)ptr );
|
ret = X11DRV_FONT_SelectObject( dc, handle, (FONTOBJ *)ptr );
|
||||||
break;
|
break;
|
||||||
case REGION_MAGIC:
|
case REGION_MAGIC:
|
||||||
ret = (HGDIOBJ16)SelectClipRgn16( dc->hSelf, handle );
|
ret = (HGDIOBJ)SelectClipRgn( dc->hSelf, handle );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
GDI_ReleaseObj( handle );
|
GDI_ReleaseObj( handle );
|
||||||
|
|
|
@ -80,7 +80,7 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode )
|
||||||
{
|
{
|
||||||
if (fnMode == RGN_COPY)
|
if (fnMode == RGN_COPY)
|
||||||
{
|
{
|
||||||
if (dc->hClipRgn) DeleteObject16( dc->hClipRgn );
|
if (dc->hClipRgn) DeleteObject( dc->hClipRgn );
|
||||||
dc->hClipRgn = 0;
|
dc->hClipRgn = 0;
|
||||||
retval = SIMPLEREGION; /* Clip region == whole DC */
|
retval = SIMPLEREGION; /* Clip region == whole DC */
|
||||||
}
|
}
|
||||||
|
|
|
@ -392,7 +392,7 @@ void WINAPI SetDCState16( HDC16 hdc, HDC16 hdcs )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (dc->hClipRgn) DeleteObject16( dc->hClipRgn );
|
if (dc->hClipRgn) DeleteObject( dc->hClipRgn );
|
||||||
dc->hClipRgn = 0;
|
dc->hClipRgn = 0;
|
||||||
}
|
}
|
||||||
CLIPPING_UpdateGCRegion( dc );
|
CLIPPING_UpdateGCRegion( dc );
|
||||||
|
|
|
@ -901,11 +901,11 @@ static Atom EVENT_SelectionRequest_WCF( Display *display, Window requestor,
|
||||||
itemFmtName, wFormat, CLIPBOARD_GetFormatName( wFormat));
|
itemFmtName, wFormat, CLIPBOARD_GetFormatName( wFormat));
|
||||||
TSXFree(itemFmtName);
|
TSXFree(itemFmtName);
|
||||||
|
|
||||||
hClipData = GetClipboardData16(wFormat);
|
hClipData = GetClipboardData(wFormat);
|
||||||
|
|
||||||
if( hClipData && (lpClipData = GlobalLock16(hClipData)) )
|
if( hClipData && (lpClipData = GlobalLock(hClipData)) )
|
||||||
{
|
{
|
||||||
cBytes = GlobalSize16(hClipData);
|
cBytes = GlobalSize(hClipData);
|
||||||
|
|
||||||
TRACE("\tUpdating property %s, %d bytes...\n",
|
TRACE("\tUpdating property %s, %d bytes...\n",
|
||||||
TSXGetAtomName(display, rprop), cBytes);
|
TSXGetAtomName(display, rprop), cBytes);
|
||||||
|
@ -915,7 +915,7 @@ static Atom EVENT_SelectionRequest_WCF( Display *display, Window requestor,
|
||||||
(unsigned char *)lpClipData, cBytes);
|
(unsigned char *)lpClipData, cBytes);
|
||||||
TRACE("(Rc=%d)\n", xRc);
|
TRACE("(Rc=%d)\n", xRc);
|
||||||
|
|
||||||
GlobalUnlock16(hClipData);
|
GlobalUnlock(hClipData);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue