From 2986b27f7d0972965ca27d2aa9743aa8c548d685 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Tue, 20 Sep 2022 18:25:46 +0200 Subject: [PATCH] [0.4.9][SHELL32] Fix uninitialized variable usage. CORE-15251 (#3986) This fixes log spam about NM_CUSTOMDRAW not being handled, e.g. when interacting with the start-menu or filebrowsers menubar. Less logging implies faster painting here with dbg-builds. fix picked from commit 0.4.15-dev-3229-g 22e58e68aa35a1ba49d280b12f99f7f03f5f8633 The bug was a regression of 0.4.9-dev-151-g 0aed0fd167863d1674e73a7fdb22fd1fb7a319f0 very likely, The symptom with the logging can neither be observed in unpatched releases/0.4.8 nor in releases/0.4.7 --- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index fd98086e4a2..aa3d4513433 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -261,6 +261,10 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu } *theResult = TRUE; return S_OK; + + default: + *theResult = 0L; + break; } return S_OK; }