Fix some memory leaks

vanjac · Jun 17, 2022 · 57e36eb · 57e36eb
1 parent 2fd6849
commit 57e36eb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -21,6 +21,7 @@
 			"args": [
 				"/Zi",      // debug only
 				"/EHsc",    // debug only
+				"/MTd",		// debug only
 				"/D", "CHROMABROWSE_DEBUG", // debug only
 				"/nologo",
 				"/W4",

diff --git a/src/FolderWindow.cpp b/src/FolderWindow.cpp
@@ -110,6 +110,7 @@ void FolderWindow::onCreate() {
             view = nullptr;
             // destroy and recreate browser
             browser->Destroy();
+            browser = nullptr;
             if (!initBrowser())
                 return;
             // don't set property bag! (breaks sorting)
@@ -242,6 +243,7 @@ void FolderWindow::resultsFolderFallback() {
                     CComPtr<IShellItem> childItem;
                     while (enumItems->Next(1, &childItem, nullptr) == S_OK) {
                         results->AddItem(childItem);
+                        childItem = nullptr;
                     }
                     // for some reason changing the sort columns immediately after adding items
                     // breaks the folder view, so delay it until the browser has had a chance to

diff --git a/src/PreviewWindow.cpp b/src/PreviewWindow.cpp
@@ -32,6 +32,10 @@ void PreviewWindow::init() {
     RegisterClass(&containerClass);
 }
 
+void PreviewWindow::uninit() {
+    previewFactoryCache.clear();
+}
+
 PreviewWindow::PreviewWindow(CComPtr<ItemWindow> parent, CComPtr<IShellItem> item, CLSID previewID)
     : ItemWindow(parent, item)
     , previewID(previewID)

diff --git a/src/PreviewWindow.h b/src/PreviewWindow.h
@@ -8,6 +8,7 @@ namespace chromabrowse {
 class PreviewWindow : public ItemWindow, public IPreviewHandlerFrame {
 public:
     static void init();
+    static void uninit();
 
     PreviewWindow(CComPtr<ItemWindow> parent, CComPtr<IShellItem> item, CLSID previewID);
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -100,6 +100,7 @@ int WINAPI wWinMain(HINSTANCE, HINSTANCE, PWSTR, int showCommand) {
     updateJumpList(nullptr);
 
     chromabrowse::ItemWindow::uninit();
+    chromabrowse::PreviewWindow::uninit();
     OleUninitialize();
     return 0;
 }
@@ -137,12 +138,14 @@ DWORD WINAPI updateJumpList(void *) {
     if (FAILED(favoritesFolder->BindToHandler(nullptr, BHID_EnumItems, IID_PPV_ARGS(&enumItems))))
         return false;
 
-    CComPtr<IShellItem> childItem;
     if (IsWindows10OrGreater()) {
         // TODO: hack!! the first 20 items in Quick Access are recents
-        for (int i = 0; i < 20; i++)
-            enumItems->Next(1, &childItem, nullptr);
+        for (int i = 0; i < 20; i++) {
+            CComPtr<IShellItem> tempItem;
+            enumItems->Next(1, &tempItem, nullptr);
+        }
     }
+    CComPtr<IShellItem> childItem;
     while (enumItems->Next(1, &childItem, nullptr) == S_OK) {
         CComHeapPtr<wchar_t> displayName, parsingName;
         childItem->GetDisplayName(SIGDN_NORMALDISPLAY, &displayName);
@@ -174,6 +177,7 @@ DWORD WINAPI updateJumpList(void *) {
                     link->SetIconLocation(iconFile, index);
             }
         }
+        childItem = nullptr; // CComPtr isn't very smart
     }
 
     if (FAILED(jumpList->AddUserTasks(tasks))) {