From a16c243119d5eec194615fc3782018eeecf09d8e Mon Sep 17 00:00:00 2001 From: Andrew Coates <30809111+acoates-ms@users.noreply.github.com> Date: Mon, 29 Apr 2024 11:36:30 -0700 Subject: [PATCH] [0.74] Ensure D2D device context is not used outside Begin/End draw (#13010) * Ensure D2D device context is not used outside Begin/End draw * Change files --- ...ative-windows-48f54764-11c8-49c7-bf4a-a4d724d35f20.json | 7 +++++++ vnext/Microsoft.ReactNative.Cxx/AutoDraw.h | 1 + 2 files changed, 8 insertions(+) create mode 100644 change/react-native-windows-48f54764-11c8-49c7-bf4a-a4d724d35f20.json diff --git a/change/react-native-windows-48f54764-11c8-49c7-bf4a-a4d724d35f20.json b/change/react-native-windows-48f54764-11c8-49c7-bf4a-a4d724d35f20.json new file mode 100644 index 00000000000..7cf2970cda5 --- /dev/null +++ b/change/react-native-windows-48f54764-11c8-49c7-bf4a-a4d724d35f20.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Ensure D2D device context is not used outside Begin/End draw", + "packageName": "react-native-windows", + "email": "30809111+acoates-ms@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/vnext/Microsoft.ReactNative.Cxx/AutoDraw.h b/vnext/Microsoft.ReactNative.Cxx/AutoDraw.h index d03904af2e4..342a1879376 100644 --- a/vnext/Microsoft.ReactNative.Cxx/AutoDraw.h +++ b/vnext/Microsoft.ReactNative.Cxx/AutoDraw.h @@ -20,6 +20,7 @@ class AutoDrawDrawingSurface { ~AutoDrawDrawingSurface() noexcept { if (m_d2dDeviceContext) { + m_d2dDeviceContext = nullptr; m_drawingSurfaceInterop->EndDraw(); } }