Minor code cleanup

microsoft · Feb 4, 2021 · 647506c · 647506c
1 parent 0148096
commit 647506c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/dxg.cpp b/dxg.cpp
@@ -1622,7 +1622,7 @@ VOID DXG_FillTree(HWND hwndTV)
                 hr = g_pD3D->GetDeviceCaps(iAdapter, devType, &caps);
                 if (FAILED(hr))
                     memset(&caps, 0, sizeof(caps));
-                pCapsCopy = new D3DCAPS9;
+                pCapsCopy = new (std::nothrow) D3DCAPS9;
                 if (!pCapsCopy)
                     continue;
                 *pCapsCopy = caps;

diff --git a/dxgi.cpp b/dxgi.cpp
@@ -839,7 +839,9 @@ namespace
 
             if (SUCCEEDED(hr) && num > 0)
             {
-                DXGI_MODE_DESC* pDescs = new DXGI_MODE_DESC[num];
+                auto pDescs = new (std::nothrow) DXGI_MODE_DESC[num];
+                if (!pDescs)
+                   return E_OUTOFMEMORY;
 
                 hr = pOutput->GetDisplayModeList(fmt, flags, &num, pDescs);
 

diff --git a/dxview.h b/dxview.h
@@ -17,6 +17,7 @@
 #include <ctime>
 #include <cstdio>
 #include <iterator>
+#include <new>
 
 #include "resource.h"