[ros-diffs] [gadamopoulos] 74452: [GDI32] -Add a public undocgdi.h file to keep the definitions for undocumented exports. For now it only contains GdiDrawStream.

Author: gadamopoulos
Date: Wed May  3 10:55:54 2017
New Revision: 74452

URL: http://svn.reactos.org/svn/reactos?rev=74452&view=rev
Log:
[GDI32] -Add a public undocgdi.h file to keep the definitions for undocumented exports.
For now it only contains GdiDrawStream.

Added:
    trunk/reactos/sdk/include/reactos/undocgdi.h   (with props)
Modified:
    trunk/reactos/win32ss/gdi/gdi32/include/precomp.h
    trunk/reactos/win32ss/gdi/gdi32/misc/misc.c

Added: trunk/reactos/sdk/include/reactos/undocgdi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/undocg…
==============================================================================
--- trunk/reactos/sdk/include/reactos/undocgdi.h	(added)
+++ trunk/reactos/sdk/include/reactos/undocgdi.h	[iso-8859-1] Wed May  3 10:55:54 2017
@@ -0,0 +1,33 @@
+
+#ifndef _UNDOCGDI_H
+#define _UNDOCGDI_H
+
+#define DS_TILE 0x2
+#define DS_TRANSPARENTALPHA 0x4
+#define DS_TRANSPARENTCLR 0x8
+#define DS_TRUESIZE 0x20
+
+typedef struct GDI_DRAW_STREAM_TAG
+{
+    DWORD   signature;     // must be 0x44727753;//"Swrd"
+    DWORD   reserved;      // must be 0
+    HDC     hDC;           // handle to the device object of windiw to draw.
+    RECT    rcDest;        // desination rect of dc to draw.
+    DWORD   unknown1;      // must be 1.
+    HBITMAP hImage;
+    DWORD   unknown2;      // must be 9.
+    RECT    rcClip;
+    RECT    rcSrc;         // source rect of bitmap to draw.
+    DWORD   drawOption;    // DS_ flags
+    DWORD   leftSizingMargin;
+    DWORD   rightSizingMargin;
+    DWORD   topSizingMargin;
+    DWORD   bottomSizingMargin;
+    DWORD   crTransparent; // transparent color.
+} GDI_DRAW_STREAM, *PGDI_DRAW_STREAM;
+
+BOOL
+WINAPI
+GdiDrawStream(HDC dc, ULONG l, PGDI_DRAW_STREAM pDS);
+
+#endif

Propchange: trunk/reactos/sdk/include/reactos/undocgdi.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/…
==============================================================================
--- trunk/reactos/win32ss/gdi/gdi32/include/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/gdi32/include/precomp.h	[iso-8859-1] Wed May  3 10:55:54
2017
@@ -56,4 +56,6 @@
 /* Deprecated NTGDI calls which shouldn't exist */
 #include <ntgdibad.h>
 
+#include <undocgdi.h>
+
 #endif /* _GDI32_PCH_ */

Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/mis…
==============================================================================
--- trunk/reactos/win32ss/gdi/gdi32/misc/misc.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/gdi32/misc/misc.c	[iso-8859-1] Wed May  3 10:55:54 2017
@@ -282,26 +282,6 @@
     int cyTopHeight;
     int cyBottomHeight;
 } MARGINS, *PMARGINS;
-
-typedef struct GDI_DRAW_STREAM_TAG
-{
-	DWORD   signature;     // must be 0x44727753;//"Swrd"
-	DWORD   reserved;      // must be 0
-	HDC     hDC;           // handle to the device object of windiw to draw.
-	RECT    rcDest;        // desination rect of window to draw.
-	DWORD   unknown1;      // must be 1.
-	HBITMAP hImage;
-	DWORD   unknown2;      // must be 9.
-	RECT    rcClip;        // desination rect of window to draw.
-	RECT    rcSrc;         // source rect of bitmap to draw.
-	DWORD   drawOption;    // 0x2 is tile instead of stretch. 0x4 is transparent. 0x20 is
true size
-	DWORD   leftSizingMargin;
-	DWORD   rightSizingMargin;
-	DWORD   topSizingMargin;
-	DWORD   bottomSizingMargin;
-	DWORD   crTransparent; // transparent color.
-
-} GDI_DRAW_STREAM, *PGDI_DRAW_STREAM;
 
 enum SIZINGTYPE {
     ST_TRUESIZE = 0,
@@ -683,16 +663,16 @@
         INT transparent = 0;
         int sizingtype;
 
-        if (pDS->drawOption & 0x4)
+        if (pDS->drawOption & DS_TRANSPARENTALPHA)
             transparent = ALPHABLEND_FULL;
-        else if (pDS->drawOption & 0x8)
+        else if (pDS->drawOption & DS_TRANSPARENTCLR)
             transparent = ALPHABLEND_BINARY;
         else 
             transparent = ALPHABLEND_NONE;
 
-        if (pDS->drawOption & 0x2)
+        if (pDS->drawOption & DS_TILE)
             sizingtype = ST_TILE;
-        else if (pDS->drawOption & 0x20)
+        else if (pDS->drawOption & DS_TRUESIZE)
             sizingtype = ST_TRUESIZE;
         else
             sizingtype = ST_STRETCH;