gdk/win32/gdkprivate-win32.h gdk/win32/gdkglobals-win32.c

2002-11-15  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkprivate-win32.h
	* gdk/win32/gdkglobals-win32.c
	* gdk/win32/gdkmain-win32.c
	* gdk/win32/gdkdrawable-win32.c (generic_draw): Don't check if
	MaskBlt() is present in gdi32.dll, it is, even on Win9x. It just
	always returns failure on Win9x. Instead, call MaskBlt() only if
	we are on NT/2k/XP.

10 files changed, 66 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 3aa7f7c2a..3f87f1f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-15  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkprivate-win32.h
+	* gdk/win32/gdkglobals-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkdrawable-win32.c (generic_draw): Don't check if
+	MaskBlt() is present in gdi32.dll, it is, even on Win9x. It just
+	always returns failure on Win9x. Instead, call MaskBlt() only if
+	we are on NT/2k/XP.
+
 2002-11-14  Tor Lillqvist  <tml@iki.fi>
 
 	Start implementing all fill styles (i.e. tiled, stippled, and
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3aa7f7c2a..3f87f1f0b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2002-11-15  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkprivate-win32.h
+	* gdk/win32/gdkglobals-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkdrawable-win32.c (generic_draw): Don't check if
+	MaskBlt() is present in gdi32.dll, it is, even on Win9x. It just
+	always returns failure on Win9x. Instead, call MaskBlt() only if
+	we are on NT/2k/XP.
+
 2002-11-14  Tor Lillqvist  <tml@iki.fi>
 
 	Start implementing all fill styles (i.e. tiled, stippled, and
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3aa7f7c2a..3f87f1f0b 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+2002-11-15  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkprivate-win32.h
+	* gdk/win32/gdkglobals-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkdrawable-win32.c (generic_draw): Don't check if
+	MaskBlt() is present in gdi32.dll, it is, even on Win9x. It just
+	always returns failure on Win9x. Instead, call MaskBlt() only if
+	we are on NT/2k/XP.
+
 2002-11-14  Tor Lillqvist  <tml@iki.fi>
 
 	Start implementing all fill styles (i.e. tiled, stippled, and
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3aa7f7c2a..3f87f1f0b 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2002-11-15  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkprivate-win32.h
+	* gdk/win32/gdkglobals-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkdrawable-win32.c (generic_draw): Don't check if
+	MaskBlt() is present in gdi32.dll, it is, even on Win9x. It just
+	always returns failure on Win9x. Instead, call MaskBlt() only if
+	we are on NT/2k/XP.
+
 2002-11-14  Tor Lillqvist  <tml@iki.fi>
 
 	Start implementing all fill styles (i.e. tiled, stippled, and
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3aa7f7c2a..3f87f1f0b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2002-11-15  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkprivate-win32.h
+	* gdk/win32/gdkglobals-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkdrawable-win32.c (generic_draw): Don't check if
+	MaskBlt() is present in gdi32.dll, it is, even on Win9x. It just
+	always returns failure on Win9x. Instead, call MaskBlt() only if
+	we are on NT/2k/XP.
+
 2002-11-14  Tor Lillqvist  <tml@iki.fi>
 
 	Start implementing all fill styles (i.e. tiled, stippled, and
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3aa7f7c2a..3f87f1f0b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2002-11-15  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkprivate-win32.h
+	* gdk/win32/gdkglobals-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkdrawable-win32.c (generic_draw): Don't check if
+	MaskBlt() is present in gdi32.dll, it is, even on Win9x. It just
+	always returns failure on Win9x. Instead, call MaskBlt() only if
+	we are on NT/2k/XP.
+
 2002-11-14  Tor Lillqvist  <tml@iki.fi>
 
 	Start implementing all fill styles (i.e. tiled, stippled, and
diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 41fb727ac..abb32d1df 100644
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -545,14 +545,13 @@ generic_draw (GdkDrawable    *drawable,
        * the areas where mask is one. (It is filled with said pattern.)
        */
 
-      if (mask_blt != NULL)
+      if (IS_WIN_NT ())
 	{
-	  if (!(*mask_blt) (hdc, region->extents.x1, region->extents.y1,
-			    width, height,
-			    tile_hdc, 0, 0,
-			    GDK_PIXMAP_HBITMAP (mask_pixmap), 0, 0,
-			    MAKEROP4 (rop2_to_rop3 (gcwin32->rop2), ROP3_D)))
-	    WIN32_GDI_FAILED ("MaskBlt");
+	  GDI_CALL (MaskBlt, (hdc, region->extents.x1, region->extents.y1,
+			      width, height,
+			      tile_hdc, 0, 0,
+			      GDK_PIXMAP_HBITMAP (mask_pixmap), 0, 0,
+			      MAKEROP4 (rop2_to_rop3 (gcwin32->rop2), ROP3_D)));
 	}
       else
 	{
diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c
index 41128a037..410ddc4bb 100644
--- a/gdk/win32/gdkglobals-win32.c
+++ b/gdk/win32/gdkglobals-win32.c
@@ -53,6 +53,3 @@ DWORD		  windows_version;
 
 gint		  gdk_input_ignore_wintab = FALSE;
 gint		  gdk_max_colors = 0;
-
-mask_blt_t	  mask_blt = NULL;
-
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 02ef126f1..a63b89c20 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -86,12 +86,6 @@ _gdk_windowing_init_check (int    argc,
   if (gdk_synchronize)
     GdiSetBatchLimit (1);
 
-  if (!getenv ("NO_MASKBLT"))
-    {
-      mask_blt = GetProcAddress (GetModuleHandle ("gdi32.dll"), "MaskBlt");
-      GDK_NOTE (MISC, g_print ("MaskBlt found %p\n", mask_blt));
-    }
-
   gdk_app_hmodule = GetModuleHandle (NULL);
   gdk_display_hdc = CreateDC ("DISPLAY", NULL, NULL, NULL);
   gdk_root_window = GetDesktopWindow ();
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index fb381548a..1042c0a78 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -492,8 +492,6 @@ extern DWORD		 windows_version;
 extern gboolean		 gdk_input_ignore_wintab;
 extern gint		 gdk_max_colors;
 
-typedef BOOL (WINAPI *mask_blt_t) (HDC, int, int, int, int, HDC, int, int, HBITMAP, int, int, DWORD);
-extern mask_blt_t mask_blt;
 
 #define GDK_WIN32_COLORMAP_DATA(cmap) ((GdkColormapPrivateWin32 *) GDK_COLORMAP (cmap)->windowing_data)