From 4bbc798067c00fb22c1e91dbb7501e5cf1655a4f Mon Sep 17 00:00:00 2001 From: Ahmed Arif Date: Sat, 28 Mar 2026 14:30:53 +0100 Subject: [PATCH] [CTF][SHDOCVW] fix gcc 15 -Werror=overloaded-virtual and uninitialized member (#8785) Fix overloaded-virtual hiding errors and uninitialized m_dwFlags in ctf and shdocvw for GCC 15 --- base/ctf/cicero/cicuif.h | 1 + base/ctf/msctfime/profile.cpp | 2 +- base/ctf/msutb/msutb.cpp | 1 + dll/win32/shdocvw/mrulist.cpp | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/base/ctf/cicero/cicuif.h b/base/ctf/cicero/cicuif.h index 6ec4f1deeb3..661ebb5b273 100644 --- a/base/ctf/cicero/cicuif.h +++ b/base/ctf/cicero/cicuif.h @@ -570,6 +570,7 @@ public: STDMETHOD_(void, OnSetFocus)(HWND hWnd) { } STDMETHOD_(void, OnKillFocus)(HWND hWnd) { } STDMETHOD_(void, OnNotify)(HWND hWnd, WPARAM wParam, LPARAM lParam) { } + using CUIFObject::OnTimer; STDMETHOD_(void, OnTimer)(WPARAM wParam) { } STDMETHOD_(void, OnSysColorChange)() { } STDMETHOD_(void, OnEndSession)(HWND hWnd, WPARAM wParam, LPARAM lParam) { } diff --git a/base/ctf/msctfime/profile.cpp b/base/ctf/msctfime/profile.cpp index d8a512987e9..fd43f67942d 100644 --- a/base/ctf/msctfime/profile.cpp +++ b/base/ctf/msctfime/profile.cpp @@ -12,7 +12,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctfime); /// @implemented CicProfile::CicProfile() { - m_dwFlags &= 0xFFFFFFF0; + m_dwFlags = 0; m_cRefs = 1; m_pIPProfiles = NULL; m_pActiveLanguageProfileNotifySink = NULL; diff --git a/base/ctf/msutb/msutb.cpp b/base/ctf/msutb/msutb.cpp index c0aff7f7714..5e70312bcc2 100644 --- a/base/ctf/msutb/msutb.cpp +++ b/base/ctf/msutb/msutb.cpp @@ -1283,6 +1283,7 @@ public: CLBarInatItem(DWORD dwThreadId); STDMETHOD(InitMenu)(ITfMenu *pMenu) override; + using CLBarItemButtonBase::OnMenuSelect; STDMETHOD(OnMenuSelect)(INT nCommandId); STDMETHOD(GetIcon)(HICON *phIcon) override; STDMETHOD(GetText)(BSTR *pbstr) override; diff --git a/dll/win32/shdocvw/mrulist.cpp b/dll/win32/shdocvw/mrulist.cpp index 5714e6e8ae5..e064f21d6d2 100644 --- a/dll/win32/shdocvw/mrulist.cpp +++ b/dll/win32/shdocvw/mrulist.cpp @@ -734,6 +734,7 @@ protected: IShellFolder *m_pShellFolder = NULL; // The shell folder BOOL _InitLate(); + using CMruBase::_IsEqual; BOOL _IsEqual(SLOTITEMDATA *pItem, LPCVOID pvData, UINT cbData); DWORD _DeleteValue(LPCWSTR pszValue) override;