Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 67181: [NTOBJSHEX] * Fix comparison length: StrCmpNW takes chars, not bytes. * While at it, make canonical comparisons use memcmp instead of string comparison, as we only care about equ...
by dquintana＠svn.reactos.org 12 Apr '15

12 Apr '15

Author: dquintana Date: Sun Apr 12 19:00:26 2015 New Revision: 67181 URL: http://svn.reactos.org/svn/reactos?rev=67181&view=rev Log: [NTOBJSHEX] * Fix comparison length: StrCmpNW takes chars, not bytes. * While at it, make canonical comparisons use memcmp instead of string comparison, as we only care about equality, not ordering. Better fix for CORE-9432 Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp trunk/reactos/dll/shellext/ntobjshex/precomp.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] Sun Apr 12 19:00:26 2015 @@ -213,21 +213,21 @@ return E_FAIL; } - NtPidlEntry * info = (NtPidlEntry *) pcidl; + const NtPidlEntry * info = (const NtPidlEntry *) pcidl; if ((info->cb < sizeof(NtPidlEntry)) || (info->magic != NT_OBJECT_PIDL_MAGIC)) { ERR("FindPidlInList: Requested pidl is not of the correct type.\n"); return E_INVALIDARG; } - TRACE("Searching for pidl { cb=%d } in a list of %d items\n", pcidl->mkid.cb, m_hDpaCount); + TRACE("Searching for pidl { name='%S' } in a list of %d items\n", info->entryName, m_hDpaCount); for (UINT i = 0; i < m_hDpaCount; i++) { - NtPidlEntry * pInfo = (NtPidlEntry *) DPA_GetPtr(m_hDpa, i); + const NtPidlEntry * pInfo = (const NtPidlEntry *) DPA_GetPtr(m_hDpa, i); ASSERT(pInfo); - hr = CompareIDs(0, pInfo, pcidl); + hr = CompareIDs(SHCIDS_CANONICALONLY, pInfo, info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -238,11 +238,13 @@ } else { - TRACE("Comparison returned %d\n", (int) (short) (hr & 0xFFFF)); + TRACE("Comparison returned %d for '%S'\n", (int) (short) (hr & 0xFFFF), pInfo->entryName); } } ERR("PIDL NOT FOUND: Requested filename: %S\n", info->entryName); + *pinfo = NULL; + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } @@ -284,11 +286,9 @@ HRESULT GetPidl(UINT index, NtPidlEntry ** pEntry) { - HRESULT hr; - if (!m_hDpa) { - hr = Enumerate(); + HRESULT hr = Enumerate(); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -310,11 +310,9 @@ HRESULT GetCount(UINT * count) { - HRESULT hr; - if (!m_hDpa) { - hr = Enumerate(); + HRESULT hr = Enumerate(); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -377,23 +375,33 @@ return MAKE_HRESULT(0, 0, (USHORT) 1); if (second->entryNameLength < first->entryNameLength) return MAKE_HRESULT(0, 0, (USHORT) -1); + + int minlength = min(first->entryNameLength, second->entryNameLength); + if (minlength > 0) + { + int ord = memcmp(first->entryName, second->entryName, minlength); + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + } + return S_OK; } - - int minlength = min(first->entryNameLength, second->entryNameLength); - int ord = StrCmpNW(first->entryName, second->entryName, minlength); - - if (ord != 0) - return MAKE_HRESULT(0, 0, (USHORT) ord); - - if (!canonical) + else { + int minlength = min(first->entryNameLength, second->entryNameLength); + if (minlength > 0) + { + int ord = StrCmpNW(first->entryName, second->entryName, minlength / sizeof(WCHAR)); + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + } + if (second->entryNameLength > first->entryNameLength) return MAKE_HRESULT(0, 0, (USHORT) 1); if (second->entryNameLength < first->entryNameLength) return MAKE_HRESULT(0, 0, (USHORT) -1); + + return S_OK; } - - return S_OK; } case NTOBJECT_COLUMN_TYPE: { @@ -623,7 +631,6 @@ LPITEMIDLIST *ppidl, ULONG *pdwAttributes) { - HRESULT hr; NtPidlEntry * info; if (!ppidl) @@ -637,7 +644,7 @@ TRACE("CNtObjectFolder::ParseDisplayName name=%S (ntPath=%S)\n", lpszDisplayName, m_NtPath); - hr = m_PidlManager->FindByName(lpszDisplayName, &info); + HRESULT hr = m_PidlManager->FindByName(lpszDisplayName, &info); if (FAILED(hr)) { return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); @@ -669,11 +676,10 @@ void **ppvOut) { const NtPidlEntry * info; - HRESULT hr; if (IsEqualIID(riid, IID_IShellFolder)) { - hr = m_PidlManager->FindPidlInList(pidl, &info); + HRESULT hr = m_PidlManager->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -830,15 +836,9 @@ { PCUITEMID_CHILD pidl = apidl[i]; -#ifndef DISABLE_STRICT_PIDL_CHECK HRESULT hr = m_PidlManager->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; -#else - info = (const NtPidlEntry *) pidl; - if (info->magic != NT_OBJECT_PIDL_MAGIC) - return E_INVALIDARG; -#endif // Update attributes. *rgfInOut = m_PidlManager->ConvertAttributes(info, rgfInOut); @@ -918,19 +918,12 @@ STRRET *lpName) { const NtPidlEntry * info; - HRESULT hr; TRACE("GetDisplayNameOf %p\n", pidl); -#ifndef DISABLE_STRICT_PIDL_CHECK - hr = m_PidlManager->FindPidlInList(pidl, &info); + HRESULT hr = m_PidlManager->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; -#else - info = (const NtPidlEntry *) pidl; - if (info->magic != NT_OBJECT_PIDL_MAGIC) - return E_INVALIDARG; -#endif if ((GET_SHGDN_RELATION(uFlags) == SHGDN_NORMAL) && (GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING)) @@ -1102,15 +1095,9 @@ if (pidl) { -#ifndef DISABLE_STRICT_PIDL_CHECK HRESULT hr = m_PidlManager->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; -#else - info = (const NtPidlEntry *) pidl; - if (info->magic != NT_OBJECT_PIDL_MAGIC) - return E_INVALIDARG; -#endif static const GUID storage = PSGUID_STORAGE; if (IsEqualGUID(pscid->fmtid, storage)) @@ -1185,15 +1172,9 @@ if (pidl) { -#ifndef DISABLE_STRICT_PIDL_CHECK HRESULT hr = m_PidlManager->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; -#else - info = (const NtPidlEntry *) pidl; - if (info->magic != NT_OBJECT_PIDL_MAGIC) - return E_INVALIDARG; -#endif switch (iColumn) { Modified: trunk/reactos/dll/shellext/ntobjshex/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/pre… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/precomp.h [iso-8859-1] Sun Apr 12 19:00:26 2015 @@ -48,6 +48,3 @@ #include "ntobjns.h" #include "regfolder.h" - -// Workaround for missing entries -#define DISABLE_STRICT_PIDL_CHECKS Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Sun Apr 12 19:00:26 2015 @@ -208,21 +208,21 @@ return E_FAIL; } - RegPidlEntry * info = (RegPidlEntry *) pcidl; + const RegPidlEntry * info = (const RegPidlEntry *) pcidl; if ((info->cb < sizeof(RegPidlEntry)) || (info->magic != REGISTRY_PIDL_MAGIC)) { ERR("FindPidlInList: Requested pidl is not of the correct type.\n"); return E_INVALIDARG; } - TRACE("Searching for pidl { cb=%d } in a list of %d items\n", pcidl->mkid.cb, m_hDpaCount); + TRACE("Searching for pidl { name='%S' } in a list of %d items\n", info->entryName, m_hDpaCount); for (UINT i = 0; i < m_hDpaCount; i++) { - RegPidlEntry * pInfo = (RegPidlEntry *) DPA_GetPtr(m_hDpa, i); + const RegPidlEntry * pInfo = (const RegPidlEntry *) DPA_GetPtr(m_hDpa, i); ASSERT(pInfo); - hr = CompareIDs(0, pInfo, pcidl); + hr = CompareIDs(SHCIDS_CANONICALONLY, pInfo, info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -233,11 +233,13 @@ } else { - TRACE("Comparison returned %d\n", (int) (short) (hr & 0xFFFF)); + TRACE("Comparison returned %d for '%S'\n", (int) (short) (hr & 0xFFFF), pInfo->entryName); } } ERR("PIDL NOT FOUND: Requested filename: %S\n", info->entryName); + *pinfo = NULL; + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } @@ -280,11 +282,9 @@ HRESULT GetPidl(UINT index, RegPidlEntry ** pEntry) { - HRESULT hr; - if (!m_hDpa) { - hr = Enumerate(); + HRESULT hr = Enumerate(); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -306,11 +306,9 @@ HRESULT GetCount(UINT * count) { - HRESULT hr; - if (!m_hDpa) { - hr = Enumerate(); + HRESULT hr = Enumerate(); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -374,23 +372,33 @@ return MAKE_HRESULT(0, 0, (USHORT) 1); if (second->entryNameLength < first->entryNameLength) return MAKE_HRESULT(0, 0, (USHORT) -1); + + int minlength = min(first->entryNameLength, second->entryNameLength); + if (minlength > 0) + { + int ord = memcmp(first->entryName, second->entryName, minlength); + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + } + return S_OK; } - - int minlength = min(first->entryNameLength, second->entryNameLength); - int ord = StrCmpNW(first->entryName, second->entryName, minlength); - - if (ord != 0) - return MAKE_HRESULT(0, 0, (USHORT) ord); - - if (!canonical) + else { + int minlength = min(first->entryNameLength, second->entryNameLength); + if (minlength > 0) + { + int ord = StrCmpNW(first->entryName, second->entryName, minlength / sizeof(WCHAR)); + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + } + if (second->entryNameLength > first->entryNameLength) return MAKE_HRESULT(0, 0, (USHORT) 1); if (second->entryNameLength < first->entryNameLength) return MAKE_HRESULT(0, 0, (USHORT) -1); + + return S_OK; } - - return S_OK; } case REGISTRY_COLUMN_TYPE: { @@ -707,7 +715,6 @@ LPITEMIDLIST *ppidl, ULONG *pdwAttributes) { - HRESULT hr; RegPidlEntry * info; if (!ppidl) @@ -721,7 +728,7 @@ TRACE("CRegistryFolder::ParseDisplayName name=%S (ntPath=%S)\n", lpszDisplayName, m_NtPath); - hr = m_PidlManager->FindByName(lpszDisplayName, &info); + HRESULT hr = m_PidlManager->FindByName(lpszDisplayName, &info); if (FAILED(hr)) { return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); @@ -753,11 +760,10 @@ void **ppvOut) { const RegPidlEntry * info; - HRESULT hr; if (IsEqualIID(riid, IID_IShellFolder)) { - hr = m_PidlManager->FindPidlInList(pidl, &info); + HRESULT hr = m_PidlManager->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -880,15 +886,9 @@ { PCUITEMID_CHILD pidl = apidl[i]; -#ifndef DISABLE_STRICT_PIDL_CHECK HRESULT hr = m_PidlManager->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; -#else - info = (const RegPidlEntry *) pidl; - if (info->magic != REGISTRY_PIDL_MAGIC) - return E_INVALIDARG; -#endif // Update attributes. *rgfInOut = m_PidlManager->ConvertAttributes(info, rgfInOut); @@ -968,19 +968,12 @@ STRRET *lpName) { const RegPidlEntry * info; - HRESULT hr; TRACE("GetDisplayNameOf %p\n", pidl); -#ifndef DISABLE_STRICT_PIDL_CHECK - hr = m_PidlManager->FindPidlInList(pidl, &info); + HRESULT hr = m_PidlManager->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; -#else - info = (const RegPidlEntry *) pidl; - if (info->magic != REGISTRY_PIDL_MAGIC) - return E_INVALIDARG; -#endif if ((GET_SHGDN_RELATION(uFlags) == SHGDN_NORMAL) && (GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING)) @@ -1146,21 +1139,14 @@ VARIANT *pv) { const RegPidlEntry * info; - HRESULT hr; TRACE("GetDetailsEx\n"); if (pidl) { -#ifndef DISABLE_STRICT_PIDL_CHECK - hr = m_PidlManager->FindPidlInList(pidl, &info); + HRESULT hr = m_PidlManager->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; -#else - info = (const RegPidlEntry *) pidl; - if (info->magic != REGISTRY_PIDL_MAGIC) - return E_INVALIDARG; -#endif static const GUID storage = PSGUID_STORAGE; if (IsEqualGUID(pscid->fmtid, storage)) @@ -1226,21 +1212,14 @@ SHELLDETAILS *psd) { const RegPidlEntry * info; - HRESULT hr; TRACE("GetDetailsOf\n"); if (pidl) { -#ifndef DISABLE_STRICT_PIDL_CHECK - hr = m_PidlManager->FindPidlInList(pidl, &info); + HRESULT hr = m_PidlManager->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; -#else - info = (const RegPidlEntry *) pidl; - if (info->magic != REGISTRY_PIDL_MAGIC) - return E_INVALIDARG; -#endif switch (iColumn) {

1 0

[pschweitzer] 67180: [MYCOMPUT] Add French translation
by pschweitzer＠svn.reactos.org 12 Apr '15

12 Apr '15

Author: pschweitzer Date: Sun Apr 12 18:22:26 2015 New Revision: 67180 URL: http://svn.reactos.org/svn/reactos?rev=67180&view=rev Log: [MYCOMPUT] Add French translation Added: trunk/reactos/dll/win32/mycomput/lang/fr-FR.rc (with props) Modified: trunk/reactos/dll/win32/mycomput/mycomput.rc Added: trunk/reactos/dll/win32/mycomput/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/mycomput/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/mycomput/lang/fr-FR.rc [iso-8859-1] Sun Apr 12 18:22:26 2015 @@ -0,0 +1,6 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_MANAGE "Administrer" +END Propchange: trunk/reactos/dll/win32/mycomput/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mycomput/mycomput.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/mycompu… ============================================================================== --- trunk/reactos/dll/win32/mycomput/mycomput.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mycomput/mycomput.rc [iso-8859-1] Sun Apr 12 18:22:26 2015 @@ -15,6 +15,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif

1 0

[tkreuzer] 67179: [CRT] Implement __rt_sdiv as a wrapper around the unsigned divide (now factored out into an inline worker function)
by tkreuzer＠svn.reactos.org 12 Apr '15

12 Apr '15

Author: tkreuzer Date: Sun Apr 12 18:07:19 2015 New Revision: 67179 URL: http://svn.reactos.org/svn/reactos?rev=67179&view=rev Log: [CRT] Implement __rt_sdiv as a wrapper around the unsigned divide (now factored out into an inline worker function) Added: trunk/reactos/lib/sdk/crt/math/arm/__rt_div.c - copied, changed from r67178, trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c Removed: trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.s trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c Modified: trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sun Apr 12 18:07:19 2015 @@ -476,7 +476,7 @@ endif() elseif(ARCH STREQUAL "arm") list(APPEND LIBCNTPR_SOURCE - math/arm/__rt_udiv.c + math/arm/__rt_div.c ) list(APPEND CRT_ASM_SOURCE math/arm/floor.s @@ -484,7 +484,6 @@ math/arm/pow.s math/arm/__dtou64.s math/arm/__u64tod.s - math/arm/__rt_sdiv.s math/arm/__rt_sdiv64.s math/arm/__rt_udiv64.s ) Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Sun Apr 12 18:07:19 2015 @@ -135,7 +135,7 @@ math/sin.c) elseif(ARCH STREQUAL "arm") list(APPEND LIBCNTPR_SOURCE - math/arm/__rt_udiv.c + math/arm/__rt_div.c ) list(APPEND LIBCNTPR_ASM_SOURCE math/arm/floor.s @@ -143,7 +143,6 @@ math/arm/pow.s math/arm/__dtou64.s math/arm/__u64tod.s - math/arm/__rt_sdiv.s math/arm/__rt_sdiv64.s math/arm/__rt_udiv64.s ) Copied: trunk/reactos/lib/sdk/crt/math/arm/__rt_div.c (from r67178, trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_div.c [iso-8859-1] Sun Apr 12 18:07:19 2015 @@ -21,15 +21,16 @@ __emit(0xDEF9); } -ARM_UDIVRESULT -__rt_udiv( +__forceinline +void +__rt_udiv_internal( + ARM_UDIVRESULT *result, unsigned int divisor, unsigned int dividend) { - ARM_UDIVRESULT result; - unsigned int BitShift; - unsigned int BitMask; - unsigned int Quotient; + unsigned int shift; + unsigned int mask; + unsigned int quotient; if (divisor == 0) { @@ -39,35 +40,87 @@ if (divisor > dividend) { - result.quotient = 0; - result.modulus = divisor; - return result; + result->quotient = 0; + result->modulus = divisor; + return; } /* Get the difference in count of leading zeros between dividend and divisor */ - BitShift = _CountLeadingZeros(divisor); - BitShift -= _CountLeadingZeros(dividend); + shift = _CountLeadingZeros(divisor); + shift -= _CountLeadingZeros(dividend); /* Shift the divisor to the left, so that it's highest bit is the same as the highest bit of the dividend */ - divisor <<= BitShift; + divisor <<= shift; - BitMask = 1 << BitShift; + mask = 1 << shift; + quotient = 0; do { if (dividend >= divisor) { - Quotient |= BitMask; + quotient |= mask; dividend -= divisor; } divisor >>= 1; - BitMask >>= 1; + mask >>= 1; } - while (BitMask); + while (mask); - result.quotient = Quotient; - result.modulus = dividend; + result->quotient = quotient; + result->modulus = dividend; + return; +} + +ARM_UDIVRESULT +__rt_udiv( + unsigned int divisor, + unsigned int dividend) +{ + ARM_UDIVRESULT result; + + __rt_udiv_internal(&result, divisor, dividend); return result; } +typedef struct _ARM_SDIVRESULT +{ + int quotient; /* to be returned in R0 */ + int modulus; /* to be returned in R1 */ +} ARM_SDIVRESULT; + +ARM_SDIVRESULT +__rt_sdiv( + int divisor, + int dividend) +{ + ARM_SDIVRESULT result; + int divisor_sign, dividend_sign; + + dividend_sign = divisor & 0x80000000; + if (dividend_sign) + { + dividend = -dividend; + } + + divisor_sign = divisor & 0x80000000; + if (divisor_sign) + { + divisor = -divisor; + } + + __rt_udiv_internal((ARM_UDIVRESULT*)&result, divisor, dividend); + + if (dividend_sign ^ divisor_sign) + { + result.quotient = -result.quotient; + } + + if (dividend_sign) + { + result.modulus = -result.modulus; + } + + return result; +} Removed: trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.s (removed) @@ -1,20 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of __rt_sdiv - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <kxarm.h> - -/* CODE **********************************************************************/ - TEXTAREA - - LEAF_ENTRY __rt_sdiv - - LEAF_END __rt_sdiv - - END -/* EOF */ Removed: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c (removed) @@ -1,73 +0,0 @@ -/* - * COPYRIGHT: BSD, see COPYING.ARM in the top level directory - * PROJECT: ReactOS crt library - * FILE: lib/sdk/crt/math/arm/__rt_udiv.c - * PURPOSE: Implementation of __rt_udiv - * PROGRAMMER: Timo Kreuzer - * REFERENCE: http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… - * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… - */ - -typedef struct _ARM_UDIVRESULT -{ - unsigned int quotient; /* to be returned in R0 */ - unsigned int modulus; /* to be returned in R1 */ -} ARM_UDIVRESULT; - -__forceinline -void -__brkdiv0(void) -{ - __emit(0xDEF9); -} - -ARM_UDIVRESULT -__rt_udiv( - unsigned int divisor, - unsigned int dividend) -{ - ARM_UDIVRESULT result; - unsigned int BitShift; - unsigned int BitMask; - unsigned int Quotient; - - if (divisor == 0) - { - /* Raise divide by zero error */ - __brkdiv0(); - } - - if (divisor > dividend) - { - result.quotient = 0; - result.modulus = divisor; - return result; - } - - /* Get the difference in count of leading zeros between dividend and divisor */ - BitShift = _CountLeadingZeros(divisor); - BitShift -= _CountLeadingZeros(dividend); - - /* Shift the divisor to the left, so that it's highest bit is the same - as the highest bit of the dividend */ - divisor <<= BitShift; - - BitMask = 1 << BitShift; - - do - { - if (dividend >= divisor) - { - Quotient |= BitMask; - dividend -= divisor; - } - divisor >>= 1; - BitMask >>= 1; - } - while (BitMask); - - result.quotient = Quotient; - result.modulus = dividend; - return result; -} -

1 0

[tkreuzer] 67178: [CRT] Implement __rt_udiv in C.
by tkreuzer＠svn.reactos.org 12 Apr '15

12 Apr '15

Author: tkreuzer Date: Sun Apr 12 17:08:11 2015 New Revision: 67178 URL: http://svn.reactos.org/svn/reactos?rev=67178&view=rev Log: [CRT] Implement __rt_udiv in C. Added: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c (with props) Removed: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.s Modified: trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sun Apr 12 17:08:11 2015 @@ -475,6 +475,9 @@ except/amd64/cpp.s) endif() elseif(ARCH STREQUAL "arm") + list(APPEND LIBCNTPR_SOURCE + math/arm/__rt_udiv.c + ) list(APPEND CRT_ASM_SOURCE math/arm/floor.s math/arm/log10.s @@ -483,7 +486,6 @@ math/arm/__u64tod.s math/arm/__rt_sdiv.s math/arm/__rt_sdiv64.s - math/arm/__rt_udiv.s math/arm/__rt_udiv64.s ) endif() Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Sun Apr 12 17:08:11 2015 @@ -134,6 +134,9 @@ math/cos.c math/sin.c) elseif(ARCH STREQUAL "arm") + list(APPEND LIBCNTPR_SOURCE + math/arm/__rt_udiv.c + ) list(APPEND LIBCNTPR_ASM_SOURCE math/arm/floor.s math/arm/log10.s @@ -142,7 +145,6 @@ math/arm/__u64tod.s math/arm/__rt_sdiv.s math/arm/__rt_sdiv64.s - math/arm/__rt_udiv.s math/arm/__rt_udiv64.s ) endif() Added: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c (added) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c [iso-8859-1] Sun Apr 12 17:08:11 2015 @@ -0,0 +1,73 @@ +/* + * COPYRIGHT: BSD, see COPYING.ARM in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/math/arm/__rt_udiv.c + * PURPOSE: Implementation of __rt_udiv + * PROGRAMMER: Timo Kreuzer + * REFERENCE: http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + */ + +typedef struct _ARM_UDIVRESULT +{ + unsigned int quotient; /* to be returned in R0 */ + unsigned int modulus; /* to be returned in R1 */ +} ARM_UDIVRESULT; + +__forceinline +void +__brkdiv0(void) +{ + __emit(0xDEF9); +} + +ARM_UDIVRESULT +__rt_udiv( + unsigned int divisor, + unsigned int dividend) +{ + ARM_UDIVRESULT result; + unsigned int BitShift; + unsigned int BitMask; + unsigned int Quotient; + + if (divisor == 0) + { + /* Raise divide by zero error */ + __brkdiv0(); + } + + if (divisor > dividend) + { + result.quotient = 0; + result.modulus = divisor; + return result; + } + + /* Get the difference in count of leading zeros between dividend and divisor */ + BitShift = _CountLeadingZeros(divisor); + BitShift -= _CountLeadingZeros(dividend); + + /* Shift the divisor to the left, so that it's highest bit is the same + as the highest bit of the dividend */ + divisor <<= BitShift; + + BitMask = 1 << BitShift; + + do + { + if (dividend >= divisor) + { + Quotient |= BitMask; + dividend -= divisor; + } + divisor >>= 1; + BitMask >>= 1; + } + while (BitMask); + + result.quotient = Quotient; + result.modulus = dividend; + return result; +} + Propchange: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.s (removed) @@ -1,20 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of __rt_udiv - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <kxarm.h> - -/* CODE **********************************************************************/ - TEXTAREA - - LEAF_ENTRY __rt_udiv - - LEAF_END __rt_udiv - - END -/* EOF */

1 0

[cwittich] 67177: [SNDREC32] do not delete objects which are still selected into a DC
by cwittich＠svn.reactos.org 12 Apr '15

12 Apr '15

Author: cwittich Date: Sun Apr 12 16:29:36 2015 New Revision: 67177 URL: http://svn.reactos.org/svn/reactos?rev=67177&view=rev Log: [SNDREC32] do not delete objects which are still selected into a DC Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Sun Apr 12 16:29:36 2015 @@ -352,6 +352,7 @@ PAINTSTRUCT ps; HDC hdc; HPEN pen; + HPEN oldpen; unsigned int max_h = (cli.bottom / 2); unsigned int samples; @@ -366,7 +367,7 @@ /* Initialize hdc objects */ hdc = BeginPaint(hWnd, &ps); pen = (HPEN)CreatePen(PS_SOLID, 1, WAVEBAR_COLOR); - SelectObject(hdc, (HBRUSH)pen); + oldpen = (HPEN) SelectObject(hdc, (HBRUSH)pen); if (AUD_OUT->current_status() == snd::WAVEOUT_PLAYING) { samples = AUD_OUT->tot_samples_buf(); @@ -412,6 +413,7 @@ LineTo(hdc, WAVEBAR_CX, cli.bottom / 2); } + SelectObject(hdc, oldpen); DeleteObject( pen ); EndPaint( hWnd, &ps ); break; @@ -437,6 +439,7 @@ PAINTSTRUCT ps; HDC hdc; HFONT font; + HFONT oldfont; long long slid_samp = 0; /* Checking for global pointers to buffer and io audio devices */ @@ -774,7 +777,7 @@ case WM_PAINT: hdc = BeginPaint(hWnd, &ps); font = CreateFontIndirect(&s_info.lfMenuFont); - SelectObject(hdc, font); + oldfont = (HFONT) SelectObject(hdc, font); SetBkMode(hdc, TRANSPARENT); if (AUD_IN->current_status() == snd::WAVEIN_RECORDING) @@ -877,6 +880,7 @@ _tcslen(str_tmp), 0); + SelectObject(hdc, oldfont); DeleteObject(font); EndPaint(hWnd, &ps); break;

1 0

[cwittich] 67176: [TASKMGR] fix some more memory leaks CORE-9473
by cwittich＠svn.reactos.org 12 Apr '15

12 Apr '15

Author: cwittich Date: Sun Apr 12 16:09:26 2015 New Revision: 67176 URL: http://svn.reactos.org/svn/reactos?rev=67176&view=rev Log: [TASKMGR] fix some more memory leaks CORE-9473 Modified: trunk/reactos/base/applications/taskmgr/applpage.c trunk/reactos/base/applications/taskmgr/perfdata.c Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Sun Apr 12 16:09:26 2015 @@ -89,6 +89,23 @@ return ColorDepth; } +void AppPageCleanup(void) +{ + int i; + LV_ITEM item; + LPAPPLICATION_PAGE_LIST_ITEM pData; + for (i = 0; i < ListView_GetItemCount(hApplicationPageListCtrl); i++) + { + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_PARAM; + item.iItem = i; + (void)ListView_GetItem(hApplicationPageListCtrl, &item); + pData = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; + HeapFree(GetProcessHeap(), 0, pData); + } +} + + INT_PTR CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { @@ -151,6 +168,7 @@ #ifdef RUN_APPS_PAGE EndLocalThread(&hApplicationThread, dwApplicationThread); #endif + AppPageCleanup(); break; case WM_COMMAND: Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sun Apr 12 16:09:26 2015 @@ -330,12 +330,12 @@ } /* Now alloc a new PERFDATA array and fill in the data */ + pPerfData = (PPERFDATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PERFDATA) * ProcessCount); if (pPerfDataOld) { HeapFree(GetProcessHeap(), 0, pPerfDataOld); } pPerfDataOld = pPerfData; - /* Clear out process perf data structures with HEAP_ZERO_MEMORY flag: */ - pPerfData = (PPERFDATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PERFDATA) * ProcessCount); + pSPI = (PSYSTEM_PROCESS_INFORMATION)pBuffer; for (Idx=0; Idx<ProcessCount; Idx++) { /* Get the old perf data for this process (if any) */

1 0

[cwittich] 67175: [TASKMGR] fix some memory leaks
by cwittich＠svn.reactos.org 12 Apr '15

12 Apr '15

Author: cwittich Date: Sun Apr 12 15:45:40 2015 New Revision: 67175 URL: http://svn.reactos.org/svn/reactos?rev=67175&view=rev Log: [TASKMGR] fix some memory leaks Modified: trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sun Apr 12 15:45:40 2015 @@ -105,6 +105,10 @@ pEntry = CONTAINING_RECORD(pCur, SIDTOUSERNAME, List); pCur = pCur->Flink; HeapFree(GetProcessHeap(), 0, pEntry); + } + + if (SystemProcessorTimeInfo) { + HeapFree(GetProcessHeap(), 0, SystemProcessorTimeInfo); } } Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sun Apr 12 15:45:40 2015 @@ -59,6 +59,22 @@ DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); int ProcessRunning(ULONG ProcessId); +void Cleanup(void) +{ + int i; + LV_ITEM item; + LPPROCESS_PAGE_LIST_ITEM pData; + for (i = 0; i < ListView_GetItemCount(hProcessPageListCtrl); i++) + { + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_PARAM; + item.iItem = i; + (void)ListView_GetItem(hProcessPageListCtrl, &item); + pData = (LPPROCESS_PAGE_LIST_ITEM)item.lParam; + HeapFree(GetProcessHeap(), 0, pData); + } +} + int ProcGetIndexByProcessId(DWORD dwProcessId) { int i; @@ -170,6 +186,7 @@ EndLocalThread(&hProcessThread, dwProcessThread); #endif SaveColumnSettings(); + Cleanup(); break; case WM_COMMAND:

1 0

[tkreuzer] 67174: [KMTEST] Remove now obsolete definitions
by tkreuzer＠svn.reactos.org 12 Apr '15

12 Apr '15

Author: tkreuzer Date: Sun Apr 12 12:42:50 2015 New Revision: 67174 URL: http://svn.reactos.org/svn/reactos?rev=67174&view=rev Log: [KMTEST] Remove now obsolete definitions Modified: trunk/rostests/kmtests/ntos_ex/ExInterlocked.c Modified: trunk/rostests/kmtests/ntos_ex/ExInterlocked.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExInterlo… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] Sun Apr 12 12:42:50 2015 @@ -257,14 +257,6 @@ ok_eq_print(Value##Type.QuadPart, ExpectedValue, Print); \ } while (0) -/* TODO: missing in wdm.h! */ -#define InterlockedCompareExchangeAcquire InterlockedCompareExchange -#define InterlockedCompareExchangeRelease InterlockedCompareExchange -#define InterlockedIncrementAcquire InterlockedIncrement -#define InterlockedIncrementRelease InterlockedIncrement -#define InterlockedDecrementAcquire InterlockedDecrement -#define InterlockedDecrementRelease InterlockedDecrement - static VOID TestInterlockedFunctional(VOID)

1 0

[tkreuzer] 67173: [INCLUDE] Fix the Interlocked function mess. Implement all Interlocked functions in xdk/interlocked.h as they exist in native. Use this header to generate wdm.h and winnt.h. Remov...
by tkreuzer＠svn.reactos.org 12 Apr '15

12 Apr '15

Author: tkreuzer Date: Sun Apr 12 12:40:49 2015 New Revision: 67173 URL: http://svn.reactos.org/svn/reactos?rev=67173&view=rev Log: [INCLUDE] Fix the Interlocked function mess. Implement all Interlocked functions in xdk/interlocked.h as they exist in native. Use this header to generate wdm.h and winnt.h. Remove Interlocked definitions from winbase.h. Fix definition of ExInterlockedAddLargeInteger. Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/exfuncs.h trunk/reactos/include/xdk/interlocked.h trunk/reactos/include/xdk/winnt.template.h trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=67… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Sun Apr 12 12:40:49 2015 @@ -3342,6 +3342,8 @@ #elif defined(_M_MIPS) #elif defined(_M_ARM) + +#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() #else #error Unknown Architecture #endif Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6717… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Apr 12 12:40:49 2015 @@ -242,145 +242,533 @@ #define BitTestAndComplement _bittestandcomplement #define BitTestAndSet _bittestandset #define BitTestAndReset _bittestandreset -#define InterlockedBitTestAndSet _interlockedbittestandset -#define InterlockedBitTestAndReset _interlockedbittestandreset - -#ifdef _M_AMD64 +#ifdef _WIN64 #define BitScanForward64 _BitScanForward64 #define BitScanReverse64 _BitScanReverse64 #define BitTest64 _bittest64 #define BitTestAndComplement64 _bittestandcomplement64 #define BitTestAndSet64 _bittestandset64 #define BitTestAndReset64 _bittestandreset64 +#endif /* _WIN64 */ + +#if defined(_M_ARM) || defined(_M_IA64) +#define __ACQ_(x) x##_acq +#define __REL_(x) x##_rel +#define __NF_(x) x##_nf +#else +#define __ACQ_(x) x +#define __REL_(x) x +#define __NF_(x) x +#endif + +#define InterlockedBitTestAndSet _interlockedbittestandset +#define InterlockedBitTestAndSetAcquire __ACQ_(_interlockedbittestandset) +#define InterlockedBitTestAndSetRelease __REL_(_interlockedbittestandset) +#define InterlockedBitTestAndSetNoFence __NF_(_interlockedbittestandset) + +#define InterlockedBitTestAndReset _interlockedbittestandreset +#define InterlockedBitTestAndResetAcquire __ACQ_(_interlockedbittestandreset) +#define InterlockedBitTestAndResetRelease __REL_(_interlockedbittestandreset) +#define InterlockedBitTestAndResetNoFence __NF_(_interlockedbittestandreset) + +#ifdef _WIN64 #define InterlockedBitTestAndSet64 _interlockedbittestandset64 +#define InterlockedBitTestAndSet64Acquire __ACQ_(_interlockedbittestandset64) +#define InterlockedBitTestAndSet64Release __REL_(_interlockedbittestandset64) +#define InterlockedBitTestAndSet64NoFence __NF_(_interlockedbittestandset64) + #define InterlockedBitTestAndReset64 _interlockedbittestandreset64 -#endif - -#if !defined(__INTERLOCKED_DECLARED) -#define __INTERLOCKED_DECLARED - -#if defined (_X86_) -#if defined(NO_INTERLOCKED_INTRINSICS) -NTKERNELAPI -LONG -FASTCALL -InterlockedIncrement( - _Inout_ _Interlocked_operand_ LONG volatile *Addend); - -NTKERNELAPI -LONG -FASTCALL -InterlockedDecrement( - _Inout_ _Interlocked_operand_ LONG volatile *Addend); - -NTKERNELAPI -LONG -FASTCALL -InterlockedCompareExchange( - _Inout_ _Interlocked_operand_ LONG volatile *Destination, - _In_ LONG Exchange, - _In_ LONG Comparand); - -NTKERNELAPI -LONG -FASTCALL -InterlockedExchange( - _Inout_ _Interlocked_operand_ LONG volatile *Destination, - _In_ LONG Value); - -NTKERNELAPI -LONG -FASTCALL -InterlockedExchangeAdd( - _Inout_ _Interlocked_operand_ LONG volatile *Addend, - _In_ LONG Value); - -#else /* !defined(NO_INTERLOCKED_INTRINSICS) */ +#define InterlockedBitTestAndReset64Acquire __ACQ_(_interlockedbittestandreset64) +#define InterlockedBitTestAndReset64Release __REL_(_interlockedbittestandreset64) +#define InterlockedBitTestAndReset64NoFence __NF_(_interlockedbittestandreset64) +#endif /* _WIN64 */ + +#define InterlockedAdd _InterlockedAdd +#define InterlockedAddAcquire __ACQ_(_InterlockedAdd) +#define InterlockedAddRelease __REL_(_InterlockedAdd) +#define InterlockedAddNoFence __NF_(_InterlockedAdd) + +#define InterlockedAdd64 _InterlockedAdd64 +#define InterlockedAddAcquire64 __ACQ_(_InterlockedAdd64) +#define InterlockedAddRelease64 __REL_(_InterlockedAdd64) +#define InterlockedAddNoFence64 __NF_(_InterlockedAdd64) + +#define InterlockedAnd _InterlockedAnd +#define InterlockedAndAcquire __ACQ_(_InterlockedAnd) +#define InterlockedAndRelease __REL_(_InterlockedAnd) +#define InterlockedAndNoFence __NF_(_InterlockedAnd) + +#define InterlockedAnd8 _InterlockedAnd8 +#ifdef _M_ARM +#define InterlockedAndAcquire8 _InterlockedAnd8_acq +#define InterlockedAndRelease8 _InterlockedAnd8_rel +#define InterlockedAndNoFence8 _InterlockedAnd8_nf +#elif defined(_M_IA64) +#define InterlockedAnd8Acquire _InterlockedAnd8_acq +#define InterlockedAnd8Release _InterlockedAnd8_rel +#endif // _M_ARM + +#define InterlockedAnd16 _InterlockedAnd16 +#ifdef _M_ARM +#define InterlockedAndAcquire16 _InterlockedAnd16_acq +#define InterlockedAndRelease16 _InterlockedAnd16_rel +#define InterlockedAndNoFence16 _InterlockedAnd16_nf +#elif defined(_M_IA64) +#define InterlockedAnd16Acquire _InterlockedAnd16_acq +#define InterlockedAnd16Release _InterlockedAnd16_rel +#endif // _M_ARM + +#define InterlockedAnd64 _InterlockedAnd64 +#ifdef _M_ARM +#define InterlockedAndAcquire64 __ACQ_(_InterlockedAnd64) +#define InterlockedAndRelease64 __REL_(_InterlockedAnd64) +#define InterlockedAndNoFence64 __NF_(_InterlockedAnd64) +#else // _M_ARM +#define InterlockedAnd64Acquire __ACQ_(_InterlockedAnd64) +#define InterlockedAnd64Release __REL_(_InterlockedAnd64) +#define InterlockedAnd64NoFence __NF_(_InterlockedAnd64) +#endif // _M_ARM + +#ifdef _WIN64 +#define InterlockedAndAffinity InterlockedAnd64 +#else +#define InterlockedAndAffinity InterlockedAnd +#endif // _WIN64 + +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedCompareExchangeAcquire __ACQ_(_InterlockedCompareExchange) +#define InterlockedCompareExchangeRelease __REL_(_InterlockedCompareExchange) +#define InterlockedCompareExchangeNoFence __NF_(_InterlockedCompareExchange) + +#define InterlockedCompareExchange16 _InterlockedCompareExchange16 +#define InterlockedCompareExchangeAcquire16 __ACQ_(_InterlockedCompareExchange16) +#define InterlockedCompareExchangeRelease16 __REL_(_InterlockedCompareExchange16) +#define InterlockedCompareExchangeNoFence16 __NF_(_InterlockedCompareExchange16) + +#define InterlockedCompareExchange64 _InterlockedCompareExchange64 +#define InterlockedCompareExchangeAcquire64 __ACQ_(_InterlockedCompareExchange64) +#define InterlockedCompareExchangeRelease64 __REL_(_InterlockedCompareExchange64) +#define InterlockedCompareExchangeNoFence64 __NF_(_InterlockedCompareExchange64) + +#ifdef _WIN64 +#define InterlockedCompareExchange128 _InterlockedCompareExchange128 +#endif // _WIN64 + +#ifdef _M_IA64 +#define InterlockedCompare64Exchange128 _InterlockedCompare64Exchange128 +#define InterlockedCompare64ExchangeAcquire128 _InterlockedCompare64Exchange128_acq +#define InterlockedCompare64ExchangeRelease128 _InterlockedCompare64Exchange128_rel +#endif // _M_IA64 + +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#define InterlockedCompareExchangePointerAcquire __ACQ_(_InterlockedCompareExchangePointer) +#define InterlockedCompareExchangePointerRelease __REL_(_InterlockedCompareExchangePointer) +#define InterlockedCompareExchangePointerNoFence __NF_(_InterlockedCompareExchangePointer) + +#define InterlockedDecrement _InterlockedDecrement +#define InterlockedDecrementAcquire __ACQ_(_InterlockedDecrement) +#define InterlockedDecrementRelease __REL_(_InterlockedDecrement) +#define InterlockedDecrementNoFence __NF_(_InterlockedDecrement) + +#define InterlockedDecrement16 _InterlockedDecrement16 +#define InterlockedDecrementAcquire16 __ACQ_(_InterlockedDecrement16) +#define InterlockedDecrementRelease16 __REL_(_InterlockedDecrement16) +#define InterlockedDecrementNoFence16 __NF_(_InterlockedDecrement16) + +#define InterlockedDecrement64 _InterlockedDecrement64 +#define InterlockedDecrementAcquire64 __ACQ_(_InterlockedDecrement64) +#define InterlockedDecrementRelease64 __REL_(_InterlockedDecrement64) +#define InterlockedDecrementNoFence64 __NF_(_InterlockedDecrement64) + +#ifdef _WIN64 +#define InterlockedDecrementSizeT(a) InterlockedDecrement64((LONG64 *)a) +#define InterlockedDecrementSizeTNoFence(a) InterlockedDecrementNoFence64((LONG64 *)a) +#else +#define InterlockedDecrementSizeT(a) InterlockedDecrement((LONG *)a) +#define InterlockedDecrementSizeTNoFence(a) InterlockedDecrementNoFence((LONG *)a) +#endif // _WIN64 #define InterlockedExchange _InterlockedExchange +#define InterlockedExchangeAcquire __ACQ_(_InterlockedExchange) +/* No release here */ +#define InterlockedExchangeNoFence __NF_(_InterlockedExchange) + +#if (_MSC_VER >= 1600) +#define InterlockedExchange8 _InterlockedExchange8 +#endif // (_MSC_VER >= 1600) + +#define InterlockedExchange16 _InterlockedExchange16 +/* No release here */ +#define InterlockedExchangeAcquire16 __ACQ_(_InterlockedExchange16) +#define InterlockedExchangeNoFence16 __NF_(_InterlockedExchange16) + +#define InterlockedExchange64 _InterlockedExchange64 +#define InterlockedExchangeAcquire64 __ACQ_(_InterlockedExchange64) +/* No release here */ +#define InterlockedExchangeNoFence64 __NF_(_InterlockedExchange64) + +#define InterlockedExchangePointer _InterlockedExchangePointer +#define InterlockedExchangePointerAcquire __ACQ_(_InterlockedExchangePointer) +/* No release here */ +#define InterlockedExchangePointerNoFence __NF_(_InterlockedExchangePointer) + +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchangeAddAcquire __ACQ_(_InterlockedExchangeAdd) +#define InterlockedExchangeAddRelease __REL_(_InterlockedExchangeAdd) +#define InterlockedExchangeAddNoFence __NF_(_InterlockedExchangeAdd) + +#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 +#define InterlockedExchangeAddAcquire64 __ACQ_(_InterlockedExchangeAdd64) +#define InterlockedExchangeAddRelease64 __REL_(_InterlockedExchangeAdd64) +#define InterlockedExchangeAddNoFence64 __NF_(_InterlockedExchangeAdd64) + +#ifdef _WIN64 +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONG64 *)a, b) +#define InterlockedExchangeAddSizeTAcquire(a, b) InterlockedExchangeAddAcquire64((LONG64 *)a, b) +#define InterlockedExchangeAddSizeTNoFence(a, b) InterlockedExchangeAddNoFence64((LONG64 *)a, b) +#else +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)a, b) +#define InterlockedExchangeAddSizeTAcquire(a, b) InterlockedExchangeAddAcquire((LONG *)a, b) +#define InterlockedExchangeAddSizeTNoFence(a, b) InterlockedExchangeAddNoFence((LONG *)a, b) +#endif // _WIN64 + #define InterlockedIncrement _InterlockedIncrement -#define InterlockedDecrement _InterlockedDecrement -#define InterlockedExchangeAdd _InterlockedExchangeAdd -#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedIncrementAcquire __ACQ_(_InterlockedIncrement) +#define InterlockedIncrementRelease __REL_(_InterlockedIncrement) +#define InterlockedIncrementNoFence __NF_(_InterlockedIncrement) + +#define InterlockedIncrement16 _InterlockedIncrement16 +#define InterlockedIncrementAcquire16 __ACQ_(_InterlockedIncrement16) +#define InterlockedIncrementRelease16 __REL_(_InterlockedIncrement16) +#define InterlockedIncrementNoFence16 __NF_(_InterlockedIncrement16) + +#define InterlockedIncrement64 _InterlockedIncrement64 +#define InterlockedIncrementAcquire64 __ACQ_(_InterlockedIncrement64) +#define InterlockedIncrementRelease64 __REL_(_InterlockedIncrement64) +#define InterlockedIncrementNoFence64 __NF_(_InterlockedIncrement64) + +#ifdef _WIN64 +#define InterlockedIncrementSizeT(a) InterlockedIncrement64((LONG64 *)a) +#define InterlockedIncrementSizeTNoFence(a) InterlockedIncrementNoFence64((LONG64 *)a) +#else +#define InterlockedIncrementSizeT(a) InterlockedIncrement((LONG *)a) +#define InterlockedIncrementSizeTNoFence(a) InterlockedIncrementNoFence((LONG *)a) +#endif // _WIN64 + #define InterlockedOr _InterlockedOr -#define InterlockedAnd _InterlockedAnd +#define InterlockedOrAcquire __ACQ_(_InterlockedOr) +#define InterlockedOrRelease __REL_(_InterlockedOr) +#define InterlockedOrNoFence __NF_(_InterlockedOr) + +#define InterlockedOr8 _InterlockedOr8 +#ifdef _M_ARM +#define InterlockedOrAcquire8 _InterlockedOr8_acq +#define InterlockedOrRelease8 _InterlockedOr8_rel +#define InterlockedOrNoFence8 _InterlockedOr8_nf +#elif defined(_M_IA64) +#define InterlockedOr8Acquire _InterlockedOr8_acq +#define InterlockedOr8Release _InterlockedOr8_rel +#endif // _M_ARM + +#define InterlockedOr16 _InterlockedOr16 +#ifdef _M_ARM +#define InterlockedOrAcquire16 _InterlockedOr16_acq +#define InterlockedOrRelease16 _InterlockedOr16_rel +#define InterlockedOrNoFence16 _InterlockedOr16_nf +#elif defined(_M_IA64) +#define InterlockedOr16Acquire _InterlockedOr16_acq +#define InterlockedOr16Release _InterlockedOr16_rel +#endif // _M_ARM + +#define InterlockedOr64 _InterlockedOr64 +#ifdef _M_ARM +#define InterlockedOrAcquire64 _InterlockedOr64_acq +#define InterlockedOrRelease64 _InterlockedOr64_rel +#define InterlockedOrNoFence64 _InterlockedOr64_nf +#elif defined(_M_IA64) || defined(_M_AMD64) +#define InterlockedOr64Acquire __ACQ_(_InterlockedOr64) +#define InterlockedOr64Release __REL_(_InterlockedOr64) +#define InterlockedOr64NoFence __NF_(_InterlockedOr64) +#endif // _M_ARM + +#ifdef _WIN64 +#define InterlockedOrAffinity InterlockedOr64 +#else +#define InterlockedOrAffinity InterlockedOr +#endif // _WIN64 + #define InterlockedXor _InterlockedXor - -#endif /* !defined(NO_INTERLOCKED_INTRINSICS) */ - -#endif /* defined (_X86_) */ - -#if !defined (_WIN64) -/* - * PVOID - * InterlockedExchangePointer( - * IN OUT PVOID volatile *Target, - * IN PVOID Value) - */ -#define InterlockedExchangePointer(Target, Value) \ - ((PVOID) InterlockedExchange((PLONG) Target, (LONG) Value)) - -/* - * PVOID - * InterlockedCompareExchangePointer( - * IN OUT PVOID *Destination, - * IN PVOID Exchange, - * IN PVOID Comparand) - */ -#define InterlockedCompareExchangePointer(Destination, Exchange, Comparand) \ - ((PVOID) InterlockedCompareExchange((PLONG) Destination, (LONG) Exchange, (LONG) Comparand)) - -#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)a, b) -#define InterlockedIncrementSizeT(a) InterlockedIncrement((LONG *)a) -#define InterlockedDecrementSizeT(a) InterlockedDecrement((LONG *)a) - -#endif // !defined (_WIN64) - -#if defined (_M_AMD64) - -#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONGLONG *)a, (LONGLONG)b) -#define InterlockedIncrementSizeT(a) InterlockedIncrement64((LONGLONG *)a) -#define InterlockedDecrementSizeT(a) InterlockedDecrement64((LONGLONG *)a) -#define InterlockedAnd _InterlockedAnd -#define InterlockedOr _InterlockedOr -#define InterlockedXor _InterlockedXor -#define InterlockedIncrement _InterlockedIncrement -#define InterlockedDecrement _InterlockedDecrement -#define InterlockedAdd _InterlockedAdd -#define InterlockedExchange _InterlockedExchange -#define InterlockedExchangeAdd _InterlockedExchangeAdd -#define InterlockedCompareExchange _InterlockedCompareExchange -#define InterlockedAnd64 _InterlockedAnd64 -#define InterlockedOr64 _InterlockedOr64 +#define InterlockedXorAcquire __ACQ_(_InterlockedXor) +#define InterlockedXorRelease __REL_(_InterlockedXor) +#define InterlockedXorNoFence __NF_(_InterlockedXor) + +#define InterlockedXor8 _InterlockedXor8 +#ifdef _M_ARM +#define InterlockedXorAcquire8 _InterlockedXor8_acq +#define InterlockedXorRelease8 _InterlockedXor8_rel +#define InterlockedXorNoFence8 _InterlockedXor8_nf +#elif defined(_M_IA64) +#define InterlockedXor8Acquire _InterlockedXor8_acq +#define InterlockedXor8Release _InterlockedXor8_rel +#endif /* _M_ARM */ + +#define InterlockedXor16 _InterlockedXor16 +#ifdef _M_ARM +#define InterlockedXorAcquire16 _InterlockedXor16_acq +#define InterlockedXorRelease16 _InterlockedXor16_rel +#define InterlockedXorNoFence16 _InterlockedXor16_nf +#elif defined(_M_IA64) +#define InterlockedXor16Acquire _InterlockedXor16_acq +#define InterlockedXor16Release _InterlockedXor16_rel +#endif /* _M_ARM */ + #define InterlockedXor64 _InterlockedXor64 -#define InterlockedIncrement64 _InterlockedIncrement64 -#define InterlockedDecrement64 _InterlockedDecrement64 -#define InterlockedAdd64 _InterlockedAdd64 -#define InterlockedExchange64 _InterlockedExchange64 -#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 -#define InterlockedCompareExchange64 _InterlockedCompareExchange64 -#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer -#define InterlockedExchangePointer _InterlockedExchangePointer -#define InterlockedBitTestAndSet64 _interlockedbittestandset64 -#define InterlockedBitTestAndReset64 _interlockedbittestandreset64 - -#endif // _M_AMD64 - -#if defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS) -//#if !defined(_X86AMD64_) // FIXME: what's _X86AMD64_ used for? +#ifdef _M_ARM +#define InterlockedXorAcquire64 _InterlockedXor64_acq +#define InterlockedXorRelease64 _InterlockedXor64_rel +#define InterlockedXorNoFence64 _InterlockedXor64_nf +#elif defined(_M_IA64) || defined(_M_AMD64) +#define InterlockedXor64Acquire __ACQ_(_InterlockedXor64) +#define InterlockedXor64Release __REL_(_InterlockedXor64) +#define InterlockedXor64NoFence __NF_(_InterlockedXor64) +#endif /* _M_ARM */ + +#ifdef _M_IX86 + FORCEINLINE LONG64 -InterlockedAdd64( - _Inout_ _Interlocked_operand_ LONG64 volatile *Addend, +_InterlockedExchange64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, _In_ LONG64 Value) { - return InterlockedExchangeAdd64(Addend, Value) + Value; + LONG64 Old, Prev; + for (Old = *Target; ; Old = Prev) + { + Prev = _InterlockedCompareExchange64(Target, Value, Old); + if (Prev == Old) + return Prev; + } } -//#endif -#endif - -#endif /* !__INTERLOCKED_DECLARED */ - + +FORCEINLINE +LONG64 +_InterlockedAdd64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old + Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedExchangeAdd64 ( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value + ) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old + Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return Prev; + } +} + +FORCEINLINE +LONG64 +_InterlockedAnd64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old & Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedOr64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old | Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedXor64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old ^ Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedIncrement64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target) +{ + return _InterlockedAdd64(Target, 1); +} + +FORCEINLINE +LONG64 +_InterlockedDecrement64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target) +{ + return _InterlockedAdd64(Target, -1); +} + +#undef _InterlockedExchangePointer +#define _InterlockedExchangePointer _InlineInterlockedExchangePointer +FORCEINLINE +_Ret_writes_(_Inexpressible_(Unknown)) +PVOID +_InterlockedExchangePointer( + _Inout_ _At_(*Destination, _Pre_writable_byte_size_(_Inexpressible_(Unknown)) + _Post_writable_byte_size_(_Inexpressible_(Unknown))) + _Interlocked_operand_ volatile PVOID *Destination, + _In_opt_ PVOID Value) +{ + return (PVOID)InterlockedExchange((volatile long *)Destination, (long)Value); +} + +#undef _InterlockedCompareExchangePointer +#define _InterlockedCompareExchangePointer _InlineInterlockedCompareExchangePointer +FORCEINLINE +_Ret_writes_(_Inexpressible_(Unknown)) +PVOID +_InterlockedCompareExchangePointer( + _Inout_ _At_(*Destination, _Pre_writable_byte_size_(_Inexpressible_(Unknown)) + _Post_writable_byte_size_(_Inexpressible_(Unknown))) + _Interlocked_operand_ volatile PVOID *Destination, + _In_opt_ PVOID ExChange, + _In_opt_ PVOID Comperand) +{ + return (PVOID)InterlockedCompareExchange((volatile long *)Destination, + (long)ExChange, + (long)Comperand); +} + +#endif /* _M_IX86 */ + +#ifdef _M_AMD64 + +FORCEINLINE +LONG64 +_InterlockedAdd64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) + +{ + return _InterlockedExchangeAdd64(Target, Value) + Value; +} + +#endif /* _M_AMD64 */ + +#ifdef _M_IA64 + +#undef _InterlockedBitTestAndSet +#define _InterlockedBitTestAndSet InterlockedBitTestAndSet_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndSet( + _Inout_ _Interlocked_operand_ volatile LONG *Target, + _In_ LONG Bit) +{ + ULONG Mask = 1 << (Bit & 31); + return (BOOLEAN)((InterlockedOr(&Target[Bit / 32], Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndReset +#define _InterlockedBitTestAndReset InterlockedBitTestAndReset_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndReset( + _Inout_ _Interlocked_operand_ volatile LONG *Target, + _In_ LONG Bit) +{ + ULONG Mask = 1 << (Bit & 31); + return (BOOLEAN)((InterlockedAnd(&Target[Bit / 32], ~Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndSet64 +#define _InterlockedBitTestAndSet64 InterlockedBitTestAndSet64_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndSet64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Bit) +{ + ULONG64 Mask = 1LL << (Bit & 63); + return (BOOLEAN)((InterlockedOr64(&Target[Bit / 64], Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndReset64 +#define _InterlockedBitTestAndReset64 InterlockedBitTestAndReset64_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndReset64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Bit) +{ + ULONG64 Mask = 1LL << (Bit & 63); + return (BOOLEAN)((InterlockedAnd64(&Target[Bit / 64], ~Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndComplement +#define _InterlockedBitTestAndComplement InterlockedBitTestAndComplement_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndComplement( + _Inout_ _Interlocked_operand_ volatile LONG *Target, + _In_ LONG Bit) +{ + ULONG Mask = 1 << (Bit & 31); + return (BOOLEAN)((InterlockedXor(&Target[Bit / 32], Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndComplement64 +#define _InterlockedBitTestAndComplement64 InterlockedBitTestAndComplement64_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndComplement64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Bit) +{ + ULONG64 Mask = 1LL << (Bit & 63); + return (BOOLEAN)((InterlockedXor64(&Target[Bit / 64], Mask) & Mask) != 0); +} + +#endif /* M_IA64 */ /****************************************************************************** * Runtime Library Types * @@ -14884,12 +15272,12 @@ _In_ LARGE_INTEGER Increment, _Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); -#if defined(_WIN64) +#if !defined(_M_IX86) #define ExInterlockedAddLargeStatistic(Addend, Increment) \ (VOID)InterlockedAdd64(&(Addend)->QuadPart, Increment) #else #define ExInterlockedAddLargeStatistic(Addend, Increment) \ - _InterlockedAddLargeStatistic((PLONGLONG)&(Addend)->QuadPart, Increment) + (VOID)_InterlockedAddLargeStatistic((PLONGLONG)&(Addend)->QuadPart, Increment) #endif NTKERNELAPI Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sun Apr 12 12:40:49 2015 @@ -2403,143 +2403,6 @@ #if (_WIN32_WINNT >= 0x0600) VOID WINAPI InitializeSRWLock(PSRWLOCK); #endif -#ifndef __INTERLOCKED_DECLARED -#define __INTERLOCKED_DECLARED - -#if defined (_M_AMD64) || defined (_M_IA64) - -#define InterlockedAnd _InterlockedAnd -#define InterlockedOr _InterlockedOr -#define InterlockedXor _InterlockedXor -#define InterlockedIncrement _InterlockedIncrement -#define InterlockedIncrementAcquire InterlockedIncrement -#define InterlockedIncrementRelease InterlockedIncrement -#define InterlockedDecrement _InterlockedDecrement -#define InterlockedDecrementAcquire InterlockedDecrement -#define InterlockedDecrementRelease InterlockedDecrement -#define InterlockedExchange _InterlockedExchange -#define InterlockedExchangeAdd _InterlockedExchangeAdd -#define InterlockedCompareExchange _InterlockedCompareExchange -#define InterlockedCompareExchangeAcquire InterlockedCompareExchange -#define InterlockedCompareExchangeRelease InterlockedCompareExchange -#define InterlockedExchangePointer _InterlockedExchangePointer -#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer -#define InterlockedCompareExchangePointerAcquire _InterlockedCompareExchangePointer -#define InterlockedCompareExchangePointerRelease _InterlockedCompareExchangePointer -#define InterlockedAnd64 _InterlockedAnd64 -#define InterlockedOr64 _InterlockedOr64 -#define InterlockedXor64 _InterlockedXor64 -#define InterlockedIncrement64 _InterlockedIncrement64 -#define InterlockedDecrement64 _InterlockedDecrement64 -#define InterlockedExchange64 _InterlockedExchange64 -#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 -#define InterlockedCompareExchange64 _InterlockedCompareExchange64 -#define InterlockedCompareExchangeAcquire64 InterlockedCompareExchange64 -#define InterlockedCompareExchangeRelease64 InterlockedCompareExchange64 - -#else // !(defined (_M_AMD64) || defined (_M_IA64)) - -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); -WINBASEAPI LONG WINAPI InterlockedDecrement(IN OUT LONG volatile *); -WINBASEAPI LONG WINAPI InterlockedExchange(IN OUT LONG volatile *,LONG); -#if defined(_WIN64) - /* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */ - #define InterlockedExchangePointer(t,v) \ - (PVOID)_InterlockedExchange64((LONGLONG*)(t),(LONGLONG)(v)) - /* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */ - #define InterlockedCompareExchangePointer(d,e,c) \ - (PVOID)_InterlockedCompareExchange64((LONGLONG*)(d),(LONGLONG)(e),(LONGLONG)(c)) -#else - /* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */ - #define InterlockedExchangePointer(t,v) \ - (PVOID)InterlockedExchange((LPLONG)(t),(LONG)(v)) - /* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */ - #define InterlockedCompareExchangePointer(d,e,c) \ - (PVOID)InterlockedCompareExchange((LPLONG)(d),(LONG)(e),(LONG)(c)) -#endif -LONG WINAPI InterlockedExchangeAdd(IN OUT LONG volatile *,LONG); -#if (_WIN32_WINNT >= 0x0501) -PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); -#endif -WINBASEAPI LONG WINAPI InterlockedIncrement(IN OUT LONG volatile *); -#if (_WIN32_WINNT >= 0x0501) -PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); -PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY); -#endif -#define InterlockedCompareExchangePointerAcquire InterlockedCompareExchangePointer -#define InterlockedCompareExchangePointerRelease InterlockedCompareExchangePointer - -#endif // !(defined (_M_AMD64) || defined (_M_IA64)) - -#if defined(_SLIST_HEADER_) && !defined(_NTOSP_) - -WINBASEAPI -VOID -WINAPI -InitializeSListHead ( - IN OUT PSLIST_HEADER ListHead); -#endif - -USHORT WINAPI QueryDepthSList(PSLIST_HEADER); - -#ifdef _MSC_VER - -// -// Intrinsics are a mess -- *sigh* -// -long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); -#pragma intrinsic(_InterlockedCompareExchange) -#endif - -#if !defined(InterlockedAnd) -#define InterlockedAnd InterlockedAnd_Inline -FORCEINLINE -LONG -InterlockedAnd_Inline(IN OUT volatile LONG *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = _InterlockedCompareExchange((volatile long *)Target, - i & Set, - i); - - } while (i != j); - - return j; -} -#endif - -#if !defined(InterlockedOr) -#define InterlockedOr InterlockedOr_Inline -FORCEINLINE -LONG -InterlockedOr_Inline(IN OUT volatile LONG *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = _InterlockedCompareExchange((volatile long *)Target, - i | Set, - i); - - } while (i != j); - - return j; -} -#endif - -#endif /* __INTERLOCKED_DECLARED */ BOOL WINAPI IsBadCodePtr(_In_opt_ FARPROC); BOOL WINAPI IsBadHugeReadPtr(_In_opt_ CONST VOID*, _In_ UINT_PTR); Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Apr 12 12:40:49 2015 @@ -1355,6 +1355,557 @@ #define LOCALE_CUSTOM_UI_DEFAULT MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_UI_CUSTOM_DEFAULT), SORT_DEFAULT) #define LOCALE_NEUTRAL MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), SORT_DEFAULT) #define LOCALE_INVARIANT MAKELCID(MAKELANGID(LANG_INVARIANT, SUBLANG_NEUTRAL), SORT_DEFAULT) +/****************************************************************************** + * INTERLOCKED Functions * + ******************************************************************************/ + +#define BitScanForward _BitScanForward +#define BitScanReverse _BitScanReverse +#define BitTest _bittest +#define BitTestAndComplement _bittestandcomplement +#define BitTestAndSet _bittestandset +#define BitTestAndReset _bittestandreset +#ifdef _WIN64 +#define BitScanForward64 _BitScanForward64 +#define BitScanReverse64 _BitScanReverse64 +#define BitTest64 _bittest64 +#define BitTestAndComplement64 _bittestandcomplement64 +#define BitTestAndSet64 _bittestandset64 +#define BitTestAndReset64 _bittestandreset64 +#endif /* _WIN64 */ + +#if defined(_M_ARM) || defined(_M_IA64) +#define __ACQ_(x) x##_acq +#define __REL_(x) x##_rel +#define __NF_(x) x##_nf +#else +#define __ACQ_(x) x +#define __REL_(x) x +#define __NF_(x) x +#endif + +#define InterlockedBitTestAndSet _interlockedbittestandset +#define InterlockedBitTestAndSetAcquire __ACQ_(_interlockedbittestandset) +#define InterlockedBitTestAndSetRelease __REL_(_interlockedbittestandset) +#define InterlockedBitTestAndSetNoFence __NF_(_interlockedbittestandset) + +#define InterlockedBitTestAndReset _interlockedbittestandreset +#define InterlockedBitTestAndResetAcquire __ACQ_(_interlockedbittestandreset) +#define InterlockedBitTestAndResetRelease __REL_(_interlockedbittestandreset) +#define InterlockedBitTestAndResetNoFence __NF_(_interlockedbittestandreset) + +#ifdef _WIN64 +#define InterlockedBitTestAndSet64 _interlockedbittestandset64 +#define InterlockedBitTestAndSet64Acquire __ACQ_(_interlockedbittestandset64) +#define InterlockedBitTestAndSet64Release __REL_(_interlockedbittestandset64) +#define InterlockedBitTestAndSet64NoFence __NF_(_interlockedbittestandset64) + +#define InterlockedBitTestAndReset64 _interlockedbittestandreset64 +#define InterlockedBitTestAndReset64Acquire __ACQ_(_interlockedbittestandreset64) +#define InterlockedBitTestAndReset64Release __REL_(_interlockedbittestandreset64) +#define InterlockedBitTestAndReset64NoFence __NF_(_interlockedbittestandreset64) +#endif /* _WIN64 */ + +#define InterlockedAdd _InterlockedAdd +#define InterlockedAddAcquire __ACQ_(_InterlockedAdd) +#define InterlockedAddRelease __REL_(_InterlockedAdd) +#define InterlockedAddNoFence __NF_(_InterlockedAdd) + +#define InterlockedAdd64 _InterlockedAdd64 +#define InterlockedAddAcquire64 __ACQ_(_InterlockedAdd64) +#define InterlockedAddRelease64 __REL_(_InterlockedAdd64) +#define InterlockedAddNoFence64 __NF_(_InterlockedAdd64) + +#define InterlockedAnd _InterlockedAnd +#define InterlockedAndAcquire __ACQ_(_InterlockedAnd) +#define InterlockedAndRelease __REL_(_InterlockedAnd) +#define InterlockedAndNoFence __NF_(_InterlockedAnd) + +#define InterlockedAnd8 _InterlockedAnd8 +#ifdef _M_ARM +#define InterlockedAndAcquire8 _InterlockedAnd8_acq +#define InterlockedAndRelease8 _InterlockedAnd8_rel +#define InterlockedAndNoFence8 _InterlockedAnd8_nf +#elif defined(_M_IA64) +#define InterlockedAnd8Acquire _InterlockedAnd8_acq +#define InterlockedAnd8Release _InterlockedAnd8_rel +#endif // _M_ARM + +#define InterlockedAnd16 _InterlockedAnd16 +#ifdef _M_ARM +#define InterlockedAndAcquire16 _InterlockedAnd16_acq +#define InterlockedAndRelease16 _InterlockedAnd16_rel +#define InterlockedAndNoFence16 _InterlockedAnd16_nf +#elif defined(_M_IA64) +#define InterlockedAnd16Acquire _InterlockedAnd16_acq +#define InterlockedAnd16Release _InterlockedAnd16_rel +#endif // _M_ARM + +#define InterlockedAnd64 _InterlockedAnd64 +#ifdef _M_ARM +#define InterlockedAndAcquire64 __ACQ_(_InterlockedAnd64) +#define InterlockedAndRelease64 __REL_(_InterlockedAnd64) +#define InterlockedAndNoFence64 __NF_(_InterlockedAnd64) +#else // _M_ARM +#define InterlockedAnd64Acquire __ACQ_(_InterlockedAnd64) +#define InterlockedAnd64Release __REL_(_InterlockedAnd64) +#define InterlockedAnd64NoFence __NF_(_InterlockedAnd64) +#endif // _M_ARM + +#ifdef _WIN64 +#define InterlockedAndAffinity InterlockedAnd64 +#else +#define InterlockedAndAffinity InterlockedAnd +#endif // _WIN64 + +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedCompareExchangeAcquire __ACQ_(_InterlockedCompareExchange) +#define InterlockedCompareExchangeRelease __REL_(_InterlockedCompareExchange) +#define InterlockedCompareExchangeNoFence __NF_(_InterlockedCompareExchange) + +#define InterlockedCompareExchange16 _InterlockedCompareExchange16 +#define InterlockedCompareExchangeAcquire16 __ACQ_(_InterlockedCompareExchange16) +#define InterlockedCompareExchangeRelease16 __REL_(_InterlockedCompareExchange16) +#define InterlockedCompareExchangeNoFence16 __NF_(_InterlockedCompareExchange16) + +#define InterlockedCompareExchange64 _InterlockedCompareExchange64 +#define InterlockedCompareExchangeAcquire64 __ACQ_(_InterlockedCompareExchange64) +#define InterlockedCompareExchangeRelease64 __REL_(_InterlockedCompareExchange64) +#define InterlockedCompareExchangeNoFence64 __NF_(_InterlockedCompareExchange64) + +#ifdef _WIN64 +#define InterlockedCompareExchange128 _InterlockedCompareExchange128 +#endif // _WIN64 + +#ifdef _M_IA64 +#define InterlockedCompare64Exchange128 _InterlockedCompare64Exchange128 +#define InterlockedCompare64ExchangeAcquire128 _InterlockedCompare64Exchange128_acq +#define InterlockedCompare64ExchangeRelease128 _InterlockedCompare64Exchange128_rel +#endif // _M_IA64 + +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#define InterlockedCompareExchangePointerAcquire __ACQ_(_InterlockedCompareExchangePointer) +#define InterlockedCompareExchangePointerRelease __REL_(_InterlockedCompareExchangePointer) +#define InterlockedCompareExchangePointerNoFence __NF_(_InterlockedCompareExchangePointer) + +#define InterlockedDecrement _InterlockedDecrement +#define InterlockedDecrementAcquire __ACQ_(_InterlockedDecrement) +#define InterlockedDecrementRelease __REL_(_InterlockedDecrement) +#define InterlockedDecrementNoFence __NF_(_InterlockedDecrement) + +#define InterlockedDecrement16 _InterlockedDecrement16 +#define InterlockedDecrementAcquire16 __ACQ_(_InterlockedDecrement16) +#define InterlockedDecrementRelease16 __REL_(_InterlockedDecrement16) +#define InterlockedDecrementNoFence16 __NF_(_InterlockedDecrement16) + +#define InterlockedDecrement64 _InterlockedDecrement64 +#define InterlockedDecrementAcquire64 __ACQ_(_InterlockedDecrement64) +#define InterlockedDecrementRelease64 __REL_(_InterlockedDecrement64) +#define InterlockedDecrementNoFence64 __NF_(_InterlockedDecrement64) + +#ifdef _WIN64 +#define InterlockedDecrementSizeT(a) InterlockedDecrement64((LONG64 *)a) +#define InterlockedDecrementSizeTNoFence(a) InterlockedDecrementNoFence64((LONG64 *)a) +#else +#define InterlockedDecrementSizeT(a) InterlockedDecrement((LONG *)a) +#define InterlockedDecrementSizeTNoFence(a) InterlockedDecrementNoFence((LONG *)a) +#endif // _WIN64 + +#define InterlockedExchange _InterlockedExchange +#define InterlockedExchangeAcquire __ACQ_(_InterlockedExchange) +/* No release here */ +#define InterlockedExchangeNoFence __NF_(_InterlockedExchange) + +#if (_MSC_VER >= 1600) +#define InterlockedExchange8 _InterlockedExchange8 +#endif // (_MSC_VER >= 1600) + +#define InterlockedExchange16 _InterlockedExchange16 +/* No release here */ +#define InterlockedExchangeAcquire16 __ACQ_(_InterlockedExchange16) +#define InterlockedExchangeNoFence16 __NF_(_InterlockedExchange16) + +#define InterlockedExchange64 _InterlockedExchange64 +#define InterlockedExchangeAcquire64 __ACQ_(_InterlockedExchange64) +/* No release here */ +#define InterlockedExchangeNoFence64 __NF_(_InterlockedExchange64) + +#define InterlockedExchangePointer _InterlockedExchangePointer +#define InterlockedExchangePointerAcquire __ACQ_(_InterlockedExchangePointer) +/* No release here */ +#define InterlockedExchangePointerNoFence __NF_(_InterlockedExchangePointer) + +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchangeAddAcquire __ACQ_(_InterlockedExchangeAdd) +#define InterlockedExchangeAddRelease __REL_(_InterlockedExchangeAdd) +#define InterlockedExchangeAddNoFence __NF_(_InterlockedExchangeAdd) + +#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 +#define InterlockedExchangeAddAcquire64 __ACQ_(_InterlockedExchangeAdd64) +#define InterlockedExchangeAddRelease64 __REL_(_InterlockedExchangeAdd64) +#define InterlockedExchangeAddNoFence64 __NF_(_InterlockedExchangeAdd64) + +#ifdef _WIN64 +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONG64 *)a, b) +#define InterlockedExchangeAddSizeTAcquire(a, b) InterlockedExchangeAddAcquire64((LONG64 *)a, b) +#define InterlockedExchangeAddSizeTNoFence(a, b) InterlockedExchangeAddNoFence64((LONG64 *)a, b) +#else +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)a, b) +#define InterlockedExchangeAddSizeTAcquire(a, b) InterlockedExchangeAddAcquire((LONG *)a, b) +#define InterlockedExchangeAddSizeTNoFence(a, b) InterlockedExchangeAddNoFence((LONG *)a, b) +#endif // _WIN64 + +#define InterlockedIncrement _InterlockedIncrement +#define InterlockedIncrementAcquire __ACQ_(_InterlockedIncrement) +#define InterlockedIncrementRelease __REL_(_InterlockedIncrement) +#define InterlockedIncrementNoFence __NF_(_InterlockedIncrement) + +#define InterlockedIncrement16 _InterlockedIncrement16 +#define InterlockedIncrementAcquire16 __ACQ_(_InterlockedIncrement16) +#define InterlockedIncrementRelease16 __REL_(_InterlockedIncrement16) +#define InterlockedIncrementNoFence16 __NF_(_InterlockedIncrement16) + +#define InterlockedIncrement64 _InterlockedIncrement64 +#define InterlockedIncrementAcquire64 __ACQ_(_InterlockedIncrement64) +#define InterlockedIncrementRelease64 __REL_(_InterlockedIncrement64) +#define InterlockedIncrementNoFence64 __NF_(_InterlockedIncrement64) + +#ifdef _WIN64 +#define InterlockedIncrementSizeT(a) InterlockedIncrement64((LONG64 *)a) +#define InterlockedIncrementSizeTNoFence(a) InterlockedIncrementNoFence64((LONG64 *)a) +#else +#define InterlockedIncrementSizeT(a) InterlockedIncrement((LONG *)a) +#define InterlockedIncrementSizeTNoFence(a) InterlockedIncrementNoFence((LONG *)a) +#endif // _WIN64 + +#define InterlockedOr _InterlockedOr +#define InterlockedOrAcquire __ACQ_(_InterlockedOr) +#define InterlockedOrRelease __REL_(_InterlockedOr) +#define InterlockedOrNoFence __NF_(_InterlockedOr) + +#define InterlockedOr8 _InterlockedOr8 +#ifdef _M_ARM +#define InterlockedOrAcquire8 _InterlockedOr8_acq +#define InterlockedOrRelease8 _InterlockedOr8_rel +#define InterlockedOrNoFence8 _InterlockedOr8_nf +#elif defined(_M_IA64) +#define InterlockedOr8Acquire _InterlockedOr8_acq +#define InterlockedOr8Release _InterlockedOr8_rel +#endif // _M_ARM + +#define InterlockedOr16 _InterlockedOr16 +#ifdef _M_ARM +#define InterlockedOrAcquire16 _InterlockedOr16_acq +#define InterlockedOrRelease16 _InterlockedOr16_rel +#define InterlockedOrNoFence16 _InterlockedOr16_nf +#elif defined(_M_IA64) +#define InterlockedOr16Acquire _InterlockedOr16_acq +#define InterlockedOr16Release _InterlockedOr16_rel +#endif // _M_ARM + +#define InterlockedOr64 _InterlockedOr64 +#ifdef _M_ARM +#define InterlockedOrAcquire64 _InterlockedOr64_acq +#define InterlockedOrRelease64 _InterlockedOr64_rel +#define InterlockedOrNoFence64 _InterlockedOr64_nf +#elif defined(_M_IA64) || defined(_M_AMD64) +#define InterlockedOr64Acquire __ACQ_(_InterlockedOr64) +#define InterlockedOr64Release __REL_(_InterlockedOr64) +#define InterlockedOr64NoFence __NF_(_InterlockedOr64) +#endif // _M_ARM + +#ifdef _WIN64 +#define InterlockedOrAffinity InterlockedOr64 +#else +#define InterlockedOrAffinity InterlockedOr +#endif // _WIN64 + +#define InterlockedXor _InterlockedXor +#define InterlockedXorAcquire __ACQ_(_InterlockedXor) +#define InterlockedXorRelease __REL_(_InterlockedXor) +#define InterlockedXorNoFence __NF_(_InterlockedXor) + +#define InterlockedXor8 _InterlockedXor8 +#ifdef _M_ARM +#define InterlockedXorAcquire8 _InterlockedXor8_acq +#define InterlockedXorRelease8 _InterlockedXor8_rel +#define InterlockedXorNoFence8 _InterlockedXor8_nf +#elif defined(_M_IA64) +#define InterlockedXor8Acquire _InterlockedXor8_acq +#define InterlockedXor8Release _InterlockedXor8_rel +#endif /* _M_ARM */ + +#define InterlockedXor16 _InterlockedXor16 +#ifdef _M_ARM +#define InterlockedXorAcquire16 _InterlockedXor16_acq +#define InterlockedXorRelease16 _InterlockedXor16_rel +#define InterlockedXorNoFence16 _InterlockedXor16_nf +#elif defined(_M_IA64) +#define InterlockedXor16Acquire _InterlockedXor16_acq +#define InterlockedXor16Release _InterlockedXor16_rel +#endif /* _M_ARM */ + +#define InterlockedXor64 _InterlockedXor64 +#ifdef _M_ARM +#define InterlockedXorAcquire64 _InterlockedXor64_acq +#define InterlockedXorRelease64 _InterlockedXor64_rel +#define InterlockedXorNoFence64 _InterlockedXor64_nf +#elif defined(_M_IA64) || defined(_M_AMD64) +#define InterlockedXor64Acquire __ACQ_(_InterlockedXor64) +#define InterlockedXor64Release __REL_(_InterlockedXor64) +#define InterlockedXor64NoFence __NF_(_InterlockedXor64) +#endif /* _M_ARM */ + +#ifdef _M_IX86 + +FORCEINLINE +LONG64 +_InterlockedExchange64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev; + for (Old = *Target; ; Old = Prev) + { + Prev = _InterlockedCompareExchange64(Target, Value, Old); + if (Prev == Old) + return Prev; + } +} + +FORCEINLINE +LONG64 +_InterlockedAdd64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old + Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedExchangeAdd64 ( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value + ) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old + Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return Prev; + } +} + +FORCEINLINE +LONG64 +_InterlockedAnd64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old & Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedOr64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old | Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedXor64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old ^ Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedIncrement64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target) +{ + return _InterlockedAdd64(Target, 1); +} + +FORCEINLINE +LONG64 +_InterlockedDecrement64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target) +{ + return _InterlockedAdd64(Target, -1); +} + +#undef _InterlockedExchangePointer +#define _InterlockedExchangePointer _InlineInterlockedExchangePointer +FORCEINLINE +_Ret_writes_(_Inexpressible_(Unknown)) +PVOID +_InterlockedExchangePointer( + _Inout_ _At_(*Destination, _Pre_writable_byte_size_(_Inexpressible_(Unknown)) + _Post_writable_byte_size_(_Inexpressible_(Unknown))) + _Interlocked_operand_ volatile PVOID *Destination, + _In_opt_ PVOID Value) +{ + return (PVOID)InterlockedExchange((volatile long *)Destination, (long)Value); +} + +#undef _InterlockedCompareExchangePointer +#define _InterlockedCompareExchangePointer _InlineInterlockedCompareExchangePointer +FORCEINLINE +_Ret_writes_(_Inexpressible_(Unknown)) +PVOID +_InterlockedCompareExchangePointer( + _Inout_ _At_(*Destination, _Pre_writable_byte_size_(_Inexpressible_(Unknown)) + _Post_writable_byte_size_(_Inexpressible_(Unknown))) + _Interlocked_operand_ volatile PVOID *Destination, + _In_opt_ PVOID ExChange, + _In_opt_ PVOID Comperand) +{ + return (PVOID)InterlockedCompareExchange((volatile long *)Destination, + (long)ExChange, + (long)Comperand); +} + +#endif /* _M_IX86 */ + +#ifdef _M_AMD64 + +FORCEINLINE +LONG64 +_InterlockedAdd64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) + +{ + return _InterlockedExchangeAdd64(Target, Value) + Value; +} + +#endif /* _M_AMD64 */ + +#ifdef _M_IA64 + +#undef _InterlockedBitTestAndSet +#define _InterlockedBitTestAndSet InterlockedBitTestAndSet_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndSet( + _Inout_ _Interlocked_operand_ volatile LONG *Target, + _In_ LONG Bit) +{ + ULONG Mask = 1 << (Bit & 31); + return (BOOLEAN)((InterlockedOr(&Target[Bit / 32], Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndReset +#define _InterlockedBitTestAndReset InterlockedBitTestAndReset_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndReset( + _Inout_ _Interlocked_operand_ volatile LONG *Target, + _In_ LONG Bit) +{ + ULONG Mask = 1 << (Bit & 31); + return (BOOLEAN)((InterlockedAnd(&Target[Bit / 32], ~Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndSet64 +#define _InterlockedBitTestAndSet64 InterlockedBitTestAndSet64_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndSet64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Bit) +{ + ULONG64 Mask = 1LL << (Bit & 63); + return (BOOLEAN)((InterlockedOr64(&Target[Bit / 64], Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndReset64 +#define _InterlockedBitTestAndReset64 InterlockedBitTestAndReset64_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndReset64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Bit) +{ + ULONG64 Mask = 1LL << (Bit & 63); + return (BOOLEAN)((InterlockedAnd64(&Target[Bit / 64], ~Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndComplement +#define _InterlockedBitTestAndComplement InterlockedBitTestAndComplement_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndComplement( + _Inout_ _Interlocked_operand_ volatile LONG *Target, + _In_ LONG Bit) +{ + ULONG Mask = 1 << (Bit & 31); + return (BOOLEAN)((InterlockedXor(&Target[Bit / 32], Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndComplement64 +#define _InterlockedBitTestAndComplement64 InterlockedBitTestAndComplement64_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndComplement64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Bit) +{ + ULONG64 Mask = 1LL << (Bit & 63); + return (BOOLEAN)((InterlockedXor64(&Target[Bit / 64], Mask) & Mask) != 0); +} + +#endif /* M_IA64 */ + + +#if defined(__ROS_LONG64__) +#undef InterlockedExchange +#define InterlockedExchange(a,b) _InterlockedExchange((long*)a,b) +#undef InterlockedExchangeAdd +#define InterlockedExchangeAdd(a,b) _InterlockedExchangeAdd((long*)a,b) +#undef InterlockedCompareExchange +#define InterlockedCompareExchange(a,b,c) _InterlockedCompareExchange((long*)a,b,c) +#undef InterlockedIncrement +#define InterlockedIncrement(a) _InterlockedIncrement((long*)a) +#undef InterlockedDecrement +#define InterlockedDecrement(a) _InterlockedDecrement((long*)a) +#endif #undef __C89_NAMELESS #undef __C89_NAMELESSSTRUCTNAME @@ -5993,42 +6544,6 @@ return *((PVOID *)GetCurrentFiber()); } -#define BitScanForward _BitScanForward -#define BitScanReverse _BitScanReverse -#define BitTest _bittest -#define BitTestAndComplement _bittestandcomplement -#define BitTestAndSet _bittestandset -#define BitTestAndReset _bittestandreset -#define InterlockedBitTestAndSet _interlockedbittestandset -#define InterlockedBitTestAndReset _interlockedbittestandreset -#define InterlockedAnd16 _InterlockedAnd16 -#define InterlockedCompareExchange16 _InterlockedCompareExchange16 -#define InterlockedOr16 _InterlockedOr16 -#define InterlockedIncrement16 _InterlockedIncrement16 -#define InterlockedDecrement16 _InterlockedDecrement16 - -#ifdef _M_AMD64 -#define BitScanForward64 _BitScanForward64 -#define BitScanReverse64 _BitScanReverse64 - -#define InterlockedAnd _InterlockedAnd -#define InterlockedExchange _InterlockedExchange -#define InterlockedOr _InterlockedOr - -#define InterlockedAnd64 _InterlockedAnd64 -#define InterlockedOr64 _InterlockedOr64 - -#define InterlockedBitTestAndSet64 _interlockedbittestandset64 -#define InterlockedBitTestAndReset64 _interlockedbittestandreset64 - -#endif - -#ifdef _WIN64 -#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONG64 *)a, b) -#else -#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)a, b) -#endif - /* TODO: Other architectures than X86 */ #if defined(_M_IX86) #define PF_TEMPORAL_LEVEL_1 Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Sun Apr 12 12:40:49 2015 @@ -677,12 +677,12 @@ _In_ LARGE_INTEGER Increment, _Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); -#if defined(_WIN64) +#if !defined(_M_IX86) #define ExInterlockedAddLargeStatistic(Addend, Increment) \ (VOID)InterlockedAdd64(&(Addend)->QuadPart, Increment) #else #define ExInterlockedAddLargeStatistic(Addend, Increment) \ - _InterlockedAddLargeStatistic((PLONGLONG)&(Addend)->QuadPart, Increment) + (VOID)_InterlockedAddLargeStatistic((PLONGLONG)&(Addend)->QuadPart, Increment) #endif NTKERNELAPI 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] Sun Apr 12 12:40:49 2015 @@ -8,143 +8,531 @@ #define BitTestAndComplement _bittestandcomplement #define BitTestAndSet _bittestandset #define BitTestAndReset _bittestandreset -#define InterlockedBitTestAndSet _interlockedbittestandset -#define InterlockedBitTestAndReset _interlockedbittestandreset - -#ifdef _M_AMD64 +#ifdef _WIN64 #define BitScanForward64 _BitScanForward64 #define BitScanReverse64 _BitScanReverse64 #define BitTest64 _bittest64 #define BitTestAndComplement64 _bittestandcomplement64 #define BitTestAndSet64 _bittestandset64 #define BitTestAndReset64 _bittestandreset64 +#endif /* _WIN64 */ + +#if defined(_M_ARM) || defined(_M_IA64) +#define __ACQ_(x) x##_acq +#define __REL_(x) x##_rel +#define __NF_(x) x##_nf +#else +#define __ACQ_(x) x +#define __REL_(x) x +#define __NF_(x) x +#endif + +#define InterlockedBitTestAndSet _interlockedbittestandset +#define InterlockedBitTestAndSetAcquire __ACQ_(_interlockedbittestandset) +#define InterlockedBitTestAndSetRelease __REL_(_interlockedbittestandset) +#define InterlockedBitTestAndSetNoFence __NF_(_interlockedbittestandset) + +#define InterlockedBitTestAndReset _interlockedbittestandreset +#define InterlockedBitTestAndResetAcquire __ACQ_(_interlockedbittestandreset) +#define InterlockedBitTestAndResetRelease __REL_(_interlockedbittestandreset) +#define InterlockedBitTestAndResetNoFence __NF_(_interlockedbittestandreset) + +#ifdef _WIN64 #define InterlockedBitTestAndSet64 _interlockedbittestandset64 +#define InterlockedBitTestAndSet64Acquire __ACQ_(_interlockedbittestandset64) +#define InterlockedBitTestAndSet64Release __REL_(_interlockedbittestandset64) +#define InterlockedBitTestAndSet64NoFence __NF_(_interlockedbittestandset64) + #define InterlockedBitTestAndReset64 _interlockedbittestandreset64 -#endif - -#if !defined(__INTERLOCKED_DECLARED) -#define __INTERLOCKED_DECLARED - -#if defined (_X86_) -#if defined(NO_INTERLOCKED_INTRINSICS) -NTKERNELAPI -LONG -FASTCALL -InterlockedIncrement( - _Inout_ _Interlocked_operand_ LONG volatile *Addend); - -NTKERNELAPI -LONG -FASTCALL -InterlockedDecrement( - _Inout_ _Interlocked_operand_ LONG volatile *Addend); - -NTKERNELAPI -LONG -FASTCALL -InterlockedCompareExchange( - _Inout_ _Interlocked_operand_ LONG volatile *Destination, - _In_ LONG Exchange, - _In_ LONG Comparand); - -NTKERNELAPI -LONG -FASTCALL -InterlockedExchange( - _Inout_ _Interlocked_operand_ LONG volatile *Destination, - _In_ LONG Value); - -NTKERNELAPI -LONG -FASTCALL -InterlockedExchangeAdd( - _Inout_ _Interlocked_operand_ LONG volatile *Addend, - _In_ LONG Value); - -#else /* !defined(NO_INTERLOCKED_INTRINSICS) */ +#define InterlockedBitTestAndReset64Acquire __ACQ_(_interlockedbittestandreset64) +#define InterlockedBitTestAndReset64Release __REL_(_interlockedbittestandreset64) +#define InterlockedBitTestAndReset64NoFence __NF_(_interlockedbittestandreset64) +#endif /* _WIN64 */ + +#define InterlockedAdd _InterlockedAdd +#define InterlockedAddAcquire __ACQ_(_InterlockedAdd) +#define InterlockedAddRelease __REL_(_InterlockedAdd) +#define InterlockedAddNoFence __NF_(_InterlockedAdd) + +#define InterlockedAdd64 _InterlockedAdd64 +#define InterlockedAddAcquire64 __ACQ_(_InterlockedAdd64) +#define InterlockedAddRelease64 __REL_(_InterlockedAdd64) +#define InterlockedAddNoFence64 __NF_(_InterlockedAdd64) + +#define InterlockedAnd _InterlockedAnd +#define InterlockedAndAcquire __ACQ_(_InterlockedAnd) +#define InterlockedAndRelease __REL_(_InterlockedAnd) +#define InterlockedAndNoFence __NF_(_InterlockedAnd) + +#define InterlockedAnd8 _InterlockedAnd8 +#ifdef _M_ARM +#define InterlockedAndAcquire8 _InterlockedAnd8_acq +#define InterlockedAndRelease8 _InterlockedAnd8_rel +#define InterlockedAndNoFence8 _InterlockedAnd8_nf +#elif defined(_M_IA64) +#define InterlockedAnd8Acquire _InterlockedAnd8_acq +#define InterlockedAnd8Release _InterlockedAnd8_rel +#endif // _M_ARM + +#define InterlockedAnd16 _InterlockedAnd16 +#ifdef _M_ARM +#define InterlockedAndAcquire16 _InterlockedAnd16_acq +#define InterlockedAndRelease16 _InterlockedAnd16_rel +#define InterlockedAndNoFence16 _InterlockedAnd16_nf +#elif defined(_M_IA64) +#define InterlockedAnd16Acquire _InterlockedAnd16_acq +#define InterlockedAnd16Release _InterlockedAnd16_rel +#endif // _M_ARM + +#define InterlockedAnd64 _InterlockedAnd64 +#ifdef _M_ARM +#define InterlockedAndAcquire64 __ACQ_(_InterlockedAnd64) +#define InterlockedAndRelease64 __REL_(_InterlockedAnd64) +#define InterlockedAndNoFence64 __NF_(_InterlockedAnd64) +#else // _M_ARM +#define InterlockedAnd64Acquire __ACQ_(_InterlockedAnd64) +#define InterlockedAnd64Release __REL_(_InterlockedAnd64) +#define InterlockedAnd64NoFence __NF_(_InterlockedAnd64) +#endif // _M_ARM + +#ifdef _WIN64 +#define InterlockedAndAffinity InterlockedAnd64 +#else +#define InterlockedAndAffinity InterlockedAnd +#endif // _WIN64 + +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedCompareExchangeAcquire __ACQ_(_InterlockedCompareExchange) +#define InterlockedCompareExchangeRelease __REL_(_InterlockedCompareExchange) +#define InterlockedCompareExchangeNoFence __NF_(_InterlockedCompareExchange) + +#define InterlockedCompareExchange16 _InterlockedCompareExchange16 +#define InterlockedCompareExchangeAcquire16 __ACQ_(_InterlockedCompareExchange16) +#define InterlockedCompareExchangeRelease16 __REL_(_InterlockedCompareExchange16) +#define InterlockedCompareExchangeNoFence16 __NF_(_InterlockedCompareExchange16) + +#define InterlockedCompareExchange64 _InterlockedCompareExchange64 +#define InterlockedCompareExchangeAcquire64 __ACQ_(_InterlockedCompareExchange64) +#define InterlockedCompareExchangeRelease64 __REL_(_InterlockedCompareExchange64) +#define InterlockedCompareExchangeNoFence64 __NF_(_InterlockedCompareExchange64) + +#ifdef _WIN64 +#define InterlockedCompareExchange128 _InterlockedCompareExchange128 +#endif // _WIN64 + +#ifdef _M_IA64 +#define InterlockedCompare64Exchange128 _InterlockedCompare64Exchange128 +#define InterlockedCompare64ExchangeAcquire128 _InterlockedCompare64Exchange128_acq +#define InterlockedCompare64ExchangeRelease128 _InterlockedCompare64Exchange128_rel +#endif // _M_IA64 + +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#define InterlockedCompareExchangePointerAcquire __ACQ_(_InterlockedCompareExchangePointer) +#define InterlockedCompareExchangePointerRelease __REL_(_InterlockedCompareExchangePointer) +#define InterlockedCompareExchangePointerNoFence __NF_(_InterlockedCompareExchangePointer) + +#define InterlockedDecrement _InterlockedDecrement +#define InterlockedDecrementAcquire __ACQ_(_InterlockedDecrement) +#define InterlockedDecrementRelease __REL_(_InterlockedDecrement) +#define InterlockedDecrementNoFence __NF_(_InterlockedDecrement) + +#define InterlockedDecrement16 _InterlockedDecrement16 +#define InterlockedDecrementAcquire16 __ACQ_(_InterlockedDecrement16) +#define InterlockedDecrementRelease16 __REL_(_InterlockedDecrement16) +#define InterlockedDecrementNoFence16 __NF_(_InterlockedDecrement16) + +#define InterlockedDecrement64 _InterlockedDecrement64 +#define InterlockedDecrementAcquire64 __ACQ_(_InterlockedDecrement64) +#define InterlockedDecrementRelease64 __REL_(_InterlockedDecrement64) +#define InterlockedDecrementNoFence64 __NF_(_InterlockedDecrement64) + +#ifdef _WIN64 +#define InterlockedDecrementSizeT(a) InterlockedDecrement64((LONG64 *)a) +#define InterlockedDecrementSizeTNoFence(a) InterlockedDecrementNoFence64((LONG64 *)a) +#else +#define InterlockedDecrementSizeT(a) InterlockedDecrement((LONG *)a) +#define InterlockedDecrementSizeTNoFence(a) InterlockedDecrementNoFence((LONG *)a) +#endif // _WIN64 #define InterlockedExchange _InterlockedExchange +#define InterlockedExchangeAcquire __ACQ_(_InterlockedExchange) +/* No release here */ +#define InterlockedExchangeNoFence __NF_(_InterlockedExchange) + +#if (_MSC_VER >= 1600) +#define InterlockedExchange8 _InterlockedExchange8 +#endif // (_MSC_VER >= 1600) + +#define InterlockedExchange16 _InterlockedExchange16 +/* No release here */ +#define InterlockedExchangeAcquire16 __ACQ_(_InterlockedExchange16) +#define InterlockedExchangeNoFence16 __NF_(_InterlockedExchange16) + +#define InterlockedExchange64 _InterlockedExchange64 +#define InterlockedExchangeAcquire64 __ACQ_(_InterlockedExchange64) +/* No release here */ +#define InterlockedExchangeNoFence64 __NF_(_InterlockedExchange64) + +#define InterlockedExchangePointer _InterlockedExchangePointer +#define InterlockedExchangePointerAcquire __ACQ_(_InterlockedExchangePointer) +/* No release here */ +#define InterlockedExchangePointerNoFence __NF_(_InterlockedExchangePointer) + +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchangeAddAcquire __ACQ_(_InterlockedExchangeAdd) +#define InterlockedExchangeAddRelease __REL_(_InterlockedExchangeAdd) +#define InterlockedExchangeAddNoFence __NF_(_InterlockedExchangeAdd) + +#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 +#define InterlockedExchangeAddAcquire64 __ACQ_(_InterlockedExchangeAdd64) +#define InterlockedExchangeAddRelease64 __REL_(_InterlockedExchangeAdd64) +#define InterlockedExchangeAddNoFence64 __NF_(_InterlockedExchangeAdd64) + +#ifdef _WIN64 +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONG64 *)a, b) +#define InterlockedExchangeAddSizeTAcquire(a, b) InterlockedExchangeAddAcquire64((LONG64 *)a, b) +#define InterlockedExchangeAddSizeTNoFence(a, b) InterlockedExchangeAddNoFence64((LONG64 *)a, b) +#else +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)a, b) +#define InterlockedExchangeAddSizeTAcquire(a, b) InterlockedExchangeAddAcquire((LONG *)a, b) +#define InterlockedExchangeAddSizeTNoFence(a, b) InterlockedExchangeAddNoFence((LONG *)a, b) +#endif // _WIN64 + #define InterlockedIncrement _InterlockedIncrement -#define InterlockedDecrement _InterlockedDecrement -#define InterlockedExchangeAdd _InterlockedExchangeAdd -#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedIncrementAcquire __ACQ_(_InterlockedIncrement) +#define InterlockedIncrementRelease __REL_(_InterlockedIncrement) +#define InterlockedIncrementNoFence __NF_(_InterlockedIncrement) + +#define InterlockedIncrement16 _InterlockedIncrement16 +#define InterlockedIncrementAcquire16 __ACQ_(_InterlockedIncrement16) +#define InterlockedIncrementRelease16 __REL_(_InterlockedIncrement16) +#define InterlockedIncrementNoFence16 __NF_(_InterlockedIncrement16) + +#define InterlockedIncrement64 _InterlockedIncrement64 +#define InterlockedIncrementAcquire64 __ACQ_(_InterlockedIncrement64) +#define InterlockedIncrementRelease64 __REL_(_InterlockedIncrement64) +#define InterlockedIncrementNoFence64 __NF_(_InterlockedIncrement64) + +#ifdef _WIN64 +#define InterlockedIncrementSizeT(a) InterlockedIncrement64((LONG64 *)a) +#define InterlockedIncrementSizeTNoFence(a) InterlockedIncrementNoFence64((LONG64 *)a) +#else +#define InterlockedIncrementSizeT(a) InterlockedIncrement((LONG *)a) +#define InterlockedIncrementSizeTNoFence(a) InterlockedIncrementNoFence((LONG *)a) +#endif // _WIN64 + #define InterlockedOr _InterlockedOr -#define InterlockedAnd _InterlockedAnd +#define InterlockedOrAcquire __ACQ_(_InterlockedOr) +#define InterlockedOrRelease __REL_(_InterlockedOr) +#define InterlockedOrNoFence __NF_(_InterlockedOr) + +#define InterlockedOr8 _InterlockedOr8 +#ifdef _M_ARM +#define InterlockedOrAcquire8 _InterlockedOr8_acq +#define InterlockedOrRelease8 _InterlockedOr8_rel +#define InterlockedOrNoFence8 _InterlockedOr8_nf +#elif defined(_M_IA64) +#define InterlockedOr8Acquire _InterlockedOr8_acq +#define InterlockedOr8Release _InterlockedOr8_rel +#endif // _M_ARM + +#define InterlockedOr16 _InterlockedOr16 +#ifdef _M_ARM +#define InterlockedOrAcquire16 _InterlockedOr16_acq +#define InterlockedOrRelease16 _InterlockedOr16_rel +#define InterlockedOrNoFence16 _InterlockedOr16_nf +#elif defined(_M_IA64) +#define InterlockedOr16Acquire _InterlockedOr16_acq +#define InterlockedOr16Release _InterlockedOr16_rel +#endif // _M_ARM + +#define InterlockedOr64 _InterlockedOr64 +#ifdef _M_ARM +#define InterlockedOrAcquire64 _InterlockedOr64_acq +#define InterlockedOrRelease64 _InterlockedOr64_rel +#define InterlockedOrNoFence64 _InterlockedOr64_nf +#elif defined(_M_IA64) || defined(_M_AMD64) +#define InterlockedOr64Acquire __ACQ_(_InterlockedOr64) +#define InterlockedOr64Release __REL_(_InterlockedOr64) +#define InterlockedOr64NoFence __NF_(_InterlockedOr64) +#endif // _M_ARM + +#ifdef _WIN64 +#define InterlockedOrAffinity InterlockedOr64 +#else +#define InterlockedOrAffinity InterlockedOr +#endif // _WIN64 + #define InterlockedXor _InterlockedXor - -#endif /* !defined(NO_INTERLOCKED_INTRINSICS) */ - -#endif /* defined (_X86_) */ - -#if !defined (_WIN64) -/* - * PVOID - * InterlockedExchangePointer( - * IN OUT PVOID volatile *Target, - * IN PVOID Value) - */ -#define InterlockedExchangePointer(Target, Value) \ - ((PVOID) InterlockedExchange((PLONG) Target, (LONG) Value)) - -/* - * PVOID - * InterlockedCompareExchangePointer( - * IN OUT PVOID *Destination, - * IN PVOID Exchange, - * IN PVOID Comparand) - */ -#define InterlockedCompareExchangePointer(Destination, Exchange, Comparand) \ - ((PVOID) InterlockedCompareExchange((PLONG) Destination, (LONG) Exchange, (LONG) Comparand)) - -#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)a, b) -#define InterlockedIncrementSizeT(a) InterlockedIncrement((LONG *)a) -#define InterlockedDecrementSizeT(a) InterlockedDecrement((LONG *)a) - -#endif // !defined (_WIN64) - -#if defined (_M_AMD64) - -#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONGLONG *)a, (LONGLONG)b) -#define InterlockedIncrementSizeT(a) InterlockedIncrement64((LONGLONG *)a) -#define InterlockedDecrementSizeT(a) InterlockedDecrement64((LONGLONG *)a) -#define InterlockedAnd _InterlockedAnd -#define InterlockedOr _InterlockedOr -#define InterlockedXor _InterlockedXor -#define InterlockedIncrement _InterlockedIncrement -#define InterlockedDecrement _InterlockedDecrement -#define InterlockedAdd _InterlockedAdd -#define InterlockedExchange _InterlockedExchange -#define InterlockedExchangeAdd _InterlockedExchangeAdd -#define InterlockedCompareExchange _InterlockedCompareExchange -#define InterlockedAnd64 _InterlockedAnd64 -#define InterlockedOr64 _InterlockedOr64 +#define InterlockedXorAcquire __ACQ_(_InterlockedXor) +#define InterlockedXorRelease __REL_(_InterlockedXor) +#define InterlockedXorNoFence __NF_(_InterlockedXor) + +#define InterlockedXor8 _InterlockedXor8 +#ifdef _M_ARM +#define InterlockedXorAcquire8 _InterlockedXor8_acq +#define InterlockedXorRelease8 _InterlockedXor8_rel +#define InterlockedXorNoFence8 _InterlockedXor8_nf +#elif defined(_M_IA64) +#define InterlockedXor8Acquire _InterlockedXor8_acq +#define InterlockedXor8Release _InterlockedXor8_rel +#endif /* _M_ARM */ + +#define InterlockedXor16 _InterlockedXor16 +#ifdef _M_ARM +#define InterlockedXorAcquire16 _InterlockedXor16_acq +#define InterlockedXorRelease16 _InterlockedXor16_rel +#define InterlockedXorNoFence16 _InterlockedXor16_nf +#elif defined(_M_IA64) +#define InterlockedXor16Acquire _InterlockedXor16_acq +#define InterlockedXor16Release _InterlockedXor16_rel +#endif /* _M_ARM */ + #define InterlockedXor64 _InterlockedXor64 -#define InterlockedIncrement64 _InterlockedIncrement64 -#define InterlockedDecrement64 _InterlockedDecrement64 -#define InterlockedAdd64 _InterlockedAdd64 -#define InterlockedExchange64 _InterlockedExchange64 -#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 -#define InterlockedCompareExchange64 _InterlockedCompareExchange64 -#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer -#define InterlockedExchangePointer _InterlockedExchangePointer -#define InterlockedBitTestAndSet64 _interlockedbittestandset64 -#define InterlockedBitTestAndReset64 _interlockedbittestandreset64 - -#endif // _M_AMD64 - -#if defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS) -//#if !defined(_X86AMD64_) // FIXME: what's _X86AMD64_ used for? -FORCEINLINE -LONG64 -InterlockedAdd64( - _Inout_ _Interlocked_operand_ LONG64 volatile *Addend, +#ifdef _M_ARM +#define InterlockedXorAcquire64 _InterlockedXor64_acq +#define InterlockedXorRelease64 _InterlockedXor64_rel +#define InterlockedXorNoFence64 _InterlockedXor64_nf +#elif defined(_M_IA64) || defined(_M_AMD64) +#define InterlockedXor64Acquire __ACQ_(_InterlockedXor64) +#define InterlockedXor64Release __REL_(_InterlockedXor64) +#define InterlockedXor64NoFence __NF_(_InterlockedXor64) +#endif /* _M_ARM */ + +#ifdef _M_IX86 + +FORCEINLINE +LONG64 +_InterlockedExchange64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, _In_ LONG64 Value) { - return InterlockedExchangeAdd64(Addend, Value) + Value; -} -//#endif -#endif - -#endif /* !__INTERLOCKED_DECLARED */ - - + LONG64 Old, Prev; + for (Old = *Target; ; Old = Prev) + { + Prev = _InterlockedCompareExchange64(Target, Value, Old); + if (Prev == Old) + return Prev; + } +} + +FORCEINLINE +LONG64 +_InterlockedAdd64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old + Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedExchangeAdd64 ( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value + ) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old + Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return Prev; + } +} + +FORCEINLINE +LONG64 +_InterlockedAnd64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old & Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedOr64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old | Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedXor64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) +{ + LONG64 Old, Prev, New; + for (Old = *Target; ; Old = Prev) + { + New = Old ^ Value; + Prev = _InterlockedCompareExchange64(Target, New, Old); + if (Prev == Old) + return New; + } +} + +FORCEINLINE +LONG64 +_InterlockedIncrement64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target) +{ + return _InterlockedAdd64(Target, 1); +} + +FORCEINLINE +LONG64 +_InterlockedDecrement64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target) +{ + return _InterlockedAdd64(Target, -1); +} + +#undef _InterlockedExchangePointer +#define _InterlockedExchangePointer _InlineInterlockedExchangePointer +FORCEINLINE +_Ret_writes_(_Inexpressible_(Unknown)) +PVOID +_InterlockedExchangePointer( + _Inout_ _At_(*Destination, _Pre_writable_byte_size_(_Inexpressible_(Unknown)) + _Post_writable_byte_size_(_Inexpressible_(Unknown))) + _Interlocked_operand_ volatile PVOID *Destination, + _In_opt_ PVOID Value) +{ + return (PVOID)InterlockedExchange((volatile long *)Destination, (long)Value); +} + +#undef _InterlockedCompareExchangePointer +#define _InterlockedCompareExchangePointer _InlineInterlockedCompareExchangePointer +FORCEINLINE +_Ret_writes_(_Inexpressible_(Unknown)) +PVOID +_InterlockedCompareExchangePointer( + _Inout_ _At_(*Destination, _Pre_writable_byte_size_(_Inexpressible_(Unknown)) + _Post_writable_byte_size_(_Inexpressible_(Unknown))) + _Interlocked_operand_ volatile PVOID *Destination, + _In_opt_ PVOID ExChange, + _In_opt_ PVOID Comperand) +{ + return (PVOID)InterlockedCompareExchange((volatile long *)Destination, + (long)ExChange, + (long)Comperand); +} + +#endif /* _M_IX86 */ + +#ifdef _M_AMD64 + +FORCEINLINE +LONG64 +_InterlockedAdd64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Value) + +{ + return _InterlockedExchangeAdd64(Target, Value) + Value; +} + +#endif /* _M_AMD64 */ + +#ifdef _M_IA64 + +#undef _InterlockedBitTestAndSet +#define _InterlockedBitTestAndSet InterlockedBitTestAndSet_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndSet( + _Inout_ _Interlocked_operand_ volatile LONG *Target, + _In_ LONG Bit) +{ + ULONG Mask = 1 << (Bit & 31); + return (BOOLEAN)((InterlockedOr(&Target[Bit / 32], Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndReset +#define _InterlockedBitTestAndReset InterlockedBitTestAndReset_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndReset( + _Inout_ _Interlocked_operand_ volatile LONG *Target, + _In_ LONG Bit) +{ + ULONG Mask = 1 << (Bit & 31); + return (BOOLEAN)((InterlockedAnd(&Target[Bit / 32], ~Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndSet64 +#define _InterlockedBitTestAndSet64 InterlockedBitTestAndSet64_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndSet64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Bit) +{ + ULONG64 Mask = 1LL << (Bit & 63); + return (BOOLEAN)((InterlockedOr64(&Target[Bit / 64], Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndReset64 +#define _InterlockedBitTestAndReset64 InterlockedBitTestAndReset64_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndReset64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Bit) +{ + ULONG64 Mask = 1LL << (Bit & 63); + return (BOOLEAN)((InterlockedAnd64(&Target[Bit / 64], ~Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndComplement +#define _InterlockedBitTestAndComplement InterlockedBitTestAndComplement_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndComplement( + _Inout_ _Interlocked_operand_ volatile LONG *Target, + _In_ LONG Bit) +{ + ULONG Mask = 1 << (Bit & 31); + return (BOOLEAN)((InterlockedXor(&Target[Bit / 32], Mask) & Mask) != 0); +} + +#undef _InterlockedBitTestAndComplement64 +#define _InterlockedBitTestAndComplement64 InterlockedBitTestAndComplement64_Inline +FORCEINLINE +BOOLEAN +_InterlockedBitTestAndComplement64( + _Inout_ _Interlocked_operand_ volatile LONG64 *Target, + _In_ LONG64 Bit) +{ + ULONG64 Mask = 1LL << (Bit & 63); + return (BOOLEAN)((InterlockedXor64(&Target[Bit / 64], Mask) & Mask) != 0); +} + +#endif /* M_IA64 */ + Modified: trunk/reactos/include/xdk/winnt.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt.template… ============================================================================== --- trunk/reactos/include/xdk/winnt.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt.template.h [iso-8859-1] Sun Apr 12 12:40:49 2015 @@ -70,6 +70,7 @@ $define(USHORT=WORD) $define(UCHAR=BYTE) $include(ntbasedef.h) +$include(interlocked.h) $include(winnt_old.h) #ifdef __cplusplus Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Sun Apr 12 12:40:49 2015 @@ -1,3 +1,16 @@ + +#if defined(__ROS_LONG64__) +#undef InterlockedExchange +#define InterlockedExchange(a,b) _InterlockedExchange((long*)a,b) +#undef InterlockedExchangeAdd +#define InterlockedExchangeAdd(a,b) _InterlockedExchangeAdd((long*)a,b) +#undef InterlockedCompareExchange +#define InterlockedCompareExchange(a,b,c) _InterlockedCompareExchange((long*)a,b,c) +#undef InterlockedIncrement +#define InterlockedIncrement(a) _InterlockedIncrement((long*)a) +#undef InterlockedDecrement +#define InterlockedDecrement(a) _InterlockedDecrement((long*)a) +#endif #undef __C89_NAMELESS #undef __C89_NAMELESSSTRUCTNAME @@ -4636,42 +4649,6 @@ return *((PVOID *)GetCurrentFiber()); } -#define BitScanForward _BitScanForward -#define BitScanReverse _BitScanReverse -#define BitTest _bittest -#define BitTestAndComplement _bittestandcomplement -#define BitTestAndSet _bittestandset -#define BitTestAndReset _bittestandreset -#define InterlockedBitTestAndSet _interlockedbittestandset -#define InterlockedBitTestAndReset _interlockedbittestandreset -#define InterlockedAnd16 _InterlockedAnd16 -#define InterlockedCompareExchange16 _InterlockedCompareExchange16 -#define InterlockedOr16 _InterlockedOr16 -#define InterlockedIncrement16 _InterlockedIncrement16 -#define InterlockedDecrement16 _InterlockedDecrement16 - -#ifdef _M_AMD64 -#define BitScanForward64 _BitScanForward64 -#define BitScanReverse64 _BitScanReverse64 - -#define InterlockedAnd _InterlockedAnd -#define InterlockedExchange _InterlockedExchange -#define InterlockedOr _InterlockedOr - -#define InterlockedAnd64 _InterlockedAnd64 -#define InterlockedOr64 _InterlockedOr64 - -#define InterlockedBitTestAndSet64 _interlockedbittestandset64 -#define InterlockedBitTestAndReset64 _interlockedbittestandreset64 - -#endif - -#ifdef _WIN64 -#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONG64 *)a, b) -#else -#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)a, b) -#endif - /* TODO: Other architectures than X86 */ #if defined(_M_IX86) #define PF_TEMPORAL_LEVEL_1

1 0

[akhaldi] 67172: [WINE/TEST] Add the possibility of making file names clickable in visual studio output windows by defining WINETEST_MSVC_IDE_FORMATTING. By Mark Jansen. ROSTESTS-156
by akhaldi＠svn.reactos.org 12 Apr '15

12 Apr '15

Author: akhaldi Date: Sun Apr 12 12:26:46 2015 New Revision: 67172 URL: http://svn.reactos.org/svn/reactos?rev=67172&view=rev Log: [WINE/TEST] Add the possibility of making file names clickable in visual studio output windows by defining WINETEST_MSVC_IDE_FORMATTING. By Mark Jansen. ROSTESTS-156 Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Sun Apr 12 12:26:46 2015 @@ -205,6 +205,14 @@ # define __winetest_va_end(list) va_end(list) #endif +/* Define WINETEST_MSVC_IDE_FORMATTING to alter the output format winetest will use for file/line numbers. + This alternate format makes the file/line numbers clickable in visual studio, to directly jump to them. */ +#if defined(WINETEST_MSVC_IDE_FORMATTING) +# define __winetest_file_line_prefix "%s(%d)" +#else +# define __winetest_file_line_prefix "%s:%d" +#endif + struct test { const char *name; @@ -294,6 +302,9 @@ void winetest_set_location( const char* file, int line ) { tls_data* data=get_tls_data(); +#if defined(WINETEST_MSVC_IDE_FORMATTING) + data->current_file = file; +#else data->current_file=strrchr(file,'/'); if (data->current_file==NULL) data->current_file=strrchr(file,'\\'); @@ -301,6 +312,7 @@ data->current_file=file; else data->current_file++; +#endif data->current_line=line; } @@ -331,7 +343,7 @@ { if (condition) { - fprintf( stdout, "%s:%d: Test succeeded inside todo block: ", + fprintf( stdout, __winetest_file_line_prefix ": Test succeeded inside todo block: ", data->current_file, data->current_line ); vfprintf(stdout, msg, args); InterlockedIncrement(&todo_failures); @@ -342,7 +354,7 @@ /* show todos even if traces are disabled*/ /*if (winetest_debug > 0)*/ { - fprintf( stdout, "%s:%d: Test marked todo: ", + fprintf( stdout, __winetest_file_line_prefix ": Test marked todo: ", data->current_file, data->current_line ); vfprintf(stdout, msg, args); } @@ -354,7 +366,7 @@ { if (!condition) { - fprintf( stdout, "%s:%d: Test failed: ", + fprintf( stdout, __winetest_file_line_prefix ": Test failed: ", data->current_file, data->current_line ); vfprintf(stdout, msg, args); InterlockedIncrement(&failures); @@ -363,7 +375,7 @@ else { if (report_success) - fprintf( stdout, "%s:%d: Test succeeded\n", + fprintf( stdout, __winetest_file_line_prefix ": Test succeeded\n", data->current_file, data->current_line); InterlockedIncrement(&successes); return 1; @@ -387,7 +399,7 @@ if (winetest_debug > 0) { - fprintf( stdout, "%s:%d: ", data->current_file, data->current_line ); + fprintf( stdout, __winetest_file_line_prefix ": ", data->current_file, data->current_line ); __winetest_va_start(valist, msg); vfprintf(stdout, msg, valist); __winetest_va_end(valist); @@ -398,7 +410,7 @@ { tls_data* data=get_tls_data(); - fprintf( stdout, "%s:%d: Tests skipped: ", data->current_file, data->current_line ); + fprintf( stdout, __winetest_file_line_prefix ": Tests skipped: ", data->current_file, data->current_line ); vfprintf(stdout, msg, args); skipped++; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs