diff options
Diffstat (limited to 'winsup/w32api/include')
| -rw-r--r-- | winsup/w32api/include/routprot.h | 8 | ||||
| -rw-r--r-- | winsup/w32api/include/sdkddkver.h | 141 | ||||
| -rw-r--r-- | winsup/w32api/include/setupapi.h | 12 | ||||
| -rw-r--r-- | winsup/w32api/include/shobjidl.h | 143 | ||||
| -rw-r--r-- | winsup/w32api/include/winbase.h | 12 | ||||
| -rw-r--r-- | winsup/w32api/include/windows.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/winnt.h | 13 | ||||
| -rw-r--r-- | winsup/w32api/include/winsock.h | 4 | ||||
| -rw-r--r-- | winsup/w32api/include/winsock2.h | 4 | ||||
| -rw-r--r-- | winsup/w32api/include/winuser.h | 4 | ||||
| -rw-r--r-- | winsup/w32api/include/winver.h | 4 | ||||
| -rw-r--r-- | winsup/w32api/include/wtsapi32.h | 52 |
12 files changed, 25 insertions, 374 deletions
diff --git a/winsup/w32api/include/routprot.h b/winsup/w32api/include/routprot.h index 319835fef..54fe9ee68 100644 --- a/winsup/w32api/include/routprot.h +++ b/winsup/w32api/include/routprot.h @@ -43,10 +43,6 @@ extern "C" { #define IPX_PROTOCOL_NLSP 0x00020002 /*--- Router Management Reference - Router Management Structures */ #if (_WIN32_WINNT >= 0x0500) -typedef struct IP_LOCAL_BINDING { - DWORD Address; - DWORD Mask; -} IP_LOCAL_BINDING,*PIP_LOCAL_BINDING; typedef struct IP_ADAPTER_BINDING_INFO { ULONG AddressCount; DWORD RemoteAddress; @@ -54,6 +50,10 @@ typedef struct IP_ADAPTER_BINDING_INFO { ULONGLONG Speed; IP_LOCAL_BINDING Address[]; } IP_ADAPTER_BINDING_INFO,*PIP_ADAPTER_BINDING_INFO; +typedef struct IP_LOCAL_BINDING { + DWORD Address; + DWORD Mask; +} IP_LOCAL_BINDING,*PIP_LOCAL_BINDING; typedef struct IPX_ADAPTER_BINDING_INFO { ULONG AdapterIndex; UCHAR Network[4]; diff --git a/winsup/w32api/include/sdkddkver.h b/winsup/w32api/include/sdkddkver.h deleted file mode 100644 index 3005cf5ab..000000000 --- a/winsup/w32api/include/sdkddkver.h +++ /dev/null @@ -1,141 +0,0 @@ -/** - sdkddkver.h - Versioning file for Windows SDK/DDK. - - This file is part of a free library for the Windows API. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ -#ifndef _SDKDDKVER_H -#define _SDKDDKVER_H - -/** - * Define version masks - * http://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85).aspx - * Values and names are guessed based on comments in the documentation. - */ -#define OSVERSION_MASK 0xFFFF0000 -#define SPVERSION_MASK 0x0000FF00 -#define SUBVERSION_MASK 0x000000FF - -/** - * Macros to extract values from NTDDI version. - * Derived from comments on MSDN or social.microsoft.com - */ -#define OSVER(ver) ((ver) & OSVERSION_MASK) -#define SPVER(ver) (((ver) & SPVERSION_MASK) >> 8) -#define SUBVER(ver) ((ver) & SUBVERSION_MASK) - -/** - * Macros to create the minimal NTDDI version from _WIN32_WINNT value. - */ -#define NTDDI_VERSION_FROM_WIN32_WINNT(ver) _NTDDI_VERSION_FROM_WIN32_WINNT(ver) -#define _NTDDI_VERSION_FROM_WIN32_WINNT(ver) ver##0000 - -/** - * Version constants defining _WIN32_WINNT versions. - * http://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85).aspx - */ -#define _WIN32_WINNT_NT4 0x0400 -#define _WIN32_WINNT_WIN2K 0x0500 -#define _WIN32_WINNT_WINXP 0x0501 -#define _WIN32_WINNT_WS03 0x0502 -#define _WIN32_WINNT_WIN6 0x0600 -#define _WIN32_WINNT_VISTA 0x0600 -#define _WIN32_WINNT_WS08 0x0600 -#define _WIN32_WINNT_LONGORN 0x0600 -#define _WIN32_WINNT_WIN7 0x0601 - -/** - * Version constants defining _WIN32_IE versions. - * http://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85).aspx - */ -#define _WIN32_IE_IE50 0x0500 -#define _WIN32_IE_IE501 0x0501 -#define _WIN32_IE_IE55 0x0550 -#define _WIN32_IE_IE60 0x0600 -#define _WIN32_IE_IE60SP1 0x0601 -#define _WIN32_IE_IE60SP2 0x0603 -#define _WIN32_IE_IE70 0x0700 -#define _WIN32_IE_IE80 0x0800 - -/** - * Version constants defining NTDDI_VERSION. - * http://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85).aspx - */ -#define __NTDDI_WIN5 0x05000000 -#define __NTDDI_WIN51 0x05010000 -#define __NTDDI_WIN52 0x05020000 -#define __NTDDI_WIN6 0x06000000 -#define __NTDDI_WIN61 0x06010000 -#define __NTDDI_SP0 0x00000000 -#define __NTDDI_SP1 0x00000100 -#define __NTDDI_SP2 0x00000200 -#define __NTDDI_SP3 0x00000300 -#define __NTDDI_SP4 0x00000400 - -#define NTDDI_WIN2K __NTDDI_WIN5 + __NTDDI_SP0 -#define NTDDI_WIN2KSP1 __NTDDI_WIN5 + __NTDDI_SP1 -#define NTDDI_WIN2KSP2 __NTDDI_WIN5 + __NTDDI_SP2 -#define NTDDI_WIN2KSP3 __NTDDI_WIN5 + __NTDDI_SP3 -#define NTDDI_WIN2KSP4 __NTDDI_WIN5 + __NTDDI_SP4 - -#define NTDDI_WINXP __NTDDI_WIN51 + __NTDDI_SP0 -#define NTDDI_WINXPSP1 __NTDDI_WIN51 + __NTDDI_SP1 -#define NTDDI_WINXPSP2 __NTDDI_WIN51 + __NTDDI_SP2 -#define NTDDI_WINXPSP3 __NTDDI_WIN51 + __NTDDI_SP3 - -#define NTDDI_WS03 __NTDDI_WIN52 + __NTDDI_SP0 -#define NTDDI_WS03SP1 __NTDDI_WIN52 + __NTDDI_SP1 -#define NTDDI_WS03SP2 __NTDDI_WIN52 + __NTDDI_SP2 - -#define NTDDI_VISTA __NTDDI_WIN6 + __NTDDI_SP0 -#define NTDDI_VISTASP1 __NTDDI_WIN6 + __NTDDI_SP1 -#define NTDDI_VISTASP2 __NTDDI_WIN6 + __NTDDI_SP2 - -#define NTDDI_LONGHORN NTDDI_VISTA - -#define NTDDI_WIN6 NTDDI_VISTA -#define NTDDI_WIN6SP1 NTDDI_VISTASP1 -#define NTDDI_WIN6SP2 NTDDI_VISTASP2 - -#define NTDDI_WS08 __NTDDI_WIN6 + __NTDDI_SP1 - -#define NTDDI_WIN7 __NTDDI_WIN61 + __NTDDI_SP0 - -/** - * Assign defaults - */ -#ifdef NTDDI_VERSION -# ifdef _WIN32_WINNT -# if _WIN32_WINNT != OSDIR(NTDDI_VERSION) -# error The _WIN32_WINNT value does not match NTDDI_VERSION -# endif -# else -# define _WIN32_WINNT OSVER(NTDDI_VERSION) -# ifndef WINVER -# define WINVER _WIN32_WINNT -# endif -# endif -#endif - -#ifndef _WIN32_WINNT -# ifdef WINVER -# define _WIN32_WINNT WINVER -# else -# warning _WIN32_WINNT is defaulting to _WIN32_WINNT_WIN2K -# define _WIN32_WINNT _WIN32_WINNT_WIN2K -# endif -#endif - -#ifndef WINVER -# define WINVER _WIN32_WINNT -#endif - -#ifndef NTDDI_VERSION -# warning NTDDI_VERSION is defaulting to _WIN32_WINNT version SPK0 -# define NTDDI_VERSION NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT) -#endif - -#endif diff --git a/winsup/w32api/include/setupapi.h b/winsup/w32api/include/setupapi.h index 8fc7a6c82..ef38852a2 100644 --- a/winsup/w32api/include/setupapi.h +++ b/winsup/w32api/include/setupapi.h @@ -1046,7 +1046,7 @@ WINSETUPAPI BOOL WINAPI SetupAdjustDiskSpaceListA(HDSKSPC,LPCSTR,LONGLONG,PVOID, WINSETUPAPI BOOL WINAPI SetupAdjustDiskSpaceListW(HDSKSPC,LPCWSTR,LONGLONG,PVOID,UINT); WINSETUPAPI UINT WINAPI SetupBackupErrorA(HWND,PCSTR,PCSTR,PCSTR,UINT,DWORD); WINSETUPAPI UINT WINAPI SetupBackupErrorW(HWND,PCWSTR,PCWSTR,PCWSTR,UINT,DWORD); -WINSETUPAPI BOOL WINAPI SetupCancelTemporarySourceList(VOID); +WINSETUPAPI BOOL WINAPI SetupCancelTemporary(VOID); WINSETUPAPI BOOL WINAPI SetupCloseFileQueue(HSPFILEQ); WINSETUPAPI VOID WINAPI SetupCloseInfFile(HINF); WINSETUPAPI VOID WINAPI SetupCloseLog(VOID); @@ -1157,7 +1157,7 @@ WINSETUPAPI BOOL WINAPI SetupDiGetINFClassW(PCWSTR,LPGUID,PWSTR,DWORD,PDWORD); WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDevice(HDEVINFO,PSP_DEVINFO_DATA); WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDriverA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A); WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDriverW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W); -WINSETUPAPI HPROPSHEETPAGE WINAPI SetupDiGetWizardPage(HDEVINFO,PSP_DEVINFO_DATA,PSP_INSTALLWIZARD_DATA,DWORD,DWORD); +WINSETUPAPI HPROPSHEETPAGE WINAPI SetupDiGetWizardage(HDEVINFO,PSP_DEVINFO_DATA,PSP_INSTALLWIZARD_DATA,DWORD,DWORD); WINSETUPAPI BOOL WINAPI SetupDiInstallClassA(HWND,PCSTR,DWORD,HSPFILEQ); WINSETUPAPI BOOL WINAPI SetupDiInstallClassW(HWND,PCWSTR,DWORD,HSPFILEQ); WINSETUPAPI BOOL WINAPI SetupDiInstallClassExA(HWND,PCSTR,DWORD,HSPFILEQ,CONST GUID*,PVOID,PVOID); @@ -1204,8 +1204,8 @@ WINSETUPAPI BOOL WINAPI SetupFindFirstLineW(HINF,PCWSTR,PCWSTR,PINFCONTEXT); WINSETUPAPI BOOL WINAPI SetupFindNextLine(PINFCONTEXT,PINFCONTEXT); WINSETUPAPI BOOL WINAPI SetupFindNextMatchLineA(PINFCONTEXT,PCSTR,PINFCONTEXT); WINSETUPAPI BOOL WINAPI SetupFindNextMatchLineW(PINFCONTEXT,PCWSTR,PINFCONTEXT); -WINSETUPAPI BOOL WINAPI SetupFreeSourceListA(PCSTR**,UINT); -WINSETUPAPI BOOL WINAPI SetupFreeSourceListW(PCWSTR**,UINT); +WINSETUPAPI BOOL WINAPI SetupFreeA(PCSTR**,UINT); +WINSETUPAPI BOOL WINAPI SetupFreeW(PCWSTR**,UINT); WINSETUPAPI BOOL WINAPI SetupGetBackupInformationA(HSPFILEQ,PSP_BACKUP_QUEUE_PARAMS_A); WINSETUPAPI BOOL WINAPI SetupGetBackupInformationW(HSPFILEQ,PSP_BACKUP_QUEUE_PARAMS_W); WINSETUPAPI BOOL WINAPI SetupGetBinaryField(PINFCONTEXT,DWORD,PBYTE,DWORD,LPDWORD); @@ -1267,8 +1267,8 @@ WINSETUPAPI HINF WINAPI SetupOpenMasterInf(VOID); WINSETUPAPI UINT WINAPI SetupPromptForDiskA(HWND,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,DWORD,PSTR,DWORD,PDWORD); WINSETUPAPI UINT WINAPI SetupPromptForDiskW(HWND,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,DWORD,PWSTR,DWORD,PDWORD); WINSETUPAPI INT WINAPI SetupPromptReboot(HSPFILEQ,HWND,BOOL); -WINSETUPAPI BOOL WINAPI SetupQuerySourceListA(DWORD,PCSTR**,PUINT); -WINSETUPAPI BOOL WINAPI SetupQuerySourceListW(DWORD,PCWSTR**,PUINT); +WINSETUPAPI BOOL WINAPI SetupQueryA(DWORD,PCSTR**,PUINT); +WINSETUPAPI BOOL WINAPI SetupQueryW(DWORD,PCWSTR**,PUINT); WINSETUPAPI BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC,PSTR,DWORD,PDWORD); WINSETUPAPI BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC,PWSTR,DWORD,PDWORD); WINSETUPAPI BOOL WINAPI SetupQueryFileLogA(HSPFILELOG,PCSTR,PCSTR,SetupFileLogInfo,PSTR,DWORD,PDWORD); diff --git a/winsup/w32api/include/shobjidl.h b/winsup/w32api/include/shobjidl.h deleted file mode 100644 index c69e5cf72..000000000 --- a/winsup/w32api/include/shobjidl.h +++ /dev/null @@ -1,143 +0,0 @@ -#ifndef _SHLOBJIDL_H -#define _SHLOBJIDL_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#include <ole2.h> -#include <shlguid.h> -#include <shellapi.h> -#pragma pack(push,1) -#include <commctrl.h> - -extern const IID IID_ITaskbarList3; -extern const GUID CLSID_ITaskbarList; - -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd562322%28v=vs.85%29.aspx */ -typedef enum THUMBBUTTONMASK { - THB_BITMAP = 0x00000001, - THB_ICON = 0x00000002, - THB_TOOLTIP = 0x00000004, - THB_FLAGS = 0x00000008 -} THUMBBUTTONMASK; - -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd562321%28v=vs.85%29.aspx */ -typedef enum THUMBBUTTONFLAGS { - THBF_ENABLED = 0x00000000, - THBF_DISABLED = 0x00000001, - THBF_DISMISSONCLICK = 0x00000002, - THBF_NOBACKGROUND = 0x00000004, - THBF_HIDDEN = 0x00000008, - THBF_NONINTERACTIVE = 0x00000010 -} THUMBBUTTONFLAGS; - -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391559%28v=vs.85%29.aspx */ -typedef struct THUMBBUTTON { - THUMBBUTTONMASK dwMask; - UINT iId; - UINT iBitmap; - HICON hIcon; - WCHAR szTip[260]; - THUMBBUTTONFLAGS dwFlags; -} THUMBBUTTON, *LPTHUMBBUTTON; - -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391697%28v=vs.85%29.aspx */ -typedef enum TBPFLAG { - TBPF_NOPROGRESS = 0x00000000, - TBPF_INDETERMINATE = 0x00000001, - TBPF_NORMAL = 0x00000002, - TBPF_ERROR = 0x00000004, - TBPF_PAUSED = 0x00000008 -} TBPFLAG; - -/* http://msdn.microsoft.com/en-us/library/windows/desktop/bb774652%28v=vs.85%29.aspx */ -#define INTERFACE ITaskbarList -DECLARE_INTERFACE_(ITaskbarList, IUnknown) -{ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/bb774650%28v=vs.85%29.aspx */ - STDMETHOD(HrInit)(THIS) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/bb774646%28v=vs.85%29.aspx */ - STDMETHOD(AddTab)(THIS_ HWND) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/bb774648%28v=vs.85%29.aspx */ - STDMETHOD(DeleteTab)(THIS_ HWND) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/bb774644%28v=vs.85%29.aspx */ - STDMETHOD(ActivateTab)(THIS_ HWND) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/bb774655%28v=vs.85%29.aspx */ - STDMETHOD(SetActiveAlt)(THIS_ HWND) PURE; -}; -#undef INTERFACE -typedef ITaskbarList *LPTASKBARLIST; - -/* http://msdn.microsoft.com/en-us/library/windows/desktop/bb774638%28v=vs.85%29.aspx */ -#define INTERFACE ITaskbarList2 -DECLARE_INTERFACE_(ITaskbarList2, ITaskbarList) -{ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(HrInit)(THIS) PURE; - STDMETHOD(AddTab)(THIS_ HWND) PURE; - STDMETHOD(DeleteTab)(THIS_ HWND) PURE; - STDMETHOD(ActivateTab)(THIS_ HWND) PURE; - STDMETHOD(SetActiveAlt)(THIS_ HWND) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/bb774640%28v=vs.85%29.aspx */ - STDMETHOD(MarkFullscreenWindow)(THIS_ HWND,BOOL) PURE; -}; -#undef INTERFACE -typedef ITaskbarList2 *LPTASKBARLIST2; - -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391692%28v=vs.85%29.aspx */ -#define INTERFACE ITaskbarList3 -DECLARE_INTERFACE_(ITaskbarList3, ITaskbarList2) -{ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(HrInit)(THIS) PURE; - STDMETHOD(AddTab)(THIS_ HWND) PURE; - STDMETHOD(DeleteTab)(THIS_ HWND) PURE; - STDMETHOD(ActivateTab)(THIS_ HWND) PURE; - STDMETHOD(SetActiveAlt)(THIS_ HWND) PURE; - STDMETHOD(MarkFullscreenWindow)(THIS_ HWND,BOOL) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391698%28v=vs.85%29.aspx */ - STDMETHOD(SetProgressValue)(THIS_ ULONGLONG,ULONGLONG) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391697%28v=vs.85%29.aspx */ - STDMETHOD(SetProgressState)(THIS_ HWND,TBPFLAG) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391694%28v=vs.85%29.aspx */ - STDMETHOD(RegisterTab)(THIS_ HWND,HWND) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391706%28v=vs.85%29.aspx */ - STDMETHOD(UnregisterTab)(THIS_ HWND) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391700%28v=vs.85%29.aspx */ - STDMETHOD(SetTabOrder)(THIS_ HWND,HWND) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391699%28v=vs.85%29.aspx */ - STDMETHOD(SetTabActive)(THIS_ HWND,HWND,DWORD) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391703%28v=vs.85%29.aspx */ - STDMETHOD(ThumbBarAddButtons)(THIS_ HWND,UINT,LPTHUMBBUTTON) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391705%28v=vs.85%29.aspx */ - STDMETHOD(ThumbBarUpdateButtons)(THIS_ HWND,UINT,LPTHUMBBUTTON) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391704%28v=vs.85%29.aspx */ - STDMETHOD(ThumbBarSetImageList)(THIS_ HWND,HIMAGELIST) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391696%28v=vs.85%29.aspx */ - STDMETHOD(SetOverlayIcon)(THIS_ HWND,HICON,LPCWSTR) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391702%28v=vs.85%29.aspx */ - STDMETHOD(SetThumbnailTooltip)(THIS_ HWND,LPCWSTR) PURE; -/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd391701%28v=vs.85%29.aspx */ - STDMETHOD(SetThumbnailClip)(THIS_ HWND,RECT*) PURE; -}; -#undef INTERFACE -typedef ITaskbarList3 *LPTASKBARLIST3; - -#pragma pack(pop) -#ifdef __cplusplus -} -#endif - - -#endif /* _SHLOBJIDL_H */ diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index aa168418b..3d206794d 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1648,7 +1648,7 @@ WINBASEAPI DWORD WINAPI GetModuleFileNameA(HINSTANCE,LPSTR,DWORD); WINBASEAPI DWORD WINAPI GetModuleFileNameW(HINSTANCE,LPWSTR,DWORD); WINBASEAPI HMODULE WINAPI GetModuleHandleA(LPCSTR); WINBASEAPI HMODULE WINAPI GetModuleHandleW(LPCWSTR); -#if (_WIN32_WINNT >= 0x0501) +#if (_WIN32_WINNT >= 0x0500) WINBASEAPI BOOL WINAPI GetModuleHandleExA(DWORD,LPCSTR,HMODULE*); WINBASEAPI BOOL WINAPI GetModuleHandleExW(DWORD,LPCWSTR,HMODULE*); #endif @@ -1846,8 +1846,8 @@ LONG WINAPI InterlockedCompareExchange(LONG volatile *,LONG,LONG); /* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */ #define InterlockedCompareExchangePointer(d,e,c) \ (PVOID)InterlockedCompareExchange((LONG volatile *)(d),(LONG)(e),(LONG)(c)) -LONG __cdecl InterlockedDecrement(LONG volatile *); -LONG __cdecl InterlockedExchange(LONG volatile *,LONG); +LONG WINAPI InterlockedDecrement(LONG volatile *); +LONG WINAPI InterlockedExchange(LONG volatile *,LONG); /* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */ #define InterlockedExchangePointer(t,v) \ (PVOID)InterlockedExchange((LONG volatile *)(t),(LONG)(v)) @@ -1855,7 +1855,7 @@ LONG WINAPI InterlockedExchangeAdd(LONG volatile *,LONG); #if (_WIN32_WINNT >= 0x0501) PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); #endif -LONG __cdecl InterlockedIncrement(LONG volatile *); +LONG WINAPI InterlockedIncrement(LONG volatile *); #if (_WIN32_WINNT >= 0x0501) PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY); @@ -2339,7 +2339,7 @@ typedef PCACTCTXW PCACTCTX; #endif #define GetModuleFileName GetModuleFileNameW #define GetModuleHandle GetModuleHandleW -#if (_WIN32_WINNT >= 0x0501) +#if (_WIN32_WINNT >= 0x0500) #define GetModuleHandleEx GetModuleHandleExW #endif #define GetNamedPipeHandleState GetNamedPipeHandleStateW @@ -2546,7 +2546,7 @@ typedef PCACTCTXA PCACTCTX; #endif #define GetNamedPipeHandleState GetNamedPipeHandleStateA #define GetModuleHandle GetModuleHandleA -#if (_WIN32_WINNT >= 0x0501) +#if (_WIN32_WINNT >= 0x0500) #define GetModuleHandleEx GetModuleHandleExA #endif #define GetModuleFileName GetModuleFileNameA diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h index db18aec8d..97e037e90 100644 --- a/winsup/w32api/include/windows.h +++ b/winsup/w32api/include/windows.h @@ -16,8 +16,6 @@ #pragma GCC system_header #endif -#include <sdkddkver.h> - /* translate GCC target defines to MS equivalents. Keep this synchronized with winnt.h. */ #if defined(__i686__) && !defined(_M_IX86) diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index d650bf800..b31274bbe 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -4035,19 +4035,6 @@ struct _TEB * NtCurrentTeb(void); #endif /* __GNUC__ */ #endif /* _X86_ */ -#if _WIN32_WINNT >= _WIN32_WINNT_VISTA -# if defined(_AMD64_) || defined(__X86_64) -# define MemoryBarrier __faststorefence -# elif defined(_IA64_) -# define MemoryBarrier __mf -# else - void __mingworg_MemoryBarrier(void); -# define MemoryBarrier __mingworg_MemoryBarrier -# endif -#else -# define MemoryBarrier -#endif - #endif /* RC_INVOKED */ #ifdef __cplusplus diff --git a/winsup/w32api/include/winsock.h b/winsup/w32api/include/winsock.h index 929c10348..b595b597c 100644 --- a/winsup/w32api/include/winsock.h +++ b/winsup/w32api/include/winsock.h @@ -240,7 +240,7 @@ typedef struct WSAData { } WSADATA; typedef WSADATA *LPWSADATA; -#ifndef __INSIDE_MSYS__ +#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) #define IP_OPTIONS 1 #define SO_DEBUG 1 #define SO_ACCEPTCONN 2 @@ -260,7 +260,7 @@ typedef WSADATA *LPWSADATA; #define SO_RCVTIMEO 0x1006 #define SO_ERROR 0x1007 #define SO_TYPE 0x1008 -#endif /* !__INSIDE_MSYS__ */ +#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ /* * Note that the next 5 IP defines are specific to WinSock 1.1 (wsock32.dll). * They will cause errors or unexpected results if used with the diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h index 0279227b4..260c3fa5f 100644 --- a/winsup/w32api/include/winsock2.h +++ b/winsup/w32api/include/winsock2.h @@ -331,7 +331,7 @@ typedef WSADATA *LPWSADATA; #define AF_12844 25 #define AF_IRDA 26 #define AF_NETDES 28 -#ifndef __INSIDE_MSYS__ +#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) #define AF_MAX 29 struct sockaddr { u_short sa_family; @@ -359,7 +359,7 @@ struct sockaddr_storage { __int64 __ss_align; /* force alignment */ char __ss_pad2[_SS_PAD2SIZE]; /* pad to 128 */ }; -#endif /* !__INSIDE_MSYS__ */ +#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ struct sockproto { u_short sp_family; diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 76f493584..7fb6fe224 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -2771,7 +2771,7 @@ typedef struct tagMENUITEMINFOA { HMENU hSubMenu; HBITMAP hbmpChecked; HBITMAP hbmpUnchecked; - ULONG_PTR dwItemData; + DWORD dwItemData; LPSTR dwTypeData; UINT cch; #if (_WIN32_WINNT >= 0x0500) @@ -2788,7 +2788,7 @@ typedef struct tagMENUITEMINFOW { HMENU hSubMenu; HBITMAP hbmpChecked; HBITMAP hbmpUnchecked; - ULONG_PTR dwItemData; + DWORD dwItemData; LPWSTR dwTypeData; UINT cch; #if (_WIN32_WINNT >= 0x0500) diff --git a/winsup/w32api/include/winver.h b/winsup/w32api/include/winver.h index f5a0dab85..9f8c9b76c 100644 --- a/winsup/w32api/include/winver.h +++ b/winsup/w32api/include/winver.h @@ -107,8 +107,8 @@ BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,PVOID); BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,PVOID); DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD); DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); -BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,PUINT); -BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,PUINT); +BOOL WINAPI VerQueryValueA(const LPVOID,LPCSTR,LPVOID*,PUINT); +BOOL WINAPI VerQueryValueW(const LPVOID,LPCWSTR,LPVOID*,PUINT); #ifdef UNICODE #define VerFindFile VerFindFileW #define VerQueryValue VerQueryValueW diff --git a/winsup/w32api/include/wtsapi32.h b/winsup/w32api/include/wtsapi32.h index 298acb9b6..5bd09bbbd 100644 --- a/winsup/w32api/include/wtsapi32.h +++ b/winsup/w32api/include/wtsapi32.h @@ -74,7 +74,7 @@ BOOL WINAPI WTSQueryUserToken(ULONG SessionId, PHANDLE pToken); #endif /* _WIN32_WINNT >= 0x0501 */ -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) +#if (_WIN32_WINNT >= 0x0500) typedef struct _WTS_SESSION_INFOW { DWORD SessionId; @@ -168,56 +168,6 @@ BOOL WTSSendMessageW( #define WTSSendMessage WTSSendMessageA #endif -BOOL WTSVirtualChannelClose( - __in HANDLE hChannelHandle -); - -HANDLE WTSVirtualChannelOpen( - __in HANDLE hServer, - __in DWORD SessionId, - __in LPSTR pVirtualName -); - -#if _WIN32_WINNT >= _WIN32_WINNT_VISTA -HANDLE WTSVirtualChannelOpenEx( - __in DWORD SessionId, - __in LPSTR pVirtualName, - __in DWORD flags -); -#endif - -BOOL WTSVirtualChannelPurgeInput( - __in HANDLE hChannelHandle -); - -BOOL WTSVirtualChannelPurgeOutput( - __in HANDLE hChannelHandle -); - -#if _WIN32_WINNT >= _WIN32_WINNT_WINXP -BOOL WTSVirtualChannelQuery( - __in HANDLE hChannelHandle, - __in WTS_VIRTUAL_CLASS WtsVirtualClass, - __out PVOID *ppBuffer, - __out DWORD *pBytesReturned -); -#endif - -BOOL WTSVirtualChannelRead( - __in HANDLE hChannelHandle, - __in ULONG TimeOut, - __out PCHAR Buffer, - __in ULONG BufferSize, - __out PULONG pBytesRead -); - -BOOL WTSVirtualChannelWrite( - __in HANDLE hChannelHandle, - __in PCHAR Buffer, - __in ULONG Length, - __out PULONG pBytesWritten -); - #endif /* _WIN32_WINNT >= 0x0500 */ #ifdef __cplusplus |