Changeset 10316 for trunk/include

Timestamp:

Nov 12, 2003, 3:13:26 PM (22 years ago)

Author:

sandervl

Message:

Visible & Clip region changes

Location:

trunk/include

Files:

• dcdata.h (modified) (4 diffs)
• win32api.h (modified) (1 diff)
• win32type.h (modified) (1 diff)
• winconst.h (modified) (1 diff)
• wingdi32.h (modified) (1 diff)

trunk/include/dcdata.h

@@ -1 @@
-/* $Id: dcdata.h,v 1.3 2001-01-09 18:14:44 sandervl Exp $ */
 /*
  * GDI32: public dc data definitions
@@ -12 +11 @@
 #ifndef __DCDATA_H__
 #define __DCDATA_H__
+
+//Flags for Reserved DWORD in DCData structure
+#define DC_FLAG_SEND_POSTSCRIPT_SETUP_STRING    1
+#define DC_FLAG_POLYGON_PRINTER_HACK            2
 
 enum PS_Type { MICRO_CACHED, MICRO, NORMAL };
@@ -148 +151 @@
    POINTL      windowOrg;
    SIZEL       windowExt;
-   HRGN        hrgnVis;
+   HRGN        hrgnWin32Clip;   //current Win32 clip region handle
 
    POINTL      ptlOrigin;
@@ -184 +187 @@
    int         yInvert;
    int         yInvert4Enable;
+
+   ULONG       Reserved;
+
+   HRGN        hrgnWinVis;      //current Win32 visible region handle
    struct      _DCData *nextHPS_HDC;
 } tDCData, *pDCData;

trunk/include/win32api.h

@@ -240 +240 @@
 
 HANDLE    WINAPI GetCurrentObject(HDC,UINT);
+BOOL      WIN32API ValidateRgn( HWND hwnd, HRGN  hrgn);
+BOOL      WIN32API ValidateRect( HWND hwnd, const RECT * lprc);
+int       WIN32API GetRgnBox( HRGN  hrgn, PRECT pRect);
 
 #endif

trunk/include/win32type.h

@@ -1319 +1319 @@
 typedef VOID (CALLBACK *TIMERPROC)(HWND hwnd, UINT msg, UINT id, DWORD dwTime);
 
-#endif
+typedef struct
+{
+    unsigned short  fract;
+    signed short   value;
+} FIXED_W;
+
+
+typedef struct
+{
+    FIXED_W  eM11;
+    FIXED_W  eM12;
+    FIXED_W  eM21;
+    FIXED_W  eM22;
+} MAT2, *LPMAT2;
+
+typedef struct
+{
+    UINT        gmBlackBoxX;
+    UINT        gmBlackBoxY;
+    POINT       gmptGlyphOrigin;
+    INT16       gmCellIncX;
+    INT16       gmCellIncY;
+} GLYPHMETRICS, *LPGLYPHMETRICS;
+
+typedef struct
+{
+    INT  lfHeight;
+    INT  lfWidth;
+    INT  lfEscapement;
+    INT  lfOrientation;
+    INT  lfWeight;
+    BYTE   lfItalic;
+    BYTE   lfUnderline;
+    BYTE   lfStrikeOut;
+    BYTE   lfCharSet;
+    BYTE   lfOutPrecision;
+    BYTE   lfClipPrecision;
+    BYTE   lfQuality;
+    BYTE   lfPitchAndFamily;
+    CHAR   lfFaceName[32];
+} LOGFONTA, *PLOGFONTA, *LPLOGFONTA;
+
+typedef struct
+{
+    UINT   lopnStyle;
+    POINT  lopnWidth;
+    ULONG  lopnColor;
+} LOGPEN_W, *LPLOGPEN_W;
+
+typedef struct tagEXTLOGPEN
+{
+    DWORD elpPenStyle;
+    DWORD elpWidth;
+    DWORD elpBrushStyle;
+    DWORD elpColor;
+    DWORD elpNumEntries;
+    DWORD elpStyleEntry[1];
+} EXTLOGPEN_W, *PEXTLOGPEN_W, *NPEXTLOGPEN_W, *LPEXTLOGPEN_W;
+
+typedef struct
+{
+    UINT   lbStyle;
+    ULONG  lbColor;
+    INT    lbHatch;
+} LOGBRUSH_W, *LPLOGBRUSH_W;
+
+typedef struct
+{
+    HDC   hdc;
+    BOOL  fErase;
+    RECT  rcPaint;
+    BOOL  fRestore;
+    BOOL  IncUpdate;
+    BYTE  rgbReserved[32];
+} PAINTSTRUCT_W, *PPAINTSTRUCT_W, *LPPAINTSTRUCT_W;
+
+
+#endif

trunk/include/winconst.h

@@ -2041 +2041 @@
 #define OBJ_ENHMETAFILE_W     13
 
+#define PS_SOLID_W         0x00000000
+#define PS_DASH_W          0x00000001
+#define PS_DOT_W           0x00000002
+#define PS_DASHDOT_W       0x00000003
+#define PS_DASHDOTDOT_W    0x00000004
+#define PS_NULL_W          0x00000005
+#define PS_INSIDEFRAME_W   0x00000006
+#define PS_USERSTYLE_W     0x00000007
+#define PS_ALTERNATE_W     0x00000008
+#define PS_STYLE_MASK_W    0x0000000f
+
+/* DC Graphics Mode */
+#define GM_COMPATIBLE_W     1
+#define GM_ADVANCED_W       2
+
+#define DCX_WINDOW_W                    0x00000001L
+#define DCX_CACHE_W                     0x00000002L
+#define DCX_NORESETATTRS_W              0x00000004L
+#define DCX_CLIPCHILDREN_W              0x00000008L
+#define DCX_CLIPSIBLINGS_W              0x00000010L
+#define DCX_PARENTCLIP_W                0x00000020L
+#define DCX_EXCLUDERGN_W                0x00000040L
+#define DCX_INTERSECTRGN_W              0x00000080L
+#define DCX_EXCLUDEUPDATE_W             0x00000100L
+#define DCX_INTERSECTUPDATE_W           0x00000200L
+#define DCX_LOCKWINDOWUPDATE_W          0x00000400L
+#define DCX_USESTYLE_W                  0x00010000L
+#define DCX_VALIDATE_W                  0x00200000L
+
+#define RDW_INVALIDATE_W       0x0001
+#define RDW_INTERNALPAINT_W    0x0002
+#define RDW_ERASE_W            0x0004
+#define RDW_VALIDATE_W         0x0008
+#define RDW_NOINTERNALPAINT_W  0x0010
+#define RDW_NOERASE_W          0x0020
+#define RDW_NOCHILDREN_W       0x0040
+#define RDW_ALLCHILDREN_W      0x0080
+#define RDW_UPDATENOW_W        0x0100
+#define RDW_ERASENOW_W         0x0200
+#define RDW_FRAME_W            0x0400
+#define RDW_NOFRAME_W          0x0800
+/* Xform FLAGS */
+#define MWT_IDENTITY_W        1
+#define MWT_LEFTMULTIPLY_W    2
+#define MWT_RIGHTMULTIPLY_W   3
+
+/* Mapping Modes */
+#define MM_TEXT_W             1
+#define MM_LOMETRIC_W         2
+#define MM_HIMETRIC_W         3
+#define MM_LOENGLISH_W        4
+#define MM_HIENGLISH_W        5
+#define MM_TWIPS_W            6
+#define MM_ISOTROPIC_W        7
+#define MM_ANISOTROPIC_W      8
+
+#define RGN_OR_W              2
+
+/* Window scrolling */
+#define SW_SCROLLCHILDREN_W    0x0001
+#define SW_INVALIDATE_W        0x0002
+#define SW_ERASE_W             0x0004
+#define SW_SMOOTHSCROLL_W      0x0010
+
 #endif //__WINCONST_H__

trunk/include/wingdi32.h

@@ -11 +11 @@
 
 BOOL WIN32API setWinDeviceRegionFromPMDeviceRegion(HRGN winHrgn, HRGN pmHrgn, pDCData pHpsPmHrgn, HWND hwndPmHrgn);
+
+INT  WIN32API GdiCombineVisRgn(pDCData pHps, HRGN hrgn, INT operation);
+INT  WIN32API GdiSetVisRgn(pDCData pHps, HRGN hrgn);
+INT  WIN32API GdiCombineVisRgnClipRgn(pDCData pHps, HRGN hrgn, INT operation);
+
 VOID WIN32API UnselectGDIObjects(HDC hdc);
 BOOL OSLibGpiSetCp(HDC hdc, ULONG codepage);