* 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.
This commit is contained in:
Earnie Boyd
parent
b701af168c
commit
0b0a9f4087
|
|
@ -1,4 +1,11 @@
|
|||
|
||||
2001-02-21 Danny Smith <dannysmith@users.sourceforge.net>
|
||||
|
||||
* 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.
|
||||
|
||||
2001-02-21 Danny Smith <dannysmith@users.sourceforge.net>
|
||||
|
||||
* include/mswsock.h: New file.
|
||||
|
|
|
|||
|
|
@ -687,6 +687,7 @@
|
|||
#define GetScode(hr) ((SCODE) (hr))
|
||||
#define ResultFromScode(sc) ((HRESULT) (sc))
|
||||
#define PropagateResult(hrPrevious, scBase) ((HRESULT) scBase)
|
||||
|
||||
#define NOERROR S_OK
|
||||
#define E_UNEXPECTED 0x8000FFFFL
|
||||
#define E_NOTIMPL 0x80004001L
|
||||
|
|
@ -1009,4 +1010,40 @@
|
|||
#define RPC_E_WRONG_THREAD 0x8001010EL
|
||||
#define RPC_E_THREAD_NOT_INIT 0x8001010FL
|
||||
#define RPC_E_UNEXPECTED 0x8001FFFFL
|
||||
|
||||
#define NTE_BAD_UID 0x80090001L
|
||||
#define NTE_BAD_HASH 0x80090002L
|
||||
#define NTE_BAD_KEY 0x80090003L
|
||||
#define NTE_BAD_LEN 0x80090004L
|
||||
#define NTE_BAD_DATA 0x80090005L
|
||||
#define NTE_BAD_SIGNATURE 0x80090006L
|
||||
#define NTE_BAD_VER 0x80090007L
|
||||
#define NTE_BAD_ALGID 0x80090008L
|
||||
#define NTE_BAD_FLAGS 0x80090009L
|
||||
#define NTE_BAD_TYPE 0x8009000AL
|
||||
#define NTE_BAD_KEY_STATE 0x8009000BL
|
||||
#define NTE_BAD_HASH_STATE 0x8009000CL
|
||||
#define NTE_NO_KEY 0x8009000DL
|
||||
#define NTE_NO_MEMORY 0x8009000EL
|
||||
#define NTE_EXISTS 0x8009000FL
|
||||
#define NTE_PERM 0x80090010L
|
||||
#define NTE_NOT_FOUND 0x80090011L
|
||||
#define NTE_DOUBLE_ENCRYPT 0x80090012L
|
||||
#define NTE_BAD_PROVIDER 0x80090013L
|
||||
#define NTE_BAD_PROV_TYPE 0x80090014L
|
||||
#define NTE_BAD_PUBLIC_KEY 0x80090015L
|
||||
#define NTE_BAD_KEYSET 0x80090016L
|
||||
#define NTE_PROV_TYPE_NOT_DEF 0x80090017L
|
||||
#define NTE_PROV_TYPE_ENTRY_BAD 0x80090018L
|
||||
#define NTE_KEYSET_NOT_DEF 0x80090019L
|
||||
#define NTE_KEYSET_ENTRY_BAD 0x8009001AL
|
||||
#define NTE_PROV_TYPE_NO_MATCH 0x8009001BL
|
||||
#define NTE_SIGNATURE_FILE_BAD 0x8009001CL
|
||||
#define NTE_PROVIDER_DLL_FAIL 0x8009001DL
|
||||
#define NTE_PROV_DLL_NOT_FOUND 0x8009001EL
|
||||
#define NTE_BAD_KEYSET_PARAM 0x8009001FL
|
||||
#define NTE_FAIL 0x80090020L
|
||||
#define NTE_SYS_ERR 0x80090021L
|
||||
/* #define NTE_TOKEN_KEYSET_STORAGE ??? */
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -2222,6 +2222,15 @@ typedef struct tagMINIMIZEDMETRICS {
|
|||
int iVertGap;
|
||||
int iArrange;
|
||||
} MINIMIZEDMETRICS,*LPMINIMIZEDMETRICS;
|
||||
typedef struct tagMOUSEKEYS{
|
||||
UINT cbSize;
|
||||
DWORD dwFlags;
|
||||
DWORD iMaxSpeed;
|
||||
DWORD iTimeToMaxSpeed;
|
||||
DWORD iCtrlSpeed;
|
||||
DWORD dwReserved1;
|
||||
DWORD dwReserved2;
|
||||
} MOUSEKEYS, *LPMOUSEKEYS;
|
||||
typedef struct tagNONCLIENTMETRICSA {
|
||||
UINT cbSize;
|
||||
int iBorderWidth;
|
||||
|
|
|
|||
Loading…
Reference in New Issue