WinCE: fix compilation of vout

diff --git a/configure.ac b/configure.ac
index f7cbac643de3324f6c87dedfc4f7c2d83fa270a9..dd3ad11056f08def3fa0fa981432e47a0e61850d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4567,6 +4567,8 @@ if test "${enable_wingdi}" != "no"; then
   if test "${SYS}" = "mingwce"; then
     VLC_ADD_PLUGIN([wingdi])
     VLC_ADD_PLUGIN([wingapi])
+    VLC_ADD_LIBS([wingdi],[-laygshell])
+    VLC_ADD_LIBS([wingapi],[-laygshell])
   fi
 fi
 

diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 25052615118988d05b14ec49f4dd18100c1672ed..83593f0b82b290f129ae0805084ecb0111a44c46 100644 (file)
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -1037,6 +1037,7 @@ static int DirectXConvertKey( int i_key )
 static int Control( vout_thread_t *p_vout, int i_query, va_list args )
 {
     unsigned int *pi_width, *pi_height;
+       bool b_bool;
     RECT rect_window;
     POINT point;
 
@@ -1132,7 +1133,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
 
 #ifdef MODULE_NAME_IS_wingapi
     case VOUT_SET_FOCUS:
-        b_bool = (bool) va_arg( args, int );
+               b_bool = (bool) va_arg( args, int );
         p_vout->p_sys->b_parent_focus = b_bool;
         if( b_bool ) GXResume();
         else if( !p_vout->p_sys->b_focus ) GXSuspend();

diff --git a/modules/video_output/msw/vout.h b/modules/video_output/msw/vout.h
index d964c3630007c5479d34ebada27f0a71d985ce12..043e77fe801feab1cf9c42164d5f22d0e9b1635e 100644 (file)
--- a/modules/video_output/msw/vout.h
+++ b/modules/video_output/msw/vout.h
@@ -64,6 +64,7 @@ typedef struct event_thread_t
 #       define kfDirect444      0x200
 #       define kfDirectInverted 0x400
 #   endif
+
 #endif
 
 /*****************************************************************************
@@ -194,11 +195,22 @@ struct vout_sys_t
     int        i_depth;
     int        render_width;
     int        render_height;
+           /* Our offscreen bitmap and its framebuffer */
+    HDC        off_dc;
+    HBITMAP    off_bitmap;
+    uint8_t *  p_pic_buffer;
+    int        i_pic_pitch;
+    int        i_pic_pixel_pitch;
+
+    BITMAPINFO bitmapinfo;
+    RGBQUAD    red;
+    RGBQUAD    green;
+    RGBQUAD    blue;
 
     bool b_focus;
     bool b_parent_focus;
 
-    HINSTANCE  gapi_dll;                    /* handle of the opened gapi dll */
+    HINSTANCE  gapi_dll;                   /* handle of the opened gapi dll */
 
     /* GAPI functions */
     int (*GXOpenDisplay)( HWND hWnd, DWORD dwFlags );
@@ -219,6 +231,16 @@ struct vout_sys_t
     vlc_mutex_t    lock;
 };
 
+#ifdef MODULE_NAME_IS_wingapi
+#   define GXOpenDisplay p_vout->p_sys->GXOpenDisplay
+#   define GXCloseDisplay p_vout->p_sys->GXCloseDisplay
+#   define GXBeginDraw p_vout->p_sys->GXBeginDraw
+#   define GXEndDraw p_vout->p_sys->GXEndDraw
+#   define GXGetDisplayProperties p_vout->p_sys->GXGetDisplayProperties
+#   define GXSuspend p_vout->p_sys->GXSuspend
+#   define GXResume p_vout->p_sys->GXResume
+#endif
+
 /*****************************************************************************
  * Prototypes from directx.c
  *****************************************************************************/

diff --git a/modules/video_output/msw/wingdi.c b/modules/video_output/msw/wingdi.c
index a1448deea9def90ef06bd258f8fd36f6864c0a94..42416b6d2dafae726db4c30c5c31e1200cf64c5a 100644 (file)
--- a/modules/video_output/msw/wingdi.c
+++ b/modules/video_output/msw/wingdi.c
@@ -117,15 +117,7 @@ static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
 
 static void InitBuffers        ( vout_thread_t * );
 
-#ifdef MODULE_NAME_IS_wingapi
-#   define GXOpenDisplay p_vout->p_sys->GXOpenDisplay
-#   define GXCloseDisplay p_vout->p_sys->GXCloseDisplay
-#   define GXBeginDraw p_vout->p_sys->GXBeginDraw
-#   define GXEndDraw p_vout->p_sys->GXEndDraw
-#   define GXGetDisplayProperties p_vout->p_sys->GXGetDisplayProperties
-#   define GXSuspend p_vout->p_sys->GXSuspend
-#   define GXResume p_vout->p_sys->GXResume
-#endif
+
 
 #define DX_POSITION_CHANGE 0x1000