Changeset 10294 for trunk/include/win

Timestamp:

Oct 24, 2003, 4:46:29 PM (22 years ago)

Author:

sandervl

Message:

update

Location:

trunk/include/win

Files:

• winbase.h (modified) (1 diff)
• wine/winuser16.h (modified) (1 diff)
• wingdi.h (modified) (5 diffs)
• winuser.h (modified) (2 diffs)

trunk/include/win/winbase.h

@@ -264 +264 @@
 #define INVALID_HANDLE_VALUE  ((HANDLE) -1)
 #define INVALID_SET_FILE_POINTER ((DWORD)-1)
+#define INVALID_FILE_ATTRIBUTES  ((DWORD)-1)
 
 /* comm */

trunk/include/win/wine/winuser16.h

@@ -944 +944 @@
 VOID        WINAPI DisableSystemTimers16(void);
 VOID        WINAPI EnableSystemTimers16(void);
-DWORD       WINAPI GetFileResourceSize16(LPCSTR,SEGPTR,SEGPTR,LPDWORD);
-DWORD       WINAPI GetFileResource16(LPCSTR,SEGPTR,SEGPTR,DWORD,DWORD,LPVOID);
+DWORD       WINAPI GetFileResourceSize16(LPCSTR,LPCSTR,LPCSTR,LPDWORD);
+DWORD       WINAPI GetFileResource16(LPCSTR,LPCSTR,LPCSTR,DWORD,DWORD,LPVOID);
 BYTE        WINAPI GetTempDrive(BYTE);
 FARPROC16   WINAPI SetTaskSignalProc(HTASK16,FARPROC16);

trunk/include/win/wingdi.h

@@ -278 +278 @@
 #define ENCAPSULATED_POSTSCRIPT 4116
 
+#define POSTSCRIPT_IDENTIFY          4117
+#define POSTSCRIPT_INJECTION         4118
+
+#define CHECKJPEGFORMAT              4119
+#define CHECKPNGFORMAT               4120
+
+#define GET_PS_FEATURESETTING        4121
+
+#define SPCLPASSTHROUGH2             4568
+
+#define PSIDENT_GDICENTRIC    0
+#define PSIDENT_PSCENTRIC     1
+
+typedef struct _PSINJECTDATA {
+    DWORD   DataBytes;      /* number of raw data bytes (NOT including this header) */
+    WORD    InjectionPoint; /* injection point */
+    WORD    PageNumber;     /* page number to apply the injection */
+    /* Followed by raw data to be injected */
+} PSINJECTDATA, *PPSINJECTDATA;
+
+#define PSINJECT_BEGINSTREAM                1
+#define PSINJECT_PSADOBE                    2
+#define PSINJECT_PAGESATEND                 3
+#define PSINJECT_PAGES                      4
+#define PSINJECT_DOCNEEDEDRES               5
+#define PSINJECT_DOCSUPPLIEDRES             6
+#define PSINJECT_PAGEORDER                  7
+#define PSINJECT_ORIENTATION                8
+#define PSINJECT_BOUNDINGBOX                9
+#define PSINJECT_DOCUMENTPROCESSCOLORS      10
+#define PSINJECT_COMMENTS                   11
+#define PSINJECT_BEGINDEFAULTS              12
+#define PSINJECT_ENDDEFAULTS                13
+#define PSINJECT_BEGINPROLOG                14
+#define PSINJECT_ENDPROLOG                  15
+#define PSINJECT_BEGINSETUP                 16
+#define PSINJECT_ENDSETUP                   17
+#define PSINJECT_TRAILER                    18
+#define PSINJECT_EOF                        19
+#define PSINJECT_ENDSTREAM                  20
+#define PSINJECT_DOCUMENTPROCESSCOLORSATEND 21
+
+#define PSINJECT_PAGENUMBER                 100
+#define PSINJECT_BEGINPAGESETUP             101
+#define PSINJECT_ENDPAGESETUP               102
+#define PSINJECT_PAGETRAILER                103
+#define PSINJECT_PLATECOLOR                 104
+#define PSINJECT_SHOWPAGE                   105
+#define PSINJECT_PAGEBBOX                   106
+#define PSINJECT_ENDPAGECOMMENTS            107
+
+#define PSINJECT_VMSAVE                     200
+#define PSINJECT_VMRESTORE                  201
+
+#define FEATURESETTING_NUP         0
+#define FEATURESETTING_OUTPUT      1
+#define FEATURESETTING_PSLEVEL     2
+#define FEATURESETTING_CUSTPAPER   3
+#define FEATURESETTING_MIRROR      4
+#define FEATURESETTING_NEGATIVE    5
+#define FEATURESETTING_PROTOCOL    6
+
+typedef struct _PSFEATURE_OUTPUT {
+    BOOL bPageIndependent;
+    BOOL bSetPageDevice;
+} PSFEATURE_OUTPUT, *PPSFEATURE_OUTPUT;
+
+typedef struct _PSFEATURE_CUSTPAPER {
+    LONG lOrientation;
+    LONG lWidth;
+    LONG lHeight;
+    LONG lWidthOffset;
+    LONG lHeightOffset;
+} PSFEATURE_CUSTPAPER, *PPSFEATURE_CUSTPAPER;
+
+#define PSPROTOCOL_ASCII             0
+#define PSPROTOCOL_BCP               1
+#define PSPROTOCOL_TBCP              2
+#define PSPROTOCOL_BINARY            3
+
 /* Spooler Error Codes */
 #define SP_NOTREPORTED  0x4000
@@ -1173 +1253 @@
     DWORD  lStructSize;
     LPWSTR lpOutString;
-    UINT *lpOrder;
-    INT  *lpDx;
-    INT  *lpCaretPos;
-    LPWSTR lpClass;
-    UINT *lpGlyphs;
-    UINT nGlyphs;
-    UINT nMaxFit;
+    UINT   *lpOrder;
+    INT    *lpDx;
+    INT    *lpCaretPos;
+    LPSTR  lpClass;
+    LPWSTR lpGlyphs;
+    UINT   nGlyphs;
+    UINT   nMaxFit;
 } GCP_RESULTSW, *LPGCP_RESULTSW;
 
@@ -1271 +1351 @@
 #define SIMPLEREGION      2
 #define COMPLEXREGION     3
+
+#define SYSRGN            4
 
 #define RGN_AND           1
@@ -3158 +3240 @@
 INT       WINAPI GetPixelFormat(HDC);
 INT       WINAPI GetPolyFillMode(HDC);
+INT       WINAPI GetRandomRgn(HDC hdc, HRGN hrgn, INT iNum);
 BOOL      WINAPI GetRasterizerCaps(LPRASTERIZER_STATUS,UINT);
 DWORD       WINAPI GetRegionData(HRGN,DWORD,LPRGNDATA);
@@ -3186 +3269 @@
 BOOL      WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW);
 #define GetTextMetrics WINELIB_NAME_AW(GetTextMetrics)
+
+DWORD     WINAPI GetGlyphIndicesA(HDC,LPCSTR,INT,LPWORD,DWORD);
+DWORD     WINAPI GetGlyphIndicesW(HDC,LPCWSTR,INT,LPWORD,DWORD);
 
 BOOL      WINAPI GetViewportExtEx(HDC,LPSIZE);

trunk/include/win/winuser.h

@@ -3319 +3319 @@
 BOOL      WINAPI EnumThreadWindows(DWORD,WNDENUMPROC,LPARAM);
 BOOL      WINAPI ExitWindowsEx(UINT,DWORD);
+HWND      WINAPI GetAncestor( HWND hwnd, UINT type );
 BOOL      WINAPI GetGUIThreadInfo(DWORD dwThreadId, GUITHREADINFO *lpThreadInfo);
 BOOL      WINAPI GetIconInfo(HICON,LPICONINFO);
@@ -3333 +3334 @@
 #define     GetMonitorInfo WINELIB_NAME_AW(GetMonitorInfo)
 DWORD       WINAPI GetWindowContextHelpId(HWND);
+
+UINT WIN32API GetWindowModuleFileNameA(HWND hwnd, LPTSTR lpszFileName, UINT cchFileNameMax);
+UINT WIN32API GetWindowModuleFileNameW(HWND hwnd, LPWSTR lpszFileName, UINT cchFileNameMax);
+#define     GetWindowModuleFileName WINELIB_NAME_AW(GetWindowModuleFileName)
+
 DWORD       WINAPI GetWindowThreadProcessId(HWND,LPDWORD);
 BOOL      WINAPI IsWindowUnicode(HWND);