From: <ea...@us...> - 2002-08-14 21:05:47
|
Update of /cvsroot/mingw/w32api/include In directory usw-pr-cvs1:/tmp/cvs-serv25783/include Modified Files: commdlg.h shellapi.h shlobj.h wincrypt.h Log Message: Merge winsup changes Index: commdlg.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/commdlg.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** commdlg.h 12 Aug 2002 12:21:10 -0000 1.6 --- commdlg.h 14 Aug 2002 21:05:43 -0000 1.7 *************** *** 437,441 **** HANDLE hSetupTemplate; } PRINTDLGW,*LPPRINTDLGW; ! #if (WINVER >= 0x0500) #include <unknwn.h> /* for LPUNKNOWN */ #include <prsht.h> /* for HPROPSHEETPAGE */ --- 437,441 ---- HANDLE hSetupTemplate; } PRINTDLGW,*LPPRINTDLGW; ! #if (WINVER >= 0x0500) && !defined (__OBJC__) #include <unknwn.h> /* for LPUNKNOWN */ #include <prsht.h> /* for HPROPSHEETPAGE */ *************** *** 511,515 **** HWND WINAPI ReplaceTextA(LPFINDREPLACEA); HWND WINAPI ReplaceTextW(LPFINDREPLACEW); ! #if (WINVER >= 0x0500) HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA); HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW); --- 511,515 ---- HWND WINAPI ReplaceTextA(LPFINDREPLACEA); HWND WINAPI ReplaceTextW(LPFINDREPLACEW); ! #if (WINVER >= 0x0500) && !defined (__OBJC__) HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA); HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW); *************** *** 540,544 **** #define PrintDlg PrintDlgW #define ReplaceText ReplaceTextW ! #if (WINVER >= 0x0500) typedef PRINTDLGEXW PRINTDLGEX, *LPPRINTDLGEX; #define PrintDlgEx PrintDlgExW --- 540,544 ---- #define PrintDlg PrintDlgW #define ReplaceText ReplaceTextW ! #if (WINVER >= 0x0500) && !defined (__OBJC__) typedef PRINTDLGEXW PRINTDLGEX, *LPPRINTDLGEX; #define PrintDlgEx PrintDlgExW *************** *** 568,572 **** #define PrintDlg PrintDlgA #define ReplaceText ReplaceTextA ! #if (WINVER >= 0x0500) typedef PRINTDLGEXA PRINTDLGEX, *LPPRINTDLGEX; #define PrintDlgEx PrintDlgExA --- 568,572 ---- #define PrintDlg PrintDlgA #define ReplaceText ReplaceTextA ! #if (WINVER >= 0x0500) && !defined (__OBJC__) typedef PRINTDLGEXA PRINTDLGEX, *LPPRINTDLGEX; #define PrintDlgEx PrintDlgExA Index: shellapi.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/shellapi.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellapi.h 9 Apr 2002 21:17:17 -0000 1.2 --- shellapi.h 14 Aug 2002 21:05:43 -0000 1.3 *************** *** 70,73 **** --- 70,74 ---- #define FOF_SIMPLEPROGRESS 256 #define FOF_NOCONFIRMMKDIR 512 + #define FOF_NOERRORUI 1024 #define PO_DELETE 19 #define PO_RENAME 20 Index: shlobj.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/shlobj.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** shlobj.h 12 Aug 2002 12:21:11 -0000 1.10 --- shlobj.h 14 Aug 2002 21:05:43 -0000 1.11 *************** *** 744,747 **** --- 744,749 ---- BOOL WINAPI SHGetSpecialFolderPathA(HWND,LPSTR,int,BOOL); BOOL WINAPI SHGetSpecialFolderPathW(HWND,LPSTR,int,BOOL); + BOOL WINAPI SHGetFolderPathA(HWND,int,HANDLE,DWORD,LPTSTR); + BOOL WINAPI SHGetFolderPathW(HWND,int,HANDLE,DWORD,LPTSTR); #ifdef UNICODE *************** *** 754,757 **** --- 756,760 ---- /* FIXME/TODO: Only valid for _WIN32_IE >= 400? */ #define SHGetSpecialFolderPath SHGetSpecialFolderPathW + #define SHGetFolderPath SHGetFolderPathW #else typedef IShellExecuteHookA IShellExecuteHook; *************** *** 763,766 **** --- 766,770 ---- /* FIXME/TODO: Only valid for _WIN32_IE >= 400? */ #define SHGetSpecialFolderPath SHGetSpecialFolderPathA + #define SHGetFolderPath SHGetFolderPathA #endif Index: wincrypt.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/wincrypt.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wincrypt.h 12 Aug 2002 12:21:11 -0000 1.3 --- wincrypt.h 14 Aug 2002 21:05:43 -0000 1.4 *************** *** 504,507 **** --- 504,511 ---- BOOL WINAPI CryptDeriveKey(HCRYPTPROV,ALG_ID,HCRYPTHASH,DWORD,HCRYPTKEY*); BOOL WINAPI CryptDestroyKey(HCRYPTKEY); + #if (WINVER >= 0x0500) + BOOL WINAPI CryptDuplicateHash(HCRYPTHASH,DWORD*,DWORD,HCRYPTHASH*); + BOOL WINAPI CryptDuplicateKey(HCRYPTKEY,DWORD*,DWORD,HCRYPTKEY*); + #endif BOOL WINAPI CryptSetKeyParam(HCRYPTKEY,DWORD,PBYTE,DWORD); BOOL WINAPI CryptGetKeyParam(HCRYPTKEY,DWORD,PBYTE,PDWORD,DWORD); |