[tkreuzer] 64046: [XDK/DDK] - Remove useless inline definition of InterlockedBitTestAnd(Re)Set, which was not used anyway. - Update template for ntdef.h
5 Sep
2014
5 Sep
'14
9:54 p.m.
Author: tkreuzer
Date: Fri Sep 5 21:54:49 2014
New Revision: 64046
URL: http://svn.reactos.org/svn/reactos?rev=64046&view=rev
Log:
[XDK/DDK]
- Remove useless inline definition of InterlockedBitTestAnd(Re)Set, which was not used
anyway.
- Update template for ntdef.h
Modified:
trunk/reactos/include/ddk/wdm.h
trunk/reactos/include/xdk/generate.bat
trunk/reactos/include/xdk/interlocked.h
trunk/reactos/include/xdk/ntdef.template.h
Modified: trunk/reactos/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6404…
==============================================================================
--- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Fri Sep 5 21:54:49 2014
@@ -235,51 +235,6 @@
/******************************************************************************
* INTERLOCKED Functions *
******************************************************************************/
-//
-// Intrinsics (note: taken from our winnt.h)
-// FIXME: 64-bit
-//
-#if defined(__GNUC__)
-
-static __inline__ BOOLEAN
-InterlockedBitTestAndSet(
- _Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base,
- _In_ LONG Bit)
-{
-#if defined(_M_IX86)
- LONG OldBit;
- __asm__ __volatile__("lock "
- "btsl %2,%1\n\t"
- "sbbl %0,%0\n\t"
- :"=r" (OldBit),"+m" (*Base)
- :"Ir" (Bit)
- : "memory");
- return OldBit;
-#else
- return (_InterlockedOr(Base, 1 << Bit) >> Bit) & 1;
-#endif
-}
-
-static __inline__ BOOLEAN
-InterlockedBitTestAndReset(
- _Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base,
- _In_ LONG Bit)
-{
-#if defined(_M_IX86)
- LONG OldBit;
- __asm__ __volatile__("lock "
- "btrl %2,%1\n\t"
- "sbbl %0,%0\n\t"
- :"=r" (OldBit),"+m" (*Base)
- :"Ir" (Bit)
- : "memory");
- return OldBit;
-#else
- return (_InterlockedAnd(Base, ~(1 << Bit)) >> Bit) & 1;
-#endif
-}
-
-#endif /* defined(__GNUC__) */
#define BitScanForward _BitScanForward
#define BitScanReverse _BitScanReverse
@@ -16136,6 +16091,7 @@
ULONGLONG LastRecoveredLsn;
} TRANSACTIONMANAGER_RECOVERY_INFORMATION, *PTRANSACTIONMANAGER_RECOVERY_INFORMATION;
+
typedef struct _TRANSACTION_PROPERTIES_INFORMATION {
ULONG IsolationLevel;
ULONG IsolationFlags;
@@ -16184,7 +16140,7 @@
typedef struct _KTMOBJECT_CURSOR {
GUID LastQuery;
- ULONG ObjectIdCount;
+ unsigned long ObjectIdCount;
GUID ObjectIds[1];
} KTMOBJECT_CURSOR, *PKTMOBJECT_CURSOR;
@@ -16192,14 +16148,14 @@
TransactionBasicInformation,
TransactionPropertiesInformation,
TransactionEnlistmentInformation,
- TransactionSuperiorEnlistmentInformation
+ TransactionSuperiorEnlistmentInformation,
} TRANSACTION_INFORMATION_CLASS;
typedef enum _TRANSACTIONMANAGER_INFORMATION_CLASS {
TransactionManagerBasicInformation,
TransactionManagerLogInformation,
TransactionManagerLogPathInformation,
- TransactionManagerRecoveryInformation = 4
+ TransactionManagerRecoveryInformation = 4,
} TRANSACTIONMANAGER_INFORMATION_CLASS;
typedef enum _RESOURCEMANAGER_INFORMATION_CLASS {
Modified: trunk/reactos/include/xdk/generate.bat
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/generate.bat?r…
==============================================================================
--- trunk/reactos/include/xdk/generate.bat [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/generate.bat [iso-8859-1] Fri Sep 5 21:54:49 2014
@@ -4,3 +4,5 @@
hpp.exe ntddk.template.h ntddk.h
hpp.exe ntifs.template.h ntifs.h
hpp.exe devioctl.template.h devioctl.h
+hpp.exe ntdef.template.h ..\psdk\ntdef.h
+hpp.exe winnt.template.h ..\psdk\winnt.h
Modified: trunk/reactos/include/xdk/interlocked.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/interlocked.h?…
==============================================================================
--- trunk/reactos/include/xdk/interlocked.h [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/interlocked.h [iso-8859-1] Fri Sep 5 21:54:49 2014
@@ -1,51 +1,6 @@
/******************************************************************************
* INTERLOCKED Functions *
******************************************************************************/
-//
-// Intrinsics (note: taken from our winnt.h)
-// FIXME: 64-bit
-//
-#if defined(__GNUC__)
-
-static __inline__ BOOLEAN
-InterlockedBitTestAndSet(
- _Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base,
- _In_ LONG Bit)
-{
-#if defined(_M_IX86)
- LONG OldBit;
- __asm__ __volatile__("lock "
- "btsl %2,%1\n\t"
- "sbbl %0,%0\n\t"
- :"=r" (OldBit),"+m" (*Base)
- :"Ir" (Bit)
- : "memory");
- return OldBit;
-#else
- return (_InterlockedOr(Base, 1 << Bit) >> Bit) & 1;
-#endif
-}
-
-static __inline__ BOOLEAN
-InterlockedBitTestAndReset(
- _Inout_updates_bytes_((Bit+7)/8) _Interlocked_operand_ LONG volatile *Base,
- _In_ LONG Bit)
-{
-#if defined(_M_IX86)
- LONG OldBit;
- __asm__ __volatile__("lock "
- "btrl %2,%1\n\t"
- "sbbl %0,%0\n\t"
- :"=r" (OldBit),"+m" (*Base)
- :"Ir" (Bit)
- : "memory");
- return OldBit;
-#else
- return (_InterlockedAnd(Base, ~(1 << Bit)) >> Bit) & 1;
-#endif
-}
-
-#endif /* defined(__GNUC__) */
#define BitScanForward _BitScanForward
#define BitScanReverse _BitScanReverse
Modified: trunk/reactos/include/xdk/ntdef.template.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntdef.template…
==============================================================================
--- trunk/reactos/include/xdk/ntdef.template.h [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/ntdef.template.h [iso-8859-1] Fri Sep 5 21:54:49 2014
@@ -24,7 +24,9 @@
/* Dependencies */
#include <ctype.h>
+$if(0)
//#include <winapifamily.h>
+$endif()
#include <basetsd.h>
#include <guiddef.h>
#include <excpt.h>
3764
days inactive
3764
days old
0 comments
1 participants
participants (1)
-
tkreuzer＠svn.reactos.org