From 3c4fc89e66aa571d1a31173092124d20db0cf09b Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 21 Feb 2015 22:46:20 +1100 Subject: WM_SIZE etc may be posted before CreateWindowEx returns --- src/osd/modules/debugger/win/debugviewinfo.c | 4 ++-- src/osd/modules/debugger/win/debugwininfo.c | 4 ++-- src/osd/modules/debugger/win/debugwininfo.h | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/osd/modules/debugger/win/debugviewinfo.c b/src/osd/modules/debugger/win/debugviewinfo.c index e474ab5ebcb..883a12dac11 100644 --- a/src/osd/modules/debugger/win/debugviewinfo.c +++ b/src/osd/modules/debugger/win/debugviewinfo.c @@ -774,10 +774,10 @@ LRESULT CALLBACK debugview_info::static_view_proc(HWND wnd, UINT message, WPARAM } debugview_info *const info = (debugview_info *)(FPTR)GetWindowLongPtr(wnd, GWLP_USERDATA); - if (!info) + if (info == NULL) return DefWindowProc(wnd, message, wparam, lparam); - assert(info->m_wnd == wnd); + assert((info->m_wnd == wnd) || (info->m_wnd == NULL)); return info->view_proc(message, wparam, lparam); } diff --git a/src/osd/modules/debugger/win/debugwininfo.c b/src/osd/modules/debugger/win/debugwininfo.c index 3c32db35d9c..f900715a015 100644 --- a/src/osd/modules/debugger/win/debugwininfo.c +++ b/src/osd/modules/debugger/win/debugwininfo.c @@ -564,10 +564,10 @@ LRESULT CALLBACK debugwin_info::static_window_proc(HWND wnd, UINT message, WPARA } debugwin_info *const info = (debugwin_info *)(FPTR)GetWindowLongPtr(wnd, GWLP_USERDATA); - if (!info) + if (info == NULL) return DefWindowProc(wnd, message, wparam, lparam); - assert(info->m_wnd == wnd); + assert((info->m_wnd == wnd) || (info->m_wnd == NULL)); return info->window_proc(message, wparam, lparam); } diff --git a/src/osd/modules/debugger/win/debugwininfo.h b/src/osd/modules/debugger/win/debugwininfo.h index 148d79a651e..9ae4ad34aca 100644 --- a/src/osd/modules/debugger/win/debugwininfo.h +++ b/src/osd/modules/debugger/win/debugwininfo.h @@ -21,7 +21,7 @@ class debugwin_info : protected debugbase_info public: template friend class simple_list; - debugwin_info(debugger_windows_interface &debugger, bool main_console, LPCSTR title, WNDPROC handler); + debugwin_info(debugger_windows_interface &debugger, bool is_main_console, LPCSTR title, WNDPROC handler); virtual ~debugwin_info(); bool is_valid() const { return m_wnd != NULL; } @@ -101,6 +101,7 @@ protected: ID_DEVICE_OPTIONS // always keep this at the end }; + bool is_main_console() const { return m_is_main_console; } HWND window() const { return m_wnd; } UINT32 minwidth() const { return m_minwidth; } UINT32 maxwidth() const { return m_maxwidth; } -- cgit v1.2.3