[vlc-commits] vout:win32: rect_display is only used for winstore

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Apr  1 11:58:25 2019 +0200| [2f9ec493889982c8639c5abd144ab8b9320ed2ce] | committer: Steve Lhomme

vout:win32: rect_display is only used for winstore

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2f9ec493889982c8639c5abd144ab8b9320ed2ce
---

 modules/video_output/win32/common.c    | 5 +++--
 modules/video_output/win32/common.h    | 2 ++
 modules/video_output/win32/direct3d9.c | 6 ------
 modules/video_output/win32/wingdi.c    | 7 -------
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c
index 37991e31b6..66ff48ad96 100644
--- a/modules/video_output/win32/common.c
+++ b/modules/video_output/win32/common.c
@@ -76,9 +76,10 @@ int CommonInit(vout_display_t *vd, vout_display_sys_win32_t *sys, bool b_windowl
 #if !defined(NDEBUG) && defined(HAVE_DXGIDEBUG_H)
     sys->dxgidebug_dll = LoadLibrary(TEXT("DXGIDEBUG.DLL"));
 #endif
-#if !VLC_WINSTORE_APP
+#if VLC_WINSTORE_APP
+    memset(&sys->rect_display, 0, sizeof(sys->rect_display));
+#else /* !VLC_WINSTORE_APP */
     sys->pf_GetRect = GetRect;
-    SetRectEmpty(&sys->rect_display);
     SetRectEmpty(&sys->rect_parent);
 
     var_Create(vd, "disable-screensaver", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
diff --git a/modules/video_output/win32/common.h b/modules/video_output/win32/common.h
index 485e6fe674..63bee758d7 100644
--- a/modules/video_output/win32/common.h
+++ b/modules/video_output/win32/common.h
@@ -50,8 +50,10 @@ typedef struct vout_display_sys_win32_t
     HWND                 hparent;             /* Handle of the parent window */
     HWND                 hfswnd;          /* Handle of the fullscreen window */
 
+#if VLC_WINSTORE_APP
     /* size of the display */
     RECT         rect_display;
+#endif
 
     /* size of the overall window (including black bands) */
     RECT         rect_parent;
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index 26b6b6b2d6..b936226cf6 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -1483,12 +1483,6 @@ static int Direct3D9Open(vout_display_t *vd, video_format_t *fmt,
 
     const d3d9_device_t *p_d3d9_dev = &sys->d3d_dev;
     /* */
-    RECT *display = &vd->sys->sys.rect_display;
-    display->left   = 0;
-    display->top    = 0;
-    display->right  = p_d3d9_dev->pp.BackBufferWidth;
-    display->bottom = p_d3d9_dev->pp.BackBufferHeight;
-
     *fmt = vd->source;
 
     /* Find the appropriate D3DFORMAT for the render chroma, the format will be the closest to
diff --git a/modules/video_output/win32/wingdi.c b/modules/video_output/win32/wingdi.c
index ece115c72a..734d0e8084 100644
--- a/modules/video_output/win32/wingdi.c
+++ b/modules/video_output/win32/wingdi.c
@@ -183,13 +183,6 @@ static int Init(vout_display_t *vd, video_format_t *fmt)
 {
     vout_display_sys_t *sys = vd->sys;
 
-    /* */
-    RECT *display = &sys->sys.rect_display;
-    display->left   = 0;
-    display->top    = 0;
-    display->right  = GetSystemMetrics(SM_CXSCREEN);;
-    display->bottom = GetSystemMetrics(SM_CYSCREEN);;
-
     /* Initialize an offscreen bitmap for direct buffer operations. */
 
     /* */