Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[jgardou] 66337: [WS2_32] - Do not free resources at process termination. - Free the provider catalog after the handle table, since the latter references the former.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Feb 17 15:08:54 2015 New Revision: 66337 URL: http://svn.reactos.org/svn/reactos?rev=66337&view=rev Log: [WS2_32] - Do not free resources at process termination. - Free the provider catalog after the handle table, since the latter references the former. Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Tue Feb 17 15:08:54 2015 @@ -887,9 +887,11 @@ case DLL_PROCESS_DETACH: { - DestroyCatalog(); - - FreeProviderHandleTable(); + if (!lpReserved) + { + FreeProviderHandleTable(); + DestroyCatalog(); + } } break;

9 years, 7 months

[jgardou] 66336: [RTL/DPH] - Do not merge memory blocks if they don't belong to the same VM "region" (ie not allocated from the same NtAllocateVirtualMemory call) Fixes failures of ZwProtectVirtual...

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Feb 17 15:08:47 2015 New Revision: 66336 URL: http://svn.reactos.org/svn/reactos?rev=66336&view=rev Log: [RTL/DPH] - Do not merge memory blocks if they don't belong to the same VM "region" (ie not allocated from the same NtAllocateVirtualMemory call) Fixes failures of ZwProtectVirtualMemory calls. Bugs see DPH rollin', they hatin' Modified: trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=663… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Tue Feb 17 15:08:47 2015 @@ -691,12 +691,35 @@ /* Check the previous node and merge if possible */ if (PrevNode->pVirtualBlock + PrevNode->nVirtualBlockSize == Node->pVirtualBlock) { - /* They are adjacent - merge! */ - PrevNode->nVirtualBlockSize += Node->nVirtualBlockSize; - RtlpDphReturnNodeToUnusedList(DphRoot, Node); - DphRoot->nAvailableAllocations--; - - Node = PrevNode; + /* Check they actually belong to the same virtual memory block */ + NTSTATUS Status; + MEMORY_BASIC_INFORMATION MemoryBasicInfo; + + Status = ZwQueryVirtualMemory( + ZwCurrentProcess(), + Node->pVirtualBlock, + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + + /* There is no way this can fail, we committed this memory! */ + ASSERT(NT_SUCCESS(Status)); + + if ((PUCHAR)MemoryBasicInfo.AllocationBase <= PrevNode->pVirtualBlock) + { + /* They are adjacent, and from the same VM region. - merge! */ + PrevNode->nVirtualBlockSize += Node->nVirtualBlockSize; + RtlpDphReturnNodeToUnusedList(DphRoot, Node); + DphRoot->nAvailableAllocations--; + + Node = PrevNode; + } + else + { + /* Insert after PrevNode */ + InsertTailList(&PrevNode->AvailableEntry, &Node->AvailableEntry); + } } else { @@ -711,13 +734,31 @@ /* Node is not at the tail of the list, check if it's adjacent */ if (Node->pVirtualBlock + Node->nVirtualBlockSize == NextNode->pVirtualBlock) { - /* They are adjacent - merge! */ - Node->nVirtualBlockSize += NextNode->nVirtualBlockSize; - - /* Remove next entry from the list and put it into unused entries list */ - RemoveEntryList(&NextNode->AvailableEntry); - RtlpDphReturnNodeToUnusedList(DphRoot, NextNode); - DphRoot->nAvailableAllocations--; + /* Check they actually belong to the same virtual memory block */ + NTSTATUS Status; + MEMORY_BASIC_INFORMATION MemoryBasicInfo; + + Status = ZwQueryVirtualMemory( + ZwCurrentProcess(), + NextNode->pVirtualBlock, + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + + /* There is no way this can fail, we committed this memory! */ + ASSERT(NT_SUCCESS(Status)); + + if ((PUCHAR)MemoryBasicInfo.AllocationBase <= Node->pVirtualBlock) + { + /* They are adjacent - merge! */ + Node->nVirtualBlockSize += NextNode->nVirtualBlockSize; + + /* Remove next entry from the list and put it into unused entries list */ + RemoveEntryList(&NextNode->AvailableEntry); + RtlpDphReturnNodeToUnusedList(DphRoot, NextNode); + DphRoot->nAvailableAllocations--; + } } } }

9 years, 7 months

[tfaber] 66335: [WMIUTILS] - Import from Wine 1.7.27 (or your choice of any later version) CORE-9212 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Feb 17 15:07:56 2015 New Revision: 66335 URL: http://svn.reactos.org/svn/reactos?rev=66335&view=rev Log: [WMIUTILS] - Import from Wine 1.7.27 (or your choice of any later version) CORE-9212 #resolve Added: trunk/reactos/dll/win32/wmiutils/ (with props) trunk/reactos/dll/win32/wmiutils/CMakeLists.txt (with props) trunk/reactos/dll/win32/wmiutils/main.c (with props) trunk/reactos/dll/win32/wmiutils/path.c (with props) trunk/reactos/dll/win32/wmiutils/statuscode.c (with props) trunk/reactos/dll/win32/wmiutils/wmiutils.rc (with props) trunk/reactos/dll/win32/wmiutils/wmiutils.spec (with props) trunk/reactos/dll/win32/wmiutils/wmiutils_classes.idl (with props) trunk/reactos/dll/win32/wmiutils/wmiutils_classes.rgs (with props) trunk/reactos/dll/win32/wmiutils/wmiutils_private.h (with props) trunk/reactos/include/psdk/wmiutils.idl trunk/rostests/winetests/wmiutils/ (with props) trunk/rostests/winetests/wmiutils/CMakeLists.txt (with props) trunk/rostests/winetests/wmiutils/path.c (with props) trunk/rostests/winetests/wmiutils/testlist.c (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/include/psdk/CMakeLists.txt trunk/reactos/media/doc/README.WINE trunk/reactos/media/inf/syssetup.inf trunk/rostests/winetests/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… Added: trunk/reactos/dll/win32/wmiutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/CMakeLi… Added: trunk/reactos/dll/win32/wmiutils/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/main.c?… Added: trunk/reactos/dll/win32/wmiutils/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/path.c?… Added: trunk/reactos/dll/win32/wmiutils/statuscode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/statusc… Added: trunk/reactos/dll/win32/wmiutils/wmiutils.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/wmiutil… Added: trunk/reactos/dll/win32/wmiutils/wmiutils.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/wmiutil… Added: trunk/reactos/dll/win32/wmiutils/wmiutils_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/wmiutil… Added: trunk/reactos/dll/win32/wmiutils/wmiutils_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/wmiutil… Added: trunk/reactos/dll/win32/wmiutils/wmiutils_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/wmiutil… Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… Added: trunk/reactos/include/psdk/wmiutils.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wmiutils.idl?… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… Added: trunk/rostests/winetests/wmiutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wmiutils/CMakeL… Added: trunk/rostests/winetests/wmiutils/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wmiutils/path.c… Added: trunk/rostests/winetests/wmiutils/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wmiutils/testli…

9 years, 7 months

[jgardou] 66334: [NTOSKRNL/MM] - MiIsEntireRangeCommitted: Ensure the PTE we are checking is really faulted in. - Prefer MiPteToPde and MiPdeToPte (which should really be called MiFirstPteInPde) in...

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Feb 17 14:19:05 2015 New Revision: 66334 URL: http://svn.reactos.org/svn/reactos?rev=66334&view=rev Log: [NTOSKRNL/MM] - MiIsEntireRangeCommitted: Ensure the PTE we are checking is really faulted in. - Prefer MiPteToPde and MiPdeToPte (which should really be called MiFirstPteInPde) instead of MiAddressToPte and MiPteToAddress Fixes weird failed ASSERT in page fault handler when using DPH. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Feb 17 14:19:05 2015 @@ -1994,14 +1994,13 @@ if (OnBoundary) { /* Is this PDE demand zero? */ - PointerPde = MiAddressToPte(PointerPte); + PointerPde = MiPteToPde(PointerPte); if (PointerPde->u.Long != 0) { /* It isn't -- is it valid? */ if (PointerPde->u.Hard.Valid == 0) { /* Nope, fault it in */ - PointerPte = MiPteToAddress(PointerPde); MiMakeSystemAddressValid(PointerPte, Process); } } @@ -2009,13 +2008,13 @@ { /* The PTE was already valid, so move to the next one */ PointerPde++; - PointerPte = MiPteToAddress(PointerPde); + PointerPte = MiPdeToPte(PointerPde); /* Is the entire VAD committed? If not, fail */ if (!Vad->u.VadFlags.MemCommit) return FALSE; - /* Everything is committed so far past the range, return true */ - if (PointerPte > LastPte) return TRUE; + /* New loop iteration with our new, on-boundary PTE. */ + continue; } }

9 years, 7 months

[tfaber] 66333: [EXPLORER] - Load default application icon and display it in the taskbar for windows that have no icon. Fixes "GetIconInfo failed" debug prints all over the place (and looks prettie...

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Feb 17 12:59:22 2015 New Revision: 66333 URL: http://svn.reactos.org/svn/reactos?rev=66333&view=rev Log: [EXPLORER] - Load default application icon and display it in the taskbar for windows that have no icon. Fixes "GetIconInfo failed" debug prints all over the place (and looks prettier). CORE-9211 #resolve Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Tue Feb 17 12:59:22 2015 @@ -419,6 +419,8 @@ } icon = GetWndIcon(TaskItem->hWnd); + if (!icon) + icon = static_cast<HICON>(LoadImage(NULL, MAKEINTRESOURCE(OIC_SAMPLE), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE)); TaskItem->IconIndex = ImageList_ReplaceIcon(m_ImageList, TaskItem->IconIndex, icon); tbbi.iImage = TaskItem->IconIndex; @@ -562,6 +564,8 @@ } icon = GetWndIcon(TaskItem->hWnd); + if (!icon) + icon = static_cast<HICON>(LoadImage(NULL, MAKEINTRESOURCE(OIC_SAMPLE), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE)); TaskItem->IconIndex = ImageList_ReplaceIcon(m_ImageList, -1, icon); tbBtn.iBitmap = TaskItem->IconIndex;

9 years, 7 months

[jimtabor] 66332: [NtUser] - Fix wine msg test_SetFocus tests. Use send message for WM_WINDOWPOSCHANGING. If nothing has been drawn and the no position changed bits set, set no Z order and no redra...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Feb 17 08:25:43 2015 New Revision: 66332 URL: http://svn.reactos.org/svn/reactos?rev=66332&view=rev Log: [NtUser] - Fix wine msg test_SetFocus tests. Use send message for WM_WINDOWPOSCHANGING. If nothing has been drawn and the no position changed bits set, set no Z order and no redraw. See CORE-7447. Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Tue Feb 17 08:25:43 2015 @@ -17,9 +17,9 @@ #define SWP_EX_PAINTSELF 0x0002 #define SWP_AGG_NOGEOMETRYCHANGE \ - (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE) + (SWP_NOSIZE | SWP_NOCLIENTSIZE | SWP_NOZORDER) #define SWP_AGG_NOPOSCHANGE \ - (SWP_AGG_NOGEOMETRYCHANGE | SWP_NOZORDER) + (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) #define SWP_AGG_STATUSFLAGS \ (SWP_AGG_NOPOSCHANGE | SWP_FRAMECHANGED | SWP_HIDEWINDOW | SWP_SHOWWINDOW) @@ -1287,7 +1287,7 @@ if (!(WinPos->flags & SWP_NOSENDCHANGING)) { TRACE("Sending WM_WINDOWPOSCHANGING to hwnd %p.\n", Window->head.h); - co_IntSendMessageNoWait(Window->head.h, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos); + co_IntSendMessage(Window->head.h, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos); } /* Calculate new position and size */ @@ -1604,7 +1604,9 @@ WinPos->hwndInsertAfter = HWND_TOPMOST; if (IntGetWindow(WinPos->hwnd, GW_HWNDFIRST) == WinPos->hwnd) + { WinPos->flags |= SWP_NOZORDER; + } } else if (WinPos->hwndInsertAfter == HWND_BOTTOM) { @@ -2069,6 +2071,16 @@ } } + // Fix wine msg test_SetFocus, prevents sending WM_WINDOWPOSCHANGED. + if ( VisBefore == NULL && + VisBeforeJustClient == NULL && + !(Window->ExStyle & WS_EX_TOPMOST) && + (WinPos.flags & SWP_AGG_STATUSFLAGS) == (SWP_AGG_NOPOSCHANGE & ~SWP_NOZORDER)) + { + TRACE("No drawing, set no Z order and no redraw!\n"); + WinPos.flags |= SWP_NOZORDER|SWP_NOREDRAW; + } + /* And last, send the WM_WINDOWPOSCHANGED message */ TRACE("\tstatus flags = %04x\n", WinPos.flags & SWP_AGG_STATUSFLAGS); @@ -2082,6 +2094,7 @@ WinPos.y = NewWindowRect.top; WinPos.cx = NewWindowRect.right - NewWindowRect.left; WinPos.cy = NewWindowRect.bottom - NewWindowRect.top; + TRACE("WM_WINDOWPOSCHANGED hwnd %p Flags %04x\n",WinPos.hwnd,(WinPos.flags&SWP_AGG_STATUSFLAGS)); co_IntSendMessageNoWait(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos); }

9 years, 7 months

[tfaber] 66331: [WIN32K:NTUSER] - Remove unneeded casts, fix format specifiers, and clarify some logic in co_MsqSendMessage

by tfaber＠svn.reactos.org

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) {

9 years, 7 months

[jimtabor] 66330: [User32] - Add missing wParam for hooks. See CORE-7447.

by jimtabor＠svn.reactos.org

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:

9 years, 7 months

[jgardou] 66329: [RSHELL] - Fix use after free (and spanish style issues ; -) )

by jgardou＠svn.reactos.org

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; -} +}

9 years, 7 months

[jgardou] 66328: [EXPLORER] - Prperly initialize members in CStartMenu constructor.

by jgardou＠svn.reactos.org

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()

9 years, 7 months

← Newer
1
...
15
16
17
18
19
20
21
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015