[vlc-devel] commit: Fixed uninitialized variables (msw). (Laurent Aimar )
git version control
git at videolan.org
Sun Oct 11 21:18:45 CEST 2009
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Oct 11 11:49:48 2009 +0200| [3b471fb3781d7f60268732ac4f6601e54fb45e39] | committer: Laurent Aimar
Fixed uninitialized variables (msw).
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b471fb3781d7f60268732ac4f6601e54fb45e39
---
modules/video_output/msw/events.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 3aab8ca..c64cfda 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -457,6 +457,8 @@ static int DirectXCreateWindow( event_thread_t *p_event )
p_event->parent_window = vout_window_New( VLC_OBJECT(p_vout), NULL, &p_event->wnd_cfg );
if( p_event->parent_window )
p_event->hparent = p_event->parent_window->handle.hwnd;
+ else
+ p_event->hparent = NULL;
#ifdef MODULE_NAME_IS_direct3d
}
else
@@ -601,6 +603,10 @@ static int DirectXCreateWindow( event_thread_t *p_event )
CW_USEDEFAULT, CW_USEDEFAULT,
NULL, NULL, hInstance, NULL );
}
+ else
+ {
+ p_event->hfswnd = NULL;
+ }
/* Append a "Always On Top" entry in the system menu */
hMenu = GetSystemMenu( p_event->hwnd, FALSE );
@@ -1049,7 +1055,10 @@ int EventThreadStart( event_thread_t *p_event, event_hwnd_t *p_hwnd, const event
}
msg_Dbg( p_event->p_vout, "Vout EventThread running" );
- p_hwnd->parent_window = p_event->parent_window;
+ if( !p_event->use_desktop )
+ p_hwnd->parent_window = p_event->parent_window;
+ else
+ p_hwnd->parent_window = NULL;
p_hwnd->hparent = p_event->hparent;
p_hwnd->hwnd = p_event->hwnd;
p_hwnd->hvideownd = p_event->hvideownd;
More information about the vlc-devel
mailing list