From: Earnie B. <ea...@us...> - 2002-01-25 13:18:21
|
Update of /cvsroot/mingw/w32api/include In directory usw-pr-cvs1:/tmp/cvs-serv24906/include Modified Files: wininet.h winnt.h winuser.h Log Message: Merge Cygwin changes Index: wininet.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/wininet.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wininet.h 2001/09/04 22:58:56 1.2 --- wininet.h 2002/01/25 13:18:17 1.3 *************** *** 141,144 **** --- 141,147 ---- #define SECURITY_FLAG_PCT4 16 #define SECURITY_FLAG_IETFSSL4 0x20 + #define SECURITY_FLAG_IGNORE_REVOCATION 0x00000080 + #define SECURITY_FLAG_IGNORE_UNKNOWN_CA 0x00000100 + #define SECURITY_FLAG_IGNORE_WRONG_USAGE 0x00000200 #define SECURITY_FLAG_40BIT 0x10000000 #define SECURITY_FLAG_128BIT 0x20000000 Index: winnt.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/winnt.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** winnt.h 2002/01/25 00:59:16 1.20 --- winnt.h 2002/01/25 13:18:18 1.21 *************** *** 76,81 **** --- 76,83 ---- */ typedef WCHAR TCHAR; + typedef WCHAR _TCHAR; #else typedef CHAR TCHAR; + typedef CHAR _TCHAR; #endif #endif *************** *** 630,646 **** #define MEM_RESET 0x80000 #define MEM_TOP_DOWN 0x100000 #define MEM_4MB_PAGES 0x80000000 #define MEM_IMAGE 16777216 - <<<<<<< winnt.h - #define MEM_MAPPED 262144 - #define MEM_PRIVATE 131072 - #define MEM_DECOMMIT 16384 - #define MEM_RELEASE 32768 - #define MEM_PHYSICAL 0x400000 - #define MEM_RESET 0x80000 /* NT */ - #define MEM_TOP_DOWN 0x100000 /* NT */ - #define MEM_WRITE_WATCH 0x200000 /* 98/Me */ - ======= - >>>>>>> 1.42 #define SEC_FILE 0x800000 #define SEC_IMAGE 0x1000000 --- 632,639 ---- #define MEM_RESET 0x80000 #define MEM_TOP_DOWN 0x100000 + #define MEM_WRITE_WATCH 0x200000 /* 98/Me */ + #define MEM_PHYSICAL 0x400000 #define MEM_4MB_PAGES 0x80000000 #define MEM_IMAGE 16777216 #define SEC_FILE 0x800000 #define SEC_IMAGE 0x1000000 Index: winuser.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/winuser.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** winuser.h 2002/01/17 21:09:53 1.13 --- winuser.h 2002/01/25 13:18:18 1.14 *************** *** 12,15 **** --- 12,16 ---- #define ATF_TIMEOUTON 1 #define ATF_ONOFFFEEDBACK 2 + #define ATF_AVAILABLE 4 /* May be obsolete. Not in recent MS docs. */ #define WH_MIN (-1) #define WH_MSGFILTER (-1) *************** *** 1501,1504 **** --- 1502,1506 ---- #define MKF_MODIFIERS 64 #define MKF_REPLACENUMBERS 128 + #define SERKF_ACTIVE 8 /* May be obsolete. Not in recent MS docs. */ #define SERKF_AVAILABLE 2 #define SERKF_INDICATOR 4 *************** *** 1909,1913 **** DWORD dwFlags; DWORD iTimeOutMSec; ! } ACCESSTIMEOUT; typedef struct tagANIMATIONINFO { UINT cbSize; --- 1911,1915 ---- DWORD dwFlags; DWORD iTimeOutMSec; ! } ACCESSTIMEOUT, *LPACCESSTIMEOUT; typedef struct tagANIMATIONINFO { UINT cbSize; |