Bug 1621726 - Part 2: Remove [NeedsWindowsUndef] attribute from webidl, r=peterv

Differential Revision: https://phabricator.services.mozilla.com/D69450

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nika Layzell 2020-04-06 15:06:32 +00:00
parent b6d18805e0
commit 0113f6578d
10 changed files with 178 additions and 125 deletions

View File

@ -9,8 +9,8 @@
* windows.h using #define. Adding a new constant should be a simple as adding
* its name (and optionally type) to this file.
*
* This file is processed by generate-windows-h-wrapper.py to generate a wrapper
* for the header which removes the defines usually implementing these constants.
* This file is processed by make-windows-h-wrapper.py to generate a wrapper for
* the header which removes the defines usually implementing these constants.
*
* Wrappers defined in this file will be declared as `constexpr` values,
* and will have their value derived from the windows.h define.
@ -57,3 +57,8 @@ auto GENERIC_READ;
auto GENERIC_WRITE;
auto GENERIC_EXECUTE;
auto GENERIC_ALL;
auto NO_ERROR;
auto WAIT_FAILED;
auto WAIT_ABANDONED;
auto WAIT_TIMEOUT;

View File

@ -8,8 +8,8 @@
* This file contains a series of C-style function prototypes for A/W-suffixed
* Win32 APIs defined by windows.h.
*
* This file is processed by generate-windows-h-wrapper.py to generate a wrapper
* for the header which removes the defines usually implementing these aliases.
* This file is processed by make-windows-h-wrapper.py to generate a wrapper for
* the header which removes the defines usually implementing these aliases.
*
* Wrappers defined in this file will have the 'stdcall' calling convention,
* will be defined as 'inline', and will only be defined if the corresponding
@ -39,7 +39,8 @@ BOOL NeedCurrentDirectoryForExePath(LPCTSTR);
BOOL CreateDirectory(LPCTSTR, LPSECURITY_ATTRIBUTES);
HANDLE CreateFile(LPCTSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE);
HANDLE CreateFile(LPCTSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD,
HANDLE);
BOOL DeleteFile(LPCTSTR);
@ -47,13 +48,15 @@ HANDLE FindFirstChangeNotification(LPCTSTR, BOOL, DWORD);
HANDLE FindFirstFile(LPCTSTR, LPWIN32_FIND_DATA);
HANDLE FindFirstFileEx(LPCTSTR, FINDEX_INFO_LEVELS, LPVOID, FINDEX_SEARCH_OPS, LPVOID, DWORD);
HANDLE FindFirstFileEx(LPCTSTR, FINDEX_INFO_LEVELS, LPVOID, FINDEX_SEARCH_OPS,
LPVOID, DWORD);
BOOL FindNextFile(HANDLE, LPWIN32_FIND_DATA);
BOOL GetDiskFreeSpace(LPCTSTR, LPDWORD, LPDWORD, LPDWORD, LPDWORD);
BOOL GetDiskFreeSpaceEx(LPCTSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER);
BOOL GetDiskFreeSpaceEx(LPCTSTR, PULARGE_INTEGER, PULARGE_INTEGER,
PULARGE_INTEGER);
UINT GetDriveType(LPCTSTR);
@ -75,7 +78,8 @@ DWORD GetCompressedFileSize(LPCTSTR, LPDWORD);
DWORD GetTempPath(DWORD, LPTSTR);
BOOL GetVolumeInformation(LPCTSTR, LPTSTR, DWORD, LPDWORD, LPDWORD, LPDWORD, LPTSTR, DWORD);
BOOL GetVolumeInformation(LPCTSTR, LPTSTR, DWORD, LPDWORD, LPDWORD, LPDWORD,
LPTSTR, DWORD);
UINT GetTempFileName(LPCTSTR, LPCTSTR, UINT, LPTSTR);
@ -93,9 +97,13 @@ HANDLE CreateMutexEx(LPSECURITY_ATTRIBUTES, LPCTSTR, DWORD, DWORD);
HANDLE CreateEventEx(LPSECURITY_ATTRIBUTES, LPCTSTR, DWORD, DWORD);
BOOL CreateProcess(LPCTSTR, LPTSTR, LPSECURITY_ATTRIBUTES, LPSECURITY_ATTRIBUTES, BOOL, DWORD, LPVOID, LPCTSTR, LPSTARTUPINFO, LPPROCESS_INFORMATION);
BOOL CreateProcess(LPCTSTR, LPTSTR, LPSECURITY_ATTRIBUTES,
LPSECURITY_ATTRIBUTES, BOOL, DWORD, LPVOID, LPCTSTR,
LPSTARTUPINFO, LPPROCESS_INFORMATION);
BOOL CreateProcessAsUser(HANDLE, LPCTSTR, LPTSTR, LPSECURITY_ATTRIBUTES, LPSECURITY_ATTRIBUTES, BOOL, DWORD, LPVOID, LPCTSTR, LPSTARTUPINFO, LPPROCESS_INFORMATION);
BOOL CreateProcessAsUser(HANDLE, LPCTSTR, LPTSTR, LPSECURITY_ATTRIBUTES,
LPSECURITY_ATTRIBUTES, BOOL, DWORD, LPVOID, LPCTSTR,
LPSTARTUPINFO, LPPROCESS_INFORMATION);
UINT GetSystemDirectory(LPTSTR, UINT);
@ -125,9 +133,11 @@ HMODULE LoadLibraryEx(LPCTSTR, HANDLE, DWORD);
int LoadString(HINSTANCE, UINT, LPTSTR, int);
BOOL EnumResourceLanguagesEx(HMODULE, LPCTSTR, LPCTSTR, ENUMRESLANGPROC, LONG_PTR, DWORD, LANGID);
BOOL EnumResourceLanguagesEx(HMODULE, LPCTSTR, LPCTSTR, ENUMRESLANGPROC,
LONG_PTR, DWORD, LANGID);
BOOL EnumResourceNamesEx(HMODULE, LPCTSTR, ENUMRESNAMEPROC, LONG_PTR, DWORD, LANGID);
BOOL EnumResourceNamesEx(HMODULE, LPCTSTR, ENUMRESNAMEPROC, LONG_PTR, DWORD,
LANGID);
BOOL EnumResourceTypesEx(HMODULE, ENUMRESTYPEPROC, LONG_PTR, DWORD, LANGID);
@ -143,7 +153,7 @@ BOOL SetEnvironmentStrings(LPTCH);
BOOL SetFileShortName(HANDLE, LPCTSTR);
DWORD FormatMessage(DWORD, LPCVOID, DWORD, DWORD, LPTSTR, DWORD, va_list *);
DWORD FormatMessage(DWORD, LPCVOID, DWORD, DWORD, LPTSTR, DWORD, va_list*);
HANDLE CreateMailslot(LPCTSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES);
@ -153,7 +163,7 @@ BOOL DecryptFile(LPCTSTR, DWORD);
BOOL FileEncryptionStatus(LPCTSTR, LPDWORD);
DWORD OpenEncryptedFileRaw(LPCTSTR, ULONG, PVOID *);
DWORD OpenEncryptedFileRaw(LPCTSTR, ULONG, PVOID*);
HANDLE OpenMutex(DWORD, BOOL, LPCTSTR);
@ -165,13 +175,16 @@ HANDLE CreateWaitableTimer(LPSECURITY_ATTRIBUTES, BOOL, LPCTSTR);
HANDLE OpenWaitableTimer(DWORD, BOOL, LPCTSTR);
HANDLE CreateSemaphoreEx(LPSECURITY_ATTRIBUTES, LONG, LONG, LPCTSTR, DWORD, DWORD);
HANDLE CreateSemaphoreEx(LPSECURITY_ATTRIBUTES, LONG, LONG, LPCTSTR, DWORD,
DWORD);
HANDLE CreateWaitableTimerEx(LPSECURITY_ATTRIBUTES, LPCTSTR, DWORD, DWORD);
HANDLE CreateFileMapping(HANDLE, LPSECURITY_ATTRIBUTES, DWORD, DWORD, DWORD, LPCTSTR);
HANDLE CreateFileMapping(HANDLE, LPSECURITY_ATTRIBUTES, DWORD, DWORD, DWORD,
LPCTSTR);
HANDLE CreateFileMappingNuma(HANDLE, LPSECURITY_ATTRIBUTES, DWORD, DWORD, DWORD, LPCTSTR, DWORD);
HANDLE CreateFileMappingNuma(HANDLE, LPSECURITY_ATTRIBUTES, DWORD, DWORD, DWORD,
LPCTSTR, DWORD);
HANDLE OpenFileMapping(DWORD, BOOL, LPCTSTR);
@ -191,7 +204,8 @@ BOOL EnumResourceTypes(HMODULE, ENUMRESTYPEPROC, LONG_PTR);
BOOL EnumResourceNames(HMODULE, LPCTSTR, ENUMRESNAMEPROC, LONG_PTR);
BOOL EnumResourceLanguages(HMODULE, LPCTSTR, LPCTSTR, ENUMRESLANGPROC, LONG_PTR);
BOOL EnumResourceLanguages(HMODULE, LPCTSTR, LPCTSTR, ENUMRESLANGPROC,
LONG_PTR);
HANDLE BeginUpdateResource(LPCTSTR, BOOL);
@ -225,7 +239,8 @@ BOOL WriteProfileSection(LPCTSTR, LPCTSTR);
UINT GetPrivateProfileInt(LPCTSTR, LPCTSTR, INT, LPCTSTR);
DWORD GetPrivateProfileString(LPCTSTR, LPCTSTR, LPCTSTR, LPTSTR, DWORD, LPCTSTR);
DWORD GetPrivateProfileString(LPCTSTR, LPCTSTR, LPCTSTR, LPTSTR, DWORD,
LPCTSTR);
BOOL WritePrivateProfileString(LPCTSTR, LPCTSTR, LPCTSTR, LPCTSTR);
@ -249,17 +264,19 @@ BOOL CreateDirectoryTransacted(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES, HANDLE);
BOOL RemoveDirectoryTransacted(LPCTSTR, HANDLE);
DWORD GetFullPathNameTransacted(LPCTSTR, DWORD, LPTSTR, LPTSTR *, HANDLE);
DWORD GetFullPathNameTransacted(LPCTSTR, DWORD, LPTSTR, LPTSTR*, HANDLE);
BOOL DefineDosDevice(DWORD, LPCTSTR, LPCTSTR);
DWORD QueryDosDevice(LPCTSTR, LPTSTR, DWORD);
HANDLE CreateFileTransacted(LPCTSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE, HANDLE, PUSHORT, PVOID);
HANDLE CreateFileTransacted(LPCTSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD,
DWORD, HANDLE, HANDLE, PUSHORT, PVOID);
BOOL SetFileAttributesTransacted(LPCTSTR, DWORD, HANDLE);
BOOL GetFileAttributesTransacted(LPCTSTR, GET_FILEEX_INFO_LEVELS, LPVOID, HANDLE);
BOOL GetFileAttributesTransacted(LPCTSTR, GET_FILEEX_INFO_LEVELS, LPVOID,
HANDLE);
DWORD GetCompressedFileSizeTransacted(LPCTSTR, LPDWORD, HANDLE);
@ -267,13 +284,15 @@ BOOL DeleteFileTransacted(LPCTSTR, HANDLE);
BOOL CheckNameLegalDOS8Dot3(LPCTSTR, LPSTR, DWORD, PBOOL, PBOOL);
HANDLE FindFirstFileTransacted(LPCTSTR, FINDEX_INFO_LEVELS, LPVOID, FINDEX_SEARCH_OPS, LPVOID, DWORD, HANDLE);
HANDLE FindFirstFileTransacted(LPCTSTR, FINDEX_INFO_LEVELS, LPVOID,
FINDEX_SEARCH_OPS, LPVOID, DWORD, HANDLE);
BOOL CopyFile(LPCTSTR, LPCTSTR, BOOL);
BOOL CopyFileEx(LPCTSTR, LPCTSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL, DWORD);
BOOL CopyFileTransacted(LPCTSTR, LPCTSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL, DWORD, HANDLE);
BOOL CopyFileTransacted(LPCTSTR, LPCTSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL,
DWORD, HANDLE);
BOOL MoveFile(LPCTSTR, LPCTSTR);
@ -281,7 +300,8 @@ BOOL MoveFileEx(LPCTSTR, LPCTSTR, DWORD);
BOOL MoveFileWithProgress(LPCTSTR, LPCTSTR, LPPROGRESS_ROUTINE, LPVOID, DWORD);
BOOL MoveFileTransacted(LPCTSTR, LPCTSTR, LPPROGRESS_ROUTINE, LPVOID, DWORD, HANDLE);
BOOL MoveFileTransacted(LPCTSTR, LPCTSTR, LPPROGRESS_ROUTINE, LPVOID, DWORD,
HANDLE);
BOOL ReplaceFile(LPCTSTR, LPCTSTR, LPCTSTR, DWORD, LPVOID, LPVOID);
@ -289,9 +309,11 @@ BOOL CreateHardLink(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES);
BOOL CreateHardLinkTransacted(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES, HANDLE);
HANDLE CreateNamedPipe(LPCTSTR, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, LPSECURITY_ATTRIBUTES);
HANDLE CreateNamedPipe(LPCTSTR, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD,
LPSECURITY_ATTRIBUTES);
BOOL GetNamedPipeHandleState(HANDLE, LPDWORD, LPDWORD, LPDWORD, LPDWORD, LPTSTR, DWORD);
BOOL GetNamedPipeHandleState(HANDLE, LPDWORD, LPDWORD, LPDWORD, LPDWORD, LPTSTR,
DWORD);
BOOL CallNamedPipe(LPCTSTR, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, DWORD);
@ -311,41 +333,65 @@ HANDLE RegisterEventSource(LPCTSTR, LPCTSTR);
HANDLE OpenBackupEventLog(LPCTSTR, LPCTSTR);
BOOL ReadEventLog(HANDLE, DWORD, DWORD, LPVOID, DWORD, DWORD *, DWORD *);
BOOL ReadEventLog(HANDLE, DWORD, DWORD, LPVOID, DWORD, DWORD*, DWORD*);
BOOL ReportEvent(HANDLE, WORD, WORD, DWORD, PSID, WORD, DWORD, LPCTSTR *, LPVOID);
BOOL ReportEvent(HANDLE, WORD, WORD, DWORD, PSID, WORD, DWORD, LPCTSTR*,
LPVOID);
BOOL AccessCheckAndAuditAlarm(LPCTSTR, LPVOID, LPTSTR, LPTSTR, PSECURITY_DESCRIPTOR, DWORD, PGENERIC_MAPPING, BOOL, LPDWORD, LPBOOL, LPBOOL);
BOOL AccessCheckAndAuditAlarm(LPCTSTR, LPVOID, LPTSTR, LPTSTR,
PSECURITY_DESCRIPTOR, DWORD, PGENERIC_MAPPING,
BOOL, LPDWORD, LPBOOL, LPBOOL);
BOOL AccessCheckByTypeAndAuditAlarm(LPCTSTR, LPVOID, LPCTSTR, LPCTSTR, PSECURITY_DESCRIPTOR, PSID, DWORD, AUDIT_EVENT_TYPE, DWORD, POBJECT_TYPE_LIST, DWORD, PGENERIC_MAPPING, BOOL, LPDWORD, LPBOOL, LPBOOL);
BOOL AccessCheckByTypeAndAuditAlarm(LPCTSTR, LPVOID, LPCTSTR, LPCTSTR,
PSECURITY_DESCRIPTOR, PSID, DWORD,
AUDIT_EVENT_TYPE, DWORD, POBJECT_TYPE_LIST,
DWORD, PGENERIC_MAPPING, BOOL, LPDWORD,
LPBOOL, LPBOOL);
BOOL AccessCheckByTypeResultListAndAuditAlarm(LPCTSTR, LPVOID, LPCTSTR, LPCTSTR, PSECURITY_DESCRIPTOR, PSID, DWORD, AUDIT_EVENT_TYPE, DWORD, POBJECT_TYPE_LIST, DWORD, PGENERIC_MAPPING, BOOL, LPDWORD, LPDWORD, LPBOOL);
BOOL AccessCheckByTypeResultListAndAuditAlarm(LPCTSTR, LPVOID, LPCTSTR, LPCTSTR,
PSECURITY_DESCRIPTOR, PSID, DWORD,
AUDIT_EVENT_TYPE, DWORD,
POBJECT_TYPE_LIST, DWORD,
PGENERIC_MAPPING, BOOL, LPDWORD,
LPDWORD, LPBOOL);
BOOL AccessCheckByTypeResultListAndAuditAlarmByHandle(LPCTSTR, LPVOID, HANDLE, LPCTSTR, LPCTSTR, PSECURITY_DESCRIPTOR, PSID, DWORD, AUDIT_EVENT_TYPE, DWORD, POBJECT_TYPE_LIST, DWORD, PGENERIC_MAPPING, BOOL, LPDWORD, LPDWORD, LPBOOL);
BOOL AccessCheckByTypeResultListAndAuditAlarmByHandle(
LPCTSTR, LPVOID, HANDLE, LPCTSTR, LPCTSTR, PSECURITY_DESCRIPTOR, PSID,
DWORD, AUDIT_EVENT_TYPE, DWORD, POBJECT_TYPE_LIST, DWORD, PGENERIC_MAPPING,
BOOL, LPDWORD, LPDWORD, LPBOOL);
BOOL ObjectOpenAuditAlarm(LPCTSTR, LPVOID, LPTSTR, LPTSTR, PSECURITY_DESCRIPTOR, HANDLE, DWORD, DWORD, PPRIVILEGE_SET, BOOL, BOOL, LPBOOL);
BOOL ObjectOpenAuditAlarm(LPCTSTR, LPVOID, LPTSTR, LPTSTR, PSECURITY_DESCRIPTOR,
HANDLE, DWORD, DWORD, PPRIVILEGE_SET, BOOL, BOOL,
LPBOOL);
BOOL ObjectPrivilegeAuditAlarm(LPCTSTR, LPVOID, HANDLE, DWORD, PPRIVILEGE_SET, BOOL);
BOOL ObjectPrivilegeAuditAlarm(LPCTSTR, LPVOID, HANDLE, DWORD, PPRIVILEGE_SET,
BOOL);
BOOL ObjectCloseAuditAlarm(LPCTSTR, LPVOID, BOOL);
BOOL ObjectDeleteAuditAlarm(LPCTSTR, LPVOID, BOOL);
BOOL PrivilegedServiceAuditAlarm(LPCTSTR, LPCTSTR, HANDLE, PPRIVILEGE_SET, BOOL);
BOOL PrivilegedServiceAuditAlarm(LPCTSTR, LPCTSTR, HANDLE, PPRIVILEGE_SET,
BOOL);
BOOL SetFileSecurity(LPCTSTR, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR);
BOOL GetFileSecurity(LPCTSTR, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD);
BOOL GetFileSecurity(LPCTSTR, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD,
LPDWORD);
BOOL IsBadStringPtr(LPCTSTR, UINT_PTR);
BOOL LookupAccountSid(LPCTSTR, PSID, LPTSTR, LPDWORD, LPTSTR, LPDWORD, PSID_NAME_USE);
BOOL LookupAccountSid(LPCTSTR, PSID, LPTSTR, LPDWORD, LPTSTR, LPDWORD,
PSID_NAME_USE);
BOOL LookupAccountName(LPCTSTR, LPCTSTR, PSID, LPDWORD, LPTSTR, LPDWORD, PSID_NAME_USE);
BOOL LookupAccountName(LPCTSTR, LPCTSTR, PSID, LPDWORD, LPTSTR, LPDWORD,
PSID_NAME_USE);
BOOL LookupAccountNameLocal(LPCTSTR, PSID, LPDWORD, LPTSTR, LPDWORD, PSID_NAME_USE);
BOOL LookupAccountNameLocal(LPCTSTR, PSID, LPDWORD, LPTSTR, LPDWORD,
PSID_NAME_USE);
BOOL LookupAccountSidLocal(PSID, LPTSTR, LPDWORD, LPTSTR, LPDWORD, PSID_NAME_USE);
BOOL LookupAccountSidLocal(PSID, LPTSTR, LPDWORD, LPTSTR, LPDWORD,
PSID_NAME_USE);
BOOL LookupPrivilegeValue(LPCTSTR, LPCTSTR, PLUID);
@ -371,7 +417,8 @@ BOOL GetUserName(LPTSTR, LPDWORD);
BOOL LogonUser(LPCTSTR, LPCTSTR, LPCTSTR, DWORD, DWORD, PHANDLE);
BOOL LogonUserEx(LPCTSTR, LPCTSTR, LPCTSTR, DWORD, DWORD, PHANDLE, PSID *, PVOID *, LPDWORD, PQUOTA_LIMITS);
BOOL LogonUserEx(LPCTSTR, LPCTSTR, LPCTSTR, DWORD, DWORD, PHANDLE, PSID*,
PVOID*, LPDWORD, PQUOTA_LIMITS);
HANDLE CreatePrivateNamespace(LPSECURITY_ATTRIBUTES, LPVOID, LPCTSTR);
@ -407,7 +454,8 @@ BOOL GetVolumePathNamesForVolumeName(LPCTSTR, LPTCH, DWORD, PDWORD);
HANDLE CreateActCtx(PCACTCTX);
BOOL FindActCtxSectionString(DWORD, const GUID *, ULONG, LPCTSTR, PACTCTX_SECTION_KEYED_DATA);
BOOL FindActCtxSectionString(DWORD, const GUID*, ULONG, LPCTSTR,
PACTCTX_SECTION_KEYED_DATA);
BOOLEAN CreateSymbolicLink(LPCTSTR, LPCTSTR, DWORD);
@ -417,19 +465,20 @@ int AddFontResource(LPCTSTR);
HMETAFILE CopyMetaFile(HMETAFILE, LPCTSTR);
HDC CreateDC(LPCTSTR, LPCTSTR, LPCTSTR, const DEVMODE *);
HDC CreateDC(LPCTSTR, LPCTSTR, LPCTSTR, const DEVMODE*);
HFONT CreateFontIndirect(const LOGFONT *);
HFONT CreateFontIndirect(const LOGFONT*);
HFONT CreateFont(int, int, int, int, int, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, LPCTSTR);
HFONT CreateFont(int, int, int, int, int, DWORD, DWORD, DWORD, DWORD, DWORD,
DWORD, DWORD, DWORD, LPCTSTR);
HDC CreateIC(LPCTSTR, LPCTSTR, LPCTSTR, const DEVMODE *);
HDC CreateIC(LPCTSTR, LPCTSTR, LPCTSTR, const DEVMODE*);
HDC CreateMetaFile(LPCTSTR);
BOOL CreateScalableFontResource(DWORD, LPCTSTR, LPCTSTR, LPCTSTR);
int DeviceCapabilities(LPCTSTR, LPCTSTR, WORD, LPTSTR, const DEVMODE *);
int DeviceCapabilities(LPCTSTR, LPCTSTR, WORD, LPTSTR, const DEVMODE*);
int EnumFontFamiliesEx(HDC, LPLOGFONT, FONTENUMPROC, LPARAM, DWORD);
@ -447,7 +496,8 @@ BOOL GetCharABCWidths(HDC, UINT, UINT, LPABC);
BOOL GetCharABCWidthsFloat(HDC, UINT, UINT, LPABCFLOAT);
DWORD GetGlyphOutline(HDC, UINT, UINT, LPGLYPHMETRICS, DWORD, LPVOID, const MAT2 *);
DWORD GetGlyphOutline(HDC, UINT, UINT, LPGLYPHMETRICS, DWORD, LPVOID,
const MAT2*);
HMETAFILE GetMetaFile(LPCTSTR);
@ -467,15 +517,15 @@ int AddFontResourceEx(LPCTSTR, DWORD, PVOID);
BOOL RemoveFontResourceEx(LPCTSTR, DWORD, PVOID);
HFONT CreateFontIndirectEx(const ENUMLOGFONTEXDV *);
HFONT CreateFontIndirectEx(const ENUMLOGFONTEXDV*);
HDC ResetDC(HDC, const DEVMODE *);
HDC ResetDC(HDC, const DEVMODE*);
BOOL RemoveFontResource(LPCTSTR);
HENHMETAFILE CopyEnhMetaFile(HENHMETAFILE, LPCTSTR);
HDC CreateEnhMetaFile(HDC, LPCTSTR, const RECT *, LPCTSTR);
HDC CreateEnhMetaFile(HDC, LPCTSTR, const RECT*, LPCTSTR);
HENHMETAFILE GetEnhMetaFile(LPCTSTR);
@ -483,15 +533,15 @@ UINT GetEnhMetaFileDescription(HENHMETAFILE, UINT, LPTSTR);
BOOL GetTextMetrics(HDC, LPTEXTMETRIC);
int StartDoc(HDC, const DOCINFO *);
int StartDoc(HDC, const DOCINFO*);
int GetObject(HANDLE, int, LPVOID);
BOOL TextOut(HDC, int, int, LPCTSTR, int);
BOOL ExtTextOut(HDC, int, int, UINT, const RECT *, LPCTSTR, UINT, const INT *);
BOOL ExtTextOut(HDC, int, int, UINT, const RECT*, LPCTSTR, UINT, const INT*);
BOOL PolyTextOut(HDC, const POLYTEXT *, int);
BOOL PolyTextOut(HDC, const POLYTEXT*, int);
int GetTextFace(HDC, int, LPTSTR);
@ -513,9 +563,11 @@ HKL LoadKeyboardLayout(LPCTSTR, UINT);
BOOL GetKeyboardLayoutName(LPTSTR);
HDESK CreateDesktop(LPCTSTR, LPCTSTR, DEVMODE*, DWORD, ACCESS_MASK, LPSECURITY_ATTRIBUTES);
HDESK CreateDesktop(LPCTSTR, LPCTSTR, DEVMODE*, DWORD, ACCESS_MASK,
LPSECURITY_ATTRIBUTES);
HDESK CreateDesktopEx(LPCTSTR, LPCTSTR, DEVMODE*, DWORD, ACCESS_MASK, LPSECURITY_ATTRIBUTES, ULONG, PVOID);
HDESK CreateDesktopEx(LPCTSTR, LPCTSTR, DEVMODE*, DWORD, ACCESS_MASK,
LPSECURITY_ATTRIBUTES, ULONG, PVOID);
HDESK OpenDesktop(LPCTSTR, DWORD, BOOL, ACCESS_MASK);
@ -535,7 +587,7 @@ UINT RegisterWindowMessage(LPCTSTR);
BOOL GetMessage(LPMSG, HWND, UINT, UINT);
LRESULT DispatchMessage(const MSG *);
LRESULT DispatchMessage(const MSG*);
BOOL PeekMessage(LPMSG, HWND, UINT, UINT, UINT);
@ -563,23 +615,26 @@ LRESULT DefWindowProc(HWND, UINT, WPARAM, LPARAM);
LRESULT CallWindowProc(WNDPROC, HWND, UINT, WPARAM, LPARAM);
ATOM RegisterClass(const WNDCLASS *);
ATOM RegisterClass(const WNDCLASS*);
BOOL UnregisterClass(LPCTSTR, HINSTANCE);
BOOL GetClassInfo(HINSTANCE, LPCTSTR, LPWNDCLASS);
ATOM RegisterClassEx(const WNDCLASSEX *);
ATOM RegisterClassEx(const WNDCLASSEX*);
BOOL GetClassInfoEx(HINSTANCE, LPCTSTR, LPWNDCLASSEX);
HWND CreateWindowEx(DWORD, LPCTSTR, LPCTSTR, DWORD, int, int, int, int, HWND, HMENU, HINSTANCE, LPVOID);
HWND CreateWindowEx(DWORD, LPCTSTR, LPCTSTR, DWORD, int, int, int, int, HWND,
HMENU, HINSTANCE, LPVOID);
HWND CreateWindow(LPCTSTR, LPCTSTR, DWORD, int, int, int, int, HWND, HMENU, HINSTANCE, LPVOID);
HWND CreateWindow(LPCTSTR, LPCTSTR, DWORD, int, int, int, int, HWND, HMENU,
HINSTANCE, LPVOID);
HWND CreateDialogParam(HINSTANCE, LPCTSTR, HWND, DLGPROC, LPARAM);
HWND CreateDialogIndirectParam(HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
HWND CreateDialogIndirectParam(HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC,
LPARAM);
HWND CreateDialog(HINSTANCE, LPCTSTR, HWND, DLGPROC);
@ -587,7 +642,8 @@ HWND CreateDialogIndirect(HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC);
INT_PTR DialogBoxParam(HINSTANCE, LPCTSTR, HWND, DLGPROC, LPARAM);
INT_PTR DialogBoxIndirectParam(HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
INT_PTR DialogBoxIndirectParam(HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC,
LPARAM);
INT_PTR DialogBox(HINSTANCE, LPCTSTR, HWND, DLGPROC);
@ -655,7 +711,7 @@ int TranslateAccelerator(HWND, HACCEL, LPMSG);
HMENU LoadMenu(HINSTANCE, LPCTSTR);
HMENU LoadMenuIndirect(const MENUTEMPLATE *);
HMENU LoadMenuIndirect(const MENUTEMPLATE*);
BOOL ChangeMenu(HMENU, UINT, LPCTSTR, UINT, UINT);
@ -679,11 +735,12 @@ int DrawTextEx(HDC, LPTSTR, int, LPRECT, UINT, LPDRAWTEXTPARAMS);
BOOL GrayString(HDC, HBRUSH, GRAYSTRINGPROC, LPARAM, int, int, int, int, int);
BOOL DrawState(HDC, HBRUSH, DRAWSTATEPROC, LPARAM, WPARAM, int, int, int, int, UINT);
BOOL DrawState(HDC, HBRUSH, DRAWSTATEPROC, LPARAM, WPARAM, int, int, int, int,
UINT);
LONG TabbedTextOut(HDC, int, int, LPCTSTR, int, int, const INT *, int);
LONG TabbedTextOut(HDC, int, int, LPCTSTR, int, int, const INT*, int);
DWORD GetTabbedTextExtent(HDC, LPCTSTR, int, int, const INT *);
DWORD GetTabbedTextExtent(HDC, LPCTSTR, int, int, const INT*);
BOOL SetProp(HWND, LPCTSTR, HANDLE);
@ -705,7 +762,7 @@ int MessageBox(HWND, LPCTSTR, LPCTSTR, UINT);
int MessageBoxEx(HWND, LPCTSTR, LPCTSTR, UINT, WORD);
int MessageBoxIndirect(const MSGBOXPARAMS *);
int MessageBoxIndirect(const MSGBOXPARAMS*);
LONG GetWindowLong(HWND, int);
@ -741,7 +798,7 @@ HCURSOR LoadCursorFromFile(LPCTSTR);
HICON LoadIcon(HINSTANCE, LPCTSTR);
UINT PrivateExtractIcons(LPCTSTR, int, int, int, HICON *, UINT *, UINT, UINT);
UINT PrivateExtractIcons(LPCTSTR, int, int, int, HICON*, UINT*, UINT, UINT);
HANDLE LoadImage(HINSTANCE, LPCTSTR, UINT, int, int, UINT);
@ -761,7 +818,8 @@ LRESULT DefFrameProc(HWND, HWND, UINT, WPARAM, LPARAM);
LRESULT DefMDIChildProc(HWND, UINT, WPARAM, LPARAM);
HWND CreateMDIWindow(LPCTSTR, LPCTSTR, DWORD, int, int, int, int, HWND, HINSTANCE, LPARAM);
HWND CreateMDIWindow(LPCTSTR, LPCTSTR, DWORD, int, int, int, int, HWND,
HINSTANCE, LPARAM);
BOOL WinHelp(HWND, LPCTSTR, UINT, ULONG_PTR);
@ -803,9 +861,9 @@ int GetCalendarInfo(LCID, CALID, CALTYPE, LPTSTR, int, LPDWORD);
BOOL SetCalendarInfo(LCID, CALID, CALTYPE, LPCTSTR);
int GetNumberFormat(LCID, DWORD, LPCTSTR, const NUMBERFMT *, LPTSTR, int);
int GetNumberFormat(LCID, DWORD, LPCTSTR, const NUMBERFMT*, LPTSTR, int);
int GetCurrencyFormat(LCID, DWORD, LPCTSTR, const CURRENCYFMT *, LPTSTR, int);
int GetCurrencyFormat(LCID, DWORD, LPCTSTR, const CURRENCYFMT*, LPTSTR, int);
BOOL EnumCalendarInfo(CALINFO_ENUMPROC, LCID, CALID, CALTYPE);
@ -827,7 +885,8 @@ BOOL EnumSystemLocales(LOCALE_ENUMPROC, DWORD);
BOOL EnumSystemLanguageGroups(LANGUAGEGROUP_ENUMPROC, DWORD, LONG_PTR);
BOOL EnumLanguageGroupLocales(LANGGROUPLOCALE_ENUMPROC, LGRPID, DWORD, LONG_PTR);
BOOL EnumLanguageGroupLocales(LANGGROUPLOCALE_ENUMPROC, LGRPID, DWORD,
LONG_PTR);
BOOL EnumUILanguages(UILANGUAGE_ENUMPROC, DWORD, LONG_PTR);
@ -849,7 +908,8 @@ BOOL ReadConsoleOutputCharacter(HANDLE, LPTSTR, DWORD, COORD, LPDWORD);
BOOL WriteConsoleInput(HANDLE, const INPUT_RECORD*, DWORD, LPDWORD);
BOOL ScrollConsoleScreenBuffer(HANDLE, const SMALL_RECT*, const SMALL_RECT*, COORD, const CHAR_INFO*);
BOOL ScrollConsoleScreenBuffer(HANDLE, const SMALL_RECT*, const SMALL_RECT*,
COORD, const CHAR_INFO*);
BOOL WriteConsoleOutput(HANDLE, const CHAR_INFO*, COORD, COORD, PSMALL_RECT);
@ -883,7 +943,8 @@ DWORD GetConsoleCommandHistory(LPTSTR, DWORD, LPTSTR);
DWORD VerFindFile(DWORD, LPTSTR, LPTSTR, LPTSTR, LPTSTR, PUINT, LPTSTR, PUINT);
DWORD VerInstallFile(DWORD, LPTSTR, LPTSTR, LPTSTR, LPTSTR, LPTSTR, LPTSTR, PUINT);
DWORD VerInstallFile(DWORD, LPTSTR, LPTSTR, LPTSTR, LPTSTR, LPTSTR, LPTSTR,
PUINT);
DWORD GetFileVersionInfoSize(LPCTSTR, LPDWORD);
@ -895,7 +956,7 @@ BOOL GetFileVersionInfoEx(DWORD, LPCTSTR, DWORD, DWORD, LPVOID);
DWORD VerLanguageName(DWORD, LPTSTR, DWORD);
BOOL VerQueryValue(LPCVOID, LPCTSTR, LPVOID *, PUINT);
BOOL VerQueryValue(LPCVOID, LPCTSTR, LPVOID*, PUINT);
LSTATUS RegConnectRegistry(LPCTSTR, HKEY, PHKEY);
@ -903,9 +964,12 @@ LSTATUS RegConnectRegistryEx(LPCTSTR, HKEY, ULONG, PHKEY);
LSTATUS RegCreateKey(HKEY, LPCTSTR, PHKEY);
LSTATUS RegCreateKeyEx(HKEY, LPCTSTR, DWORD, LPTSTR, DWORD, REGSAM, const LPSECURITY_ATTRIBUTES, PHKEY, LPDWORD);
LSTATUS RegCreateKeyEx(HKEY, LPCTSTR, DWORD, LPTSTR, DWORD, REGSAM,
const LPSECURITY_ATTRIBUTES, PHKEY, LPDWORD);
LSTATUS RegCreateKeyTransacted(HKEY, LPCTSTR, DWORD, LPTSTR, DWORD, REGSAM, const LPSECURITY_ATTRIBUTES, PHKEY, LPDWORD, HANDLE, PVOID);
LSTATUS RegCreateKeyTransacted(HKEY, LPCTSTR, DWORD, LPTSTR, DWORD, REGSAM,
const LPSECURITY_ATTRIBUTES, PHKEY, LPDWORD,
HANDLE, PVOID);
LSTATUS RegDeleteKey(HKEY, LPCTSTR);
@ -917,9 +981,11 @@ LSTATUS RegDeleteValue(HKEY, LPCTSTR);
LSTATUS RegEnumKey(HKEY, DWORD, LPTSTR, DWORD);
LSTATUS RegEnumKeyEx(HKEY, DWORD, LPTSTR, LPDWORD, LPDWORD, LPTSTR, LPDWORD, PFILETIME);
LSTATUS RegEnumKeyEx(HKEY, DWORD, LPTSTR, LPDWORD, LPDWORD, LPTSTR, LPDWORD,
PFILETIME);
LSTATUS RegEnumValue(HKEY, DWORD, LPTSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE, LPDWORD);
LSTATUS RegEnumValue(HKEY, DWORD, LPTSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE,
LPDWORD);
LSTATUS RegLoadKey(HKEY, LPCTSTR, LPCTSTR);
@ -927,9 +993,11 @@ LSTATUS RegOpenKey(HKEY, LPCTSTR, PHKEY);
LSTATUS RegOpenKeyEx(HKEY, LPCTSTR, DWORD, REGSAM, PHKEY);
LSTATUS RegOpenKeyTransacted(HKEY, LPCTSTR, DWORD, REGSAM, PHKEY, HANDLE, PVOID);
LSTATUS RegOpenKeyTransacted(HKEY, LPCTSTR, DWORD, REGSAM, PHKEY, HANDLE,
PVOID);
LSTATUS RegQueryInfoKey(HKEY, LPTSTR, LPDWORD, LPDWORD, LPDWORD, LPDWORD, LPDWORD, LPDWORD, LPDWORD, LPDWORD, LPDWORD, PFILETIME);
LSTATUS RegQueryInfoKey(HKEY, LPTSTR, LPDWORD, LPDWORD, LPDWORD, LPDWORD,
LPDWORD, LPDWORD, LPDWORD, LPDWORD, LPDWORD, PFILETIME);
LSTATUS RegQueryValue(HKEY, LPCTSTR, LPTSTR, PLONG);
@ -975,17 +1043,22 @@ LSTATUS RegSaveKeyEx(HKEY, LPCTSTR, const LPSECURITY_ATTRIBUTES, DWORD);
DWORD MultinetGetConnectionPerformance(LPNETRESOURCE, LPNETCONNECTINFOSTRUCT);
BOOL ChangeServiceConfig(SC_HANDLE, DWORD, DWORD, DWORD, LPCTSTR, LPCTSTR, LPDWORD, LPCTSTR, LPCTSTR, LPCTSTR, LPCTSTR);
BOOL ChangeServiceConfig(SC_HANDLE, DWORD, DWORD, DWORD, LPCTSTR, LPCTSTR,
LPDWORD, LPCTSTR, LPCTSTR, LPCTSTR, LPCTSTR);
BOOL ChangeServiceConfig2(SC_HANDLE, DWORD, LPVOID);
SC_HANDLE CreateService(SC_HANDLE, LPCTSTR, LPCTSTR, DWORD, DWORD, DWORD, DWORD, LPCTSTR, LPCTSTR, LPDWORD, LPCTSTR, LPCTSTR, LPCTSTR);
SC_HANDLE CreateService(SC_HANDLE, LPCTSTR, LPCTSTR, DWORD, DWORD, DWORD, DWORD,
LPCTSTR, LPCTSTR, LPDWORD, LPCTSTR, LPCTSTR, LPCTSTR);
BOOL EnumDependentServices(SC_HANDLE, DWORD, LPENUM_SERVICE_STATUS, DWORD, LPDWORD, LPDWORD);
BOOL EnumDependentServices(SC_HANDLE, DWORD, LPENUM_SERVICE_STATUS, DWORD,
LPDWORD, LPDWORD);
BOOL EnumServicesStatus(SC_HANDLE, DWORD, DWORD, LPENUM_SERVICE_STATUS, DWORD, LPDWORD, LPDWORD, LPDWORD);
BOOL EnumServicesStatus(SC_HANDLE, DWORD, DWORD, LPENUM_SERVICE_STATUS, DWORD,
LPDWORD, LPDWORD, LPDWORD);
BOOL EnumServicesStatusEx(SC_HANDLE, SC_ENUM_TYPE, DWORD, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD, LPDWORD, LPCTSTR);
BOOL EnumServicesStatusEx(SC_HANDLE, SC_ENUM_TYPE, DWORD, DWORD, LPBYTE, DWORD,
LPDWORD, LPDWORD, LPDWORD, LPCTSTR);
BOOL GetServiceKeyName(SC_HANDLE, LPCTSTR, LPTSTR, LPDWORD);
@ -999,15 +1072,18 @@ BOOL QueryServiceConfig(SC_HANDLE, LPQUERY_SERVICE_CONFIG, DWORD, LPDWORD);
BOOL QueryServiceConfig2(SC_HANDLE, DWORD, LPBYTE, DWORD, LPDWORD);
BOOL QueryServiceLockStatus(SC_HANDLE, LPQUERY_SERVICE_LOCK_STATUS, DWORD, LPDWORD);
BOOL QueryServiceLockStatus(SC_HANDLE, LPQUERY_SERVICE_LOCK_STATUS, DWORD,
LPDWORD);
SERVICE_STATUS_HANDLE RegisterServiceCtrlHandler(LPCTSTR, LPHANDLER_FUNCTION);
SERVICE_STATUS_HANDLE RegisterServiceCtrlHandlerEx(LPCTSTR, LPHANDLER_FUNCTION_EX, LPVOID);
SERVICE_STATUS_HANDLE RegisterServiceCtrlHandlerEx(LPCTSTR,
LPHANDLER_FUNCTION_EX,
LPVOID);
BOOL StartServiceCtrlDispatcher(const SERVICE_TABLE_ENTRY *);
BOOL StartServiceCtrlDispatcher(const SERVICE_TABLE_ENTRY*);
BOOL StartService(SC_HANDLE, DWORD, LPCTSTR *);
BOOL StartService(SC_HANDLE, DWORD, LPCTSTR*);
DWORD NotifyServiceStatusChange(SC_HANDLE, DWORD, PSERVICE_NOTIFY);
@ -1047,6 +1123,8 @@ BOOL ImmUnregisterWord(HKL, LPCTSTR, DWORD, LPCTSTR);
UINT ImmGetRegisterWordStyle(HKL, UINT, LPSTYLEBUF);
UINT ImmEnumRegisterWord(HKL, REGISTERWORDENUMPROC, LPCTSTR, DWORD, LPCTSTR, LPVOID);
UINT ImmEnumRegisterWord(HKL, REGISTERWORDENUMPROC, LPCTSTR, DWORD, LPCTSTR,
LPVOID);
DWORD ImmGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFO, LPIMEMENUITEMINFO, DWORD);
DWORD ImmGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFO,
LPIMEMENUITEMINFO, DWORD);

View File

@ -2903,16 +2903,6 @@ class CGConstDefinition(CGThing):
self.const = "static const %s %s = %s;" % (builtinNames[tag],
name,
value)
if member.getExtendedAttribute("NeedsWindowsUndef"):
self.const = fill(
"""
#ifdef XP_WIN
#undef ${name}
#endif // XP_WIN
${constDecl}
""",
name=name,
constDecl=self.const)
def declare(self):
return self.const

View File

@ -4351,8 +4351,7 @@ class IDLConst(IDLInterfaceMember):
identifier == "ChromeOnly" or
identifier == "Func" or
identifier == "SecureContext" or
identifier == "NonEnumerable" or
identifier == "NeedsWindowsUndef"):
identifier == "NonEnumerable"):
# Known attributes that we don't need to do anything with here
pass
else:

View File

@ -28,11 +28,6 @@ class Promise;
} // namespace mozilla
// We don't export TestCodeGenBinding.h, but it's right in our parent dir.
#ifdef XP_WIN
// If we're on windows, simulate including windows.h. This step will cause
// compilation failure if NeedsWindowsUndef is not defined.
# define NO_ERROR 0x1
#endif
#include "../TestCodeGenBinding.h"
extern bool TestFuncControlledMember(JSContext*, JSObject*);

View File

@ -1033,10 +1033,6 @@ interface TestInterface {
[NonEnumerable]
void nonEnumerableMethod();
// [NeedsWindowsUndef] test generation
[NeedsWindowsUndef]
const unsigned long NO_ERROR = 0xffffffff;
// [AllowShared] tests
attribute [AllowShared] ArrayBufferViewTypedef allowSharedArrayBufferViewTypedef;
attribute [AllowShared] ArrayBufferView allowSharedArrayBufferView;

View File

@ -828,10 +828,6 @@ interface TestExampleInterface {
[NonEnumerable]
void nonEnumerableMethod();
// [NeedsWindowsUndef] test generation
[NeedsWindowsUndef]
const unsigned long NO_ERROR = 0xffffffff;
// [AllowShared] tests
attribute [AllowShared] ArrayBufferViewTypedef allowSharedArrayBufferViewTypedef;
attribute [AllowShared] ArrayBufferView allowSharedArrayBufferView;

View File

@ -848,10 +848,6 @@ interface TestJSImplInterface {
[NonEnumerable]
void nonEnumerableMethod();
// [NeedsWindowsUndef] test generation
[NeedsWindowsUndef]
const unsigned long NO_ERROR = 0xffffffff;
// [AllowShared] tests
attribute [AllowShared] ArrayBufferViewTypedef allowSharedArrayBufferViewTypedef;
attribute [AllowShared] ArrayBufferView allowSharedArrayBufferView;

View File

@ -283,7 +283,6 @@ interface mixin WebGL2RenderingContextBase
const GLenum ALREADY_SIGNALED = 0x911A;
const GLenum TIMEOUT_EXPIRED = 0x911B;
const GLenum CONDITION_SATISFIED = 0x911C;
[NeedsWindowsUndef]
const GLenum WAIT_FAILED = 0x911D;
const GLenum SYNC_FLUSH_COMMANDS_BIT = 0x00000001;
const GLenum VERTEX_ATTRIB_ARRAY_DIVISOR = 0x88FE;

View File

@ -226,7 +226,6 @@ interface mixin WebGLRenderingContextBase {
const GLenum SAMPLE_COVERAGE = 0x80A0;
/* ErrorCode */
[NeedsWindowsUndef]
const GLenum NO_ERROR = 0;
const GLenum INVALID_ENUM = 0x0500;
const GLenum INVALID_VALUE = 0x0501;