Misc minor WinRT fixes and cleanups

BUILD.gn

@@ -337,11 +337,7 @@ static_library("libANGLE") {
   if (angle_enable_d3d11) {
     sources += rebase_path(gles_gypi.libangle_d3d11_sources, ".", "src")
     sources += rebase_path(gles_gypi.libangle_d3d11_win32_sources, ".", "src")
-    libs += [
-      "dxguid.lib",
-      "Cfgmgr32.lib",
-      "setupapi.lib",
-    ]
+    libs += [ "dxguid.lib" ]
   }
 
   if (angle_enable_gl) {

build/common.gypi

@@ -103,6 +103,16 @@
                         'EnableFunctionLevelLinking': 'true',
                         'MinimalRebuild': 'false',
                         'WarningLevel': '4',
+                        'conditions':
+                        [
+                            ['angle_build_winrt==1',
+                            {
+                                # Use '/Wv:18' to avoid WRL warnings in VS2015 Update 3
+                                # Use /Gw and /Zc:threadSafeInit to avoid
+                                # LTCG-related crashes with VS2015 Update 3
+                                'AdditionalOptions': ['/Wv:18', '/Gw', '/Zc:threadSafeInit-'],
+                            }],
+                        ],
                     },
                     'VCLinkerTool':
                     {

build/gyp_angle

@@ -52,6 +52,7 @@ def generateWinRTProjects(generate_args, generation_dir, msvs_version, app_type_
     args.append('-Dangle_build_winrt_target_platform_ver=' + target_platform_ver)
     args.append('-Dangle_enable_d3d9=0')
     args.append('-Dangle_enable_gl=0')
+    args.append('-Dangle_enable_vulkan=0')
     args.append('-Dangle_enable_essl=0')
     args.append('-Dangle_enable_glsl=0')
     # Add all.gyp as the main gyp file to be generated.

src/libANGLE/renderer/d3d/DisplayD3D.cpp

@@ -6,13 +6,6 @@
 
 // DisplayD3D.cpp: D3D implementation of egl::Display
 
-// These headers annoyingly have to be the first lines in the file.
-#include <Windows.h>
-#include <cfgmgr32.h>
-#include <strsafe.h>
-#include <setupapi.h>
-#include <VersionHelpers.h>
-
 #include "libANGLE/renderer/d3d/DisplayD3D.h"
 
 #include <EGL/eglext.h>

src/libGLESv2.gypi

@@ -809,20 +809,16 @@
                                     {
                                         'AdditionalDependencies':
                                         [
-                                            'Cfgmgr32.lib',
                                             'dxguid.lib',
-                                            'setupapi.lib',
                                         ],
                                     }],
                                     ['angle_build_winrt==1',
                                     {
                                         'AdditionalDependencies':
                                         [
-                                            'Cfgmgr32.lib',
                                             'dxguid.lib',
                                             'd3d11.lib',
                                             'd3dcompiler.lib',
-                                            'setupapi.lib',
                                         ],
                                     }],
                                 ],