* include/winbase.h (CancelDeviceWakeupRequest): Add function.

	* include/winbase.h [_WIN32_WINNT >= 0x0501]
	(CreateMemoryResourceNotification, DeactivateActCtx): Add functions.

	* include/winbase.h [_WIN32_WINNT >= 0x0500] (CreateTimerQueue,
	CreateTimerQueueTimer): Add function.

	* include/winbase.h [_WIN32_WINNT >= 0x0501]
	(MEMORY_RESOURCE_NOTIFICATION_TYPE): Add enumeration.

	* include/winbase.h [_WIN32_WINNT >= 0x0501]
	(DEACTIVATE_ACTCTX_FLAG_FORCE_EARLY_DEACTIVATION): Add constant.

	* include/winnt.h (WT_*): Add constants.

	* lib/user32.def (CancelDeviceWakeupRequest,
	CreateMemoryResourceNotification, CreateTimerQueueTimer,
	DeactivateActCtx): Add functions.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index b6ee0dfaa80a0a4fb125871bf86fbd83d315bc5a..3e670a165c1162789de719b9f26991dad6a54db9 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,25 @@
+2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+       * include/winbase.h (CancelDeviceWakeupRequest): Add function.
+
+       * include/winbase.h [_WIN32_WINNT >= 0x0501]
+       (CreateMemoryResourceNotification, DeactivateActCtx): Add functions.
+
+       * include/winbase.h [_WIN32_WINNT >= 0x0500] (CreateTimerQueue,
+       CreateTimerQueueTimer): Add function.
+
+       * include/winbase.h [_WIN32_WINNT >= 0x0501]
+       (MEMORY_RESOURCE_NOTIFICATION_TYPE): Add enumeration.
+
+       * include/winbase.h [_WIN32_WINNT >= 0x0501]
+       (DEACTIVATE_ACTCTX_FLAG_FORCE_EARLY_DEACTIVATION): Add constant.
+
+       * include/winnt.h (WT_*): Add constants.
+
+       * lib/user32.def (CancelDeviceWakeupRequest,
+       CreateMemoryResourceNotification, CreateTimerQueueTimer,
+       DeactivateActCtx): Add functions.
+
 2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
        * include/winbase.h [_WIN32_WINNT >= 0x0400] (ConvertFiberToThread):

diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index f32b4fa25217ce9dd360da4b447c8f29cb4c3b5a..bea2e6d30ef37426a2a0f67ac477c67cbe65ccd8 100644 (file)
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -522,6 +522,7 @@ extern "C" {
 #define ACTCTX_FLAG_SET_PROCESS_DEFAULT 0x00000010
 #define ACTCTX_FLAG_APPLICATION_NAME_VALID 0x00000020
 #define ACTCTX_FLAG_HMODULE_VALID 0x00000080
+#define DEACTIVATE_ACTCTX_FLAG_FORCE_EARLY_DEACTIVATION 0x00000001
 #endif
 
 #ifndef RC_INVOKED
@@ -971,6 +972,10 @@ typedef struct tagACTCTXW {
        HMODULE hModule;
 } ACTCTXW,*PACTCTXW;
 typedef const ACTCTXW *PCACTCTXW;
+typedef enum {
+       LowMemoryResourceNotification ,
+       HighMemoryResourceNotification
+} MEMORY_RESOURCE_NOTIFICATION_TYPE;
 #endif
 
 typedef DWORD(WINAPI *LPPROGRESS_ROUTINE)(LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,DWORD,DWORD,HANDLE,HANDLE,LPVOID);
@@ -983,6 +988,9 @@ typedef LONG(CALLBACK *PTOP_LEVEL_EXCEPTION_FILTER)(LPEXCEPTION_POINTERS);
 typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
 typedef void(APIENTRY *PAPCFUNC)(DWORD);
 typedef void(CALLBACK *PTIMERAPCROUTINE)(PVOID,DWORD,DWORD);
+#if (_WIN32_WINNT >= 0x0500)
+typedef void(CALLBACK *WAITORTIMERCALLBACK)(PVOID,BOOLEAN);   
+#endif
 #define MAKEINTATOM(i) (LPTSTR)((DWORD)((WORD)(i)))
 /* Functions */
 #ifndef UNDER_CE
@@ -1037,6 +1045,7 @@ BOOL WINAPI BuildCommDCBAndTimeoutsA(LPCSTR,LPDCB,LPCOMMTIMEOUTS);
 BOOL WINAPI BuildCommDCBAndTimeoutsW(LPCWSTR,LPDCB,LPCOMMTIMEOUTS);
 BOOL WINAPI CallNamedPipeA(LPCSTR,PVOID,DWORD,PVOID,DWORD,PDWORD,DWORD);
 BOOL WINAPI CallNamedPipeW(LPCWSTR,PVOID,DWORD,PVOID,DWORD,PDWORD,DWORD);
+BOOL WINAPI CancelDeviceWakeupRequest(HANDLE);
 BOOL WINAPI CancelIo(HANDLE);
 BOOL WINAPI CancelWaitableTimer(HANDLE);
 #if (_WIN32_WINNT >= 0x0501)
@@ -1098,6 +1107,9 @@ BOOL WINAPI AssignProcessToJobObject(HANDLE,HANDLE);
 #endif
 HANDLE WINAPI CreateMailslotA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
 HANDLE WINAPI CreateMailslotW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
+#if (_WIN32_WINNT >= 0x0501)
+HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE);
+#endif
 HANDLE WINAPI CreateMutexA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR);
 HANDLE WINAPI CreateMutexW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR);
 HANDLE WINAPI CreateNamedPipeA(LPCSTR,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
@@ -1112,9 +1124,16 @@ HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,LPTHREAD_STA
 HANDLE WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR);
 HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR);
 DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD);
+#if (_WIN32_WINNT >= 0x0500)
+HANDLE WINAPI CreateTimerQueue(void);
+BOOL WINAPI CreateTimerQueueTimer(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,ULONG);
+#endif
 HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,DWORD,LPTHREAD_START_ROUTINE,PVOID,DWORD,PDWORD);
 HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR);
 HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR);
+#if (_WIN32_WINNT >= 0x0501)
+BOOL WINAPI DeactivateActCtx(DWORD,ULONG_PTR);
+#endif
 BOOL WINAPI DebugActiveProcess(DWORD);
 void WINAPI DebugBreak(void);
 BOOL WINAPI DefineDosDeviceA(DWORD,LPCSTR,LPCSTR);

diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 50115a2b481ca3219d9705077ca6ff1fd3ab161e..fe71bafb1da1c4fa75e518504d243e4b80f1278a 100644 (file)
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -1264,6 +1264,14 @@ typedef DWORD FLONG;
 #define VER_SUITE_DATACENTER 128
 #define VER_SUITE_PERSONAL 512
 #define VER_SUITE_BLADE 1024
+#define WT_EXECUTEDEFAULT 0x00000000                           
+#define WT_EXECUTEINIOTHREAD 0x00000001                           
+#define WT_EXECUTEINWAITTHREAD 0x00000004                           
+#define WT_EXECUTEONLYONCE 0x00000008                           
+#define WT_EXECUTELONGFUNCTION 0x00000010                           
+#define WT_EXECUTEINTIMERTHREAD 0x00000020                           
+#define WT_EXECUTEINPERSISTENTTHREAD 0x00000080                      
+#define WT_TRANSFER_IMPERSONATION 0x00000100                         
 #define BTYPE(x) ((x)&N_BTMASK)
 #define ISPTR(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_POINTER<<N_BTSHFT))
 #define ISFCN(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_FUNCTION<<N_BTSHFT))

diff --git a/winsup/w32api/lib/kernel32.def b/winsup/w32api/lib/kernel32.def
index 4539e2d2579f0ba8f86fd7d299c53a35a692fa38..2222e9eb88833c2fe7b6c16941505636a6dd772c 100644 (file)
--- a/winsup/w32api/lib/kernel32.def
+++ b/winsup/w32api/lib/kernel32.def
@@ -25,6 +25,7 @@ BuildCommDCBAndTimeoutsW@12
 BuildCommDCBW@8
 CallNamedPipeA@28
 CallNamedPipeW@28
+CancelDeviceWakeupRequest@4
 CancelIo@4
 CancelTimerQueueTimer@8
 CancelWaitableTimer@4
@@ -86,10 +87,12 @@ CreateSemaphoreW@16
 CreateTapePartition@16
 CreateThread@24
 CreateTimerQueue@0
+CreateTimerQueueTimer@28
 CreateToolhelp32Snapshot@8
 CreateVirtualBuffer@12
 CreateWaitableTimerA@12
 CreateWaitableTimerW@12
+DeactivateActCtx@8
 DebugActiveProcess@4
 DebugBreak@0
 DefineDosDeviceA@12