diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-06-06 13:41:58 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-06-06 13:41:58 +1000 |
| commit | 554d1cc7c885291618ec50b6045e27fc1cf87a28 (patch) | |
| tree | 85b548fe63cc42a1487ad8f8122d341bcdad9138 /win32/ScintillaWin.cxx | |
| parent | f1f8eeddbe3437c3e3f4f4580435996ea3cd0904 (diff) | |
| download | scintilla-mirror-554d1cc7c885291618ec50b6045e27fc1cf87a28.tar.gz | |
Backport: Add ReleaseUnknown to safely release IUnknown* and avoid warnings when done in
noexcept context.
Backport of changeset 8286:bddda9b7df4f.
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index c33944db4..651a2629f 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -672,10 +672,7 @@ void ScintillaWin::EnsureRenderTarget(HDC hdc) { } void ScintillaWin::DropRenderTarget() { - if (pRenderTarget) { - pRenderTarget->Release(); - pRenderTarget = nullptr; - } + ReleaseUnknown(pRenderTarget); } #endif @@ -3533,8 +3530,7 @@ LRESULT PASCAL ScintillaWin::CTWndProc( #endif surfaceWindow->Release(); #if defined(USE_D2D) - if (pCTRenderTarget) - pCTRenderTarget->Release(); + ReleaseUnknown(pCTRenderTarget); #endif ::EndPaint(hWnd, &ps); return 0; |