From d216c026b22e368dd6cb7ca5b8ea5c10586fb527 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Sun, 23 Sep 2007 14:35:40 +0000
Subject: [PATCH] Fix : UnrealizeObject behoivr as windows 2000/XP see msdn
 http://msdn2.microsoft.com/en-us/library/ms532602.aspx Redirect :
 XFORMOBJ_bApplyXform@20 to NtGdiXFORMOBJ_bApplyXform@20 Redirect :
 XFORMOBJ_iGetXform@8 to NtGdiXFORMOBJ_iGetXform@8 Redirect :
 XLATEOBJ_cGetPalette@16 to NtGdiXLATEOBJ_cGetPalette@16 Redirect :
 XLATEOBJ_hGetColorTransform@4 to NtGdiXLATEOBJ_hGetColorTransform@4

svn path=/trunk/; revision=29163
---
 reactos/dll/win32/gdi32/gdi32.def    | 22 +++++-----
 reactos/dll/win32/gdi32/misc/stubs.c | 65 ++++------------------------
 2 files changed, 19 insertions(+), 68 deletions(-)

diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def
index c54af953afa..bb8f7ed9ece 100644
--- a/reactos/dll/win32/gdi32/gdi32.def
+++ b/reactos/dll/win32/gdi32/gdi32.def
@@ -536,7 +536,16 @@ SwapBuffers@4
 TextOutA@20
 TextOutW@20
 TranslateCharsetInfo@12
-
+UnloadNetworkFonts@4
+UnrealizeObject@4
+UpdateColors@4
+UpdateICMRegKeyA@16
+UpdateICMRegKeyW@16
+WidenPath@4
+XFORMOBJ_bApplyXform@20=NtGdiXFORMOBJ_bApplyXform@20
+XFORMOBJ_iGetXform@8=NtGdiXFORMOBJ_iGetXform@8
+XLATEOBJ_cGetPalette@16=NtGdiXLATEOBJ_cGetPalette@16
+XLATEOBJ_hGetColorTransform@4=NtGdiXLATEOBJ_hGetColorTransform@4
 
 
 ClearBitmapAttributes@8
@@ -605,17 +614,6 @@ GetTextExtentExPointWPri@28
 GetTextExtentPoint32A@16
 SetBitmapAttributes@8
 SetBrushAttributes@8
-UnrealizeObject@4
-UnloadNetworkFonts@4
-UpdateColors@4
-UpdateICMRegKeyA@16
-UpdateICMRegKeyA@16
-UpdateICMRegKeyW@16
-WidenPath@4
-XFORMOBJ_bApplyXform@20
-XFORMOBJ_iGetXform@8
-XLATEOBJ_cGetPalette@16
-XLATEOBJ_hGetColorTransform@4
 XLATEOBJ_iXlate@8
 XLATEOBJ_piVector@4
 bInitSystemAndFontsDirectoriesW@8
diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c
index a7cd81490d6..05c98db53a6 100644
--- a/reactos/dll/win32/gdi32/misc/stubs.c
+++ b/reactos/dll/win32/gdi32/misc/stubs.c
@@ -911,11 +911,16 @@ ScaleWindowExtEx(
  */
 BOOL
 STDCALL
-UnrealizeObject(
-	HGDIOBJ	a0
-	)
+UnrealizeObject(HGDIOBJ  hgdiobj)
 {
-	return NtGdiUnrealizeObject(a0);
+    BOOL retValue = TRUE;
+
+    if (GDI_HANDLE_GET_TYPE(hgdiobj) != GDI_OBJECT_TYPE_BRUSH)
+    {
+        retValue = NtGdiUnrealizeObject(hgdiobj);
+    }
+
+    return retValue;
 }
 
 
@@ -2338,58 +2343,6 @@ EngWideCharToMultiByte( UINT CodePage,
                          NULL);
 }
 
-/*
- * @unimplemented
- */
-BOOL STDCALL
-XFORMOBJ_bApplyXform(XFORMOBJ *pxo,
-                     ULONG iMode,
-                     ULONG cPoints,
-                     PVOID pvIn,
-                     PVOID pvOut)
-{
-    UNIMPLEMENTED;
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-/*
- * @unimplemented
- */
-ULONG STDCALL
-XFORMOBJ_iGetXform(XFORMOBJ *pxo,
-                   XFORML *pxform)
-{
-    UNIMPLEMENTED;
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-/*
- * @unimplemented
- */
-ULONG
-STDCALL
-XLATEOBJ_cGetPalette(XLATEOBJ *XlateObj,
-                     ULONG PalOutType,
-                     ULONG cPal,
-                     ULONG *OutPal)
-{
-    UNIMPLEMENTED;
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-/*
- * @unimplemented
- */
-HANDLE STDCALL
-XLATEOBJ_hGetColorTransform(XLATEOBJ *pxlo)
-{
-    UNIMPLEMENTED;
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
 
 /*
  * @unimplemented