Commit 16ede4ccd2f35e389707ad231b35c92ca7bbe3c8
2023-12-19T09:53:43
win32
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101
diff --git a/libc3/window/cairo/win32/Makefile b/libc3/window/cairo/win32/Makefile
index 0771cac..03a0160 100644
--- a/libc3/window/cairo/win32/Makefile
+++ b/libc3/window/cairo/win32/Makefile
@@ -51,6 +51,15 @@ debug:
demo: build
${MAKE} -C demo demo
+demo_asan: asan
+ ${MAKE} -C demo demo_asan
+
+demo_cov: cov
+ ${MAKE} -C demo demo_cov
+
+demo_debug: debug
+ ${MAKE} -C demo demo_debug
+
distclean:
rm -rf ${DISTCLEANFILES}
${MAKE} -C demo distclean
diff --git a/libc3/window/cairo/win32/demo/Makefile b/libc3/window/cairo/win32/demo/Makefile
index 34cde24..f519ecf 100644
--- a/libc3/window/cairo/win32/demo/Makefile
+++ b/libc3/window/cairo/win32/demo/Makefile
@@ -43,6 +43,15 @@ debug: ${PROG_DEBUG}
demo: ${PROG}
time ./${PROG}
+demo_asan: ${PROG_ASAN}
+ time ./${PROG_ASAN}
+
+demo_cov: ${PROG_COV}
+ time ./${PROG_COV}
+
+demo_debug: ${PROG_DEBUG}
+ time ./${PROG_DEBUG}
+
distclean:
rm -rf ${DISTCLEANFILES}
diff --git a/libc3/window/cairo/win32/window_cairo_win32.c b/libc3/window/cairo/win32/window_cairo_win32.c
index e925487..f567141 100644
--- a/libc3/window/cairo/win32/window_cairo_win32.c
+++ b/libc3/window/cairo/win32/window_cairo_win32.c
@@ -25,8 +25,8 @@ bool window_cairo_run (s_window_cairo *window)
return window_cairo_win32_run(window);
}
-LRESULT CALLBACK window_cairo_win32_proc(HWND hwnd, UINT message,
- WPARAM wParam, LPARAM lParam)
+LRESULT CALLBACK window_cairo_win32_proc (HWND hwnd, UINT message,
+ WPARAM wParam, LPARAM lParam)
{
HBITMAP buffer_hbitmap;
HDC buffer_hdc;
@@ -39,7 +39,6 @@ LRESULT CALLBACK window_cairo_win32_proc(HWND hwnd, UINT message,
s_window_cairo *window;
HDC window_hdc;
window = (s_window_cairo *) GetWindowLongPtr(hwnd, GWLP_USERDATA);
- assert(window);
switch (message) {
case WM_DESTROY:
printf("WM_DESTROY\n");
@@ -76,6 +75,7 @@ LRESULT CALLBACK window_cairo_win32_proc(HWND hwnd, UINT message,
DeleteObject(buffer_hbitmap);
DeleteDC(buffer_hdc);
DeleteDC(window_hdc);
+ DeleteDC(hdc);
break;
case WM_SIZE:
if (! window->resize(window, LOWORD(lParam), HIWORD(lParam)))
diff --git a/libc3/window/cairo/window_cairo.c b/libc3/window/cairo/window_cairo.c
index db2dbb5..7d4728d 100644
--- a/libc3/window/cairo/window_cairo.c
+++ b/libc3/window/cairo/window_cairo.c
@@ -118,13 +118,15 @@ s_sequence * window_cairo_sequence_init
f_window_cairo_sequence_load load,
f_window_cairo_sequence_render render)
{
+ s_sequence tmp = {0};
assert(seq);
- seq->dt = 0.0;
- seq->t = 0.0;
- seq->duration = duration;
- seq->title = title;
- seq->load = (f_sequence_load) load;
- seq->render = (f_sequence_render) render;
- tag_init_void(&seq->tag);
+ tmp.dt = 0.0;
+ tmp.t = 0.0;
+ tmp.duration = duration;
+ tmp.title = title;
+ tmp.load = (f_sequence_load) load;
+ tmp.render = (f_sequence_render) render;
+ tag_init_void(&tmp.tag);
+ *seq = tmp;
return seq;
}
diff --git a/release/c3-0.1.9.win32.zip b/release/c3-0.1.9.win32.zip
index 7adb145..d3e49da 100644
Binary files a/release/c3-0.1.9.win32.zip and b/release/c3-0.1.9.win32.zip differ