From ed494d70d2abefcba46e8af5dbccb2e6479d6a9a Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Thu, 23 Aug 2007 12:54:09 +0000
Subject: [PATCH] remove redirect of CombineRgn and CreateBitmap some part are
 need be done in user mode. not in win32k, implement it as stub, and doing the
 syscall until some got time review and rewrite this code right

svn path=/trunk/; revision=28469
---
 reactos/dll/win32/gdi32/gdi32.def    | 12 +++++++-----
 reactos/dll/win32/gdi32/misc/stubs.c | 27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def
index bb41ef7c1a4..857d0117c06 100644
--- a/reactos/dll/win32/gdi32/gdi32.def
+++ b/reactos/dll/win32/gdi32/gdi32.def
@@ -37,19 +37,21 @@ Chord@36
 CloseEnhMetaFile@4
 CloseFigure@4
 CloseMetaFile@4
-
-ClearBitmapAttributes@8
-ClearBrushAttributes@8
 ColorCorrectPalette@16
 ColorMatchToTarget@12
-CombineRgn@16=NtGdiCombineRgn@16
+CombineRgn@16
 CombineTransform@12=NtGdiCombineTransform@12
 CopyEnhMetaFileA@8
 CopyEnhMetaFileW@8
 CopyMetaFileA@8
 CopyMetaFileW@8
-CreateBitmap@20=NtGdiCreateBitmap@20
+CreateBitmap@20
 CreateBitmapIndirect@4
+
+ClearBitmapAttributes@8
+ClearBrushAttributes@8
+CopyMetaFileA@8
+CopyMetaFileW@8
 CreateBrushIndirect@4
 CreateColorSpaceA@4
 CreateColorSpaceW@4
diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c
index 1e3c2f7613a..47b13a6f140 100644
--- a/reactos/dll/win32/gdi32/misc/stubs.c
+++ b/reactos/dll/win32/gdi32/misc/stubs.c
@@ -2432,7 +2432,34 @@ GdiResetDCEMF(
 	return 0;
 }
 
+/*
+ * @unimplemented
+ */
+INT
+STDCALL
+CombineRgn(HRGN  hDest,
+                    HRGN  hSrc1,
+                    HRGN  hSrc2,
+                    INT  CombineMode)
+{
+    /* FIXME some part should be done in user mode */
+    return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); 
+}
 
+/*
+ * @unimplemented
+ */
+HBITMAP STDCALL
+CreateBitmap(
+    INT  Width,
+    INT  Height,
+    UINT  Planes,
+    UINT  BitsPixel,
+    PCVOID pUnsafeBits)
+{
+    /* FIXME some part should be done in user mode */
+    return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits);
+}
 
 /*
  * @unimplemented