From 60d09fb723764cf54b53c166964e51143ad8d070 Mon Sep 17 00:00:00 2001
From: Brian Ledger <brianpl@google.com>
Date: Tue, 5 Dec 2023 11:20:01 -0500
Subject: [PATCH] Declare default virtual destructors where needed to quiet
 [-Wnon-virtual-dtor] errors.

---
 tests/ComTests.cpp      | 8 ++++++++
 tests/ResourceTests.cpp | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/tests/ComTests.cpp b/tests/ComTests.cpp
index 76dbe2fcc..4750593b9 100644
--- a/tests/ComTests.cpp
+++ b/tests/ComTests.cpp
@@ -69,6 +69,7 @@ IUnknownFake : public IUnknown
         ReleaseCounter = 0;
         return res;
     }
+    virtual ~IUnknownFake() = default;
 protected:
     static int AddRefCounter;
     static int ReleaseCounter;
@@ -552,6 +553,7 @@ class ExtensionHelper
     {
         return 0;
     }
+    virtual ~ExtensionHelper() = default;
 };
 
 TEST_CASE("ComTests::Test_ConstPointer", "[com][com_ptr]")
@@ -597,6 +599,7 @@ TEST_CASE("ComTests::Test_ComPtrWithForwardDeclaration", "[com][com_ptr]")
         {
             return 0;
         }
+        virtual ~MyClass() = default;
     };
 }
 
@@ -614,6 +617,7 @@ interface __declspec(uuid("ececcc6a-5193-4d14-b38e-ed1460c20a01"))
 IDerivedTest : public ITest
 {
    STDMETHOD_(void, TestDerived)() = 0;
+   virtual ~ITest() = default;
 };
 
 interface __declspec(uuid("ececcc6a-5193-4d14-b38e-ed1460c20a02"))
@@ -626,18 +630,21 @@ interface __declspec(uuid("ececcc6a-5193-4d14-b38e-ed1460c20a03"))
 IDerivedTestInspectable : public ITestInspectable
 {
    STDMETHOD_(void, TestInspctableDerived)() = 0;
+   virtual ~ITestInspectable() = default;
 };
 
 interface __declspec(uuid("ececcc6a-5193-4d14-b38e-ed1460c20a04"))
 INever : public IUnknown
 {
    STDMETHOD_(void, Never)() = 0;
+   virtual ~INever() = default;
 };
 
 interface __declspec(uuid("ececcc6a-5193-4d14-b38e-ed1460c20a05"))
 IAlways : public IUnknown
 {
    STDMETHOD_(void, Always)() = 0;
+   virtual ~IAlways() = default;
 };
 
 class __declspec(empty_bases) __declspec(uuid("ececcc6a-5193-4d14-b38e-ed1460c20b00")) // non-implemented to allow QI for the class to be attempted (and fail)
@@ -2574,6 +2581,7 @@ class FakeStream : public IStream
     {
         return SetPosition(position, position);
     }
+    virtual ~FakeStream() = default;
 };
 
 TEST_CASE("StreamTests::ReadPartial", "[com][IStream]")
diff --git a/tests/ResourceTests.cpp b/tests/ResourceTests.cpp
index 42454064b..eb4e64e21 100644
--- a/tests/ResourceTests.cpp
+++ b/tests/ResourceTests.cpp
@@ -122,6 +122,7 @@ interface __declspec(uuid("ececcc6a-5193-4d14-b38e-ed1460c20b00"))
 ITest : public IUnknown
 {
    STDMETHOD_(void, Test)() = 0;
+   virtual ~ITest() = default;
 };
 
 class __declspec(empty_bases) PointerTestObject : witest::AllocatedObject,
@@ -810,6 +811,7 @@ TEST_CASE("UniqueInvokeCleanupMembers", "[resource]")
 struct ITokenTester : IUnknown
 {
     virtual void DirectClose(DWORD_PTR token) = 0;
+    virtual ~ITokenTester() = default;
 };
 
 struct TokenTester : ITokenTester