* include/winbase.h [_WIN32_WINNT >= 0x0500] (SetComputerNameEx[AW],

	UnregisterWaitEx): Add functions.

	* include/winbase.h [_WIN32_WINNT >= 0x0500]
	(AddVectoredExceptionHandler, RemoveVectoredExceptionHandler): Add
	or guard function. The MSDN says it is available on Windows XP and
	better, and then it says it is declared for _WIN32_WINNT >= 0x0500.
	Huh?

	* include/winbase.h [_WIN32_WINNT >= 0x0501] (AddRefActCtx,
	CreateActCtx[AW], SetFileShortName[AW], SetFileValidData,
	ZombifyActCtx, QueryActCtxW): Add functions.

	* include/winbase.h [_WIN32_WINNT >= 0x0501]
	(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX,
	QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE,
	QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS): Add constants.

	* include/winbase.h [_WIN32_WINNT >= 0x0502] (SetDllDirectory[AW],
	SetFirmwareEnvironmentVariable[AW]): Add functions.

	* include/winnt.h [_WIN32_WINNT >= 0x0500] (VER_BUILDNUMBER,
	VER_MAJORVERSION, VER_MINORVERSION, VER_PLATFORMID,
	VER_SERVICEPACKMAJOR, VER_SERVICEPACKMINOR, VER_SUITENAME,
	VER_PRODUCT_TYPE, VER_EQUAL, VER_GREATER, VER_GREATER_EQUAL,
	VER_LESS, VER_LESS_EQUAL, VER_AND, VER_OR): Add constants.

	* include/winnt.h [_WIN32_WINNT >= 0x0501]
	(PVECTORED_EXCEPTION_HANDLER): Add callback.

	* include/winnt.h [_WIN32_WINNT >= 0x0501]
	(ACTIVATION_CONTEXT_INFO_CLASS,
	ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION,
	ACTIVATION_CONTEXT_DETAILED_INFORMATION,
	ACTIVATION_CONTEXT_QUERY_INDEX, ASSEMBLY_FILE_DETAILED_INFORMATION):
	Add structures.

	* lib/user32.def (AddRefActCtx, AddVectoredExceptionHandler,
	CreateActCtx[AW], SetComputerNameEx[AW], SetDllDirectory[AW],
	SetFileShortName[AW], SetFileValidData,
	SetFirmwareEnvironmentVariable[AW], UnregisterWaitEx,
	VerSetConditionMask, ZombifyActCtx, QueryActCtxW): Add functions.

4 files changed, 210 insertions, 9 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index bbafeb8b6..25f781f9b 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,4 +1,49 @@
-2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+2003-10-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/winbase.h [_WIN32_WINNT >= 0x0500] (SetComputerNameEx[AW],
+	UnregisterWaitEx): Add functions.
+
+	* include/winbase.h [_WIN32_WINNT >= 0x0500]
+	(AddVectoredExceptionHandler, RemoveVectoredExceptionHandler): Add
+	or guard function. The MSDN says it is available on Windows XP and
+	better, and then it says it is declared for _WIN32_WINNT >= 0x0500.
+	Huh?
+
+	* include/winbase.h [_WIN32_WINNT >= 0x0501] (AddRefActCtx,
+	CreateActCtx[AW], SetFileShortName[AW], SetFileValidData,
+	ZombifyActCtx, QueryActCtxW): Add functions.
+
+	* include/winbase.h [_WIN32_WINNT >= 0x0501]
+	(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX,
+	QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE,
+	QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS): Add constants.
+
+	* include/winbase.h [_WIN32_WINNT >= 0x0502] (SetDllDirectory[AW],
+	SetFirmwareEnvironmentVariable[AW]): Add functions.
+
+	* include/winnt.h [_WIN32_WINNT >= 0x0500] (VER_BUILDNUMBER,
+	VER_MAJORVERSION, VER_MINORVERSION, VER_PLATFORMID,
+	VER_SERVICEPACKMAJOR, VER_SERVICEPACKMINOR, VER_SUITENAME,
+	VER_PRODUCT_TYPE, VER_EQUAL, VER_GREATER, VER_GREATER_EQUAL,
+	VER_LESS, VER_LESS_EQUAL, VER_AND, VER_OR): Add constants.
+
+	* include/winnt.h [_WIN32_WINNT >= 0x0501]
+	(PVECTORED_EXCEPTION_HANDLER): Add callback.
+
+	* include/winnt.h [_WIN32_WINNT >= 0x0501]
+	(ACTIVATION_CONTEXT_INFO_CLASS,
+	ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION,
+	ACTIVATION_CONTEXT_DETAILED_INFORMATION,
+	ACTIVATION_CONTEXT_QUERY_INDEX, ASSEMBLY_FILE_DETAILED_INFORMATION):
+	Add structures.
+
+	* lib/user32.def (AddRefActCtx, AddVectoredExceptionHandler,
+	CreateActCtx[AW], SetComputerNameEx[AW], SetDllDirectory[AW],
+	SetFileShortName[AW], SetFileValidData,
+	SetFirmwareEnvironmentVariable[AW], UnregisterWaitEx,
+	VerSetConditionMask, ZombifyActCtx, QueryActCtxW): Add functions.
+
+2003-10-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/winbase.h (GetWriteWatch, IsSystemResumeAutomatic,
 	ResetWriteWatch): Add function.
@@ -35,7 +80,7 @@
 	RemoveVectoredExceptionHandler, ReplaceFile[AW], ResetWriteWatch,
 	RestoreLastError): Add functions.
 
-2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+2003-10-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/winbase.h [_WIN32_WINNT >= 0x0500] (GetComputerNameEx[AW],
 	GetProcessIoCounters): Add functions.
@@ -71,7 +116,7 @@
 	GetNativeSystemInfo, GetProcessHandleCount, GetProcessIoCounters):
 	Add functions.
 
-2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+2003-10-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/winbase.h [_WIN32_WINNT >= 0x0501]
 	(CheckRemoteDebuggerPresent, DebugActiveProcessStop, DebugBreakProcess,
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index e0d9f6c2a..9b3aec169 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -524,7 +524,10 @@ extern "C" {
 #define ACTCTX_FLAG_HMODULE_VALID 0x00000080
 #define DEACTIVATE_ACTCTX_FLAG_FORCE_EARLY_DEACTIVATION 0x00000001
 #define FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX 0x00000001
-#endif
+#define QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX 0x00000004
+#define QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE 0x00000008
+#define QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS 0x00000010
+#endif /* (_WIN32_WINNT >= 0x0501) */
 #if (_WIN32_WINNT >= 0x0500)
 #define REPLACEFILE_WRITE_THROUGH 0x00000001
 #define REPLACEFILE_IGNORE_MERGE_ERRORS 0x00000002
@@ -994,7 +997,7 @@ typedef enum {
 	LowMemoryResourceNotification ,
 	HighMemoryResourceNotification
 } MEMORY_RESOURCE_NOTIFICATION_TYPE;
-#endif / (_WIN32_WINNT >= 0x0501) */
+#endif /* (_WIN32_WINNT >= 0x0501) */
 #if (_WIN32_WINNT >= 0x0500)
 typedef enum _COMPUTER_NAME_FORMAT {
 	ComputerNameNetBIOS, 
@@ -1007,7 +1010,7 @@ typedef enum _COMPUTER_NAME_FORMAT {
 	ComputerNamePhysicalDnsFullyQualified, 
 	ComputerNameMax
 } COMPUTER_NAME_FORMAT;
-#endif / (_WIN32_WINNT >= 0x0500) */
+#endif /* (_WIN32_WINNT >= 0x0500) */
 
 typedef DWORD(WINAPI *LPPROGRESS_ROUTINE)(LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,DWORD,DWORD,HANDLE,HANDLE,LPVOID);
 typedef void(WINAPI *LPFIBER_START_ROUTINE)(PVOID);
@@ -1055,6 +1058,12 @@ BOOL WINAPI AddAce(PACL,DWORD,DWORD,PVOID,DWORD);
 ATOM WINAPI AddAtomA(LPCSTR);
 ATOM WINAPI AddAtomW(LPCWSTR);
 BOOL WINAPI AddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL);
+#if (_WIN32_WINNT >= 0x0501)
+void WINAPI AddRefActCtx(HANDLE);
+#endif
+#if (_WIN32_WINNT >= 0x0500)
+PVOID WINAPI AddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER);
+#endif
 BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD);
 BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
 BOOL WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID*);
@@ -1112,6 +1121,10 @@ BOOL WINAPI CopyFileExW(LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,LPBOOL,DWORD);
 #define FillMemory RtlFillMemory
 #define ZeroMemory RtlZeroMemory
 BOOL WINAPI CopySid(DWORD,PSID,PSID);
+#if (_WIN32_WINNT >= 0x0501)
+HANDLE WINAPI CreateActCtxA(PCACTCTXA);
+HANDLE WINAPI CreateActCtxW(PCACTCTXW);
+#endif
 BOOL WINAPI CreateDirectoryA(LPCSTR,LPSECURITY_ATTRIBUTES);
 BOOL WINAPI CreateDirectoryW(LPCWSTR,LPSECURITY_ATTRIBUTES);
 BOOL WINAPI CreateDirectoryExA(LPCSTR,LPCSTR,LPSECURITY_ATTRIBUTES);
@@ -1695,6 +1708,9 @@ BOOL WINAPI ProcessIdToSessionId(DWORD,DWORD*);
 #endif
 BOOL WINAPI PulseEvent(HANDLE);
 BOOL WINAPI PurgeComm(HANDLE,DWORD);
+#if (_WIN32_WINNT >= 0x0501)
+BOOL WINAPI QueryActCtxW(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*);
+#endif
 DWORD WINAPI QueryDosDeviceA(LPCSTR,LPSTR,DWORD);
 DWORD WINAPI QueryDosDeviceW(LPCWSTR,LPWSTR,DWORD);
 #if (_WIN32_WINNT >= 0x0501)
@@ -1720,7 +1736,7 @@ BOOL WINAPI ReleaseMutex(HANDLE);
 BOOL WINAPI ReleaseSemaphore(HANDLE,LONG,LPLONG);
 BOOL WINAPI RemoveDirectoryA(LPCSTR);
 BOOL WINAPI RemoveDirectoryW(LPCWSTR);
-#if (_WIN32_WINNT >= 0x0501)
+#if (_WIN32_WINNT >= 0x0500)
 ULONG WINAPI RemoveVectoredExceptionHandler(PVOID);
 #endif
 #if (_WIN32_WINNT >= 0x0500)
@@ -1746,10 +1762,18 @@ BOOL WINAPI SetCommState(HANDLE,LPDCB);
 BOOL WINAPI SetCommTimeouts(HANDLE,LPCOMMTIMEOUTS);
 BOOL WINAPI SetComputerNameA(LPCSTR);
 BOOL WINAPI SetComputerNameW(LPCWSTR);
+#if (_WIN32_WINNT >= 0x0500)
+BOOL WINAPI SetComputerNameExA(COMPUTER_NAME_FORMAT,LPCSTR);
+BOOL WINAPI SetComputerNameExW(COMPUTER_NAME_FORMAT,LPCWSTR);
+#endif
 BOOL WINAPI SetCurrentDirectoryA(LPCSTR);
 BOOL WINAPI SetCurrentDirectoryW(LPCWSTR);
 BOOL WINAPI SetDefaultCommConfigA(LPCSTR,LPCOMMCONFIG,DWORD);
 BOOL WINAPI SetDefaultCommConfigW(LPCWSTR,LPCOMMCONFIG,DWORD);
+#if (_WIN32_WINNT >= 0x0502)
+BOOL WINAPI SetDllDirectoryA(LPCSTR);
+BOOL WINAPI SetDllDirectoryW(LPCWSTR);
+#endif
 BOOL WINAPI SetEndOfFile(HANDLE);
 BOOL WINAPI SetEnvironmentVariableA(LPCSTR,LPCSTR);
 BOOL WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR);
@@ -1763,7 +1787,18 @@ DWORD WINAPI SetFilePointer(HANDLE,LONG,PLONG,DWORD);
 BOOL WINAPI SetFilePointerEx(HANDLE,LARGE_INTEGER,PLARGE_INTEGER,DWORD);
 BOOL WINAPI SetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
 BOOL WINAPI SetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
+#if (_WIN32_WINNT >= 0x0501)
+BOOL WINAPI SetFileShortNameA(HANDLE,LPCSTR);
+BOOL WINAPI SetFileShortNameW(HANDLE,LPCWSTR);
+#endif
 BOOL WINAPI SetFileTime(HANDLE,const FILETIME*,const FILETIME*,const FILETIME*);
+#if (_WIN32_WINNT >= 0x0501)
+BOOL WINAPI SetFileValidData(HANDLE,LONGLONG);
+#endif
+#if (_WIN32_WINNT >= 0x0502)
+BOOL WINAPI SetFirmwareEnvironmentVariableA(LPCSTR,LPCSTR,PVOID,DWORD);
+BOOL WINAPI SetFirmwareEnvironmentVariableW(LPCWSTR,LPCWSTR,PVOID,DWORD);
+#endif
 UINT WINAPI SetHandleCount(UINT);
 BOOL WINAPI SetHandleInformation(HANDLE,DWORD,DWORD);
 BOOL WINAPI SetKernelObjectSecurity(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
@@ -1831,6 +1866,9 @@ BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED);
 #define UnlockResource(h) (h)
 #define UnlockSegment(w) GlobalUnfix((HANDLE)(w)) /* Obsolete: Has no effect. */
 BOOL WINAPI UnmapViewOfFile(PVOID);
+#if (_WIN32_WINNT >= 0x0500)
+BOOL WINAPI UnregisterWaitEx(HANDLE,HANDLE);
+#endif
 BOOL WINAPI UpdateResourceA(HANDLE,LPCSTR,LPCSTR,WORD,PVOID,DWORD);
 BOOL WINAPI UpdateResourceW(HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD);
 BOOL WINAPI VerifyVersionInfoA(LPOSVERSIONINFOEXA,DWORD,DWORDLONG);
@@ -1870,6 +1908,9 @@ BOOL WINAPI WriteProfileStringA(LPCSTR,LPCSTR,LPCSTR);
 BOOL WINAPI WriteProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR);
 DWORD WINAPI WriteTapemark(HANDLE,DWORD,DWORD,BOOL);
 #define Yield()
+#if (_WIN32_WINNT >= 0x0501)
+BOOL WINAPI ZombifyActCtx(HANDLE);
+#endif
 #if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI AllocateUserPhysicalPages(HANDLE,PULONG_PTR,PULONG_PTR);
 BOOL WINAPI FreeUserPhysicalPages(HANDLE,PULONG_PTR,PULONG_PTR);
@@ -1899,6 +1940,9 @@ typedef PCACTCTXW PCACTCTX;
 #define CommConfigDialog CommConfigDialogW
 #define CopyFile CopyFileW
 #define CopyFileEx CopyFileExW
+#if (_WIN32_WINNT >= 0x0501)
+#define CreateActCtx CreateActCtxW
+#endif
 #define CreateDirectory CreateDirectoryW
 #define CreateDirectoryEx CreateDirectoryExW
 #define CreateEvent CreateEventW
@@ -2048,9 +2092,18 @@ typedef PCACTCTXW PCACTCTX;
 #define SetComputerName SetComputerNameW
 #define SetCurrentDirectory SetCurrentDirectoryW
 #define SetDefaultCommConfig SetDefaultCommConfigW
+#if (_WIN32_WINNT >= 0x0502)
+#define SetDllDirectory SetDllDirectoryW
+#endif
 #define SetEnvironmentVariable SetEnvironmentVariableW
 #define SetFileAttributes SetFileAttributesW
 #define SetFileSecurity SetFileSecurityW
+#if (_WIN32_WINNT >= 0x0501)
+#define SetFileShortName SetFileShortNameW
+#endif
+#if (_WIN32_WINNT >= 0x0502)
+#define SetFirmwareEnvironmentVariable SetFirmwareEnvironmentVariableW
+#endif
 #define SetVolumeLabel SetVolumeLabelW
 #define SetVolumeMountPoint SetVolumeMountPointW
 #define UpdateResource UpdateResourceW
@@ -2083,6 +2136,9 @@ typedef PCACTCTXA PCACTCTX;
 #define CommConfigDialog CommConfigDialogA
 #define CopyFile CopyFileA
 #define CopyFileEx CopyFileExA
+#if (_WIN32_WINNT >= 0x0501)
+#define CreateActCtx CreateActCtxA
+#endif
 #define CreateDirectory CreateDirectoryA
 #define CreateDirectoryEx CreateDirectoryExA
 #define CreateEvent CreateEventA
@@ -2231,9 +2287,18 @@ typedef PCACTCTXA PCACTCTX;
 #define SetComputerName SetComputerNameA
 #define SetCurrentDirectory SetCurrentDirectoryA
 #define SetDefaultCommConfig SetDefaultCommConfigA
+#if (_WIN32_WINNT >= 0x0502)
+#define SetDllDirectory SetDllDirectoryA
+#endif
 #define SetEnvironmentVariable SetEnvironmentVariableA
 #define SetFileAttributes SetFileAttributesA
 #define SetFileSecurity SetFileSecurityA
+#if (_WIN32_WINNT >= 0x0501)
+#define SetFileShortName SetFileShortNameA
+#endif
+#if (_WIN32_WINNT >= 0x0502)
+#define SetFirmwareEnvironmentVariable SetFirmwareEnvironmentVariableA
+#endif
 #define SetVolumeLabel SetVolumeLabelA
 #define SetVolumeMountPoint SetVolumeMountPointA
 #define UpdateResource UpdateResourceA
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 442918e7e..a49709641 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -1250,6 +1250,23 @@ typedef DWORD FLONG;
 #define TAPE_LOCK 3
 #define TAPE_UNLOCK 4
 #define TAPE_FORMAT 5
+#if (_WIN32_WINNT >= 0x0500)
+#define VER_MINORVERSION 0x0000001
+#define VER_MAJORVERSION 0x0000002
+#define VER_BUILDNUMBER 0x0000004
+#define VER_PLATFORMID 0x0000008
+#define VER_SERVICEPACKMINOR 0x0000010
+#define VER_SERVICEPACKMAJOR 0x0000020
+#define VER_SUITENAME 0x0000040
+#define VER_PRODUCT_TYPE 0x0000080
+#define VER_EQUAL 1
+#define VER_GREATER 2
+#define VER_GREATER_EQUAL 3
+#define VER_LESS 4
+#define VER_LESS_EQUAL 5
+#define VER_AND 6
+#define VER_OR 7
+#endif
 #define VER_PLATFORM_WIN32s 0
 #define VER_PLATFORM_WIN32_WINDOWS 1
 #define VER_PLATFORM_WIN32_NT 2
@@ -2058,7 +2075,8 @@ typedef enum tagTOKEN_TYPE {
 	TokenImpersonation
 } TOKEN_TYPE,*PTOKEN_TYPE;
 #if (_WIN32_WINNT >= 0x0501)
-typedef enum {
+typedef LONG (WINAPI *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS);
+typedef enum _HEAP_INFORMATION_CLASS {
 	HeapCompatibilityInformation
 } HEAP_INFORMATION_CLASS;
 #endif
@@ -3155,9 +3173,67 @@ typedef struct _SYSTEM_POWER_INFORMATION {
 	ULONG  Idleness;
 	ULONG  TimeRemaining;
 	UCHAR  CoolingMode;
-} SYSTEM_POWER_INFORMATION, *PSYSTEM_POWER_INFORMATION;
+} SYSTEM_POWER_INFORMATION,*PSYSTEM_POWER_INFORMATION;
 #endif
 
+#if (WIN32_WINNT >= 0x0501)
+typedef enum _ACTIVATION_CONTEXT_INFO_CLASS {
+	ActivationContextBasicInformation = 1,
+	ActivationContextDetailedInformation,
+	AssemblyDetailedInformationInActivationContext,
+	FileInformationInAssemblyOfAssemblyInActivationContext
+} ACTIVATION_CONTEXT_INFO_CLASS;
+typedef struct _ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION {
+	DWORD ulFlags;
+	DWORD ulEncodedAssemblyIdentityLength;
+	DWORD ulManifestPathType;
+	DWORD ulManifestPathLength;
+	LARGE_INTEGER liManifestLastWriteTime;
+	DWORD ulPolicyPathType;
+	DWORD ulPolicyPathLength;
+	LARGE_INTEGER liPolicyLastWriteTime;
+	DWORD ulMetadataSatelliteRosterIndex;
+	DWORD ulManifestVersionMajor;
+	DWORD ulManifestVersionMinor;
+	DWORD ulPolicyVersionMajor;
+	DWORD ulPolicyVersionMinor;
+	DWORD ulAssemblyDirectoryNameLength;
+	PCWSTR lpAssemblyEncodedAssemblyIdentity;
+	PCWSTR lpAssemblyManifestPath;
+	PCWSTR lpAssemblyPolicyPath;
+	PCWSTR lpAssemblyDirectoryName;
+} ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION,*PACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION;
+typedef const ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *PCACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION;
+typedef struct _ACTIVATION_CONTEXT_DETAILED_INFORMATION {
+	DWORD dwFlags;
+	DWORD ulFormatVersion;
+	DWORD ulAssemblyCount;
+	DWORD ulRootManifestPathType;
+	DWORD ulRootManifestPathChars;
+	DWORD ulRootConfigurationPathType;
+	DWORD ulRootConfigurationPathChars;
+	DWORD ulAppDirPathType;
+	DWORD ulAppDirPathChars;
+	PCWSTR lpRootManifestPath;
+	PCWSTR lpRootConfigurationPath;
+	PCWSTR lpAppDirPath;
+} ACTIVATION_CONTEXT_DETAILED_INFORMATION,*PACTIVATION_CONTEXT_DETAILED_INFORMATION;
+typedef const ACTIVATION_CONTEXT_DETAILED_INFORMATION *PCACTIVATION_CONTEXT_DETAILED_INFORMATION;
+typedef struct _ACTIVATION_CONTEXT_QUERY_INDEX {
+	ULONG ulAssemblyIndex;
+	ULONG ulFileIndexInAssembly;
+} ACTIVATION_CONTEXT_QUERY_INDEX,*PACTIVATION_CONTEXT_QUERY_INDEX;
+typedef const ACTIVATION_CONTEXT_QUERY_INDEX *PCACTIVATION_CONTEXT_QUERY_INDEX;
+typedef struct _ASSEMBLY_FILE_DETAILED_INFORMATION {
+	DWORD ulFlags;
+	DWORD ulFilenameLength;
+	DWORD ulPathLength;
+	PCWSTR lpFileName;
+	PCWSTR lpFilePath;
+} ASSEMBLY_FILE_DETAILED_INFORMATION,*PASSEMBLY_FILE_DETAILED_INFORMATION;
+typedef const ASSEMBLY_FILE_DETAILED_INFORMATION *PCASSEMBLY_FILE_DETAILED_INFORMATION;
+#endif /* (WIN32_WINNT >= 0x0501) */
+
 typedef struct _PROCESSOR_POWER_POLICY_INFO {
 	ULONG  TimeCheck;
 	ULONG  DemoteLimit;
diff --git a/winsup/w32api/lib/kernel32.def b/winsup/w32api/lib/kernel32.def
index ed704bac3..f22e83c1c 100644
--- a/winsup/w32api/lib/kernel32.def
+++ b/winsup/w32api/lib/kernel32.def
@@ -7,6 +7,8 @@ AddConsoleAliasA@12
 AddConsoleAliasW@12
 AddLocalAlternateComputerNameA@8
 AddLocalAlternateComputerNameW@8
+AddRefActCtx@4
+AddVectoredExceptionHandler@8
 AllocConsole@0
 AllocateUserPhysicalPages@12
 AreFileApisANSI@0
@@ -55,6 +57,8 @@ CopyFileA@12
 CopyFileW@12
 CopyFileExA@24
 CopyFileExW@24
+CreateActCtxA@4
+CreateActCtxW@4
 CreateConsoleScreenBuffer@20
 CreateDirectoryA@8
 CreateDirectoryExA@12
@@ -586,6 +590,7 @@ Process32NextW@8
 ProcessIdToSessionId@8
 PulseEvent@4
 PurgeComm@8
+QueryActCtxW@28
 QueryDosDeviceA@12
 QueryDosDeviceW@12
 QueryInformationJobObject@20
@@ -650,6 +655,8 @@ SetCommState@8
 SetCommTimeouts@8
 SetComputerNameA@4
 SetComputerNameW@4
+SetComputerNameExA@8
+SetComputerNameExW@8
 SetConsoleActiveScreenBuffer@4
 SetConsoleCP@4
 SetConsoleCommandHistoryMode@4
@@ -681,6 +688,8 @@ SetCurrentDirectoryA@4
 SetCurrentDirectoryW@4
 SetDefaultCommConfigA@12
 SetDefaultCommConfigW@12
+SetDllDirectoryA@4
+SetDllDirectoryW@4
 SetEndOfFile@4
 SetEnvironmentVariableA@8
 SetEnvironmentVariableW@8
@@ -692,7 +701,10 @@ SetFileAttributesA@8
 SetFileAttributesW@8
 SetFilePointer@16
 SetFilePointerEx@20
+SetFileShortNameA@8
+SetFileShortNameW@8
 SetFileTime@16
+SetFileValidData@12
 SetHandleCount@4
 SetHandleInformation@12
 SetInformationJobObject@16
@@ -763,12 +775,14 @@ UnlockFileEx@20
 UnmapViewOfFile@4
 UnmapViewOfFileVlm@4
 UnregisterWait@4
+UnregisterWaitEx@8
 UpdateResourceA@24
 UpdateResourceW@24
 VDMConsoleOperation@8
 VDMOperationStarted@4
 VerLanguageNameA@12
 VerLanguageNameW@12
+VerSetConditionMask@13
 VerifyConsoleIoHandle@4
 VerifyVersionInfoA@16
 VerifyVersionInfoW@16
@@ -825,6 +839,7 @@ WriteProfileSectionW@8
 WriteProfileStringA@12
 WriteProfileStringW@12
 WriteTapemark@16
+ZombifyActCtx@4
 _hread@12
 _hwrite@12
 _lclose@4