From 698ef15b19b53cf5edb5175783c6588f5b20939d Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@codeweavers.com>
Date: Mon, 25 Jun 2001 20:08:44 +0000
Subject: [PATCH] Replace some 16-bit calls by their 32-bit equivalents.

---
 graphics/x11drv/brush.c   | 2 +-
 graphics/x11drv/objects.c | 2 +-
 objects/clipping.c        | 2 +-
 objects/dc.c              | 2 +-
 windows/x11drv/event.c    | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/graphics/x11drv/brush.c b/graphics/x11drv/brush.c
index 2dba09431ad..de1b0a80431 100644
--- a/graphics/x11drv/brush.c
+++ b/graphics/x11drv/brush.c
@@ -269,7 +269,7 @@ HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
                                         bmpInfo,
                                         (WORD)brush->logbrush.lbColor );
 	    BRUSH_SelectPatternBrush( dc, hBitmap );
-	    DeleteObject16( hBitmap );
+	    DeleteObject( hBitmap );
 	    GlobalUnlock16( (HGLOBAL16)brush->logbrush.lbHatch );	    
 	}
 	
diff --git a/graphics/x11drv/objects.c b/graphics/x11drv/objects.c
index cb5377c525e..e91f6b69387 100644
--- a/graphics/x11drv/objects.c
+++ b/graphics/x11drv/objects.c
@@ -54,7 +54,7 @@ HGDIOBJ X11DRV_SelectObject( DC *dc, HGDIOBJ handle )
 	  ret = X11DRV_FONT_SelectObject( dc, handle, (FONTOBJ *)ptr );	  
 	  break;
       case REGION_MAGIC:
-	  ret = (HGDIOBJ16)SelectClipRgn16( dc->hSelf, handle );
+	  ret = (HGDIOBJ)SelectClipRgn( dc->hSelf, handle );
 	  break;
     }
     GDI_ReleaseObj( handle );
diff --git a/objects/clipping.c b/objects/clipping.c
index aae8acfc22a..4bd60ddad7d 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -80,7 +80,7 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode )
     {
         if (fnMode == RGN_COPY)
         {
-            if (dc->hClipRgn) DeleteObject16( dc->hClipRgn );
+            if (dc->hClipRgn) DeleteObject( dc->hClipRgn );
             dc->hClipRgn = 0;
             retval = SIMPLEREGION; /* Clip region == whole DC */
         }
diff --git a/objects/dc.c b/objects/dc.c
index f5709f81aee..22f5084f37b 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -392,7 +392,7 @@ void WINAPI SetDCState16( HDC16 hdc, HDC16 hdcs )
     }
     else
     {
-        if (dc->hClipRgn) DeleteObject16( dc->hClipRgn );
+        if (dc->hClipRgn) DeleteObject( dc->hClipRgn );
         dc->hClipRgn = 0;
     }
     CLIPPING_UpdateGCRegion( dc );
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index f54e6630c75..973343effdc 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -901,11 +901,11 @@ static Atom EVENT_SelectionRequest_WCF( Display *display, Window requestor,
           itemFmtName, wFormat, CLIPBOARD_GetFormatName( wFormat));
     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",
               TSXGetAtomName(display, rprop), cBytes);
@@ -915,7 +915,7 @@ static Atom EVENT_SelectionRequest_WCF( Display *display, Window requestor,
                                 (unsigned char *)lpClipData, cBytes);
         TRACE("(Rc=%d)\n", xRc);
         
-        GlobalUnlock16(hClipData);
+        GlobalUnlock(hClipData);
     }
     else
     {