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

Dmitry Timoshkov dmitry at baikal.ru
Mon Jun 25 07:38:46 CDT 2001


Hello.

Changelog:
    Dmitry Timoshkov <dmitry at codeweavers.com>
    Replace some 16-bit calls by their 32-bit equivalents.

diff -u wine/graphics/x11drv/brush.c wine/graphics/x11drv/brush.c
--- cvs/hq/wine/graphics/x11drv/brush.c	Sat May 12 06:12:20 2001
+++ wine/graphics/x11drv/brush.c	Mon Jun 25 05:15:34 2001
@@ -269,7 +269,7 @@
                                         bmpInfo,
                                         (WORD)brush->logbrush.lbColor );
 	    BRUSH_SelectPatternBrush( dc, hBitmap );
-	    DeleteObject16( hBitmap );
+	    DeleteObject( hBitmap );
 	    GlobalUnlock16( (HGLOBAL16)brush->logbrush.lbHatch );	    
 	}
 	
diff -u wine/objects/clipping.c wine/objects/clipping.c
--- cvs/hq/wine/objects/clipping.c	Sat Feb 17 06:45:16 2001
+++ wine/objects/clipping.c	Mon Jun 25 05:16:04 2001
@@ -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 */
         }
diff -u wine/objects/dc.c wine/objects/dc.c
--- cvs/hq/wine/objects/dc.c	Tue Apr 17 02:33:40 2001
+++ wine/objects/dc.c	Mon Jun 25 05:16:14 2001
@@ -392,7 +392,7 @@
     }
     else
     {
-        if (dc->hClipRgn) DeleteObject16( dc->hClipRgn );
+        if (dc->hClipRgn) DeleteObject( dc->hClipRgn );
         dc->hClipRgn = 0;
     }
     CLIPPING_UpdateGCRegion( dc );
diff -u wine/windows/x11drv/event.c wine/windows/x11drv/event.c
--- cvs/hq/wine/windows/x11drv/event.c	Sun Jun 24 08:24:40 2001
+++ wine/windows/x11drv/event.c	Mon Jun 25 05:20:44 2001
@@ -916,11 +916,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);
@@ -930,7 +930,7 @@
                                 (unsigned char *)lpClipData, cBytes);
         TRACE("(Rc=%d)\n", xRc);
         
-        GlobalUnlock16(hClipData);
+        GlobalUnlock(hClipData);
     }
     else
     {






More information about the wine-patches mailing list