diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2001-02-21 21:37:18 +0000 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2001-02-21 21:37:18 +0000 |
| commit | 0b0a9f40872a274fb46f6e60566614ace735f2ac (patch) | |
| tree | 316a56eb9182c01cb0ef6f611c9e6872f3c74653 /winsup/w32api/include/wingdi.h | |
| parent | b701af168c787548e57b55678928830da76c7935 (diff) | |
| download | cygnal-0b0a9f40872a274fb46f6e60566614ace735f2ac.tar.gz cygnal-0b0a9f40872a274fb46f6e60566614ace735f2ac.tar.bz2 cygnal-0b0a9f40872a274fb46f6e60566614ace735f2ac.zip | |
* include/wingdi.h (struct _DOCINFO[AW]): UNICODE it.
(StartDoc[AW]): Use UNICODE'd LPDOCINFO[AW]
* include/winuser.h (struct tagMOUSEKEYS): Define new structure.
* include/winerror.h (NTE_*): Add CryptoAPI error codes.
Diffstat (limited to 'winsup/w32api/include/wingdi.h')
| -rw-r--r-- | winsup/w32api/include/wingdi.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index f155d2329..4b817f8e8 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -1349,13 +1349,20 @@ typedef struct tagDIBSECTION { HANDLE dshSection; DWORD dsOffset; } DIBSECTION; -typedef struct { +typedef struct _DOCINFOA { int cbSize; LPCTSTR lpszDocName; LPCTSTR lpszOutput; LPCTSTR lpszDatatype; DWORD fwType; -} DOCINFO,*LPDOCINFO; +} DOCINFOA,*LPDOCINFOA; +typedef struct _DOCINFOW { + int cbSize; + LPCWSTR lpszDocName; + LPCWSTR lpszOutput; + LPCWSTR lpszDatatype; + DWORD fwType; +} DOCINFOW,*LPDOCINFOW; typedef struct tagEMR { DWORD iType; DWORD nSize; @@ -2646,8 +2653,8 @@ BOOL WINAPI SetWindowExtEx(HDC,int,int,LPSIZE); BOOL WINAPI SetWindowOrgEx(HDC,int,int,LPPOINT); HENHMETAFILE WINAPI SetWinMetaFileBits(UINT,const BYTE*,HDC,const METAFILEPICT*); BOOL WINAPI SetWorldTransform(HDC,const XFORM *); -int WINAPI StartDocA(HDC,const DOCINFO*); -int WINAPI StartDocW(HDC,const DOCINFO*); +int WINAPI StartDocA(HDC,const LPDOCINFOA); +int WINAPI StartDocW(HDC,const LPDOCINFOW); int WINAPI StartPage(HDC); BOOL WINAPI StretchBlt(HDC,int,int,int,int,HDC,int,int,int,int,DWORD); int WINAPI StretchDIBits(HDC,int,int,int,int,int,int,int,int,const VOID *,const BITMAPINFO *,UINT,DWORD); @@ -2683,6 +2690,7 @@ BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMET #ifdef UNICODE typedef WCHAR BCHAR; +typedef DOCINFOW DOCINFO, *LPDOCINFO; typedef LOGFONTW LOGFONT,*PLOGFONT,*LPLOGFONT; typedef TEXTMETRICW TEXTMETRIC,*PTEXTMETRIC,*LPTEXTMETRIC; #define ICMENUMPROC ICMENUMPROCW @@ -2744,6 +2752,7 @@ typedef ENUMLOGFONTEXW ENUMLOGFONTEX,*LPENUMLOGFONTEX; #define wglUseFontOutlines wglUseFontOutlinesW #else typedef BYTE BCHAR; +typedef DOCINFOW DOCINFO, *LPDOCINFO; typedef LOGFONTA LOGFONT,*PLOGFONT,*LPLOGFONT; typedef TEXTMETRICA TEXTMETRIC,*PTEXTMETRIC,*LPTEXTMETRIC; #define ICMENUMPROC ICMENUMPROCA |