From 1c906df21f516f84d9427d0d15205bbc7aac7f2d Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Wed, 18 Jun 2003 10:04:09 +0000 Subject: 2003-06-17 Danny Smith * include/shellapi.h (SHQUERYRBINFO): Add structure, (SHQueryRecycleBin[AW]. SHEmptyRecycleBin[AW]):Add prototypes. (SHERB_NOCONFIRMATION, SHERB_NOPROGRESSUI, SHERB_NOSOUND): Add defines. Thanks to Brett Hart 2003-06-17 Danny Smith * include/winbase.h (GlobalCompact, GlobalFix, GlobalFlags, GlobalUnfix, GlobalUnWire, GlobalWire, LocalCompact, LocalFlags, LocalShrink, LockSegment, UnlockSegment): Add comment that these are obsolete no-ops. 2003-06-17 Bang Jun-Young * include/winbase.h (GetProcessWorkingSetSize, GlobalCompact, LocalAlloc, LocalCompact, LocalReAlloc, LocalShrink, SignalObjectAndWait, WriteProcessMemory): Correct prototypes. --- winsup/w32api/include/shellapi.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'winsup/w32api/include/shellapi.h') diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h index 99ec490e9..c974674ce 100644 --- a/winsup/w32api/include/shellapi.h +++ b/winsup/w32api/include/shellapi.h @@ -90,6 +90,9 @@ extern "C" { #define SHGFI_SHELLICONSIZE 4 #define SHGFI_PIDL 8 #define SHGFI_USEFILEATTRIBUTES 16 +#define SHERB_NOCONFIRMATION 1 +#define SHERB_NOPROGRESSUI 2 +#define SHERB_NOSOUND 4 typedef WORD FILEOP_FLAGS; typedef WORD PRINTEROP_FLAGS; @@ -190,6 +193,11 @@ typedef struct _SHFILEINFOW { WCHAR szDisplayName[MAX_PATH]; WCHAR szTypeName[80]; } SHFILEINFOW; +typedef struct _SHQUERYRBINFO { + DWORD cbSize; + __int64 i64Size; + __int64 i64NumItems; +} SHQUERYRBINFO, *LPSHQUERYRBINFO; LPWSTR * WINAPI CommandLineToArgvW(LPCWSTR,int*); void WINAPI DragAcceptFiles(HWND,BOOL); @@ -219,6 +227,10 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW); void WINAPI SHFreeNameMappings(HANDLE); DWORD WINAPI SHGetFileInfoA(LPCSTR,DWORD,SHFILEINFOA*,UINT,UINT); DWORD WINAPI SHGetFileInfoW(LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT); +HRESULT WINAPI SHQueryRecycleBinA(LPCSTR, LPSHQUERYRBINFO); +HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR, LPSHQUERYRBINFO); +HRESULT WINAPI SHEmptyRecycleBinA(HWND,LPCSTR,DWORD); +HRESULT WINAPI SHEmptyRecycleBinW(HWND,LPCWSTR,DWORD); #ifdef UNICODE typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA; @@ -236,6 +248,9 @@ typedef SHFILEINFOW SHFILEINFO; #define ShellExecuteEx ShellExecuteExW #define SHFileOperation SHFileOperationW #define SHGetFileInfo SHGetFileInfoW +#define SHQueryRecycleBin SHQueryRecycleBinW +#define SHEmptyRecycleBin SHEmptyRecycleBinW + #else typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA; typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; @@ -252,6 +267,8 @@ typedef SHFILEINFOA SHFILEINFO; #define ShellExecuteEx ShellExecuteExA #define SHFileOperation SHFileOperationA #define SHGetFileInfo SHGetFileInfoA +#define SHQueryRecycleBin SHQueryRecycleBinA +#define SHEmptyRecycleBin SHEmptyRecycleBinA #endif #ifdef __cplusplus } -- cgit v1.2.3