Converted glwin32 to vout display.

modules/video_output/msw/Modules.am

@@ -16,10 +16,10 @@ SOURCES_direct3d = \
 
 SOURCES_glwin32 = \
 	glwin32.c \
-	vout.h \
-	events_vo.h \
-	events_vo.c \
-	common_vo.c \
+	common.h \
+	events.h \
+	events.c \
+	common.c \
 	$(NULL)
 
 SOURCES_wingdi = \

modules/video_output/msw/common.c

@@ -46,7 +46,7 @@
 #include <d3d9.h>
 #endif
 #ifdef MODULE_NAME_IS_glwin32
-#include <GL/gl.h>
+#include "../opengl.h"
 #endif
 
 #include "common.h"

modules/video_output/msw/common.h

@@ -148,8 +148,11 @@ struct vout_display_sys_t
 #endif
 
 #ifdef MODULE_NAME_IS_glwin32
-    HDC hGLDC;
-    HGLRC hGLRC;
+    HDC                   hGLDC;
+    HGLRC                 hGLRC;
+    vout_opengl_t         gl;
+    vout_display_opengl_t vgl;
+    picture_pool_t        *pool;
 #endif
 
 #ifdef MODULE_NAME_IS_direct3d

modules/video_output/msw/events.c

@@ -47,7 +47,7 @@
 #include <d3d9.h>
 #endif
 #ifdef MODULE_NAME_IS_glwin32
-#include <GL/gl.h>
+#include "../opengl.h"
 #endif
 
 #include <vlc_keys.h>