* Replace NtGdiCreatePatternBrush and NtGdiCreateHatchBrush with NtGdiCreatePatternBrushInteral and NtGdiCreateHatchBrushInteral
* Implement CreateHatchBrush, CreatePatternBrush

Modified: trunk/reactos/include/win32k/ntgdibad.h
Modified: trunk/reactos/lib/gdi32/gdi32.def
Modified: trunk/reactos/lib/gdi32/objects/brush.c
Modified: trunk/reactos/subsys/win32k/objects/brush.c
Modified: trunk/reactos/tools/nci/w32ksvc.db

--- trunk/reactos/include/win32k/ntgdibad.h	2006-01-08 20:02:26 UTC (rev 20725)
+++ trunk/reactos/include/win32k/ntgdibad.h	2006-01-08 20:08:38 UTC (rev 20726)
@@ -281,12 +281,6 @@

 	LPCWSTR		Description
 	);
 

-/* Use NtGdiCreateHatchBrushInternal with FALSE at the end. */
-HBRUSH STDCALL
-NtGdiCreateHatchBrush(
-   INT Style,
-   COLORREF Color);
-

 /* Metafiles are user mode */
 HDC
 STDCALL
@@ -301,11 +295,6 @@

 	CONST PLOGPALETTE	lgpl
 	);
 

-/* Use NtGdiCreatePatternBrushInternal with false, false at the end. */
-HBRUSH STDCALL
-NtGdiCreatePatternBrush(
-   HBITMAP hBitmap);
-

 /* Use NtGdiCreatePen with -> as parameters. */
 HPEN STDCALL
 NtGdiCreatePenIndirect(

--- trunk/reactos/lib/gdi32/gdi32.def	2006-01-08 20:02:26 UTC (rev 20725)
+++ trunk/reactos/lib/gdi32/gdi32.def	2006-01-08 20:08:38 UTC (rev 20726)
@@ -72,13 +72,13 @@

 CreateFontIndirectW@4
 CreateFontW@56
 CreateHalftonePalette@4=NtGdiCreateHalftonePalette@4

-CreateHatchBrush@8=NtGdiCreateHatchBrush@8

+CreateHatchBrush@8

 CreateICA@16
 CreateICW@16
 CreateMetaFileA@4
 CreateMetaFileW@4
 CreatePalette@4=NtGdiCreatePalette@4

-CreatePatternBrush@4=NtGdiCreatePatternBrush@4

+CreatePatternBrush@4

 CreatePen@12=NtGdiCreatePen@12
 CreatePenIndirect@4=NtGdiCreatePenIndirect@4
 CreatePolyPolygonRgn@16=NtGdiCreatePolyPolygonRgn@16

--- trunk/reactos/lib/gdi32/objects/brush.c	2006-01-08 20:02:26 UTC (rev 20725)
+++ trunk/reactos/lib/gdi32/objects/brush.c	2006-01-08 20:08:38 UTC (rev 20726)
@@ -82,6 +82,27 @@

  */
 HBRUSH
 STDCALL

+CreateHatchBrush(INT fnStyle,
+                 COLORREF clrref)
+{
+    return NtGdiCreateHatchBrushInternal(fnStyle, clrref, FALSE);
+}
+
+/*
+ * @implemented
+ */
+HBRUSH
+STDCALL
+CreatePatternBrush(HBITMAP hbmp)
+{
+    return NtGdiCreatePatternBrushInternal(hbmp, FALSE, FALSE);
+}
+
+/*
+ * @implemented
+ */
+HBRUSH
+STDCALL

 CreateSolidBrush(IN COLORREF crColor)
 {
     /* Call Server-Side API */
@@ -111,8 +132,15 @@

          break;
 
       case BS_PATTERN:

+         hBrush = NtGdiCreatePatternBrushInternal((HBITMAP)LogBrush->lbHatch, 
+                                                  FALSE, 
+                                                  FALSE);
+         break;
+

       case BS_PATTERN8X8:

-         hBrush = NtGdiCreatePatternBrush((HBITMAP)LogBrush->lbHatch);

+         hBrush = NtGdiCreatePatternBrushInternal((HBITMAP)LogBrush->lbHatch, 
+                                                  FALSE, 
+                                                  TRUE);

          break;
 
       case BS_SOLID:
@@ -120,7 +148,9 @@

          break;
 
       case BS_HATCHED:

-         hBrush = NtGdiCreateHatchBrush(LogBrush->lbHatch, LogBrush->lbColor);

+         hBrush = NtGdiCreateHatchBrushInternal(LogBrush->lbHatch, 
+                                                LogBrush->lbColor, 
+                                                FALSE);

          break;
          
       case BS_NULL:

--- trunk/reactos/subsys/win32k/objects/brush.c	2006-01-08 20:02:26 UTC (rev 20725)
+++ trunk/reactos/subsys/win32k/objects/brush.c	2006-01-08 20:08:38 UTC (rev 20726)
@@ -608,16 +608,19 @@

 }
 
 HBRUSH STDCALL

-NtGdiCreateHatchBrush(
-   INT Style,
-   COLORREF Color)

+NtGdiCreateHatchBrushInternal(
+   ULONG Style,
+   COLORREF Color,
+   BOOL bPen)

 {
    return IntGdiCreateHatchBrush(Style, Color);
 }
 
 HBRUSH STDCALL

-NtGdiCreatePatternBrush(
-   HBITMAP hBitmap)

+NtGdiCreatePatternBrushInternal(
+   HBITMAP hBitmap,
+   BOOL bPen,
+   BOOL b8x8)

 {
    return IntGdiCreatePatternBrush(hBitmap);
 }

--- trunk/reactos/tools/nci/w32ksvc.db	2006-01-08 20:02:26 UTC (rev 20725)
+++ trunk/reactos/tools/nci/w32ksvc.db	2006-01-08 20:08:38 UTC (rev 20726)
@@ -35,11 +35,11 @@

 NtGdiCreateFont				14
 NtGdiCreateFontIndirect			1
 NtGdiCreateHalftonePalette		1

-NtGdiCreateHatchBrush			2

+NtGdiCreateHatchBrushInternal		3

 NtGdiCreateIC				4
 NtGdiCreateMetaFile			1
 NtGdiCreatePalette			1

-NtGdiCreatePatternBrush			1

+NtGdiCreatePatternBrushInternal	3

 NtGdiCreatePen				3
 NtGdiCreatePenIndirect			1
 NtGdiCreatePolygonRgn			3