From e92dab9e3447d94c8c70789082da9f64765fb7ba Mon Sep 17 00:00:00 2001 From: Nathan Woods Date: Sat, 8 Feb 2014 14:19:00 +0000 Subject: [PATCH] Changed how NULL callbacks are specified on win_draw_callbacks --- src/osd/windows/drawd3d.c | 1 + src/osd/windows/drawdd.c | 4 +--- src/osd/windows/drawgdi.c | 4 +--- src/osd/windows/drawnone.c | 4 +--- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/osd/windows/drawd3d.c b/src/osd/windows/drawd3d.c index 703032fa59a..19268641d76 100644 --- a/src/osd/windows/drawd3d.c +++ b/src/osd/windows/drawd3d.c @@ -293,6 +293,7 @@ int drawd3d_init(running_machine &machine, win_draw_callbacks *callbacks) } // fill in the callbacks + memset(callbacks, 0, sizeof(*callbacks)); callbacks->exit = drawd3d_exit; callbacks->window_init = drawd3d_window_init; callbacks->window_get_primitives = drawd3d_window_get_primitives; diff --git a/src/osd/windows/drawdd.c b/src/osd/windows/drawdd.c index fb580b39cd2..991d7d45806 100644 --- a/src/osd/windows/drawdd.c +++ b/src/osd/windows/drawdd.c @@ -184,13 +184,11 @@ int drawdd_init(running_machine &machine, win_draw_callbacks *callbacks) } // fill in the callbacks + memset(callbacks, 0, sizeof(*callbacks)); callbacks->exit = drawdd_exit; callbacks->window_init = drawdd_window_init; callbacks->window_get_primitives = drawdd_window_get_primitives; callbacks->window_draw = drawdd_window_draw; - callbacks->window_save = NULL; - callbacks->window_record = NULL; - callbacks->window_toggle_fsfx = NULL; callbacks->window_destroy = drawdd_window_destroy; mame_printf_verbose("DirectDraw: Using DirectDraw 7\n"); diff --git a/src/osd/windows/drawgdi.c b/src/osd/windows/drawgdi.c index 18b7840012f..28871a3f7db 100644 --- a/src/osd/windows/drawgdi.c +++ b/src/osd/windows/drawgdi.c @@ -54,13 +54,11 @@ static int drawgdi_window_draw(win_window_info *window, HDC dc, int update); int drawgdi_init(running_machine &machine, win_draw_callbacks *callbacks) { // fill in the callbacks + memset(callbacks, 0, sizeof(*callbacks)); callbacks->exit = drawgdi_exit; callbacks->window_init = drawgdi_window_init; callbacks->window_get_primitives = drawgdi_window_get_primitives; callbacks->window_draw = drawgdi_window_draw; - callbacks->window_save = NULL; - callbacks->window_record = NULL; - callbacks->window_toggle_fsfx = NULL; callbacks->window_destroy = drawgdi_window_destroy; return 0; } diff --git a/src/osd/windows/drawnone.c b/src/osd/windows/drawnone.c index 2008892b59f..fa840e7a60b 100644 --- a/src/osd/windows/drawnone.c +++ b/src/osd/windows/drawnone.c @@ -38,13 +38,11 @@ static int drawnone_window_draw(win_window_info *window, HDC dc, int update); int drawnone_init(running_machine &machine, win_draw_callbacks *callbacks) { // fill in the callbacks + memset(callbacks, 0, sizeof(*callbacks)); callbacks->exit = drawnone_exit; callbacks->window_init = drawnone_window_init; callbacks->window_get_primitives = drawnone_window_get_primitives; callbacks->window_draw = drawnone_window_draw; - callbacks->window_save = NULL; - callbacks->window_record = NULL; - callbacks->window_toggle_fsfx = NULL; callbacks->window_destroy = drawnone_window_destroy; return 0; }