commit 698ef15b19b53cf5edb5175783c6588f5b20939d
author Dmitry Timoshkov <dmitry@codeweavers.com> Mon Jun 25 20:08:44 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jun 25 20:08:44 2001 +0000
tree 4a01d9fe2d914fa0086d20552750e91f689c6160
parent f9037de2ae1d72a0c748ebc60b66e9b2d1d19025

Replace some 16-bit calls by their 32-bit equivalents.

graphics/x11drv/brush.c

diff --git a/graphics/x11drv/brush.c b/graphics/x11drv/brush.c
index 2dba094..de1b0a8 100644
--- a/graphics/x11drv/brush.c
+++ b/graphics/x11drv/brush.c
@@ -269,7 +269,7 @@
                                         bmpInfo,
                                         (WORD)brush->logbrush.lbColor );
 	    BRUSH_SelectPatternBrush( dc, hBitmap );
-	    DeleteObject16( hBitmap );
+	    DeleteObject( hBitmap );
 	    GlobalUnlock16( (HGLOBAL16)brush->logbrush.lbHatch );	    
 	}
 	

graphics/x11drv/objects.c

diff --git a/graphics/x11drv/objects.c b/graphics/x11drv/objects.c
index cb5377c..e91f6b6 100644
--- a/graphics/x11drv/objects.c
+++ b/graphics/x11drv/objects.c
@@ -54,7 +54,7 @@
 	  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 );

objects/clipping.c

diff --git a/objects/clipping.c b/objects/clipping.c
index aae8acf..4bd60dd 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -80,7 +80,7 @@
     {
         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 */
         }

objects/dc.c

diff --git a/objects/dc.c b/objects/dc.c
index f5709f8..22f5084 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -392,7 +392,7 @@
     }
     else
     {
-        if (dc->hClipRgn) DeleteObject16( dc->hClipRgn );
+        if (dc->hClipRgn) DeleteObject( dc->hClipRgn );
         dc->hClipRgn = 0;
     }
     CLIPPING_UpdateGCRegion( dc );

windows/x11drv/event.c

diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index f54e663..973343e 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -901,11 +901,11 @@
           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 @@
                                 (unsigned char *)lpClipData, cBytes);
         TRACE("(Rc=%d)\n", xRc);
         
-        GlobalUnlock16(hClipData);
+        GlobalUnlock(hClipData);
     }
     else
     {