Ignore errors during manual unregistration (#1005)

microsoft · Aug 25, 2021 · f2f08f7 · f2f08f7
1 parent 8f40198
commit f2f08f7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/cppwinrt.props b/cppwinrt.props
@@ -12,6 +12,11 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
+    <PlatformToolset>v143</PlatformToolset>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+
   <!--
     Can be used as follows.
 

diff --git a/cppwinrt/code_writers.h b/cppwinrt/code_writers.h
@@ -1120,11 +1120,23 @@ namespace cppwinrt
 
         if (is_noexcept(method))
         {
-            format = R"(    template <typename D%> WINRT_IMPL_AUTO(%) consume_%<D%>::%(%) const noexcept
+            if (is_remove_overload(method))
+            {
+                // we intentionally ignore errors when unregistering event handlers to be consistent with event_revoker
+                format = R"(    template <typename D%> WINRT_IMPL_AUTO(%) consume_%<D%>::%(%) const noexcept
+    {%
+        WINRT_IMPL_SHIM(%)->%(%);%
+    }
+)";
+            }
+            else
+            {
+                format = R"(    template <typename D%> WINRT_IMPL_AUTO(%) consume_%<D%>::%(%) const noexcept
     {%
         WINRT_VERIFY_(0, WINRT_IMPL_SHIM(%)->%(%));%
     }
 )";
+            }
         }
         else
         {

diff --git a/test/old_tests/UnitTests/event_consume.cpp b/test/old_tests/UnitTests/event_consume.cpp
@@ -37,6 +37,8 @@ struct TestSplashScreen : implements<TestSplashScreen, ISplashScreen>
     void Dismissed(event_token cookie)
     {
         m_dismissed.remove(cookie);
+
+        throw hresult_error(0x80010108); // this exception should always be ignored.
     }
 };
 
@@ -61,6 +63,8 @@ struct TestClipboardStatics : implements<TestClipboardStatics, IClipboardStatics
     void ContentChanged(event_token token)
     {
         m_contentChanged.remove(token);
+
+        throw hresult_error(0x80010108); // this exception should always be ignored.
     }
 };