Fix division by zero in VSync code.

Fixes DrDump problem 166588.
mpc-hc · Nov 15, 2015 · ab4c693 · ab4c693
1 parent bacd5d0
commit ab4c693
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp
@@ -687,7 +687,7 @@ HRESULT CDX9AllocatorPresenter::CreateDevice(CString& _Error)
         m_hFocusWindow = hFocusWindow;
 
         if (m_pD3DEx) {
-            m_pD3DEx->GetAdapterDisplayModeEx(m_CurrentAdapter, &DisplayMode, nullptr);
+            CHECK_HR(m_pD3DEx->GetAdapterDisplayModeEx(m_CurrentAdapter, &DisplayMode, nullptr));
 
             DisplayMode.Format = pp.BackBufferFormat;
             m_ScreenSize.SetSize(DisplayMode.Width, DisplayMode.Height);
@@ -719,7 +719,7 @@ HRESULT CDX9AllocatorPresenter::CreateDevice(CString& _Error)
             }
         }
         if (!m_pD3DDev) {
-            m_pD3D->GetAdapterDisplayMode(m_CurrentAdapter, &d3ddm);
+            CHECK_HR(m_pD3D->GetAdapterDisplayMode(m_CurrentAdapter, &d3ddm));
             d3ddm.Format = pp.BackBufferFormat;
             m_ScreenSize.SetSize(d3ddm.Width, d3ddm.Height);
             pp.FullScreen_RefreshRateInHz = m_refreshRate = d3ddm.RefreshRate;
@@ -753,7 +753,7 @@ HRESULT CDX9AllocatorPresenter::CreateDevice(CString& _Error)
         m_hFocusWindow = m_hWnd;
 
         if (m_pD3DEx) {
-            m_pD3DEx->GetAdapterDisplayModeEx(m_CurrentAdapter, &DisplayMode, nullptr);
+            CHECK_HR(m_pD3DEx->GetAdapterDisplayModeEx(m_CurrentAdapter, &DisplayMode, nullptr));
             m_ScreenSize.SetSize(DisplayMode.Width, DisplayMode.Height);
             m_refreshRate = DisplayMode.RefreshRate;
             pp.BackBufferWidth = szDesktopSize.cx;
@@ -782,7 +782,7 @@ HRESULT CDX9AllocatorPresenter::CreateDevice(CString& _Error)
             }
         }
         if (!m_pD3DDev) {
-            m_pD3D->GetAdapterDisplayMode(m_CurrentAdapter, &d3ddm);
+            CHECK_HR(m_pD3D->GetAdapterDisplayMode(m_CurrentAdapter, &d3ddm));
             m_ScreenSize.SetSize(d3ddm.Width, d3ddm.Height);
             m_refreshRate = d3ddm.RefreshRate;
             pp.BackBufferWidth = szDesktopSize.cx;
@@ -823,6 +823,11 @@ HRESULT CDX9AllocatorPresenter::CreateDevice(CString& _Error)
 
     ASSERT(m_pD3DDev);
 
+    if (m_ScreenSize.cx <= 0 || m_ScreenSize.cy <= 0) {
+        _Error += L"Invalid screen size\n";
+        return E_FAIL;
+    }
+
     m_MainThreadId = GetCurrentThreadId();
 
     // Get the device caps

diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
@@ -462,7 +462,8 @@ HRESULT CBaseAP::CreateDXDevice(CString& _Error)
 
     D3DDISPLAYMODE d3ddm;
     ZeroMemory(&d3ddm, sizeof(d3ddm));
-    if (FAILED(m_pD3D->GetAdapterDisplayMode(m_CurrentAdapter, &d3ddm))) {
+    if (FAILED(m_pD3D->GetAdapterDisplayMode(m_CurrentAdapter, &d3ddm))
+            || m_ScreenSize.cx <= 0 || m_ScreenSize.cy <= 0) {
         _Error += L"Can not retrieve display mode data\n";
         return E_UNEXPECTED;
     }
@@ -774,7 +775,8 @@ HRESULT CBaseAP::ResetDXDevice(CString& _Error)
 
     D3DDISPLAYMODE d3ddm;
     ZeroMemory(&d3ddm, sizeof(d3ddm));
-    if (FAILED(m_pD3D->GetAdapterDisplayMode(GetAdapter(m_pD3D, m_hWnd), &d3ddm))) {
+    if (FAILED(m_pD3D->GetAdapterDisplayMode(GetAdapter(m_pD3D, m_hWnd), &d3ddm))
+            || m_ScreenSize.cx <= 0 || m_ScreenSize.cy <= 0) {
         _Error += L"Can not retrieve display mode data\n";
         return E_UNEXPECTED;
     }