diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-05-31 09:59:44 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-05-31 09:59:44 +1000 |
| commit | 79948de49ae85c62b48ca371a8784effcf774141 (patch) | |
| tree | 64c541e9dcb42c9999759ab7dd40d67c72749b9a /win32/PlatWin.cxx | |
| parent | 8b447b76bbc110e055a0637657f5f00c65cc98dd (diff) | |
| parent | 9bc61b338dfe63d2e6fcc66bc0933a0de6bcd31b (diff) | |
| download | scintilla-mirror-79948de49ae85c62b48ca371a8784effcf774141.tar.gz | |
Merge with 343-Win32-Fix.
Diffstat (limited to 'win32/PlatWin.cxx')
| -rw-r--r-- | win32/PlatWin.cxx | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 9eb45e804..fda07875a 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -3280,31 +3280,33 @@ void Platform_Initialise(void *hInstance) { #pragma warning(default: 4996) #endif -void Platform_Finalise() { +void Platform_Finalise(bool fromDllMain) { #if defined(USE_D2D) - if (defaultRenderingParams) { - defaultRenderingParams->Release(); - defaultRenderingParams = 0; - } - if (customClearTypeRenderingParams) { - customClearTypeRenderingParams->Release(); - customClearTypeRenderingParams = 0; - } - if (pIDWriteFactory) { - pIDWriteFactory->Release(); - pIDWriteFactory = 0; - } - if (pD2DFactory) { - pD2DFactory->Release(); - pD2DFactory = 0; - } - if (hDLLDWrite) { - FreeLibrary(hDLLDWrite); - hDLLDWrite = NULL; - } - if (hDLLD2D) { - FreeLibrary(hDLLD2D); - hDLLD2D = NULL; + if (!fromDllMain) { + if (defaultRenderingParams) { + defaultRenderingParams->Release(); + defaultRenderingParams = 0; + } + if (customClearTypeRenderingParams) { + customClearTypeRenderingParams->Release(); + customClearTypeRenderingParams = 0; + } + if (pIDWriteFactory) { + pIDWriteFactory->Release(); + pIDWriteFactory = 0; + } + if (pD2DFactory) { + pD2DFactory->Release(); + pD2DFactory = 0; + } + if (hDLLDWrite) { + FreeLibrary(hDLLDWrite); + hDLLDWrite = NULL; + } + if (hDLLD2D) { + FreeLibrary(hDLLD2D); + hDLLD2D = NULL; + } } #endif if (reverseArrowCursor != NULL) |