reactos/include/psdk/windef.h

442 lines
9.5 KiB
C
Raw Normal View History

#ifndef _WINDEF_H
#define _WINDEF_H
Merge from amd64 branch: 40122 mmsystem.h: 64bit build fixes. (Samuel Serapión) 40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión) 40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión) 40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer) 40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer) 41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer) 41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer) 41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer) 43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer) 43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión) 43907 commctrl.h: Fix bad cast. (Timo Kreuzer) 44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer) 44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión) 44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión) 44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer) 44338 winnt.h: fix build. (Samuel Serapión) 44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión) svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
#ifndef _M_AMD64
Warning killing commit modified include/psdk/basetsd.h modified include/psdk/windef.h modified include/psdk/winnt.h Introduce new define __ROS_LONG64__ ("assume 64-bit long"), to use int instead of long in typedefs of 32-bit integers __ROS_LONG64__ automatically defined if __WINESRC__ is defined. No, __WINESRC__ alone is not enough modified base/applications/winhlp32/winhlp32.rbuild modified base/applications/wordpad/wordpad.rbuild Compile with __ROS_LONG64__ define to silence int/long warnings modified include/psdk/winsock.h modified include/psdk/winsock2.h __ROS_LONG64__ does Winsock too Use LONG and u_long instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/reactos/wine/test.h Use explicit casts in printf calls so the header compiles without warnings regardless of whether __ROS_LONG64__ is defined Use _strdup instead of strdup modified include/psdk/sspi.h modified include/psdk/wininet.h Use LONG and ULONG instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/psdk/htmlhelp.h modified include/psdk/lmaccess.h modified include/psdk/prsht.h modified include/psdk/vfw.h modified include/psdk/winuser.h By sheer coincidence, several wrong prototypes were uncovered by the __ROS_LONG64__ feature. They all happen to be 64-bit portability issues, too modified base/system/msiexec/msiexec.rbuild msiexec is a Wine system component: compile with __WINESRC__ modified dll/win32/setupapi/setupapi.rbuild setupapi is _not_ a Wine system component: compile _without_ __WINESRC__ modified lib/3rdparty/libwine/debug.c Use LONG instead of long modified dll/win32/advapi32/service/sctrl.c modified include/psdk/winsvc.h Fix prototypes of StartServiceCtrlDispatcherA and StartServiceCtrlDispatcherW modified include/psdk/winbase.h Corrected the prototypes of GetProcessAffinityMask and ReadProcessMemory. Now Win64-compliant The argument to the _InterlockedCompareExchange is volatile long *, not volatile LONG *: cast explicitly (it's perfectly safe) modified include/psdk/wingdi.h Fix prototype of ENHMFENUMPROC svn path=/trunk/; revision=38872
2009-01-18 06:25:43 +00:00
#if !defined(__ROS_LONG64__)
#ifdef __WINESRC__
#define __ROS_LONG64__
#endif
#endif
Merge from amd64 branch: 40122 mmsystem.h: 64bit build fixes. (Samuel Serapión) 40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión) 40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión) 40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer) 40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer) 41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer) 41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer) 41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer) 43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer) 43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión) 43907 commctrl.h: Fix bad cast. (Timo Kreuzer) 44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer) 44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión) 44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión) 44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer) 44338 winnt.h: fix build. (Samuel Serapión) 44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión) svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
#endif
Warning killing commit modified include/psdk/basetsd.h modified include/psdk/windef.h modified include/psdk/winnt.h Introduce new define __ROS_LONG64__ ("assume 64-bit long"), to use int instead of long in typedefs of 32-bit integers __ROS_LONG64__ automatically defined if __WINESRC__ is defined. No, __WINESRC__ alone is not enough modified base/applications/winhlp32/winhlp32.rbuild modified base/applications/wordpad/wordpad.rbuild Compile with __ROS_LONG64__ define to silence int/long warnings modified include/psdk/winsock.h modified include/psdk/winsock2.h __ROS_LONG64__ does Winsock too Use LONG and u_long instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/reactos/wine/test.h Use explicit casts in printf calls so the header compiles without warnings regardless of whether __ROS_LONG64__ is defined Use _strdup instead of strdup modified include/psdk/sspi.h modified include/psdk/wininet.h Use LONG and ULONG instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/psdk/htmlhelp.h modified include/psdk/lmaccess.h modified include/psdk/prsht.h modified include/psdk/vfw.h modified include/psdk/winuser.h By sheer coincidence, several wrong prototypes were uncovered by the __ROS_LONG64__ feature. They all happen to be 64-bit portability issues, too modified base/system/msiexec/msiexec.rbuild msiexec is a Wine system component: compile with __WINESRC__ modified dll/win32/setupapi/setupapi.rbuild setupapi is _not_ a Wine system component: compile _without_ __WINESRC__ modified lib/3rdparty/libwine/debug.c Use LONG instead of long modified dll/win32/advapi32/service/sctrl.c modified include/psdk/winsvc.h Fix prototypes of StartServiceCtrlDispatcherA and StartServiceCtrlDispatcherW modified include/psdk/winbase.h Corrected the prototypes of GetProcessAffinityMask and ReadProcessMemory. Now Win64-compliant The argument to the _InterlockedCompareExchange is volatile long *, not volatile LONG *: cast explicitly (it's perfectly safe) modified include/psdk/wingdi.h Fix prototype of ENHMFENUMPROC svn path=/trunk/; revision=38872
2009-01-18 06:25:43 +00:00
#ifdef __cplusplus
extern "C" {
#endif
modified include/crt/_mingw.h No "restrict" support in Visual C++ (and __restrict isn't the same thing) modified include/crt/stdarg.h Really fix stdarg.h this time modified include/crt/wchar.h modified include/psdk/dde.h modified include/psdk/mmsystem.h modified include/psdk/prsht.h modified include/psdk/rpcndr.h modified include/psdk/shellapi.h modified include/psdk/winbase.h modified include/psdk/wincon.h modified include/psdk/wincrypt.h modified include/psdk/windef.h modified include/psdk/wingdi.h modified include/psdk/winioctl.h modified include/psdk/winnetwk.h modified include/psdk/winnls.h modified include/psdk/winnt.h modified include/psdk/winperf.h modified include/psdk/winsmcrd.h modified include/psdk/winsock2.h modified include/psdk/winspool.h modified include/psdk/winuser.h modified include/psdk/wtypes.idl modified include/reactos/mingw-w64/internal.h modified include/reactos/mingw-w64/oscalls.h Disable some unavoidable warnings in Visual C++ modified include/psdk/poppack.h modified include/psdk/pshpack1.h modified include/psdk/pshpack2.h modified include/psdk/pshpack4.h modified include/psdk/pshpack8.h modified include/psdk/pshpck16.h modified include/psdk/windows.h modified include/psdk/winsock2.h Check that defines are defined before testing their value modified include/psdk/rpcasync.h modified include/psdk/rpcdce.h Visual C++ doesn't support functions without a prototype anymore, and RPC_AUTH_KEY_RETRIEVAL_FN has a documented prototype anyway modified include/psdk/winnt.h WIN32_WINNT -> _WIN32_WINNT svn path=/trunk/; revision=41434
2009-06-17 11:18:51 +00:00
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4255)
#endif
#ifndef WINVER
#define WINVER 0x0400
/*
* If you need Win32 API features newer the Win95 and WinNT then you must
* define WINVER before including windows.h or any other method of including
* the windef.h header.
*/
#endif
#ifndef _WIN32_WINNT
#define _WIN32_WINNT WINVER
/*
* There may be the need to define _WIN32_WINNT to a value different from
* the value of WINVER. I don't have any example of why you would do that.
* However, if you must then define _WIN32_WINNT to the value required before
* including windows.h or any other method of including the windef.h header.
*/
#endif
#ifndef WIN32
#define WIN32
#endif
#ifndef _WIN32
#define _WIN32
#endif
#define FAR
#define far
#define NEAR
#define near
#ifndef CONST
#define CONST const
#endif
#undef MAX_PATH
#define MAX_PATH 260
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void*)0)
#endif
#endif
#ifndef FALSE
#define FALSE 0
#endif
#ifndef TRUE
#define TRUE 1
#endif
#ifndef IN
#define IN
#endif
#ifndef OUT
#define OUT
#endif
#ifndef OPTIONAL
#define OPTIONAL
#endif
/* needed by header files generated by WIDL */
#ifdef __WINESRC__
#define WINE_NO_UNICODE_MACROS
#endif
#ifdef WINE_NO_UNICODE_MACROS
# define WINELIB_NAME_AW(func) \
func##_must_be_suffixed_with_W_or_A_in_this_context \
func##_must_be_suffixed_with_W_or_A_in_this_context
#else /* WINE_NO_UNICODE_MACROS */
# ifdef UNICODE
# define WINELIB_NAME_AW(func) func##W
# else
# define WINELIB_NAME_AW(func) func##A
# endif
#endif /* WINE_NO_UNICODE_MACROS */
#ifdef WINE_NO_UNICODE_MACROS
# define DECL_WINELIB_TYPE_AW(type) /* nothing */
#else
# define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type;
#endif
#ifdef __GNUC__
#define PACKED __attribute__((packed))
#ifndef _fastcall
#define _fastcall __attribute__((fastcall))
#endif
#ifndef __fastcall
#define __fastcall __attribute__((fastcall))
#endif
#ifndef _stdcall
#define _stdcall __attribute__((stdcall))
#endif
#ifndef __stdcall
#define __stdcall __attribute__((stdcall))
#endif
#ifndef _cdecl
#define _cdecl __attribute__((cdecl))
#endif
#ifndef __cdecl
#define __cdecl __attribute__((cdecl))
#endif
#ifndef __declspec
#define __declspec(e) __attribute__((e))
#endif
#ifndef _declspec
#define _declspec(e) __attribute__((e))
#endif
#elif defined(__WATCOMC__)
#define PACKED
#else
#define PACKED
#define _cdecl
#define __cdecl
#endif
#undef pascal
#undef _pascal
#undef __pascal
#define pascal __stdcall
#define _pascal __stdcall
#define __pascal __stdcall
Merge 34739 - 34769, 34796 - 34905, 34916 - 34967, 34970 - 35135, 35167, 35325, 35326, 35443 - 35506, 35510 - 35546, 35587, 35616, 35644 from ros-amd64-bringup branch: - Update AMD64 intrinsic Interlocked functions - Add _InterlockedExchange64 to intin_x86.h -Fix definitions of IsBadHugeReadPtr, IsBadHugeWritePtr, IsBadReadPtr, IsBadStringPtrA, IsBadStringPtrW, IsBadWritePtr and SetProcessWorkingSetSize - Define CONTEXT and XMM_SAVE_AREA32, taken from WINE - Include _M_AMD64 for defintitions in ioaccess.h - Add Interlocked intrinisc definitions for AMD64 platform - Add KI_USER_SHARED_DATA and KeGetCurrentIrql() prototype to winddh - Fix prototypes for KfAcquireSpinLock, KfReleaseSpinLock, KeAcquireInStackQueuedSpinLock and KeReleaseInStackQueuedSpinLock on amd64 - Fix rotl declaration, add mysteriously missing rotr. winnt.h: - Fix CONTEXT_AMD64 and friends, add various constants. - Define RUNTIME_FUNCTION, RtlCaptureContext, RtlRestoreContext, RtlAddFunctionTable, RtlInstallFunctionTableCallback, RtlDeleteFunctionTable. - Fix definitions for EXCEPTION_RECORD and friends to support amd64. - Define IMAGE_THUNK_DATA64 and related constants. - Define IMAGE_TLS_DIRECTORY64 and related constants. - Remove WINEisms - Remove multiple declarations and minor fixes. - Fix KESEG0_BASE for amd64 - Fix definition for NdisCopyLookaheadData on amd64 - Only add function prototypes if NO_INTERLOCKED_INTRINSICS is defined - Move the inlined InterlockedAnd/Or from rtl to winbase.h and rename it to InterlockedAnd/Or_Inline - Fix TreeView_EnsureVisible macro. - Add missing 64 bit intrinsic Interlocked functions - Fix _InterlockedDecrement64 - Fix InterlockedExchangeAddSizeT - Fix __writecrx instrinsics - Fix ExQueryPoolBlockSize prototype - Make KI_USER_SHARED_DATA and IMAGE_ORDINAL_FLAG64 a ULONGLONG - Fix definition if IMAGE_OPTIONAL_HEADER64 - Add KPCR structure - Add __readcrx intrinsics - Ad some definitions to winddk.h - Add a field for a DbgPrint function pointer to the ROS_LOADER_PARAMETER_BLOCK for early debug prints in ntoskrnl - Update KPCR and KIPCR - Add KeGetPcr() and update KeGetCurrentProcessorNumber - Fix SECURITY_DESCRIPTOR_RELATIVE and KDPC_DATA - Implement byteswap intrinsics - Add macro definitions for KeQuerySystemTime, KeQueryTickCount and KeQueryInterruptTime to ddk - Add NtCurrentTeb inline function - Update amd64 prototypes for KeGetCurrentIrql, KfRaiseIrql, KfLowerIrql, KeRaiseIrqlToDpcLevel, KeRaiseIrqlToSynchLevel, KeLowerIrql, KeRaiseIrql - Implement __readcr8, __writecr8, __lidt and __sidt intrinsics. - Implement KeGetCurrentIrql as intrinsic. - Make KeGetCurrentIrql, KeLowerIrql, KfRaiseIrql, KeRaiseIrql, KeRaiseIrqlToDpcLevel and KeRaiseIrqlToSynchLevel intrinsics as in the WDK 2008. - Fix _interlockedbittest intrinsics - Fix __readmsr and __writemsr on amd64 - Fix __readgsqword, it was using a long internally. Add volatile keyword to segment addressing intrinsics. Add "memory" to clobber list on all those that do write. - Merge __readcr and __writecr x86 / x64 definitions, because they are the same. Implement __readdr and __writedr for x64. - __readcr3() returns an unsigned __int64, fix x86 MmGetPageDirectory accordingly. svn path=/trunk/; revision=35646
2008-08-25 21:57:13 +00:00
#define CDECL _cdecl
Merge 34739 - 34769, 34796 - 34905, 34916 - 34967, 34970 - 35135, 35167, 35325, 35326, 35443 - 35506, 35510 - 35546, 35587, 35616, 35644 from ros-amd64-bringup branch: - Update AMD64 intrinsic Interlocked functions - Add _InterlockedExchange64 to intin_x86.h -Fix definitions of IsBadHugeReadPtr, IsBadHugeWritePtr, IsBadReadPtr, IsBadStringPtrA, IsBadStringPtrW, IsBadWritePtr and SetProcessWorkingSetSize - Define CONTEXT and XMM_SAVE_AREA32, taken from WINE - Include _M_AMD64 for defintitions in ioaccess.h - Add Interlocked intrinisc definitions for AMD64 platform - Add KI_USER_SHARED_DATA and KeGetCurrentIrql() prototype to winddh - Fix prototypes for KfAcquireSpinLock, KfReleaseSpinLock, KeAcquireInStackQueuedSpinLock and KeReleaseInStackQueuedSpinLock on amd64 - Fix rotl declaration, add mysteriously missing rotr. winnt.h: - Fix CONTEXT_AMD64 and friends, add various constants. - Define RUNTIME_FUNCTION, RtlCaptureContext, RtlRestoreContext, RtlAddFunctionTable, RtlInstallFunctionTableCallback, RtlDeleteFunctionTable. - Fix definitions for EXCEPTION_RECORD and friends to support amd64. - Define IMAGE_THUNK_DATA64 and related constants. - Define IMAGE_TLS_DIRECTORY64 and related constants. - Remove WINEisms - Remove multiple declarations and minor fixes. - Fix KESEG0_BASE for amd64 - Fix definition for NdisCopyLookaheadData on amd64 - Only add function prototypes if NO_INTERLOCKED_INTRINSICS is defined - Move the inlined InterlockedAnd/Or from rtl to winbase.h and rename it to InterlockedAnd/Or_Inline - Fix TreeView_EnsureVisible macro. - Add missing 64 bit intrinsic Interlocked functions - Fix _InterlockedDecrement64 - Fix InterlockedExchangeAddSizeT - Fix __writecrx instrinsics - Fix ExQueryPoolBlockSize prototype - Make KI_USER_SHARED_DATA and IMAGE_ORDINAL_FLAG64 a ULONGLONG - Fix definition if IMAGE_OPTIONAL_HEADER64 - Add KPCR structure - Add __readcrx intrinsics - Ad some definitions to winddk.h - Add a field for a DbgPrint function pointer to the ROS_LOADER_PARAMETER_BLOCK for early debug prints in ntoskrnl - Update KPCR and KIPCR - Add KeGetPcr() and update KeGetCurrentProcessorNumber - Fix SECURITY_DESCRIPTOR_RELATIVE and KDPC_DATA - Implement byteswap intrinsics - Add macro definitions for KeQuerySystemTime, KeQueryTickCount and KeQueryInterruptTime to ddk - Add NtCurrentTeb inline function - Update amd64 prototypes for KeGetCurrentIrql, KfRaiseIrql, KfLowerIrql, KeRaiseIrqlToDpcLevel, KeRaiseIrqlToSynchLevel, KeLowerIrql, KeRaiseIrql - Implement __readcr8, __writecr8, __lidt and __sidt intrinsics. - Implement KeGetCurrentIrql as intrinsic. - Make KeGetCurrentIrql, KeLowerIrql, KfRaiseIrql, KeRaiseIrql, KeRaiseIrqlToDpcLevel and KeRaiseIrqlToSynchLevel intrinsics as in the WDK 2008. - Fix _interlockedbittest intrinsics - Fix __readmsr and __writemsr on amd64 - Fix __readgsqword, it was using a long internally. Add volatile keyword to segment addressing intrinsics. Add "memory" to clobber list on all those that do write. - Merge __readcr and __writecr x86 / x64 definitions, because they are the same. Implement __readdr and __writedr for x64. - __readcr3() returns an unsigned __int64, fix x86 MmGetPageDirectory accordingly. svn path=/trunk/; revision=35646
2008-08-25 21:57:13 +00:00
#if !defined(__x86_64__) //defined(_STDCALL_SUPPORTED)
#define CALLBACK __stdcall
#define WINAPI __stdcall
#define WINAPIV __cdecl
#define APIENTRY WINAPI
#define APIPRIVATE __stdcall
#define PASCAL __stdcall
#else
#define CALLBACK
#define WINAPI
#define WINAPIV
#define APIENTRY WINAPI
#define APIPRIVATE
#define PASCAL pascal
#endif
#define DECLSPEC_IMPORT __declspec(dllimport)
#define DECLSPEC_EXPORT __declspec(dllexport)
#ifndef DECLSPEC_NOINLINE
#if (_MSC_VER >= 1300)
#define DECLSPEC_NOINLINE __declspec(noinline)
#elif defined(__GNUC__)
#define DECLSPEC_NOINLINE __attribute__((noinline))
#else
#define DECLSPEC_NOINLINE
#endif
#endif
#ifdef __GNUC__
#define DECLSPEC_NORETURN __declspec(noreturn)
#define DECLARE_STDCALL_P( type ) __stdcall type
#elif defined(__WATCOMC__)
#define DECLSPEC_NORETURN
#define DECLARE_STDCALL_P( type ) type __stdcall
#elif defined(_MSC_VER)
#define DECLSPEC_NORETURN __declspec(noreturn)
#define DECLARE_STDCALL_P( type ) type __stdcall
#endif /* __GNUC__/__WATCOMC__ */
#define MAKEWORD(a,b) ((WORD)(((BYTE)(a))|(((WORD)((BYTE)(b)))<<8)))
#define MAKELONG(a,b) ((LONG)(((WORD)(a))|(((DWORD)((WORD)(b)))<<16)))
#define LOWORD(l) ((WORD)((DWORD_PTR)(l)))
#define HIWORD(l) ((WORD)(((DWORD_PTR)(l)>>16)&0xFFFF))
#define LOBYTE(w) ((BYTE)(w))
#define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF))
#ifndef __WATCOMC__
#ifndef _export
#define _export
#endif
#ifndef __export
#define __export
#endif
#endif
#ifndef NOMINMAX
#ifndef max
#define max(a,b) ((a)>(b)?(a):(b))
#endif
#ifndef min
#define min(a,b) ((a)<(b)?(a):(b))
#endif
#endif
#define UNREFERENCED_PARAMETER(P) {(P)=(P);}
#define UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);}
#define DBG_UNREFERENCED_PARAMETER(P)
#define DBG_UNREFERENCED_LOCAL_VARIABLE(L)
#ifndef __ANONYMOUS_DEFINED
#define __ANONYMOUS_DEFINED
#ifndef NONAMELESSUNION
#ifdef __GNUC__
#define _ANONYMOUS_UNION __extension__
#define _ANONYMOUS_STRUCT __extension__
#elif defined(__WATCOMC__) || defined(_MSC_VER)
#define _ANONYMOUS_UNION
#define _ANONYMOUS_STRUCT
#endif /* __GNUC__/__WATCOMC__ */
#endif /* NONAMELESSUNION */
#ifndef _ANONYMOUS_UNION
#define _ANONYMOUS_UNION
#define _UNION_NAME(x) x
#define DUMMYUNIONNAME u
#define DUMMYUNIONNAME1 u1
#define DUMMYUNIONNAME2 u2
#define DUMMYUNIONNAME3 u3
#define DUMMYUNIONNAME4 u4
#define DUMMYUNIONNAME5 u5
#define DUMMYUNIONNAME6 u6
#define DUMMYUNIONNAME7 u7
#define DUMMYUNIONNAME8 u8
#else
#define _UNION_NAME(x)
#define DUMMYUNIONNAME
#define DUMMYUNIONNAME1
#define DUMMYUNIONNAME2
#define DUMMYUNIONNAME3
#define DUMMYUNIONNAME4
#define DUMMYUNIONNAME5
#define DUMMYUNIONNAME6
#define DUMMYUNIONNAME7
#define DUMMYUNIONNAME8
#endif
#ifndef _ANONYMOUS_STRUCT
#define _ANONYMOUS_STRUCT
#define _STRUCT_NAME(x) x
#define DUMMYSTRUCTNAME s
#define DUMMYSTRUCTNAME1 s1
#define DUMMYSTRUCTNAME2 s2
#define DUMMYSTRUCTNAME3 s3
#define DUMMYSTRUCTNAME4 s4
#define DUMMYSTRUCTNAME5 s5
#else
#define _STRUCT_NAME(x)
#define DUMMYSTRUCTNAME
#define DUMMYSTRUCTNAME1
#define DUMMYSTRUCTNAME2
#define DUMMYSTRUCTNAME3
#define DUMMYSTRUCTNAME4
#define DUMMYSTRUCTNAME5
#endif
#endif /* __ANONYMOUS_DEFINED */
#ifndef NO_STRICT
#ifndef STRICT
#define STRICT 1
#endif
#endif
#ifndef DWORD_DEFINED
#define DWORD_DEFINED
Warning killing commit modified include/psdk/basetsd.h modified include/psdk/windef.h modified include/psdk/winnt.h Introduce new define __ROS_LONG64__ ("assume 64-bit long"), to use int instead of long in typedefs of 32-bit integers __ROS_LONG64__ automatically defined if __WINESRC__ is defined. No, __WINESRC__ alone is not enough modified base/applications/winhlp32/winhlp32.rbuild modified base/applications/wordpad/wordpad.rbuild Compile with __ROS_LONG64__ define to silence int/long warnings modified include/psdk/winsock.h modified include/psdk/winsock2.h __ROS_LONG64__ does Winsock too Use LONG and u_long instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/reactos/wine/test.h Use explicit casts in printf calls so the header compiles without warnings regardless of whether __ROS_LONG64__ is defined Use _strdup instead of strdup modified include/psdk/sspi.h modified include/psdk/wininet.h Use LONG and ULONG instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/psdk/htmlhelp.h modified include/psdk/lmaccess.h modified include/psdk/prsht.h modified include/psdk/vfw.h modified include/psdk/winuser.h By sheer coincidence, several wrong prototypes were uncovered by the __ROS_LONG64__ feature. They all happen to be 64-bit portability issues, too modified base/system/msiexec/msiexec.rbuild msiexec is a Wine system component: compile with __WINESRC__ modified dll/win32/setupapi/setupapi.rbuild setupapi is _not_ a Wine system component: compile _without_ __WINESRC__ modified lib/3rdparty/libwine/debug.c Use LONG instead of long modified dll/win32/advapi32/service/sctrl.c modified include/psdk/winsvc.h Fix prototypes of StartServiceCtrlDispatcherA and StartServiceCtrlDispatcherW modified include/psdk/winbase.h Corrected the prototypes of GetProcessAffinityMask and ReadProcessMemory. Now Win64-compliant The argument to the _InterlockedCompareExchange is volatile long *, not volatile LONG *: cast explicitly (it's perfectly safe) modified include/psdk/wingdi.h Fix prototype of ENHMFENUMPROC svn path=/trunk/; revision=38872
2009-01-18 06:25:43 +00:00
#ifndef __ROS_LONG64__
typedef unsigned long DWORD;
Warning killing commit modified include/psdk/basetsd.h modified include/psdk/windef.h modified include/psdk/winnt.h Introduce new define __ROS_LONG64__ ("assume 64-bit long"), to use int instead of long in typedefs of 32-bit integers __ROS_LONG64__ automatically defined if __WINESRC__ is defined. No, __WINESRC__ alone is not enough modified base/applications/winhlp32/winhlp32.rbuild modified base/applications/wordpad/wordpad.rbuild Compile with __ROS_LONG64__ define to silence int/long warnings modified include/psdk/winsock.h modified include/psdk/winsock2.h __ROS_LONG64__ does Winsock too Use LONG and u_long instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/reactos/wine/test.h Use explicit casts in printf calls so the header compiles without warnings regardless of whether __ROS_LONG64__ is defined Use _strdup instead of strdup modified include/psdk/sspi.h modified include/psdk/wininet.h Use LONG and ULONG instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/psdk/htmlhelp.h modified include/psdk/lmaccess.h modified include/psdk/prsht.h modified include/psdk/vfw.h modified include/psdk/winuser.h By sheer coincidence, several wrong prototypes were uncovered by the __ROS_LONG64__ feature. They all happen to be 64-bit portability issues, too modified base/system/msiexec/msiexec.rbuild msiexec is a Wine system component: compile with __WINESRC__ modified dll/win32/setupapi/setupapi.rbuild setupapi is _not_ a Wine system component: compile _without_ __WINESRC__ modified lib/3rdparty/libwine/debug.c Use LONG instead of long modified dll/win32/advapi32/service/sctrl.c modified include/psdk/winsvc.h Fix prototypes of StartServiceCtrlDispatcherA and StartServiceCtrlDispatcherW modified include/psdk/winbase.h Corrected the prototypes of GetProcessAffinityMask and ReadProcessMemory. Now Win64-compliant The argument to the _InterlockedCompareExchange is volatile long *, not volatile LONG *: cast explicitly (it's perfectly safe) modified include/psdk/wingdi.h Fix prototype of ENHMFENUMPROC svn path=/trunk/; revision=38872
2009-01-18 06:25:43 +00:00
#else
typedef unsigned int DWORD;
#endif
#endif//DWORD_DEFINED
typedef int WINBOOL,*PWINBOOL,*LPWINBOOL;
/* FIXME: Is there a good solution to this? */
#ifndef XFree86Server
#ifndef __OBJC__
typedef WINBOOL BOOL;
#else
#define BOOL WINBOOL
#endif
typedef unsigned char BYTE;
#endif /* ndef XFree86Server */
typedef BOOL *PBOOL,*LPBOOL;
typedef unsigned short WORD;
typedef float FLOAT;
typedef FLOAT *PFLOAT;
typedef BYTE *PBYTE,*LPBYTE;
typedef int *PINT,*LPINT;
typedef WORD *PWORD,*LPWORD;
Warning killing commit modified include/psdk/basetsd.h modified include/psdk/windef.h modified include/psdk/winnt.h Introduce new define __ROS_LONG64__ ("assume 64-bit long"), to use int instead of long in typedefs of 32-bit integers __ROS_LONG64__ automatically defined if __WINESRC__ is defined. No, __WINESRC__ alone is not enough modified base/applications/winhlp32/winhlp32.rbuild modified base/applications/wordpad/wordpad.rbuild Compile with __ROS_LONG64__ define to silence int/long warnings modified include/psdk/winsock.h modified include/psdk/winsock2.h __ROS_LONG64__ does Winsock too Use LONG and u_long instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/reactos/wine/test.h Use explicit casts in printf calls so the header compiles without warnings regardless of whether __ROS_LONG64__ is defined Use _strdup instead of strdup modified include/psdk/sspi.h modified include/psdk/wininet.h Use LONG and ULONG instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/psdk/htmlhelp.h modified include/psdk/lmaccess.h modified include/psdk/prsht.h modified include/psdk/vfw.h modified include/psdk/winuser.h By sheer coincidence, several wrong prototypes were uncovered by the __ROS_LONG64__ feature. They all happen to be 64-bit portability issues, too modified base/system/msiexec/msiexec.rbuild msiexec is a Wine system component: compile with __WINESRC__ modified dll/win32/setupapi/setupapi.rbuild setupapi is _not_ a Wine system component: compile _without_ __WINESRC__ modified lib/3rdparty/libwine/debug.c Use LONG instead of long modified dll/win32/advapi32/service/sctrl.c modified include/psdk/winsvc.h Fix prototypes of StartServiceCtrlDispatcherA and StartServiceCtrlDispatcherW modified include/psdk/winbase.h Corrected the prototypes of GetProcessAffinityMask and ReadProcessMemory. Now Win64-compliant The argument to the _InterlockedCompareExchange is volatile long *, not volatile LONG *: cast explicitly (it's perfectly safe) modified include/psdk/wingdi.h Fix prototype of ENHMFENUMPROC svn path=/trunk/; revision=38872
2009-01-18 06:25:43 +00:00
#ifndef __ROS_LONG64__
typedef long *LPLONG;
Warning killing commit modified include/psdk/basetsd.h modified include/psdk/windef.h modified include/psdk/winnt.h Introduce new define __ROS_LONG64__ ("assume 64-bit long"), to use int instead of long in typedefs of 32-bit integers __ROS_LONG64__ automatically defined if __WINESRC__ is defined. No, __WINESRC__ alone is not enough modified base/applications/winhlp32/winhlp32.rbuild modified base/applications/wordpad/wordpad.rbuild Compile with __ROS_LONG64__ define to silence int/long warnings modified include/psdk/winsock.h modified include/psdk/winsock2.h __ROS_LONG64__ does Winsock too Use LONG and u_long instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/reactos/wine/test.h Use explicit casts in printf calls so the header compiles without warnings regardless of whether __ROS_LONG64__ is defined Use _strdup instead of strdup modified include/psdk/sspi.h modified include/psdk/wininet.h Use LONG and ULONG instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/psdk/htmlhelp.h modified include/psdk/lmaccess.h modified include/psdk/prsht.h modified include/psdk/vfw.h modified include/psdk/winuser.h By sheer coincidence, several wrong prototypes were uncovered by the __ROS_LONG64__ feature. They all happen to be 64-bit portability issues, too modified base/system/msiexec/msiexec.rbuild msiexec is a Wine system component: compile with __WINESRC__ modified dll/win32/setupapi/setupapi.rbuild setupapi is _not_ a Wine system component: compile _without_ __WINESRC__ modified lib/3rdparty/libwine/debug.c Use LONG instead of long modified dll/win32/advapi32/service/sctrl.c modified include/psdk/winsvc.h Fix prototypes of StartServiceCtrlDispatcherA and StartServiceCtrlDispatcherW modified include/psdk/winbase.h Corrected the prototypes of GetProcessAffinityMask and ReadProcessMemory. Now Win64-compliant The argument to the _InterlockedCompareExchange is volatile long *, not volatile LONG *: cast explicitly (it's perfectly safe) modified include/psdk/wingdi.h Fix prototype of ENHMFENUMPROC svn path=/trunk/; revision=38872
2009-01-18 06:25:43 +00:00
#else
typedef int *LPLONG;
#endif
typedef DWORD *PDWORD,*LPDWORD;
typedef CONST void *LPCVOID;
typedef unsigned int UINT,*PUINT,*LPUINT;
typedef void *LPVOID;
#ifndef __ms_va_list
# if defined(__x86_64__) && defined (__GNUC__)
# define __ms_va_list __builtin_ms_va_list
# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
# define __ms_va_end(list) __builtin_ms_va_end(list)
# else
# define __ms_va_list va_list
# define __ms_va_start(list,arg) va_start(list,arg)
# define __ms_va_end(list) va_end(list)
# endif
#endif
//
// Check if ntdef.h already defined these for us
//
#ifndef BASETYPES
#define BASETYPES
Warning killing commit modified include/psdk/basetsd.h modified include/psdk/windef.h modified include/psdk/winnt.h Introduce new define __ROS_LONG64__ ("assume 64-bit long"), to use int instead of long in typedefs of 32-bit integers __ROS_LONG64__ automatically defined if __WINESRC__ is defined. No, __WINESRC__ alone is not enough modified base/applications/winhlp32/winhlp32.rbuild modified base/applications/wordpad/wordpad.rbuild Compile with __ROS_LONG64__ define to silence int/long warnings modified include/psdk/winsock.h modified include/psdk/winsock2.h __ROS_LONG64__ does Winsock too Use LONG and u_long instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/reactos/wine/test.h Use explicit casts in printf calls so the header compiles without warnings regardless of whether __ROS_LONG64__ is defined Use _strdup instead of strdup modified include/psdk/sspi.h modified include/psdk/wininet.h Use LONG and ULONG instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/psdk/htmlhelp.h modified include/psdk/lmaccess.h modified include/psdk/prsht.h modified include/psdk/vfw.h modified include/psdk/winuser.h By sheer coincidence, several wrong prototypes were uncovered by the __ROS_LONG64__ feature. They all happen to be 64-bit portability issues, too modified base/system/msiexec/msiexec.rbuild msiexec is a Wine system component: compile with __WINESRC__ modified dll/win32/setupapi/setupapi.rbuild setupapi is _not_ a Wine system component: compile _without_ __WINESRC__ modified lib/3rdparty/libwine/debug.c Use LONG instead of long modified dll/win32/advapi32/service/sctrl.c modified include/psdk/winsvc.h Fix prototypes of StartServiceCtrlDispatcherA and StartServiceCtrlDispatcherW modified include/psdk/winbase.h Corrected the prototypes of GetProcessAffinityMask and ReadProcessMemory. Now Win64-compliant The argument to the _InterlockedCompareExchange is volatile long *, not volatile LONG *: cast explicitly (it's perfectly safe) modified include/psdk/wingdi.h Fix prototype of ENHMFENUMPROC svn path=/trunk/; revision=38872
2009-01-18 06:25:43 +00:00
#ifndef __ROS_LONG64__
typedef unsigned long ULONG, *PULONG;
Warning killing commit modified include/psdk/basetsd.h modified include/psdk/windef.h modified include/psdk/winnt.h Introduce new define __ROS_LONG64__ ("assume 64-bit long"), to use int instead of long in typedefs of 32-bit integers __ROS_LONG64__ automatically defined if __WINESRC__ is defined. No, __WINESRC__ alone is not enough modified base/applications/winhlp32/winhlp32.rbuild modified base/applications/wordpad/wordpad.rbuild Compile with __ROS_LONG64__ define to silence int/long warnings modified include/psdk/winsock.h modified include/psdk/winsock2.h __ROS_LONG64__ does Winsock too Use LONG and u_long instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/reactos/wine/test.h Use explicit casts in printf calls so the header compiles without warnings regardless of whether __ROS_LONG64__ is defined Use _strdup instead of strdup modified include/psdk/sspi.h modified include/psdk/wininet.h Use LONG and ULONG instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/psdk/htmlhelp.h modified include/psdk/lmaccess.h modified include/psdk/prsht.h modified include/psdk/vfw.h modified include/psdk/winuser.h By sheer coincidence, several wrong prototypes were uncovered by the __ROS_LONG64__ feature. They all happen to be 64-bit portability issues, too modified base/system/msiexec/msiexec.rbuild msiexec is a Wine system component: compile with __WINESRC__ modified dll/win32/setupapi/setupapi.rbuild setupapi is _not_ a Wine system component: compile _without_ __WINESRC__ modified lib/3rdparty/libwine/debug.c Use LONG instead of long modified dll/win32/advapi32/service/sctrl.c modified include/psdk/winsvc.h Fix prototypes of StartServiceCtrlDispatcherA and StartServiceCtrlDispatcherW modified include/psdk/winbase.h Corrected the prototypes of GetProcessAffinityMask and ReadProcessMemory. Now Win64-compliant The argument to the _InterlockedCompareExchange is volatile long *, not volatile LONG *: cast explicitly (it's perfectly safe) modified include/psdk/wingdi.h Fix prototype of ENHMFENUMPROC svn path=/trunk/; revision=38872
2009-01-18 06:25:43 +00:00
#else
typedef unsigned int ULONG, *PULONG;
#endif
typedef unsigned short USHORT, *PUSHORT;
typedef unsigned char UCHAR, *PUCHAR;
typedef char *PSZ;
typedef int INT;
#endif /* BASETYPES */
#ifndef NT_INCLUDED
#include <winnt.h>
#endif
typedef HANDLE *LPHANDLE;
typedef UINT_PTR WPARAM;
typedef LONG_PTR LPARAM;
typedef LONG_PTR LRESULT;
#ifndef _HRESULT_DEFINED
typedef LONG HRESULT;
#define _HRESULT_DEFINED
#endif
#ifndef XFree86Server
typedef WORD ATOM;
#endif /* XFree86Server */
typedef HANDLE HGLOBAL;
typedef HANDLE HLOCAL;
typedef HANDLE GLOBALHANDLE;
typedef HANDLE LOCALHANDLE;
typedef void *HGDIOBJ;
DECLARE_HANDLE(HACCEL);
DECLARE_HANDLE(HBITMAP);
DECLARE_HANDLE(HBRUSH);
DECLARE_HANDLE(HCOLORSPACE);
DECLARE_HANDLE(HDC);
DECLARE_HANDLE(HGLRC);
DECLARE_HANDLE(HDESK);
DECLARE_HANDLE(HENHMETAFILE);
DECLARE_HANDLE(HFONT);
DECLARE_HANDLE(HICON);
DECLARE_HANDLE(HKEY);
/* FIXME: How to handle these. SM_CMONITORS etc in winuser.h also. */
/* #if (WINVER >= 0x0500) */
DECLARE_HANDLE(HMONITOR);
DECLARE_HANDLE(HUMPD);
#define HMONITOR_DECLARED 1
DECLARE_HANDLE(HTERMINAL);
DECLARE_HANDLE(HWINEVENTHOOK);
/* #endif */
typedef HKEY *PHKEY;
DECLARE_HANDLE(HMENU);
DECLARE_HANDLE(HMETAFILE);
DECLARE_HANDLE(HINSTANCE);
typedef HINSTANCE HMODULE;
DECLARE_HANDLE(HPALETTE);
DECLARE_HANDLE(HPEN);
DECLARE_HANDLE(HRGN);
DECLARE_HANDLE(HRSRC);
DECLARE_HANDLE(HSTR);
DECLARE_HANDLE(HTASK);
DECLARE_HANDLE(HWND);
DECLARE_HANDLE(HWINSTA);
DECLARE_HANDLE(HKL);
typedef int HFILE;
typedef HICON HCURSOR;
typedef DWORD COLORREF;
merge from amd64 branch. and 35645: Fix some wrong declarations for 64bits. (Samuel Serapión) 35652: More header fixes. (Samuel Serapión) 35950: Implement __readeflags and __writeeflags (Timo Kreuzer) 35951: Remove hacks from __addgsbyte, __addgsword, __addgsdword. (Timo Kreuzer) 36171: Fix TIMERPROC definition. Fix CreateToolbarEx definition. (Samuel Serapión) 36468: Add MemoryBarrier definition for amd64 (Timo Kreuzer) 36469: Fix NetLocalGroupGetMembers prototype. (Samuel Serapión) 36474: Fix ReadProcessMemory and Toolhelp32ReadProcessMemory prototypes. (Samuel Serapión) 36840: fix __rdtsc on amd64 build (Timo Kreuzer) 36898: Fix CryptReleaseContext definition. (Samuel Serapión) 36900: Fix COMBOBOXEXITEA/W noticed by Daniel Verkamp. (Samuel Serapión) 36901: Fix NMHDR definition. noticed by Daniel Verkamp. (Samuel Serapión) 36906: Fix definitions of CDHOOKPROC, PROC, FARPROC, NEARPROC, SYSTEM_INFO, COMPAREITEMSTRUCT, COPYDATASTRUCT, DELETEITEMSTRUCT, DRAWITEMSTRUCT, MENUITEMINFOA/W, HELPINFO, MSGBOXPARAMSA/W, MOUSEHOOKSTRUCT, DROPSTRUCT, KBDLLHOOKSTRUCT, GetProcessAffinityMask, SetProcessAffinityMask, DragObject, InsertMenuA/W, ModifyMenuA/W, WinHelpA/W, RT_GROUP_CURSOR, RT_GROUP_ICON (Daniel Verkamp.) 36953: Fix AFD compilation for 64-bit (treat handles as ULONG_PTR-sized). Also correct Winsock's SOCKET definition (Stefan Ginsberg) 37307: Add UNWIND_HISTORY_TABLE_ENTRY and UNWIND_HISTORY_TABLE. (Timo Kreuzer) 37875: Inlcude excpt.h in winnt.h. (Timo Kreuzer) 37908: Fix definition of SOCKET. (Timo Kreuzer) 37926: fix *HOOKPROC definition. Add 64 bit BitTest functions. (Timo Kreuzer) 38072: Fix FARPROC, NEARPROC, PROC definitions (Samuel Serapión) 38091: Fix some 64bit portability issues. (Samuel Serapión) 38093: Hack for wine specific hack. (Samuel Serapión) 38095: Fix packing for commdlg. (Samuel Serapión) 38260: Fix EDITSTREAM structure. (Samuel Serapión) 38263: Fix definitions of WAVEOPENDESC, WAVEHDR structures. Fix prototypes for DefDriverProc, waveOutMessage, waveOutGetDevCapsA/W, waveInGetDevCapsA/W, waveInMessage, midiStreamOpen, midiOutGetDevCapsA/W, midiOutOpen, midiOutMessage, midiInGetDevCapsA/W, midiInOpen, midiInMessage, auxGetDevCapsA/W, auxOutMessage, mixerGetDevCapsA/W, mixerOpen, timeSetEvent, joyGetDevCapsA/W, mciSendCommandA/W, and mciGetCreatorTask. (Samuel Serapión) 38478: Fix HeapAlloc prototype. (Timo Kreuzer) 39468: Fix some definitions in mmsystem.h (Timo Kreuzer) svn path=/trunk/; revision=39471
2009-02-08 03:41:29 +00:00
#ifdef _WIN64
typedef INT_PTR (FAR WINAPI *FARPROC)();
typedef INT_PTR (NEAR WINAPI *NEARPROC)();
typedef INT_PTR (WINAPI *PROC)();
#else
typedef int (FAR WINAPI *FARPROC)();
typedef int (NEAR WINAPI *NEARPROC)();
typedef int (WINAPI *PROC)();
merge from amd64 branch. and 35645: Fix some wrong declarations for 64bits. (Samuel Serapión) 35652: More header fixes. (Samuel Serapión) 35950: Implement __readeflags and __writeeflags (Timo Kreuzer) 35951: Remove hacks from __addgsbyte, __addgsword, __addgsdword. (Timo Kreuzer) 36171: Fix TIMERPROC definition. Fix CreateToolbarEx definition. (Samuel Serapión) 36468: Add MemoryBarrier definition for amd64 (Timo Kreuzer) 36469: Fix NetLocalGroupGetMembers prototype. (Samuel Serapión) 36474: Fix ReadProcessMemory and Toolhelp32ReadProcessMemory prototypes. (Samuel Serapión) 36840: fix __rdtsc on amd64 build (Timo Kreuzer) 36898: Fix CryptReleaseContext definition. (Samuel Serapión) 36900: Fix COMBOBOXEXITEA/W noticed by Daniel Verkamp. (Samuel Serapión) 36901: Fix NMHDR definition. noticed by Daniel Verkamp. (Samuel Serapión) 36906: Fix definitions of CDHOOKPROC, PROC, FARPROC, NEARPROC, SYSTEM_INFO, COMPAREITEMSTRUCT, COPYDATASTRUCT, DELETEITEMSTRUCT, DRAWITEMSTRUCT, MENUITEMINFOA/W, HELPINFO, MSGBOXPARAMSA/W, MOUSEHOOKSTRUCT, DROPSTRUCT, KBDLLHOOKSTRUCT, GetProcessAffinityMask, SetProcessAffinityMask, DragObject, InsertMenuA/W, ModifyMenuA/W, WinHelpA/W, RT_GROUP_CURSOR, RT_GROUP_ICON (Daniel Verkamp.) 36953: Fix AFD compilation for 64-bit (treat handles as ULONG_PTR-sized). Also correct Winsock's SOCKET definition (Stefan Ginsberg) 37307: Add UNWIND_HISTORY_TABLE_ENTRY and UNWIND_HISTORY_TABLE. (Timo Kreuzer) 37875: Inlcude excpt.h in winnt.h. (Timo Kreuzer) 37908: Fix definition of SOCKET. (Timo Kreuzer) 37926: fix *HOOKPROC definition. Add 64 bit BitTest functions. (Timo Kreuzer) 38072: Fix FARPROC, NEARPROC, PROC definitions (Samuel Serapión) 38091: Fix some 64bit portability issues. (Samuel Serapión) 38093: Hack for wine specific hack. (Samuel Serapión) 38095: Fix packing for commdlg. (Samuel Serapión) 38260: Fix EDITSTREAM structure. (Samuel Serapión) 38263: Fix definitions of WAVEOPENDESC, WAVEHDR structures. Fix prototypes for DefDriverProc, waveOutMessage, waveOutGetDevCapsA/W, waveInGetDevCapsA/W, waveInMessage, midiStreamOpen, midiOutGetDevCapsA/W, midiOutOpen, midiOutMessage, midiInGetDevCapsA/W, midiInOpen, midiInMessage, auxGetDevCapsA/W, auxOutMessage, mixerGetDevCapsA/W, mixerOpen, timeSetEvent, joyGetDevCapsA/W, mciSendCommandA/W, and mciGetCreatorTask. (Samuel Serapión) 38478: Fix HeapAlloc prototype. (Timo Kreuzer) 39468: Fix some definitions in mmsystem.h (Timo Kreuzer) svn path=/trunk/; revision=39471
2009-02-08 03:41:29 +00:00
#endif
typedef struct tagRECT {
LONG left;
LONG top;
LONG right;
LONG bottom;
} RECT,*PRECT,*LPRECT;
typedef const RECT *LPCRECT;
typedef struct tagRECTL {
LONG left;
LONG top;
LONG right;
LONG bottom;
} RECTL,*PRECTL,*LPRECTL;
typedef const RECTL *LPCRECTL;
typedef struct tagPOINT {
LONG x;
LONG y;
} POINT,POINTL,*PPOINT,*LPPOINT,*PPOINTL,*LPPOINTL;
typedef struct tagSIZE {
LONG cx;
LONG cy;
} SIZE,SIZEL,*PSIZE,*LPSIZE,*PSIZEL,*LPSIZEL;
typedef struct tagPOINTS {
SHORT x;
SHORT y;
} POINTS,*PPOINTS,*LPPOINTS;
modified include/crt/_mingw.h No "restrict" support in Visual C++ (and __restrict isn't the same thing) modified include/crt/stdarg.h Really fix stdarg.h this time modified include/crt/wchar.h modified include/psdk/dde.h modified include/psdk/mmsystem.h modified include/psdk/prsht.h modified include/psdk/rpcndr.h modified include/psdk/shellapi.h modified include/psdk/winbase.h modified include/psdk/wincon.h modified include/psdk/wincrypt.h modified include/psdk/windef.h modified include/psdk/wingdi.h modified include/psdk/winioctl.h modified include/psdk/winnetwk.h modified include/psdk/winnls.h modified include/psdk/winnt.h modified include/psdk/winperf.h modified include/psdk/winsmcrd.h modified include/psdk/winsock2.h modified include/psdk/winspool.h modified include/psdk/winuser.h modified include/psdk/wtypes.idl modified include/reactos/mingw-w64/internal.h modified include/reactos/mingw-w64/oscalls.h Disable some unavoidable warnings in Visual C++ modified include/psdk/poppack.h modified include/psdk/pshpack1.h modified include/psdk/pshpack2.h modified include/psdk/pshpack4.h modified include/psdk/pshpack8.h modified include/psdk/pshpck16.h modified include/psdk/windows.h modified include/psdk/winsock2.h Check that defines are defined before testing their value modified include/psdk/rpcasync.h modified include/psdk/rpcdce.h Visual C++ doesn't support functions without a prototype anymore, and RPC_AUTH_KEY_RETRIEVAL_FN has a documented prototype anyway modified include/psdk/winnt.h WIN32_WINNT -> _WIN32_WINNT svn path=/trunk/; revision=41434
2009-06-17 11:18:51 +00:00
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#ifdef __cplusplus
}
#endif
#endif