diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-04-13 17:28:46 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-04-13 19:01:26 +0200 |
| commit | df556aa47da22f96b3fcd356c12419d3035cba3c (patch) | |
| tree | f901a62630cccdd3819b2c28ce3ce2bdc7088b88 /vcl/inc | |
| parent | 2fd2a7f9b3a866cf4d31f9b496d8f6fd221d75e8 (diff) | |
tdf#106933 vcl: delete D2DWriteTextOutRenderer before exit()
As it happens this DirectWrite stuff is using some thread pool
internally, and that must be shutdown before exit(), as Win32 will
terminate all other threads at that point, and then the thread pool
wants to talk to threads that don't exist any more.
https://blogs.msdn.microsoft.com/oldnewthing/20120427-00/?p=7763/
So convert this from a global variable that is deleted from DllMain()
to a member of SalData, so it is deleted from DeInitVCL().
Change-Id: I51408a07c78758cf0c193ab66b9214d0c9dbd9e3
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 2fb1b49d5177..0e13cef9970a 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -39,6 +39,7 @@ class WinSalPrinter; namespace vcl { class Font; } struct HDCCache; struct TempFontItem; +class TextOutRenderer; #define MAX_STOCKPEN 4 #define MAX_STOCKBRUSH 4 @@ -118,6 +119,9 @@ public: std::set< HMENU > mhMenuSet; // keeps track of menu handles created by VCL, used by IsKnownMenuHandle() std::map< UINT,sal_uInt16 > maVKMap; // map some dynamic VK_* entries + + // must be deleted before exit(), so delete it in DeInitSalData() + std::unique_ptr<TextOutRenderer> m_pTextOutRenderer; }; inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; } |