commit a396029270066741c9db29a428e943dc2080019f
author Alexandre Julliard <julliard@winehq.org> Fri Feb 26 11:11:13 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Feb 26 11:11:13 1999 +0000
tree addb3d2845eedcccaba7bc7b08410af44df43507
parent 314f9609d8e931fceb0eb28aba68a2130ce13acd

Large-scale renaming of all Win32 functions and types to use the
standard Windows names.

graphics/x11drv/bitmap.c

diff --git a/graphics/x11drv/bitmap.c b/graphics/x11drv/bitmap.c
index 077c7ab..de17e60 100644
--- a/graphics/x11drv/bitmap.c
+++ b/graphics/x11drv/bitmap.c
@@ -32,7 +32,7 @@
 /***********************************************************************
  *           X11DRV_BITMAP_Init
  */
-BOOL32 X11DRV_BITMAP_Init(void)
+BOOL X11DRV_BITMAP_Init(void)
 {
     Pixmap tmpPixmap;
     
@@ -66,11 +66,11 @@
 /***********************************************************************
  *           X11DRV_BITMAP_SelectObject
  */
-HBITMAP32 X11DRV_BITMAP_SelectObject( DC * dc, HBITMAP32 hbitmap,
+HBITMAP X11DRV_BITMAP_SelectObject( DC * dc, HBITMAP hbitmap,
                                       BITMAPOBJ * bmp )
 {
-    HRGN32 hrgn;
-    HBITMAP32 prevHandle = dc->w.hBitmap;
+    HRGN hrgn;
+    HBITMAP prevHandle = dc->w.hBitmap;
     X11DRV_PHYSBITMAP *pbitmap;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
@@ -94,11 +94,11 @@
     dc->w.totalExtent.bottom = bmp->bitmap.bmHeight;
 
     if (dc->w.hVisRgn)
-       SetRectRgn32( dc->w.hVisRgn, 0, 0,
+       SetRectRgn( dc->w.hVisRgn, 0, 0,
                      bmp->bitmap.bmWidth, bmp->bitmap.bmHeight );
     else
     { 
-       hrgn = CreateRectRgn32(0, 0, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight);
+       hrgn = CreateRectRgn(0, 0, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight);
        if (!hrgn) return 0;
        dc->w.hVisRgn    = hrgn;
     }
@@ -130,8 +130,8 @@
 {
     BITMAPOBJ *bmp;
     XImage    *image;
-    INT32      width;
-    INT32      height;
+    INT      width;
+    INT      height;
 };
 
 static int XPutImage_wrapper( const struct XPutImage_descr *descr )
@@ -181,7 +181,7 @@
  *
  */
 
-BOOL32 X11DRV_CreateBitmap( HBITMAP32 hbitmap )
+BOOL X11DRV_CreateBitmap( HBITMAP hbitmap )
 {
     X11DRV_PHYSBITMAP *pbitmap;
     BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
@@ -487,7 +487,7 @@
 /***********************************************************************
  *           X11DRV_BitmapBits
  */
-LONG X11DRV_BitmapBits(HBITMAP32 hbitmap, void *bits, LONG count, WORD flags)
+LONG X11DRV_BitmapBits(HBITMAP hbitmap, void *bits, LONG count, WORD flags)
 {
     BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
     LONG ret;
@@ -512,7 +512,7 @@
 /***********************************************************************
  *           X11DRV_BITMAP_DeleteObject
  */
-BOOL32 X11DRV_BITMAP_DeleteObject( HBITMAP32 hbitmap, BITMAPOBJ * bmp )
+BOOL X11DRV_BITMAP_DeleteObject( HBITMAP hbitmap, BITMAPOBJ * bmp )
 {
     X11DRV_PHYSBITMAP *pbitmap = bmp->DDBitmap->physBitmap;