https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9259ded8ae36d0f7ab117d...
commit 9259ded8ae36d0f7ab117ddca02a2e9a9e79bef9 Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Thu Mar 11 20:26:45 2021 +0900 Commit: GitHub noreply@github.com CommitDate: Thu Mar 11 20:26:45 2021 +0900
[ATL][SHELL32][EXPLORER] Disable ATLASSERT (#3527)
We are not ready for enabling ATLASSERT. Enabling ATL assertions takes time to realize. CORE-17505 - Disable ATLASSERT by undefining _DEBUG. - Revert currently non-fixable codes. --- base/applications/rapps/appview.cpp | 1 + base/shell/explorer/syspager.cpp | 6 ++---- base/shell/explorer/taskswnd.cpp | 3 +-- base/shell/explorer/traywnd.cpp | 6 ++---- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 3 ++- sdk/lib/atl/CMakeLists.txt | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 947df04d0bd..57442cd0e80 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -989,6 +989,7 @@ VOID CAppInfoDisplay::ResizeChildren(int Width, int Height) #if DBG ATLASSERT(dwError == ERROR_SUCCESS); #endif + UNREFERENCED_PARAMETER(dwError);
UpdateWindow(); } diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index d6f729d2d7b..a71d3cf280a 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1231,10 +1231,8 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue) TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_TRANSPARENT | CCS_TOP | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NODIVIDER;
- 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); + // HACK & FIXME: CORE-17505 + SubclassWindow(CToolbar::Create(hWndParent, styles));
// Force the toolbar tooltips window to always show tooltips even if not foreground HWND tooltipsWnd = (HWND)SendMessageW(TB_GETTOOLTIPS); diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 03a2b3f02a0..5d90d36ebc3 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -287,8 +287,7 @@ 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; + // HACK & FIXME: CORE-17505 return SubclassWindow(toolbar); } }; diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 8dad6c4e2a1..5473e190bfa 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -200,10 +200,8 @@ public:
VOID Initialize() { - //HACK: We have not created this button properly, so we need to subclass it now! - HWND button = m_hWnd; - m_hWnd = NULL; - SubclassWindow(button); + // HACK & FIXME: CORE-17505 + SubclassWindow(m_hWnd);
SetWindowTheme(m_hWnd, L"Start", NULL);
diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index b08097e02b0..274b780b970 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -398,7 +398,8 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags) rc.bottom = 1; }
- CToolbar::Create(hwndParent, tbStyles, tbExStyles); + // HACK & FIXME: CORE-17505 + SubclassWindow(CToolbar::Create(hwndParent, tbStyles, tbExStyles));
SetWindowTheme(m_hWnd, L"", L"");
diff --git a/sdk/lib/atl/CMakeLists.txt b/sdk/lib/atl/CMakeLists.txt index 000bd02060d..3a0fb3ce0dc 100644 --- a/sdk/lib/atl/CMakeLists.txt +++ b/sdk/lib/atl/CMakeLists.txt @@ -1,7 +1,7 @@
add_library(atl_classes INTERFACE) if(DBG) - target_compile_definitions(atl_classes INTERFACE _DEBUG) + #target_compile_definitions(atl_classes INTERFACE _DEBUG) # HACK & FIXME: CORE-17505 endif()
target_include_directories(atl_classes INTERFACE
-
Katayama Hirofumi MZ