Commit 4d37034c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

MSW vouts: fix warnings

parent 607d0272
...@@ -290,11 +290,12 @@ static void CommonChangeThumbnailClip(vout_display_t *vd, bool show) ...@@ -290,11 +290,12 @@ static void CommonChangeThumbnailClip(vout_display_t *vd, bool show)
CoInitialize(0); CoInitialize(0);
LPTASKBARLIST3 taskbl; void *ptr;
if (S_OK == CoCreateInstance(&clsid_ITaskbarList, if (S_OK == CoCreateInstance(&clsid_ITaskbarList,
NULL, CLSCTX_INPROC_SERVER, NULL, CLSCTX_INPROC_SERVER,
&IID_ITaskbarList3, &IID_ITaskbarList3,
&taskbl)) { &ptr)) {
LPTASKBARLIST3 taskbl = ptr;
taskbl->vt->HrInit(taskbl); taskbl->vt->HrInit(taskbl);
HWND hroot = GetAncestor(sys->hwnd,GA_ROOT); HWND hroot = GetAncestor(sys->hwnd,GA_ROOT);
......
...@@ -602,8 +602,9 @@ static int DirectXOpenDDraw(vout_display_t *vd) ...@@ -602,8 +602,9 @@ static int DirectXOpenDDraw(vout_display_t *vd)
} }
/* Get the IDirectDraw2 interface */ /* Get the IDirectDraw2 interface */
void *ptr;
hr = IDirectDraw_QueryInterface(ddobject, &IID_IDirectDraw2, hr = IDirectDraw_QueryInterface(ddobject, &IID_IDirectDraw2,
&sys->ddobject); &ptr);
/* Release the unused interface */ /* Release the unused interface */
IDirectDraw_Release(ddobject); IDirectDraw_Release(ddobject);
...@@ -612,6 +613,7 @@ static int DirectXOpenDDraw(vout_display_t *vd) ...@@ -612,6 +613,7 @@ static int DirectXOpenDDraw(vout_display_t *vd)
sys->ddobject = NULL; sys->ddobject = NULL;
return VLC_EGENERIC; return VLC_EGENERIC;
} }
sys->ddobject = ptr;
/* Set DirectDraw Cooperative level, ie what control we want over Windows /* Set DirectDraw Cooperative level, ie what control we want over Windows
* display */ * display */
...@@ -783,8 +785,9 @@ static int DirectXOpenDisplay(vout_display_t *vd) ...@@ -783,8 +785,9 @@ static int DirectXOpenDisplay(vout_display_t *vd)
return VLC_EGENERIC; return VLC_EGENERIC;
} }
void *ptr;
hr = IDirectDrawSurface_QueryInterface(display, &IID_IDirectDrawSurface2, hr = IDirectDrawSurface_QueryInterface(display, &IID_IDirectDrawSurface2,
&sys->display); &ptr);
/* Release the old interface */ /* Release the old interface */
IDirectDrawSurface_Release(display); IDirectDrawSurface_Release(display);
...@@ -793,6 +796,7 @@ static int DirectXOpenDisplay(vout_display_t *vd) ...@@ -793,6 +796,7 @@ static int DirectXOpenDisplay(vout_display_t *vd)
sys->display = NULL; sys->display = NULL;
return VLC_EGENERIC; return VLC_EGENERIC;
} }
sys->display = ptr;
/* The clipper will be used only in non-overlay mode */ /* The clipper will be used only in non-overlay mode */
DirectXCreateClipper(vd); DirectXCreateClipper(vd);
......
...@@ -1011,7 +1011,7 @@ int EventThreadGetWindowStyle( event_thread_t *p_event ) ...@@ -1011,7 +1011,7 @@ int EventThreadGetWindowStyle( event_thread_t *p_event )
void EventThreadUpdateWindowPosition( event_thread_t *p_event, void EventThreadUpdateWindowPosition( event_thread_t *p_event,
bool *pb_moved, bool *pb_resized, bool *pb_moved, bool *pb_resized,
int x, int y, int w, int h ) int x, int y, unsigned w, unsigned h )
{ {
vlc_mutex_lock( &p_event->lock ); vlc_mutex_lock( &p_event->lock );
*pb_moved = x != p_event->wnd_cfg.x || *pb_moved = x != p_event->wnd_cfg.x ||
......
...@@ -53,7 +53,7 @@ void EventThreadMouseHide( event_thread_t * ); ...@@ -53,7 +53,7 @@ void EventThreadMouseHide( event_thread_t * );
void EventThreadUpdateTitle( event_thread_t *, const char *psz_fallback ); void EventThreadUpdateTitle( event_thread_t *, const char *psz_fallback );
int EventThreadGetWindowStyle( event_thread_t * ); int EventThreadGetWindowStyle( event_thread_t * );
void EventThreadUpdateWindowPosition( event_thread_t *, bool *pb_moved, bool *pb_resized, void EventThreadUpdateWindowPosition( event_thread_t *, bool *pb_moved, bool *pb_resized,
int x, int y, int w, int h ); int x, int y, unsigned w, unsigned h );
void EventThreadUpdateSourceAndPlace( event_thread_t *p_event, void EventThreadUpdateSourceAndPlace( event_thread_t *p_event,
const video_format_t *p_source, const video_format_t *p_source,
const vout_display_place_t *p_place ); const vout_display_place_t *p_place );
......
...@@ -345,7 +345,7 @@ static int Init(vout_display_t *vd, ...@@ -345,7 +345,7 @@ static int Init(vout_display_t *vd,
fmt->i_width = width; fmt->i_width = width;
fmt->i_height = height; fmt->i_height = height;
uint8_t *p_pic_buffer; void *p_pic_buffer;
int i_pic_pitch; int i_pic_pitch;
#ifdef MODULE_NAME_IS_wingapi #ifdef MODULE_NAME_IS_wingapi
GXOpenDisplay(sys->hvideownd, GX_FULLSCREEN); GXOpenDisplay(sys->hvideownd, GX_FULLSCREEN);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment