Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[tkreuzer] 60839: [PSEH3] Enable it by default.
by tkreuzer＠svn.reactos.org 02 Nov '13

02 Nov '13

Author: tkreuzer Date: Sat Nov 2 20:42:13 2013 New Revision: 60839 URL: http://svn.reactos.org/svn/reactos?rev=60839&view=rev Log: [PSEH3] Enable it by default. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=60839&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Nov 2 20:42:13 2013 @@ -10,7 +10,7 @@ endif() if(NOT DEFINED USE_PSEH3) - set(USE_PSEH3 0) + set(USE_PSEH3 1) endif() if(USE_PSEH3)

1 0

[tkreuzer] 60838: [MSV1_0] Fix a bug (LsarClose must be passed a pointer to a LSAPR_HANDLE, not the handle itself)
by tkreuzer＠svn.reactos.org 02 Nov '13

02 Nov '13

Author: tkreuzer Date: Sat Nov 2 18:34:18 2013 New Revision: 60838 URL: http://svn.reactos.org/svn/reactos?rev=60838&view=rev Log: [MSV1_0] Fix a bug (LsarClose must be passed a pointer to a LSAPR_HANDLE, not the handle itself) Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sat Nov 2 18:34:18 2013 @@ -540,7 +540,7 @@ done: if (PolicyHandle != NULL) - LsarClose(PolicyHandle); + LsarClose(&PolicyHandle); return Status; }

1 0

[tkreuzer] 60837: [PSEH3] Fix a bug that could result in an endless loop and which caused the bootcd to hang on an exception.
by tkreuzer＠svn.reactos.org 02 Nov '13

02 Nov '13

Author: tkreuzer Date: Sat Nov 2 16:50:50 2013 New Revision: 60837 URL: http://svn.reactos.org/svn/reactos?rev=60837&view=rev Log: [PSEH3] Fix a bug that could result in an endless loop and which caused the bootcd to hang on an exception. Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sat Nov 2 16:50:50 2013 @@ -244,6 +244,8 @@ \ if (1) \ { \ + /* Prevent this block from being optimized away */ \ + asm volatile ("#\n"); \ do

1 0

[tkreuzer] 60836: [PSEH2_TEST] Add a test that fails with PSEH3
by tkreuzer＠svn.reactos.org 02 Nov '13

02 Nov '13

Author: tkreuzer Date: Sat Nov 2 16:48:45 2013 New Revision: 60836 URL: http://svn.reactos.org/svn/reactos?rev=60836&view=rev Log: [PSEH2_TEST] Add a test that fails with PSEH3 Modified: trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Sat Nov 2 16:48:45 2013 @@ -2616,6 +2616,28 @@ return ret; } +DEFINE_TEST(test_PSEH3_bug) +{ + volatile int count = 0; + int dummy = 0; + + _SEH2_TRY + { + if (count++ == 0) + { + *(volatile int*)0x12345678 = 0x12345678; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + dummy = 0; + } + _SEH2_END; + + (void)dummy; + return (count == 1); +} + #define USE_TEST_NAME_(NAME_) # NAME_ #define USE_TEST_NAME(NAME_) USE_TEST_NAME_(NAME_) #define USE_TEST(NAME_) { USE_TEST_NAME(NAME_), NAME_ } @@ -2745,6 +2767,7 @@ USE_TEST(test_unvolatile_2), USE_TEST(test_finally_goto), USE_TEST(test_nested_exception), + USE_TEST(test_PSEH3_bug), }; size_t i;

1 0

[dgorbachev] 60835: [SAC] Remove extra definitions of variables.
by dgorbachev＠svn.reactos.org 02 Nov '13

02 Nov '13

Author: dgorbachev Date: Sat Nov 2 14:48:01 2013 New Revision: 60835 URL: http://svn.reactos.org/svn/reactos?rev=60835&view=rev Log: [SAC] Remove extra definitions of variables. Modified: trunk/reactos/drivers/sac/driver/chanmgr.c Modified: trunk/reactos/drivers/sac/driver/chanmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/chanmgr… ============================================================================== --- trunk/reactos/drivers/sac/driver/chanmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/chanmgr.c [iso-8859-1] Sat Nov 2 14:48:01 2013 @@ -18,8 +18,6 @@ LONG ChannelRefCount[SAC_MAX_CHANNELS]; LONG ChannelReaped[SAC_MAX_CHANNELS]; SAC_CHANNEL_LOCK ChannelSlotLock[SAC_MAX_CHANNELS]; -LONG CurrentChannelRefCount; -KMUTEX CurrentChannelLock; /* FUNCTIONS ******************************************************************/

1 0

[ekohl] 60834: [USERENV] Get the user name and domain name from the logon token and set the USERNAME and USERDOMAIN environment variables accordingly.
by ekohl＠svn.reactos.org 02 Nov '13

02 Nov '13

Author: ekohl Date: Sat Nov 2 14:45:26 2013 New Revision: 60834 URL: http://svn.reactos.org/svn/reactos?rev=60834&view=rev Log: [USERENV] Get the user name and domain name from the logon token and set the USERNAME and USERDOMAIN environment variables accordingly. Modified: trunk/reactos/dll/win32/userenv/environment.c trunk/reactos/dll/win32/userenv/internal.h trunk/reactos/dll/win32/userenv/misc.c trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Sat Nov 2 14:45:26 2013 @@ -175,8 +175,8 @@ HKEY hKey; LONG Error; - if (!GetUserSidFromToken(hToken, - &SidString)) + if (!GetUserSidStringFromToken(hToken, + &SidString)) { DPRINT1("GetUserSidFromToken() failed\n"); return NULL; @@ -198,6 +198,89 @@ RtlFreeUnicodeString(&SidString); return hKey; +} + + +static +BOOL +GetUserAndDomainName(IN HANDLE hToken, + OUT LPWSTR *UserName, + OUT LPWSTR *DomainName) +{ + PSID Sid = NULL; + LPWSTR lpUserName = NULL; + LPWSTR lpDomainName = NULL; + DWORD cbUserName = 0; + DWORD cbDomainName = 0; + SID_NAME_USE SidNameUse; + BOOL bRet = TRUE; + + if (!GetUserSidFromToken(hToken, + &Sid)) + { + DPRINT1("GetUserSidFromToken() failed\n"); + return FALSE; + } + + if (!LookupAccountSidW(NULL, + Sid, + NULL, + &cbUserName, + NULL, + &cbDomainName, + &SidNameUse)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + bRet = FALSE; + goto done; + } + } + + lpUserName = LocalAlloc(LPTR, + cbUserName * sizeof(WCHAR)); + if (lpUserName == NULL) + { + bRet = FALSE; + goto done; + } + + lpDomainName = LocalAlloc(LPTR, + cbDomainName * sizeof(WCHAR)); + if (lpDomainName == NULL) + { + bRet = FALSE; + goto done; + } + + if (!LookupAccountSidW(NULL, + Sid, + lpUserName, + &cbUserName, + lpDomainName, + &cbDomainName, + &SidNameUse)) + { + bRet = FALSE; + goto done; + } + + *UserName = lpUserName; + *DomainName = lpDomainName; + +done: + if (bRet == FALSE) + { + if (lpUserName != NULL) + LocalFree(lpUserName); + + if (lpDomainName != NULL) + LocalFree(lpDomainName); + } + + LocalFree(Sid); + + return bRet; } @@ -326,6 +409,8 @@ DWORD dwType; HKEY hKey; HKEY hKeyUser; + LPWSTR lpUserName = NULL; + LPWSTR lpDomainName = NULL; NTSTATUS Status; LONG lError; @@ -431,15 +516,20 @@ FALSE); } - /* FIXME: Set 'USERDOMAIN' variable */ - - Length = MAX_PATH; - if (GetUserNameW(Buffer, - &Length)) - { + if (GetUserAndDomainName(hToken, + &lpUserName, + &lpDomainName)) + { + /* Set 'USERDOMAIN' variable */ + SetUserEnvironmentVariable(lpEnvironment, + L"USERDOMAIN", + lpDomainName, + FALSE); + + /* Set 'USERNAME' variable */ SetUserEnvironmentVariable(lpEnvironment, L"USERNAME", - Buffer, + lpUserName, FALSE); } @@ -454,6 +544,12 @@ L"Volatile Environment"); RegCloseKey(hKeyUser); + + if (lpUserName != NULL) + LocalFree(lpUserName); + + if (lpDomainName != NULL) + LocalFree(lpDomainName); return TRUE; } Modified: trunk/reactos/dll/win32/userenv/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/internal… ============================================================================== --- trunk/reactos/dll/win32/userenv/internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/internal.h [iso-8859-1] Sat Nov 2 14:45:26 2013 @@ -75,7 +75,11 @@ BOOL GetUserSidFromToken(HANDLE hToken, - PUNICODE_STRING SidString); + PSID *Sid); + +BOOL +GetUserSidStringFromToken(HANDLE hToken, + PUNICODE_STRING SidString); PSECURITY_DESCRIPTOR CreateDefaultSecurityDescriptor(VOID); Modified: trunk/reactos/dll/win32/userenv/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/misc.c?r… ============================================================================== --- trunk/reactos/dll/win32/userenv/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/misc.c [iso-8859-1] Sat Nov 2 14:45:26 2013 @@ -53,56 +53,124 @@ BOOL GetUserSidFromToken(HANDLE hToken, - PUNICODE_STRING SidString) -{ - PSID_AND_ATTRIBUTES SidBuffer, nsb; + PSID *Sid) +{ + PTOKEN_USER UserBuffer, nsb; + PSID pSid = NULL; ULONG Length; NTSTATUS Status; Length = 256; - SidBuffer = LocalAlloc(LMEM_FIXED, - Length); - if (SidBuffer == NULL) - return FALSE; + UserBuffer = LocalAlloc(LPTR, Length); + if (UserBuffer == NULL) + { + return FALSE; + } Status = NtQueryInformationToken(hToken, TokenUser, - (PVOID)SidBuffer, + (PVOID)UserBuffer, Length, &Length); if (Status == STATUS_BUFFER_TOO_SMALL) { - nsb = LocalReAlloc(SidBuffer, + nsb = LocalReAlloc(UserBuffer, Length, LMEM_MOVEABLE); + if (nsb == NULL) + { + LocalFree(UserBuffer); + return FALSE; + } + + UserBuffer = nsb; + Status = NtQueryInformationToken(hToken, + TokenUser, + (PVOID)UserBuffer, + Length, + &Length); + } + + if (!NT_SUCCESS (Status)) + { + LocalFree(UserBuffer); + return FALSE; + } + + Length = RtlLengthSid(UserBuffer->User.Sid); + + pSid = LocalAlloc(LPTR, Length); + if (pSid == NULL) + { + LocalFree(UserBuffer); + return FALSE; + } + + Status = RtlCopySid(Length, pSid, UserBuffer->User.Sid); + + LocalFree(UserBuffer); + + if (!NT_SUCCESS (Status)) + { + LocalFree(pSid); + return FALSE; + } + + *Sid = pSid; + + return TRUE; +} + + +BOOL +GetUserSidStringFromToken(HANDLE hToken, + PUNICODE_STRING SidString) +{ + PTOKEN_USER UserBuffer, nsb; + ULONG Length; + NTSTATUS Status; + + Length = 256; + UserBuffer = LocalAlloc(LPTR, Length); + if (UserBuffer == NULL) + return FALSE; + + Status = NtQueryInformationToken(hToken, + TokenUser, + (PVOID)UserBuffer, + Length, + &Length); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + nsb = LocalReAlloc(UserBuffer, Length, LMEM_MOVEABLE); if (nsb == NULL) { - LocalFree((HLOCAL)SidBuffer); + LocalFree(UserBuffer); return FALSE; } - SidBuffer = nsb; + UserBuffer = nsb; Status = NtQueryInformationToken(hToken, TokenUser, - (PVOID)SidBuffer, + (PVOID)UserBuffer, Length, &Length); } if (!NT_SUCCESS (Status)) { - LocalFree((HLOCAL)SidBuffer); + LocalFree(UserBuffer); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } - DPRINT("SidLength: %lu\n", RtlLengthSid (SidBuffer[0].Sid)); + DPRINT("SidLength: %lu\n", RtlLengthSid (UserBuffer->User.Sid)); Status = RtlConvertSidToUnicodeString(SidString, - SidBuffer[0].Sid, + UserBuffer->User.Sid, TRUE); - LocalFree((HLOCAL)SidBuffer); + LocalFree(UserBuffer); if (!NT_SUCCESS(Status)) { @@ -116,6 +184,7 @@ return TRUE; } + PSECURITY_DESCRIPTOR CreateDefaultSecurityDescriptor(VOID) Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sat Nov 2 14:45:26 2013 @@ -814,8 +814,8 @@ HKEY hKey; LONG Error; - if (!GetUserSidFromToken(hToken, - &SidString)) + if (!GetUserSidStringFromToken(hToken, + &SidString)) { DPRINT1("GetUserSidFromToken() failed\n"); return FALSE; @@ -898,8 +898,8 @@ DPRINT("CheckForLoadedProfile() called\n"); - if (!GetUserSidFromToken(hToken, - &SidString)) + if (!GetUserSidStringFromToken(hToken, + &SidString)) { DPRINT1("GetUserSidFromToken() failed\n"); return FALSE; @@ -1166,7 +1166,7 @@ } /* Get user SID string */ - ret = GetUserSidFromToken(hToken, &SidString); + ret = GetUserSidStringFromToken(hToken, &SidString); if (!ret) { DPRINT1("GetUserSidFromToken() failed\n"); @@ -1243,8 +1243,8 @@ RegCloseKey(hProfile); - if (!GetUserSidFromToken(hToken, - &SidString)) + if (!GetUserSidStringFromToken(hToken, + &SidString)) { DPRINT1("GetUserSidFromToken() failed\n"); return FALSE;

1 0

[dgorbachev] 60833: Remove some stuff added for old GCC versions.
by dgorbachev＠svn.reactos.org 02 Nov '13

02 Nov '13

Author: dgorbachev Date: Sat Nov 2 14:33:18 2013 New Revision: 60833 URL: http://svn.reactos.org/svn/reactos?rev=60833&view=rev Log: Remove some stuff added for old GCC versions. Modified: trunk/reactos/cmake/config.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/include/crt/mingw32/intrin.h trunk/reactos/include/crt/mingw32/intrin_ppc.h trunk/reactos/lib/rtl/srw.c trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/ex/pushlock.c trunk/reactos/ntoskrnl/fsrtl/fastio.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=608… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Sat Nov 2 14:33:18 2013 @@ -78,4 +78,4 @@ endif() set(USE_DUMMY_PSEH FALSE CACHE BOOL -"Whether to disable PSEH support.") +"Whether to disable PSEH support.") Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=60833&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Nov 2 14:33:18 2013 @@ -61,14 +61,10 @@ add_compile_flags("-march=${OARCH}") endif() -# Warnings -add_compile_flags("-Werror -Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-unused-value") - -if(GCC_VERSION VERSION_LESS 4.7) - add_compile_flags("-Wno-error=uninitialized") -elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7) - add_compile_flags("-Wno-error=unused-but-set-variable -Wno-maybe-uninitialized -Wno-error=narrowing") -endif() +# Warnings, errors +add_compile_flags("-Werror -Wall -Wpointer-arith") +add_compile_flags("-Wno-char-subscripts -Wno-multichar -Wno-unused-value -Wno-maybe-uninitialized") +add_compile_flags("-Wno-error=unused-but-set-variable -Wno-error=narrowing") if(ARCH STREQUAL "amd64") add_compile_flags("-Wno-format") @@ -82,7 +78,7 @@ elseif(OPTIMIZE STREQUAL "2") add_compile_flags("-Os") elseif(OPTIMIZE STREQUAL "3") - add_compile_flags("-O1 -fno-inline-functions-called-once -fno-tree-sra") + add_compile_flags("-Og") elseif(OPTIMIZE STREQUAL "4") add_compile_flags("-O1") elseif(OPTIMIZE STREQUAL "5") Modified: trunk/reactos/include/crt/mingw32/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin.h [iso-8859-1] Sat Nov 2 14:33:18 2013 @@ -113,7 +113,7 @@ /* BUGBUG: only good for use in macros. Cannot be taken the address of */ #define __noop(...) ((void)0) -/* TODO: __assume. GCC only supports the weaker __builtin_expect */ +#define __assume(x) if (!(x)) __builtin_unreachable() #endif Modified: trunk/reactos/include/crt/mingw32/intrin_ppc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_ppc.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_ppc.h [iso-8859-1] Sat Nov 2 14:33:18 2013 @@ -785,7 +785,7 @@ /* BUGBUG: only good for use in macros. Cannot be taken the address of */ #define __noop(...) ((void)0) -/* TODO: __assume. GCC only supports the weaker __builtin_expect */ +#define __assume(x) if (!(x)) __builtin_unreachable() #endif /* EOF */ Modified: trunk/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/srw.c?rev=60833&r1… ============================================================================== --- trunk/reactos/lib/rtl/srw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/srw.c [iso-8859-1] Sat Nov 2 14:33:18 2013 @@ -44,16 +44,6 @@ RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENTION_LOCK) #define RTL_SRWLOCK_BITS 4 -#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40300) || \ - (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40303) -/* This macro will cause the code to assert if compiled with a buggy - version of GCC that doesn't align the wait blocks properly on the stack! */ -#define ASSERT_SRW_WAITBLOCK(ptr) \ - ASSERT(((ULONG_PTR)ptr & ((1 << RTL_SRWLOCK_BITS) - 1)) == 0) -#else -#define ASSERT_SRW_WAITBLOCK(ptr) ((void)0) -#endif - typedef struct _RTLP_SRWLOCK_SHARED_WAKE { LONG Wake; @@ -231,7 +221,6 @@ WaitBlock = (PRTLP_SRWLOCK_WAITBLOCK)(PrevValue & ~RTL_SRWLOCK_MASK); - ASSERT_SRW_WAITBLOCK(WaitBlock); return WaitBlock; } @@ -395,8 +384,6 @@ Shared->LastSharedWake = &SharedWake; - ASSERT_SRW_WAITBLOCK(Shared); - RtlpReleaseWaitBlockLock(SRWLock); RtlpAcquireSRWLockSharedWait(SRWLock, @@ -467,8 +454,6 @@ Shared->LastSharedWake->Next = &SharedWake; } - ASSERT_SRW_WAITBLOCK(Shared); - Shared->SharedCount++; Shared->LastSharedWake = &SharedWake; @@ -496,8 +481,6 @@ StackWaitBlock.SharedWakeChain = &SharedWake; StackWaitBlock.LastSharedWake = &SharedWake; - ASSERT_SRW_WAITBLOCK(&StackWaitBlock); - NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, (PVOID)NewValue, @@ -635,8 +618,6 @@ StackWaitBlock.Last = &StackWaitBlock; StackWaitBlock.Wake = 0; - ASSERT_SRW_WAITBLOCK(&StackWaitBlock); - NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENDED | RTL_SRWLOCK_OWNED; if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, @@ -665,8 +646,6 @@ StackWaitBlock.Next = NULL; StackWaitBlock.Last = &StackWaitBlock; StackWaitBlock.Wake = 0; - - ASSERT_SRW_WAITBLOCK(&StackWaitBlock); First = RtlpAcquireWaitBlockLock(SRWLock); if (First != NULL) @@ -694,8 +673,6 @@ StackWaitBlock.Last = &StackWaitBlock; StackWaitBlock.Wake = 0; - ASSERT_SRW_WAITBLOCK(&StackWaitBlock); - NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, (PVOID)NewValue, Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Sat Nov 2 14:33:18 2013 @@ -845,23 +845,23 @@ IN PHANDLE_TABLE_ENTRY HandleTableEntry) { LONG_PTR OldValue; - DEFINE_WAIT_BLOCK(WaitBlock); + EX_PUSH_LOCK_WAIT_BLOCK WaitBlock; /* Block on the pushlock */ - ExBlockPushLock(&HandleTable->HandleContentionEvent, WaitBlock); + ExBlockPushLock(&HandleTable->HandleContentionEvent, &WaitBlock); /* Get the current value and check if it's been unlocked */ OldValue = HandleTableEntry->Value; if (!(OldValue) || (OldValue & EXHANDLE_TABLE_ENTRY_LOCK_BIT)) { /* Unblock the pushlock and return */ - ExfUnblockPushLock(&HandleTable->HandleContentionEvent, WaitBlock); + ExfUnblockPushLock(&HandleTable->HandleContentionEvent, &WaitBlock); } else { /* Wait for it to be unblocked */ ExWaitForUnblockPushLock(&HandleTable->HandleContentionEvent, - WaitBlock); + &WaitBlock); } } Modified: trunk/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] Sat Nov 2 14:33:18 2013 @@ -472,7 +472,8 @@ { EX_PUSH_LOCK OldValue = *PushLock, NewValue, TempValue; BOOLEAN NeedWake; - DEFINE_WAIT_BLOCK(WaitBlock); + EX_PUSH_LOCK_WAIT_BLOCK Block; + PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock = &Block; /* Start main loop */ for (;;) @@ -645,7 +646,8 @@ { EX_PUSH_LOCK OldValue = *PushLock, NewValue; BOOLEAN NeedWake; - DEFINE_WAIT_BLOCK(WaitBlock); + EX_PUSH_LOCK_WAIT_BLOCK Block; + PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock = &Block; /* Start main loop */ for (;;) Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Sat Nov 2 14:33:18 2013 @@ -294,11 +294,6 @@ ASSERT(FileObject); ASSERT(FileObject->FsContext); - -#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ == 405) - /* Silence incorrect GCC 4.5.x warning */ - OldFileSize.LowPart = 0; -#endif /* Initialize some of the vars and pointers */ NewSize.QuadPart = 0; @@ -546,11 +541,6 @@ else { LARGE_INTEGER OldFileSize; - -#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ == 405) - /* Silence incorrect GCC 4.5.x warning */ - OldFileSize.QuadPart = 0; -#endif /* Sanity check */ ASSERT(!KeIsExecutingDpc()); Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sat Nov 2 14:33:18 2013 @@ -98,34 +98,6 @@ #define MAX_MID_INDEX (MID_LEVEL_ENTRIES * LOW_LEVEL_ENTRIES) #define MAX_HIGH_INDEX (MID_LEVEL_ENTRIES * MID_LEVEL_ENTRIES * LOW_LEVEL_ENTRIES) -// -// Detect old GCC -// -#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40300) || \ - (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40303) - -#define DEFINE_WAIT_BLOCK(x) \ - struct _AlignHack \ - { \ - UCHAR Hack[15]; \ - EX_PUSH_LOCK_WAIT_BLOCK UnalignedBlock; \ - } WaitBlockBuffer; \ - PEX_PUSH_LOCK_WAIT_BLOCK x = (PEX_PUSH_LOCK_WAIT_BLOCK) \ - ((ULONG_PTR)&WaitBlockBuffer.UnalignedBlock &~ 0xF); - -#else - -// -// This is only for compatibility; the compiler will optimize the extra -// local variable (the actual pointer) away, so we don't take any perf hit -// by doing this. -// -#define DEFINE_WAIT_BLOCK(x) \ - EX_PUSH_LOCK_WAIT_BLOCK WaitBlockBuffer; \ - PEX_PUSH_LOCK_WAIT_BLOCK x = &WaitBlockBuffer; - -#endif - #define ExpChangeRundown(x, y, z) (ULONG_PTR)InterlockedCompareExchangePointer(&x->Ptr, (PVOID)y, (PVOID)z) #define ExpChangePushlock(x, y, z) InterlockedCompareExchangePointer((PVOID*)x, (PVOID)y, (PVOID)z) #define ExpSetRundown(x, y) InterlockedExchangePointer(&x->Ptr, (PVOID)y) Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Sat Nov 2 14:33:18 2013 @@ -10,20 +10,10 @@ #define TRAP_DEBUG 0 -// -// Unreachable code hint for GCC 4.5.x, older GCC versions, and MSVC -// -#ifdef __GNUC__ -#if __GNUC__ * 100 + __GNUC_MINOR__ >= 405 -#define UNREACHABLE __builtin_unreachable() -#else -#define UNREACHABLE __builtin_trap() -#endif -#elif _MSC_VER #define UNREACHABLE __assume(0) + +#if _MSC_VER #define __builtin_expect(a,b) (a) -#else -#define UNREACHABLE #endif //

1 0

[dgorbachev] 60832: [CMAKE] Reduce the disk space needed to build ReactOS (disabled for LTCG builds - linker bug #15143).
by dgorbachev＠svn.reactos.org 02 Nov '13

02 Nov '13

Author: dgorbachev Date: Sat Nov 2 13:56:47 2013 New Revision: 60832 URL: http://svn.reactos.org/svn/reactos?rev=60832&view=rev Log: [CMAKE] Reduce the disk space needed to build ReactOS (disabled for LTCG builds - linker bug #15143). Modified: trunk/reactos/toolchain-gcc.cmake Modified: trunk/reactos/toolchain-gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=60… ============================================================================== --- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Sat Nov 2 13:56:47 2013 @@ -47,11 +47,13 @@ set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres) set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool) -if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>") - set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) - set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) +if(NOT LTCG) + set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") +else() + set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>") endif() +set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) +set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) # Don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")

1 0

[dgorbachev] 60831: [ATACTL] Fix CORE-7042.
by dgorbachev＠svn.reactos.org 02 Nov '13

02 Nov '13

Author: dgorbachev Date: Sat Nov 2 13:54:48 2013 New Revision: 60831 URL: http://svn.reactos.org/svn/reactos?rev=60831&view=rev Log: [ATACTL] Fix CORE-7042. Modified: trunk/reactos/base/applications/atactl/atactl.cpp Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… ============================================================================== --- trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] Sat Nov 2 13:54:48 2013 @@ -243,7 +243,7 @@ ata_send_ioctl( HANDLE h, PSCSI_ADDRESS addr, - PCHAR Signature, + PCCH Signature, ULONG Ioctl, PVOID inBuffer, ULONG inBufferLength, @@ -731,7 +731,7 @@ addr.PathId = inquiryData->PathId; addr.TargetId = inquiryData->TargetId; addr.Lun = inquiryData->Lun; - status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", + status = ata_send_ioctl(h, &addr, "-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_GET_MODE, NULL, 0, &IoMode, sizeof(IoMode), @@ -753,7 +753,7 @@ // probably, we shall change this in future to support SATA splitters pin.bDriveNumber = inquiryData->PathId*2+inquiryData->TargetId; - status = ata_send_ioctl(h, NULL, (PCHAR)"SCSIDISK", + status = ata_send_ioctl(h, NULL, "SCSIDISK", IOCTL_SCSI_MINIPORT_IDENTIFY, &pin, sizeof(pin), buff, sizeof(buff), @@ -767,7 +767,7 @@ // probably, we shall change this in future to support SATA splitters pin.bDriveNumber = inquiryData->PathId*2+inquiryData->TargetId; - status = ata_send_ioctl(h, NULL, (PCHAR)"SCSIDISK", + status = ata_send_ioctl(h, NULL, "SCSIDISK", IOCTL_SCSI_MINIPORT_IDENTIFY, &pin, sizeof(pin), buff, sizeof(buff), @@ -999,7 +999,7 @@ } memset(AdapterInfo, 0, len); - status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", + status = ata_send_ioctl(h, &addr, "-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_ADAPTER_INFO, AdapterInfo, len, AdapterInfo, len, @@ -1121,7 +1121,7 @@ // IoMode.ApplyImmediately = TRUE; IoMode.OrigMode = mode; - status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", + status = ata_send_ioctl(h, &addr, "-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_SET_MAX_MODE, &IoMode, sizeof(IoMode), NULL, 0, @@ -1225,7 +1225,7 @@ if(lock) { printf("ATTENTION: you have %d seconds to disconnect cable\n", lock); } - status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", + status = ata_send_ioctl(h, &addr, "-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_DELETE_DEVICE, &to, sizeof(to), NULL, 0, @@ -1280,7 +1280,7 @@ if(lock) { printf("You have %d seconds to connect device.\n", lock); } - status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", + status = ata_send_ioctl(h, &addr, "-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_FIND_DEVICES, &to, sizeof(to), NULL, 0, @@ -1425,7 +1425,7 @@ addr.TargetId = (UCHAR)(dev_id >> 8); addr.Lun = (UCHAR)(dev_id); - status = ata_send_ioctl(h, &addr, (PCHAR)"-UNIATA-", + status = ata_send_ioctl(h, &addr, "-UNIATA-", IOCTL_SCSI_MINIPORT_UNIATA_RESETBB, NULL, 0, NULL, 0,

1 0

[tkreuzer] 60830: [WIN32K] Silence some debugprints
by tkreuzer＠svn.reactos.org 02 Nov '13

02 Nov '13

Author: tkreuzer Date: Sat Nov 2 13:15:01 2013 New Revision: 60830 URL: http://svn.reactos.org/svn/reactos?rev=60830&view=rev Log: [WIN32K] Silence some debugprints Modified: trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/msgqueue.h Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sat Nov 2 13:15:01 2013 @@ -430,7 +430,7 @@ ptiCurrent->TIF_flags |= TIF_ALLOWFOREGROUNDACTIVATE; } ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; - ERR_CH(UserThread,"UserCreateW32Thread pti 0x%p\n",ptiCurrent); + TRACE_CH(UserThread,"UserCreateW32Thread pti 0x%p\n",ptiCurrent); return STATUS_SUCCESS; error: @@ -448,7 +448,7 @@ { if (!pti->RefCount) { - ERR_CH(UserThread,"UserDeleteW32Thread pti 0x%p\n",pti); + TRACE_CH(UserThread,"UserDeleteW32Thread pti 0x%p\n",pti); if (pti->hEventQueueClient != NULL) ZwClose(pti->hEventQueueClient); pti->hEventQueueClient = NULL; @@ -549,7 +549,7 @@ if (ppiCurrent && ppiCurrent->ptiList == ptiCurrent && !ptiCurrent->ptiSibling && ppiCurrent->W32PF_flags & W32PF_CLASSESREGISTERED) { - ERR_CH(UserThread,"DestroyProcessClasses\n"); + TRACE_CH(UserThread,"DestroyProcessClasses\n"); /* no process windows should exist at this point, or the function will assert! */ DestroyProcessClasses(ppiCurrent); ppiCurrent->W32PF_flags &= ~W32PF_CLASSESREGISTERED; Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Sat Nov 2 13:15:01 2013 @@ -215,7 +215,7 @@ do { \ if(InterlockedDecrement(&(MsgQueue)->References) == 0) \ { \ - ERR("Free message queue 0x%p\n", (MsgQueue)); \ + TRACE("Free message queue 0x%p\n", (MsgQueue)); \ ExFreePoolWithTag((MsgQueue), USERTAG_Q); \ } \ } while(0)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2013