Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[tkreuzer] 34838: "Interlocked stuff is still a bit broken." ... yeah, cause you broke it ; -)
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 04:15:54 2008 New Revision: 34838 URL: http://svn.reactos.org/svn/reactos?rev=34838&view=rev Log: "Interlocked stuff is still a bit broken." ... yeah, cause you broke it ;-) Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Sun Jul 27 04:15:54 2008 @@ -5789,8 +5789,6 @@ #define QueryDepthSList(Head) ExQueryDepthSList(Head) #endif // !defined(_WINBASE_ -#endif // defined (_WIN64) - #endif /* !__INTERLOCKED_DECLARED */ NTKERNELAPI

1 0

[hpoussin] 34837: Add support for fastcall functions in .spec files
by hpoussin＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: hpoussin Date: Sun Jul 27 04:12:37 2008 New Revision: 34837 URL: http://svn.reactos.org/svn/reactos?rev=34837&view=rev Log: Add support for fastcall functions in .spec files Modified: trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/parser.c trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… ============================================================================== --- trunk/reactos/tools/winebuild/build.h [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/build.h [iso-8859-1] Sun Jul 27 04:12:37 2008 @@ -40,6 +40,7 @@ TYPE_STDCALL, /* stdcall function (Win32) */ TYPE_CDECL, /* cdecl function (Win32) */ TYPE_VARARGS, /* varargs function (Win32) */ + TYPE_FASTCALL, /* fastcall function (Win32) */ TYPE_EXTERN, /* external symbol (Win32) */ TYPE_NBTYPES } ORD_TYPE; Modified: trunk/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/parser.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/parser.c [iso-8859-1] Sun Jul 27 04:12:37 2008 @@ -57,6 +57,7 @@ "stdcall", /* TYPE_STDCALL */ "cdecl", /* TYPE_CDECL */ "varargs", /* TYPE_VARARGS */ + "fastcall", /* TYPE_FASTCALL */ "extern" /* TYPE_EXTERN */ }; @@ -490,6 +491,7 @@ case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: + case TYPE_FASTCALL: if (!parse_spec_export( odp, spec )) goto error; break; case TYPE_ABS: Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/spec32.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/spec32.c [iso-8859-1] Sun Jul 27 04:12:37 2008 @@ -577,23 +577,25 @@ if (!(odp->flags & FLAG_PRIVATE)) total++; - - output( " %s", name ); - switch(odp->type) { case TYPE_EXTERN: + output( " %s", name ); is_data = 1; - /* fall through */ + if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) + output( "=%s", odp->link_name ); + break; case TYPE_VARARGS: case TYPE_CDECL: /* try to reduce output */ + output( " %s", name ); if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) output( "=%s", odp->link_name ); break; case TYPE_STDCALL: { int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); + output( " %s", name ); if (!kill_at) output( "@%d", at_param ); if (odp->flags & FLAG_FORWARD) { @@ -606,8 +608,25 @@ } break; } + case TYPE_FASTCALL: + { + int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); + output( " @%s", name ); + if (!kill_at) output( "@%d", at_param ); + if (odp->flags & FLAG_FORWARD) + { + output( "=@%s", odp->link_name ); + } + else if (strcmp(name, odp->link_name)) /* try to reduce output */ + { + output( "=@%s", odp->link_name ); + if (!kill_at) output( "@%d", at_param ); + } + break; + } case TYPE_STUB: { + output( " %s", name ); if (!kill_at) { const char *check = name + strlen(name);

1 0

[hpoussin] 34836: Add a .spec file for HAL exports. Don't use it yet
by hpoussin＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: hpoussin Date: Sun Jul 27 04:07:59 2008 New Revision: 34836 URL: http://svn.reactos.org/svn/reactos?rev=34836&view=rev Log: Add a .spec file for HAL exports. Don't use it yet Added: trunk/reactos/hal/hal/hal.spec (with props) Modified: trunk/reactos/hal/hal/hal.c (props changed) trunk/reactos/hal/hal/hal.rbuild trunk/reactos/hal/hal/hal.rc (contents, props changed) Propchange: trunk/reactos/hal/hal/hal.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=348… ============================================================================== --- trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] Sun Jul 27 04:07:59 2008 @@ -2,13 +2,13 @@ <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> <module name="hal" type="kernelmodedll"> - <importlibrary definition="hal_$(ARCH).def" /> + <importlibrary definition="hal.spec.def" /> <include base="ntoskrnl">include</include> <library>ntoskrnl</library> <define name="_NTHAL_" /> - <linkerflag>-enable-stdcall-fixup</linkerflag> <file>hal.c</file> <file>hal.rc</file> + <file>hal.spec</file> </module> <if property="ARCH" value="i386"> <module ifnot="false" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup"> Modified: trunk/reactos/hal/hal/hal.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rc?rev=34836&r… ============================================================================== --- trunk/reactos/hal/hal/hal.rc [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.rc [iso-8859-1] Sun Jul 27 04:07:59 2008 @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Template Hardware Abstraction Layer\0" #define REACTOS_STR_INTERNAL_NAME "hal\0" Propchange: trunk/reactos/hal/hal/hal.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Added: trunk/reactos/hal/hal/hal.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.spec?rev=34836… ============================================================================== --- trunk/reactos/hal/hal/hal.spec (added) +++ trunk/reactos/hal/hal/hal.spec [iso-8859-1] Sun Jul 27 04:07:59 2008 @@ -1,0 +1,102 @@ +#include "include/reactos/msvctarget.h" + +@ fastcall ExAcquireFastMutex(ptr) ExiAcquireFastMutex +@ fastcall ExReleaseFastMutex(ptr) ExiReleaseFastMutex +@ fastcall ExTryToAcquireFastMutex(ptr) ExiTryToAcquireFastMutex +@ fastcall HalClearSoftwareInterrupt(long) +@ fastcall HalRequestSoftwareInterrupt(long) +@ fastcall HalSystemVectorDispatchEntry(long long long) +@ fastcall KeAcquireInStackQueuedSpinLock(ptr ptr) +@ fastcall KeAcquireInStackQueuedSpinLockRaiseToSynch(ptr ptr) +@ fastcall KeAcquireSpinLockRaiseToSynch(ptr) +@ fastcall KeAcquireQueuedSpinLock(ptr) +@ fastcall KeAcquireQueuedSpinLockRaiseToSynch(ptr) +@ fastcall KeReleaseInStackQueuedSpinLock(ptr) +@ fastcall KeReleaseQueuedSpinLock(ptr long) +@ fastcall KeTryToAcquireQueuedSpinLock(long ptr) +@ fastcall KeTryToAcquireQueuedSpinLockRaiseToSynch(long ptr) +@ fastcall KfAcquireSpinLock(ptr) +@ fastcall KfLowerIrql(long) +@ fastcall KfRaiseIrql(long) +@ fastcall KfReleaseSpinLock(ptr long) + +@ stdcall HalAcquireDisplayOwnership(ptr) +@ stdcall HalAdjustResourceList(ptr) +@ stdcall HalAllProcessorsStarted() +@ stdcall HalAllocateAdapterChannel(ptr ptr long ptr) +@ stdcall HalAllocateCommonBuffer(ptr long ptr long) +@ stdcall HalAllocateCrashDumpRegisters(ptr ptr) +@ stdcall HalAssignSlotResources(ptr ptr ptr ptr long long long ptr) +@ stdcall HalBeginSystemInterrupt(long long ptr) +@ stdcall HalCalibratePerformanceCounter(ptr long long) +@ stdcall HalDisableSystemInterrupt(long long) +@ stdcall HalDisplayString(str) +@ stdcall HalEnableSystemInterrupt(long long long) +@ stdcall HalEndSystemInterrupt(long long) +@ stdcall HalFlushCommonBuffer(long long long long long) +@ stdcall HalFreeCommonBuffer(ptr long long long ptr long) +@ stdcall HalGetAdapter(ptr ptr) +@ stdcall HalGetBusData(long long long ptr long) +@ stdcall HalGetBusDataByOffset(long long long ptr long long) +@ stdcall HalGetEnvironmentVariable(str long str) +#ifdef _M_ARM +@ fastcall HalGetInterruptSource() +#endif +@ stdcall HalGetInterruptVector(long long long long ptr ptr) +@ stdcall HalHandleNMI(ptr) +@ stdcall HalInitSystem(long ptr) +@ stdcall HalInitializeProcessor(long ptr) +@ stdcall HalMakeBeep(long) +@ stdcall HalProcessorIdle() +@ stdcall HalQueryDisplayParameters(ptr ptr ptr ptr) +@ stdcall HalQueryRealTimeClock(ptr) +@ stdcall HalReadDmaCounter(ptr) +@ stdcall HalReportResourceUsage() +@ stdcall HalRequestIpi(long) +@ stdcall HalReturnToFirmware(long) +@ stdcall HalSetBusData(long long long ptr long) +@ stdcall HalSetBusDataByOffset(long long long ptr long long) +@ stdcall HalSetDisplayParameters(long long) +@ stdcall HalSetEnvironmentVariable(str str) +@ stdcall HalSetProfileInterval(long) +@ stdcall HalSetRealTimeClock(ptr) +@ stdcall HalSetTimeIncrement(long) +@ stdcall HalStartNextProcessor(ptr ptr) +@ stdcall HalStartProfileInterrupt(long) +@ stdcall HalStopProfileInterrupt(long) +#ifdef _M_ARM +@ fastcall HalSweepIcache() +@ fastcall HalSweepDcache() +#endif +@ stdcall HalTranslateBusAddress(long long long long ptr ptr) +@ stdcall IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters +@ stdcall IoFlushAdapterBuffers(ptr ptr ptr ptr long long) +@ stdcall IoFreeAdapterChannel(ptr) +@ stdcall IoFreeMapRegisters(ptr ptr long) +@ stdcall IoMapTransfer(ptr ptr ptr ptr ptr long) +@ stdcall IoReadPartitionTable(ptr long long ptr) HalpReadPartitionTable +@ stdcall IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation +@ stdcall IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable +@ stdcall KeAcquireSpinLock(ptr ptr) +@ extern KdComPortInUse _KdComPortInUse +@ stdcall KeFlushWriteBuffer() +@ stdcall KeGetCurrentIrql() +@ stdcall KeLowerIrql(long) +@ stdcall KeQueryPerformanceCounter(ptr) +@ stdcall KeRaiseIrql(long ptr) +@ stdcall KeRaiseIrqlToDpcLevel() +@ stdcall KeRaiseIrqlToSynchLevel() +@ stdcall KeReleaseSpinLock(ptr long) +@ stdcall KeStallExecutionProcessor(long) +@ stdcall READ_PORT_BUFFER_UCHAR(ptr ptr long) +@ stdcall READ_PORT_BUFFER_ULONG(ptr ptr long) +@ stdcall READ_PORT_BUFFER_USHORT(ptr ptr long) +@ stdcall READ_PORT_UCHAR(ptr) +@ stdcall READ_PORT_ULONG(ptr) +@ stdcall READ_PORT_USHORT(ptr) +@ stdcall WRITE_PORT_BUFFER_UCHAR(ptr ptr long) +@ stdcall WRITE_PORT_BUFFER_ULONG(ptr ptr long) +@ stdcall WRITE_PORT_BUFFER_USHORT(ptr ptr long) +@ stdcall WRITE_PORT_UCHAR(ptr long) +@ stdcall WRITE_PORT_ULONG(ptr long) +@ stdcall WRITE_PORT_USHORT(ptr long) Propchange: trunk/reactos/hal/hal/hal.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 34835: gcc defines _WIN32 for us ... on a 64bit target. hack windef to get rid of it. This fixes zlib.
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 04:07:31 2008 New Revision: 34835 URL: http://svn.reactos.org/svn/reactos?rev=34835&view=rev Log: gcc defines _WIN32 for us ... on a 64bit target. hack windef to get rid of it. This fixes zlib. Modified: branches/ros-amd64-bringup/reactos/include/psdk/windef.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] Sun Jul 27 04:07:31 2008 @@ -25,12 +25,23 @@ * including windows.h or any other method of including the windef.h header. */ #endif + +#if !defined(WIN64) && !defined(_M_AMD64) && !defined(_M_IA64) #ifndef WIN32 #define WIN32 #endif #ifndef _WIN32 #define _WIN32 #endif +#else // WIN64 +#ifdef WIN32 +#undef WIN32 +#endif +#ifdef _WIN32 +#undef _WIN32 +#endif +#endif // WIN64 + #define FAR #define far #define NEAR

1 0

[sserapion] 34834: Forgot one.
by sserapion＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: sserapion Date: Sun Jul 27 04:02:46 2008 New Revision: 34834 URL: http://svn.reactos.org/svn/reactos?rev=34834&view=rev Log: Forgot one. Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Sun Jul 27 04:02:46 2008 @@ -813,7 +813,7 @@ } #ifndef __MSVCRT__ -static __inline__ __attribute__((always_inline)) unsigned long _rotl(const unsigned int value, const unsigned char shift) +static __inline__ __attribute__((always_inline)) unsigned int _rotl(const unsigned int value, const int shift) { unsigned long retval; __asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift));

1 0

[sserapion] 34833: Remove multiple declarations and minor fixes. Interlocked stuff is still a bit broken.
by sserapion＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: sserapion Date: Sun Jul 27 03:37:14 2008 New Revision: 34833 URL: http://svn.reactos.org/svn/reactos?rev=34833&view=rev Log: Remove multiple declarations and minor fixes. Interlocked stuff is still a bit broken. Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Sun Jul 27 03:37:14 2008 @@ -760,27 +760,6 @@ IN PVOID MapRegisterBase, IN PVOID Context); - -typedef struct _EXCEPTION_RECORD32 -{ - NTSTATUS ExceptionCode; - ULONG ExceptionFlags; - ULONG ExceptionRecord; - ULONG ExceptionAddress; - ULONG NumberParameters; - ULONG ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; -} EXCEPTION_RECORD32, *PEXCEPTION_RECORD32; - -typedef struct _EXCEPTION_RECORD64 -{ - NTSTATUS ExceptionCode; - ULONG ExceptionFlags; - ULONG64 ExceptionRecord; - ULONG64 ExceptionAddress; - ULONG NumberParameters; - ULONG __unusedAlignment; - ULONG64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; -} EXCEPTION_RECORD64, *PEXCEPTION_RECORD64; typedef EXCEPTION_DISPOSITION (DDKAPI *PEXCEPTION_ROUTINE)( @@ -5518,6 +5497,12 @@ VOID ); +NTKERNELAPI +PRKTHREAD +NTAPI +KeGetCurrentThread( + VOID); + #elif defined(__PowerPC__) typedef ULONG PFN_NUMBER, *PPFN_NUMBER; @@ -5748,7 +5733,9 @@ * IN OUT PVOID VOLATILE *Target, * IN PVOID Value) */ -#if !defined (_M_AMD64) +#if defined (_M_AMD64) +#define InterlockedExchangePointer _InterlockedExchangePointer +#else #define InterlockedExchangePointer(Target, Value) \ ((PVOID) InterlockedExchange((PLONG) Target, (LONG) Value)) #endif @@ -5760,12 +5747,13 @@ * IN PVOID Exchange, * IN PVOID Comparand) */ -#if !defined (_M_AMD64) +#if defined (_M_AMD64) +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#else #define InterlockedCompareExchangePointer(Destination, Exchange, Comparand) \ ((PVOID) InterlockedCompareExchange((PLONG) Destination, (LONG) Exchange, (LONG) Comparand)) #endif -#if defined (_M_AMD64) #define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)a, b) #define InterlockedIncrementSizeT(a) InterlockedIncrement((LONG *)a) #define InterlockedDecrementSizeT(a) InterlockedDecrement((LONG *)a)

1 0

[sserapion] 34832: Remove WINEisms
by sserapion＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: sserapion Date: Sun Jul 27 03:34:16 2008 New Revision: 34832 URL: http://svn.reactos.org/svn/reactos?rev=34832&view=rev Log: Remove WINEisms Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/port.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/wine/port.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/wine/port.h [iso-8859-1] Sun Jul 27 03:34:16 2008 @@ -328,53 +328,12 @@ #if defined(__i386__) && defined(__GNUC__) && !defined(WINE_PORT_NO_INTERLOCKED) -extern inline long interlocked_cmpxchg( long *dest, long xchg, long compare ) -{ - long ret; - __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" - : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); - return ret; -} - -extern inline void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) -{ - void *ret; - __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" - : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); - return ret; -} - -extern inline long interlocked_xchg( long *dest, long val ) -{ - long ret; - __asm__ __volatile__( "lock; xchgl %0,(%1)" - : "=r" (ret) : "r" (dest), "0" (val) : "memory" ); - return ret; -} - -extern inline void *interlocked_xchg_ptr( void **dest, void *val ) -{ - void *ret; - __asm__ __volatile__( "lock; xchgl %0,(%1)" - : "=r" (ret) : "r" (dest), "0" (val) : "memory" ); - return ret; -} - -extern inline long interlocked_xchg_add( long *dest, long incr ) -{ - long ret; - __asm__ __volatile__( "lock; xaddl %0,(%1)" - : "=r" (ret) : "r" (dest), "0" (incr) : "memory" ); - return ret; -} - -#else /* __i386___ && __GNUC__ */ - -extern long interlocked_cmpxchg( long *dest, long xchg, long compare ); -extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); -extern long interlocked_xchg( long *dest, long val ); -extern void *interlocked_xchg_ptr( void **dest, void *val ); -extern long interlocked_xchg_add( long *dest, long incr ); +#define interlocked_cmpxchg InterlockedCompareExchange +#define interlocked_cmpxchg_ptr InterlockedCompareExchangePtr +#define interlocked_xchg InterlockedExchange +#define interlocked_xchg_ptr InterlockedExchangePtr +#define interlocked_xchg_add InterlockedExchangeAdd + #endif /* __i386___ && __GNUC__ */ @@ -385,11 +344,6 @@ #define getopt_long __WINE_NOT_PORTABLE(getopt_long) #define getopt_long_only __WINE_NOT_PORTABLE(getopt_long_only) #define getpagesize __WINE_NOT_PORTABLE(getpagesize) -#define interlocked_cmpxchg __WINE_NOT_PORTABLE(interlocked_cmpxchg) -#define interlocked_cmpxchg_ptr __WINE_NOT_PORTABLE(interlocked_cmpxchg_ptr) -#define interlocked_xchg __WINE_NOT_PORTABLE(interlocked_xchg) -#define interlocked_xchg_ptr __WINE_NOT_PORTABLE(interlocked_xchg_ptr) -#define interlocked_xchg_add __WINE_NOT_PORTABLE(interlocked_xchg_add) #define lstat __WINE_NOT_PORTABLE(lstat) #define memcpy_unaligned __WINE_NOT_PORTABLE(memcpy_unaligned) #define memmove __WINE_NOT_PORTABLE(memmove)

1 0

[sserapion] 34831: intrin_x86.h: - 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.
by sserapion＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: sserapion Date: Sun Jul 27 03:30:10 2008 New Revision: 34831 URL: http://svn.reactos.org/svn/reactos?rev=34831&view=rev Log: intrin_x86.h: - 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. Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h branches/ros-amd64-bringup/reactos/include/psdk/winbase.h branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Sun Jul 27 03:30:10 2008 @@ -813,10 +813,17 @@ } #ifndef __MSVCRT__ -static __inline__ __attribute__((always_inline)) unsigned long _rotl(const unsigned long value, const unsigned char shift) +static __inline__ __attribute__((always_inline)) unsigned long _rotl(const unsigned int value, const unsigned char shift) { unsigned long retval; __asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + return retval; +} + +static __inline__ __attribute__((always_inline)) unsigned long _rotr(const unsigned int value, const unsigned char shift) +{ + unsigned long retval; + __asm__("rorl %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } #endif Modified: branches/ros-amd64-bringup/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winbase.h [iso-8859-1] Sun Jul 27 03:30:10 2008 @@ -1737,9 +1737,10 @@ #define InterlockedCompareExchange64 _InterlockedCompareExchange64 #define InterlockedCompareExchangeAcquire64 InterlockedCompareExchange64 #define InterlockedCompareExchangeRelease64 InterlockedCompareExchange64 - #else +LONG WINAPI InterlockedOr(IN OUT LONG volatile *,LONG); +LONG WINAPI InterlockedAnd(IN OUT LONG volatile *,LONG); LONG WINAPI InterlockedCompareExchange(IN OUT LONG volatile *,LONG,LONG); LONG WINAPI InterlockedDecrement(IN OUT LONG volatile *); LONG WINAPI InterlockedExchange(IN OUT LONG volatile *,LONG); Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jul 27 03:30:10 2008 @@ -510,8 +510,6 @@ #define THREAD_DIRECT_IMPERSONATION 0x200 #endif #define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3FF) -#define EXCEPTION_NONCONTINUABLE 1 -#define EXCEPTION_MAXIMUM_PARAMETERS 15 /* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ #ifndef __NTDDK_H #define MUTANT_QUERY_STATE 0x0001 @@ -2069,16 +2067,28 @@ BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; } CONTEXT; #elif defined(__x86_64__) -#define CONTEXT_AMD64 0x00100000 - -#define CONTEXT_CONTROL (CONTEXT_AMD64 | 0x0001) -#define CONTEXT_INTEGER (CONTEXT_AMD64 | 0x0002) -#define CONTEXT_SEGMENTS (CONTEXT_AMD64 | 0x0004) -#define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x0008L) -#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x0010L) + + +#define CONTEXT_AMD64 0x100000 + +#if !defined(RC_INVOKED) +#define CONTEXT_CONTROL (CONTEXT_AMD64 | 0x1L) +#define CONTEXT_INTEGER (CONTEXT_AMD64 | 0x2L) +#define CONTEXT_SEGMENTS (CONTEXT_AMD64 | 0x4L) +#define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x8L) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x10L) + #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) +#define CONTEXT_EXCEPTION_ACTIVE 0x8000000 +#define CONTEXT_SERVICE_ACTIVE 0x10000000 +#define CONTEXT_EXCEPTION_REQUEST 0x40000000 +#define CONTEXT_EXCEPTION_REPORTING 0x80000000 +#endif + +#define INITIAL_MXCSR 0x1f80 +#define INITIAL_FPCSR 0x027f #define EXCEPTION_READ_FAULT 0 #define EXCEPTION_WRITE_FAULT 1 #define EXCEPTION_EXECUTE_FAULT 8 @@ -2192,7 +2202,25 @@ DWORD64 LastBranchFromRip; DWORD64 LastExceptionToRip; DWORD64 LastExceptionFromRip; -} CONTEXT; +} CONTEXT, *PCONTEXT; + +#define RUNTIME_FUNCTION_INDIRECT 0x1 + + typedef struct _RUNTIME_FUNCTION { + DWORD BeginAddress; + DWORD EndAddress; + DWORD UnwindData; + } RUNTIME_FUNCTION,*PRUNTIME_FUNCTION; + + typedef PRUNTIME_FUNCTION (*PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD64 ControlPc,PVOID Context); + typedef DWORD (*POUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK)(HANDLE Process,PVOID TableAddress,PDWORD Entries,PRUNTIME_FUNCTION *Functions); + + #define OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK_EXPORT_NAME "OutOfProcessFunctionTableCallback" + + NTSYSAPI VOID __cdecl RtlRestoreContext (PCONTEXT ContextRecord,struct _EXCEPTION_RECORD *ExceptionRecord); + NTSYSAPI BOOLEAN __cdecl RtlAddFunctionTable(PRUNTIME_FUNCTION FunctionTable,DWORD EntryCount,DWORD64 BaseAddress); + NTSYSAPI BOOLEAN __cdecl RtlInstallFunctionTableCallback(DWORD64 TableIdentifier,DWORD64 BaseAddress,DWORD Length,PGET_RUNTIME_FUNCTION_CALLBACK Callback,PVOID Context,PCWSTR OutOfProcessCallbackDll); + NTSYSAPI BOOLEAN __cdecl RtlDeleteFunctionTable(PRUNTIME_FUNCTION FunctionTable); #elif defined(_PPC_) #define CONTEXT_CONTROL 1L @@ -2681,18 +2709,44 @@ #error "undefined processor type" #endif typedef CONTEXT *PCONTEXT,*LPCONTEXT; -typedef struct _EXCEPTION_RECORD { - DWORD ExceptionCode; - DWORD ExceptionFlags; - struct _EXCEPTION_RECORD *ExceptionRecord; - PVOID ExceptionAddress; - DWORD NumberParameters; - ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; -} EXCEPTION_RECORD,*PEXCEPTION_RECORD,*LPEXCEPTION_RECORD; -typedef struct _EXCEPTION_POINTERS { - PEXCEPTION_RECORD ExceptionRecord; - PCONTEXT ContextRecord; -} EXCEPTION_POINTERS,*PEXCEPTION_POINTERS,*LPEXCEPTION_POINTERS; + +#define EXCEPTION_NONCONTINUABLE 1 +#define EXCEPTION_MAXIMUM_PARAMETERS 15 + + typedef struct _EXCEPTION_RECORD { + DWORD ExceptionCode; + DWORD ExceptionFlags; + struct _EXCEPTION_RECORD *ExceptionRecord; + PVOID ExceptionAddress; + DWORD NumberParameters; + ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; + } EXCEPTION_RECORD, *PEXCEPTION_RECORD, *LPEXCEPTION_RECORD; + + typedef EXCEPTION_RECORD *PEXCEPTION_RECORD; + + typedef struct _EXCEPTION_RECORD32 { + DWORD ExceptionCode; + DWORD ExceptionFlags; + DWORD ExceptionRecord; + DWORD ExceptionAddress; + DWORD NumberParameters; + DWORD ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; + } EXCEPTION_RECORD32,*PEXCEPTION_RECORD32; + + typedef struct _EXCEPTION_RECORD64 { + DWORD ExceptionCode; + DWORD ExceptionFlags; + DWORD64 ExceptionRecord; + DWORD64 ExceptionAddress; + DWORD NumberParameters; + DWORD __unusedAlignment; + DWORD64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; + } EXCEPTION_RECORD64,*PEXCEPTION_RECORD64; + + typedef struct _EXCEPTION_POINTERS { + PEXCEPTION_RECORD ExceptionRecord; + PCONTEXT ContextRecord; + } EXCEPTION_POINTERS,*PEXCEPTION_POINTERS, *LPEXCEPTION_POINTERS; #ifdef _M_PPC #define LARGE_INTEGER_ORDER(x) x HighPart; DWORD LowPart; @@ -3044,6 +3098,12 @@ OUT PDWORD BackTraceHash OPTIONAL ); +NTSYSAPI +VOID +NTAPI +RtlCaptureContext( + PCONTEXT ContextRecord +); NTSYSAPI PVOID @@ -3498,14 +3558,75 @@ WORD Hint; BYTE Name[1]; } IMAGE_IMPORT_BY_NAME,*PIMAGE_IMPORT_BY_NAME; -typedef struct _IMAGE_THUNK_DATA { - union { - ULONG ForwarderString; - ULONG Function; - DWORD Ordinal; - ULONG AddressOfData; - } u1; -} IMAGE_THUNK_DATA,*PIMAGE_THUNK_DATA; +#include "pshpack8.h" +typedef struct _IMAGE_THUNK_DATA64 { + union { + ULONGLONG ForwarderString; + ULONGLONG Function; + ULONGLONG Ordinal; + ULONGLONG AddressOfData; + } u1; +} IMAGE_THUNK_DATA64; +typedef IMAGE_THUNK_DATA64 *PIMAGE_THUNK_DATA64; +#include "poppack.h" + +typedef struct _IMAGE_THUNK_DATA32 { + union { + DWORD ForwarderString; + DWORD Function; + DWORD Ordinal; + DWORD AddressOfData; + } u1; +} IMAGE_THUNK_DATA32; +typedef IMAGE_THUNK_DATA32 *PIMAGE_THUNK_DATA32; + +#define IMAGE_ORDINAL_FLAG64 0x8000000000000000 +#define IMAGE_ORDINAL_FLAG32 0x80000000 +#define IMAGE_ORDINAL64(Ordinal) (Ordinal & 0xffff) +#define IMAGE_ORDINAL32(Ordinal) (Ordinal & 0xffff) +#define IMAGE_SNAP_BY_ORDINAL64(Ordinal) ((Ordinal & IMAGE_ORDINAL_FLAG64)!=0) +#define IMAGE_SNAP_BY_ORDINAL32(Ordinal) ((Ordinal & IMAGE_ORDINAL_FLAG32)!=0) + +typedef VOID +(NTAPI *PIMAGE_TLS_CALLBACK)(PVOID DllHandle,DWORD Reason,PVOID Reserved); + +typedef struct _IMAGE_TLS_DIRECTORY64 { + ULONGLONG StartAddressOfRawData; + ULONGLONG EndAddressOfRawData; + ULONGLONG AddressOfIndex; + ULONGLONG AddressOfCallBacks; + DWORD SizeOfZeroFill; + DWORD Characteristics; +} IMAGE_TLS_DIRECTORY64; +typedef IMAGE_TLS_DIRECTORY64 *PIMAGE_TLS_DIRECTORY64; + +typedef struct _IMAGE_TLS_DIRECTORY32 { + DWORD StartAddressOfRawData; + DWORD EndAddressOfRawData; + DWORD AddressOfIndex; + DWORD AddressOfCallBacks; + DWORD SizeOfZeroFill; + DWORD Characteristics; +} IMAGE_TLS_DIRECTORY32; +typedef IMAGE_TLS_DIRECTORY32 *PIMAGE_TLS_DIRECTORY32; +#ifdef _WIN64 +#define IMAGE_ORDINAL_FLAG IMAGE_ORDINAL_FLAG64 +#define IMAGE_ORDINAL(Ordinal) IMAGE_ORDINAL64(Ordinal) +typedef IMAGE_THUNK_DATA64 IMAGE_THUNK_DATA; +typedef PIMAGE_THUNK_DATA64 PIMAGE_THUNK_DATA; +#define IMAGE_SNAP_BY_ORDINAL(Ordinal) IMAGE_SNAP_BY_ORDINAL64(Ordinal) +typedef IMAGE_TLS_DIRECTORY64 IMAGE_TLS_DIRECTORY; +typedef PIMAGE_TLS_DIRECTORY64 PIMAGE_TLS_DIRECTORY; +#else +#define IMAGE_ORDINAL_FLAG IMAGE_ORDINAL_FLAG32 +#define IMAGE_ORDINAL(Ordinal) IMAGE_ORDINAL32(Ordinal) +typedef IMAGE_THUNK_DATA32 IMAGE_THUNK_DATA; +typedef PIMAGE_THUNK_DATA32 PIMAGE_THUNK_DATA; +#define IMAGE_SNAP_BY_ORDINAL(Ordinal) IMAGE_SNAP_BY_ORDINAL32(Ordinal) +typedef IMAGE_TLS_DIRECTORY32 IMAGE_TLS_DIRECTORY; +typedef PIMAGE_TLS_DIRECTORY32 PIMAGE_TLS_DIRECTORY; +#endif + typedef struct _IMAGE_IMPORT_DESCRIPTOR { _ANONYMOUS_UNION union { DWORD Characteristics; @@ -3527,14 +3648,6 @@ WORD Reserved; } IMAGE_BOUND_FORWARDER_REF,*PIMAGE_BOUND_FORWARDER_REF; typedef void(NTAPI *PIMAGE_TLS_CALLBACK)(PVOID,DWORD,PVOID); -typedef struct _IMAGE_TLS_DIRECTORY { - DWORD StartAddressOfRawData; - DWORD EndAddressOfRawData; - PDWORD AddressOfIndex; - PIMAGE_TLS_CALLBACK *AddressOfCallBacks; - DWORD SizeOfZeroFill; - DWORD Characteristics; -} IMAGE_TLS_DIRECTORY,*PIMAGE_TLS_DIRECTORY; typedef struct _IMAGE_RESOURCE_DIRECTORY { DWORD Characteristics; DWORD TimeDateStamp;

1 0

[hpoussin] 34830: Preprocess kernel .spec files
by hpoussin＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: hpoussin Date: Sun Jul 27 03:26:42 2008 New Revision: 34830 URL: http://svn.reactos.org/svn/reactos?rev=34830&view=rev Log: Preprocess kernel .spec files Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Jul 27 03:26:42 2008 @@ -334,13 +334,6 @@ ReplaceExtension ( module.name, ".temp.a" ) ); } -bool -MingwModuleHandler::IsGeneratedFile ( const File& file ) const -{ - string extension = GetExtension ( file.file ); - return ( extension == ".spec" || extension == ".SPEC" ); -} - /*static*/ bool MingwModuleHandler::ReferenceObjects ( const Module& module ) @@ -1201,6 +1194,20 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule winebuildKMRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_WINEBLD)\n" + "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c:\n" + "\t${cp} $(NUL) $@ 1>$(NUL)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_CC)\n" + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source)\n" @@ -1384,6 +1391,8 @@ { HostDontCare, TypeDontCare, ".asm", &nasmRule }, { HostDontCare, TypeDontCare, ".rc", &windresRule }, { HostDontCare, TypeDontCare, ".mc", &wmcRule }, + { HostFalse, Kernel, ".spec", &winebuildKMRule }, + { HostFalse, KernelModeDLL, ".spec", &winebuildKMRule }, { HostDontCare, TypeDontCare, ".spec", &winebuildRule }, { HostDontCare, RpcServer, ".idl", &widlServerRule }, { HostDontCare, RpcClient, ".idl", &widlClientRule }, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Sun Jul 27 03:26:42 2008 @@ -87,7 +87,6 @@ std::string GetExtraDependencies ( const FileLocation *file ) const; std::string GetCompilationUnitDependencies ( const CompilationUnit& compilationUnit ) const; const FileLocation* GetModuleArchiveFilename () const; - bool IsGeneratedFile ( const File& file ) const; std::string GetImportLibraryDependency ( const Module& importedModule ); void GetTargets ( const Module& dependencyModule, string_list& targets );

1 0

[hpoussin] 34829: Prevent code duplication when translating GCC platform defines to MSVC ones.
by hpoussin＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: hpoussin Date: Sun Jul 27 03:18:07 2008 New Revision: 34829 URL: http://svn.reactos.org/svn/reactos?rev=34829&view=rev Log: Prevent code duplication when translating GCC platform defines to MSVC ones. Added: trunk/reactos/include/reactos/msvctarget.h (with props) Modified: trunk/reactos/include/ddk/hidclass.h trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidclass.h?rev… ============================================================================== --- trunk/reactos/include/ddk/hidclass.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/hidclass.h [iso-8859-1] Sun Jul 27 03:18:07 2008 @@ -79,6 +79,22 @@ #define IOCTL_HID_SET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(101) #define IOCTL_HID_GET_MS_GENRE_DESCRIPTOR HID_OUT_CTL_CODE(121) +/* FIXME: these values are wrong! */ +#define IOCTL_HID_GET_STRING 0 +#define IOCTL_HID_GET_DEVICE_ATTRIBUTES 1 +#define IOCTL_HID_GET_DEVICE_DESCRIPTOR 2 +#define IOCTL_HID_READ_REPORT 3 +#define IOCTL_HID_WRITE_REPORT 4 +#define IOCTL_HID_GET_REPORT_DESCRIPTOR 5 + +typedef enum _HID_STRING_TYPE +{ + HID_STRING_INDEXED = 0, + HID_STRING_ID_IMANUFACTURER, + HID_STRING_ID_IPRODUCT, + HID_STRING_ID_ISERIALNUMBER, + HID_STRING_MAX +} HID_STRING_TYPE; enum DeviceObjectState { DeviceObjectStarted = 0, Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Sun Jul 27 03:18:07 2008 @@ -16,21 +16,16 @@ #pragma GCC system_header #endif -/* translate GCC target defines to MS equivalents. Keep this synchronized - with winnt.h. */ -#if defined(__i686__) && !defined(_M_IX86) -#define _M_IX86 600 -#elif defined(__i586__) && !defined(_M_IX86) -#define _M_IX86 500 -#elif defined(__i486__) && !defined(_M_IX86) -#define _M_IX86 400 -#elif defined(__i386__) && !defined(_M_IX86) -#define _M_IX86 300 +#ifdef __GNUC__ +#include <msvctarget.h> #endif + #if defined(_M_IX86) && !defined(_X86_) #define _X86_ #elif defined(_M_ALPHA) && !defined(_ALPHA_) #define _ALPHA_ +#elif defined(_M_ARM) && !defined(_ARM_) +#define _ARM_ #elif defined(_M_PPC) && !defined(_PPC_) #define _PPC_ #elif defined(_M_MRX000) && !defined(_MIPS_) Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jul 27 03:18:07 2008 @@ -4,24 +4,16 @@ #pragma GCC system_header #endif -/* translate GCC target defines to MS equivalents. Keep this synchronized - with windows.h. */ -#if defined(__i686__) && !defined(_M_IX86) -#define _M_IX86 600 -#elif defined(__i586__) && !defined(_M_IX86) -#define _M_IX86 500 -#elif defined(__i486__) && !defined(_M_IX86) -#define _M_IX86 400 -#elif defined(__i386__) && !defined(_M_IX86) -#define _M_IX86 300 -#endif +#ifdef __GNUC__ +#include <msvctarget.h> +#endif + #if defined(_M_IX86) && !defined(_X86_) #define _X86_ #elif defined(_M_ALPHA) && !defined(_ALPHA_) #define _ALPHA_ - -#elif defined(_M_ARM) && !defined(ARM) -#define ARM +#elif defined(_M_ARM) && !defined(_ARM_) +#define _ARM_ #elif defined(_M_PPC) && !defined(_PPC_) #define _PPC_ #elif defined(_M_MRX000) && !defined(_MIPS_) Added: trunk/reactos/include/reactos/msvctarget.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/msvctarget… ============================================================================== --- trunk/reactos/include/reactos/msvctarget.h (added) +++ trunk/reactos/include/reactos/msvctarget.h [iso-8859-1] Sun Jul 27 03:18:07 2008 @@ -1,0 +1,17 @@ +#ifndef __GNUC__ +#error Unsupported compiler +#endif + +/* translate GCC target defines to MS equivalents. */ +#if defined(__i686__) && !defined(_M_IX86) +#define _M_IX86 600 +#undef __i686__ +#elif defined(__i586__) && !defined(_M_IX86) +#define _M_IX86 500 +#undef __i586__ +#elif defined(__i486__) && !defined(_M_IX86) +#define _M_IX86 400 +#undef __i486__ +#elif defined(__i386__) && !defined(_M_IX86) +#define _M_IX86 300 +#endif Propchange: trunk/reactos/include/reactos/msvctarget.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008