Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [BROWSEUI][SHELL32] Treat OnWinEvent's result parameter as optional. CORE-14443

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0aed0fd167863d1674e73… commit 0aed0fd167863d1674e73a7fdb22fd1fb7a319f0 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Mar 8 10:28:33 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Mar 8 12:21:24 2018 +0100 [BROWSEUI][SHELL32] Treat OnWinEvent's result parameter as optional. CORE-14443 Windows's explorer can call it with NULL. --- dll/win32/browseui/addressband.cpp | 3 ++- dll/win32/browseui/addresseditbox.cpp | 3 ++- dll/win32/browseui/basebarsite.cpp | 5 ++++- dll/win32/browseui/explorerband.cpp | 20 ++++++++++++++------ dll/win32/browseui/shellbars/CBandSite.cpp | 3 ++- dll/win32/browseui/shellbars/CISFBand.cpp | 16 ++++++++++------ dll/win32/shell32/shellmenu/CMenuBand.cpp | 3 ++- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 10 ++++++++-- 8 files changed, 44 insertions(+), 19 deletions(-) diff --git a/dll/win32/browseui/addressband.cpp b/dll/win32/browseui/addressband.cpp index 55164a9b1c..c319dbd628 100644 --- a/dll/win32/browseui/addressband.cpp +++ b/dll/win32/browseui/addressband.cpp @@ -290,7 +290,8 @@ HRESULT STDMETHODCALLTYPE CAddressBand::OnWinEvent( HRESULT hResult; RECT rect; - *theResult = 0; + if (theResult) + *theResult = 0; switch (uMsg) { diff --git a/dll/win32/browseui/addresseditbox.cpp b/dll/win32/browseui/addresseditbox.cpp index 091272dcf5..f5748ec6c8 100644 --- a/dll/win32/browseui/addresseditbox.cpp +++ b/dll/win32/browseui/addresseditbox.cpp @@ -256,7 +256,8 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::OnWinEvent( { LPNMHDR hdr; - *theResult = 0; + if (theResult) + *theResult = 0; switch (uMsg) { diff --git a/dll/win32/browseui/basebarsite.cpp b/dll/win32/browseui/basebarsite.cpp index 5a53387c86..8d2675d996 100644 --- a/dll/win32/browseui/basebarsite.cpp +++ b/dll/win32/browseui/basebarsite.cpp @@ -322,6 +322,7 @@ HRESULT STDMETHODCALLTYPE CBaseBarSite::OnWinEvent( NMHDR *notifyHeader; // RECT newBounds; HRESULT hResult; + LRESULT result; hResult = S_OK; if (uMsg == WM_NOTIFY) @@ -342,7 +343,9 @@ HRESULT STDMETHODCALLTYPE CBaseBarSite::OnWinEvent( #endif break; case NM_CUSTOMDRAW: - *theResult = OnCustomDraw((LPNMCUSTOMDRAW)lParam); + result = OnCustomDraw((LPNMCUSTOMDRAW)lParam); + if (theResult) + *theResult = result; return S_OK; } } diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/browseui/explorerband.cpp index 2b398bd2f1..968b173ec3 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/browseui/explorerband.cpp @@ -1265,13 +1265,17 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::GetSizeMax(ULARGE_INTEGER *pcbSize) HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { BOOL bHandled; + LRESULT result; + if (uMsg == WM_NOTIFY) { NMHDR *pNotifyHeader = (NMHDR*)lParam; switch (pNotifyHeader->code) { case TVN_ITEMEXPANDING: - *theResult = OnTreeItemExpanding((LPNMTREEVIEW)lParam); + result = OnTreeItemExpanding((LPNMTREEVIEW)lParam); + if (theResult) + *theResult = result; break; case TVN_SELCHANGED: OnSelectionChanged((LPNMTREEVIEW)lParam); @@ -1281,7 +1285,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM break; case NM_RCLICK: OnContextMenu(WM_CONTEXTMENU, (WPARAM)m_hWnd, GetMessagePos(), bHandled); - *theResult = 1; + if (theResult) + *theResult = 1; break; case TVN_BEGINDRAG: case TVN_BEGINRDRAG: @@ -1295,7 +1300,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM LPCITEMIDLIST pChild; HRESULT hr; - *theResult = 1; + if (theResult) + *theResult = 1; NodeInfo *info = GetNodeInfo(dispInfo->item.hItem); if (!info) return E_FAIL; @@ -1304,7 +1310,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM return E_FAIL; hr = pParent->GetAttributesOf(1, &pChild, &dwAttr); - if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME)) + if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME) && theResult) *theResult = 0; return S_OK; } @@ -1314,7 +1320,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM NodeInfo *info = GetNodeInfo(dispInfo->item.hItem); HRESULT hr; - *theResult = 0; + if (theResult) + *theResult = 0; if (dispInfo->item.pszText) { LPITEMIDLIST pidlNew; @@ -1345,7 +1352,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM ILFree(pidlNewAbs); ILFree(pidlNew); - *theResult = 1; + if (theResult) + *theResult = 1; } return S_OK; } diff --git a/dll/win32/browseui/shellbars/CBandSite.cpp b/dll/win32/browseui/shellbars/CBandSite.cpp index 13f78a2b94..fea22c3987 100644 --- a/dll/win32/browseui/shellbars/CBandSite.cpp +++ b/dll/win32/browseui/shellbars/CBandSite.cpp @@ -708,7 +708,8 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM TRACE("(%p, %p, %u, %p, %p, %p)\n", this, hWnd, uMsg, wParam, lParam, plrResult); - *plrResult = 0; + if (plrResult) + *plrResult = 0; if (m_hwndRebar == NULL) return E_FAIL; diff --git a/dll/win32/browseui/shellbars/CISFBand.cpp b/dll/win32/browseui/shellbars/CISFBand.cpp index 8d538c21ac..722d72b60a 100644 --- a/dll/win32/browseui/shellbars/CISFBand.cpp +++ b/dll/win32/browseui/shellbars/CISFBand.cpp @@ -342,7 +342,8 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent) if (chk) SHInvokeDefaultCommand(m_hWnd, m_pISF, (LPITEMIDLIST)tb.dwData); - *theResult = TRUE; + if (theResult) + *theResult = TRUE; break; } case WM_NOTIFY: @@ -393,18 +394,21 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent) } } DestroyMenu(fmenu); - - *theResult = TRUE; + + if (theResult) + *theResult = TRUE; break; } default: - *theResult = FALSE; + if (theResult) + *theResult = FALSE; } break; } - default: - *theResult = FALSE; + default: + if (theResult) + *theResult = FALSE; } return S_OK; diff --git a/dll/win32/shell32/shellmenu/CMenuBand.cpp b/dll/win32/shell32/shellmenu/CMenuBand.cpp index e09bc007ee..49cb279184 100644 --- a/dll/win32/shell32/shellmenu/CMenuBand.cpp +++ b/dll/win32/shell32/shellmenu/CMenuBand.cpp @@ -723,7 +723,8 @@ HRESULT STDMETHODCALLTYPE CMenuBand::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIS HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - *theResult = 0; + if (theResult) + *theResult = 0; if (uMsg == WM_WININICHANGE && wParam == SPI_SETFLATMENU) { diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index a33070af2c..fd98086e4a 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -49,8 +49,11 @@ LRESULT CMenuToolbarBase::OnWinEventWrap(UINT uMsg, WPARAM wParam, LPARAM lParam HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { NMHDR * hdr; + HRESULT hr; + LRESULT result; - *theResult = 0; + if (theResult) + *theResult = 0; switch (uMsg) { case WM_COMMAND: @@ -75,7 +78,10 @@ HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM return S_OK; case NM_CUSTOMDRAW: - return OnCustomDraw(reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr), theResult); + hr = OnCustomDraw(reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr), &result); + if (theResult) + *theResult = result; + return hr; case TBN_GETINFOTIP: return OnGetInfoTip(reinterpret_cast<LPNMTBGETINFOTIP>(hdr));

6 years, 6 months

02/02: [APPHELP_APITEST] Fix a Clang-Cl warning about a memcmp() call

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84a9284a3f1ddcbd8892b… commit 84a9284a3f1ddcbd8892b556da6955b6fadc8d08 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Feb 13 11:23:25 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Mar 7 20:42:14 2018 +0100 [APPHELP_APITEST] Fix a Clang-Cl warning about a memcmp() call "warning: argument to 'sizeof' in 'memcmp' call is the same pointer type 'SDBQUERYRESULT_VISTA *' (aka 'struct tagSDBQUERYRESULT_VISTA *') as the destination; expected 'SDBQUERYRESULT_VISTA' (aka 'struct tagSDBQUERYRESULT_VISTA') or an explicit length [-Wsizeof-pointer-memaccess]" CORE-14306 --- modules/rostests/apitests/apphelp/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/apphelp/env.c b/modules/rostests/apitests/apphelp/env.c index 2ec1a46faf..74e7d3b5dc 100644 --- a/modules/rostests/apitests/apphelp/env.c +++ b/modules/rostests/apitests/apphelp/env.c @@ -716,7 +716,7 @@ static void Test_Shimdata(SDBQUERYRESULT_VISTA* result, const WCHAR* szLayer) output->dwCustomSDBMap = input->dwCustomSDBMap; output->rgGuidDB[0] = input->rgGuidDB[0]; } - ok(!memcmp(&result2, result, sizeof(result)), "Expected result2 to equal result for %s\n", wine_dbgstr_w(szLayer)); + ok(!memcmp(&result2, result, sizeof(*result)), "Expected result2 to equal result for %s\n", wine_dbgstr_w(szLayer)); RtlFreeHeap(GetProcessHeap(), 0, pData); }

6 years, 6 months

01/02: [APPHELP_APITEST] env.c: Fix a 3rd Windows S2003 special case

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=601871955f030d3eb38ca… commit 601871955f030d3eb38ca1c933b4be6f00c43c63 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Mar 5 00:23:45 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Mar 7 20:42:14 2018 +0100 [APPHELP_APITEST] env.c: Fix a 3rd Windows S2003 special case Test_Shimdata() already has a TODO with 2 special cases. - Special-case "dwLayerCount" too. - Add extra-safety checks. --- modules/rostests/apitests/apphelp/env.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/apphelp/env.c b/modules/rostests/apitests/apphelp/env.c index 39a9ece74d..2ec1a46faf 100644 --- a/modules/rostests/apitests/apphelp/env.c +++ b/modules/rostests/apitests/apphelp/env.c @@ -685,10 +685,34 @@ static void Test_Shimdata(SDBQUERYRESULT_VISTA* result, const WCHAR* szLayer) investigate when we have support for multible db's! */ if (dwSize == sizeof(ShimData_Win2k3)) { - /* Fake it for now, so the memcmp works. */ SDBQUERYRESULT_2k3* input = (SDBQUERYRESULT_2k3*)result; SDBQUERYRESULT_2k3* output = (SDBQUERYRESULT_2k3*)&result2; - ok(output->dwCustomSDBMap == 0, "Expected output->dwCustomSDBMap to be 0, was %u for %s\n", output->dwCustomSDBMap, wine_dbgstr_w(szLayer)); + const GUID rgGuidDB0 = {0x11111111, 0x1111, 0x1111, {0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11}}; + + // Check expected data. + ok(input->dwLayerCount == 1, + "Expected input->dwLayerCount to be 1, was %u for %s\n", + input->dwLayerCount, wine_dbgstr_w(szLayer)); + ok(input->dwCustomSDBMap == 1, + "Expected input->dwCustomSDBMap to be 1, was %u for %s\n", + input->dwCustomSDBMap, wine_dbgstr_w(szLayer)); + ok(IsEqualGUID(&input->rgGuidDB[0], &rgGuidDB0), + "Expected input->rgGuidDB[0] to be %s, was %s for %s\n", + wine_dbgstr_guid(&rgGuidDB0), wine_dbgstr_guid(&input->rgGuidDB[0]), wine_dbgstr_w(szLayer)); + + // Check missing data. + ok(output->dwLayerCount == 0, + "Expected output->dwLayerCount to be 0, was %u for %s\n", + output->dwLayerCount, wine_dbgstr_w(szLayer)); + ok(output->dwCustomSDBMap == 0, + "Expected output->dwCustomSDBMap to be 0, was %u for %s\n", + output->dwCustomSDBMap, wine_dbgstr_w(szLayer)); + ok(IsEqualGUID(&output->rgGuidDB[0], &empty_result.rgGuidDB[0]), + "Expected output->rgGuidDB[0] to be empty, was %s for %s\n", + wine_dbgstr_guid(&output->rgGuidDB[0]), wine_dbgstr_w(szLayer)); + + // Fake it for now, so the memcmp works. + output->dwLayerCount = input->dwLayerCount; output->dwCustomSDBMap = input->dwCustomSDBMap; output->rgGuidDB[0] = input->rgGuidDB[0]; }

6 years, 6 months

01/01: [WINSRV] Don't try to remove messages from the queue without dispatching them. CORE-13734

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3159de5573e3836e31241… commit 3159de5573e3836e31241cc87724f1d3d1f8daf0 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 7 13:03:39 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Mar 7 13:32:38 2018 +0100 [WINSRV] Don't try to remove messages from the queue without dispatching them. CORE-13734 This partially reverts r58615 / 01729482ae. --- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c index c3e14d3099..e371ea484a 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c @@ -229,13 +229,10 @@ GuiConsoleInputThread(PVOID Param) * that the window that we want to destroy doesn't exist yet. * So first empty the message queue. */ - /* while (PeekMessageW(&TempMsg, NULL, 0, 0, PM_REMOVE)) { - TranslateMessage(&TempMsg); DispatchMessageW(&TempMsg); - }*/ - while (PeekMessageW(&TempMsg, NULL, 0, 0, PM_REMOVE)) ; + } if (GuiData->hWindow == NULL) continue;

6 years, 6 months

01/01: [USER32_APITEST] Add a test for PeekMessage without DispatchMessage for WM_PAINT. CORE-13734

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7905efdf357ad830d4abb… commit 7905efdf357ad830d4abba23a428dcd9e6195247 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 7 13:02:52 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Mar 7 13:20:42 2018 +0100 [USER32_APITEST] Add a test for PeekMessage without DispatchMessage for WM_PAINT. CORE-13734 --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + modules/rostests/apitests/user32/RedrawWindow.c | 86 +++++++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + 3 files changed, 89 insertions(+) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 5a0c2d1844..6b1ad32939 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -23,6 +23,7 @@ list(APPEND SOURCE LookupIconIdFromDirectoryEx.c NextDlgItem.c RealGetWindowClass.c + RedrawWindow.c RegisterClassEx.c RegisterHotKey.c ScrollDC.c diff --git a/modules/rostests/apitests/user32/RedrawWindow.c b/modules/rostests/apitests/user32/RedrawWindow.c new file mode 100644 index 0000000000..eb39f9b714 --- /dev/null +++ b/modules/rostests/apitests/user32/RedrawWindow.c @@ -0,0 +1,86 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test for RedrawWindow + * COPYRIGHT: Copyright 2018 Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include "precomp.h" + +static DWORD dwThreadId; +static BOOL got_paint; + +static +LRESULT +CALLBACK +WndProc( + _In_ HWND hWnd, + _In_ UINT message, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + ok(GetCurrentThreadId() == dwThreadId, "Thread 0x%lx instead of 0x%lx\n", GetCurrentThreadId(), dwThreadId); + if (message == WM_PAINT) + { + got_paint = TRUE; + } + return DefWindowProcW(hWnd, message, wParam, lParam); +} + + +START_TEST(RedrawWindow) +{ + HWND hWnd; + MSG msg; + HRGN hRgn; + BOOL ret; + int i; + + SetCursorPos(0,0); + + dwThreadId = GetCurrentThreadId(); + RegisterSimpleClass(WndProc, L"CreateTest"); + + hWnd = CreateWindowExW(0, L"CreateTest", NULL, 0, 10, 10, 20, 20, NULL, NULL, 0, NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + + ShowWindow(hWnd, SW_SHOW); + + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + DispatchMessageA( &msg ); + } + + ok(got_paint == TRUE, "Did not process WM_PAINT message\n"); + got_paint = FALSE; + + hRgn = CreateRectRgn(0, 0, 1, 1); + ok(hRgn != NULL, "CreateRectRgn failed\n"); + ret = RedrawWindow(hWnd, NULL, hRgn, RDW_INTERNALPAINT | RDW_INVALIDATE); + ok(ret == TRUE, "RedrawWindow failed\n"); + + i = 0; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + RECORD_MESSAGE(1, msg.message, POST, 0, 0); + if (msg.message == WM_PAINT) + { + i++; + if (i == 10) + { + ok(got_paint == FALSE, "Received unexpected WM_PAINT message\n"); + } + } + if (msg.message != WM_PAINT || i >= 10) + { + DispatchMessageA( &msg ); + } + } + + ok(i == 10, "Received %d WM_PAINT messages\n", i); + ok(got_paint == TRUE, "Did not process WM_PAINT message\n"); + + TRACE_CACHE(); + + DeleteObject(hRgn); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index 494137a8c0..f5214b8bd2 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -25,6 +25,7 @@ extern void func_LoadImage(void); extern void func_LookupIconIdFromDirectoryEx(void); extern void func_NextDlgItem(void); extern void func_RealGetWindowClass(void); +extern void func_RedrawWindow(void); extern void func_RegisterHotKey(void); extern void func_RegisterClassEx(void); extern void func_ScrollDC(void); @@ -65,6 +66,7 @@ const struct test winetest_testlist[] = { "LookupIconIdFromDirectoryEx", func_LookupIconIdFromDirectoryEx }, { "NextDlgItem", func_NextDlgItem }, { "RealGetWindowClass", func_RealGetWindowClass }, + { "RedrawWindow", func_RedrawWindow }, { "RegisterHotKey", func_RegisterHotKey }, { "RegisterClassEx", func_RegisterClassEx }, { "ScrollDC", func_ScrollDC },

6 years, 6 months

01/01: [NTOS:EX] Worker threads must not exit with a critical region held. CORE-13734

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b8f4f6e244dcd8387556… commit 2b8f4f6e244dcd83875564f72d8320c687a3a240 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 7 11:02:55 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Mar 7 13:18:09 2018 +0100 [NTOS:EX] Worker threads must not exit with a critical region held. CORE-13734 --- ntoskrnl/ex/work.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ex/work.c b/ntoskrnl/ex/work.c index 731f442a85..24d328abc0 100644 --- a/ntoskrnl/ex/work.c +++ b/ntoskrnl/ex/work.c @@ -162,7 +162,7 @@ ProcessLoop: WorkItem->WorkerRoutine(WorkItem->Parameter); /* Make sure APCs are not disabled */ - if (Thread->Tcb.SpecialApcDisable) + if (Thread->Tcb.CombinedApcDisable != 0) { /* We're nice and do it behind your back */ DPRINT1("Warning: Broken Worker Thread: %p %p %p came back " @@ -170,7 +170,8 @@ ProcessLoop: WorkItem->WorkerRoutine, WorkItem->Parameter, WorkItem); - Thread->Tcb.SpecialApcDisable = 0; + ASSERT(Thread->Tcb.CombinedApcDisable == 0); + Thread->Tcb.CombinedApcDisable = 0; } /* Make sure it returned at right IRQL */

6 years, 6 months

01/01: [STOBJECT] Use double click time for the single click timers instead of a fixed timeout.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=282b4397e03cd4f71c55c… commit 282b4397e03cd4f71c55c06b84f2b63b54f6dd38 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Mar 6 20:41:28 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Mar 6 20:43:04 2018 +0100 [STOBJECT] Use double click time for the single click timers instead of a fixed timeout. --- dll/shellext/stobject/hotplug.cpp | 2 +- dll/shellext/stobject/power.cpp | 2 +- dll/shellext/stobject/volume.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index ed0660f49e..1d2a58774f 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -294,7 +294,7 @@ HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray * pSysTray, UINT uMsg, W switch (lParam) { case WM_LBUTTONDOWN: - SetTimer(pSysTray->GetHWnd(), HOTPLUG_TIMER_ID, 500, NULL); + SetTimer(pSysTray->GetHWnd(), HOTPLUG_TIMER_ID, GetDoubleClickTime(), NULL); break; case WM_LBUTTONUP: diff --git a/dll/shellext/stobject/power.cpp b/dll/shellext/stobject/power.cpp index ada4fb1e81..24d5fd888b 100644 --- a/dll/shellext/stobject/power.cpp +++ b/dll/shellext/stobject/power.cpp @@ -388,7 +388,7 @@ HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPA switch (lParam) { case WM_LBUTTONDOWN: - SetTimer(pSysTray->GetHWnd(), POWER_TIMER_ID, 500, NULL); + SetTimer(pSysTray->GetHWnd(), POWER_TIMER_ID, GetDoubleClickTime(), NULL); break; case WM_LBUTTONUP: diff --git a/dll/shellext/stobject/volume.cpp b/dll/shellext/stobject/volume.cpp index ba0f905356..931cd2e2ae 100644 --- a/dll/shellext/stobject/volume.cpp +++ b/dll/shellext/stobject/volume.cpp @@ -300,7 +300,7 @@ HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WP switch (lParam) { case WM_LBUTTONDOWN: - SetTimer(pSysTray->GetHWnd(), VOLUME_TIMER_ID, 500, NULL); + SetTimer(pSysTray->GetHWnd(), VOLUME_TIMER_ID, GetDoubleClickTime(), NULL); break; case WM_LBUTTONUP:

6 years, 6 months

01/01: [SHELL32] Fix a directory handle leak when browsing folders

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da8a41b97bef45f28a1c8… commit da8a41b97bef45f28a1c85c17b99b1bfe22b4008 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Mar 6 20:22:50 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Mar 6 20:30:21 2018 +0100 [SHELL32] Fix a directory handle leak when browsing folders A bit of history: in r71528, I tried to fix our explorer often crashing while browsing directories. It was linked to the fact that a notification result may arrive while the notification structure had already been deleted. The fix for this was actually broken and was leading to a double leak: the notification structure was leaked. But also the handle to the directory that had been browsed! This means that the directory couldn't be modified anymore as a leaked handle to it was still open. Actually, when notifications are cancel, the kernel properly calls the notification routine, but with a specific error code. So the correct fix is to stop handling that notification when we receive this error code. This is the correct fix with no leaks. This commit is a complete r71528 revert with the appropriate fix. CORE-10941 CORE-12843 --- dll/win32/shell32/wine/changenotify.c | 56 ++++++++--------------------------- 1 file changed, 12 insertions(+), 44 deletions(-) diff --git a/dll/win32/shell32/wine/changenotify.c b/dll/win32/shell32/wine/changenotify.c index 0157297e1b..05c7284a87 100644 --- a/dll/win32/shell32/wine/changenotify.c +++ b/dll/win32/shell32/wine/changenotify.c @@ -59,7 +59,6 @@ typedef struct { OVERLAPPED overlapped; /* Overlapped structure */ BYTE *buffer; /* Async buffer to fill */ BYTE *backBuffer; /* Back buffer to swap buffer into */ - struct _NOTIFICATIONLIST * pParent; } SHChangeNotifyEntryInternal, *LPNOTIFYREGISTER; #else typedef SHChangeNotifyEntry *LPNOTIFYREGISTER; @@ -76,9 +75,6 @@ typedef struct _NOTIFICATIONLIST LONG wEventMask; /* subscribed events */ DWORD dwFlags; /* client flags */ ULONG id; -#ifdef __REACTOS__ - volatile LONG wQueuedCount; -#endif } NOTIFICATIONLIST, *LPNOTIFICATIONLIST; #ifdef __REACTOS__ @@ -161,22 +157,9 @@ static const char * NodeName(const NOTIFICATIONLIST *item) static void DeleteNode(LPNOTIFICATIONLIST item) { UINT i; -#ifdef __REACTOS__ - LONG queued; -#endif TRACE("item=%p\n", item); -#ifdef __REACTOS__ - queued = InterlockedCompareExchange(&item->wQueuedCount, 0, 0); - if (queued != 0) - { - ERR("Not freeing, still %d queued events\n", queued); - return; - } - TRACE("Freeing for real! %p (%d) \n", item, item->cidl); -#endif - /* remove item from list */ list_remove( &item->entry ); @@ -253,7 +236,6 @@ SHChangeNotifyRegister( item->cidl = cItems; #ifdef __REACTOS__ item->apidl = SHAlloc(sizeof(SHChangeNotifyEntryInternal) * cItems); - item->wQueuedCount = 0; #else item->apidl = SHAlloc(sizeof(SHChangeNotifyEntry) * cItems); #endif @@ -268,13 +250,11 @@ SHChangeNotifyRegister( item->apidl[i].buffer = SHAlloc(BUFFER_SIZE); item->apidl[i].backBuffer = SHAlloc(BUFFER_SIZE); item->apidl[i].overlapped.hEvent = &item->apidl[i]; - item->apidl[i].pParent = item; if (fSources & SHCNRF_InterruptLevel) { if (_OpenDirectory( &item->apidl[i] )) { - InterlockedIncrement(&item->wQueuedCount); QueueUserAPC( _AddDirectoryProc, m_hThread, (ULONG_PTR) &item->apidl[i] ); } } @@ -738,8 +718,18 @@ _NotificationCompletion(DWORD dwErrorCode, // completion code if (dwErrorCode == ERROR_INVALID_FUNCTION) { WARN("Directory watching not supported\n"); - goto quit; + return; + } + + /* Also, if the notify operation was canceled (like, user moved to another + * directory), then, don't requeue notification + */ + if (dwErrorCode == ERROR_OPERATION_ABORTED) + { + TRACE("Notification aborted\n"); + return; } + #endif /* This likely means overflow, so force whole directory refresh. */ @@ -755,11 +745,7 @@ _NotificationCompletion(DWORD dwErrorCode, // completion code item->pidl, NULL); -#ifdef __REACTOS__ - goto quit; -#else return; -#endif } /* @@ -776,21 +762,12 @@ _NotificationCompletion(DWORD dwErrorCode, // completion code _BeginRead(item); _ProcessNotification(item); - -#ifdef __REACTOS__ -quit: - InterlockedDecrement(&item->pParent->wQueuedCount); - DeleteNode(item->pParent); -#endif } static VOID _BeginRead(LPNOTIFYREGISTER item ) { TRACE("_BeginRead %p \n", item->hDirectory); -#ifdef __REACTOS__ - InterlockedIncrement(&item->pParent->wQueuedCount); -#endif /* This call needs to be reissued after every APC. */ if (!ReadDirectoryChangesW(item->hDirectory, // handle to directory item->buffer, // read results buffer @@ -800,22 +777,13 @@ static VOID _BeginRead(LPNOTIFYREGISTER item ) NULL, // bytes returned &item->overlapped, // overlapped buffer _NotificationCompletion)) // completion routine -#ifdef __REACTOS__ - { -#endif - ERR("ReadDirectoryChangesW failed. (%p, %p, %p, %p, %p, %p) Code: %u \n", + ERR("ReadDirectoryChangesW failed. (%p, %p, %p, %p, %p) Code: %u \n", item, - item->pParent, item->hDirectory, item->buffer, &item->overlapped, _NotificationCompletion, GetLastError()); -#ifdef __REACTOS__ - InterlockedDecrement(&item->pParent->wQueuedCount); - DeleteNode(item->pParent); - } -#endif } DWORD _MapAction(DWORD dwAction, BOOL isDir)

6 years, 6 months

01/01: [LIBTIFF] Print errors to the console instead of in a MessageBox.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad301e6604fac82562294… commit ad301e6604fac825622949e909bc41ac145c826e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Mar 6 03:12:25 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Mar 6 03:12:31 2018 +0100 [LIBTIFF] Print errors to the console instead of in a MessageBox. This is a temporary fix for a timeout in windowscodecs:tiffformat. The test ends up invoking Win32ErrorHandler with: _TIFFVSetField: <IStream object>: Bad value 0 for "ResolutionUnit" tag. Ideally we'd keep the MessageBox version of the error/warning handlers but make them respect the current error mode to avoid blocking tests and other non-interactive applications. --- dll/3rdparty/libtiff/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt index 9c57c2d1b3..6c28292ec1 100644 --- a/dll/3rdparty/libtiff/CMakeLists.txt +++ b/dll/3rdparty/libtiff/CMakeLists.txt @@ -2,7 +2,8 @@ add_definitions( -DWIN32 -DNDEBUG - -DUSE_WIN32_FILEIO) + -DUSE_WIN32_FILEIO + -DTIF_PLATFORM_CONSOLE) include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/libtiff

6 years, 6 months

01/01: [WINDOWSCODECS] Forgot to commit this file. Addendum to ae80686. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a93fbcd97314956cb269… commit 4a93fbcd97314956cb269b898b80c5c0e7a614a8 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Mar 5 23:56:09 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Mar 5 23:56:28 2018 +0100 [WINDOWSCODECS] Forgot to commit this file. Addendum to ae80686. CORE-14434 --- dll/win32/windowscodecs/windowscodecs_wincodec.rgs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/windowscodecs/windowscodecs_wincodec.rgs b/dll/win32/windowscodecs/windowscodecs_wincodec.rgs index adfe66edd1..d47e1b6c92 100644 --- a/dll/win32/windowscodecs/windowscodecs_wincodec.rgs +++ b/dll/win32/windowscodecs/windowscodecs_wincodec.rgs @@ -167,6 +167,10 @@ HKCR { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } } + '{114F5598-0B22-40A0-86A1-C83EA495ADBD}' = s 'WIC GIF Encoder' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } '{C61BFCDF-2E0F-4AAD-A8D7-E06BAFEBCDFE}' = s 'WIC ICO Decoder' { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }

6 years, 6 months

← Newer
1
...
37
38
39
40
41
42
43
44
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 March 2018