diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 97e63b228..45b498ce0 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,24 @@ +2003-10-06 Dimitri Papadopoulos + + * include/winbase.h [_WIN32_WINNT >= 0x0501] (ACTCTX_FLAG_*): + Add constants. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] (ACTCTX[AW]): Add + structures. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] (ActivateActCtx): Add + function. MSDN says the first argument is HACTCTX but I'm not sure + where such a specialized handle is defined, so use HANDLE instead. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] (AttachConsole, + CheckNameLegalDOS8Dot3[AW]): Add functions. + + * lib/user32.def (ActivateActCtx, AttachConsole, + CheckNameLegalDOS8Dot3[AW]): Add functions. + + * lib/user32.def (AddLocalAlternateComputerName[AW]): Add functions. + Unfortunately I don't know which header to put the declarations in. + 2003-10-06 Dimitri Papadopoulos * include/winnls.h (CTRY_KYRGYZSTAN, CTRY_MALDIVES, CTRY_MONGOLIA): diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index db0c7641e..68f6c49ed 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -514,6 +514,15 @@ extern "C" { #define SECURITY_VALID_SQOS_FLAGS 0x1F0000 #define INVALID_FILE_SIZE 0xFFFFFFFF #define TLS_OUT_OF_INDEXES (DWORD)0xFFFFFFFF +#if (_WIN32_WINNT >= 0x0501) +#define ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID 0x00000001 +#define ACTCTX_FLAG_LANGID_VALID 0x00000002 +#define ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID 0x00000004 +#define ACTCTX_FLAG_RESOURCE_NAME_VALID 0x00000008 +#define ACTCTX_FLAG_SET_PROCESS_DEFAULT 0x00000010 +#define ACTCTX_FLAG_APPLICATION_NAME_VALID 0x00000020 +#define ACTCTX_FLAG_HMODULE_VALID 0x00000080 +#endif #ifndef RC_INVOKED typedef struct _FILETIME { @@ -937,6 +946,32 @@ typedef struct _WIN_CERTIFICATE { WORD wCertificateType; BYTE bCertificate[1]; } WIN_CERTIFICATE, *LPWIN_CERTIFICATE; +#if (_WIN32_WINNT >= 0x0501) +typedef struct tagACTCTXA { + ULONG cbSize; + DWORD dwFlags; + LPCSTR lpSource; + USHORT wProcessorArchitecture; + LANGID wLangId; + LPCSTR lpAssemblyDirectory; + LPCSTR lpResourceName; + LPCSTR lpApplicationName; + HMODULE hModule; +} ACTCTXA,*PACTCTXA; +typedef const ACTCTXA *PCACTCTXA; +typedef struct tagACTCTXW { + ULONG cbSize; + DWORD dwFlags; + LPCWSTR lpSource; + USHORT wProcessorArchitecture; + LANGID wLangId; + LPCWSTR lpAssemblyDirectory; + LPCWSTR lpResourceName; + LPCWSTR lpApplicationName; + HMODULE hModule; +} ACTCTXW,*PACTCTXW; +typedef const ACTCTXW *PCACTCTXW; +#endif 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); @@ -968,6 +1003,9 @@ UINT WINAPI _lwrite(HFILE,LPCSTR,UINT); BOOL WINAPI AccessCheck(PSECURITY_DESCRIPTOR,HANDLE,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,PDWORD,PDWORD,PBOOL); BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,PDWORD,PBOOL,PBOOL); BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,PDWORD,PBOOL,PBOOL); +#if (_WIN32_WINNT >= 0x0501) +BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR*); +#endif BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); BOOL WINAPI AddAccessDeniedAce(PACL,DWORD,DWORD,PSID); #if (_WIN32_WINNT >= 0x0500) @@ -1001,6 +1039,10 @@ BOOL WINAPI CallNamedPipeA(LPCSTR,PVOID,DWORD,PVOID,DWORD,PDWORD,DWORD); BOOL WINAPI CallNamedPipeW(LPCWSTR,PVOID,DWORD,PVOID,DWORD,PDWORD,DWORD); BOOL WINAPI CancelIo(HANDLE); BOOL WINAPI CancelWaitableTimer(HANDLE); +#if (_WIN32_WINNT >= 0x0501) +BOOL WINAPI CheckNameLegalDOS8Dot3A(LPCSTR,LPSTR,DWORD,PBOOL,PBOOL); +BOOL WINAPI CheckNameLegalDOS8Dot3W(LPCWSTR,LPSTR,DWORD,PBOOL,PBOOL); +#endif BOOL WINAPI ClearCommBreak(HANDLE); BOOL WINAPI ClearCommError(HANDLE,PDWORD,LPCOMSTAT); BOOL WINAPI ClearEventLogA(HANDLE,LPCSTR); @@ -1689,6 +1731,10 @@ typedef enum _COMPUTER_NAME_FORMAT typedef STARTUPINFOW STARTUPINFO,*LPSTARTUPINFO; typedef WIN32_FIND_DATAW WIN32_FIND_DATA,*LPWIN32_FIND_DATA; typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO; +#if (_WIN32_WINNT >= 0x0501) +typedef ACTCTXW ACTCTX,*PACTCTX; +typedef PCACTCTXW PCACTCTX; +#endif #define AccessCheckAndAuditAlarm AccessCheckAndAuditAlarmW #define AddAtom AddAtomW #define BackupEventLog BackupEventLogW @@ -1696,6 +1742,9 @@ typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO; #define BuildCommDCB BuildCommDCBW #define BuildCommDCBAndTimeouts BuildCommDCBAndTimeoutsW #define CallNamedPipe CallNamedPipeW +#if (_WIN32_WINNT >= 0x0501) +#define CheckNameLegalDOS8Dot3 CheckNameLegalDOS8Dot3W +#endif #define ClearEventLog ClearEventLogW #define CommConfigDialog CommConfigDialogW #define CopyFile CopyFileW @@ -1850,6 +1899,10 @@ typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO; typedef STARTUPINFOA STARTUPINFO,*LPSTARTUPINFO; typedef WIN32_FIND_DATAA WIN32_FIND_DATA,*LPWIN32_FIND_DATA; typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO; +#if (_WIN32_WINNT >= 0x0501) +typedef ACTCTXA ACTCTX,*PACTCTX; +typedef PCACTCTXA PCACTCTX; +#endif #define AccessCheckAndAuditAlarm AccessCheckAndAuditAlarmA #define AddAtom AddAtomA #define BackupEventLog BackupEventLogA @@ -1857,6 +1910,9 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO; #define BuildCommDCB BuildCommDCBA #define BuildCommDCBAndTimeouts BuildCommDCBAndTimeoutsA #define CallNamedPipe CallNamedPipeA +#if (_WIN32_WINNT >= 0x0501) +#define CheckNameLegalDOS8Dot3 CheckNameLegalDOS8Dot3A +#endif #define ClearEventLog ClearEventLogA #define CommConfigDialog CommConfigDialogA #define CopyFile CopyFileA diff --git a/winsup/w32api/include/wincon.h b/winsup/w32api/include/wincon.h index b10f4ad56..6c92f09ce 100644 --- a/winsup/w32api/include/wincon.h +++ b/winsup/w32api/include/wincon.h @@ -122,6 +122,9 @@ typedef struct _INPUT_RECORD { } INPUT_RECORD,*PINPUT_RECORD; BOOL WINAPI AllocConsole(void); +#if (_WIN32_WINNT >= 0x05001) +BOOL WINAPI AttachConsole(DWORD); +#endif HANDLE WINAPI CreateConsoleScreenBuffer(DWORD,DWORD,CONST SECURITY_ATTRIBUTES*,DWORD,LPVOID); BOOL WINAPI FillConsoleOutputAttribute(HANDLE,WORD,DWORD,COORD,PDWORD); BOOL WINAPI FillConsoleOutputCharacterA(HANDLE,CHAR,DWORD,COORD,PDWORD); diff --git a/winsup/w32api/lib/kernel32.def b/winsup/w32api/lib/kernel32.def index 409532f79..423701bf5 100644 --- a/winsup/w32api/lib/kernel32.def +++ b/winsup/w32api/lib/kernel32.def @@ -1,13 +1,17 @@ LIBRARY KERNEL32.dll EXPORTS +ActivateActCtx@8 AddAtomA@4 AddAtomW@4 AddConsoleAliasA@12 AddConsoleAliasW@12 +AddLocalAlternateComputerNameA@8 +AddLocalAlternateComputerNameW@8 AllocConsole@0 AllocateUserPhysicalPages@12 AreFileApisANSI@0 AssignProcessToJobObject@8 +AttachConsole@4 BackupRead@28 BackupSeek@24 BackupWrite@28 @@ -25,6 +29,8 @@ CancelIo@4 CancelTimerQueueTimer@8 CancelWaitableTimer@4 ChangeTimerQueueTimer@16 +CheckNameLegalDOS8Dot3A@20 +CheckNameLegalDOS8Dot3W@20 ClearCommBreak@4 ClearCommError@12 CloseConsoleHandle@4