Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-27 21:16:34 +00:00
Code Issues Packages Projects Releases 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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
base/shell/explorer/syspager.cpp
View file

@ -1231,7 +1231,10 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue)
TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_TRANSPARENT |
CCS_TOP | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NODIVIDER;
SubclassWindow(CToolbar::Create(hWndParent, styles));
HWND toolbar = CToolbar::Create(hWndParent, styles);
//HACK: We have not created this toolbar properly, so we need to subclass it now!
m_hWnd = NULL;
SubclassWindow(toolbar);
// Force the toolbar tooltips window to always show tooltips even if not foreground
HWND tooltipsWnd = (HWND)SendMessageW(TB_GETTOOLTIPS);

2
base/shell/explorer/taskswnd.cpp
View file

@ -287,6 +287,8 @@ public:
HWND toolbar = CToolbar::Create(hWndParent, styles);
SetDrawTextFlags(DT_NOPREFIX, DT_NOPREFIX);
//HACK: We have not created this toolbar properly, so we need to subclass it now!
m_hWnd = NULL;
return SubclassWindow(toolbar);
}
};

8
base/shell/explorer/traywnd.cpp
View file

@ -200,7 +200,11 @@ public:
VOID Initialize()
{
SubclassWindow(m_hWnd);
//HACK: We have not created this button properly, so we need to subclass it now!
HWND button = m_hWnd;
m_hWnd = NULL;
SubclassWindow(button);
SetWindowTheme(m_hWnd, L"Start", NULL);
m_ImageList = ImageList_LoadImageW(hExplorerInstance,
@ -214,6 +218,8 @@ public:
UpdateSize();
}
// Hack:
// Use DECLARE_WND_SUPERCLASS instead!
HWND Create(HWND hwndParent)
{
WCHAR szStartCaption[32];

1
dll/shellext/netshell/lanstatusui.cpp
View file

@ -915,6 +915,7 @@ CLanStatus::InitializeNetTaskbarNotifications()
Index = 1;
while (TRUE)
{
pNetCon.Release();
hr = pEnumCon->Next(1, &pNetCon, &Count);
if (hr != S_OK)
break;

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

2
dll/win32/shell32/shellmenu/CMenuToolbars.h
View file

@ -135,6 +135,8 @@ private:
MESSAGE_HANDLER(WM_COMMAND, OnWinEventWrap)
MESSAGE_HANDLER(WM_NOTIFY, OnWinEventWrap)
MESSAGE_HANDLER(WM_TIMER, OnPopupTimer)
ALT_MSG_MAP(1)
// No pager specific handlers yet
END_MSG_MAP()
};

2
sdk/include/reactos/rosctrls.h
View file

@ -251,6 +251,8 @@ class CToolbar :
{
public: // Configuration methods
// Hack:
// Use DECLARE_WND_SUPERCLASS instead!
HWND Create(HWND hWndParent, DWORD dwStyles = 0, DWORD dwExStyles = 0)
{
if (!dwStyles)