vo_directx: minor fixes and reformat

Restore hunk disabling overlay when the Window is minimized.

This was accidentally removed in r33657.
Fixes bug 1950.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33894 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify code handling minimized state.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33895 b3059339-0415-0410-9bf9-f77b7e298cf2

Apply uncrustify to vo_directx.c.

The vast majority of changes are whitespace changes, but in some cases
{} was merged with other lines or a ; was removed after a } from a
switch and similar minor and obviously correct changes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33896 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix array layout uncrustify messed up.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33897 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove pointless () and {}.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33898 b3059339-0415-0410-9bf9-f77b7e298cf2

Make NULL checks simpler/more consistent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33899 b3059339-0415-0410-9bf9-f77b7e298cf2

Use FFMIN/FFMAX.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33901 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify struct initialization.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33902 b3059339-0415-0410-9bf9-f77b7e298cf2

Split out read/write part from data struct and make read-only
struct const.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33903 b3059339-0415-0410-9bf9-f77b7e298cf2

Store fixed-length string directly in struct, avoid pointer indirection.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33904 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace some inappropriate while() loops with for()

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33905 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify some more struct initializations.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33906 b3059339-0415-0410-9bf9-f77b7e298cf2

Avoid typedef.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33907 b3059339-0415-0410-9bf9-f77b7e298cf2

Use struct initializer in one more case.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33908 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify printing of error strings.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33909 b3059339-0415-0410-9bf9-f77b7e298cf2

Conflicts:

	libvo/vo_directx.c

1 files changed, 847 insertions, 883 deletions

diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index c937e13618..1c8519048b 100644
--- a/libvo/vo_directx.c
+++ b/libvo/vo_directx.c
@@ -36,31 +36,31 @@
 #include "sub/sub.h"
 #include "w32_common.h"
 
-static LPDIRECTDRAWCOLORCONTROL	g_cc = NULL;		//color control interface
-static LPDIRECTDRAW7        g_lpdd = NULL;          //DirectDraw Object
-static LPDIRECTDRAWSURFACE7  g_lpddsPrimary = NULL;  //Primary Surface: viewport through the Desktop
-static LPDIRECTDRAWSURFACE7  g_lpddsOverlay = NULL;  //Overlay Surface
-static LPDIRECTDRAWSURFACE7  g_lpddsBack = NULL;     //Back surface
-static LPDIRECTDRAWCLIPPER  g_lpddclipper;          //clipper object, can only be used without overlay
-static DDSURFACEDESC2		ddsdsf;                 //surface descripiton needed for locking
-static HINSTANCE            hddraw_dll;             //handle to ddraw.dll
-static RECT                 rd;                     //rect of our stretched image
-static RECT                 rs;                     //rect of our source image
-static HBRUSH               colorbrush = NULL;      // Handle to colorkey brush
-static HBRUSH               blackbrush = NULL;      // Handle to black brush
+static LPDIRECTDRAWCOLORCONTROL g_cc = NULL;            //color control interface
+static LPDIRECTDRAW7 g_lpdd = NULL;                 //DirectDraw Object
+static LPDIRECTDRAWSURFACE7 g_lpddsPrimary = NULL;   //Primary Surface: viewport through the Desktop
+static LPDIRECTDRAWSURFACE7 g_lpddsOverlay = NULL;   //Overlay Surface
+static LPDIRECTDRAWSURFACE7 g_lpddsBack    = NULL;   //Back surface
+static LPDIRECTDRAWCLIPPER g_lpddclipper;           //clipper object, can only be used without overlay
+static DDSURFACEDESC2 ddsdsf;                           //surface descripiton needed for locking
+static HINSTANCE hddraw_dll;                        //handle to ddraw.dll
+static RECT rd;                                     //rect of our stretched image
+static RECT rs;                                     //rect of our source image
+static HBRUSH colorbrush = NULL;                    // Handle to colorkey brush
+static HBRUSH blackbrush = NULL;                    // Handle to black brush
 static uint32_t image_width, image_height;          //image width and height
-static uint8_t  *image=NULL;                        //image data
-static void* tmp_image = NULL;
-static uint32_t image_format=0;                       //image format
+static uint8_t *image        = NULL;                //image data
+static void *tmp_image       = NULL;
+static uint32_t image_format = 0;                       //image format
 static uint32_t primary_image_format;
-static uint32_t vm_height=0;
-static uint32_t vm_width=0;
-static uint32_t vm_bpp=0;
+static uint32_t vm_height = 0;
+static uint32_t vm_width  = 0;
+static uint32_t vm_bpp    = 0;
 static uint32_t dstride;                            //surface stride
 static uint32_t nooverlay = 0;                      //NonOverlay mode
-static DWORD    destcolorkey;                       //colorkey for our surface
-static COLORREF windowcolor = RGB(0,0,16);          //windowcolor == colorkey
-static int adapter_count=0;
+static DWORD destcolorkey;                          //colorkey for our surface
+static COLORREF windowcolor = RGB(0, 0, 16);          //windowcolor == colorkey
+static int adapter_count    = 0;
 static GUID selected_guid;
 static GUID *selected_guid_ptr = NULL;
 
@@ -70,296 +70,291 @@ static GUID *selected_guid_ptr = NULL;
  * the linking stage.
  *****************************************************************************/
 #define IID_IDirectDraw7 MP_IID_IDirectDraw7
-static const GUID MP_IID_IDirectDraw7 =
-{
-	0x15e65ec0,0x3b9c,0x11d2,{0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b}
+static const GUID MP_IID_IDirectDraw7 = {
+    0x15e65ec0, 0x3b9c, 0x11d2, { 0xb9, 0x2f, 0x00, 0x60, 0x97, 0x97, 0xea, 0x5b }
 };
 
 #define IID_IDirectDrawColorControl MP_IID_IDirectDrawColorControl
-static const GUID MP_IID_IDirectDrawColorControl =
-{
-	0x4b9f0ee0,0x0d7e,0x11d0,{0x9b,0x06,0x00,0xa0,0xc9,0x03,0xa3,0xb8}
+static const GUID MP_IID_IDirectDrawColorControl = {
+    0x4b9f0ee0, 0x0d7e, 0x11d0, { 0x9b, 0x06, 0x00, 0xa0, 0xc9, 0x03, 0xa3, 0xb8 }
 };
 
-
-typedef struct directx_fourcc_caps
-{
-   char*  img_format_name;      //human readable name
-   uint32_t img_format;         //as MPlayer image format
-   uint32_t drv_caps;           //what hw supports with this format
-   DDPIXELFORMAT g_ddpfOverlay; //as Directx Sourface description
-} directx_fourcc_caps;
-
-
-static directx_fourcc_caps g_ddpf[] =
-{
-	{"YV12 ",IMGFMT_YV12 ,0,{sizeof(DDPIXELFORMAT), DDPF_FOURCC,MAKEFOURCC('Y','V','1','2'),0,0,0,0,0}},
-	{"I420 ",IMGFMT_I420 ,0,{sizeof(DDPIXELFORMAT), DDPF_FOURCC,MAKEFOURCC('I','4','2','0'),0,0,0,0,0}},   //yv12 with swapped uv
-	{"IYUV ",IMGFMT_IYUV ,0,{sizeof(DDPIXELFORMAT), DDPF_FOURCC,MAKEFOURCC('I','Y','U','V'),0,0,0,0,0}},   //same as i420
-	{"YVU9 ",IMGFMT_YVU9 ,0,{sizeof(DDPIXELFORMAT), DDPF_FOURCC,MAKEFOURCC('Y','V','U','9'),0,0,0,0,0}},
-	{"YUY2 ",IMGFMT_YUY2 ,0,{sizeof(DDPIXELFORMAT), DDPF_FOURCC,MAKEFOURCC('Y','U','Y','2'),0,0,0,0,0}},
-	{"UYVY ",IMGFMT_UYVY ,0,{sizeof(DDPIXELFORMAT), DDPF_FOURCC,MAKEFOURCC('U','Y','V','Y'),0,0,0,0,0}},
- 	{"BGR8 ",IMGFMT_BGR8 ,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 8,  0x00000000, 0x00000000, 0x00000000, 0}},
-	{"RGB15",IMGFMT_RGB15,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16,  0x0000001F, 0x000003E0, 0x00007C00, 0}},   //RGB 5:5:5
-	{"BGR15",IMGFMT_BGR15,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16,  0x00007C00, 0x000003E0, 0x0000001F, 0}},
-	{"RGB16",IMGFMT_RGB16,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16,  0x0000001F, 0x000007E0, 0x0000F800, 0}},   //RGB 5:6:5
-    {"BGR16",IMGFMT_BGR16,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16,  0x0000F800, 0x000007E0, 0x0000001F, 0}},
-	{"RGB24",IMGFMT_RGB24,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24,  0x000000FF, 0x0000FF00, 0x00FF0000, 0}},
-    {"BGR24",IMGFMT_BGR24,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24,  0x00FF0000, 0x0000FF00, 0x000000FF, 0}},
-    {"RGB32",IMGFMT_RGB32,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32,  0x000000FF, 0x0000FF00, 0x00FF0000, 0}},
-    {"BGR32",IMGFMT_BGR32,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32,  0x00FF0000, 0x0000FF00, 0x000000FF, 0}}
+struct directx_fourcc_caps {
+    char img_format_name[6];    //human readable name
+    uint32_t img_format;        //as MPlayer image format
+    DDPIXELFORMAT g_ddpfOverlay; //as Directx Sourface description
+} static const g_ddpf[] = {
+    { "YV12 ", IMGFMT_YV12,  { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('Y', 'V', '1', '2'), 0, 0, 0, 0, 0 } },
+    { "I420 ", IMGFMT_I420,  { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('I', '4', '2', '0'), 0, 0, 0, 0, 0 } }, //yv12 with swapped uv
+    { "IYUV ", IMGFMT_IYUV,  { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('I', 'Y', 'U', 'V'), 0, 0, 0, 0, 0 } }, //same as i420
+    { "YVU9 ", IMGFMT_YVU9,  { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('Y', 'V', 'U', '9'), 0, 0, 0, 0, 0 } },
+    { "YUY2 ", IMGFMT_YUY2,  { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('Y', 'U', 'Y', '2'), 0, 0, 0, 0, 0 } },
+    { "UYVY ", IMGFMT_UYVY,  { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('U', 'Y', 'V', 'Y'), 0, 0, 0, 0, 0 } },
+    { "BGR8 ", IMGFMT_BGR8,  { sizeof(DDPIXELFORMAT), DDPF_RGB,    0,  8,  0x00000000, 0x00000000, 0x00000000, 0 } },
+    { "RGB15", IMGFMT_RGB15, { sizeof(DDPIXELFORMAT), DDPF_RGB,    0,  16, 0x0000001F, 0x000003E0, 0x00007C00, 0 } }, //RGB 5:5:5
+    { "BGR15", IMGFMT_BGR15, { sizeof(DDPIXELFORMAT), DDPF_RGB,    0,  16, 0x00007C00, 0x000003E0, 0x0000001F, 0 } },
+    { "RGB16", IMGFMT_RGB16, { sizeof(DDPIXELFORMAT), DDPF_RGB,    0,  16, 0x0000001F, 0x000007E0, 0x0000F800, 0 } }, //RGB 5:6:5
+    { "BGR16", IMGFMT_BGR16, { sizeof(DDPIXELFORMAT), DDPF_RGB,    0,  16, 0x0000F800, 0x000007E0, 0x0000001F, 0 } },
+    { "RGB24", IMGFMT_RGB24, { sizeof(DDPIXELFORMAT), DDPF_RGB,    0,  24, 0x000000FF, 0x0000FF00, 0x00FF0000, 0 } },
+    { "BGR24", IMGFMT_BGR24, { sizeof(DDPIXELFORMAT), DDPF_RGB,    0,  24, 0x00FF0000, 0x0000FF00, 0x000000FF, 0 } },
+    { "RGB32", IMGFMT_RGB32, { sizeof(DDPIXELFORMAT), DDPF_RGB,    0,  32, 0x000000FF, 0x0000FF00, 0x00FF0000, 0 } },
+    { "BGR32", IMGFMT_BGR32, { sizeof(DDPIXELFORMAT), DDPF_RGB,    0,  32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0 } }
 };
 #define NUM_FORMATS (sizeof(g_ddpf) / sizeof(g_ddpf[0]))
 
-static const vo_info_t info =
-{
-	"Directx DDraw YUV/RGB/BGR renderer",
-	"directx",
-	"Sascha Sommer <saschasommer@freenet.de>",
-	""
+// what hw supports with corresponding format in g_ddpf
+static uint32_t drv_caps[NUM_FORMATS];
+
+static const vo_info_t info = {
+    "Directx DDraw YUV/RGB/BGR renderer",
+    "directx",
+    "Sascha Sommer <saschasommer@freenet.de>",
+    ""
 };
 
 const LIBVO_EXTERN(directx)
 
 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
-		unsigned char *srca, int stride)
+                       unsigned char *srca, int stride)
 {
-    switch(image_format) {
-    case IMGFMT_YV12 :
-    case IMGFMT_I420 :
-	case IMGFMT_IYUV :
-	case IMGFMT_YVU9 :
-    	vo_draw_alpha_yv12(w,h,src,srca,stride,((uint8_t *) image) + dstride*y0 + x0,dstride);
-	break;
-	case IMGFMT_YUY2 :
-	    vo_draw_alpha_yuy2(w,h,src,srca,stride,((uint8_t *) image)+ dstride*y0 + 2*x0 ,dstride);
-    break;
-    case IMGFMT_UYVY :
-        vo_draw_alpha_yuy2(w,h,src,srca,stride,((uint8_t *) image) + dstride*y0 + 2*x0 + 1,dstride);
-    break;
-	case IMGFMT_RGB15:
+    switch (image_format) {
+    case IMGFMT_YV12:
+    case IMGFMT_I420:
+    case IMGFMT_IYUV:
+    case IMGFMT_YVU9:
+        vo_draw_alpha_yv12(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + x0, dstride);
+        break;
+    case IMGFMT_YUY2:
+        vo_draw_alpha_yuy2(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0, dstride);
+        break;
+    case IMGFMT_UYVY:
+        vo_draw_alpha_yuy2(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0 + 1, dstride);
+        break;
+    case IMGFMT_RGB15:
     case IMGFMT_BGR15:
-		vo_draw_alpha_rgb15(w,h,src,srca,stride,((uint8_t *) image)+dstride*y0+2*x0,dstride);
-    break;
+        vo_draw_alpha_rgb15(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0, dstride);
+        break;
     case IMGFMT_RGB16:
-	case IMGFMT_BGR16:
-        vo_draw_alpha_rgb16(w,h,src,srca,stride,((uint8_t *) image)+dstride*y0+2*x0,dstride);
-    break;
+    case IMGFMT_BGR16:
+        vo_draw_alpha_rgb16(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0, dstride);
+        break;
     case IMGFMT_RGB24:
-	case IMGFMT_BGR24:
-        vo_draw_alpha_rgb24(w,h,src,srca,stride,((uint8_t *) image)+dstride*y0+4*x0,dstride);
-    break;
+    case IMGFMT_BGR24:
+        vo_draw_alpha_rgb24(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 4 * x0, dstride);
+        break;
     case IMGFMT_RGB32:
-	case IMGFMT_BGR32:
-        vo_draw_alpha_rgb32(w,h,src,srca,stride,((uint8_t *) image)+dstride*y0+4*x0,dstride);
-    break;
+    case IMGFMT_BGR32:
+        vo_draw_alpha_rgb32(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 4 * x0, dstride);
+        break;
     }
 }
 
 static void draw_osd(void)
 {
-    vo_draw_text(image_width,image_height,draw_alpha);
+    vo_draw_text(image_width, image_height, draw_alpha);
 }
 
-static int
-query_format(uint32_t format)
+static int query_format(uint32_t format)
 {
-    uint32_t i=0;
-    while ( i < NUM_FORMATS )
-    {
-		if (g_ddpf[i].img_format == format)
-		    return g_ddpf[i].drv_caps;
-	    i++;
-    }
+    int i;
+    for (i = 0; i < NUM_FORMATS; i++)
+        if (g_ddpf[i].img_format == format)
+            return drv_caps[i];
     return 0;
 }
 
+struct errmap {
+    HRESULT err;
+    const char *errstr;
+} static const dd_errmap[] = {
+    {DDERR_INCOMPATIBLEPRIMARY, "incompatible primary surface"},
+    {DDERR_INVALIDCAPS, "invalid caps"},
+    {DDERR_INVALIDOBJECT, "invalid object"},
+    {DDERR_INVALIDPARAMS, "invalid parameters"},
+    {DDERR_INVALIDRECT, "invalid rectangle"},
+    {DDERR_INVALIDSURFACETYPE, "invalid surfacetype"},
+    {DDERR_NODIRECTDRAWHW, "no directdraw hardware"},
+    {DDERR_NOEMULATION, "can't emulate"},
+    {DDERR_NOFLIPHW, "hardware can't do flip"},
+    {DDERR_NOOVERLAYHW, "hardware can't do overlay"},
+    {DDERR_NOSTRETCHHW, "hardware can't stretch: try to size the window back"},
+    {DDERR_OUTOFMEMORY, "not enough system memory"},
+    {DDERR_OUTOFVIDEOMEMORY, "not enough video memory"},
+    {DDERR_UNSUPPORTED, "unsupported"},
+    {DDERR_UNSUPPORTEDMODE, "unsupported mode"},
+    {DDERR_HEIGHTALIGN, "height align"},
+    {DDERR_XALIGN, "x align"},
+    {DDERR_SURFACELOST, "surfaces lost"},
+    {0, NULL}
+};
+
+static const char *dd_errstr(HRESULT res)
+{
+    int i;
+    for (i = 0; dd_errmap[i].errstr; i++)
+        if (dd_errmap[i].err == res)
+            return dd_errmap[i].errstr;
+    return "unknown error";
+}
+
 static uint32_t Directx_CreatePrimarySurface(void)
 {
-    DDSURFACEDESC2   ddsd;
+    DDSURFACEDESC2 ddsd = { .dwSize = sizeof(ddsd) };
     //cleanup
-	if(g_lpddsPrimary)g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary);
-	g_lpddsPrimary=NULL;
+    if (g_lpddsPrimary)
+        g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary);
+    g_lpddsPrimary = NULL;
 
-    if(vidmode)g_lpdd->lpVtbl->SetDisplayMode(g_lpdd,vm_width,vm_height,vm_bpp,vo_refresh_rate,0);
-    ZeroMemory(&ddsd, sizeof(ddsd));
-    ddsd.dwSize = sizeof(ddsd);
+    if (vidmode)
+        g_lpdd->lpVtbl->SetDisplayMode(g_lpdd, vm_width, vm_height, vm_bpp, vo_refresh_rate, 0);
     //set flags and create a primary surface.
     ddsd.dwFlags = DDSD_CAPS;
     ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-    if(g_lpdd->lpVtbl->CreateSurface(g_lpdd,&ddsd, &g_lpddsPrimary, NULL )== DD_OK)
-		mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>primary surface created\n");
-	else
-	{
-		mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>could not create primary surface\n");
-		return 1;
-	}
-	return 0;
+    if (g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsd, &g_lpddsPrimary, NULL) == DD_OK)
+        mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>primary surface created\n");
+    else {
+        mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>could not create primary surface\n");
+        return 1;
+    }
+    return 0;
 }
 
 static uint32_t Directx_CreateOverlay(uint32_t imgfmt)
 {
     HRESULT ddrval;
-    DDSURFACEDESC2   ddsdOverlay;
-    uint32_t        i=0;
-	while ( i < NUM_FORMATS && imgfmt != g_ddpf[i].img_format)
-	{
-		i++;
-	}
-	if (!g_lpdd || !g_lpddsPrimary || i == NUM_FORMATS)
+    DDSURFACEDESC2 ddsdOverlay = {
+        .dwSize = sizeof(ddsdOverlay),
+        .ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_VIDEOMEMORY,
+        .dwFlags  = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_BACKBUFFERCOUNT | DDSD_PIXELFORMAT,
+        .dwWidth  = image_width,
+        .dwHeight = image_height,
+        .dwBackBufferCount = 2,
+    };
+    uint32_t i = 0;
+    while (i < NUM_FORMATS && imgfmt != g_ddpf[i].img_format)
+        i++;
+    if (!g_lpdd || !g_lpddsPrimary || i == NUM_FORMATS)
         return 1;
     //cleanup
-	if (g_lpddsOverlay)g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay);
-	if (g_lpddsBack)g_lpddsBack->lpVtbl->Release(g_lpddsBack);
-	g_lpddsOverlay= NULL;
-	g_lpddsBack = NULL;
-	//create our overlay
-    ZeroMemory(&ddsdOverlay, sizeof(ddsdOverlay));
-    ddsdOverlay.dwSize = sizeof(ddsdOverlay);
-    ddsdOverlay.ddsCaps.dwCaps=DDSCAPS_OVERLAY | DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_VIDEOMEMORY;
-    ddsdOverlay.dwFlags= DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH|DDSD_BACKBUFFERCOUNT| DDSD_PIXELFORMAT;
-    ddsdOverlay.dwWidth=image_width;
-    ddsdOverlay.dwHeight=image_height;
-    ddsdOverlay.dwBackBufferCount=2;
-	ddsdOverlay.ddpfPixelFormat=g_ddpf[i].g_ddpfOverlay;
-	if(vo_doublebuffering)   //tribblebuffering
-	{
-		if (g_lpdd->lpVtbl->CreateSurface(g_lpdd,&ddsdOverlay, &g_lpddsOverlay, NULL)== DD_OK)
-		{
-			mp_msg(MSGT_VO, MSGL_V,"<vo_directx><INFO>overlay with format %s created\n",g_ddpf[i].img_format_name);
+    if (g_lpddsOverlay)
+        g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay);
+    if (g_lpddsBack)
+        g_lpddsBack->lpVtbl->Release(g_lpddsBack);
+    g_lpddsOverlay = NULL;
+    g_lpddsBack    = NULL;
+    //create our overlay
+    ddsdOverlay.ddpfPixelFormat   = g_ddpf[i].g_ddpfOverlay;
+    if (vo_doublebuffering) {    //tribblebuffering
+        if (g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsdOverlay, &g_lpddsOverlay, NULL) == DD_OK) {
+            mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>overlay with format %s created\n", g_ddpf[i].img_format_name);
             //get the surface directly attached to the primary (the back buffer)
             ddsdOverlay.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER;
-            if(g_lpddsOverlay->lpVtbl->GetAttachedSurface(g_lpddsOverlay,&ddsdOverlay.ddsCaps, &g_lpddsBack) != DD_OK)
-			{
-				mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>can't get attached surface\n");
-				return 1;
-			}
-			return 0;
-		}
-		vo_doublebuffering=0; //disable tribblebuffering
-		mp_msg(MSGT_VO, MSGL_V,"<vo_directx><WARN>cannot create tribblebuffer overlay with format %s\n",g_ddpf[i].img_format_name);
-	}
-	//single buffer
-	mp_msg(MSGT_VO, MSGL_V,"<vo_directx><INFO>using singlebuffer overlay\n");
-    ddsdOverlay.dwBackBufferCount=0;
-    ddsdOverlay.ddsCaps.dwCaps=DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY;
-    ddsdOverlay.dwFlags= DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT;
-    ddsdOverlay.ddpfPixelFormat=g_ddpf[i].g_ddpfOverlay;
-	// try to create the overlay surface
-	ddrval = g_lpdd->lpVtbl->CreateSurface(g_lpdd,&ddsdOverlay, &g_lpddsOverlay, NULL);
-	if(ddrval != DD_OK)
-	{
-	   if(ddrval == DDERR_INVALIDPIXELFORMAT)mp_msg(MSGT_VO,MSGL_V,"<vo_directx><ERROR> invalid pixelformat: %s\n",g_ddpf[i].img_format_name);
-       else mp_msg(MSGT_VO, MSGL_ERR,"<vo_directx><ERROR>");
-       switch(ddrval)
-	   {
-	      case DDERR_INCOMPATIBLEPRIMARY:
-			 {mp_msg(MSGT_VO, MSGL_ERR,"incompatible primary surface\n");break;}
-		  case DDERR_INVALIDCAPS:
-			 {mp_msg(MSGT_VO, MSGL_ERR,"invalid caps\n");break;}
-	      case DDERR_INVALIDOBJECT:
-		     {mp_msg(MSGT_VO, MSGL_ERR,"invalid object\n");break;}
-	      case DDERR_INVALIDPARAMS:
-		     {mp_msg(MSGT_VO, MSGL_ERR,"invalid parameters\n");break;}
-	      case DDERR_NODIRECTDRAWHW:
-		     {mp_msg(MSGT_VO, MSGL_ERR,"no directdraw hardware\n");break;}
-	      case DDERR_NOEMULATION:
-		     {mp_msg(MSGT_VO, MSGL_ERR,"can't emulate\n");break;}
-	      case DDERR_NOFLIPHW:
-		     {mp_msg(MSGT_VO, MSGL_ERR,"hardware can't do flip\n");break;}
-	      case DDERR_NOOVERLAYHW:
-		     {mp_msg(MSGT_VO, MSGL_ERR,"hardware can't do overlay\n");break;}
-	      case DDERR_OUTOFMEMORY:
-		     {mp_msg(MSGT_VO, MSGL_ERR,"not enough system memory\n");break;}
-	      case DDERR_UNSUPPORTEDMODE:
-			 {mp_msg(MSGT_VO, MSGL_ERR,"unsupported mode\n");break;}
-		  case DDERR_OUTOFVIDEOMEMORY:
-			 {mp_msg(MSGT_VO, MSGL_ERR,"not enough video memory\n");break;}
-          default:
-             mp_msg(MSGT_VO, MSGL_ERR,"create surface failed with 0x%xu\n",(unsigned)ddrval);
-	   }
-	   return 1;
-	}
+            if (g_lpddsOverlay->lpVtbl->GetAttachedSurface(g_lpddsOverlay, &ddsdOverlay.ddsCaps, &g_lpddsBack) != DD_OK) {
+                mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't get attached surface\n");
+                return 1;
+            }
+            return 0;
+        }
+        vo_doublebuffering = 0;       //disable tribblebuffering
+        mp_msg(MSGT_VO, MSGL_V, "<vo_directx><WARN>cannot create tribblebuffer overlay with format %s\n", g_ddpf[i].img_format_name);
+    }
+    //single buffer
+    mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>using singlebuffer overlay\n");
+    ddsdOverlay.dwBackBufferCount = 0;
+    ddsdOverlay.ddsCaps.dwCaps    = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY;
+    ddsdOverlay.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT;
+    ddsdOverlay.ddpfPixelFormat = g_ddpf[i].g_ddpfOverlay;
+    // try to create the overlay surface
+    ddrval = g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsdOverlay, &g_lpddsOverlay, NULL);
+    if (ddrval != DD_OK) {
+        if (ddrval == DDERR_INVALIDPIXELFORMAT)
+            mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR> invalid pixelformat: %s\n", g_ddpf[i].img_format_name);
+        else
+            mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>create surface failed: %s (0x%x)\n", dd_errstr(ddrval), (unsigned int)ddrval);
+        return 1;
+    }
     g_lpddsBack = g_lpddsOverlay;
-	return 0;
+    return 0;
 }
 
 static uint32_t Directx_CreateBackpuffer(void)
 {
-    DDSURFACEDESC2   ddsd;
-	//cleanup
-	if (g_lpddsBack)g_lpddsBack->lpVtbl->Release(g_lpddsBack);
-	g_lpddsBack=NULL;
-	ZeroMemory(&ddsd, sizeof(ddsd));
-    ddsd.dwSize = sizeof(ddsd);
-    ddsd.ddsCaps.dwCaps= DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
-    ddsd.dwFlags= DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
-    ddsd.dwWidth=image_width;
-    ddsd.dwHeight=image_height;
-    if(g_lpdd->lpVtbl->CreateSurface( g_lpdd, &ddsd, &g_lpddsBack, 0 ) != DD_OK )
-	{
-		mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>can't create backpuffer\n");
-		return 1;
-	}
-    mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>backbuffer created\n");
-	return 0;
+    DDSURFACEDESC2 ddsd = {
+        .dwSize = sizeof(ddsd),
+        .ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY,
+        .dwFlags  = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT,
+        .dwWidth  = image_width,
+        .dwHeight = image_height,
+    };
+    //cleanup
+    if (g_lpddsBack)
+        g_lpddsBack->lpVtbl->Release(g_lpddsBack);
+    g_lpddsBack = NULL;
+    if (g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsd, &g_lpddsBack, 0) != DD_OK) {
+        mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't create backpuffer\n");
+        return 1;
+    }
+    mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>backbuffer created\n");
+    return 0;
 }
 
 static void uninit(void)
 {
-	if (g_cc != NULL)
-	{
-		g_cc->lpVtbl->Release(g_cc);
-	}
-	g_cc=NULL;
-	if (g_lpddclipper != NULL) g_lpddclipper->lpVtbl->Release(g_lpddclipper);
-	g_lpddclipper = NULL;
-	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>clipper released\n");
-	if (g_lpddsBack != NULL) g_lpddsBack->lpVtbl->Release(g_lpddsBack);
-	g_lpddsBack = NULL;
-	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>back surface released\n");
-	if(vo_doublebuffering && !nooverlay)
-	{
-		if (g_lpddsOverlay != NULL)g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay);
+    if (g_cc)
+        g_cc->lpVtbl->Release(g_cc);
+    g_cc = NULL;
+    if (g_lpddclipper)
+        g_lpddclipper->lpVtbl->Release(g_lpddclipper);
+    g_lpddclipper = NULL;
+    mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>clipper released\n");
+    if (g_lpddsBack)
+        g_lpddsBack->lpVtbl->Release(g_lpddsBack);
+    g_lpddsBack = NULL;
+    mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>back surface released\n");
+    if (vo_doublebuffering && !nooverlay) {
+        if (g_lpddsOverlay)
+            g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay);
         g_lpddsOverlay = NULL;
-		mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>overlay surface released\n");
-	}
-	if (g_lpddsPrimary != NULL) g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary);
+        mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>overlay surface released\n");
+    }
+    if (g_lpddsPrimary)
+        g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary);
     g_lpddsPrimary = NULL;
-	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>primary released\n");
-	if (colorbrush) DeleteObject(colorbrush);
-	colorbrush = NULL;
-	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>GDI resources deleted\n");
-	if (g_lpdd != NULL){
-	    if(vidmode)g_lpdd->lpVtbl->RestoreDisplayMode(g_lpdd);
-	    g_lpdd->lpVtbl->Release(g_lpdd);
-	}
-	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>directdrawobject released\n");
-	FreeLibrary( hddraw_dll);
-	hddraw_dll= NULL;
-	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>ddraw.dll freed\n");
-	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>uninitialized\n");
-	vo_w32_uninit();
+    mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>primary released\n");
+    if (colorbrush)
+        DeleteObject(colorbrush);
+    colorbrush = NULL;
+    mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>GDI resources deleted\n");
+    if (g_lpdd) {
+        if (vidmode)
+            g_lpdd->lpVtbl->RestoreDisplayMode(g_lpdd);
+        g_lpdd->lpVtbl->Release(g_lpdd);
+    }
+    mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>directdrawobject released\n");
+    FreeLibrary(hddraw_dll);
+    hddraw_dll = NULL;
+    mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>ddraw.dll freed\n");
+    mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>uninitialized\n");
+    vo_w32_uninit();
 }
 
-static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR  hm)
+static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm)
 {
     if (!lpGUID)
         lpDriverDescription = "Primary Display Adapter";
-    mp_msg(MSGT_VO, MSGL_INFO ,"<vo_directx> adapter %d: %s", adapter_count, lpDriverDescription);
+    mp_msg(MSGT_VO, MSGL_INFO, "<vo_directx> adapter %d: %s", adapter_count, lpDriverDescription);
 
-    if(adapter_count == vo_adapter_num){
+    if (adapter_count == vo_adapter_num) {
         if (!lpGUID)
             selected_guid_ptr = NULL;
-        else
-        {
-            selected_guid = *lpGUID;
+        else {
+            selected_guid     = *lpGUID;
             selected_guid_ptr = &selected_guid;
         }
 
-        mp_msg(MSGT_VO, MSGL_INFO ,"\t\t<--");
+        mp_msg(MSGT_VO, MSGL_INFO, "\t\t<--");
     }
-    mp_msg(MSGT_VO, MSGL_INFO ,"\n");
+    mp_msg(MSGT_VO, MSGL_INFO, "\n");
 
     adapter_count++;
 
@@ -368,265 +363,242 @@ static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, L
 
 static uint32_t Directx_InitDirectDraw(void)
 {
-	HRESULT    (WINAPI *OurDirectDrawCreateEx)(GUID *,LPVOID *, REFIID,IUnknown FAR *);
-	DDSURFACEDESC2 ddsd;
-	LPDIRECTDRAWENUMERATEEX OurDirectDrawEnumerateEx;
+    HRESULT (WINAPI *OurDirectDrawCreateEx)(GUID *, LPVOID *, REFIID, IUnknown FAR *);
+    DDSURFACEDESC2 ddsd = {
+        .dwSize  = sizeof(ddsd),
+        .dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT,
+    };
+    LPDIRECTDRAWENUMERATEEX OurDirectDrawEnumerateEx;
 
-	adapter_count = 0;
+    adapter_count = 0;
 
-	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>Initing DirectDraw\n" );
+    mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>Initing DirectDraw\n");
 
-	//load direct draw DLL: based on videolans code
-	hddraw_dll = LoadLibrary("DDRAW.DLL");
-	if( hddraw_dll == NULL )
-    {
-        mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>failed loading ddraw.dll\n" );
-		return 1;
+    //load direct draw DLL: based on videolans code
+    hddraw_dll = LoadLibrary("DDRAW.DLL");
+    if (!hddraw_dll) {
+        mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>failed loading ddraw.dll\n");
+        return 1;
     }
 
-	if(vo_adapter_num){ //display other than default
-        OurDirectDrawEnumerateEx = (LPDIRECTDRAWENUMERATEEX) GetProcAddress(hddraw_dll,"DirectDrawEnumerateExA");
-        if (!OurDirectDrawEnumerateEx){
-            FreeLibrary( hddraw_dll );
+    if (vo_adapter_num) {   //display other than default
+        OurDirectDrawEnumerateEx = (LPDIRECTDRAWENUMERATEEX)GetProcAddress(hddraw_dll, "DirectDrawEnumerateExA");
+        if (!OurDirectDrawEnumerateEx) {
+            FreeLibrary(hddraw_dll);
             hddraw_dll = NULL;
-            mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>failed geting proc address: DirectDrawEnumerateEx\n");
-            mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>no directx 7 or higher installed\n");
+            mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>failed geting proc address: DirectDrawEnumerateEx\n");
+            mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>no directx 7 or higher installed\n");
             return 1;
         }
 
         // enumerate all display devices attached to the desktop
-        OurDirectDrawEnumerateEx(EnumCallbackEx, NULL, DDENUM_ATTACHEDSECONDARYDEVICES );
+        OurDirectDrawEnumerateEx(EnumCallbackEx, NULL, DDENUM_ATTACHEDSECONDARYDEVICES);
 
-        if(vo_adapter_num >= adapter_count)
-            mp_msg(MSGT_VO, MSGL_ERR,"Selected adapter (%d) doesn't exist: Default Display Adapter selected\n",vo_adapter_num);
+        if (vo_adapter_num >= adapter_count)
+            mp_msg(MSGT_VO, MSGL_ERR, "Selected adapter (%d) doesn't exist: Default Display Adapter selected\n", vo_adapter_num);
     }
 
-	OurDirectDrawCreateEx = (void *)GetProcAddress(hddraw_dll, "DirectDrawCreateEx");
-    if ( OurDirectDrawCreateEx == NULL )
-     {
-         FreeLibrary( hddraw_dll );
-         hddraw_dll = NULL;
-        mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>failed geting proc address: DirectDrawCreateEx\n");
- 		return 1;
-     }
-
-	// initialize DirectDraw and create directx v7 object
-    if (OurDirectDrawCreateEx(selected_guid_ptr, (VOID**)&g_lpdd, &IID_IDirectDraw7, NULL ) != DD_OK )
-    {
-        FreeLibrary( hddraw_dll );
+    OurDirectDrawCreateEx = (void *)GetProcAddress(hddraw_dll, "DirectDrawCreateEx");
+    if (!OurDirectDrawCreateEx) {
+        FreeLibrary(hddraw_dll);
         hddraw_dll = NULL;
-        mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>can't initialize ddraw\n");
-		return 1;
+        mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>failed geting proc address: DirectDrawCreateEx\n");
+        return 1;
     }
 
-	//get current screen siz for selected monitor ...
-	ddsd.dwSize=sizeof(ddsd);
-	ddsd.dwFlags=DDSD_WIDTH|DDSD_HEIGHT|DDSD_PIXELFORMAT;
-	g_lpdd->lpVtbl->GetDisplayMode(g_lpdd, &ddsd);
-	if(vo_screenwidth && vo_screenheight)
-	{
-	    vm_height=vo_screenheight;
-	    vm_width=vo_screenwidth;
-	}
-    else
-    {
-	    vm_height=ddsd.dwHeight;
-	    vm_width=ddsd.dwWidth;
-	}
+    // initialize DirectDraw and create directx v7 object
+    if (OurDirectDrawCreateEx(selected_guid_ptr, (VOID **)&g_lpdd, &IID_IDirectDraw7, NULL) != DD_OK) {
+        FreeLibrary(hddraw_dll);
+        hddraw_dll = NULL;
+        mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't initialize ddraw\n");
+        return 1;
+    }
 
+    //get current screen siz for selected monitor ...
+    g_lpdd->lpVtbl->GetDisplayMode(g_lpdd, &ddsd);
+    if (vo_screenwidth && vo_screenheight) {
+        vm_height = vo_screenheight;
+        vm_width  = vo_screenwidth;
+    } else {
+        vm_height = ddsd.dwHeight;
+        vm_width  = ddsd.dwWidth;
+    }
 
-	if(vo_dbpp)vm_bpp=vo_dbpp;
-	else vm_bpp=ddsd.ddpfPixelFormat.dwRGBBitCount;
+    if (vo_dbpp)
+        vm_bpp = vo_dbpp;
+    else
+        vm_bpp = ddsd.ddpfPixelFormat.dwRGBBitCount;
 
-	if(vidmode){
-		if (g_lpdd->lpVtbl->SetCooperativeLevel(g_lpdd, vo_w32_window, DDSCL_EXCLUSIVE|DDSCL_FULLSCREEN) != DD_OK)
-		{
-	        mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>can't set cooperativelevel for exclusive mode\n");
+    if (vidmode) {
+        if (g_lpdd->lpVtbl->SetCooperativeLevel(g_lpdd, vo_w32_window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN) != DD_OK) {
+            mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't set cooperativelevel for exclusive mode\n");
+            return 1;
+        }
+        /*SetDisplayMode(ddobject,width,height,bpp,refreshrate,aditionalflags)*/
+        if (g_lpdd->lpVtbl->SetDisplayMode(g_lpdd, vm_width, vm_height, vm_bpp, 0, 0) != DD_OK) {
+            mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't set displaymode\n");
             return 1;
-		}
-		/*SetDisplayMode(ddobject,width,height,bpp,refreshrate,aditionalflags)*/
-		if(g_lpdd->lpVtbl->SetDisplayMode(g_lpdd,vm_width, vm_height, vm_bpp,0,0) != DD_OK)
-		{
-	        mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>can't set displaymode\n");
-	        return 1;
-		}
-	    mp_msg(MSGT_VO, MSGL_V,"<vo_directx><INFO>Initialized adapter %i for %i x %i @ %i \n",vo_adapter_num,vm_width,vm_height,vm_bpp);
-	    return 0;
-	}
-	if (g_lpdd->lpVtbl->SetCooperativeLevel(g_lpdd, vo_w32_window, DDSCL_NORMAL) != DD_OK) // or DDSCL_SETFOCUSWINDOW
-     {
-        mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>could not set cooperativelevel for hardwarecheck\n");
-		return 1;
+        }
+        mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>Initialized adapter %i for %i x %i @ %i \n", vo_adapter_num, vm_width, vm_height, vm_bpp);
+        return 0;
     }
-    mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>DirectDraw Initialized\n");
-	return 0;
+    if (g_lpdd->lpVtbl->SetCooperativeLevel(g_lpdd, vo_w32_window, DDSCL_NORMAL) != DD_OK) {   // or DDSCL_SETFOCUSWINDOW
+        mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>could not set cooperativelevel for hardwarecheck\n");
+        return 1;
+    }
+    mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>DirectDraw Initialized\n");
+    return 0;
 }
 
 static uint32_t Directx_ManageDisplay(void)
 {
-    HRESULT         ddrval;
-    DDCAPS          capsDrv;
-    DDOVERLAYFX     ovfx;
-    DWORD           dwUpdateFlags=0;
-    int width,height;
+    HRESULT ddrval;
+    DDCAPS capsDrv = { .dwSize = sizeof(capsDrv) };
+    DDOVERLAYFX ovfx = { .dwSize = sizeof(ovfx) };
+    DWORD dwUpdateFlags = 0;
+    int width, height;
 
     rd.left = vo_dx - xinerama_x;
     rd.top  = vo_dy - xinerama_y;
-    width  = vo_dwidth;
-    height = vo_dheight;
+    width   = vo_dwidth;
+    height  = vo_dheight;
 
     aspect(&width, &height, A_WINZOOM);
     panscan_calc_windowed();
-    width  += vo_panscan_x;
-    height += vo_panscan_y;
-    width  = FFMIN(width,  vo_screenwidth);
-    height = FFMIN(height, vo_screenheight);
-    rd.left += (vo_dwidth  - width ) / 2;
+    width   += vo_panscan_x;
+    height  += vo_panscan_y;
+    width    = FFMIN(width, vo_screenwidth);
+    height   = FFMIN(height, vo_screenheight);
+    rd.left += (vo_dwidth - width) / 2;
     rd.top  += (vo_dheight - height) / 2;
 
-    rd.right=rd.left+width;
-    rd.bottom=rd.top+height;
-
-	/*ok, let's workaround some overlay limitations*/
-	if(!nooverlay)
-	{
-		uint32_t        uStretchFactor1000;  //minimum stretch
-        uint32_t        xstretch1000,ystretch1000;
-		/*get driver capabilities*/
-        ZeroMemory(&capsDrv, sizeof(capsDrv));
-        capsDrv.dwSize = sizeof(capsDrv);
-        if(g_lpdd->lpVtbl->GetCaps(g_lpdd,&capsDrv, NULL) != DD_OK)return 1;
-		/*get minimum stretch, depends on display adaptor and mode (refresh rate!) */
-        uStretchFactor1000 = capsDrv.dwMinOverlayStretch>1000 ? capsDrv.dwMinOverlayStretch : 1000;
-        rd.right = ((width+rd.left)*uStretchFactor1000+999)/1000;
-        rd.bottom = (height+rd.top)*uStretchFactor1000/1000;
+    rd.right  = rd.left + width;
+    rd.bottom = rd.top + height;
+
+    /*ok, let's workaround some overlay limitations*/
+    if (!nooverlay) {
+        uint32_t uStretchFactor1000;                 //minimum stretch
+        uint32_t xstretch1000, ystretch1000;
+
+        if (!width || !height) {
+            // window is minimized, so we should hide the overlay in case
+            // colorkeying is not used or working.
+            // In addition trying to set width/height to 0 would crash
+            g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay, NULL, g_lpddsPrimary, NULL, DDOVER_HIDE, NULL);
+            return 0;
+        }
+
+        /*get driver capabilities*/
+        if (g_lpdd->lpVtbl->GetCaps(g_lpdd, &capsDrv, NULL) != DD_OK)
+            return 1;
+        /*get minimum stretch, depends on display adaptor and mode (refresh rate!) */
+        uStretchFactor1000 = capsDrv.dwMinOverlayStretch > 1000 ? capsDrv.dwMinOverla