Call AddMessageFilter in CLogWindow

Fixed order of creation of CMessageLoop instance and LogWindow Call Invalidate() in UI thread in CHistoryTreeControl
zenden2k · Jan 19, 2025 · 8c4da64 · 8c4da64
1 parent b2b08e0
commit 8c4da64
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 27 deletions.
diff --git a/Source/Core/TempFileDeleter.cpp b/Source/Core/TempFileDeleter.cpp
@@ -7,7 +7,9 @@ TempFileDeleter::~TempFileDeleter()
     try {
         cleanup();
     } catch (const std::exception& ex) {
-        LOG(ERROR) << ex.what();
+        LOG(ERROR) << "Failed to clean up temporary files: " << ex.what();
+    } catch (...) {
+        LOG(ERROR) << "Unknown error during cleanup.";
     }
 }
 

diff --git a/Source/Gui/Controls/HistoryTreeControl.cpp b/Source/Gui/Controls/HistoryTreeControl.cpp
@@ -36,6 +36,7 @@
 #include "Func/MyEngineList.h"
 #include "Core/i18n/Translator.h"
 #include "Core/AbstractServerIconCache.h"
+#include "Core/TaskDispatcher.h"
 
 // CHistoryTreeControl
 CHistoryTreeControl::CHistoryTreeControl(std::shared_ptr<INetworkClientFactory> factory)
@@ -56,10 +57,7 @@ CHistoryTreeControl::~CHistoryTreeControl()
     }
 }
 
-void CHistoryTreeControl::CreateDownloader()
-{
-    using namespace std::placeholders;
-
+void CHistoryTreeControl::CreateDownloader() {
     if(!m_FileDownloader) {
         m_FileDownloader = std::make_unique<CFileDownloader>(networkClientFactory_, AppParams::instance()->tempDirectory());
         m_FileDownloader->setOnConfigureNetworkClientCallback([this](auto* nm) { OnConfigureNetworkClient(nm); });
@@ -82,6 +80,11 @@ LRESULT CHistoryTreeControl::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam,B
     return 0;
 }
 
+LRESULT CHistoryTreeControl::OnThumbLoaded(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
+    Invalidate();
+    return 0;
+}
+
 void CHistoryTreeControl::abortLoadingThreads()
 {
     {
@@ -124,6 +127,7 @@ void CHistoryTreeControl::addSubEntry(TreeItem* res, HistoryItem* it, bool autoE
     it2->hi = it;
     it2->thumbnail = nullptr;
     it2->ThumbnailRequested = false;
+    it2->treeItem = item;
 }
 
 DWORD CHistoryTreeControl::OnItemPrePaint(int /*idCtrl*/, LPNMCUSTOMDRAW lpNMCustomDraw)
@@ -709,8 +713,7 @@ void CHistoryTreeControl::DownloadThumb(HistoryTreeItem * it)
         std::string thumbUrl = it->hi->thumbUrl;
         if(thumbUrl.empty()) return ;
         std::string cacheFile = ServiceLocator::instance()->localFileCache()->get(thumbUrl);
-        if(!cacheFile.empty() && IuCoreUtils::FileExists(cacheFile))
-        {
+        if(!cacheFile.empty()) {
             it->thumbnailSource = cacheFile;
             m_thumbLoadingQueueMutex.lock();
             m_thumbLoadingQueue.push_back(it);
@@ -742,9 +745,16 @@ DWORD CHistoryTreeControl::Run()
             // Try downloading it
             DownloadThumb(it);    
         }
-        else
-        {
-            Invalidate();
+        else {
+            /* ServiceLocator::instance()->taskRunner()->runInGuiThread([this, treeItem = it->treeItem] {
+                RECT rc {};
+                if (GetItemRect(FindVisibleItemIndex(treeItem), &rc) != LB_ERR) {
+                    InvalidateRect(&rc);
+                }
+            },
+            true);*/
+
+            PostMessage(WM_APP_MY_THUMBLOADED, 0, 0);
         }
     }
     m_bIsRunning = false;

diff --git a/Source/Gui/Controls/HistoryTreeControl.h b/Source/Gui/Controls/HistoryTreeControl.h
@@ -10,6 +10,8 @@
 #include "Core/FileDownloader.h"
 #include "CustomTreeControl.h"
 
+constexpr auto WM_APP_MY_THUMBLOADED = WM_USER + 2000;
+
 class INetworkClientFactory;
 
 struct HistoryTreeItem
@@ -18,6 +20,8 @@ struct HistoryTreeItem
     HBITMAP thumbnail;
     bool ThumbnailRequested;
     std::string thumbnailSource;
+    TreeItem* treeItem = nullptr;
+
     HistoryTreeItem() :hi(nullptr), thumbnail(nullptr), ThumbnailRequested(false){
 
     }
@@ -47,6 +51,7 @@ class CHistoryTreeControl :
         BEGIN_MSG_MAP(CHistoryTreeControl)
             MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
             MESSAGE_HANDLER(WM_GETDLGCODE, OnGetDlgCode)
+            MESSAGE_HANDLER(WM_APP_MY_THUMBLOADED, OnThumbLoaded)
             CHAIN_MSG_MAP(CCustomTreeControlImpl<CHistoryTreeControl>)
         END_MSG_MAP()
 
@@ -61,6 +66,7 @@ class CHistoryTreeControl :
         //  LRESULT NotifyHandler(int idCtrl, LPNMHDR pnmh, BOOL& bHandled);
         LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
         LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+        LRESULT OnThumbLoaded(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
         void DrawTreeItem(HDC dc, RECT rc, UINT itemState,  TreeItem* item) override;
         DWORD OnItemPrePaint(int /*idCtrl*/, LPNMCUSTOMDRAW /*lpNMCustomDraw*/);
         DWORD OnSubItemPrePaint(int /*idCtrl*/, LPNMCUSTOMDRAW /*lpNMCustomDraw*/);

diff --git a/Source/Gui/Dialogs/AboutDlg.cpp b/Source/Gui/Dialogs/AboutDlg.cpp
@@ -277,17 +277,17 @@ LRESULT CAboutDlg::OnContextMenu(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/
     HWND wnd = reinterpret_cast<HWND>(wParam);
     HWND authorNameLabelWnd = GetDlgItem(IDC_AUTHORNAMELABEL);
 
-	if (wnd == authorNameLabelWnd) {
+    if (wnd == authorNameLabelWnd) {
         RECT rc;
         ::GetWindowRect(authorNameLabelWnd, &rc);
-        POINT menuOrigin{ rc.left,rc.bottom };
-		
+        POINT menuOrigin { rc.left, rc.bottom };
+
         CMenu contextMenu;
         contextMenu.CreatePopupMenu();
         contextMenu.AppendMenu(MF_STRING, ID_COPYAUTHOREMAIL, TR("Copy e-mail"));
         //contextMenu.SetMenuDefaultItem(ID_COPYAUTHOREMAIL, FALSE);
         contextMenu.TrackPopupMenu(TPM_LEFTALIGN | TPM_LEFTBUTTON, menuOrigin.x, menuOrigin.y, m_hWnd);
-	}
+    }
 
     return 0;
 }

diff --git a/Source/Gui/Dialogs/LogWindow.cpp b/Source/Gui/Dialogs/LogWindow.cpp
@@ -49,9 +49,20 @@ LRESULT CLogWindow::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
     DlgResize_Init();
     MsgList.SubclassWindow(GetDlgItem(IDC_MSGLIST));
 
+    CMessageLoop* pLoop = _Module.GetMessageLoop();
+	ATLASSERT(pLoop != NULL);
+	pLoop->AddMessageFilter(this);
+
     return 1;  // Let the system set the focus
 } 
 
+LRESULT CLogWindow::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
+    CMessageLoop* pLoop = _Module.GetMessageLoop();
+    ATLASSERT(pLoop != NULL);
+    pLoop->RemoveMessageFilter(this);
+    return 0;
+}
+
 BOOL CLogWindow::PreTranslateMessage(MSG* pMsg)
 {
     return CWindow::IsDialogMessage(pMsg);
@@ -68,19 +79,20 @@ void CLogWindow::WriteLogImpl(const DefaultLogger::LogEntry& entry)
     auto* settings = ServiceLocator::instance()->basicSettings();
     MsgList.AddString(entry.MsgType, entry.Sender.c_str(), entry.Msg.c_str(), entry.Info.c_str(), entry.Time.c_str());
     if (entry.MsgType == ILogger::logError && settings->AutoShowLog) {
-        Show();
+        Show(false);
     }
 }
 
-void CLogWindow::Show()
+void CLogWindow::Show(bool setActive)
 {
     if (!IsWindowVisible()) {
         ShowWindow(SW_SHOW);
+        setActive = true;
+    }
+    if (setActive) {
+        SetForegroundWindow(m_hWnd);
+        ::SetActiveWindow(m_hWnd);
     }
-    SetForegroundWindow(m_hWnd);
-    ::SetActiveWindow(m_hWnd);
-    //BringWindowToTop();
-    //SetWindowPos(HWND_TOPMOST, 0,0,0,0, SWP_NOSIZE | SWP_NOMOVE);
 }
 
 LRESULT CLogWindow::OnContextMenu(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/)

diff --git a/Source/Gui/Dialogs/LogWindow.h b/Source/Gui/Dialogs/LogWindow.h
@@ -59,6 +59,7 @@ class CLogWindow : public CDialogImpl <CLogWindow>,
 
         BEGIN_MSG_MAP(CLogWindow)
             MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
+            MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
             COMMAND_HANDLER(IDCANCEL, BN_CLICKED, OnClickedCancel)
             COMMAND_ID_HANDLER(IDC_COPYTEXTTOCLIPBOARD, OnCopyToClipboard)
             MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu)
@@ -81,10 +82,11 @@ class CLogWindow : public CDialogImpl <CLogWindow>,
         //  LRESULT CommandHandler(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         //  LRESULT NotifyHandler(int idCtrl, LPNMHDR pnmh, BOOL& bHandled);
         LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+        LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
         LRESULT OnWmWriteLog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
         LRESULT OnClickedCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         CLogListBox MsgList;
-        void Show();
+        void Show(bool setActive = true);
         LRESULT OnContextMenu(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL & /*bHandled*/);
         LRESULT OnClearList(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL & /*bHandled*/);
         LRESULT OnCopyToClipboard(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL & /*bHandled*/);

diff --git a/Source/Image Uploader.cpp b/Source/Image Uploader.cpp
@@ -58,6 +58,7 @@
 CAppModule _Module;
 
 class Application {
+    CMessageLoop theLoop_;
     CLogWindow logWindow_;
     WtlGuiSettings settings_;
     CLang lang_;
@@ -78,6 +79,7 @@ class Application {
     std::shared_ptr<NetworkDebugger> networkDebugger_;
     MediaFoundationInitializer mediaFoundationInitializer_;
     CString commonTempFolder_, tempFolder_;
+
 public:
     Application() {
         srand(static_cast<unsigned>(time(nullptr)));
@@ -89,6 +91,7 @@ class Application {
         CScriptUploadEngine::DestroyScriptEngine();
         //ServiceLocator::instance()->setUploadManager(nullptr);
         logWindow_.DestroyWindow();
+        _Module.RemoveMessageLoop();
         // Remove temporary files
         IuCommonFunctions::ClearTempFolder(tempFolder_);
         std::vector<CString> folders;
@@ -128,6 +131,8 @@ class Application {
         google::AddLogSink(myLogSink_.get());
         serviceLocator->setSettings(&settings_);
         serviceLocator->setNetworkClientFactory(std::make_shared<NetworkClientFactory>());
+
+        _Module.AddMessageLoop(&theLoop_);
         logWindow_.Create(nullptr);
         logWindow_.setLogger(logger_.get());
 
@@ -244,9 +249,6 @@ class Application {
 
         GdiPlusInitializer gdiPlusInitializer;
         initServices();
-
-        CMessageLoop theLoop;
-        _Module.AddMessageLoop(&theLoop);
 
         CWizardDlg  dlgMain(logger_, engineList_.get(), uploadEngineManager_.get(), uploadManager_.get(), scriptsManager_.get(), &settings_);
         auto* serviceLocator = ServiceLocator::instance();
@@ -368,11 +370,10 @@ class Application {
             dlgMain.ShowWindow(nCmdShow);
         }
 
-        int nRet = theLoop.Run();
+        int nRet = theLoop_.Run();
         if (dlgMain.m_hWnd) {
             dlgMain.DestroyWindow();
         }
-        _Module.RemoveMessageLoop();
 
         return nRet;
     }
@@ -418,7 +419,6 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPTSTR lp
     }
     _Module.Term();
 
-
     OleUninitialize();
     //google::RemoveLogSink(&logSink);
     google::ShutdownGoogleLogging();