From 77ad49411af12f023e37a96bf0a3111791c67f2c Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 6 Aug 2014 20:00:26 +0200 Subject: win32: never call GetClientRect(0, ...) Sometimes GetClientRect() appeared to fail during init, and since we don't check GetClientRect() calls (because they're on our own window, and logically can never fail), bogus resizes were triggered. This could cause vo_direct3d to fail initialization. The reason was that w32->window was set to 0 during early window initialization: CreateWindow*() can send messages to the new window, even though it hasn't returned yet. This means w32->window is not yet set to our window handle, and functions in WndProc may accidentally pass hwnd=0 to win32 API functions. Fix it by initializing w32->window on opportunity. This also means we always strictly expect that the WndProc is used with our own window only. --- video/out/vo_direct3d.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'video/out/vo_direct3d.c') diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 032454eb3f..34ddafdd1e 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -772,7 +772,8 @@ static bool resize_d3d(d3d_priv *priv) { D3DVIEWPORT9 vp = {0, 0, priv->vo->dwidth, priv->vo->dheight, 0, 1}; - MP_VERBOSE(priv, "resize_d3d called.\n"); + MP_VERBOSE(priv, "resize_d3d %dx%d called.\n", + priv->vo->dwidth, priv->vo->dheight); /* Make sure that backbuffer is large enough to accomodate the new viewport dimensions. Grow it if necessary. */ -- cgit v1.2.3