[ros-diffs] [greatlrd] 28469: 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

Author: greatlrd
Date: Thu Aug 23 16:54:09 2007
New Revision: 28469

URL: http://svn.reactos.org/svn/reactos?rev=28469&view=rev
Log:
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

Modified:
    trunk/reactos/dll/win32/gdi32/gdi32.def
    trunk/reactos/dll/win32/gdi32/misc/stubs.c

Modified: trunk/reactos/dll/win32/gdi32/gdi32.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 23 16:54:09 2007
@@ -37,19 +37,21 @@
 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

Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Aug 23 16:54:09 2007
@@ -2432,7 +2432,34 @@
 	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