From 439c9ab21546674b50b3af44167e65c5f12a7bd6 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Thu, 30 Aug 2007 20:55:31 +0000
Subject: [PATCH] implement : GetBoundsRect remove redirect for follow api for
 they are need more stuff in user mode GetBkColor, GetBkMode, GetBrushOrgEx,
 GetCharABCWidthsFloatW

svn path=/trunk/; revision=28687
---
 reactos/dll/win32/gdi32/gdi32.def    | 22 +++++-----
 reactos/dll/win32/gdi32/misc/stubs.c | 63 ++++++++++++++++++++++++----
 2 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def
index 3e6f0e5a929..7ae35335579 100644
--- a/reactos/dll/win32/gdi32/gdi32.def
+++ b/reactos/dll/win32/gdi32/gdi32.def
@@ -276,6 +276,18 @@ GdiTransparentBlt@44
 GdiValidateHandle@4
 GetArcDirection@4
 GetAspectRatioFilterEx@8
+GetBitmapBits@12=NtGdiGetBitmapBits@12
+GetBitmapDimensionEx@8=NtGdiGetBitmapDimension@8
+GetBkColor@4
+GetBkMode@4
+GetBoundsRect@12
+GetBrushOrgEx@8
+GetCharABCWidthsA@16
+GetCharABCWidthsFloatA@16
+GetCharABCWidthsFloatW@16
+GetCharABCWidthsI@20
+
+
 
 ClearBitmapAttributes@8
 ClearBrushAttributes@8
@@ -337,17 +349,7 @@ DdEntry55@12=NtGdiDdUpdateOverlay@12
 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8
 GdiDrawStream@12
 GetBitmapAttributes@4
-GetBitmapBits@12=NtGdiGetBitmapBits@12
-GetBitmapDimensionEx@8=NtGdiGetBitmapDimension@8
-GetBkColor@4=NtGdiGetBkColor@4
-GetBkMode@4=NtGdiGetBkMode@4
-GetBoundsRect@12
 GetBrushAttributes@4
-GetBrushOrgEx@8=NtGdiGetBrushOrgEx@8
-GetCharABCWidthsA@16
-GetCharABCWidthsFloatA@16
-GetCharABCWidthsFloatW@16=NtGdiGetCharABCWidthsFloat@16
-GetCharABCWidthsI@20
 GetCharABCWidthsW@16=NtGdiGetCharABCWidths@16
 GetCharWidth32A@16
 GetCharWidth32W@16=NtGdiGetCharWidth32@16
diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c
index 0241cd619dd..72c50ea8e6d 100644
--- a/reactos/dll/win32/gdi32/misc/stubs.c
+++ b/reactos/dll/win32/gdi32/misc/stubs.c
@@ -100,19 +100,17 @@ ExtCreateRegion(
 
 
 /*
- * @unimplemented
+ * @implemented
  */
 UINT
 STDCALL
 GetBoundsRect(
-	HDC	a0,
-	LPRECT	a1,
-	UINT	a2
+	HDC	hdc,
+	LPRECT	lprcBounds,
+	UINT	flags
 	)
 {
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
+    return NtGdiGetBoundsRect(hdc,lprcBounds,flags & DCB_RESET);
 }
 
 
@@ -1441,7 +1439,7 @@ GdiConvertPalette(HPALETTE hpal)
 }
 
 /*
- * @unimplemented
+ * @implemented
  */
 HRGN
 STDCALL
@@ -2783,3 +2781,52 @@ GdiConvertBitmapV5(
     return FALSE;
 }
 
+
+/*
+ * @implemented
+ *
+ */
+COLORREF 
+STDCALL 
+GetBkColor(HDC hdc)
+{
+    /* FIXME some part are done in user mode */
+    return NtGdiGetBkColor(hdc);
+}
+
+/*
+ * @implemented
+ *
+ */
+int
+STDCALL 
+GetBkMode(HDC hdc)
+{
+    /* FIXME some part are done in user mode */
+    return NtGdiGetBkMode(hdc);
+}
+
+/*
+ * @implemented
+ *
+ */
+BOOL 
+STDCALL 
+GetBrushOrgEx(HDC hdc,LPPOINT pt)
+{
+    /* FIXME some part are done in user mode */
+    return NtGdiGetBrushOrgEx(hdc,pt);
+}
+
+/*
+ * @implemented
+ *
+ */
+BOOL 
+STDCALL 
+GetCharABCWidthsFloatW(HDC hdc,UINT FirstChar,UINT LastChar,LPABCFLOAT abcF)
+{
+    /* FIXME some part are done in user mode */
+    return NtGdiGetCharABCWidthsFloat(hdc, FirstChar, LastChar, abcF);
+}
+