Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 66331: [WIN32K:NTUSER] - Remove unneeded casts, fix format specifiers, and clarify some logic in co_MsqSendMessage
by tfaber＠svn.reactos.org 17 Feb '15

17 Feb '15

Author: tfaber Date: Tue Feb 17 08:08:04 2015 New Revision: 66331 URL: http://svn.reactos.org/svn/reactos?rev=66331&view=rev Log: [WIN32K:NTUSER] - Remove unneeded casts, fix format specifiers, and clarify some logic in co_MsqSendMessage Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Tue Feb 17 08:08:04 2015 @@ -99,7 +99,7 @@ if (MessageQueue->iCursorLevel < 0) return OldCursor; - // Fixes the error message "Not the same cursor!". + // Fixes the error message "Not the same cursor!". if (gpqCursor == NULL) { gpqCursor = MessageQueue; @@ -446,7 +446,7 @@ } if (MessageBits & QS_MOUSEMOVE) { // Account for tracking mouse moves.. - if (pti->nCntsQBits[QSRosMouseMove]) + if (pti->nCntsQBits[QSRosMouseMove]) { pti->nCntsQBits[QSRosMouseMove] = 0; // Throttle down count. Up to > 3:1 entries are ignored. ClrMask |= QS_MOUSEMOVE; @@ -1062,11 +1062,11 @@ if (pti->TIF_flags & TIF_INCLEANUP && !(ptirec->TIF_flags & TIF_INCLEANUP)) { // Parent notify is the big one. Fire and forget! - TRACE("Send message from dying thread %d\n",Msg); + TRACE("Send message from dying thread %u\n", Msg); co_MsqSendMessageAsync(ptirec, Wnd, Msg, wParam, lParam, NULL, 0, FALSE, HookMessage); } if (uResult) *uResult = -1; - TRACE("MsqSM: Msg %d Current pti %lu or Rec pti %lu\n", Msg, pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP); + TRACE("MsqSM: Msg %u Current pti %lu or Rec pti %lu\n", Msg, pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP); return STATUS_UNSUCCESSFUL; } @@ -1112,7 +1112,7 @@ if(!(Message = ExAllocatePoolWithTag(PagedPool, sizeof(USER_SENT_MESSAGE), TAG_USRMSG))) { - ERR("MsqSendMessage(): Not enough memory to allocate a message"); + ERR("MsqSendMessage(): Not enough memory to allocate a message\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1171,8 +1171,7 @@ Entry = ptirec->SentMessagesListHead.Flink; while (Entry != &ptirec->SentMessagesListHead) { - if ((PUSER_SENT_MESSAGE) CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry) - == Message) + if (CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry) == Message) { /* We can access Message here, it's secure because the message queue is locked and the message is still hasn't been dispatched */ @@ -1187,17 +1186,16 @@ Entry = Entry->Flink; } - TRACE("MsqSendMessage (blocked) timed out 1 Status %p\n",WaitStatus); + TRACE("MsqSendMessage (blocked) timed out 1 Status %lx\n", WaitStatus); } // Receiving thread passed on and left us hanging with issues still pending. - if ( WaitStatus == STATUS_WAIT_1 ) + else if (WaitStatus == STATUS_WAIT_1) { ERR("Bk Receiving Thread woken up dead!\n"); Entry = pti->DispatchingMessagesHead.Flink; while (Entry != &pti->DispatchingMessagesHead) { - if ((PUSER_SENT_MESSAGE) CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, DispatchingListEntry) - == Message) + if (CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, DispatchingListEntry) == Message) { Message->CompletionEvent = NULL; Message->Result = NULL; @@ -1235,8 +1233,7 @@ Entry = ptirec->SentMessagesListHead.Flink; while (Entry != &ptirec->SentMessagesListHead) { - if ((PUSER_SENT_MESSAGE) CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry) - == Message) + if (CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry) == Message) { /* We can access Message here, it's secure because the message queue is locked and the message is still hasn't been dispatched */ @@ -1251,19 +1248,18 @@ Entry = Entry->Flink; } - TRACE("MsqSendMessage timed out 2 Status %p\n",WaitStatus); - + TRACE("MsqSendMessage timed out 2 Status %lx\n", WaitStatus); + break; } // Receiving thread passed on and left us hanging with issues still pending. - if ( WaitStatus == STATUS_WAIT_2 ) + else if (WaitStatus == STATUS_WAIT_2) { ERR("NB Receiving Thread woken up dead!\n"); Entry = pti->DispatchingMessagesHead.Flink; while (Entry != &pti->DispatchingMessagesHead) { - if ((PUSER_SENT_MESSAGE) CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, DispatchingListEntry) - == Message) + if (CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, DispatchingListEntry) == Message) { Message->CompletionEvent = NULL; Message->Result = NULL; @@ -1279,11 +1275,10 @@ while (co_MsqDispatchOneSentMessage(pti)) ; - } - while (NT_SUCCESS(WaitStatus) && WaitStatus == STATUS_WAIT_1); - } - - if ( WaitStatus == STATUS_USER_APC ) + } while (WaitStatus == STATUS_WAIT_1); + } + + if (WaitStatus == STATUS_USER_APC) { // The current thread is dying! TRACE("User APC\n"); @@ -1291,7 +1286,7 @@ ERR("User APC Returned\n"); // Should not see this message. } - if ( WaitStatus != STATUS_TIMEOUT ) + if (WaitStatus != STATUS_TIMEOUT) { if (uResult) {

1 0

[jimtabor] 66330: [User32] - Add missing wParam for hooks. See CORE-7447.
by jimtabor＠svn.reactos.org 17 Feb '15

17 Feb '15

Author: jimtabor Date: Tue Feb 17 06:42:27 2015 New Revision: 66330 URL: http://svn.reactos.org/svn/reactos?rev=66330&view=rev Log: [User32] - Add missing wParam for hooks. See CORE-7447. Modified: trunk/reactos/win32ss/user/user32/windows/hook.c Modified: trunk/reactos/win32ss/user/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] Tue Feb 17 06:42:27 2015 @@ -622,14 +622,18 @@ case HCBT_CLICKSKIPPED: pMHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); lParam = (LPARAM) pMHook; + wParam = Common->wParam; break; case HCBT_MOVESIZE: prl = (PRECTL)((PCHAR) Common + Common->lParam); lParam = (LPARAM) prl; + wParam = Common->wParam; break; case HCBT_ACTIVATE: + //ERR("HCBT_ACTIVATE: hwnd %p\n",Common->wParam); pcbtas = (LPCBTACTIVATESTRUCT)((PCHAR) Common + Common->lParam); lParam = (LPARAM) pcbtas; + wParam = Common->wParam; break; case HCBT_KEYSKIPPED: /* The rest SEH support */ case HCBT_MINMAX:

1 0

[jgardou] 66329: [RSHELL] - Fix use after free (and spanish style issues ; -) )
by jgardou＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: jgardou Date: Mon Feb 16 22:40:15 2015 New Revision: 66329 URL: http://svn.reactos.org/svn/reactos?rev=66329&view=rev Log: [RSHELL] - Fix use after free (and spanish style issues ;-) ) Modified: trunk/reactos/base/shell/rshell/CMergedFolder.cpp Modified: trunk/reactos/base/shell/rshell/CMergedFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMergedF… ============================================================================== --- trunk/reactos/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] Mon Feb 16 22:40:15 2015 @@ -225,17 +225,15 @@ int order = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, pInfo->parseName, lstrlenW(pInfo->parseName), info.parseName, lstrlenW(info.parseName)); - switch (order) + + if (order == CSTR_EQUAL) { - case CSTR_EQUAL: TRACE("Item name already exists! Marking '%S' as shared ...\n", name); bShared = TRUE; pInfo->shared = TRUE; pInfo->pidl2 = info.pidl; CoTaskMemFree(name); break; - default: - continue; } } @@ -815,4 +813,4 @@ { UNIMPLEMENTED; return E_NOTIMPL; -} +}

1 0

[jgardou] 66328: [EXPLORER] - Prperly initialize members in CStartMenu constructor.
by jgardou＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: jgardou Date: Mon Feb 16 22:33:15 2015 New Revision: 66328 URL: http://svn.reactos.org/svn/reactos?rev=66328&view=rev Log: [EXPLORER] - Prperly initialize members in CStartMenu constructor. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Mon Feb 16 22:33:15 2015 @@ -72,8 +72,12 @@ public: CStartButton(CMessageMap *pObject, DWORD dwMsgMapID) - : CContainedWindow(pObject, dwMsgMapID) - { + : CContainedWindow(pObject, dwMsgMapID), + m_ImageList(NULL), + m_Font(NULL) + { + m_Size.cx = 0; + m_Size.cy = 0; } virtual ~CStartButton()

1 0

[jgardou] 66327: [RSHELL] - Do not free invalid data. See MSDN SHBindToParent documentation for details.
by jgardou＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: jgardou Date: Mon Feb 16 22:33:08 2015 New Revision: 66327 URL: http://svn.reactos.org/svn/reactos?rev=66327&view=rev Log: [RSHELL] - Do not free invalid data. See MSDN SHBindToParent documentation for details. Modified: trunk/reactos/base/shell/rshell/CStartMenu.cpp Modified: trunk/reactos/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CStartMe… ============================================================================== --- trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Mon Feb 16 22:33:08 2015 @@ -496,7 +496,6 @@ return hr; StrRetToBuf(&str, pcidlPrograms, szDisplayName, _countof(szDisplayName)); - ILFree((LPITEMIDLIST)pcidlPrograms); ILFree(pidlProgramsAbsolute); hr = psf->ParseDisplayName(NULL, NULL, szDisplayName, NULL, &pidlPrograms, NULL);

1 0

[jgardou] 66326: [NTDLL_APITEST] - Add tests showing windows behaviour in case of stack overflow.
by jgardou＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: jgardou Date: Mon Feb 16 21:15:55 2015 New Revision: 66326 URL: http://svn.reactos.org/svn/reactos?rev=66326&view=rev Log: [NTDLL_APITEST] - Add tests showing windows behaviour in case of stack overflow. Added: trunk/rostests/apitests/ntdll/StackOverflow.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Mon Feb 16 21:15:55 2015 @@ -27,6 +27,7 @@ RtlGetLongestNtPathLength.c RtlInitializeBitMap.c RtlMemoryStream.c + StackOverflow.c SystemInfo.c Timer.c testlist.c) Added: trunk/rostests/apitests/ntdll/StackOverflow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/StackOverf… ============================================================================== --- trunk/rostests/apitests/ntdll/StackOverflow.c (added) +++ trunk/rostests/apitests/ntdll/StackOverflow.c [iso-8859-1] Mon Feb 16 21:15:55 2015 @@ -0,0 +1,184 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for stack overflow + * PROGRAMMER: JÃ©rÃ´me Gardou + */ + +#define WIN32_NO_STATUS +#include <apitest.h> +#include <stdio.h> +#include <ndk/rtlfuncs.h> +#include <ndk/mmfuncs.h> + +static int iteration = 0; +static PVOID StackAllocationBase; +static PVOID LastStackAllocation; +static ULONG StackSize; + +static +void +infinite_recursive(void) +{ + MEMORY_BASIC_INFORMATION MemoryBasicInfo; + NTSTATUS Status; + char Buffer[0x500]; + + sprintf(Buffer, "Iteration %d.\n", iteration++); + + Status = NtQueryVirtualMemory( + NtCurrentProcess(), + &Buffer[0], + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + /* This never changes */ + ok_ptr(MemoryBasicInfo.AllocationBase, StackAllocationBase); + /* Stack is committed one page at a time */ + ok_ptr(MemoryBasicInfo.BaseAddress, (PVOID)PAGE_ROUND_DOWN(&Buffer[0])); + /* This is the protection of the memory when it was reserved. */ + ok_long(MemoryBasicInfo.AllocationProtect, PAGE_READWRITE); + /* Windows commits the whole used stack at once, +2 pages. */ +#if 0 + ok_long(MemoryBasicInfo.RegionSize, ((ULONG_PTR)StackAllocationBase + StackSize + 2* PAGE_SIZE) - PAGE_ROUND_DOWN(&Buffer[0])); +#endif + /* This is the state of the queried address */ + ok_long(MemoryBasicInfo.State, MEM_COMMIT); + /* This is the protection of the queried address */ + ok_long(MemoryBasicInfo.Protect, PAGE_READWRITE); + /* Of course this is private memory. */ + ok_long(MemoryBasicInfo.Type, MEM_PRIVATE); + + LastStackAllocation = &Buffer[-0x500]; + + infinite_recursive(); +} + +START_TEST(StackOverflow) +{ + NTSTATUS Status; + MEMORY_BASIC_INFORMATION MemoryBasicInfo; + + /* Get the base of the stack */ + Status = NtQueryVirtualMemory( + NtCurrentProcess(), + &Status, + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + StackAllocationBase = MemoryBasicInfo.AllocationBase; + trace("Stack allocation base is %p.\n", StackAllocationBase); + StackSize = MemoryBasicInfo.RegionSize; + + /* Check TEB attributes */ + ok_ptr(NtCurrentTeb()->DeallocationStack, StackAllocationBase); + ok_ptr(NtCurrentTeb()->NtTib.StackBase, (PVOID)((ULONG_PTR)MemoryBasicInfo.BaseAddress + MemoryBasicInfo.RegionSize)); + ok_ptr(NtCurrentTeb()->NtTib.StackLimit, (PVOID)((ULONG_PTR)MemoryBasicInfo.BaseAddress - PAGE_SIZE)); + trace("Guaranteed stack size is %lu.\n", NtCurrentTeb()->GuaranteedStackBytes); + + /* Get its size */ + Status = NtQueryVirtualMemory( + NtCurrentProcess(), + StackAllocationBase, + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* This is the complete stack size */ + StackSize += MemoryBasicInfo.RegionSize; + trace("Stack size is 0x%lx.\n", StackSize); + + trace("Stack limit %p, stack base %p.\n", NtCurrentTeb()->NtTib.StackLimit, NtCurrentTeb()->NtTib.StackBase); + + /* Take a look at what is beyond the stack limit */ + Status = NtQueryVirtualMemory( + NtCurrentProcess(), + NtCurrentTeb()->NtTib.StackLimit, + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + + ok_ptr(MemoryBasicInfo.BaseAddress, NtCurrentTeb()->NtTib.StackLimit); + ok_ptr(MemoryBasicInfo.AllocationBase, StackAllocationBase); + ok_long(MemoryBasicInfo.AllocationProtect, PAGE_READWRITE); + ok_long(MemoryBasicInfo.RegionSize, 2 * PAGE_SIZE); + ok_long(MemoryBasicInfo.State, MEM_COMMIT); + ok_long(MemoryBasicInfo.Protect, PAGE_READWRITE); + ok_long(MemoryBasicInfo.Type, MEM_PRIVATE); + + /* Accessing below stack limit is OK, as long as we don't starve the reserved space. */ + _SEH2_TRY + { + volatile CHAR* Pointer = (PVOID)((ULONG_PTR)NtCurrentTeb()->NtTib.StackLimit - PAGE_SIZE / 2); + CHAR Value = *Pointer; + (void)Value; + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_SUCCESS); + + _SEH2_TRY + { + infinite_recursive(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + trace("Exception after %d iteration.\n", iteration); + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + ok_ntstatus(Status, STATUS_STACK_OVERFLOW); + + /* Windows lets 2 pages between the reserved memory and the smallest possible stack address */ + ok((ULONG_PTR)LastStackAllocation > (ULONG_PTR)StackAllocationBase, "\n"); + ok_long(PAGE_ROUND_DOWN(LastStackAllocation), (ULONG_PTR)StackAllocationBase + 2 * PAGE_SIZE); + + /* And in fact, this is the true condition of the stack overflow */ + ok_ptr(NtCurrentTeb()->NtTib.StackLimit, (PVOID)((ULONG_PTR)StackAllocationBase + PAGE_SIZE)); + + trace("Stack limit %p, stack base %p.\n", NtCurrentTeb()->NtTib.StackLimit, NtCurrentTeb()->NtTib.StackBase); + + /* Of course, accessing above the stack limit is OK. */ + _SEH2_TRY + { + volatile CHAR* Pointer = (PVOID)((ULONG_PTR)NtCurrentTeb()->NtTib.StackLimit + PAGE_SIZE / 2); + CHAR Value = *Pointer; + (void)Value; + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_SUCCESS); + + /* But once stack is starved, it's starved. */ + _SEH2_TRY + { + volatile CHAR* Pointer = (PVOID)((ULONG_PTR)NtCurrentTeb()->NtTib.StackLimit - PAGE_SIZE / 2); + CHAR Value = *Pointer; + (void)Value; + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + trace("Exception after %d iteration.\n", iteration); + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); +} Propchange: trunk/rostests/apitests/ntdll/StackOverflow.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/apitests/ntdll/StackOverflow.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/ntdll/StackOverflow.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Mon Feb 16 21:15:55 2015 @@ -31,6 +31,7 @@ extern void func_RtlGetLongestNtPathLength(void); extern void func_RtlInitializeBitMap(void); extern void func_RtlMemoryStream(void); +extern void func_StackOverflow(void); extern void func_TimerResolution(void); const struct test winetest_testlist[] = @@ -63,6 +64,7 @@ { "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength }, { "RtlInitializeBitMap", func_RtlInitializeBitMap }, { "RtlMemoryStream", func_RtlMemoryStream }, + { "StackOverflow", func_StackOverflow }, { "TimerResolution", func_TimerResolution }, { 0, 0 }

1 0

[jgardou] 66325: [NTDLL_APITEST] - Add tests showing how NtAllocateVirtualMemory and NtQueryVirtualMemory work together
by jgardou＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: jgardou Date: Mon Feb 16 21:15:27 2015 New Revision: 66325 URL: http://svn.reactos.org/svn/reactos?rev=66325&view=rev Log: [NTDLL_APITEST] - Add tests showing how NtAllocateVirtualMemory and NtQueryVirtualMemory work together Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtAllocate… ============================================================================== --- trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] Mon Feb 16 21:15:27 2015 @@ -367,6 +367,7 @@ NTSTATUS Status; PVOID BaseAddress; SIZE_T Size; + MEMORY_BASIC_INFORMATION MemoryBasicInfo; /* Reserve a full 64k region */ BaseAddress = UlongToPtr(0x50000000); @@ -486,6 +487,42 @@ } _SEH2_END; ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); + + /* Commit a page at the end of the first region */ + BaseAddress = UlongToPtr(0x5000F000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_ptr(BaseAddress, UlongToPtr(0x5000F000)); + + /* See where is the base of this newly committed area + * (choose a base address in the middle of it) */ + Status = NtQueryVirtualMemory(NtCurrentProcess(), + UlongToPtr(0x5000F700), + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + /* The base address is the beginning of the committed area */ + ok_ptr(MemoryBasicInfo.BaseAddress, UlongToPtr(0x5000F000)); + /* The allocation base address is the beginning of the whole region */ + ok_ptr(MemoryBasicInfo.AllocationBase, UlongToPtr(0x50000000)); + /* This is the protection of the memory when it was reserved. */ + ok_long(MemoryBasicInfo.AllocationProtect, PAGE_NOACCESS); + /* This is the size of the committed region. (ie, smallest chunk size) */ + ok_long(MemoryBasicInfo.RegionSize, 0x1000); + /* This is the state of the queried address */ + ok_long(MemoryBasicInfo.State, MEM_COMMIT); + /* This is the protection of the queried address */ + ok_long(MemoryBasicInfo.Protect, PAGE_READWRITE); + /* NtAllocateVirtualMemory makes it MEM_PRIVATE */ + ok_long(MemoryBasicInfo.Type, MEM_PRIVATE); /* Try to free the whole region at once */ BaseAddress = UlongToPtr(0x50000000);

1 0

[jgardou] 66324: [KERNEL32] - Fix mixed arguments. CORE-9201 #resolve CORE-9124 #comment Please retest
by jgardou＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: jgardou Date: Mon Feb 16 21:13:36 2015 New Revision: 66324 URL: http://svn.reactos.org/svn/reactos?rev=66324&view=rev Log: [KERNEL32] - Fix mixed arguments. CORE-9201 #resolve CORE-9124 #comment Please retest Modified: trunk/reactos/dll/win32/kernel32/client/utils.c Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Mon Feb 16 21:13:36 2015 @@ -351,8 +351,8 @@ NTSTATUS WINAPI BaseCreateStack(HANDLE hProcess, + SIZE_T StackCommit, SIZE_T StackReserve, - SIZE_T StackCommit, PINITIAL_TEB InitialTeb) { NTSTATUS Status;

1 0

[jgardou] 66323: [KERNEL32] Revert r64525 - Always allocate a guard page at the bottom of the stack.
by jgardou＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: jgardou Date: Mon Feb 16 21:12:51 2015 New Revision: 66323 URL: http://svn.reactos.org/svn/reactos?rev=66323&view=rev Log: [KERNEL32] Revert r64525 - Always allocate a guard page at the bottom of the stack. Modified: trunk/reactos/dll/win32/kernel32/client/utils.c Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Mon Feb 16 21:12:51 2015 @@ -358,6 +358,7 @@ NTSTATUS Status; PIMAGE_NT_HEADERS Headers; ULONG_PTR Stack; + BOOLEAN UseGuard; ULONG PageSize, Dummy, AllocationGranularity; SIZE_T StackReserveHeader, StackCommitHeader, GuardPageSize, GuaranteedStackCommit; DPRINT("BaseCreateStack (hProcess: %p, Max: %lx, Current: %lx)\n", @@ -425,6 +426,18 @@ /* Update the Stack Position */ Stack += StackReserve - StackCommit; + /* Check if we will need a guard page */ + if (StackReserve > StackCommit) + { + Stack -= PageSize; + StackCommit += PageSize; + UseGuard = TRUE; + } + else + { + UseGuard = FALSE; + } + /* Allocate memory for the stack */ Status = NtAllocateVirtualMemory(hProcess, (PVOID*)&Stack, @@ -444,21 +457,25 @@ InitialTeb->StackLimit = (PVOID)Stack; /* Create a guard page */ - GuardPageSize = PageSize; - Status = NtProtectVirtualMemory(hProcess, - (PVOID*)&Stack, - &GuardPageSize, - PAGE_GUARD | PAGE_READWRITE, - &Dummy); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failure to set guard page\n"); - return Status; - } - - /* Update the Stack Limit keeping in mind the Guard Page */ - InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit + - GuardPageSize); + if (UseGuard) + { + /* Set the guard page */ + GuardPageSize = PAGE_SIZE; + Status = NtProtectVirtualMemory(hProcess, + (PVOID*)&Stack, + &GuardPageSize, + PAGE_GUARD | PAGE_READWRITE, + &Dummy); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to set guard page\n"); + return Status; + } + + /* Update the Stack Limit keeping in mind the Guard Page */ + InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit + + GuardPageSize); + } /* We are done! */ return STATUS_SUCCESS;

1 0

[dreimer] 66322: ... ANSI vs UTF-8... sorry
by dreimer＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: dreimer Date: Mon Feb 16 20:44:12 2015 New Revision: 66322 URL: http://svn.reactos.org/svn/reactos?rev=66322&view=rev Log: ... ANSI vs UTF-8... sorry Modified: trunk/reactos/base/system/services/lang/de-DE.rc Modified: trunk/reactos/base/system/services/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… ============================================================================== --- trunk/reactos/base/system/services/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/services/lang/de-DE.rc [iso-8859-1] Mon Feb 16 20:44:12 2015 @@ -6,7 +6,7 @@ IDS_SERVICE_STOP "beenden" IDS_SERVICE_PAUSE "anhalten" IDS_SERVICE_RESUME "fortsetzen" - IDS_SERVICE_RUNNING "Ausgeführt" + IDS_SERVICE_RUNNING "AusgefÃ¼hrt" IDS_SERVICE_STOPPED "Beendet" IDS_SERVICE_PAUSED "Angehalten" END

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