Alexandre Julliard : gdi32: Disable SetSolidBrush16 since it requires access to gdi32 internals.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 06e09f67b4c2e72869eac918df853ef16b52032e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=06e09f67b4c2e72869eac918df...

Author: Alexandre Julliard 
Date:   Tue Nov 17 22:29:37 2009 +0100

gdi32: Disable SetSolidBrush16 since it requires access to gdi32 internals.

---

dlls/gdi32/brush.c       |   21 ---------------------
 dlls/gdi32/gdi16.c       |    5 ++---
 dlls/gdi32/gdi_private.h |    3 ---
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c
index 721da98..0202033 100644
--- a/dlls/gdi32/brush.c
+++ b/dlls/gdi32/brush.c
@@ -447,24 +447,3 @@ static INT BRUSH_GetObject( HGDIOBJ handle, INT count, LPVOID buffer )
     GDI_ReleaseObj( handle );
     return count;
 }
-
-/***********************************************************************
- *           BRUSH_SetSolid
- */
-BOOL BRUSH_SetSolid( HGDIOBJ handle, COLORREF new_color )
-{
-    BRUSHOBJ * brushPtr;
-    BOOL res = FALSE;
-
-    if (!(brushPtr = GDI_GetObjPtr( handle, OBJ_BRUSH )))
-	return FALSE;
-
-    if (brushPtr->logbrush.lbStyle == BS_SOLID)
-    {
-        brushPtr->logbrush.lbColor = new_color;
-	res = TRUE;
-    }
-
-    GDI_ReleaseObj( handle );
-    return res;
-}
diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c
index a8644da..4290d8f 100644
--- a/dlls/gdi32/gdi16.c
+++ b/dlls/gdi32/gdi16.c
@@ -3521,9 +3521,8 @@ BOOL16 WINAPI SetLayout16( HDC16 hdc, DWORD layout )
  */
 BOOL16 WINAPI SetSolidBrush16(HBRUSH16 hBrush, COLORREF newColor )
 {
-    TRACE("(hBrush %04x, newColor %08x)\n", hBrush, newColor);
-
-    return BRUSH_SetSolid( HBRUSH_32(hBrush), newColor );
+    FIXME( "%04x %08x no longer supported\n", hBrush, newColor );
+    return FALSE;
 }

diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 9526c9a..bf0f37b 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -359,9 +359,6 @@ extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN;
 extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, DC *dc ) DECLSPEC_HIDDEN;
 extern INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp ) DECLSPEC_HIDDEN;

-/* brush.c */
-extern BOOL BRUSH_SetSolid( HGDIOBJ handle, COLORREF new_color ) DECLSPEC_HIDDEN;
-
 /* clipping.c */
 extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN;