Commit 668504f
markisch
Missing cleanup of Direct2D resources.
1 parent b472a2a commit 668504f
2 files changed
Lines changed: 16 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,3 +1,10 @@ | |||
| 1 | + 2017-06-14 Bastian Maerkisch <bmaerkisch@web.de> | ||
| 2 | + | ||
| 3 | + * src/win/wd2d.cpp: When compiled with D2DDEBUG defined, enable the | ||
| 4 | + Direct2D debug layer. | ||
| 5 | + | ||
| 6 | + * src/win/winmain.c (WinExit): Missing cleanup of Direct2D resources. | ||
| 7 | + | ||
| 1 | 8 | 2017-06-13 Bastian Maerkisch <bmaerkisch@web.de> | |
| 2 | 9 | ||
| 3 | 10 | * src/win/wgdiplus.cpp: Cleartype text antialiasing seems to be only | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | 1 | /* | |
| 2 | - * $Id: winmain.c,v 1.101 2017-05-20 18:28:19 markisch Exp $ | ||
| 2 | + * $Id: winmain.c,v 1.102 2017-06-14 07:43:39 markisch Exp $ | ||
| 3 | 3 | */ | |
| 4 | 4 | ||
| 5 | 5 | /* GNUPLOT - win/winmain.c */ | |
@@ -78,6 +78,9 @@ | |||
| 78 | 78 | #ifdef HAVE_GDIPLUS | |
| 79 | 79 | #include "wgdiplus.h" | |
| 80 | 80 | #endif | |
| 81 | + #ifdef HAVE_D2D | ||
| 82 | + #include "wd2d.h" | ||
| 83 | + #endif | ||
| 81 | 84 | #ifdef WXWIDGETS | |
| 82 | 85 | #include "wxterminal/wxt_term.h" | |
| 83 | 86 | #endif | |
@@ -191,6 +194,9 @@ WinExit(void) | |||
| 191 | 194 | #endif | |
| 192 | 195 | #ifdef HAVE_GDIPLUS | |
| 193 | 196 | gdiplusCleanup(); | |
| 197 | + #endif | ||
| 198 | + #ifdef HAVE_D2D | ||
| 199 | + d2dCleanup(); | ||
| 194 | 200 | #endif | |
| 195 | 201 | CoUninitialize(); | |
| 196 | 202 | return; | |
@@ -1238,7 +1244,7 @@ ConsoleHandler(DWORD dwType) | |||
| 1238 | 1244 | DWORD written; | |
| 1239 | 1245 | ||
| 1240 | 1246 | // NOTE: returning from this handler terminates the application. | |
| 1241 | - // Insteadm, we signal the main thread to clean up and exit and | ||
| 1247 | + // Instead, we signal the main thread to clean up and exit and | ||
| 1242 | 1248 | // then idle by sleeping. | |
| 1243 | 1249 | terminate_flag = TRUE; | |
| 1244 | 1250 | // send ^D to main thread input queue | |
@@ -1260,6 +1266,7 @@ ConsoleHandler(DWORD dwType) | |||
| 1260 | 1266 | } | |
| 1261 | 1267 | #endif | |
| 1262 | 1268 | ||
| 1269 | + | ||
| 1263 | 1270 | /* public interface to printer routines : Windows PRN emulation | |
| 1264 | 1271 | * (formerly in win.trm) | |
| 1265 | 1272 | */ | |
0 commit comments