Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 19:55:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some assertions now that they are enabled (#3524)

Browse source 
Fix some assertions, hack out some others (they need more ATL work).
CORE-17505
This commit is contained in:
Mark Jansen 2021-03-10 23:43:06 +01:00 • committed by GitHub
parent df35c8d05e
commit 1952e5b795
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/shell32/shellmenu/CMenuToolbars.cpp
View file

@ -398,7 +398,7 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags)
rc.bottom = 1;
}
SubclassWindow(CToolbar::Create(hwndParent, tbStyles, tbExStyles));
CToolbar::Create(hwndParent, tbStyles, tbExStyles);
SetWindowTheme(m_hWnd, L"", L"");
@ -1163,7 +1163,8 @@ HRESULT CMenuStaticToolbar::SetMenu(
m_hwndMenu = hwnd;
m_dwMenuFlags = dwFlags;
ClearToolbar();
if (IsWindow())
ClearToolbar();
return S_OK;
}
@ -1408,7 +1409,8 @@ HRESULT CMenuSFToolbar::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFold
m_hKey = hKey;
m_dwMenuFlags = dwFlags;
ClearToolbar();
if (IsWindow())
ClearToolbar();
return S_OK;
}