From 1c906df21f516f84d9427d0d15205bbc7aac7f2d Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Wed, 18 Jun 2003 10:04:09 +0000 Subject: [PATCH] 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/ChangeLog | 23 ++++++++++++++++++++- winsup/w32api/include/shellapi.h | 17 ++++++++++++++++ winsup/w32api/include/winbase.h | 34 ++++++++++++++++---------------- 3 files changed, 56 insertions(+), 18 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index a78876d93..2627636a4 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,10 +1,31 @@ +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. + 2003-06-18 Steven Edwards * include/winuser.h (TPM_RECURSE): Add define. 2003-06-06 Danny Smith - * lib/test.c: #include . + * lib/test.c: #include . 2003-06-06 James E. Lucas 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 } diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index 7abb4e29a..eaa6cee8c 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1261,7 +1261,7 @@ BOOL WINAPI GetProcessShutdownParameters(PDWORD,PDWORD); BOOL WINAPI GetProcessTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME); DWORD WINAPI GetProcessVersion(DWORD); HWINSTA WINAPI GetProcessWindowStation(void); -BOOL WINAPI GetProcessWorkingSetSize(HANDLE,PDWORD,PDWORD); +BOOL WINAPI GetProcessWorkingSetSize(HANDLE,PSIZE_T,PSIZE_T); UINT WINAPI GetProfileIntA(LPCSTR,LPCSTR,INT); UINT WINAPI GetProfileIntW(LPCWSTR,LPCWSTR,INT); DWORD WINAPI GetProfileSectionA(LPCSTR,LPSTR,DWORD); @@ -1330,13 +1330,13 @@ DWORD WINAPI GetWindowThreadProcessId(HWND,PDWORD); ATOM WINAPI GlobalAddAtomA(LPCSTR); ATOM WINAPI GlobalAddAtomW( LPCWSTR); HGLOBAL WINAPI GlobalAlloc(UINT,DWORD); -UINT WINAPI GlobalCompact(DWORD); +SIZE_T WINAPI GlobalCompact(DWORD); /* Obsolete: Has no effect. */ ATOM WINAPI GlobalDeleteAtom(ATOM); HGLOBAL GlobalDiscard(HGLOBAL); ATOM WINAPI GlobalFindAtomA(LPCSTR); ATOM WINAPI GlobalFindAtomW(LPCWSTR); -VOID WINAPI GlobalFix(HGLOBAL); -UINT WINAPI GlobalFlags(HGLOBAL); +VOID WINAPI GlobalFix(HGLOBAL); /* Obsolete: Has no effect. */ +UINT WINAPI GlobalFlags(HGLOBAL); /* Obsolete: Has no effect. */ HGLOBAL WINAPI GlobalFree(HGLOBAL); UINT WINAPI GlobalGetAtomNameA(ATOM,LPSTR,int); UINT WINAPI GlobalGetAtomNameW(ATOM,LPWSTR,int); @@ -1348,10 +1348,10 @@ BOOL WINAPI GlobalMemoryStatusEx(LPMEMORYSTATUSEX); #endif HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,DWORD,UINT); DWORD WINAPI GlobalSize(HGLOBAL); -VOID WINAPI GlobalUnfix(HGLOBAL); -BOOL WINAPI GlobalUnlock(HGLOBAL); -BOOL WINAPI GlobalUnWire(HGLOBAL); -PVOID WINAPI GlobalWire(HGLOBAL); +VOID WINAPI GlobalUnfix(HGLOBAL); /* Obsolete: Has no effect. */ +BOOL WINAPI GlobalUnlock(HGLOBAL); +BOOL WINAPI GlobalUnWire(HGLOBAL); /* Obsolete: Has no effect. */ +PVOID WINAPI GlobalWire(HGLOBAL); /* Obsolete: Has no effect. */ #define HasOverlappedIoCompleted(lpOverlapped) ((lpOverlapped)->Internal != STATUS_PENDING) PVOID WINAPI HeapAlloc(HANDLE,DWORD,DWORD); SIZE_T WINAPI HeapCompact(HANDLE,DWORD); @@ -1411,22 +1411,22 @@ HINSTANCE WINAPI LoadLibraryExW(LPCWSTR,HANDLE,DWORD); HINSTANCE WINAPI LoadLibraryW(LPCWSTR); DWORD WINAPI LoadModule(LPCSTR,PVOID); HGLOBAL WINAPI LoadResource(HINSTANCE,HRSRC); -HLOCAL WINAPI LocalAlloc(UINT,UINT); -UINT WINAPI LocalCompact(UINT); +HLOCAL WINAPI LocalAlloc(UINT,SIZE_T); +SIZE_T WINAPI LocalCompact(UINT); /* Obsolete: Has no effect. */ HLOCAL LocalDiscard(HLOCAL); BOOL WINAPI LocalFileTimeToFileTime(CONST FILETIME *,LPFILETIME); -UINT WINAPI LocalFlags(HLOCAL); +UINT WINAPI LocalFlags(HLOCAL); /* Obsolete: Has no effect. */ HLOCAL WINAPI LocalFree(HLOCAL); HLOCAL WINAPI LocalHandle(LPCVOID); PVOID WINAPI LocalLock(HLOCAL); -HLOCAL WINAPI LocalReAlloc(HLOCAL,UINT,UINT); -UINT WINAPI LocalShrink(HLOCAL,UINT); +HLOCAL WINAPI LocalReAlloc(HLOCAL,SIZE_T,UINT); +SIZE_T WINAPI LocalShrink(HLOCAL,UINT); /* Obsolete: Has no effect. */ UINT WINAPI LocalSize(HLOCAL); BOOL WINAPI LocalUnlock(HLOCAL); BOOL WINAPI LockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); BOOL WINAPI LockFileEx(HANDLE,DWORD,DWORD,DWORD,DWORD,LPOVERLAPPED); PVOID WINAPI LockResource(HGLOBAL); -#define LockSegment(w) GlobalFix((HANDLE)(w)) +#define LockSegment(w) GlobalFix((HANDLE)(w)) /* Obsolete: Has no effect. */ BOOL WINAPI LogonUserA(LPSTR,LPSTR,LPSTR,DWORD,DWORD,PHANDLE); BOOL WINAPI LogonUserW(LPWSTR,LPWSTR,LPWSTR,DWORD,DWORD,PHANDLE); BOOL WINAPI LookupAccountNameA(LPCSTR,LPCSTR,PSID,PDWORD,LPSTR,PDWORD,PSID_NAME_USE); @@ -1597,7 +1597,7 @@ BOOL WINAPI SetVolumeMountPointA(LPCSTR,LPCSTR); BOOL WINAPI SetVolumeMountPointW(LPCWSTR,LPCWSTR); #endif BOOL WINAPI SetWaitableTimer(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,PVOID,BOOL); -BOOL WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL); +DWORD WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL); DWORD WINAPI SizeofResource(HINSTANCE,HRSRC); void WINAPI Sleep(DWORD); DWORD WINAPI SleepEx(DWORD,BOOL); @@ -1619,7 +1619,7 @@ LONG WINAPI UnhandledExceptionFilter(LPEXCEPTION_POINTERS); BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); #define UnlockResource(h) (h) -#define UnlockSegment(w) GlobalUnfix((HANDLE)(w)) +#define UnlockSegment(w) GlobalUnfix((HANDLE)(w)) /* Obsolete: Has no effect. */ BOOL WINAPI UnmapViewOfFile(PVOID); BOOL WINAPI UpdateResourceA(HANDLE,LPCSTR,LPCSTR,WORD,PVOID,DWORD); BOOL WINAPI UpdateResourceW(HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD); @@ -1653,7 +1653,7 @@ BOOL WINAPI WritePrivateProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPCSTR); BOOL WINAPI WritePrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); BOOL WINAPI WritePrivateProfileStructA(LPCSTR,LPCSTR,LPVOID,UINT,LPCSTR); BOOL WINAPI WritePrivateProfileStructW(LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR); -BOOL WINAPI WriteProcessMemory(HANDLE,PVOID,PVOID,DWORD,PDWORD); +BOOL WINAPI WriteProcessMemory(HANDLE,LPVOID,LPCVOID,SIZE_T,SIZE_T*); BOOL WINAPI WriteProfileSectionA(LPCSTR,LPCSTR); BOOL WINAPI WriteProfileSectionW(LPCWSTR,LPCWSTR); BOOL WINAPI WriteProfileStringA(LPCSTR,LPCSTR,LPCSTR);