https://git.reactos.org/?p=reactos.git;a=commitdiff;h=974a0f03dfe3799d0a7bdf5266dc7659547ece06
commit 974a0f03dfe3799d0a7bdf5266dc7659547ece06 Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Tue Jan 25 11:49:27 2022 +0900 Commit: Katayama Hirofumi MZ <[email protected]> CommitDate: Tue Jan 25 11:49:27 2022 +0900 [SHELL32] Fix assertion failure in CMenuToolbars CORE-17505 --- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 9044e134359..f38509d8cf2 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -403,7 +403,9 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags) } // HACK & FIXME: CORE-17505 - SubclassWindow(CToolbar::Create(hwndParent, tbStyles, tbExStyles)); + HWND toolbar = CToolbar::Create(hwndParent, tbStyles, tbExStyles); + m_hWnd = NULL; + SubclassWindow(toolbar); SetWindowTheme(m_hWnd, L"", L"");
