From bbe353230727568d3c1999af2701d2e150ff232f Mon Sep 17 00:00:00 2001
From: Vishal More <vmore@nvidia.com>
Date: Thu, 11 Jun 2020 11:11:17 +0530
Subject: Picking up lastest bug fixes & SHA2 signing

[SNG-2803] GFE-SDK : SHA-2 sign task
---
 CHANGELOG.md                                       |    5 +
 LICENSE                                            |   15 +-
 doc/html/_c_h_a_n_g_e_l_o_g_8md_source.html        |   49 +-
 doc/html/_m_a_i_n_p_a_g_e_8md_source.html          |   49 +-
 doc/html/annotated.html                            |   51 +-
 doc/html/arrowdown.png                             |  Bin 0 -> 238 bytes
 doc/html/arrowright.png                            |  Bin 0 -> 219 bytes
 doc/html/class_gfe_s_d_k_1_1_core-members.html     |   51 +-
 doc/html/class_gfe_s_d_k_1_1_core.html             |   78 +-
 doc/html/class_gfe_s_d_k_1_1_core.png              |  Bin 0 -> 556 bytes
 .../class_gfe_s_d_k_1_1_core_impl-members.html     |   51 +-
 doc/html/class_gfe_s_d_k_1_1_core_impl.html        |   88 +-
 doc/html/class_gfe_s_d_k_1_1_core_impl.png         |  Bin 0 -> 550 bytes
 .../class_gfe_s_d_k_1_1_highlights-members.html    |   53 +-
 doc/html/class_gfe_s_d_k_1_1_highlights.html       |  100 +-
 doc/html/class_gfe_s_d_k_1_1_highlights.js         |    2 +-
 doc/html/class_gfe_s_d_k_1_1_highlights.png        |  Bin 0 -> 693 bytes
 ...lass_gfe_s_d_k_1_1_highlights_impl-members.html |   53 +-
 doc/html/class_gfe_s_d_k_1_1_highlights_impl.html  |  110 +-
 doc/html/class_gfe_s_d_k_1_1_highlights_impl.js    |    2 +-
 doc/html/class_gfe_s_d_k_1_1_highlights_impl.png   |  Bin 0 -> 688 bytes
 doc/html/classes.html                              |   73 +-
 doc/html/config_8h_source.html                     |   55 +-
 doc/html/dir_007ea9f4a44739512de65b1e8449a30c.html |  130 +
 doc/html/dir_007ea9f4a44739512de65b1e8449a30c.js   |    4 +
 doc/html/dir_0c61202ded5e294eff1cc1338a0167a6.html |  130 +
 doc/html/dir_0c61202ded5e294eff1cc1338a0167a6.js   |    6 +
 doc/html/dir_0e11d6b9f607d0ef730b98f1fc6a7102.html |  130 +
 doc/html/dir_0e11d6b9f607d0ef730b98f1fc6a7102.js   |    6 +
 doc/html/dir_171a6e180bb88a8eb61f17f17c2f6876.html |  130 +
 doc/html/dir_171a6e180bb88a8eb61f17f17c2f6876.js   |    4 +
 doc/html/dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html |  130 +
 doc/html/dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.js   |    4 +
 doc/html/dir_2da3e0a8a223e44caac2fd87d541599f.html |  130 +
 doc/html/dir_2da3e0a8a223e44caac2fd87d541599f.js   |    4 +
 doc/html/dir_2f4536f343cdc104d7b83de3fff7416d.html |   58 +-
 doc/html/dir_37f49c9d6a230916a5077fbd270eac2a.html |   59 +-
 doc/html/dir_4522e853adfb3285c34ceee6be627ffe.html |   62 +-
 doc/html/dir_493b85567c8a3fbf04d485060a60d793.html |  130 +
 doc/html/dir_493b85567c8a3fbf04d485060a60d793.js   |    4 +
 doc/html/dir_5224d54c82353be970e4f2086a8200d8.html |  130 +
 doc/html/dir_5224d54c82353be970e4f2086a8200d8.js   |    6 +
 doc/html/dir_5ecf58e08b8bac4b5dfd1f49ca574289.html |  130 +
 doc/html/dir_5ecf58e08b8bac4b5dfd1f49ca574289.js   |    4 +
 doc/html/dir_956a284d1d814cd411185293071355a4.html |  130 +
 doc/html/dir_956a284d1d814cd411185293071355a4.js   |    4 +
 doc/html/dir_9e1fb0299a0600dff10179bfe2b8a156.html |   60 +-
 doc/html/dir_ab8ba62fc8fdaf78364406bae0a66d43.html |   61 +-
 doc/html/dir_e31eb9cae286691b323708fcb3cc0b5c.html |  130 +
 doc/html/dir_e31eb9cae286691b323708fcb3cc0b5c.js   |    4 +
 doc/html/dir_eb56eea0ff74c30c2a48b22915222057.html |   63 +-
 doc/html/dir_f1cfbb21bff00595e5c2406058aaadcb.html |  130 +
 doc/html/dir_f1cfbb21bff00595e5c2406058aaadcb.js   |    6 +
 doc/html/dir_f78f74a3131a0cfd456c5ed856861cff.html |   61 +-
 doc/html/doxygen.css                               |   51 +-
 doc/html/files.html                                |   55 +-
 doc/html/files.js                                  |    2 +-
 doc/html/functions.html                            |  114 +-
 doc/html/functions_func.html                       |   62 +-
 doc/html/functions_vars.html                       |  107 +-
 doc/html/gfe3__product__version_8h_source.html     |   55 +-
 doc/html/globals.html                              |   66 +-
 doc/html/globals_enum.html                         |   58 +-
 doc/html/globals_eval.html                         |   58 +-
 doc/html/globals_func.html                         |   58 +-
 doc/html/globals_type.html                         |   66 +-
 doc/html/hierarchy.html                            |   55 +-
 doc/html/highlights__types_8h.html                 |   94 +-
 doc/html/highlights__types_8h.js                   |    4 +-
 doc/html/highlights__types_8h_source.html          |   97 +-
 doc/html/highlights__types__cpp_8h_source.html     |   49 +-
 doc/html/ihighlights_8h.html                       |  109 +-
 doc/html/ihighlights_8h_source.html                |   63 +-
 doc/html/ihighlights__cpp_8h.html                  |   75 +-
 doc/html/ihighlights__cpp_8h_source.html           |   53 +-
 doc/html/ihighlights__cpp__impl_8h.html            |   69 +-
 doc/html/ihighlights__cpp__impl_8h_source.html     |   93 +-
 doc/html/index.html                                |   45 +-
 doc/html/isdk_8h.html                              |  112 +-
 doc/html/isdk_8h_source.html                       |   55 +-
 doc/html/isdk__cpp_8h.html                         |   93 +-
 doc/html/isdk__cpp_8h_source.html                  |   53 +-
 doc/html/isdk__cpp__impl_8h.html                   |   72 +-
 doc/html/isdk__cpp__impl_8h_source.html            |   55 +-
 doc/html/jquery.js                                 |   21 +-
 doc/html/md_C                                      |    0
 doc/html/navtree.css                               |    7 +-
 doc/html/navtree.js                                |   50 +-
 doc/html/navtreedata.js                            |    2 +-
 doc/html/navtreeindex0.js                          |   22 +-
 doc/html/os__defines_8h_source.html                |   49 +-
 doc/html/pages.html                                |   45 +-
 doc/html/resize.js                                 |  154 +-
 doc/html/sdk__types_8h.html                        |  124 +-
 doc/html/sdk__types_8h.js                          |    6 +-
 doc/html/sdk__types_8h_source.html                 |   68 +-
 doc/html/sdk__types__cpp_8h_source.html            |   49 +-
 doc/html/sdk__types__ipc_8h_source.html            |   55 +-
 doc/html/search/all_0.html                         |    2 +-
 doc/html/search/all_1.html                         |    2 +-
 doc/html/search/all_1.js                           |    2 +-
 doc/html/search/all_2.html                         |    2 +-
 doc/html/search/all_3.html                         |    2 +-
 doc/html/search/all_4.html                         |    2 +-
 doc/html/search/all_4.js                           |    2 +-
 doc/html/search/all_5.html                         |    2 +-
 doc/html/search/all_6.html                         |    2 +-
 doc/html/search/all_7.html                         |    2 +-
 doc/html/search/all_8.html                         |    2 +-
 doc/html/search/all_8.js                           |    8 +-
 doc/html/search/all_9.html                         |    2 +-
 doc/html/search/all_a.html                         |    2 +-
 doc/html/search/all_b.html                         |    2 +-
 doc/html/search/all_c.html                         |    2 +-
 doc/html/search/all_d.html                         |    2 +-
 doc/html/search/all_e.html                         |    2 +-
 doc/html/search/all_f.html                         |    2 +-
 doc/html/search/classes_0.html                     |    2 +-
 doc/html/search/classes_1.html                     |    2 +-
 doc/html/search/classes_2.html                     |    2 +-
 doc/html/search/classes_3.html                     |    2 +-
 doc/html/search/classes_4.html                     |    2 +-
 doc/html/search/classes_5.html                     |    2 +-
 doc/html/search/classes_6.html                     |    2 +-
 doc/html/search/classes_7.html                     |    2 +-
 doc/html/search/classes_8.html                     |    2 +-
 doc/html/search/enums_0.html                       |    2 +-
 doc/html/search/enumvalues_0.html                  |    2 +-
 doc/html/search/files_0.html                       |    2 +-
 doc/html/search/files_1.html                       |    2 +-
 doc/html/search/files_2.html                       |    2 +-
 doc/html/search/functions_0.html                   |    2 +-
 doc/html/search/functions_1.html                   |    2 +-
 doc/html/search/functions_2.html                   |    2 +-
 doc/html/search/functions_2.js                     |    2 +-
 doc/html/search/functions_3.html                   |    2 +-
 doc/html/search/functions_4.html                   |    2 +-
 doc/html/search/functions_5.html                   |    2 +-
 doc/html/search/functions_6.html                   |    2 +-
 doc/html/search/functions_7.html                   |    2 +-
 doc/html/search/pages_0.html                       |    2 +-
 doc/html/search/pages_0.js                         |    2 +-
 doc/html/search/pages_1.html                       |    2 +-
 doc/html/search/search.css                         |   12 +-
 doc/html/search/typedefs_0.html                    |    2 +-
 doc/html/search/typedefs_0.js                      |    8 +-
 doc/html/search/variables_0.html                   |    2 +-
 doc/html/search/variables_1.html                   |    2 +-
 doc/html/search/variables_2.html                   |    2 +-
 doc/html/search/variables_3.html                   |    2 +-
 doc/html/search/variables_4.html                   |    2 +-
 doc/html/search/variables_5.html                   |    2 +-
 doc/html/search/variables_6.html                   |    2 +-
 doc/html/search/variables_7.html                   |    2 +-
 doc/html/search/variables_8.html                   |    2 +-
 doc/html/search/variables_9.html                   |    2 +-
 doc/html/search/variables_a.html                   |    2 +-
 doc/html/search/variables_b.html                   |    2 +-
 doc/html/search/variables_c.html                   |    2 +-
 doc/html/search/variables_d.html                   |    2 +-
 doc/html/search/variables_e.html                   |    2 +-
 ..._gfe_s_d_k_1_1_create_input_params-members.html |   51 +-
 .../struct_gfe_s_d_k_1_1_create_input_params.html  |   65 +-
 ...ruct_gfe_s_d_k_1_1_create_response-members.html |   51 +-
 doc/html/struct_gfe_s_d_k_1_1_create_response.html |   61 +-
 ..._get_number_of_highlights_response-members.html |   51 +-
 ..._d_k_1_1_get_number_of_highlights_response.html |   53 +-
 ..._d_k_1_1_get_u_i_language_response-members.html |   51 +-
 ...ct_gfe_s_d_k_1_1_get_u_i_language_response.html |   53 +-
 ...d_k_1_1_get_user_settings_response-members.html |   51 +-
 ...t_gfe_s_d_k_1_1_get_user_settings_response.html |   53 +-
 .../struct_gfe_s_d_k_1_1_group_view-members.html   |   51 +-
 doc/html/struct_gfe_s_d_k_1_1_group_view.html      |   57 +-
 ...k_1_1_highlight_close_group_params-members.html |   51 +-
 ...gfe_s_d_k_1_1_highlight_close_group_params.html |   55 +-
 ..._s_d_k_1_1_highlight_config_params-members.html |   51 +-
 ...ruct_gfe_s_d_k_1_1_highlight_config_params.html |   55 +-
 ...gfe_s_d_k_1_1_highlight_definition-members.html |   51 +-
 .../struct_gfe_s_d_k_1_1_highlight_definition.html |   61 +-
 ..._k_1_1_highlight_open_group_params-members.html |   51 +-
 ..._gfe_s_d_k_1_1_highlight_open_group_params.html |   55 +-
 ...e_s_d_k_1_1_highlight_user_setting-members.html |   51 +-
 ...truct_gfe_s_d_k_1_1_highlight_user_setting.html |   55 +-
 ...ct_gfe_s_d_k_1_1_notification_base-members.html |   51 +-
 .../struct_gfe_s_d_k_1_1_notification_base.html    |   64 +-
 .../struct_gfe_s_d_k_1_1_notification_base.png     |  Bin 0 -> 1253 bytes
 ...overlay_state_changed_notification-members.html |   51 +-
 ...d_k_1_1_overlay_state_changed_notification.html |   74 +-
 ..._d_k_1_1_overlay_state_changed_notification.png |  Bin 0 -> 880 bytes
 ...1_permissions_changed_notification-members.html |   51 +-
 ...s_d_k_1_1_permissions_changed_notification.html |   72 +-
 ..._s_d_k_1_1_permissions_changed_notification.png |  Bin 0 -> 860 bytes
 ...d_k_1_1_request_permissions_params-members.html |   51 +-
 ...t_gfe_s_d_k_1_1_request_permissions_params.html |   53 +-
 ..._k_1_1_screenshot_highlight_params-members.html |   51 +-
 ..._gfe_s_d_k_1_1_screenshot_highlight_params.html |   55 +-
 ...truct_gfe_s_d_k_1_1_summary_params-members.html |   51 +-
 doc/html/struct_gfe_s_d_k_1_1_summary_params.html  |   53 +-
 ...e_s_d_k_1_1_video_highlight_params-members.html |   51 +-
 ...truct_gfe_s_d_k_1_1_video_highlight_params.html |   59 +-
 ..._n_v_g_s_d_k___create_input_params-members.html |   51 +-
 .../struct_n_v_g_s_d_k___create_input_params.html  |   82 +-
 ...ruct_n_v_g_s_d_k___create_response-members.html |   51 +-
 doc/html/struct_n_v_g_s_d_k___create_response.html |   69 +-
 .../struct_n_v_g_s_d_k___group_view-members.html   |   51 +-
 doc/html/struct_n_v_g_s_d_k___group_view.html      |   61 +-
 .../struct_n_v_g_s_d_k___highlight-members.html    |   51 +-
 doc/html/struct_n_v_g_s_d_k___highlight.html       |   77 +-
 ...d_k___highlight_close_group_params-members.html |   51 +-
 ...n_v_g_s_d_k___highlight_close_group_params.html |   61 +-
 ..._g_s_d_k___highlight_config_params-members.html |   51 +-
 ...ruct_n_v_g_s_d_k___highlight_config_params.html |   68 +-
 ..._d_k___highlight_open_group_params-members.html |   51 +-
 ..._n_v_g_s_d_k___highlight_open_group_params.html |   71 +-
 ...v_g_s_d_k___highlight_user_setting-members.html |   51 +-
 ...truct_n_v_g_s_d_k___highlight_user_setting.html |   57 +-
 ..._highlights___number_of_highlights-members.html |   51 +-
 ..._s_d_k___highlights___number_of_highlights.html |   55 +-
 ...s_d_k___highlights___user_settings-members.html |   51 +-
 ...t_n_v_g_s_d_k___highlights___user_settings.html |   65 +-
 .../struct_n_v_g_s_d_k___language-members.html     |   51 +-
 doc/html/struct_n_v_g_s_d_k___language.html        |   55 +-
 ...truct_n_v_g_s_d_k___localized_pair-members.html |   51 +-
 doc/html/struct_n_v_g_s_d_k___localized_pair.html  |   59 +-
 .../struct_n_v_g_s_d_k___notification-members.html |   51 +-
 doc/html/struct_n_v_g_s_d_k___notification.html    |   65 +-
 ...overlay_state_changed_notification-members.html |   51 +-
 ...s_d_k___overlay_state_changed_notification.html |   55 +-
 ...__permissions_changed_notification-members.html |   51 +-
 ...g_s_d_k___permissions_changed_notification.html |   63 +-
 ...s_d_k___request_permissions_params-members.html |   51 +-
 ...t_n_v_g_s_d_k___request_permissions_params.html |   55 +-
 ...uct_n_v_g_s_d_k___scope_permission-members.html |   51 +-
 .../struct_n_v_g_s_d_k___scope_permission.html     |   55 +-
 ..._d_k___screenshot_highlight_params-members.html |   51 +-
 ..._n_v_g_s_d_k___screenshot_highlight_params.html |   61 +-
 ...truct_n_v_g_s_d_k___summary_params-members.html |   51 +-
 doc/html/struct_n_v_g_s_d_k___summary_params.html  |   65 +-
 doc/html/struct_n_v_g_s_d_k___version-members.html |   51 +-
 doc/html/struct_n_v_g_s_d_k___version.html         |   59 +-
 ...v_g_s_d_k___video_highlight_params-members.html |   51 +-
 ...truct_n_v_g_s_d_k___video_highlight_params.html |   65 +-
 doc/html/tabs.css                                  |   61 +-
 include/gfesdk/config.h                            |    8 +-
 include/gfesdk/gfe3_product_version.h              |   12 +-
 include/gfesdk/highlights/highlights_types.h       |    4 +-
 include/gfesdk/sdk_types.h                         |    8 +-
 include/gfesdk/sdk_types_ipc.h                     |  500 ++-
 lib/win32/GfeSDK.lib                               |  Bin 6182 -> 6182 bytes
 lib/win32_uwp/GfeSDK.lib                           |  Bin 0 -> 6182 bytes
 lib/win64/GfeSDK.lib                               |  Bin 6100 -> 6100 bytes
 lib/win64_uwp/GfeSDK.lib                           |  Bin 0 -> 6100 bytes
 redist/win32/GfeSDK.dll                            |  Bin 3208488 -> 2451256 bytes
 redist/win32_uwp/GfeSDK.dll                        |  Bin 0 -> 784184 bytes
 redist/win64/GfeSDK.dll                            |  Bin 4228392 -> 3258168 bytes
 redist/win64_uwp/GfeSDK.dll                        |  Bin 0 -> 1056568 bytes
 samples/DX_APIUsage/DXUT/Core/DDSTextureLoader.cpp | 1825 ++++++++
 samples/DX_APIUsage/DXUT/Core/DDSTextureLoader.h   |  129 +
 samples/DX_APIUsage/DXUT/Core/DXUT.cpp             | 3930 ++++++----------
 samples/DX_APIUsage/DXUT/Core/DXUT.h               |  330 +-
 samples/DX_APIUsage/DXUT/Core/DXUTDevice11.cpp     |  764 ++--
 samples/DX_APIUsage/DXUT/Core/DXUTDevice11.h       |  114 +-
 samples/DX_APIUsage/DXUT/Core/DXUTmisc.cpp         | 1326 ++----
 samples/DX_APIUsage/DXUT/Core/DXUTmisc.h           |  460 +-
 samples/DX_APIUsage/DXUT/Core/ScreenGrab.cpp       | 1204 +++++
 samples/DX_APIUsage/DXUT/Core/ScreenGrab.h         |   39 +
 samples/DX_APIUsage/DXUT/Core/WICTextureLoader.cpp |  932 ++++
 samples/DX_APIUsage/DXUT/Core/WICTextureLoader.h   |  126 +
 .../DX_APIUsage/DXUT/Optional/DXUTLockFreePipe.h   |   59 +-
 samples/DX_APIUsage/DXUT/Optional/DXUTcamera.cpp   |  956 ++--
 samples/DX_APIUsage/DXUT/Optional/DXUTcamera.h     |  585 +--
 samples/DX_APIUsage/DXUT/Optional/DXUTgui.cpp      | 4698 +++++++++-----------
 samples/DX_APIUsage/DXUT/Optional/DXUTgui.h        | 1115 ++---
 samples/DX_APIUsage/DXUT/Optional/DXUTguiIME.cpp   |  124 +-
 samples/DX_APIUsage/DXUT/Optional/DXUTguiIME.h     |   90 +-
 samples/DX_APIUsage/DXUT/Optional/DXUTres.cpp      |   64 +-
 samples/DX_APIUsage/DXUT/Optional/DXUTres.h        |   15 +-
 .../DX_APIUsage/DXUT/Optional/DXUTsettingsdlg.cpp  | 2589 +++--------
 .../DX_APIUsage/DXUT/Optional/DXUTsettingsdlg.h    |  217 +-
 samples/DX_APIUsage/DXUT/Optional/ImeUi.cpp        |  948 ++--
 samples/DX_APIUsage/DXUT/Optional/ImeUi.h          |   74 +-
 samples/DX_APIUsage/DXUT/Optional/SDKmesh.cpp      | 1610 ++-----
 samples/DX_APIUsage/DXUT/Optional/SDKmesh.h        |  417 +-
 samples/DX_APIUsage/DXUT/Optional/SDKmisc.cpp      | 1481 ++----
 samples/DX_APIUsage/DXUT/Optional/SDKmisc.h        |  346 +-
 samples/DX_APIUsage/DX_APIUsage.vcxproj            |   61 +-
 samples/DX_APIUsage/GfeSDKWrapper.c                |   10 +-
 samples/DX_APIUsage/GfeSDKWrapper.cpp              |    8 +-
 samples/DX_APIUsage/GfeSDKWrapper.h                |    2 +-
 samples/DX_APIUsage/GfeSDKWrapper.hpp              |    2 +-
 samples/DX_APIUsage/Main.cpp                       | 1118 ++---
 samples/DX_APIUsage/SimpleSample.hlsl              |   84 +
 samples/DX_APIUsage/Splash.bmp                     |  Bin 0 -> 1673046 bytes
 samples/DX_APIUsage/Splash.cpp                     |  185 +
 samples/DX_APIUsage/Splash.h                       |    4 +
 samples/DX_APIUsage/Splash.rc                      |  Bin 0 -> 176 bytes
 samples/DX_APIUsage/resource.h                     |    7 +-
 samples/README.md                                  |   49 +
 samples/bin/DX_APIUsage/win32/GfeSDK.dll           |  Bin 3208488 -> 2451256 bytes
 samples/bin/DX_APIUsage/win32/SimpleSample.hlsl    |   84 +
 300 files changed, 20563 insertions(+), 18299 deletions(-)
 create mode 100644 doc/html/arrowdown.png
 create mode 100644 doc/html/arrowright.png
 create mode 100644 doc/html/class_gfe_s_d_k_1_1_core.png
 create mode 100644 doc/html/class_gfe_s_d_k_1_1_core_impl.png
 create mode 100644 doc/html/class_gfe_s_d_k_1_1_highlights.png
 create mode 100644 doc/html/class_gfe_s_d_k_1_1_highlights_impl.png
 create mode 100644 doc/html/dir_007ea9f4a44739512de65b1e8449a30c.html
 create mode 100644 doc/html/dir_007ea9f4a44739512de65b1e8449a30c.js
 create mode 100644 doc/html/dir_0c61202ded5e294eff1cc1338a0167a6.html
 create mode 100644 doc/html/dir_0c61202ded5e294eff1cc1338a0167a6.js
 create mode 100644 doc/html/dir_0e11d6b9f607d0ef730b98f1fc6a7102.html
 create mode 100644 doc/html/dir_0e11d6b9f607d0ef730b98f1fc6a7102.js
 create mode 100644 doc/html/dir_171a6e180bb88a8eb61f17f17c2f6876.html
 create mode 100644 doc/html/dir_171a6e180bb88a8eb61f17f17c2f6876.js
 create mode 100644 doc/html/dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html
 create mode 100644 doc/html/dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.js
 create mode 100644 doc/html/dir_2da3e0a8a223e44caac2fd87d541599f.html
 create mode 100644 doc/html/dir_2da3e0a8a223e44caac2fd87d541599f.js
 create mode 100644 doc/html/dir_493b85567c8a3fbf04d485060a60d793.html
 create mode 100644 doc/html/dir_493b85567c8a3fbf04d485060a60d793.js
 create mode 100644 doc/html/dir_5224d54c82353be970e4f2086a8200d8.html
 create mode 100644 doc/html/dir_5224d54c82353be970e4f2086a8200d8.js
 create mode 100644 doc/html/dir_5ecf58e08b8bac4b5dfd1f49ca574289.html
 create mode 100644 doc/html/dir_5ecf58e08b8bac4b5dfd1f49ca574289.js
 create mode 100644 doc/html/dir_956a284d1d814cd411185293071355a4.html
 create mode 100644 doc/html/dir_956a284d1d814cd411185293071355a4.js
 create mode 100644 doc/html/dir_e31eb9cae286691b323708fcb3cc0b5c.html
 create mode 100644 doc/html/dir_e31eb9cae286691b323708fcb3cc0b5c.js
 create mode 100644 doc/html/dir_f1cfbb21bff00595e5c2406058aaadcb.html
 create mode 100644 doc/html/dir_f1cfbb21bff00595e5c2406058aaadcb.js
 create mode 100644 doc/html/md_C
 create mode 100644 doc/html/struct_gfe_s_d_k_1_1_notification_base.png
 create mode 100644 doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification.png
 create mode 100644 doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification.png
 create mode 100644 lib/win32_uwp/GfeSDK.lib
 create mode 100644 lib/win64_uwp/GfeSDK.lib
 create mode 100644 redist/win32_uwp/GfeSDK.dll
 create mode 100644 redist/win64_uwp/GfeSDK.dll
 create mode 100644 samples/DX_APIUsage/DXUT/Core/DDSTextureLoader.cpp
 create mode 100644 samples/DX_APIUsage/DXUT/Core/DDSTextureLoader.h
 create mode 100644 samples/DX_APIUsage/DXUT/Core/ScreenGrab.cpp
 create mode 100644 samples/DX_APIUsage/DXUT/Core/ScreenGrab.h
 create mode 100644 samples/DX_APIUsage/DXUT/Core/WICTextureLoader.cpp
 create mode 100644 samples/DX_APIUsage/DXUT/Core/WICTextureLoader.h
 create mode 100644 samples/DX_APIUsage/SimpleSample.hlsl
 create mode 100644 samples/DX_APIUsage/Splash.bmp
 create mode 100644 samples/DX_APIUsage/Splash.cpp
 create mode 100644 samples/DX_APIUsage/Splash.h
 create mode 100644 samples/DX_APIUsage/Splash.rc
 create mode 100644 samples/README.md
 create mode 100644 samples/bin/DX_APIUsage/win32/SimpleSample.hlsl

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ab6560..0c12678 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## NVIDIA GfeSDK 1.1 (2020-06-08)
+### Bug Fixes
+* **Security** Security fixes
+* **Roubestness** Added more robust error checking
+
 ## NVIDIA GfeSDK 1.1 (2018-08-1)
 ### Improvements
 * **Documentation** Expanded information about CreateInputParams member variables
diff --git a/LICENSE b/LICENSE
index 59e8baa..d77cdd6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+Copyright (c) 2020, NVIDIA CORPORATION.  All rights reserved.
 
 NVIDIA CORPORATION and its licensors retain all intellectual property
 and proprietary rights in and to this software, related documentation
@@ -10,17 +10,8 @@ This software distribution uses the following open source software:
 
 ===Protocol Buffers version 3.1.0===
 
-This license applies to all parts of Protocol Buffers except the following:
-
-  - Atomicops support for generic gcc, located in
-    src/google/protobuf/stubs/atomicops_internals_generic_gcc.h.
-    This file is copyrighted by Red Hat Inc.
-
-  - Atomicops support for AIX/POWER, located in
-    src/google/protobuf/stubs/atomicops_internals_power.h.
-    This file is copyrighted by Bloomberg Finance LP.
-
-Copyright 2014, Google Inc.  All rights reserved.
+Copyright 2008, Google Inc.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/doc/html/_c_h_a_n_g_e_l_o_g_8md_source.html b/doc/html/_c_h_a_n_g_e_l_o_g_8md_source.html
index 7bc92b2..7b4793e 100644
--- a/doc/html/_c_h_a_n_g_e_l_o_g_8md_source.html
+++ b/doc/html/_c_h_a_n_g_e_l_o_g_8md_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/doc/CHANGELOG.md Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -94,7 +119,7 @@ $(document).ready(function(){initNavTree('_c_h_a_n_g_e_l_o_g_8md.html','');});
     <li class="navelem"><b>CHANGELOG.md</b></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/_m_a_i_n_p_a_g_e_8md_source.html b/doc/html/_m_a_i_n_p_a_g_e_8md_source.html
index 423e3de..5453e98 100644
--- a/doc/html/_m_a_i_n_p_a_g_e_8md_source.html
+++ b/doc/html/_m_a_i_n_p_a_g_e_8md_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: MAINPAGE.md Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -94,7 +119,7 @@ $(document).ready(function(){initNavTree('_m_a_i_n_p_a_g_e_8md.html','');});
     <li class="navelem"><b>MAINPAGE.md</b></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/annotated.html b/doc/html/annotated.html
index b3f8f0c..c63678d 100644
--- a/doc/html/annotated.html
+++ b/doc/html/annotated.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Class List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -141,7 +168,7 @@ $(document).ready(function(){initNavTree('annotated.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/arrowdown.png b/doc/html/arrowdown.png
new file mode 100644
index 0000000..82da5b1
Binary files /dev/null and b/doc/html/arrowdown.png differ
diff --git a/doc/html/arrowright.png b/doc/html/arrowright.png
new file mode 100644
index 0000000..d6d799c
Binary files /dev/null and b/doc/html/arrowright.png differ
diff --git a/doc/html/class_gfe_s_d_k_1_1_core-members.html b/doc/html/class_gfe_s_d_k_1_1_core-members.html
index 5c88707..23eaa81 100644
--- a/doc/html/class_gfe_s_d_k_1_1_core-members.html
+++ b/doc/html/class_gfe_s_d_k_1_1_core-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -102,7 +129,7 @@ $(document).ready(function(){initNavTree('class_gfe_s_d_k_1_1_core.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/class_gfe_s_d_k_1_1_core.html b/doc/html/class_gfe_s_d_k_1_1_core.html
index e05eb8b..3e49db7 100644
--- a/doc/html/class_gfe_s_d_k_1_1_core.html
+++ b/doc/html/class_gfe_s_d_k_1_1_core.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::Core Class Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -94,11 +121,12 @@ $(document).ready(function(){initNavTree('class_gfe_s_d_k_1_1_core.html','');});
 <div class="dynheader">
 Inheritance diagram for GfeSDK::Core:</div>
 <div class="dyncontent">
-<div class="center"><img src="class_gfe_s_d_k_1_1_core__inherit__graph.png" border="0" usemap="#_gfe_s_d_k_1_1_core_inherit__map" alt="Inheritance graph"/></div>
-<map name="_gfe_s_d_k_1_1_core_inherit__map" id="_gfe_s_d_k_1_1_core_inherit__map">
-<area shape="rect" id="node2" href="class_gfe_s_d_k_1_1_core_impl.html" title="GfeSDK::CoreImpl" alt="" coords="5,80,133,107"/>
+ <div class="center">
+  <img src="class_gfe_s_d_k_1_1_core.png" usemap="#GfeSDK::Core_map" alt=""/>
+  <map id="GfeSDK::Core_map" name="GfeSDK::Core_map">
+<area href="class_gfe_s_d_k_1_1_core_impl.html" alt="GfeSDK::CoreImpl" shape="rect" coords="0,56,113,80"/>
 </map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
+ </div></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
@@ -108,7 +136,7 @@ Public Member Functions</h2></td></tr>
 <tr class="separator:ada940c792737e3fa2c6cc5cda81424b5"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad8edbad0bf465ba656bb99353d4f2122"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_core.html#ad8edbad0bf465ba656bb99353d4f2122">GetUILanguageAsync</a> (TGetUILanguageCallback cb=nullptr, void *cbContext=nullptr)=0</td></tr>
 <tr class="separator:ad8edbad0bf465ba656bb99353d4f2122"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad10bb113b98d4ee14a12ec9c9ad64d74"><td class="memItemLeft" align="right" valign="top"><a id="ad10bb113b98d4ee14a12ec9c9ad64d74"></a>
+<tr class="memitem:ad10bb113b98d4ee14a12ec9c9ad64d74"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad10bb113b98d4ee14a12ec9c9ad64d74"></a>
 virtual NVGSDK_HANDLE *&#160;</td><td class="memItemRight" valign="bottom"><b>GetHandle</b> ()=0</td></tr>
 <tr class="separator:ad10bb113b98d4ee14a12ec9c9ad64d74"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
@@ -122,9 +150,7 @@ Static Public Member Functions</h2></td></tr>
 
 <p>Definition at line <a class="el" href="isdk__cpp_8h_source.html#l00037">37</a> of file <a class="el" href="isdk__cpp_8h_source.html">isdk_cpp.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
-<a id="a0cb93acb8b273072cd37348c9b206e0d"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a0cb93acb8b273072cd37348c9b206e0d">&sect;&nbsp;</a></span>Create()</h2>
-
+<a class="anchor" id="a0cb93acb8b273072cd37348c9b206e0d"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -161,9 +187,7 @@ Static Public Member Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="a4804109b7488f52ce61b0b3d638d30fe"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a4804109b7488f52ce61b0b3d638d30fe">&sect;&nbsp;</a></span>Poll()</h2>
-
+<a class="anchor" id="a4804109b7488f52ce61b0b3d638d30fe"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -190,9 +214,7 @@ Static Public Member Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="ada940c792737e3fa2c6cc5cda81424b5"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ada940c792737e3fa2c6cc5cda81424b5">&sect;&nbsp;</a></span>RequestPermissionsAsync()</h2>
-
+<a class="anchor" id="ada940c792737e3fa2c6cc5cda81424b5"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -235,9 +257,7 @@ Static Public Member Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="ad8edbad0bf465ba656bb99353d4f2122"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ad8edbad0bf465ba656bb99353d4f2122">&sect;&nbsp;</a></span>GetUILanguageAsync()</h2>
-
+<a class="anchor" id="ad8edbad0bf465ba656bb99353d4f2122"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -287,7 +307,7 @@ Static Public Member Functions</h2></td></tr>
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="class_gfe_s_d_k_1_1_core.html">Core</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/class_gfe_s_d_k_1_1_core.png b/doc/html/class_gfe_s_d_k_1_1_core.png
new file mode 100644
index 0000000..6094851
Binary files /dev/null and b/doc/html/class_gfe_s_d_k_1_1_core.png differ
diff --git a/doc/html/class_gfe_s_d_k_1_1_core_impl-members.html b/doc/html/class_gfe_s_d_k_1_1_core_impl-members.html
index 1ebcd85..cd915c9 100644
--- a/doc/html/class_gfe_s_d_k_1_1_core_impl-members.html
+++ b/doc/html/class_gfe_s_d_k_1_1_core_impl-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -106,7 +133,7 @@ $(document).ready(function(){initNavTree('class_gfe_s_d_k_1_1_core_impl.html',''
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/class_gfe_s_d_k_1_1_core_impl.html b/doc/html/class_gfe_s_d_k_1_1_core_impl.html
index e86bfd3..e15237a 100644
--- a/doc/html/class_gfe_s_d_k_1_1_core_impl.html
+++ b/doc/html/class_gfe_s_d_k_1_1_core_impl.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::CoreImpl Class Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,19 +120,12 @@ $(document).ready(function(){initNavTree('class_gfe_s_d_k_1_1_core_impl.html',''
 <div class="dynheader">
 Inheritance diagram for GfeSDK::CoreImpl:</div>
 <div class="dyncontent">
-<div class="center"><img src="class_gfe_s_d_k_1_1_core_impl__inherit__graph.png" border="0" usemap="#_gfe_s_d_k_1_1_core_impl_inherit__map" alt="Inheritance graph"/></div>
-<map name="_gfe_s_d_k_1_1_core_impl_inherit__map" id="_gfe_s_d_k_1_1_core_impl_inherit__map">
-<area shape="rect" id="node2" href="class_gfe_s_d_k_1_1_core.html" title="GfeSDK::Core" alt="" coords="17,5,121,32"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
-<div class="dynheader">
-Collaboration diagram for GfeSDK::CoreImpl:</div>
-<div class="dyncontent">
-<div class="center"><img src="class_gfe_s_d_k_1_1_core_impl__coll__graph.png" border="0" usemap="#_gfe_s_d_k_1_1_core_impl_coll__map" alt="Collaboration graph"/></div>
-<map name="_gfe_s_d_k_1_1_core_impl_coll__map" id="_gfe_s_d_k_1_1_core_impl_coll__map">
-<area shape="rect" id="node2" href="class_gfe_s_d_k_1_1_core.html" title="GfeSDK::Core" alt="" coords="17,5,121,32"/>
+ <div class="center">
+  <img src="class_gfe_s_d_k_1_1_core_impl.png" usemap="#GfeSDK::CoreImpl_map" alt=""/>
+  <map id="GfeSDK::CoreImpl_map" name="GfeSDK::CoreImpl_map">
+<area href="class_gfe_s_d_k_1_1_core.html" alt="GfeSDK::Core" shape="rect" coords="0,0,113,24"/>
 </map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
+ </div></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
@@ -115,19 +135,19 @@ Public Member Functions</h2></td></tr>
 <tr class="separator:a09f4348a8362beccae2a237f92ead971"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a95587bb5dc50b0f8b11d7fd75a8ecea3"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_core_impl.html#a95587bb5dc50b0f8b11d7fd75a8ecea3">GetUILanguageAsync</a> (TGetUILanguageCallback cb=nullptr, void *cbContext=nullptr)</td></tr>
 <tr class="separator:a95587bb5dc50b0f8b11d7fd75a8ecea3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae6471c6a01e1a96d23d375d803ba28be"><td class="memItemLeft" align="right" valign="top"><a id="ae6471c6a01e1a96d23d375d803ba28be"></a>
+<tr class="memitem:ae6471c6a01e1a96d23d375d803ba28be"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae6471c6a01e1a96d23d375d803ba28be"></a>
 NVGSDK_HANDLE *&#160;</td><td class="memItemRight" valign="bottom"><b>GetHandle</b> ()</td></tr>
 <tr class="separator:ae6471c6a01e1a96d23d375d803ba28be"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="friends"></a>
 Friends</h2></td></tr>
-<tr class="memitem:a4107254ac74f90d4f91e810d755b98c2"><td class="memItemLeft" align="right" valign="top"><a id="a4107254ac74f90d4f91e810d755b98c2"></a>
+<tr class="memitem:a4107254ac74f90d4f91e810d755b98c2"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4107254ac74f90d4f91e810d755b98c2"></a>
 class&#160;</td><td class="memItemRight" valign="bottom"><b>Core</b></td></tr>
 <tr class="separator:a4107254ac74f90d4f91e810d755b98c2"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a649954e5dfd4889776330e97187ea6cd"><td class="memItemLeft" align="right" valign="top"><a id="a649954e5dfd4889776330e97187ea6cd"></a>
+<tr class="memitem:a649954e5dfd4889776330e97187ea6cd"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a649954e5dfd4889776330e97187ea6cd"></a>
 class&#160;</td><td class="memItemRight" valign="bottom"><b>HighlightsImpl</b></td></tr>
 <tr class="separator:a649954e5dfd4889776330e97187ea6cd"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae18b5099054ba29e309259c47462cc25"><td class="memItemLeft" align="right" valign="top"><a id="ae18b5099054ba29e309259c47462cc25"></a>
+<tr class="memitem:ae18b5099054ba29e309259c47462cc25"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae18b5099054ba29e309259c47462cc25"></a>
 class&#160;</td><td class="memItemRight" valign="bottom"><b>OpsImpl</b></td></tr>
 <tr class="separator:ae18b5099054ba29e309259c47462cc25"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
@@ -141,9 +161,7 @@ Additional Inherited Members</h2></td></tr>
 <div class="textblock">
 <p>Definition at line <a class="el" href="isdk__cpp__impl_8h_source.html#l00025">25</a> of file <a class="el" href="isdk__cpp__impl_8h_source.html">isdk_cpp_impl.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
-<a id="a3a57a88bbb7da1b8d99e1ad326205ab0"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a3a57a88bbb7da1b8d99e1ad326205ab0">&sect;&nbsp;</a></span>Poll()</h2>
-
+<a class="anchor" id="a3a57a88bbb7da1b8d99e1ad326205ab0"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -172,9 +190,7 @@ Additional Inherited Members</h2></td></tr>
 
 </div>
 </div>
-<a id="a09f4348a8362beccae2a237f92ead971"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a09f4348a8362beccae2a237f92ead971">&sect;&nbsp;</a></span>RequestPermissionsAsync()</h2>
-
+<a class="anchor" id="a09f4348a8362beccae2a237f92ead971"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -219,9 +235,7 @@ Additional Inherited Members</h2></td></tr>
 
 </div>
 </div>
-<a id="a95587bb5dc50b0f8b11d7fd75a8ecea3"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a95587bb5dc50b0f8b11d7fd75a8ecea3">&sect;&nbsp;</a></span>GetUILanguageAsync()</h2>
-
+<a class="anchor" id="a95587bb5dc50b0f8b11d7fd75a8ecea3"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -272,7 +286,7 @@ Additional Inherited Members</h2></td></tr>
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="class_gfe_s_d_k_1_1_core_impl.html">CoreImpl</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/class_gfe_s_d_k_1_1_core_impl.png b/doc/html/class_gfe_s_d_k_1_1_core_impl.png
new file mode 100644
index 0000000..5d9066f
Binary files /dev/null and b/doc/html/class_gfe_s_d_k_1_1_core_impl.png differ
diff --git a/doc/html/class_gfe_s_d_k_1_1_highlights-members.html b/doc/html/class_gfe_s_d_k_1_1_highlights-members.html
index 13e12db..4d79c7e 100644
--- a/doc/html/class_gfe_s_d_k_1_1_highlights-members.html
+++ b/doc/html/class_gfe_s_d_k_1_1_highlights-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -92,7 +119,7 @@ $(document).ready(function(){initNavTree('class_gfe_s_d_k_1_1_highlights.html','
   <tr><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#a8e522535c3393a1911e2bbb65c71eb52">ConfigureAsync</a>(HighlightConfigParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)=0</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Create</b>(Core *core) (defined in <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a>)</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">static</span></td></tr>
   <tr><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#ad640f12621aa2ab8f0bf39b859f8d849">GetNumberOfHighlightsAsync</a>(GroupView const &amp;params, TGetNumberOfHighlightsCallback cb=nullptr, void *cbContext=nullptr)=0</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#a593d1bd58183bc0b53c7dee7991d8491">GetUserSettingsAsync</a>(TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const =0</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#add1016d23068c8f2dd0cd037210aa14b">GetUserSettingsAsync</a>(TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const  =0</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#ab1b35bd4fe9e8aac357db3aeabfefa1b">OpenGroupAsync</a>(HighlightOpenGroupParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)=0</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#a9d1ab59542571efe90391aea1503411b">OpenSummaryAsync</a>(SummaryParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)=0</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#a84475c751b97bf00d55e767b55e89bff">SetScreenshotHighlightAsync</a>(ScreenshotHighlightParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)=0</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
@@ -106,7 +133,7 @@ $(document).ready(function(){initNavTree('class_gfe_s_d_k_1_1_highlights.html','
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/class_gfe_s_d_k_1_1_highlights.html b/doc/html/class_gfe_s_d_k_1_1_highlights.html
index f2d68a8..023acd9 100644
--- a/doc/html/class_gfe_s_d_k_1_1_highlights.html
+++ b/doc/html/class_gfe_s_d_k_1_1_highlights.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::Highlights Class Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -94,18 +121,19 @@ $(document).ready(function(){initNavTree('class_gfe_s_d_k_1_1_highlights.html','
 <div class="dynheader">
 Inheritance diagram for GfeSDK::Highlights:</div>
 <div class="dyncontent">
-<div class="center"><img src="class_gfe_s_d_k_1_1_highlights__inherit__graph.png" border="0" usemap="#_gfe_s_d_k_1_1_highlights_inherit__map" alt="Inheritance graph"/></div>
-<map name="_gfe_s_d_k_1_1_highlights_inherit__map" id="_gfe_s_d_k_1_1_highlights_inherit__map">
-<area shape="rect" id="node2" href="class_gfe_s_d_k_1_1_highlights_impl.html" title="GfeSDK::HighlightsImpl" alt="" coords="5,80,164,107"/>
+ <div class="center">
+  <img src="class_gfe_s_d_k_1_1_highlights.png" usemap="#GfeSDK::Highlights_map" alt=""/>
+  <map id="GfeSDK::Highlights_map" name="GfeSDK::Highlights_map">
+<area href="class_gfe_s_d_k_1_1_highlights_impl.html" alt="GfeSDK::HighlightsImpl" shape="rect" coords="0,56,140,80"/>
 </map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
+ </div></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
 <tr class="memitem:a8e522535c3393a1911e2bbb65c71eb52"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#a8e522535c3393a1911e2bbb65c71eb52">ConfigureAsync</a> (<a class="el" href="struct_gfe_s_d_k_1_1_highlight_config_params.html">HighlightConfigParams</a> const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)=0</td></tr>
 <tr class="separator:a8e522535c3393a1911e2bbb65c71eb52"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a593d1bd58183bc0b53c7dee7991d8491"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#a593d1bd58183bc0b53c7dee7991d8491">GetUserSettingsAsync</a> (TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const =0</td></tr>
-<tr class="separator:a593d1bd58183bc0b53c7dee7991d8491"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:add1016d23068c8f2dd0cd037210aa14b"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#add1016d23068c8f2dd0cd037210aa14b">GetUserSettingsAsync</a> (TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const  =0</td></tr>
+<tr class="separator:add1016d23068c8f2dd0cd037210aa14b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab1b35bd4fe9e8aac357db3aeabfefa1b"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#ab1b35bd4fe9e8aac357db3aeabfefa1b">OpenGroupAsync</a> (<a class="el" href="struct_gfe_s_d_k_1_1_highlight_open_group_params.html">HighlightOpenGroupParams</a> const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)=0</td></tr>
 <tr class="separator:ab1b35bd4fe9e8aac357db3aeabfefa1b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac53536039527813888e5404a3a20e4ab"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html#ac53536039527813888e5404a3a20e4ab">CloseGroupAsync</a> (<a class="el" href="struct_gfe_s_d_k_1_1_highlight_close_group_params.html">HighlightCloseGroupParams</a> const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)=0</td></tr>
@@ -121,7 +149,7 @@ Public Member Functions</h2></td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-static-methods"></a>
 Static Public Member Functions</h2></td></tr>
-<tr class="memitem:ab70eb13e8e586ae324f8bd91d06b1b78"><td class="memItemLeft" align="right" valign="top"><a id="ab70eb13e8e586ae324f8bd91d06b1b78"></a>
+<tr class="memitem:ab70eb13e8e586ae324f8bd91d06b1b78"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab70eb13e8e586ae324f8bd91d06b1b78"></a>
 static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>Create</b> (<a class="el" href="class_gfe_s_d_k_1_1_core.html">Core</a> *core)</td></tr>
 <tr class="separator:ab70eb13e8e586ae324f8bd91d06b1b78"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -130,9 +158,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 <p>Definition at line <a class="el" href="ihighlights__cpp_8h_source.html#l00028">28</a> of file <a class="el" href="ihighlights__cpp_8h_source.html">ihighlights_cpp.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
-<a id="a8e522535c3393a1911e2bbb65c71eb52"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a8e522535c3393a1911e2bbb65c71eb52">&sect;&nbsp;</a></span>ConfigureAsync()</h2>
-
+<a class="anchor" id="a8e522535c3393a1911e2bbb65c71eb52"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -175,9 +201,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="a593d1bd58183bc0b53c7dee7991d8491"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a593d1bd58183bc0b53c7dee7991d8491">&sect;&nbsp;</a></span>GetUserSettingsAsync()</h2>
-
+<a class="anchor" id="add1016d23068c8f2dd0cd037210aa14b"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -210,13 +234,11 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 </div><div class="memdoc">
 <p>C++ binding for <a class="el" href="ihighlights_8h.html#a48a359560944097729acf3dff42e34bb">NVGSDK_Highlights_GetUserSettingsAsync</a> </p>
 
-<p>Implemented in <a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040">GfeSDK::HighlightsImpl</a>.</p>
+<p>Implemented in <a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f">GfeSDK::HighlightsImpl</a>.</p>
 
 </div>
 </div>
-<a id="ab1b35bd4fe9e8aac357db3aeabfefa1b"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ab1b35bd4fe9e8aac357db3aeabfefa1b">&sect;&nbsp;</a></span>OpenGroupAsync()</h2>
-
+<a class="anchor" id="ab1b35bd4fe9e8aac357db3aeabfefa1b"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -259,9 +281,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="ac53536039527813888e5404a3a20e4ab"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ac53536039527813888e5404a3a20e4ab">&sect;&nbsp;</a></span>CloseGroupAsync()</h2>
-
+<a class="anchor" id="ac53536039527813888e5404a3a20e4ab"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -304,9 +324,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="a84475c751b97bf00d55e767b55e89bff"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a84475c751b97bf00d55e767b55e89bff">&sect;&nbsp;</a></span>SetScreenshotHighlightAsync()</h2>
-
+<a class="anchor" id="a84475c751b97bf00d55e767b55e89bff"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -349,9 +367,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="a982f27414a0672d50f6f156ecf557791"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a982f27414a0672d50f6f156ecf557791">&sect;&nbsp;</a></span>SetVideoHighlightAsync()</h2>
-
+<a class="anchor" id="a982f27414a0672d50f6f156ecf557791"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -394,9 +410,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="a9d1ab59542571efe90391aea1503411b"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a9d1ab59542571efe90391aea1503411b">&sect;&nbsp;</a></span>OpenSummaryAsync()</h2>
-
+<a class="anchor" id="a9d1ab59542571efe90391aea1503411b"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -439,9 +453,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="ad640f12621aa2ab8f0bf39b859f8d849"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ad640f12621aa2ab8f0bf39b859f8d849">&sect;&nbsp;</a></span>GetNumberOfHighlightsAsync()</h2>
-
+<a class="anchor" id="ad640f12621aa2ab8f0bf39b859f8d849"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -497,7 +509,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/class_gfe_s_d_k_1_1_highlights.js b/doc/html/class_gfe_s_d_k_1_1_highlights.js
index 3718414..9f69c22 100644
--- a/doc/html/class_gfe_s_d_k_1_1_highlights.js
+++ b/doc/html/class_gfe_s_d_k_1_1_highlights.js
@@ -2,7 +2,7 @@ var class_gfe_s_d_k_1_1_highlights =
 [
     [ "~Highlights", "class_gfe_s_d_k_1_1_highlights.html#aa2c9b07707a0d029f9584f29d207f56c", null ],
     [ "ConfigureAsync", "class_gfe_s_d_k_1_1_highlights.html#a8e522535c3393a1911e2bbb65c71eb52", null ],
-    [ "GetUserSettingsAsync", "class_gfe_s_d_k_1_1_highlights.html#a593d1bd58183bc0b53c7dee7991d8491", null ],
+    [ "GetUserSettingsAsync", "class_gfe_s_d_k_1_1_highlights.html#add1016d23068c8f2dd0cd037210aa14b", null ],
     [ "OpenGroupAsync", "class_gfe_s_d_k_1_1_highlights.html#ab1b35bd4fe9e8aac357db3aeabfefa1b", null ],
     [ "CloseGroupAsync", "class_gfe_s_d_k_1_1_highlights.html#ac53536039527813888e5404a3a20e4ab", null ],
     [ "SetScreenshotHighlightAsync", "class_gfe_s_d_k_1_1_highlights.html#a84475c751b97bf00d55e767b55e89bff", null ],
diff --git a/doc/html/class_gfe_s_d_k_1_1_highlights.png b/doc/html/class_gfe_s_d_k_1_1_highlights.png
new file mode 100644
index 0000000..8fb9d1e
Binary files /dev/null and b/doc/html/class_gfe_s_d_k_1_1_highlights.png differ
diff --git a/doc/html/class_gfe_s_d_k_1_1_highlights_impl-members.html b/doc/html/class_gfe_s_d_k_1_1_highlights_impl-members.html
index 517930f..38f8328 100644
--- a/doc/html/class_gfe_s_d_k_1_1_highlights_impl-members.html
+++ b/doc/html/class_gfe_s_d_k_1_1_highlights_impl-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -92,7 +119,7 @@ $(document).ready(function(){initNavTree('class_gfe_s_d_k_1_1_highlights_impl.ht
   <tr><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#adfee0bca7a525fd81406d719ad1aaed9">ConfigureAsync</a>(HighlightConfigParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html">GfeSDK::HighlightsImpl</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Create</b>(Core *core) (defined in <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a>)</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">static</span></td></tr>
   <tr><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#a358fcbe7699b79ed79952bb2eab12830">GetNumberOfHighlightsAsync</a>(GroupView const &amp;params, TGetNumberOfHighlightsCallback cb=nullptr, void *cbContext=nullptr)</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html">GfeSDK::HighlightsImpl</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040">GetUserSettingsAsync</a>(TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html">GfeSDK::HighlightsImpl</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f">GetUserSettingsAsync</a>(TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const </td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html">GfeSDK::HighlightsImpl</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>Highlights</b> (defined in <a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html">GfeSDK::HighlightsImpl</a>)</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html">GfeSDK::HighlightsImpl</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#a8420e07f1812fba8bf961e90e5795d3b">OpenGroupAsync</a>(HighlightOpenGroupParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html">GfeSDK::HighlightsImpl</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab31f1319b9dcf33cf9146916f8a1d5f3">OpenSummaryAsync</a>(SummaryParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</td><td class="entry"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html">GfeSDK::HighlightsImpl</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
@@ -107,7 +134,7 @@ $(document).ready(function(){initNavTree('class_gfe_s_d_k_1_1_highlights_impl.ht
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/class_gfe_s_d_k_1_1_highlights_impl.html b/doc/html/class_gfe_s_d_k_1_1_highlights_impl.html
index e27eef6..60ceb63 100644
--- a/doc/html/class_gfe_s_d_k_1_1_highlights_impl.html
+++ b/doc/html/class_gfe_s_d_k_1_1_highlights_impl.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::HighlightsImpl Class Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -92,26 +119,19 @@ $(document).ready(function(){initNavTree('class_gfe_s_d_k_1_1_highlights_impl.ht
 <div class="dynheader">
 Inheritance diagram for GfeSDK::HighlightsImpl:</div>
 <div class="dyncontent">
-<div class="center"><img src="class_gfe_s_d_k_1_1_highlights_impl__inherit__graph.png" border="0" usemap="#_gfe_s_d_k_1_1_highlights_impl_inherit__map" alt="Inheritance graph"/></div>
-<map name="_gfe_s_d_k_1_1_highlights_impl_inherit__map" id="_gfe_s_d_k_1_1_highlights_impl_inherit__map">
-<area shape="rect" id="node2" href="class_gfe_s_d_k_1_1_highlights.html" title="GfeSDK::Highlights" alt="" coords="17,5,152,32"/>
+ <div class="center">
+  <img src="class_gfe_s_d_k_1_1_highlights_impl.png" usemap="#GfeSDK::HighlightsImpl_map" alt=""/>
+  <map id="GfeSDK::HighlightsImpl_map" name="GfeSDK::HighlightsImpl_map">
+<area href="class_gfe_s_d_k_1_1_highlights.html" alt="GfeSDK::Highlights" shape="rect" coords="0,0,140,24"/>
 </map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
-<div class="dynheader">
-Collaboration diagram for GfeSDK::HighlightsImpl:</div>
-<div class="dyncontent">
-<div class="center"><img src="class_gfe_s_d_k_1_1_highlights_impl__coll__graph.png" border="0" usemap="#_gfe_s_d_k_1_1_highlights_impl_coll__map" alt="Collaboration graph"/></div>
-<map name="_gfe_s_d_k_1_1_highlights_impl_coll__map" id="_gfe_s_d_k_1_1_highlights_impl_coll__map">
-<area shape="rect" id="node2" href="class_gfe_s_d_k_1_1_highlights.html" title="GfeSDK::Highlights" alt="" coords="17,5,152,32"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
+ </div></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
 <tr class="memitem:adfee0bca7a525fd81406d719ad1aaed9"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#adfee0bca7a525fd81406d719ad1aaed9">ConfigureAsync</a> (<a class="el" href="struct_gfe_s_d_k_1_1_highlight_config_params.html">HighlightConfigParams</a> const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</td></tr>
 <tr class="separator:adfee0bca7a525fd81406d719ad1aaed9"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac6238d6e68d8b3ed07c2753f35ea8040"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040">GetUserSettingsAsync</a> (TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const</td></tr>
-<tr class="separator:ac6238d6e68d8b3ed07c2753f35ea8040"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ac1463c91e4646dafb38d2ff53c98f22f"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f">GetUserSettingsAsync</a> (TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const </td></tr>
+<tr class="separator:ac1463c91e4646dafb38d2ff53c98f22f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a8420e07f1812fba8bf961e90e5795d3b"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#a8420e07f1812fba8bf961e90e5795d3b">OpenGroupAsync</a> (<a class="el" href="struct_gfe_s_d_k_1_1_highlight_open_group_params.html">HighlightOpenGroupParams</a> const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</td></tr>
 <tr class="separator:a8420e07f1812fba8bf961e90e5795d3b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a22481d623b4124cd7277b30a70a11fad"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#a22481d623b4124cd7277b30a70a11fad">CloseGroupAsync</a> (<a class="el" href="struct_gfe_s_d_k_1_1_highlight_close_group_params.html">HighlightCloseGroupParams</a> const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</td></tr>
@@ -127,14 +147,14 @@ Public Member Functions</h2></td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="friends"></a>
 Friends</h2></td></tr>
-<tr class="memitem:a7bc5afc665ec977bcb3d9d9649ada38b"><td class="memItemLeft" align="right" valign="top"><a id="a7bc5afc665ec977bcb3d9d9649ada38b"></a>
+<tr class="memitem:a7bc5afc665ec977bcb3d9d9649ada38b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7bc5afc665ec977bcb3d9d9649ada38b"></a>
 class&#160;</td><td class="memItemRight" valign="bottom"><b>Highlights</b></td></tr>
 <tr class="separator:a7bc5afc665ec977bcb3d9d9649ada38b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="inherited"></a>
 Additional Inherited Members</h2></td></tr>
 <tr class="inherit_header pub_static_methods_class_gfe_s_d_k_1_1_highlights"><td colspan="2" onclick="javascript:toggleInherit('pub_static_methods_class_gfe_s_d_k_1_1_highlights')"><img src="closed.png" alt="-"/>&#160;Static Public Member Functions inherited from <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a></td></tr>
-<tr class="memitem:ab70eb13e8e586ae324f8bd91d06b1b78 inherit pub_static_methods_class_gfe_s_d_k_1_1_highlights"><td class="memItemLeft" align="right" valign="top"><a id="ab70eb13e8e586ae324f8bd91d06b1b78"></a>
+<tr class="memitem:ab70eb13e8e586ae324f8bd91d06b1b78 inherit pub_static_methods_class_gfe_s_d_k_1_1_highlights"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab70eb13e8e586ae324f8bd91d06b1b78"></a>
 static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>Create</b> (<a class="el" href="class_gfe_s_d_k_1_1_core.html">Core</a> *core)</td></tr>
 <tr class="separator:ab70eb13e8e586ae324f8bd91d06b1b78 inherit pub_static_methods_class_gfe_s_d_k_1_1_highlights"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -142,9 +162,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 <div class="textblock">
 <p>Definition at line <a class="el" href="ihighlights__cpp__impl_8h_source.html#l00026">26</a> of file <a class="el" href="ihighlights__cpp__impl_8h_source.html">ihighlights_cpp_impl.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
-<a id="adfee0bca7a525fd81406d719ad1aaed9"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#adfee0bca7a525fd81406d719ad1aaed9">&sect;&nbsp;</a></span>ConfigureAsync()</h2>
-
+<a class="anchor" id="adfee0bca7a525fd81406d719ad1aaed9"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -189,9 +207,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="ac6238d6e68d8b3ed07c2753f35ea8040"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ac6238d6e68d8b3ed07c2753f35ea8040">&sect;&nbsp;</a></span>GetUserSettingsAsync()</h2>
-
+<a class="anchor" id="ac1463c91e4646dafb38d2ff53c98f22f"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -224,15 +240,13 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 </div><div class="memdoc">
 <p>C++ binding for <a class="el" href="ihighlights_8h.html#a48a359560944097729acf3dff42e34bb">NVGSDK_Highlights_GetUserSettingsAsync</a> </p>
 
-<p>Implements <a class="el" href="class_gfe_s_d_k_1_1_highlights.html#a593d1bd58183bc0b53c7dee7991d8491">GfeSDK::Highlights</a>.</p>
+<p>Implements <a class="el" href="class_gfe_s_d_k_1_1_highlights.html#add1016d23068c8f2dd0cd037210aa14b">GfeSDK::Highlights</a>.</p>
 
 <p>Definition at line <a class="el" href="ihighlights__cpp__impl_8h_source.html#l00092">92</a> of file <a class="el" href="ihighlights__cpp__impl_8h_source.html">ihighlights_cpp_impl.h</a>.</p>
 
 </div>
 </div>
-<a id="a8420e07f1812fba8bf961e90e5795d3b"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a8420e07f1812fba8bf961e90e5795d3b">&sect;&nbsp;</a></span>OpenGroupAsync()</h2>
-
+<a class="anchor" id="a8420e07f1812fba8bf961e90e5795d3b"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -277,9 +291,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="a22481d623b4124cd7277b30a70a11fad"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a22481d623b4124cd7277b30a70a11fad">&sect;&nbsp;</a></span>CloseGroupAsync()</h2>
-
+<a class="anchor" id="a22481d623b4124cd7277b30a70a11fad"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -324,9 +336,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="a10ec6fa65e8afb5ea417f4cfe7f1d5ab"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a10ec6fa65e8afb5ea417f4cfe7f1d5ab">&sect;&nbsp;</a></span>SetScreenshotHighlightAsync()</h2>
-
+<a class="anchor" id="a10ec6fa65e8afb5ea417f4cfe7f1d5ab"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -371,9 +381,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="ab4989563440e14295449166c626ac3a9"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ab4989563440e14295449166c626ac3a9">&sect;&nbsp;</a></span>SetVideoHighlightAsync()</h2>
-
+<a class="anchor" id="ab4989563440e14295449166c626ac3a9"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -418,9 +426,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="ab31f1319b9dcf33cf9146916f8a1d5f3"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ab31f1319b9dcf33cf9146916f8a1d5f3">&sect;&nbsp;</a></span>OpenSummaryAsync()</h2>
-
+<a class="anchor" id="ab31f1319b9dcf33cf9146916f8a1d5f3"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -465,9 +471,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
 
 </div>
 </div>
-<a id="a358fcbe7699b79ed79952bb2eab12830"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a358fcbe7699b79ed79952bb2eab12830">&sect;&nbsp;</a></span>GetNumberOfHighlightsAsync()</h2>
-
+<a class="anchor" id="a358fcbe7699b79ed79952bb2eab12830"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -524,7 +528,7 @@ static <a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> *
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/class_gfe_s_d_k_1_1_highlights_impl.js b/doc/html/class_gfe_s_d_k_1_1_highlights_impl.js
index 95ce0cc..785d484 100644
--- a/doc/html/class_gfe_s_d_k_1_1_highlights_impl.js
+++ b/doc/html/class_gfe_s_d_k_1_1_highlights_impl.js
@@ -1,7 +1,7 @@
 var class_gfe_s_d_k_1_1_highlights_impl =
 [
     [ "ConfigureAsync", "class_gfe_s_d_k_1_1_highlights_impl.html#adfee0bca7a525fd81406d719ad1aaed9", null ],
-    [ "GetUserSettingsAsync", "class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040", null ],
+    [ "GetUserSettingsAsync", "class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f", null ],
     [ "OpenGroupAsync", "class_gfe_s_d_k_1_1_highlights_impl.html#a8420e07f1812fba8bf961e90e5795d3b", null ],
     [ "CloseGroupAsync", "class_gfe_s_d_k_1_1_highlights_impl.html#a22481d623b4124cd7277b30a70a11fad", null ],
     [ "SetScreenshotHighlightAsync", "class_gfe_s_d_k_1_1_highlights_impl.html#a10ec6fa65e8afb5ea417f4cfe7f1d5ab", null ],
diff --git a/doc/html/class_gfe_s_d_k_1_1_highlights_impl.png b/doc/html/class_gfe_s_d_k_1_1_highlights_impl.png
new file mode 100644
index 0000000..6b3e3f0
Binary files /dev/null and b/doc/html/class_gfe_s_d_k_1_1_highlights_impl.png differ
diff --git a/doc/html/classes.html b/doc/html/classes.html
index d0eaee0..a192805 100644
--- a/doc/html/classes.html
+++ b/doc/html/classes.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Class Index</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li class="current"><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,35 +112,35 @@ $(document).ready(function(){initNavTree('classes.html','');});
 <div class="title">Class Index</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="qindex"><a class="qindex" href="#letter_c">c</a>&#160;|&#160;<a class="qindex" href="#letter_g">g</a>&#160;|&#160;<a class="qindex" href="#letter_h">h</a>&#160;|&#160;<a class="qindex" href="#letter_n">n</a>&#160;|&#160;<a class="qindex" href="#letter_o">o</a>&#160;|&#160;<a class="qindex" href="#letter_p">p</a>&#160;|&#160;<a class="qindex" href="#letter_r">r</a>&#160;|&#160;<a class="qindex" href="#letter_s">s</a>&#160;|&#160;<a class="qindex" href="#letter_v">v</a></div>
+<div class="qindex"><a class="qindex" href="#letter_C">C</a>&#160;|&#160;<a class="qindex" href="#letter_G">G</a>&#160;|&#160;<a class="qindex" href="#letter_H">H</a>&#160;|&#160;<a class="qindex" href="#letter_N">N</a>&#160;|&#160;<a class="qindex" href="#letter_O">O</a>&#160;|&#160;<a class="qindex" href="#letter_P">P</a>&#160;|&#160;<a class="qindex" href="#letter_R">R</a>&#160;|&#160;<a class="qindex" href="#letter_S">S</a>&#160;|&#160;<a class="qindex" href="#letter_V">V</a></div>
 <table class="classindex">
-<tr><td rowspan="2" valign="bottom"><a name="letter_c"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;c&#160;&#160;</div></td></tr></table>
-</td><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_config_params.html">HighlightConfigParams</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_s"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;s&#160;&#160;</div></td></tr></table>
+<tr><td rowspan="2" valign="bottom"><a name="letter_C"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;C&#160;&#160;</div></td></tr></table>
+</td><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_config_params.html">HighlightConfigParams</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;S&#160;&#160;</div></td></tr></table>
 </td></tr>
 <tr><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_definition.html">HighlightDefinition</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a>&#160;&#160;&#160;</td></tr>
 <tr><td valign="top"><a class="el" href="class_gfe_s_d_k_1_1_core.html">Core</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_open_group_params.html">HighlightOpenGroupParams</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___version.html">NVGSDK_Version</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_screenshot_highlight_params.html">ScreenshotHighlightParams</a> (GfeSDK)&#160;&#160;&#160;</td></tr>
 <tr><td valign="top"><a class="el" href="class_gfe_s_d_k_1_1_core_impl.html">CoreImpl</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_summary_params.html">SummaryParams</a> (GfeSDK)&#160;&#160;&#160;</td></tr>
-<tr><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_create_input_params.html">CreateInputParams</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_o"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;o&#160;&#160;</div></td></tr></table>
-</td><td rowspan="2" valign="bottom"><a name="letter_v"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;v&#160;&#160;</div></td></tr></table>
+<tr><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_create_input_params.html">CreateInputParams</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_O"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;O&#160;&#160;</div></td></tr></table>
+</td><td rowspan="2" valign="bottom"><a name="letter_V"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;V&#160;&#160;</div></td></tr></table>
 </td></tr>
 <tr><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_create_response.html">CreateResponse</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_user_setting.html">HighlightUserSetting</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___highlight_user_setting.html">NVGSDK_HighlightUserSetting</a>&#160;&#160;&#160;</td></tr>
-<tr><td rowspan="2" valign="bottom"><a name="letter_g"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;g&#160;&#160;</div></td></tr></table>
-</td><td rowspan="2" valign="bottom"><a name="letter_n"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;n&#160;&#160;</div></td></tr></table>
+<tr><td rowspan="2" valign="bottom"><a name="letter_G"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;G&#160;&#160;</div></td></tr></table>
+</td><td rowspan="2" valign="bottom"><a name="letter_N"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;N&#160;&#160;</div></td></tr></table>
 </td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___language.html">NVGSDK_Language</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_overlay_state_changed_notification.html">OverlayStateChangedNotification</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_video_highlight_params.html">VideoHighlightParams</a> (GfeSDK)&#160;&#160;&#160;</td></tr>
-<tr><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_p"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;p&#160;&#160;</div></td></tr></table>
+<tr><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_P"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;P&#160;&#160;</div></td></tr></table>
 </td><td></td></tr>
 <tr><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_get_number_of_highlights_response.html">GetNumberOfHighlightsResponse</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_notification_base.html">NotificationBase</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___notification.html">NVGSDK_Notification</a>&#160;&#160;&#160;</td><td></td></tr>
 <tr><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_get_u_i_language_response.html">GetUILanguageResponse</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html">NVGSDK_CreateInputParams</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html">NVGSDK_OverlayStateChangedNotification</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_permissions_changed_notification.html">PermissionsChangedNotification</a> (GfeSDK)&#160;&#160;&#160;</td><td></td></tr>
-<tr><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_get_user_settings_response.html">GetUserSettingsResponse</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___create_response.html">NVGSDK_CreateResponse</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___permissions_changed_notification.html">NVGSDK_PermissionsChangedNotification</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_r"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;r&#160;&#160;</div></td></tr></table>
+<tr><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_get_user_settings_response.html">GetUserSettingsResponse</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___create_response.html">NVGSDK_CreateResponse</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___permissions_changed_notification.html">NVGSDK_PermissionsChangedNotification</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_R"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;R&#160;&#160;</div></td></tr></table>
 </td><td></td></tr>
 <tr><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_group_view.html">GroupView</a> (GfeSDK)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___request_permissions_params.html">NVGSDK_RequestPermissionsParams</a>&#160;&#160;&#160;</td><td></td></tr>
-<tr><td rowspan="2" valign="bottom"><a name="letter_h"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;h&#160;&#160;</div></td></tr></table>
+<tr><td rowspan="2" valign="bottom"><a name="letter_H"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;H&#160;&#160;</div></td></tr></table>
 </td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___highlight.html">NVGSDK_Highlight</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_request_permissions_params.html">RequestPermissionsParams</a> (GfeSDK)&#160;&#160;&#160;</td><td></td></tr>
 <tr><td></td><td></td><td></td><td></td></tr>
 <tr><td valign="top"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_close_group_params.html">HighlightCloseGroupParams</a> (GfeSDK)&#160;&#160;&#160;</td><td></td><td></td><td></td><td></td></tr>
 <tr><td></td><td></td><td></td><td></td><td></td></tr>
 </table>
-<div class="qindex"><a class="qindex" href="#letter_c">c</a>&#160;|&#160;<a class="qindex" href="#letter_g">g</a>&#160;|&#160;<a class="qindex" href="#letter_h">h</a>&#160;|&#160;<a class="qindex" href="#letter_n">n</a>&#160;|&#160;<a class="qindex" href="#letter_o">o</a>&#160;|&#160;<a class="qindex" href="#letter_p">p</a>&#160;|&#160;<a class="qindex" href="#letter_r">r</a>&#160;|&#160;<a class="qindex" href="#letter_s">s</a>&#160;|&#160;<a class="qindex" href="#letter_v">v</a></div>
+<div class="qindex"><a class="qindex" href="#letter_C">C</a>&#160;|&#160;<a class="qindex" href="#letter_G">G</a>&#160;|&#160;<a class="qindex" href="#letter_H">H</a>&#160;|&#160;<a class="qindex" href="#letter_N">N</a>&#160;|&#160;<a class="qindex" href="#letter_O">O</a>&#160;|&#160;<a class="qindex" href="#letter_P">P</a>&#160;|&#160;<a class="qindex" href="#letter_R">R</a>&#160;|&#160;<a class="qindex" href="#letter_S">S</a>&#160;|&#160;<a class="qindex" href="#letter_V">V</a></div>
 </div><!-- contents -->
 </div><!-- doc-content -->
 <!-- HTML footer for doxygen 1.8.12-->
@@ -122,7 +149,7 @@ $(document).ready(function(){initNavTree('classes.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/config_8h_source.html b/doc/html/config_8h_source.html
index f9b71cb..f3fe074 100644
--- a/doc/html/config_8h_source.html
+++ b/doc/html/config_8h_source.html
@@ -4,9 +4,9 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/x64-release-uwp/sdk/include/gfesdk/config.h Source File</title>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x64-release-uwp/sdk/include/gfesdk/config.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,16 +110,16 @@ $(document).ready(function(){initNavTree('config_8h_source.html','');});
 <div class="title">config.h</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment"> * NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment"> * and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> * and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment">// Warning: This file is generated. Do not edit</span></div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;</div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#ifndef _NVGSDK_CONFIG_H_</span></div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#define _NVGSDK_CONFIG_H_</span></div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;gfe3_product_version.h&quot;</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;</div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#define NVGSDK_PROJECT_NAME &quot;GfeSDK&quot;</span></div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#define NVGSDK_VERSION_MAJOR   1</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#define NVGSDK_VERSION_MINOR   1</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#define NVGSDK_BUILD_NUMBER    217</span></div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#define NVGSDK_BUILD_HASH      10bac95d</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#define NVGSDK_BUILD_HASH_STR  &quot;10bac95d&quot;</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#endif // _NVGSDK_CONFIG_H_</span></div></div><!-- fragment --></div><!-- contents -->
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment"> * NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment"> * and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> * and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment">// Warning: This file is generated. Do not edit</span></div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;</div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#ifndef _NVGSDK_CONFIG_H_</span></div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#define _NVGSDK_CONFIG_H_</span></div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;gfe3_product_version.h&quot;</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;</div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#define NVGSDK_PROJECT_NAME &quot;GfeSDK-sdkclient-win&quot;</span></div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#define NVGSDK_VERSION_MAJOR   1</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#define NVGSDK_VERSION_MINOR   1</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#define NVGSDK_BUILD_NUMBER    232</span></div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#define NVGSDK_BUILD_HASH      4cdf2529</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#define NVGSDK_BUILD_HASH_STR  &quot;4cdf2529&quot;</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#endif // _NVGSDK_CONFIG_H_</span></div></div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- HTML footer for doxygen 1.8.12-->
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="navelem"><a class="el" href="dir_21dfd2273a7f43571f69ea7d9a7bef28.html">sdk</a></li><li class="navelem"><a class="el" href="dir_c8951a4514ffd6dca1d0bd1443098010.html">include</a></li><li class="navelem"><a class="el" href="dir_e789e2e8a554a90f7e478c85f971e5ee.html">gfesdk</a></li><li class="navelem"><b>config.h</b></li>
+    <li class="navelem"><a class="el" href="dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html">sdk</a></li><li class="navelem"><a class="el" href="dir_e31eb9cae286691b323708fcb3cc0b5c.html">include</a></li><li class="navelem"><a class="el" href="dir_0e11d6b9f607d0ef730b98f1fc6a7102.html">gfesdk</a></li><li class="navelem"><b>config.h</b></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/dir_007ea9f4a44739512de65b1e8449a30c.html b/doc/html/dir_007ea9f4a44739512de65b1e8449a30c.html
new file mode 100644
index 0000000..3e5370f
--- /dev/null
+++ b/doc/html/dir_007ea9f4a44739512de65b1e8449a30c.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x64-release/sdk Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_007ea9f4a44739512de65b1e8449a30c.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">sdk Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
+Directories</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_007ea9f4a44739512de65b1e8449a30c.html">sdk</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_007ea9f4a44739512de65b1e8449a30c.js b/doc/html/dir_007ea9f4a44739512de65b1e8449a30c.js
new file mode 100644
index 0000000..2479768
--- /dev/null
+++ b/doc/html/dir_007ea9f4a44739512de65b1e8449a30c.js
@@ -0,0 +1,4 @@
+var dir_007ea9f4a44739512de65b1e8449a30c =
+[
+    [ "include", "dir_956a284d1d814cd411185293071355a4.html", "dir_956a284d1d814cd411185293071355a4" ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_0c61202ded5e294eff1cc1338a0167a6.html b/doc/html/dir_0c61202ded5e294eff1cc1338a0167a6.html
new file mode 100644
index 0000000..ccc91df
--- /dev/null
+++ b/doc/html/dir_0c61202ded5e294eff1cc1338a0167a6.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x86-release/sdk/include/gfesdk Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_0c61202ded5e294eff1cc1338a0167a6.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">gfesdk Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
+Files</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_5ecf58e08b8bac4b5dfd1f49ca574289.html">sdk</a></li><li class="navelem"><a class="el" href="dir_493b85567c8a3fbf04d485060a60d793.html">include</a></li><li class="navelem"><a class="el" href="dir_0c61202ded5e294eff1cc1338a0167a6.html">gfesdk</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_0c61202ded5e294eff1cc1338a0167a6.js b/doc/html/dir_0c61202ded5e294eff1cc1338a0167a6.js
new file mode 100644
index 0000000..02c54c7
--- /dev/null
+++ b/doc/html/dir_0c61202ded5e294eff1cc1338a0167a6.js
@@ -0,0 +1,6 @@
+var dir_0c61202ded5e294eff1cc1338a0167a6 =
+[
+    [ "config.h", "config_8h_source.html", null ],
+    [ "gfe3_product_version.h", "gfe3__product__version_8h_source.html", null ],
+    [ "sdk_types_ipc.h", "sdk__types__ipc_8h_source.html", null ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_0e11d6b9f607d0ef730b98f1fc6a7102.html b/doc/html/dir_0e11d6b9f607d0ef730b98f1fc6a7102.html
new file mode 100644
index 0000000..dc354b3
--- /dev/null
+++ b/doc/html/dir_0e11d6b9f607d0ef730b98f1fc6a7102.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x64-release-uwp/sdk/include/gfesdk Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_0e11d6b9f607d0ef730b98f1fc6a7102.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">gfesdk Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
+Files</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html">sdk</a></li><li class="navelem"><a class="el" href="dir_e31eb9cae286691b323708fcb3cc0b5c.html">include</a></li><li class="navelem"><a class="el" href="dir_0e11d6b9f607d0ef730b98f1fc6a7102.html">gfesdk</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_0e11d6b9f607d0ef730b98f1fc6a7102.js b/doc/html/dir_0e11d6b9f607d0ef730b98f1fc6a7102.js
new file mode 100644
index 0000000..fb3e250
--- /dev/null
+++ b/doc/html/dir_0e11d6b9f607d0ef730b98f1fc6a7102.js
@@ -0,0 +1,6 @@
+var dir_0e11d6b9f607d0ef730b98f1fc6a7102 =
+[
+    [ "config.h", "config_8h_source.html", null ],
+    [ "gfe3_product_version.h", "gfe3__product__version_8h_source.html", null ],
+    [ "sdk_types_ipc.h", "sdk__types__ipc_8h_source.html", null ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_171a6e180bb88a8eb61f17f17c2f6876.html b/doc/html/dir_171a6e180bb88a8eb61f17f17c2f6876.html
new file mode 100644
index 0000000..2fd4c2d
--- /dev/null
+++ b/doc/html/dir_171a6e180bb88a8eb61f17f17c2f6876.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x86-release-uwp/sdk/include Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_171a6e180bb88a8eb61f17f17c2f6876.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">include Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
+Directories</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_2da3e0a8a223e44caac2fd87d541599f.html">sdk</a></li><li class="navelem"><a class="el" href="dir_171a6e180bb88a8eb61f17f17c2f6876.html">include</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_171a6e180bb88a8eb61f17f17c2f6876.js b/doc/html/dir_171a6e180bb88a8eb61f17f17c2f6876.js
new file mode 100644
index 0000000..8cafe7d
--- /dev/null
+++ b/doc/html/dir_171a6e180bb88a8eb61f17f17c2f6876.js
@@ -0,0 +1,4 @@
+var dir_171a6e180bb88a8eb61f17f17c2f6876 =
+[
+    [ "gfesdk", "dir_f1cfbb21bff00595e5c2406058aaadcb.html", "dir_f1cfbb21bff00595e5c2406058aaadcb" ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html b/doc/html/dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html
new file mode 100644
index 0000000..5d799ea
--- /dev/null
+++ b/doc/html/dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x64-release-uwp/sdk Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">sdk Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
+Directories</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html">sdk</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.js b/doc/html/dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.js
new file mode 100644
index 0000000..af3a3d4
--- /dev/null
+++ b/doc/html/dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.js
@@ -0,0 +1,4 @@
+var dir_22a05cd20f85fd3b5d06bb82cdaa6ca8 =
+[
+    [ "include", "dir_e31eb9cae286691b323708fcb3cc0b5c.html", "dir_e31eb9cae286691b323708fcb3cc0b5c" ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_2da3e0a8a223e44caac2fd87d541599f.html b/doc/html/dir_2da3e0a8a223e44caac2fd87d541599f.html
new file mode 100644
index 0000000..dc2feee
--- /dev/null
+++ b/doc/html/dir_2da3e0a8a223e44caac2fd87d541599f.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x86-release-uwp/sdk Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_2da3e0a8a223e44caac2fd87d541599f.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">sdk Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
+Directories</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_2da3e0a8a223e44caac2fd87d541599f.html">sdk</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_2da3e0a8a223e44caac2fd87d541599f.js b/doc/html/dir_2da3e0a8a223e44caac2fd87d541599f.js
new file mode 100644
index 0000000..2b0eecd
--- /dev/null
+++ b/doc/html/dir_2da3e0a8a223e44caac2fd87d541599f.js
@@ -0,0 +1,4 @@
+var dir_2da3e0a8a223e44caac2fd87d541599f =
+[
+    [ "include", "dir_171a6e180bb88a8eb61f17f17c2f6876.html", "dir_171a6e180bb88a8eb61f17f17c2f6876" ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_2f4536f343cdc104d7b83de3fff7416d.html b/doc/html/dir_2f4536f343cdc104d7b83de3fff7416d.html
index b6a9c1b..ca1c15c 100644
--- a/doc/html/dir_2f4536f343cdc104d7b83de3fff7416d.html
+++ b/doc/html/dir_2f4536f343cdc104d7b83de3fff7416d.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights Directory Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,15 +110,6 @@ $(document).ready(function(){initNavTree('dir_2f4536f343cdc104d7b83de3fff7416d.h
 <div class="title">highlights Directory Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="dynheader">
-Directory dependency graph for highlights:</div>
-<div class="dyncontent">
-<div class="center"><img src="dir_2f4536f343cdc104d7b83de3fff7416d_dep.png" border="0" usemap="#dir__2f4536f343cdc104d7b83de3fff7416d__dep" alt="C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights"/></div>
-<map name="dir__2f4536f343cdc104d7b83de3fff7416d__dep" id="dir__2f4536f343cdc104d7b83de3fff7416d__dep">
-<area shape="rect" id="node1" href="dir_2f4536f343cdc104d7b83de3fff7416d.html" title="highlights" alt="" coords="27,52,104,100"/>
-<area shape="rect" id="clust1" href="dir_eb56eea0ff74c30c2a48b22915222057.html" title="gfesdk" alt="" coords="16,16,115,111"/>
-</map>
-</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
 Files</h2></td></tr>
@@ -111,7 +127,7 @@ Files</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_2f4536f343cdc104d7b83de3fff7416d.html">highlights</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/dir_37f49c9d6a230916a5077fbd270eac2a.html b/doc/html/dir_37f49c9d6a230916a5077fbd270eac2a.html
index 82b5ee8..952de0f 100644
--- a/doc/html/dir_37f49c9d6a230916a5077fbd270eac2a.html
+++ b/doc/html/dir_37f49c9d6a230916a5077fbd270eac2a.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include Directory Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,16 +110,6 @@ $(document).ready(function(){initNavTree('dir_37f49c9d6a230916a5077fbd270eac2a.h
 <div class="title">include Directory Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="dynheader">
-Directory dependency graph for include:</div>
-<div class="dyncontent">
-<div class="center"><img src="dir_37f49c9d6a230916a5077fbd270eac2a_dep.png" border="0" usemap="#dir__37f49c9d6a230916a5077fbd270eac2a__dep" alt="C:/u/workspace/dev/sdkwinauto/sdkclient/include"/></div>
-<map name="dir__37f49c9d6a230916a5077fbd270eac2a__dep" id="dir__37f49c9d6a230916a5077fbd270eac2a__dep">
-<area shape="rect" id="node2" href="dir_eb56eea0ff74c30c2a48b22915222057.html" title="gfesdk" alt="" coords="37,63,109,111"/>
-<area shape="rect" id="clust2" href="dir_37f49c9d6a230916a5077fbd270eac2a.html" alt="" coords="27,52,216,121"/>
-<area shape="rect" id="clust1" href="dir_4522e853adfb3285c34ceee6be627ffe.html" title="sdkclient" alt="" coords="16,16,227,132"/>
-</map>
-</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
 Directories</h2></td></tr>
@@ -108,7 +123,7 @@ Directories</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/dir_4522e853adfb3285c34ceee6be627ffe.html b/doc/html/dir_4522e853adfb3285c34ceee6be627ffe.html
index 5f767ad..85a7a0e 100644
--- a/doc/html/dir_4522e853adfb3285c34ceee6be627ffe.html
+++ b/doc/html/dir_4522e853adfb3285c34ceee6be627ffe.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient Directory Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,15 +110,10 @@ $(document).ready(function(){initNavTree('dir_4522e853adfb3285c34ceee6be627ffe.h
 <div class="title">sdkclient Directory Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="dynheader">
-Directory dependency graph for sdkclient:</div>
-<div class="dyncontent">
-<div class="center"><img src="dir_4522e853adfb3285c34ceee6be627ffe_dep.png" border="0" usemap="#dir__4522e853adfb3285c34ceee6be627ffe__dep" alt="C:/u/workspace/dev/sdkwinauto/sdkclient"/></div>
-<map name="dir__4522e853adfb3285c34ceee6be627ffe__dep" id="dir__4522e853adfb3285c34ceee6be627ffe__dep">
-<area shape="rect" id="node2" href="dir_37f49c9d6a230916a5077fbd270eac2a.html" title="include" alt="" coords="27,27,99,75"/>
-<area shape="rect" id="clust1" href="dir_4522e853adfb3285c34ceee6be627ffe.html" alt="" coords="16,16,208,85"/>
-</map>
-</div>
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
+Directories</h2></td></tr>
+</table>
 </div><!-- contents -->
 </div><!-- doc-content -->
 <!-- HTML footer for doxygen 1.8.12-->
@@ -103,7 +123,7 @@ Directory dependency graph for sdkclient:</div>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/dir_493b85567c8a3fbf04d485060a60d793.html b/doc/html/dir_493b85567c8a3fbf04d485060a60d793.html
new file mode 100644
index 0000000..59d4dc2
--- /dev/null
+++ b/doc/html/dir_493b85567c8a3fbf04d485060a60d793.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x86-release/sdk/include Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_493b85567c8a3fbf04d485060a60d793.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">include Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
+Directories</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_5ecf58e08b8bac4b5dfd1f49ca574289.html">sdk</a></li><li class="navelem"><a class="el" href="dir_493b85567c8a3fbf04d485060a60d793.html">include</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_493b85567c8a3fbf04d485060a60d793.js b/doc/html/dir_493b85567c8a3fbf04d485060a60d793.js
new file mode 100644
index 0000000..114efe5
--- /dev/null
+++ b/doc/html/dir_493b85567c8a3fbf04d485060a60d793.js
@@ -0,0 +1,4 @@
+var dir_493b85567c8a3fbf04d485060a60d793 =
+[
+    [ "gfesdk", "dir_0c61202ded5e294eff1cc1338a0167a6.html", "dir_0c61202ded5e294eff1cc1338a0167a6" ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_5224d54c82353be970e4f2086a8200d8.html b/doc/html/dir_5224d54c82353be970e4f2086a8200d8.html
new file mode 100644
index 0000000..147cdb3
--- /dev/null
+++ b/doc/html/dir_5224d54c82353be970e4f2086a8200d8.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x64-release/sdk/include/gfesdk Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_5224d54c82353be970e4f2086a8200d8.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">gfesdk Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
+Files</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_007ea9f4a44739512de65b1e8449a30c.html">sdk</a></li><li class="navelem"><a class="el" href="dir_956a284d1d814cd411185293071355a4.html">include</a></li><li class="navelem"><a class="el" href="dir_5224d54c82353be970e4f2086a8200d8.html">gfesdk</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_5224d54c82353be970e4f2086a8200d8.js b/doc/html/dir_5224d54c82353be970e4f2086a8200d8.js
new file mode 100644
index 0000000..1b7b48d
--- /dev/null
+++ b/doc/html/dir_5224d54c82353be970e4f2086a8200d8.js
@@ -0,0 +1,6 @@
+var dir_5224d54c82353be970e4f2086a8200d8 =
+[
+    [ "config.h", "config_8h_source.html", null ],
+    [ "gfe3_product_version.h", "gfe3__product__version_8h_source.html", null ],
+    [ "sdk_types_ipc.h", "sdk__types__ipc_8h_source.html", null ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_5ecf58e08b8bac4b5dfd1f49ca574289.html b/doc/html/dir_5ecf58e08b8bac4b5dfd1f49ca574289.html
new file mode 100644
index 0000000..d1bb809
--- /dev/null
+++ b/doc/html/dir_5ecf58e08b8bac4b5dfd1f49ca574289.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x86-release/sdk Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_5ecf58e08b8bac4b5dfd1f49ca574289.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">sdk Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
+Directories</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_5ecf58e08b8bac4b5dfd1f49ca574289.html">sdk</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_5ecf58e08b8bac4b5dfd1f49ca574289.js b/doc/html/dir_5ecf58e08b8bac4b5dfd1f49ca574289.js
new file mode 100644
index 0000000..191a3f4
--- /dev/null
+++ b/doc/html/dir_5ecf58e08b8bac4b5dfd1f49ca574289.js
@@ -0,0 +1,4 @@
+var dir_5ecf58e08b8bac4b5dfd1f49ca574289 =
+[
+    [ "include", "dir_493b85567c8a3fbf04d485060a60d793.html", "dir_493b85567c8a3fbf04d485060a60d793" ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_956a284d1d814cd411185293071355a4.html b/doc/html/dir_956a284d1d814cd411185293071355a4.html
new file mode 100644
index 0000000..4e57c92
--- /dev/null
+++ b/doc/html/dir_956a284d1d814cd411185293071355a4.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x64-release/sdk/include Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_956a284d1d814cd411185293071355a4.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">include Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
+Directories</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_007ea9f4a44739512de65b1e8449a30c.html">sdk</a></li><li class="navelem"><a class="el" href="dir_956a284d1d814cd411185293071355a4.html">include</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_956a284d1d814cd411185293071355a4.js b/doc/html/dir_956a284d1d814cd411185293071355a4.js
new file mode 100644
index 0000000..6372903
--- /dev/null
+++ b/doc/html/dir_956a284d1d814cd411185293071355a4.js
@@ -0,0 +1,4 @@
+var dir_956a284d1d814cd411185293071355a4 =
+[
+    [ "gfesdk", "dir_5224d54c82353be970e4f2086a8200d8.html", "dir_5224d54c82353be970e4f2086a8200d8" ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_9e1fb0299a0600dff10179bfe2b8a156.html b/doc/html/dir_9e1fb0299a0600dff10179bfe2b8a156.html
index a0308a6..9b26c78 100644
--- a/doc/html/dir_9e1fb0299a0600dff10179bfe2b8a156.html
+++ b/doc/html/dir_9e1fb0299a0600dff10179bfe2b8a156.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/highlights Directory Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,17 +110,6 @@ $(document).ready(function(){initNavTree('dir_9e1fb0299a0600dff10179bfe2b8a156.h
 <div class="title">highlights Directory Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="dynheader">
-Directory dependency graph for highlights:</div>
-<div class="dyncontent">
-<div class="center"><img src="dir_9e1fb0299a0600dff10179bfe2b8a156_dep.png" border="0" usemap="#dir__9e1fb0299a0600dff10179bfe2b8a156__dep" alt="C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/highlights"/></div>
-<map name="dir__9e1fb0299a0600dff10179bfe2b8a156__dep" id="dir__9e1fb0299a0600dff10179bfe2b8a156__dep">
-<area shape="rect" id="node1" href="dir_9e1fb0299a0600dff10179bfe2b8a156.html" title="highlights" alt="" coords="27,52,104,100"/>
-<area shape="rect" id="node2" href="dir_2f4536f343cdc104d7b83de3fff7416d.html" title="highlights" alt="" coords="27,148,104,196"/>
-<area shape="rect" id="edge1-headlabel" href="dir_000008_000009.html" title="2" alt="" coords="70,122,78,137"/>
-<area shape="rect" id="clust1" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html" title="cpp" alt="" coords="16,16,115,111"/>
-</map>
-</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
 Files</h2></td></tr>
@@ -113,7 +127,7 @@ Files</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li><li class="navelem"><a class="el" href="dir_9e1fb0299a0600dff10179bfe2b8a156.html">highlights</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/dir_ab8ba62fc8fdaf78364406bae0a66d43.html b/doc/html/dir_ab8ba62fc8fdaf78364406bae0a66d43.html
index 1589cd9..22eefcc 100644
--- a/doc/html/dir_ab8ba62fc8fdaf78364406bae0a66d43.html
+++ b/doc/html/dir_ab8ba62fc8fdaf78364406bae0a66d43.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp Directory Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,18 +110,6 @@ $(document).ready(function(){initNavTree('dir_ab8ba62fc8fdaf78364406bae0a66d43.h
 <div class="title">cpp Directory Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="dynheader">
-Directory dependency graph for cpp:</div>
-<div class="dyncontent">
-<div class="center"><img src="dir_ab8ba62fc8fdaf78364406bae0a66d43_dep.png" border="0" usemap="#dir__ab8ba62fc8fdaf78364406bae0a66d43__dep" alt="C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp"/></div>
-<map name="dir__ab8ba62fc8fdaf78364406bae0a66d43__dep" id="dir__ab8ba62fc8fdaf78364406bae0a66d43__dep">
-<area shape="rect" id="node2" href="dir_9e1fb0299a0600dff10179bfe2b8a156.html" title="highlights" alt="" coords="37,63,115,111"/>
-<area shape="rect" id="node3" href="dir_2f4536f343cdc104d7b83de3fff7416d.html" title="highlights" alt="" coords="37,159,115,207"/>
-<area shape="rect" id="edge1-headlabel" href="dir_000008_000009.html" title="2" alt="" coords="80,133,88,148"/>
-<area shape="rect" id="clust2" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html" alt="" coords="27,52,221,121"/>
-<area shape="rect" id="clust1" href="dir_f78f74a3131a0cfd456c5ed856861cff.html" title="bindings" alt="" coords="16,16,232,132"/>
-</map>
-</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
 Directories</h2></td></tr>
@@ -117,7 +130,7 @@ Files</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/dir_e31eb9cae286691b323708fcb3cc0b5c.html b/doc/html/dir_e31eb9cae286691b323708fcb3cc0b5c.html
new file mode 100644
index 0000000..39eaa6a
--- /dev/null
+++ b/doc/html/dir_e31eb9cae286691b323708fcb3cc0b5c.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x64-release-uwp/sdk/include Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_e31eb9cae286691b323708fcb3cc0b5c.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">include Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
+Directories</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html">sdk</a></li><li class="navelem"><a class="el" href="dir_e31eb9cae286691b323708fcb3cc0b5c.html">include</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_e31eb9cae286691b323708fcb3cc0b5c.js b/doc/html/dir_e31eb9cae286691b323708fcb3cc0b5c.js
new file mode 100644
index 0000000..9f7f859
--- /dev/null
+++ b/doc/html/dir_e31eb9cae286691b323708fcb3cc0b5c.js
@@ -0,0 +1,4 @@
+var dir_e31eb9cae286691b323708fcb3cc0b5c =
+[
+    [ "gfesdk", "dir_0e11d6b9f607d0ef730b98f1fc6a7102.html", "dir_0e11d6b9f607d0ef730b98f1fc6a7102" ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_eb56eea0ff74c30c2a48b22915222057.html b/doc/html/dir_eb56eea0ff74c30c2a48b22915222057.html
index b848c7b..6d82385 100644
--- a/doc/html/dir_eb56eea0ff74c30c2a48b22915222057.html
+++ b/doc/html/dir_eb56eea0ff74c30c2a48b22915222057.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk Directory Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,23 +110,9 @@ $(document).ready(function(){initNavTree('dir_eb56eea0ff74c30c2a48b22915222057.h
 <div class="title">gfesdk Directory Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="dynheader">
-Directory dependency graph for gfesdk:</div>
-<div class="dyncontent">
-<div class="center"><img src="dir_eb56eea0ff74c30c2a48b22915222057_dep.png" border="0" usemap="#dir__eb56eea0ff74c30c2a48b22915222057__dep" alt="C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk"/></div>
-<map name="dir__eb56eea0ff74c30c2a48b22915222057__dep" id="dir__eb56eea0ff74c30c2a48b22915222057__dep">
-<area shape="rect" id="node2" href="dir_f78f74a3131a0cfd456c5ed856861cff.html" title="bindings" alt="" coords="37,63,109,111"/>
-<area shape="rect" id="node3" href="dir_2f4536f343cdc104d7b83de3fff7416d.html" title="highlights" alt="" coords="37,159,115,207"/>
-<area shape="rect" id="edge1-headlabel" href="dir_000006_000009.html" title="2" alt="" coords="79,133,87,148"/>
-<area shape="rect" id="clust2" href="dir_eb56eea0ff74c30c2a48b22915222057.html" alt="" coords="27,52,216,217"/>
-<area shape="rect" id="clust1" href="dir_37f49c9d6a230916a5077fbd270eac2a.html" title="include" alt="" coords="16,16,227,228"/>
-</map>
-</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
 Directories</h2></td></tr>
-<tr class="memitem:dir_f78f74a3131a0cfd456c5ed856861cff"><td class="memItemLeft" align="right" valign="top">directory &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></td></tr>
-<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
 Files</h2></td></tr>
@@ -119,7 +130,7 @@ Files</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/dir_f1cfbb21bff00595e5c2406058aaadcb.html b/doc/html/dir_f1cfbb21bff00595e5c2406058aaadcb.html
new file mode 100644
index 0000000..7715078
--- /dev/null
+++ b/doc/html/dir_f1cfbb21bff00595e5c2406058aaadcb.html
@@ -0,0 +1,130 @@
+<!-- HTML header for doxygen 1.8.12-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x86-release-uwp/sdk/include/gfesdk Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">NVIDIAGeForceExperienceSDK
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_f1cfbb21bff00595e5c2406058aaadcb.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">gfesdk Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
+Files</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.12-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_2da3e0a8a223e44caac2fd87d541599f.html">sdk</a></li><li class="navelem"><a class="el" href="dir_171a6e180bb88a8eb61f17f17c2f6876.html">include</a></li><li class="navelem"><a class="el" href="dir_f1cfbb21bff00595e5c2406058aaadcb.html">gfesdk</a></li>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    doxygen</a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>
diff --git a/doc/html/dir_f1cfbb21bff00595e5c2406058aaadcb.js b/doc/html/dir_f1cfbb21bff00595e5c2406058aaadcb.js
new file mode 100644
index 0000000..0b6fa4a
--- /dev/null
+++ b/doc/html/dir_f1cfbb21bff00595e5c2406058aaadcb.js
@@ -0,0 +1,6 @@
+var dir_f1cfbb21bff00595e5c2406058aaadcb =
+[
+    [ "config.h", "config_8h_source.html", null ],
+    [ "gfe3_product_version.h", "gfe3__product__version_8h_source.html", null ],
+    [ "sdk_types_ipc.h", "sdk__types__ipc_8h_source.html", null ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_f78f74a3131a0cfd456c5ed856861cff.html b/doc/html/dir_f78f74a3131a0cfd456c5ed856861cff.html
index 8bb424c..bc4b0c0 100644
--- a/doc/html/dir_f78f74a3131a0cfd456c5ed856861cff.html
+++ b/doc/html/dir_f78f74a3131a0cfd456c5ed856861cff.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings Directory Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,18 +110,6 @@ $(document).ready(function(){initNavTree('dir_f78f74a3131a0cfd456c5ed856861cff.h
 <div class="title">bindings Directory Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="dynheader">
-Directory dependency graph for bindings:</div>
-<div class="dyncontent">
-<div class="center"><img src="dir_f78f74a3131a0cfd456c5ed856861cff_dep.png" border="0" usemap="#dir__f78f74a3131a0cfd456c5ed856861cff__dep" alt="C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings"/></div>
-<map name="dir__f78f74a3131a0cfd456c5ed856861cff__dep" id="dir__f78f74a3131a0cfd456c5ed856861cff__dep">
-<area shape="rect" id="node2" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html" title="cpp" alt="" coords="37,63,109,111"/>
-<area shape="rect" id="node3" href="dir_2f4536f343cdc104d7b83de3fff7416d.html" title="highlights" alt="" coords="35,159,112,207"/>
-<area shape="rect" id="edge1-headlabel" href="dir_000007_000009.html" title="2" alt="" coords="78,133,86,148"/>
-<area shape="rect" id="clust2" href="dir_f78f74a3131a0cfd456c5ed856861cff.html" alt="" coords="27,52,216,121"/>
-<area shape="rect" id="clust1" href="dir_eb56eea0ff74c30c2a48b22915222057.html" title="gfesdk" alt="" coords="16,16,227,132"/>
-</map>
-</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
 Directories</h2></td></tr>
@@ -110,7 +123,7 @@ Directories</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/doxygen.css b/doc/html/doxygen.css
index 84e07ca..13b91a6 100644
--- a/doc/html/doxygen.css
+++ b/doc/html/doxygen.css
@@ -1,4 +1,4 @@
-/* The standard CSS for doxygen 1.8.12 */
+/* The standard CSS for doxygen 1.8.11 */
 
 body, table, div, p, dl {
 	font: 400 14px/22px Roboto,sans-serif;
@@ -173,7 +173,7 @@ pre.fragment {
 }
 
 div.fragment {
-        padding: 0px;
+        padding: 4px 6px;
         margin: 4px 8px 4px 2px;
 	background-color: #F9FFF0;
 	border: 1px solid #B1FF2B;
@@ -232,15 +232,6 @@ span.lineno a:hover {
 	background-color: #C8C8C8;
 }
 
-.lineno {
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
 div.ah, span.ah {
 	background-color: black;
 	font-weight: bold;
@@ -510,29 +501,6 @@ table.memberdecls {
 
 /* Styles for detailed member documentation */
 
-.memtitle {
-	padding: 8px;
-	border-top: 1px solid #8CDD00;
-	border-left: 1px solid #8CDD00;
-	border-right: 1px solid #8CDD00;
-	border-top-right-radius: 4px;
-	border-top-left-radius: 4px;
-	margin-bottom: -1px;
-	background-image: url('nav_f.png');
-	background-repeat: repeat-x;
-	background-color: #D5FE8F;
-	line-height: 1.25;
-	font-weight: 300;
-	float:left;
-}
-
-.permalink
-{
-        font-size: 65%;
-        display: inline-block;
-        vertical-align: middle;
-}
-
 .memtemplate {
 	font-size: 80%;
 	color: #1E3000;
@@ -571,7 +539,7 @@ table.memberdecls {
 }
 
 .memname {
-        font-weight: 400;
+        font-weight: bold;
         margin-left: 6px;
 }
 
@@ -587,24 +555,24 @@ table.memberdecls {
         color: #040700;
         font-weight: bold;
         text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
-        background-color: #D1FF82;
+        background-image:url('nav_f.png');
+        background-repeat:repeat-x;
+        background-color: #D5FE8F;
         /* opera specific markup */
         box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
         border-top-right-radius: 4px;
+        border-top-left-radius: 4px;
         /* firefox specific markup */
         -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
         -moz-border-radius-topright: 4px;
+        -moz-border-radius-topleft: 4px;
         /* webkit specific markup */
         -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
         -webkit-border-top-right-radius: 4px;
+        -webkit-border-top-left-radius: 4px;
 
 }
 
-.overload {
-        font-family: "courier new",courier,monospace;
-	font-size: 65%;
-}
-
 .memdoc, dl.reflist dd {
         border-bottom: 1px solid #8CDD00;      
         border-left: 1px solid #8CDD00;      
@@ -946,7 +914,6 @@ table.fieldtable {
         padding-bottom: 4px;
         padding-top: 5px;
         text-align:left;
-        font-weight: 400;
         -moz-border-radius-topleft: 4px;
         -moz-border-radius-topright: 4px;
         -webkit-border-top-left-radius: 4px;
diff --git a/doc/html/files.html b/doc/html/files.html
index 3105067..f70d8c4 100644
--- a/doc/html/files.html
+++ b/doc/html/files.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: File List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -87,9 +112,9 @@ $(document).ready(function(){initNavTree('files.html','');});
 <div class="contents">
 <div class="textblock">Here is a list of all documented files with brief descriptions:</div><div class="directory">
 <div class="levels">[detail level <span onclick="javascript:toggleLevel(1);">1</span><span onclick="javascript:toggleLevel(2);">2</span><span onclick="javascript:toggleLevel(3);">3</span><span onclick="javascript:toggleLevel(4);">4</span><span onclick="javascript:toggleLevel(5);">5</span><span onclick="javascript:toggleLevel(6);">6</span><span onclick="javascript:toggleLevel(7);">7</span>]</div><table class="directory">
-<tr id="row_0_" class="even"><td class="entry"><span style="width:0px;display:inline-block;">&#160;</span><span id="arr_0_" class="arrow" onclick="toggleFolder('0_')">&#9660;</span><span id="img_0_" class="iconfopen" onclick="toggleFolder('0_')">&#160;</span><a class="el" href="dir_21dfd2273a7f43571f69ea7d9a7bef28.html" target="_self">sdk</a></td><td class="desc"></td></tr>
-<tr id="row_0_0_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span id="arr_0_0_" class="arrow" onclick="toggleFolder('0_0_')">&#9660;</span><span id="img_0_0_" class="iconfopen" onclick="toggleFolder('0_0_')">&#160;</span><a class="el" href="dir_c8951a4514ffd6dca1d0bd1443098010.html" target="_self">include</a></td><td class="desc"></td></tr>
-<tr id="row_0_0_0_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span id="arr_0_0_0_" class="arrow" onclick="toggleFolder('0_0_0_')">&#9660;</span><span id="img_0_0_0_" class="iconfopen" onclick="toggleFolder('0_0_0_')">&#160;</span><a class="el" href="dir_e789e2e8a554a90f7e478c85f971e5ee.html" target="_self">gfesdk</a></td><td class="desc"></td></tr>
+<tr id="row_0_" class="even"><td class="entry"><span style="width:0px;display:inline-block;">&#160;</span><span id="arr_0_" class="arrow" onclick="toggleFolder('0_')">&#9660;</span><span id="img_0_" class="iconfopen" onclick="toggleFolder('0_')">&#160;</span><a class="el" href="dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html" target="_self">sdk</a></td><td class="desc"></td></tr>
+<tr id="row_0_0_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span id="arr_0_0_" class="arrow" onclick="toggleFolder('0_0_')">&#9660;</span><span id="img_0_0_" class="iconfopen" onclick="toggleFolder('0_0_')">&#160;</span><a class="el" href="dir_e31eb9cae286691b323708fcb3cc0b5c.html" target="_self">include</a></td><td class="desc"></td></tr>
+<tr id="row_0_0_0_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span id="arr_0_0_0_" class="arrow" onclick="toggleFolder('0_0_0_')">&#9660;</span><span id="img_0_0_0_" class="iconfopen" onclick="toggleFolder('0_0_0_')">&#160;</span><a class="el" href="dir_0e11d6b9f607d0ef730b98f1fc6a7102.html" target="_self">gfesdk</a></td><td class="desc"></td></tr>
 <tr id="row_0_0_0_0_"><td class="entry"><span style="width:64px;display:inline-block;">&#160;</span><a href="config_8h_source.html"><span class="icondoc"></span></a><b>config.h</b></td><td class="desc"></td></tr>
 <tr id="row_0_0_0_1_" class="even"><td class="entry"><span style="width:64px;display:inline-block;">&#160;</span><a href="gfe3__product__version_8h_source.html"><span class="icondoc"></span></a><b>gfe3_product_version.h</b></td><td class="desc"></td></tr>
 <tr id="row_0_0_0_2_"><td class="entry"><span style="width:64px;display:inline-block;">&#160;</span><a href="sdk__types__ipc_8h_source.html"><span class="icondoc"></span></a><b>sdk_types_ipc.h</b></td><td class="desc"></td></tr>
@@ -121,7 +146,7 @@ $(document).ready(function(){initNavTree('files.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/files.js b/doc/html/files.js
index baf00c6..7c9deca 100644
--- a/doc/html/files.js
+++ b/doc/html/files.js
@@ -1,5 +1,5 @@
 var files =
 [
-    [ "sdk", "dir_21dfd2273a7f43571f69ea7d9a7bef28.html", "dir_21dfd2273a7f43571f69ea7d9a7bef28" ],
+    [ "sdk", "dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html", "dir_22a05cd20f85fd3b5d06bb82cdaa6ca8" ],
     [ "sdkclient", "dir_4522e853adfb3285c34ceee6be627ffe.html", "dir_4522e853adfb3285c34ceee6be627ffe" ]
 ];
\ No newline at end of file
diff --git a/doc/html/functions.html b/doc/html/functions.html
index 78a4df6..211c936 100644
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Class Members</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,69 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li class="current"><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
+  <div id="navrow3" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="functions.html"><span>All</span></a></li>
+      <li><a href="functions_func.html"><span>Functions</span></a></li>
+      <li><a href="functions_vars.html"><span>Variables</span></a></li>
+    </ul>
+  </div>
+  <div id="navrow4" class="tabs3">
+    <ul class="tablist">
+      <li><a href="#index_a"><span>a</span></a></li>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_d"><span>d</span></a></li>
+      <li><a href="#index_e"><span>e</span></a></li>
+      <li><a href="#index_g"><span>g</span></a></li>
+      <li><a href="#index_h"><span>h</span></a></li>
+      <li><a href="#index_i"><span>i</span></a></li>
+      <li><a href="#index_l"><span>l</span></a></li>
+      <li><a href="#index_n"><span>n</span></a></li>
+      <li><a href="#index_o"><span>o</span></a></li>
+      <li><a href="#index_p"><span>p</span></a></li>
+      <li><a href="#index_r"><span>r</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+      <li><a href="#index_t"><span>t</span></a></li>
+      <li><a href="#index_u"><span>u</span></a></li>
+      <li class="current"><a href="#index_v"><span>v</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -83,14 +137,14 @@ $(document).ready(function(){initNavTree('functions.html','');});
 <div class="contents">
 <div class="textblock">Here is a list of all documented class members with links to the class documentation for each member:</div>
 
-<h3><a id="index_a"></a>- a -</h3><ul>
+<h3><a class="anchor" id="index_a"></a>- a -</h3><ul>
 <li>appName
 : <a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">NVGSDK_CreateInputParams</a>
 </li>
 </ul>
 
 
-<h3><a id="index_c"></a>- c -</h3><ul>
+<h3><a class="anchor" id="index_c"></a>- c -</h3><ul>
 <li>CloseGroupAsync()
 : <a class="el" href="class_gfe_s_d_k_1_1_highlights.html#ac53536039527813888e5404a3a20e4ab">GfeSDK::Highlights</a>
 , <a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#a22481d623b4124cd7277b30a70a11fad">GfeSDK::HighlightsImpl</a>
@@ -108,7 +162,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_d"></a>- d -</h3><ul>
+<h3><a class="anchor" id="index_d"></a>- d -</h3><ul>
 <li>defaultLocale
 : <a class="el" href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">NVGSDK_HighlightConfigParams</a>
 </li>
@@ -118,7 +172,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_e"></a>- e -</h3><ul>
+<h3><a class="anchor" id="index_e"></a>- e -</h3><ul>
 <li>enabled
 : <a class="el" href="struct_gfe_s_d_k_1_1_highlight_user_setting.html#aee344169ace39e645bd57a3b0387e556">GfeSDK::HighlightUserSetting</a>
 , <a class="el" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a44eafd6943fb886c236cd4ff356c666d">NVGSDK_HighlightUserSetting</a>
@@ -129,7 +183,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_g"></a>- g -</h3><ul>
+<h3><a class="anchor" id="index_g"></a>- g -</h3><ul>
 <li>GetNumberOfHighlightsAsync()
 : <a class="el" href="class_gfe_s_d_k_1_1_highlights.html#ad640f12621aa2ab8f0bf39b859f8d849">GfeSDK::Highlights</a>
 , <a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#a358fcbe7699b79ed79952bb2eab12830">GfeSDK::HighlightsImpl</a>
@@ -139,8 +193,8 @@ $(document).ready(function(){initNavTree('functions.html','');});
 , <a class="el" href="class_gfe_s_d_k_1_1_core_impl.html#a95587bb5dc50b0f8b11d7fd75a8ecea3">GfeSDK::CoreImpl</a>
 </li>
 <li>GetUserSettingsAsync()
-: <a class="el" href="class_gfe_s_d_k_1_1_highlights.html#a593d1bd58183bc0b53c7dee7991d8491">GfeSDK::Highlights</a>
-, <a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040">GfeSDK::HighlightsImpl</a>
+: <a class="el" href="class_gfe_s_d_k_1_1_highlights.html#add1016d23068c8f2dd0cd037210aa14b">GfeSDK::Highlights</a>
+, <a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f">GfeSDK::HighlightsImpl</a>
 </li>
 <li>gfeVersionStr
 : <a class="el" href="struct_n_v_g_s_d_k___create_response.html#aacdf644f5f6eb996dad6bb90b4145deb">NVGSDK_CreateResponse</a>
@@ -168,7 +222,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_h"></a>- h -</h3><ul>
+<h3><a class="anchor" id="index_h"></a>- h -</h3><ul>
 <li>highlightId
 : <a class="el" href="struct_gfe_s_d_k_1_1_highlight_user_setting.html#a867bd13b05ece98cbebadd0d34e778b9">GfeSDK::HighlightUserSetting</a>
 , <a class="el" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">NVGSDK_ScreenshotHighlightParams</a>
@@ -180,7 +234,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_i"></a>- i -</h3><ul>
+<h3><a class="anchor" id="index_i"></a>- i -</h3><ul>
 <li>id
 : <a class="el" href="struct_n_v_g_s_d_k___highlight.html#a1f95d7645df3e535efa830685488ae9b">NVGSDK_Highlight</a>
 , <a class="el" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">NVGSDK_HighlightUserSetting</a>
@@ -188,7 +242,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_l"></a>- l -</h3><ul>
+<h3><a class="anchor" id="index_l"></a>- l -</h3><ul>
 <li>localeCode
 : <a class="el" href="struct_n_v_g_s_d_k___localized_pair.html#aa070c22ef7cf737497855504fb8795d6">NVGSDK_LocalizedPair</a>
 </li>
@@ -198,7 +252,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_n"></a>- n -</h3><ul>
+<h3><a class="anchor" id="index_n"></a>- n -</h3><ul>
 <li>nameLocaleTable
 : <a class="el" href="struct_gfe_s_d_k_1_1_highlight_definition.html#a2511ee17dafd2a096b15e6f62b1f77b2">GfeSDK::HighlightDefinition</a>
 </li>
@@ -217,7 +271,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_o"></a>- o -</h3><ul>
+<h3><a class="anchor" id="index_o"></a>- o -</h3><ul>
 <li>open
 : <a class="el" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#ad9684c86b575f710bcc784942e6bf256">NVGSDK_OverlayStateChangedNotification</a>
 </li>
@@ -232,7 +286,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_p"></a>- p -</h3><ul>
+<h3><a class="anchor" id="index_p"></a>- p -</h3><ul>
 <li>Poll()
 : <a class="el" href="class_gfe_s_d_k_1_1_core.html#a4804109b7488f52ce61b0b3d638d30fe">GfeSDK::Core</a>
 , <a class="el" href="class_gfe_s_d_k_1_1_core_impl.html#a3a57a88bbb7da1b8d99e1ad326205ab0">GfeSDK::CoreImpl</a>
@@ -243,7 +297,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_r"></a>- r -</h3><ul>
+<h3><a class="anchor" id="index_r"></a>- r -</h3><ul>
 <li>RequestPermissionsAsync()
 : <a class="el" href="class_gfe_s_d_k_1_1_core.html#ada940c792737e3fa2c6cc5cda81424b5">GfeSDK::Core</a>
 , <a class="el" href="class_gfe_s_d_k_1_1_core_impl.html#a09f4348a8362beccae2a237f92ead971">GfeSDK::CoreImpl</a>
@@ -251,7 +305,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_s"></a>- s -</h3><ul>
+<h3><a class="anchor" id="index_s"></a>- s -</h3><ul>
 <li>scopePermissionTable
 : <a class="el" href="struct_n_v_g_s_d_k___create_response.html#a9bc3e75a15cf9fcbc1084f2a7fde5a8f">NVGSDK_CreateResponse</a>
 </li>
@@ -287,7 +341,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_t"></a>- t -</h3><ul>
+<h3><a class="anchor" id="index_t"></a>- t -</h3><ul>
 <li>tagsFilter
 : <a class="el" href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">NVGSDK_GroupView</a>
 </li>
@@ -302,14 +356,14 @@ $(document).ready(function(){initNavTree('functions.html','');});
 </ul>
 
 
-<h3><a id="index_u"></a>- u -</h3><ul>
+<h3><a class="anchor" id="index_u"></a>- u -</h3><ul>
 <li>userInterest
 : <a class="el" href="struct_n_v_g_s_d_k___highlight.html#a9e0d5a1ba9081cb7f9b549499af61927">NVGSDK_Highlight</a>
 </li>
 </ul>
 
 
-<h3><a id="index_v"></a>- v -</h3><ul>
+<h3><a class="anchor" id="index_v"></a>- v -</h3><ul>
 <li>versionMajor
 : <a class="el" href="struct_n_v_g_s_d_k___create_response.html#aa595214daf18bdbc638ef98e1f22a30f">NVGSDK_CreateResponse</a>
 </li>
@@ -325,7 +379,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/functions_func.html b/doc/html/functions_func.html
index 4d0a73c..8e0ddd9 100644
--- a/doc/html/functions_func.html
+++ b/doc/html/functions_func.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Class Members - Functions</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,49 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li class="current"><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
+  <div id="navrow3" class="tabs2">
+    <ul class="tablist">
+      <li><a href="functions.html"><span>All</span></a></li>
+      <li class="current"><a href="functions_func.html"><span>Functions</span></a></li>
+      <li><a href="functions_vars.html"><span>Variables</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -102,8 +136,8 @@ $(document).ready(function(){initNavTree('functions_func.html','');});
 , <a class="el" href="class_gfe_s_d_k_1_1_core_impl.html#a95587bb5dc50b0f8b11d7fd75a8ecea3">GfeSDK::CoreImpl</a>
 </li>
 <li>GetUserSettingsAsync()
-: <a class="el" href="class_gfe_s_d_k_1_1_highlights.html#a593d1bd58183bc0b53c7dee7991d8491">GfeSDK::Highlights</a>
-, <a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040">GfeSDK::HighlightsImpl</a>
+: <a class="el" href="class_gfe_s_d_k_1_1_highlights.html#add1016d23068c8f2dd0cd037210aa14b">GfeSDK::Highlights</a>
+, <a class="el" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f">GfeSDK::HighlightsImpl</a>
 </li>
 <li>OpenGroupAsync()
 : <a class="el" href="class_gfe_s_d_k_1_1_highlights.html#ab1b35bd4fe9e8aac357db3aeabfefa1b">GfeSDK::Highlights</a>
@@ -138,7 +172,7 @@ $(document).ready(function(){initNavTree('functions_func.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html
index ae2ed5f..010883f 100644
--- a/doc/html/functions_vars.html
+++ b/doc/html/functions_vars.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Class Members - Variables</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,68 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li class="current"><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
+  <div id="navrow3" class="tabs2">
+    <ul class="tablist">
+      <li><a href="functions.html"><span>All</span></a></li>
+      <li><a href="functions_func.html"><span>Functions</span></a></li>
+      <li class="current"><a href="functions_vars.html"><span>Variables</span></a></li>
+    </ul>
+  </div>
+  <div id="navrow4" class="tabs3">
+    <ul class="tablist">
+      <li><a href="#index_a"><span>a</span></a></li>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_d"><span>d</span></a></li>
+      <li><a href="#index_e"><span>e</span></a></li>
+      <li><a href="#index_g"><span>g</span></a></li>
+      <li><a href="#index_h"><span>h</span></a></li>
+      <li><a href="#index_i"><span>i</span></a></li>
+      <li><a href="#index_l"><span>l</span></a></li>
+      <li><a href="#index_n"><span>n</span></a></li>
+      <li><a href="#index_o"><span>o</span></a></li>
+      <li><a href="#index_p"><span>p</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+      <li><a href="#index_t"><span>t</span></a></li>
+      <li><a href="#index_u"><span>u</span></a></li>
+      <li class="current"><a href="#index_v"><span>v</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -83,21 +136,21 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 <div class="contents">
 &#160;
 
-<h3><a id="index_a"></a>- a -</h3><ul>
+<h3><a class="anchor" id="index_a"></a>- a -</h3><ul>
 <li>appName
 : <a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">NVGSDK_CreateInputParams</a>
 </li>
 </ul>
 
 
-<h3><a id="index_c"></a>- c -</h3><ul>
+<h3><a class="anchor" id="index_c"></a>- c -</h3><ul>
 <li>cultureCode
 : <a class="el" href="struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75">NVGSDK_Language</a>
 </li>
 </ul>
 
 
-<h3><a id="index_d"></a>- d -</h3><ul>
+<h3><a class="anchor" id="index_d"></a>- d -</h3><ul>
 <li>defaultLocale
 : <a class="el" href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">NVGSDK_HighlightConfigParams</a>
 </li>
@@ -107,7 +160,7 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 </ul>
 
 
-<h3><a id="index_e"></a>- e -</h3><ul>
+<h3><a class="anchor" id="index_e"></a>- e -</h3><ul>
 <li>enabled
 : <a class="el" href="struct_gfe_s_d_k_1_1_highlight_user_setting.html#aee344169ace39e645bd57a3b0387e556">GfeSDK::HighlightUserSetting</a>
 , <a class="el" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a44eafd6943fb886c236cd4ff356c666d">NVGSDK_HighlightUserSetting</a>
@@ -118,7 +171,7 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 </ul>
 
 
-<h3><a id="index_g"></a>- g -</h3><ul>
+<h3><a class="anchor" id="index_g"></a>- g -</h3><ul>
 <li>gfeVersionStr
 : <a class="el" href="struct_n_v_g_s_d_k___create_response.html#aacdf644f5f6eb996dad6bb90b4145deb">NVGSDK_CreateResponse</a>
 , <a class="el" href="struct_n_v_g_s_d_k___version.html#abdb04097bd3c65601de459467fa4dc2b">NVGSDK_Version</a>
@@ -145,7 +198,7 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 </ul>
 
 
-<h3><a id="index_h"></a>- h -</h3><ul>
+<h3><a class="anchor" id="index_h"></a>- h -</h3><ul>
 <li>highlightId
 : <a class="el" href="struct_gfe_s_d_k_1_1_highlight_user_setting.html#a867bd13b05ece98cbebadd0d34e778b9">GfeSDK::HighlightUserSetting</a>
 , <a class="el" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">NVGSDK_ScreenshotHighlightParams</a>
@@ -157,7 +210,7 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 </ul>
 
 
-<h3><a id="index_i"></a>- i -</h3><ul>
+<h3><a class="anchor" id="index_i"></a>- i -</h3><ul>
 <li>id
 : <a class="el" href="struct_n_v_g_s_d_k___highlight.html#a1f95d7645df3e535efa830685488ae9b">NVGSDK_Highlight</a>
 , <a class="el" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">NVGSDK_HighlightUserSetting</a>
@@ -165,7 +218,7 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 </ul>
 
 
-<h3><a id="index_l"></a>- l -</h3><ul>
+<h3><a class="anchor" id="index_l"></a>- l -</h3><ul>
 <li>localeCode
 : <a class="el" href="struct_n_v_g_s_d_k___localized_pair.html#aa070c22ef7cf737497855504fb8795d6">NVGSDK_LocalizedPair</a>
 </li>
@@ -175,7 +228,7 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 </ul>
 
 
-<h3><a id="index_n"></a>- n -</h3><ul>
+<h3><a class="anchor" id="index_n"></a>- n -</h3><ul>
 <li>nameLocaleTable
 : <a class="el" href="struct_gfe_s_d_k_1_1_highlight_definition.html#a2511ee17dafd2a096b15e6f62b1f77b2">GfeSDK::HighlightDefinition</a>
 </li>
@@ -194,21 +247,21 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 </ul>
 
 
-<h3><a id="index_o"></a>- o -</h3><ul>
+<h3><a class="anchor" id="index_o"></a>- o -</h3><ul>
 <li>open
 : <a class="el" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#ad9684c86b575f710bcc784942e6bf256">NVGSDK_OverlayStateChangedNotification</a>
 </li>
 </ul>
 
 
-<h3><a id="index_p"></a>- p -</h3><ul>
+<h3><a class="anchor" id="index_p"></a>- p -</h3><ul>
 <li>pollForCallbacks
 : <a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#a0bd7568c1cb3fad975562055b4581195">NVGSDK_CreateInputParams</a>
 </li>
 </ul>
 
 
-<h3><a id="index_s"></a>- s -</h3><ul>
+<h3><a class="anchor" id="index_s"></a>- s -</h3><ul>
 <li>scopePermissionTable
 : <a class="el" href="struct_n_v_g_s_d_k___create_response.html#a9bc3e75a15cf9fcbc1084f2a7fde5a8f">NVGSDK_CreateResponse</a>
 </li>
@@ -236,7 +289,7 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 </ul>
 
 
-<h3><a id="index_t"></a>- t -</h3><ul>
+<h3><a class="anchor" id="index_t"></a>- t -</h3><ul>
 <li>tagsFilter
 : <a class="el" href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">NVGSDK_GroupView</a>
 </li>
@@ -251,14 +304,14 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 </ul>
 
 
-<h3><a id="index_u"></a>- u -</h3><ul>
+<h3><a class="anchor" id="index_u"></a>- u -</h3><ul>
 <li>userInterest
 : <a class="el" href="struct_n_v_g_s_d_k___highlight.html#a9e0d5a1ba9081cb7f9b549499af61927">NVGSDK_Highlight</a>
 </li>
 </ul>
 
 
-<h3><a id="index_v"></a>- v -</h3><ul>
+<h3><a class="anchor" id="index_v"></a>- v -</h3><ul>
 <li>versionMajor
 : <a class="el" href="struct_n_v_g_s_d_k___create_response.html#aa595214daf18bdbc638ef98e1f22a30f">NVGSDK_CreateResponse</a>
 </li>
@@ -274,7 +327,7 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/gfe3__product__version_8h_source.html b/doc/html/gfe3__product__version_8h_source.html
index e104a40..122c7c3 100644
--- a/doc/html/gfe3__product__version_8h_source.html
+++ b/doc/html/gfe3__product__version_8h_source.html
@@ -4,9 +4,9 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/x64-release-uwp/sdk/include/gfesdk/gfe3_product_version.h Source File</title>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x64-release-uwp/sdk/include/gfesdk/gfe3_product_version.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,16 +110,16 @@ $(document).ready(function(){initNavTree('gfe3__product__version_8h_source.html'
 <div class="title">gfe3_product_version.h</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">// GFE3 product version: </span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">//   - A.B.XY.N, if X &gt; 0</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">//   - A.B.Y.N, otherwise</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">// A - Major release version.</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">// B - Minor release version.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">// X - _dev to _rel_next rebase counter.</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="comment">// Y - _rel_next to _rel rebase counter.</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment">// N - Build counter.</span></div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_MAJOR 3</span></div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_MINOR 16</span></div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_DEV_REBASE 0</span></div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_RNEXT_REBASE 0</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_BUILD 6</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="comment">// Composite version values. We don&#39;t concatenate them here automatically because</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="comment">//    (a) one can&#39;t use L-based wchar_t conversion with preprocessor-concatenated terminals; and</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment">//    (b) some build scripts rely upon the explicit value for NVIDIA_GFE3_VERSION / NVIDIA_GFE3_VERSION_STRING_DOT</span></div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="comment">// Format: A,B,XY,N</span></div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION          3,16,0,6</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="comment">// Format: A.B.XY.N</span></div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_DOT      3.16.0.6</span></div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="comment">// Format: &quot;A.B.XY.N&quot;</span></div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_STRING   &quot;3.16.0.6&quot;</span></div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="comment">// Some common strings</span></div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_PRODUCT_NAME     &quot;NVIDIA GeForce Experience&quot;</span></div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="comment">// These values are taken from nvVer.h</span></div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="preprocessor">#define NV_COMPANY_NAME_STRING_SHORT &quot;NVIDIA&quot;</span></div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="preprocessor">#define NV_COMPANY_NAME_STRING_FULL  &quot;NVIDIA Corporation&quot;</span></div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="preprocessor">#define NV_COMPANY_NAME_STRING       NV_COMPANY_NAME_STRING_FULL</span></div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="preprocessor">#define NV_COPYRIGHT_YEAR            &quot;2017&quot;</span></div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="preprocessor">#define NV_COPYRIGHT                 &quot;(C) &quot; NV_COPYRIGHT_YEAR &quot; &quot; NV_COMPANY_NAME_STRING_FULL &quot;. All rights reserved.&quot;  // Please do not use the non-ascii copyright symbol for (C).</span></div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div></div><!-- fragment --></div><!-- contents -->
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">// GFE3 product version: </span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">//   - A.B.XY.N, if X &gt; 0</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">//   - A.B.Y.N, otherwise</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">// A - Major release version.</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">// B - Minor release version.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">// X - _dev to _rel_next rebase counter.</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="comment">// Y - _rel_next to _rel rebase counter.</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment">// N - Build counter.</span></div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_MAJOR 3</span></div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_MINOR 21</span></div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_DEV_REBASE 0</span></div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_RNEXT_REBASE 0</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_BUILD 449</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="comment">// Composite version values. We don&#39;t concatenate them here automatically because</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="comment">//    (a) one can&#39;t use L-based wchar_t conversion with preprocessor-concatenated terminals; and</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment">//    (b) some build scripts rely upon the explicit value for NVIDIA_GFE3_VERSION / NVIDIA_GFE3_VERSION_STRING_DOT</span></div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="comment">// Format: A,B,XY,N</span></div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION          3,21,0,449</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="comment">// Format: A.B.XY.N</span></div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_DOT      3.21.0.449</span></div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="comment">// Format: &quot;A.B.XY.N&quot;</span></div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_VERSION_STRING   &quot;3.21.0.449&quot;</span></div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="comment">// Some common strings</span></div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="preprocessor">#define NVIDIA_GFE3_PRODUCT_NAME     &quot;NVIDIA GeForce Experience&quot;</span></div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="comment">// These values are taken from nvVer.h</span></div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="preprocessor">#define NV_COMPANY_NAME_STRING_SHORT &quot;NVIDIA&quot;</span></div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="preprocessor">#define NV_COMPANY_NAME_STRING_FULL  &quot;NVIDIA Corporation&quot;</span></div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="preprocessor">#define NV_COMPANY_NAME_STRING       NV_COMPANY_NAME_STRING_FULL</span></div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="preprocessor">#define NV_COPYRIGHT_YEAR            &quot;2020&quot;</span></div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="preprocessor">#define NV_COPYRIGHT                 &quot;(C) &quot; NV_COPYRIGHT_YEAR &quot; &quot; NV_COMPANY_NAME_STRING_FULL &quot;. All rights reserved.&quot;  // Please do not use the non-ascii copyright symbol for (C).</span></div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div></div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- HTML footer for doxygen 1.8.12-->
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="navelem"><a class="el" href="dir_21dfd2273a7f43571f69ea7d9a7bef28.html">sdk</a></li><li class="navelem"><a class="el" href="dir_c8951a4514ffd6dca1d0bd1443098010.html">include</a></li><li class="navelem"><a class="el" href="dir_e789e2e8a554a90f7e478c85f971e5ee.html">gfesdk</a></li><li class="navelem"><b>gfe3_product_version.h</b></li>
+    <li class="navelem"><a class="el" href="dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html">sdk</a></li><li class="navelem"><a class="el" href="dir_e31eb9cae286691b323708fcb3cc0b5c.html">include</a></li><li class="navelem"><a class="el" href="dir_0e11d6b9f607d0ef730b98f1fc6a7102.html">gfesdk</a></li><li class="navelem"><b>gfe3_product_version.h</b></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/globals.html b/doc/html/globals.html
index afb073c..5fccd4e 100644
--- a/doc/html/globals.html
+++ b/doc/html/globals.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: File Members</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,49 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+  <div id="navrow3" class="tabs2">
+    <ul class="tablist">
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -95,7 +129,7 @@ $(document).ready(function(){initNavTree('globals.html','');});
 : <a class="el" href="isdk_8h.html#a30ed8fc1b0066f8eae9078ab65b136de">isdk.h</a>
 </li>
 <li>NVGSDK_GetUILanguageCallback
-: <a class="el" href="sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e">sdk_types.h</a>
+: <a class="el" href="sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a">sdk_types.h</a>
 </li>
 <li>NVGSDK_Highlights_CloseGroupAsync()
 : <a class="el" href="ihighlights_8h.html#aa3b6190835ada28f4cee015645814e75">ihighlights.h</a>
@@ -107,13 +141,13 @@ $(document).ready(function(){initNavTree('globals.html','');});
 : <a class="el" href="ihighlights_8h.html#afad5de18b900053c2b291ce2a55985c1">ihighlights.h</a>
 </li>
 <li>NVGSDK_Highlights_GetNumberOfHighlightsCallback
-: <a class="el" href="highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0">highlights_types.h</a>
+: <a class="el" href="highlights__types_8h.html#a69743e304d126860275dec9f1335f16f">highlights_types.h</a>
 </li>
 <li>NVGSDK_Highlights_GetUserSettingsAsync()
 : <a class="el" href="ihighlights_8h.html#a48a359560944097729acf3dff42e34bb">ihighlights.h</a>
 </li>
 <li>NVGSDK_Highlights_GetUserSettingsCallback
-: <a class="el" href="highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9">highlights_types.h</a>
+: <a class="el" href="highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6">highlights_types.h</a>
 </li>
 <li>NVGSDK_Highlights_OpenGroupAsync()
 : <a class="el" href="ihighlights_8h.html#aa49250dbc063e242607123333f8da892">ihighlights.h</a>
@@ -128,7 +162,7 @@ $(document).ready(function(){initNavTree('globals.html','');});
 : <a class="el" href="ihighlights_8h.html#a4812495c6dedfc7cc6b2d3c421c161ed">ihighlights.h</a>
 </li>
 <li>NVGSDK_LoggingCallback
-: <a class="el" href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">sdk_types.h</a>
+: <a class="el" href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">sdk_types.h</a>
 </li>
 <li>NVGSDK_LogLevel
 : <a class="el" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">sdk_types.h</a>
@@ -166,7 +200,7 @@ $(document).ready(function(){initNavTree('globals.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/globals_enum.html b/doc/html/globals_enum.html
index 67c6c34..9601aba 100644
--- a/doc/html/globals_enum.html
+++ b/doc/html/globals_enum.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: File Members</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,49 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+  <div id="navrow3" class="tabs2">
+    <ul class="tablist">
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li class="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -97,7 +131,7 @@ $(document).ready(function(){initNavTree('globals_enum.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/globals_eval.html b/doc/html/globals_eval.html
index ae3a20d..b604dcd 100644
--- a/doc/html/globals_eval.html
+++ b/doc/html/globals_eval.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: File Members</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,49 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+  <div id="navrow3" class="tabs2">
+    <ul class="tablist">
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li class="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -97,7 +131,7 @@ $(document).ready(function(){initNavTree('globals_eval.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/globals_func.html b/doc/html/globals_func.html
index 8fd5c39..ff029ef 100644
--- a/doc/html/globals_func.html
+++ b/doc/html/globals_func.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: File Members</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,49 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+  <div id="navrow3" class="tabs2">
+    <ul class="tablist">
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li class="current"><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -139,7 +173,7 @@ $(document).ready(function(){initNavTree('globals_func.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/globals_type.html b/doc/html/globals_type.html
index 3b432d9..1047915 100644
--- a/doc/html/globals_type.html
+++ b/doc/html/globals_type.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: File Members</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,49 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+  <div id="navrow3" class="tabs2">
+    <ul class="tablist">
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li class="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -86,16 +120,16 @@ $(document).ready(function(){initNavTree('globals_type.html','');});
 : <a class="el" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">sdk_types.h</a>
 </li>
 <li>NVGSDK_GetUILanguageCallback
-: <a class="el" href="sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e">sdk_types.h</a>
+: <a class="el" href="sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a">sdk_types.h</a>
 </li>
 <li>NVGSDK_Highlights_GetNumberOfHighlightsCallback
-: <a class="el" href="highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0">highlights_types.h</a>
+: <a class="el" href="highlights__types_8h.html#a69743e304d126860275dec9f1335f16f">highlights_types.h</a>
 </li>
 <li>NVGSDK_Highlights_GetUserSettingsCallback
-: <a class="el" href="highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9">highlights_types.h</a>
+: <a class="el" href="highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6">highlights_types.h</a>
 </li>
 <li>NVGSDK_LoggingCallback
-: <a class="el" href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">sdk_types.h</a>
+: <a class="el" href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">sdk_types.h</a>
 </li>
 </ul>
 </div><!-- contents -->
@@ -106,7 +140,7 @@ $(document).ready(function(){initNavTree('globals_type.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html
index a5290ee..06dc10d 100644
--- a/doc/html/hierarchy.html
+++ b/doc/html/hierarchy.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Class Hierarchy</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li class="current"><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,9 +112,7 @@ $(document).ready(function(){initNavTree('hierarchy.html','');});
 <div class="title">Class Hierarchy</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="textblock">
-<p><a href="inherits.html">Go to the graphical class hierarchy</a></p>
-This inheritance list is sorted roughly, but not completely, alphabetically:</div><div class="directory">
+<div class="textblock">This inheritance list is sorted roughly, but not completely, alphabetically:</div><div class="directory">
 <div class="levels">[detail level <span onclick="javascript:toggleLevel(1);">1</span><span onclick="javascript:toggleLevel(2);">2</span>]</div><table class="directory">
 <tr id="row_0_" class="even"><td class="entry"><span style="width:0px;display:inline-block;">&#160;</span><span id="arr_0_" class="arrow" onclick="toggleFolder('0_')">&#9660;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="class_gfe_s_d_k_1_1_core.html" target="_self">GfeSDK::Core</a></td><td class="desc"></td></tr>
 <tr id="row_0_0_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="class_gfe_s_d_k_1_1_core_impl.html" target="_self">GfeSDK::CoreImpl</a></td><td class="desc"></td></tr>
@@ -142,7 +167,7 @@ This inheritance list is sorted roughly, but not completely, alphabetically:</di
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/highlights__types_8h.html b/doc/html/highlights__types_8h.html
index f222df7..47bafd1 100644
--- a/doc/html/highlights__types_8h.html
+++ b/doc/html/highlights__types_8h.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights/highlights_types.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -91,27 +116,6 @@ $(document).ready(function(){initNavTree('highlights__types_8h.html','');});
 <div class="textblock"><code>#include &lt;<a class="el" href="sdk__types_8h_source.html">gfesdk/sdk_types.h</a>&gt;</code><br />
 <code>#include &lt;stdint.h&gt;</code><br />
 <code>#include &lt;stdbool.h&gt;</code><br />
-</div><div class="textblock"><div class="dynheader">
-Include dependency graph for highlights_types.h:</div>
-<div class="dyncontent">
-<div class="center"><img src="highlights__types_8h__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2highlights__types_8h" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2highlights__types_8h" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2highlights__types_8h">
-<area shape="rect" id="node2" href="sdk__types_8h.html" title="gfesdk/sdk_types.h" alt="" coords="165,124,300,151"/>
-<area shape="rect" id="node5" href="os__defines_8h_source.html" title="gfesdk/os_defines.h" alt="" coords="329,199,467,225"/>
-<area shape="rect" id="node6" href="sdk__types__ipc_8h_source.html" title="gfesdk/sdk_types_ipc.h" alt="" coords="95,199,253,225"/>
-</map>
-</div>
-</div><div class="textblock"><div class="dynheader">
-This graph shows which files directly or indirectly include this file:</div>
-<div class="dyncontent">
-<div class="center"><img src="highlights__types_8h__dep__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2highlights__types_8hdep" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2highlights__types_8hdep" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2highlights__types_8hdep">
-<area shape="rect" id="node2" href="highlights__types__cpp_8h_source.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/highlights\l_types_cpp.h" alt="" coords="5,124,171,209"/>
-<area shape="rect" id="node5" href="ihighlights_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/highlights\l/ihighlights.h" alt="" coords="195,131,363,202"/>
-<area shape="rect" id="node3" href="ihighlights__cpp_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights_cpp.h" alt="" coords="79,257,286,328"/>
-<area shape="rect" id="node4" href="ihighlights__cpp__impl_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights\l_cpp_impl.h" alt="" coords="99,376,267,461"/>
-</map>
-</div>
 </div>
 <p><a href="highlights__types_8h_source.html">Go to the source code of this file.</a></p>
 <table class="memberdecls">
@@ -142,47 +146,43 @@ Classes</h2></td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr class="memitem:a87a246f3f9c2a0f0670b1208b22fa2d9"><td class="memItemLeft" align="right" valign="top">typedef void(__stdcall *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9">NVGSDK_Highlights_GetUserSettingsCallback</a>) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a> const *, void *)</td></tr>
-<tr class="separator:a87a246f3f9c2a0f0670b1208b22fa2d9"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a1ace1def4d575aa419abae45b2738db0"><td class="memItemLeft" align="right" valign="top">typedef void(__stdcall *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a>) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a> const *, void *)</td></tr>
-<tr class="separator:a1ace1def4d575aa419abae45b2738db0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ac758b6034dd2bb8bbde7de7576141fd6"><td class="memItemLeft" align="right" valign="top">typedef void(__stdcall *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6">NVGSDK_Highlights_GetUserSettingsCallback</a>) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a> const *, void *)</td></tr>
+<tr class="separator:ac758b6034dd2bb8bbde7de7576141fd6"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a69743e304d126860275dec9f1335f16f"><td class="memItemLeft" align="right" valign="top">typedef void(__stdcall *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="highlights__types_8h.html#a69743e304d126860275dec9f1335f16f">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a>) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a> const *, void *)</td></tr>
+<tr class="separator:a69743e304d126860275dec9f1335f16f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Highlights types </p>
 
 <p>Definition in file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 </div><h2 class="groupheader">Typedef Documentation</h2>
-<a id="a87a246f3f9c2a0f0670b1208b22fa2d9"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a87a246f3f9c2a0f0670b1208b22fa2d9">&sect;&nbsp;</a></span>NVGSDK_Highlights_GetUserSettingsCallback</h2>
-
+<a class="anchor" id="ac758b6034dd2bb8bbde7de7576141fd6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void(__stdcall* NVGSDK_Highlights_GetUserSettingsCallback) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a> const  *, void *)</td>
+          <td class="memname">typedef void(__stdcall* NVGSDK_Highlights_GetUserSettingsCallback) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a> const *, void *)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 <p>Type of callback to provide to NVGSDK_Highlights_GetUserSettings </p>
 
-<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00109">109</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
+<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00111">111</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 
 </div>
 </div>
-<a id="a1ace1def4d575aa419abae45b2738db0"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a1ace1def4d575aa419abae45b2738db0">&sect;&nbsp;</a></span>NVGSDK_Highlights_GetNumberOfHighlightsCallback</h2>
-
+<a class="anchor" id="a69743e304d126860275dec9f1335f16f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void(__stdcall* NVGSDK_Highlights_GetNumberOfHighlightsCallback) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a> const  *, void *)</td>
+          <td class="memname">typedef void(__stdcall* NVGSDK_Highlights_GetNumberOfHighlightsCallback) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a> const *, void *)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 <p>Type of callback to provide to NVGSDK_Highlights_GetNumberOfHighlightsAsync </p>
 
-<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00117">117</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
+<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00119">119</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 
 </div>
 </div>
@@ -195,7 +195,7 @@ Typedefs</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_2f4536f343cdc104d7b83de3fff7416d.html">highlights</a></li><li class="navelem"><a class="el" href="highlights__types_8h.html">highlights_types.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/highlights__types_8h.js b/doc/html/highlights__types_8h.js
index 89bea3f..83c4696 100644
--- a/doc/html/highlights__types_8h.js
+++ b/doc/html/highlights__types_8h.js
@@ -11,6 +11,6 @@ var highlights__types_8h =
     [ "NVGSDK_SummaryParams", "struct_n_v_g_s_d_k___summary_params.html", "struct_n_v_g_s_d_k___summary_params" ],
     [ "NVGSDK_Highlights_UserSettings", "struct_n_v_g_s_d_k___highlights___user_settings.html", "struct_n_v_g_s_d_k___highlights___user_settings" ],
     [ "NVGSDK_Highlights_NumberOfHighlights", "struct_n_v_g_s_d_k___highlights___number_of_highlights.html", "struct_n_v_g_s_d_k___highlights___number_of_highlights" ],
-    [ "NVGSDK_Highlights_GetUserSettingsCallback", "highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9", null ],
-    [ "NVGSDK_Highlights_GetNumberOfHighlightsCallback", "highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0", null ]
+    [ "NVGSDK_Highlights_GetUserSettingsCallback", "highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6", null ],
+    [ "NVGSDK_Highlights_GetNumberOfHighlightsCallback", "highlights__types_8h.html#a69743e304d126860275dec9f1335f16f", null ]
 ];
\ No newline at end of file
diff --git a/doc/html/highlights__types_8h_source.html b/doc/html/highlights__types_8h_source.html
index 337afd7..84f2e06 100644
--- a/doc/html/highlights__types_8h_source.html
+++ b/doc/html/highlights__types_8h_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights/highlights_types.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,46 +110,46 @@ $(document).ready(function(){initNavTree('highlights__types_8h_source.html','');
 <div class="title">highlights_types.h</div>  </div>
 </div><!--header-->
 <div class="contents">
-<a href="highlights__types_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">*</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">* NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">* and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">* and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">* distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">* license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">*/</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifndef HIGHLIGHTS_TYPES_H</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define HIGHLIGHTS_TYPES_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="sdk__types_8h.html">gfesdk/sdk_types.h</a>&gt;</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &lt;stdint.h&gt;</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &lt;stdbool.h&gt;</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div><div class="line"><a name="l00023"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html">   23</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;{</div><div class="line"><a name="l00025"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a1f95d7645df3e535efa830685488ae9b">   25</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*                     <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a1f95d7645df3e535efa830685488ae9b">id</a>;             </div><div class="line"><a name="l00026"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a9e0d5a1ba9081cb7f9b549499af61927">   26</a></span>&#160;    <span class="keywordtype">bool</span>                            <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a9e0d5a1ba9081cb7f9b549499af61927">userInterest</a>;   </div><div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a1e55e8efeca6cfabc9c68583e24f410b">   28</a></span>&#160;    NVGSDK_HighlightType            <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a1e55e8efeca6cfabc9c68583e24f410b">highlightTags</a>;  </div><div class="line"><a name="l00029"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a3ecee6a0bd80c21b630559fb8ecfc0be">   29</a></span>&#160;    NVGSDK_HighlightSignificance    <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a3ecee6a0bd80c21b630559fb8ecfc0be">significance</a>;   </div><div class="line"><a name="l00030"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a3aa8849a5921b0189c2642840c257247">   30</a></span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a>*           <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a3aa8849a5921b0189c2642840c257247">nameTable</a>;      </div><div class="line"><a name="l00032"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a5522ae0afe385ba7d17afd83d19ed729">   32</a></span>&#160;    <span class="keywordtype">size_t</span>                          <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a5522ae0afe385ba7d17afd83d19ed729">nameTableSize</a>;  </div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlight.html">NVGSDK_Highlight</a>;</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div><div class="line"><a name="l00036"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_config_params.html">   36</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;{</div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___highlight.html">NVGSDK_Highlight</a>*   highlightDefinitionTable;</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    <span class="keywordtype">size_t</span>              highlightTableSize;</div><div class="line"><a name="l00040"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">   40</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*         <a class="code" href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">defaultLocale</a>;              </div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a>;</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div><div class="line"><a name="l00044"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_user_setting.html">   44</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;{</div><div class="line"><a name="l00046"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">   46</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">id</a>;     </div><div class="line"><a name="l00047"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a44eafd6943fb886c236cd4ff356c666d">   47</a></span>&#160;    <span class="keywordtype">bool</span> <a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a44eafd6943fb886c236cd4ff356c666d">enabled</a>;       </div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html">NVGSDK_HighlightUserSetting</a>;</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div><div class="line"><a name="l00051"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_open_group_params.html">   51</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;{</div><div class="line"><a name="l00053"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">   53</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*             <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">groupId</a>;                    </div><div class="line"><a name="l00055"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3d06bbfc6586ca5378eedc9a5984d662">   55</a></span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a>*   <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3d06bbfc6586ca5378eedc9a5984d662">groupDescriptionTable</a>;      </div><div class="line"><a name="l00057"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a7a3c123385683c40bd3a891e7af268bb">   57</a></span>&#160;    <span class="keywordtype">size_t</span>                  <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a7a3c123385683c40bd3a891e7af268bb">groupDescriptionTableSize</a>;  </div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a>;</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div><div class="line"><a name="l00061"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_close_group_params.html">   61</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;{</div><div class="line"><a name="l00063"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">   63</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">groupId</a>;            </div><div class="line"><a name="l00064"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a3d7eae61163c4616a42569ca8d7785c6">   64</a></span>&#160;    <span class="keywordtype">bool</span>        <a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a3d7eae61163c4616a42569ca8d7785c6">destroyHighlights</a>;  </div><div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a>;</div><div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;</div><div class="line"><a name="l00069"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">   69</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;{</div><div class="line"><a name="l00071"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">   71</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*             <a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">groupId</a>;     </div><div class="line"><a name="l00072"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">   72</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*             <a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">highlightId</a>; </div><div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a>;</div><div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;</div><div class="line"><a name="l00076"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___video_highlight_params.html">   76</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;{</div><div class="line"><a name="l00078"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">   78</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*             <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">groupId</a>;      </div><div class="line"><a name="l00079"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">   79</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*             <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">highlightId</a>;  </div><div class="line"><a name="l00080"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___video_highlight_params.html#ac526b90af6638fec62174304aa175da1">   80</a></span>&#160;    int32_t                 <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#ac526b90af6638fec62174304aa175da1">startDelta</a>;   </div><div class="line"><a name="l00081"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___video_highlight_params.html#ae63c02443b1eeb24c4e1ed4d49154277">   81</a></span>&#160;    int32_t                 <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#ae63c02443b1eeb24c4e1ed4d49154277">endDelta</a>;     </div><div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a>;</div><div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div><div class="line"><a name="l00085"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___group_view.html">   85</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;{</div><div class="line"><a name="l00087"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">   87</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*                     <a class="code" href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">groupId</a>;            </div><div class="line"><a name="l00088"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">   88</a></span>&#160;    NVGSDK_HighlightType            <a class="code" href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">tagsFilter</a>;         </div><div class="line"><a name="l00089"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___group_view.html#a88a126c5b8f2cd7c0e790bfdc3836fcb">   89</a></span>&#160;    NVGSDK_HighlightSignificance    <a class="code" href="struct_n_v_g_s_d_k___group_view.html#a88a126c5b8f2cd7c0e790bfdc3836fcb">significanceFilter</a>; </div><div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a>;</div><div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;</div><div class="line"><a name="l00093"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___summary_params.html">   93</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;{</div><div class="line"><a name="l00095"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___summary_params.html#a0a6f4e491c47e1468610f813c61ff4ff">   95</a></span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a>*   <a class="code" href="struct_n_v_g_s_d_k___summary_params.html#a0a6f4e491c47e1468610f813c61ff4ff">groupSummaryTable</a>;       </div><div class="line"><a name="l00096"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___summary_params.html#a8fbfd016dc92f631921e738f12ef399d">   96</a></span>&#160;    <span class="keywordtype">size_t</span>              <a class="code" href="struct_n_v_g_s_d_k___summary_params.html#a8fbfd016dc92f631921e738f12ef399d">groupSummaryTableSize</a>;   </div><div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a>;</div><div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;</div><div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;</div><div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;</div><div class="line"><a name="l00103"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlights___user_settings.html">  103</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;{</div><div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html">NVGSDK_HighlightUserSetting</a>*    highlightSettingTable;</div><div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    <span class="keywordtype">size_t</span>                          highlightSettingTableSize;</div><div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a>;</div><div class="line"><a name="l00109"></a><span class="lineno"><a class="line" href="highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9">  109</a></span>&#160;<span class="keyword">typedef</span> void(__stdcall* <a class="code" href="highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9">NVGSDK_Highlights_GetUserSettingsCallback</a>)(NVGSDK_RetCode, <a class="code" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a> <span class="keyword">const</span>*, <span class="keywordtype">void</span>*);</div><div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;</div><div class="line"><a name="l00112"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">  112</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;{</div><div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;    uint16_t numberOfHighlights;</div><div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a>;</div><div class="line"><a name="l00117"></a><span class="lineno"><a class="line" href="highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0">  117</a></span>&#160;<span class="keyword">typedef</span> void(__stdcall* <a class="code" href="highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a>)(NVGSDK_RetCode, <a class="code" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a> <span class="keyword">const</span>*, <span class="keywordtype">void</span>*);</div><div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;</div><div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;<span class="preprocessor">#endif // HIGHLIGHTS_TYPES_H</span></div><div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_aa332ddd28accd8f72fb17adc378c1267"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">NVGSDK_VideoHighlightParams::groupId</a></div><div class="ttdeci">char const  * groupId</div><div class="ttdoc">Required ID of the group this highlight is attached to. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00078">highlights_types.h:78</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_ae63c02443b1eeb24c4e1ed4d49154277"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#ae63c02443b1eeb24c4e1ed4d49154277">NVGSDK_VideoHighlightParams::endDelta</a></div><div class="ttdeci">int32_t endDelta</div><div class="ttdoc">Milliseconds between the time of request, and end of desired video clip. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00081">highlights_types.h:81</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_a88a126c5b8f2cd7c0e790bfdc3836fcb"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#a88a126c5b8f2cd7c0e790bfdc3836fcb">NVGSDK_GroupView::significanceFilter</a></div><div class="ttdeci">NVGSDK_HighlightSignificance significanceFilter</div><div class="ttdoc">If not zero, represents a bitfield of significance values to include. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00089">highlights_types.h:89</a></div></div>
+<a href="highlights__types_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">*</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">* NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">* and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">* and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">* distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">* license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">*/</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifndef HIGHLIGHTS_TYPES_H</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define HIGHLIGHTS_TYPES_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="sdk__types_8h.html">gfesdk/sdk_types.h</a>&gt;</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &lt;stdint.h&gt;</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &lt;stdbool.h&gt;</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div><div class="line"><a name="l00023"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html">   23</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;{</div><div class="line"><a name="l00025"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a1f95d7645df3e535efa830685488ae9b">   25</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*                     <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a1f95d7645df3e535efa830685488ae9b">id</a>;             </div><div class="line"><a name="l00026"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a9e0d5a1ba9081cb7f9b549499af61927">   26</a></span>&#160;    <span class="keywordtype">bool</span>                            <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a9e0d5a1ba9081cb7f9b549499af61927">userInterest</a>;   </div><div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a1e55e8efeca6cfabc9c68583e24f410b">   28</a></span>&#160;    NVGSDK_HighlightType            <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a1e55e8efeca6cfabc9c68583e24f410b">highlightTags</a>;  </div><div class="line"><a name="l00029"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a3ecee6a0bd80c21b630559fb8ecfc0be">   29</a></span>&#160;    NVGSDK_HighlightSignificance    <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a3ecee6a0bd80c21b630559fb8ecfc0be">significance</a>;   </div><div class="line"><a name="l00030"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a3aa8849a5921b0189c2642840c257247">   30</a></span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a>*           <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a3aa8849a5921b0189c2642840c257247">nameTable</a>;      </div><div class="line"><a name="l00032"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight.html#a5522ae0afe385ba7d17afd83d19ed729">   32</a></span>&#160;    <span class="keywordtype">size_t</span>                          <a class="code" href="struct_n_v_g_s_d_k___highlight.html#a5522ae0afe385ba7d17afd83d19ed729">nameTableSize</a>;  </div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlight.html">NVGSDK_Highlight</a>;</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div><div class="line"><a name="l00036"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_config_params.html">   36</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;{</div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___highlight.html">NVGSDK_Highlight</a>*   highlightDefinitionTable;</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    <span class="keywordtype">size_t</span>              highlightTableSize;</div><div class="line"><a name="l00040"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">   40</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*         <a class="code" href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">defaultLocale</a>;              </div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a>;</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div><div class="line"><a name="l00044"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_user_setting.html">   44</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;{</div><div class="line"><a name="l00046"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">   46</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">id</a>;     </div><div class="line"><a name="l00047"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a44eafd6943fb886c236cd4ff356c666d">   47</a></span>&#160;    <span class="keywordtype">bool</span> <a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a44eafd6943fb886c236cd4ff356c666d">enabled</a>;       </div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html">NVGSDK_HighlightUserSetting</a>;</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div><div class="line"><a name="l00051"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_open_group_params.html">   51</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;{</div><div class="line"><a name="l00053"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">   53</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*             <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">groupId</a>;                    </div><div class="line"><a name="l00055"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3d06bbfc6586ca5378eedc9a5984d662">   55</a></span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a>*   <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3d06bbfc6586ca5378eedc9a5984d662">groupDescriptionTable</a>;      </div><div class="line"><a name="l00057"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a7a3c123385683c40bd3a891e7af268bb">   57</a></span>&#160;    <span class="keywordtype">size_t</span>                  <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a7a3c123385683c40bd3a891e7af268bb">groupDescriptionTableSize</a>;  </div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a>;</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div><div class="line"><a name="l00061"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_close_group_params.html">   61</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;{</div><div class="line"><a name="l00063"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">   63</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">groupId</a>;            </div><div class="line"><a name="l00064"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a3d7eae61163c4616a42569ca8d7785c6">   64</a></span>&#160;    <span class="keywordtype">bool</span>        <a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a3d7eae61163c4616a42569ca8d7785c6">destroyHighlights</a>;  </div><div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a>;</div><div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;</div><div class="line"><a name="l00071"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">   71</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;{</div><div class="line"><a name="l00073"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">   73</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*             <a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">groupId</a>;     </div><div class="line"><a name="l00074"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">   74</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*             <a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">highlightId</a>; </div><div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a>;</div><div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;</div><div class="line"><a name="l00078"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___video_highlight_params.html">   78</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;{</div><div class="line"><a name="l00080"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">   80</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*             <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">groupId</a>;      </div><div class="line"><a name="l00081"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">   81</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*             <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">highlightId</a>;  </div><div class="line"><a name="l00082"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___video_highlight_params.html#ac526b90af6638fec62174304aa175da1">   82</a></span>&#160;    int32_t                 <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#ac526b90af6638fec62174304aa175da1">startDelta</a>;   </div><div class="line"><a name="l00083"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___video_highlight_params.html#ae63c02443b1eeb24c4e1ed4d49154277">   83</a></span>&#160;    int32_t                 <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#ae63c02443b1eeb24c4e1ed4d49154277">endDelta</a>;     </div><div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a>;</div><div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;</div><div class="line"><a name="l00087"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___group_view.html">   87</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;{</div><div class="line"><a name="l00089"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">   89</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>*                     <a class="code" href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">groupId</a>;            </div><div class="line"><a name="l00090"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">   90</a></span>&#160;    NVGSDK_HighlightType            <a class="code" href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">tagsFilter</a>;         </div><div class="line"><a name="l00091"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___group_view.html#a88a126c5b8f2cd7c0e790bfdc3836fcb">   91</a></span>&#160;    NVGSDK_HighlightSignificance    <a class="code" href="struct_n_v_g_s_d_k___group_view.html#a88a126c5b8f2cd7c0e790bfdc3836fcb">significanceFilter</a>; </div><div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a>;</div><div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;</div><div class="line"><a name="l00095"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___summary_params.html">   95</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;{</div><div class="line"><a name="l00097"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___summary_params.html#a0a6f4e491c47e1468610f813c61ff4ff">   97</a></span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a>*   <a class="code" href="struct_n_v_g_s_d_k___summary_params.html#a0a6f4e491c47e1468610f813c61ff4ff">groupSummaryTable</a>;       </div><div class="line"><a name="l00098"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___summary_params.html#a8fbfd016dc92f631921e738f12ef399d">   98</a></span>&#160;    <span class="keywordtype">size_t</span>              <a class="code" href="struct_n_v_g_s_d_k___summary_params.html#a8fbfd016dc92f631921e738f12ef399d">groupSummaryTableSize</a>;   </div><div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a>;</div><div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;</div><div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;</div><div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;</div><div class="line"><a name="l00105"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlights___user_settings.html">  105</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;{</div><div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html">NVGSDK_HighlightUserSetting</a>*    highlightSettingTable;</div><div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    <span class="keywordtype">size_t</span>                          highlightSettingTableSize;</div><div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a>;</div><div class="line"><a name="l00111"></a><span class="lineno"><a class="line" href="highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6">  111</a></span>&#160;<span class="keyword">typedef</span> void(__stdcall* <a class="code" href="highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6">NVGSDK_Highlights_GetUserSettingsCallback</a>)(NVGSDK_RetCode, <a class="code" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a> <span class="keyword">const</span>*, <span class="keywordtype">void</span>*);</div><div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;</div><div class="line"><a name="l00114"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">  114</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;{</div><div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;    uint16_t numberOfHighlights;</div><div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a>;</div><div class="line"><a name="l00119"></a><span class="lineno"><a class="line" href="highlights__types_8h.html#a69743e304d126860275dec9f1335f16f">  119</a></span>&#160;<span class="keyword">typedef</span> void(__stdcall* <a class="code" href="highlights__types_8h.html#a69743e304d126860275dec9f1335f16f">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a>)(NVGSDK_RetCode, <a class="code" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a> <span class="keyword">const</span>*, <span class="keywordtype">void</span>*);</div><div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;</div><div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;<span class="preprocessor">#endif // HIGHLIGHTS_TYPES_H</span></div><div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_aa332ddd28accd8f72fb17adc378c1267"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">NVGSDK_VideoHighlightParams::groupId</a></div><div class="ttdeci">char const * groupId</div><div class="ttdoc">Required ID of the group this highlight is attached to. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00080">highlights_types.h:80</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_ae63c02443b1eeb24c4e1ed4d49154277"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#ae63c02443b1eeb24c4e1ed4d49154277">NVGSDK_VideoHighlightParams::endDelta</a></div><div class="ttdeci">int32_t endDelta</div><div class="ttdoc">Milliseconds between the time of request, and end of desired video clip. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00083">highlights_types.h:83</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_a88a126c5b8f2cd7c0e790bfdc3836fcb"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#a88a126c5b8f2cd7c0e790bfdc3836fcb">NVGSDK_GroupView::significanceFilter</a></div><div class="ttdeci">NVGSDK_HighlightSignificance significanceFilter</div><div class="ttdoc">If not zero, represents a bitfield of significance values to include. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00091">highlights_types.h:91</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00051">highlights_types.h:51</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_user_setting_html_a44eafd6943fb886c236cd4ff356c666d"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_user_setting.html#a44eafd6943fb886c236cd4ff356c666d">NVGSDK_HighlightUserSetting::enabled</a></div><div class="ttdeci">bool enabled</div><div class="ttdoc">Boolean for whether the user wants to record this type of highlight. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00047">highlights_types.h:47</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_close_group_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00061">highlights_types.h:61</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_html_a3ecee6a0bd80c21b630559fb8ecfc0be"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight.html#a3ecee6a0bd80c21b630559fb8ecfc0be">NVGSDK_Highlight::significance</a></div><div class="ttdeci">NVGSDK_HighlightSignificance significance</div><div class="ttdoc">How significant the highlight is. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00029">highlights_types.h:29</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00085">highlights_types.h:85</a></div></div>
-<div class="ttc" id="highlights__types_8h_html_a87a246f3f9c2a0f0670b1208b22fa2d9"><div class="ttname"><a href="highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9">NVGSDK_Highlights_GetUserSettingsCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_Highlights_GetUserSettingsCallback)(NVGSDK_RetCode, NVGSDK_Highlights_UserSettings const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00109">highlights_types.h:109</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_a622f76afc439ed07a18e97ca95564ff0"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">NVGSDK_VideoHighlightParams::highlightId</a></div><div class="ttdeci">char const  * highlightId</div><div class="ttdoc">Refers to unique highlight id in highlight table. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00079">highlights_types.h:79</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html_adef68850dccafb01bc761da47413359d"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">NVGSDK_ScreenshotHighlightParams::groupId</a></div><div class="ttdeci">char const  * groupId</div><div class="ttdoc">Required ID of the group this highlight is attached to. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00071">highlights_types.h:71</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00087">highlights_types.h:87</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_a622f76afc439ed07a18e97ca95564ff0"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">NVGSDK_VideoHighlightParams::highlightId</a></div><div class="ttdeci">char const * highlightId</div><div class="ttdoc">Refers to unique highlight id in highlight table. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00081">highlights_types.h:81</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html_adef68850dccafb01bc761da47413359d"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">NVGSDK_ScreenshotHighlightParams::groupId</a></div><div class="ttdeci">char const * groupId</div><div class="ttdoc">Required ID of the group this highlight is attached to. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00073">highlights_types.h:73</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_config_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00036">highlights_types.h:36</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlight_config_params_html_a7f4f852d4fe97048f20dcdcc401ab82b"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">NVGSDK_HighlightConfigParams::defaultLocale</a></div><div class="ttdeci">char const  * defaultLocale</div><div class="ttdoc">Default locality, used for hinting GFE which translation to use. Defaults to en-us. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00040">highlights_types.h:40</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00093">highlights_types.h:93</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlight_html_a1f95d7645df3e535efa830685488ae9b"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight.html#a1f95d7645df3e535efa830685488ae9b">NVGSDK_Highlight::id</a></div><div class="ttdeci">char const  * id</div><div class="ttdoc">Unique id for game event. Max length NVGSDK_MAX_LENGTH - 1. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00025">highlights_types.h:25</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlight_config_params_html_a7f4f852d4fe97048f20dcdcc401ab82b"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">NVGSDK_HighlightConfigParams::defaultLocale</a></div><div class="ttdeci">char const * defaultLocale</div><div class="ttdoc">Default locality, used for hinting GFE which translation to use. Defaults to en-us. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00040">highlights_types.h:40</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00095">highlights_types.h:95</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlight_html_a1f95d7645df3e535efa830685488ae9b"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight.html#a1f95d7645df3e535efa830685488ae9b">NVGSDK_Highlight::id</a></div><div class="ttdeci">char const * id</div><div class="ttdoc">Unique id for game event. Max length NVGSDK_MAX_LENGTH - 1. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00025">highlights_types.h:25</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_html_a1e55e8efeca6cfabc9c68583e24f410b"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight.html#a1e55e8efeca6cfabc9c68583e24f410b">NVGSDK_Highlight::highlightTags</a></div><div class="ttdeci">NVGSDK_HighlightType highlightTags</div><div class="ttdoc">Tags for this highlight. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00028">highlights_types.h:28</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_user_setting_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_user_setting.html">NVGSDK_HighlightUserSetting</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00044">highlights_types.h:44</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html_a3d06bbfc6586ca5378eedc9a5984d662"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3d06bbfc6586ca5378eedc9a5984d662">NVGSDK_HighlightOpenGroupParams::groupDescriptionTable</a></div><div class="ttdeci">NVGSDK_LocalizedPair * groupDescriptionTable</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00055">highlights_types.h:55</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html_a9fb8219abe683974c0df4963a6794949"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">NVGSDK_ScreenshotHighlightParams::highlightId</a></div><div class="ttdeci">char const  * highlightId</div><div class="ttdoc">Refers to unique highlight id in highlight table. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00072">highlights_types.h:72</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html_a0a6f4e491c47e1468610f813c61ff4ff"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html#a0a6f4e491c47e1468610f813c61ff4ff">NVGSDK_SummaryParams::groupSummaryTable</a></div><div class="ttdeci">NVGSDK_GroupView * groupSummaryTable</div><div class="ttdoc">Pass in all the groups to display on screen. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00095">highlights_types.h:95</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html_a9fb8219abe683974c0df4963a6794949"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">NVGSDK_ScreenshotHighlightParams::highlightId</a></div><div class="ttdeci">char const * highlightId</div><div class="ttdoc">Refers to unique highlight id in highlight table. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00074">highlights_types.h:74</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html_a0a6f4e491c47e1468610f813c61ff4ff"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html#a0a6f4e491c47e1468610f813c61ff4ff">NVGSDK_SummaryParams::groupSummaryTable</a></div><div class="ttdeci">NVGSDK_GroupView * groupSummaryTable</div><div class="ttdoc">Pass in all the groups to display on screen. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00097">highlights_types.h:97</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_html_a3aa8849a5921b0189c2642840c257247"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight.html#a3aa8849a5921b0189c2642840c257247">NVGSDK_Highlight::nameTable</a></div><div class="ttdeci">NVGSDK_LocalizedPair * nameTable</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00030">highlights_types.h:30</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlight_user_setting_html_a048402ca61d36ae60fbee7a5fb2252b4"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">NVGSDK_HighlightUserSetting::id</a></div><div class="ttdeci">char const  * id</div><div class="ttdoc">Unique id for game event. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00046">highlights_types.h:46</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html_a8fbfd016dc92f631921e738f12ef399d"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html#a8fbfd016dc92f631921e738f12ef399d">NVGSDK_SummaryParams::groupSummaryTableSize</a></div><div class="ttdeci">size_t groupSummaryTableSize</div><div class="ttdoc">Number of groups contained in the table pointer. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00096">highlights_types.h:96</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlight_user_setting_html_a048402ca61d36ae60fbee7a5fb2252b4"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">NVGSDK_HighlightUserSetting::id</a></div><div class="ttdeci">char const * id</div><div class="ttdoc">Unique id for game event. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00046">highlights_types.h:46</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html_a8fbfd016dc92f631921e738f12ef399d"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html#a8fbfd016dc92f631921e738f12ef399d">NVGSDK_SummaryParams::groupSummaryTableSize</a></div><div class="ttdeci">size_t groupSummaryTableSize</div><div class="ttdoc">Number of groups contained in the table pointer. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00098">highlights_types.h:98</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_html_a5522ae0afe385ba7d17afd83d19ed729"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight.html#a5522ae0afe385ba7d17afd83d19ed729">NVGSDK_Highlight::nameTableSize</a></div><div class="ttdeci">size_t nameTableSize</div><div class="ttdoc">Number of entries in the localeNameTable */. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00032">highlights_types.h:32</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00076">highlights_types.h:76</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_a4f957ca7635183b884ce960e733bbfcc"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">NVGSDK_GroupView::groupId</a></div><div class="ttdeci">char const  * groupId</div><div class="ttdoc">Unique ID of the group to open. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00087">highlights_types.h:87</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00078">highlights_types.h:78</a></div></div>
+<div class="ttc" id="highlights__types_8h_html_a69743e304d126860275dec9f1335f16f"><div class="ttname"><a href="highlights__types_8h.html#a69743e304d126860275dec9f1335f16f">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_Highlights_GetNumberOfHighlightsCallback)(NVGSDK_RetCode, NVGSDK_Highlights_NumberOfHighlights const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00119">highlights_types.h:119</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_a4f957ca7635183b884ce960e733bbfcc"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">NVGSDK_GroupView::groupId</a></div><div class="ttdeci">char const * groupId</div><div class="ttdoc">Unique ID of the group to open. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00089">highlights_types.h:89</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight.html">NVGSDK_Highlight</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00023">highlights_types.h:23</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_close_group_params_html_a3d7eae61163c4616a42569ca8d7785c6"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a3d7eae61163c4616a42569ca8d7785c6">NVGSDK_HighlightCloseGroupParams::destroyHighlights</a></div><div class="ttdeci">bool destroyHighlights</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00064">highlights_types.h:64</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_ac526b90af6638fec62174304aa175da1"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#ac526b90af6638fec62174304aa175da1">NVGSDK_VideoHighlightParams::startDelta</a></div><div class="ttdeci">int32_t startDelta</div><div class="ttdoc">Milliseconds between the time of request, and the start of desired video clip. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00080">highlights_types.h:80</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_ac526b90af6638fec62174304aa175da1"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#ac526b90af6638fec62174304aa175da1">NVGSDK_VideoHighlightParams::startDelta</a></div><div class="ttdeci">int32_t startDelta</div><div class="ttdoc">Milliseconds between the time of request, and the start of desired video clip. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00082">highlights_types.h:82</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html_a7a3c123385683c40bd3a891e7af268bb"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a7a3c123385683c40bd3a891e7af268bb">NVGSDK_HighlightOpenGroupParams::groupDescriptionTableSize</a></div><div class="ttdeci">size_t groupDescriptionTableSize</div><div class="ttdoc">Number of entries in the groupDescriptionTable */. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00057">highlights_types.h:57</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_acd4b8ee94ed3a76bd9b6e7e8afe355a2"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">NVGSDK_GroupView::tagsFilter</a></div><div class="ttdeci">NVGSDK_HighlightType tagsFilter</div><div class="ttdoc">If not zero, represents a bitfield of tags to include. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00088">highlights_types.h:88</a></div></div>
-<div class="ttc" id="highlights__types_8h_html_a1ace1def4d575aa419abae45b2738db0"><div class="ttname"><a href="highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_Highlights_GetNumberOfHighlightsCallback)(NVGSDK_RetCode, NVGSDK_Highlights_NumberOfHighlights const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00117">highlights_types.h:117</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlights___number_of_highlights_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00112">highlights_types.h:112</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html_a3e9f6351540609fc3e853d5a16188da2"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">NVGSDK_HighlightOpenGroupParams::groupId</a></div><div class="ttdeci">char const  * groupId</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00053">highlights_types.h:53</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_acd4b8ee94ed3a76bd9b6e7e8afe355a2"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">NVGSDK_GroupView::tagsFilter</a></div><div class="ttdeci">NVGSDK_HighlightType tagsFilter</div><div class="ttdoc">If not zero, represents a bitfield of tags to include. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00090">highlights_types.h:90</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlights___number_of_highlights_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00114">highlights_types.h:114</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html_a3e9f6351540609fc3e853d5a16188da2"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">NVGSDK_HighlightOpenGroupParams::groupId</a></div><div class="ttdeci">char const * groupId</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00053">highlights_types.h:53</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___localized_pair_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00061">sdk_types.h:61</a></div></div>
 <div class="ttc" id="sdk__types_8h_html"><div class="ttname"><a href="sdk__types_8h.html">sdk_types.h</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_html_a9e0d5a1ba9081cb7f9b549499af61927"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight.html#a9e0d5a1ba9081cb7f9b549499af61927">NVGSDK_Highlight::userInterest</a></div><div class="ttdeci">bool userInterest</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00026">highlights_types.h:26</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlight_close_group_params_html_a6f1e0e8a5399e868588a83e1c81ad9c3"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">NVGSDK_HighlightCloseGroupParams::groupId</a></div><div class="ttdeci">char const  * groupId</div><div class="ttdoc">Unique group ID that was used to Open a group previously. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00063">highlights_types.h:63</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00069">highlights_types.h:69</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlights___user_settings_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00103">highlights_types.h:103</a></div></div>
+<div class="ttc" id="highlights__types_8h_html_ac758b6034dd2bb8bbde7de7576141fd6"><div class="ttname"><a href="highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6">NVGSDK_Highlights_GetUserSettingsCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_Highlights_GetUserSettingsCallback)(NVGSDK_RetCode, NVGSDK_Highlights_UserSettings const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00111">highlights_types.h:111</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlight_close_group_params_html_a6f1e0e8a5399e868588a83e1c81ad9c3"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">NVGSDK_HighlightCloseGroupParams::groupId</a></div><div class="ttdeci">char const * groupId</div><div class="ttdoc">Unique group ID that was used to Open a group previously. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00063">highlights_types.h:63</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00071">highlights_types.h:71</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlights___user_settings_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00105">highlights_types.h:105</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- HTML footer for doxygen 1.8.12-->
@@ -134,7 +159,7 @@ $(document).ready(function(){initNavTree('highlights__types_8h_source.html','');
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_2f4536f343cdc104d7b83de3fff7416d.html">highlights</a></li><li class="navelem"><a class="el" href="highlights__types_8h.html">highlights_types.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/highlights__types__cpp_8h_source.html b/doc/html/highlights__types__cpp_8h_source.html
index 76acbb7..ecfb306 100644
--- a/doc/html/highlights__types__cpp_8h_source.html
+++ b/doc/html/highlights__types__cpp_8h_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/highlights/highlights_types_cpp.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -110,7 +135,7 @@ $(document).ready(function(){initNavTree('highlights__types__cpp_8h_source.html'
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li><li class="navelem"><a class="el" href="dir_9e1fb0299a0600dff10179bfe2b8a156.html">highlights</a></li><li class="navelem"><b>highlights_types_cpp.h</b></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/ihighlights_8h.html b/doc/html/ihighlights_8h.html
index 1180b55..b9513cb 100644
--- a/doc/html/ihighlights_8h.html
+++ b/doc/html/ihighlights_8h.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights/ihighlights.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -88,26 +113,6 @@ $(document).ready(function(){initNavTree('ihighlights_8h.html','');});
 </div><!--header-->
 <div class="contents">
 <div class="textblock"><code>#include &lt;<a class="el" href="highlights__types_8h_source.html">gfesdk/highlights/highlights_types.h</a>&gt;</code><br />
-</div><div class="textblock"><div class="dynheader">
-Include dependency graph for ihighlights.h:</div>
-<div class="dyncontent">
-<div class="center"><img src="ihighlights_8h__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2ihighlights_8h" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2ihighlights_8h" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2ihighlights_8h">
-<area shape="rect" id="node2" href="highlights__types_8h.html" title="gfesdk/highlights/highlights\l_types.h" alt="" coords="143,124,322,165"/>
-<area shape="rect" id="node3" href="sdk__types_8h.html" title="gfesdk/sdk_types.h" alt="" coords="165,213,300,240"/>
-<area shape="rect" id="node6" href="os__defines_8h_source.html" title="gfesdk/os_defines.h" alt="" coords="329,288,467,315"/>
-<area shape="rect" id="node7" href="sdk__types__ipc_8h_source.html" title="gfesdk/sdk_types_ipc.h" alt="" coords="95,288,253,315"/>
-</map>
-</div>
-</div><div class="textblock"><div class="dynheader">
-This graph shows which files directly or indirectly include this file:</div>
-<div class="dyncontent">
-<div class="center"><img src="ihighlights_8h__dep__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2ihighlights_8hdep" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2ihighlights_8hdep" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2highlights_2ihighlights_8hdep">
-<area shape="rect" id="node2" href="ihighlights__cpp_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights_cpp.h" alt="" coords="5,124,212,195"/>
-<area shape="rect" id="node3" href="ihighlights__cpp__impl_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights\l_cpp_impl.h" alt="" coords="25,243,193,328"/>
-</map>
-</div>
 </div>
 <p><a href="ihighlights_8h_source.html">Go to the source code of this file.</a></p>
 <table class="memberdecls">
@@ -115,7 +120,7 @@ This graph shows which files directly or indirectly include this file:</div>
 Functions</h2></td></tr>
 <tr class="memitem:a0407132e7fd44771370ecfa03fdfce8d"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT void NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="ihighlights_8h.html#a0407132e7fd44771370ecfa03fdfce8d">NVGSDK_Highlights_ConfigureAsync</a> (NVGSDK_HANDLE *handle, <a class="el" href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a> const *config, <a class="el" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, void *context)</td></tr>
 <tr class="separator:a0407132e7fd44771370ecfa03fdfce8d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a48a359560944097729acf3dff42e34bb"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT void NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="ihighlights_8h.html#a48a359560944097729acf3dff42e34bb">NVGSDK_Highlights_GetUserSettingsAsync</a> (NVGSDK_HANDLE *handle, <a class="el" href="highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9">NVGSDK_Highlights_GetUserSettingsCallback</a> cb, void *cbContext)</td></tr>
+<tr class="memitem:a48a359560944097729acf3dff42e34bb"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT void NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="ihighlights_8h.html#a48a359560944097729acf3dff42e34bb">NVGSDK_Highlights_GetUserSettingsAsync</a> (NVGSDK_HANDLE *handle, <a class="el" href="highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6">NVGSDK_Highlights_GetUserSettingsCallback</a> cb, void *cbContext)</td></tr>
 <tr class="separator:a48a359560944097729acf3dff42e34bb"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa49250dbc063e242607123333f8da892"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT void NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="ihighlights_8h.html#aa49250dbc063e242607123333f8da892">NVGSDK_Highlights_OpenGroupAsync</a> (NVGSDK_HANDLE *handle, <a class="el" href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a> const *params, <a class="el" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, void *context)</td></tr>
 <tr class="separator:aa49250dbc063e242607123333f8da892"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -127,7 +132,7 @@ Functions</h2></td></tr>
 <tr class="separator:a4812495c6dedfc7cc6b2d3c421c161ed"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac6ee1cb402b4476571a79050f61bcd92"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT void NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="ihighlights_8h.html#ac6ee1cb402b4476571a79050f61bcd92">NVGSDK_Highlights_OpenSummaryAsync</a> (NVGSDK_HANDLE *handle, <a class="el" href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a> const *params, <a class="el" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, void *context)</td></tr>
 <tr class="separator:ac6ee1cb402b4476571a79050f61bcd92"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afad5de18b900053c2b291ce2a55985c1"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT void NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="ihighlights_8h.html#afad5de18b900053c2b291ce2a55985c1">NVGSDK_Highlights_GetNumberOfHighlightsAsync</a> (NVGSDK_HANDLE *handle, <a class="el" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a> const *groupParams, <a class="el" href="highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a> cb, void *context)</td></tr>
+<tr class="memitem:afad5de18b900053c2b291ce2a55985c1"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT void NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="ihighlights_8h.html#afad5de18b900053c2b291ce2a55985c1">NVGSDK_Highlights_GetNumberOfHighlightsAsync</a> (NVGSDK_HANDLE *handle, <a class="el" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a> const *groupParams, <a class="el" href="highlights__types_8h.html#a69743e304d126860275dec9f1335f16f">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a> cb, void *context)</td></tr>
 <tr class="separator:afad5de18b900053c2b291ce2a55985c1"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
@@ -135,9 +140,7 @@ Functions</h2></td></tr>
 
 <p>Definition in file <a class="el" href="ihighlights_8h_source.html">ihighlights.h</a>.</p>
 </div><h2 class="groupheader">Function Documentation</h2>
-<a id="a0407132e7fd44771370ecfa03fdfce8d"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a0407132e7fd44771370ecfa03fdfce8d">&sect;&nbsp;</a></span>NVGSDK_Highlights_ConfigureAsync()</h2>
-
+<a class="anchor" id="a0407132e7fd44771370ecfa03fdfce8d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -192,9 +195,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="a48a359560944097729acf3dff42e34bb"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a48a359560944097729acf3dff42e34bb">&sect;&nbsp;</a></span>NVGSDK_Highlights_GetUserSettingsAsync()</h2>
-
+<a class="anchor" id="a48a359560944097729acf3dff42e34bb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -207,7 +208,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9">NVGSDK_Highlights_GetUserSettingsCallback</a>&#160;</td>
+          <td class="paramtype"><a class="el" href="highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6">NVGSDK_Highlights_GetUserSettingsCallback</a>&#160;</td>
           <td class="paramname"><em>cb</em>, </td>
         </tr>
         <tr>
@@ -243,9 +244,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="aa49250dbc063e242607123333f8da892"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#aa49250dbc063e242607123333f8da892">&sect;&nbsp;</a></span>NVGSDK_Highlights_OpenGroupAsync()</h2>
-
+<a class="anchor" id="aa49250dbc063e242607123333f8da892"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -300,9 +299,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="aa3b6190835ada28f4cee015645814e75"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#aa3b6190835ada28f4cee015645814e75">&sect;&nbsp;</a></span>NVGSDK_Highlights_CloseGroupAsync()</h2>
-
+<a class="anchor" id="aa3b6190835ada28f4cee015645814e75"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -357,9 +354,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="a16d77849897fc5dca0e1c813525cd576"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a16d77849897fc5dca0e1c813525cd576">&sect;&nbsp;</a></span>NVGSDK_Highlights_SetScreenshotHighlightAsync()</h2>
-
+<a class="anchor" id="a16d77849897fc5dca0e1c813525cd576"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -414,9 +409,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="a4812495c6dedfc7cc6b2d3c421c161ed"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a4812495c6dedfc7cc6b2d3c421c161ed">&sect;&nbsp;</a></span>NVGSDK_Highlights_SetVideoHighlightAsync()</h2>
-
+<a class="anchor" id="a4812495c6dedfc7cc6b2d3c421c161ed"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -476,9 +469,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="ac6ee1cb402b4476571a79050f61bcd92"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ac6ee1cb402b4476571a79050f61bcd92">&sect;&nbsp;</a></span>NVGSDK_Highlights_OpenSummaryAsync()</h2>
-
+<a class="anchor" id="ac6ee1cb402b4476571a79050f61bcd92"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -526,9 +517,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="afad5de18b900053c2b291ce2a55985c1"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#afad5de18b900053c2b291ce2a55985c1">&sect;&nbsp;</a></span>NVGSDK_Highlights_GetNumberOfHighlightsAsync()</h2>
-
+<a class="anchor" id="afad5de18b900053c2b291ce2a55985c1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -547,7 +536,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a>&#160;</td>
+          <td class="paramtype"><a class="el" href="highlights__types_8h.html#a69743e304d126860275dec9f1335f16f">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a>&#160;</td>
           <td class="paramname"><em>cb</em>, </td>
         </tr>
         <tr>
@@ -585,7 +574,7 @@ Functions</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_2f4536f343cdc104d7b83de3fff7416d.html">highlights</a></li><li class="navelem"><a class="el" href="ihighlights_8h.html">ihighlights.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/ihighlights_8h_source.html b/doc/html/ihighlights_8h_source.html
index e3ef98d..2d5fb98 100644
--- a/doc/html/ihighlights_8h_source.html
+++ b/doc/html/ihighlights_8h_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights/ihighlights.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,24 +110,24 @@ $(document).ready(function(){initNavTree('ihighlights_8h_source.html','');});
 <div class="title">ihighlights.h</div>  </div>
 </div><!--header-->
 <div class="contents">
-<a href="ihighlights_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">*</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">* NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">* and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">* and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">* distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">* license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">*/</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifndef GFESDK_IHIGHLIGHTS_H</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define GFESDK_IHIGHLIGHTS_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">extern</span> <span class="stringliteral">&quot;C&quot;</span> {</div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="highlights__types_8h.html">gfesdk/highlights/highlights_types.h</a>&gt;</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<a class="code" href="ihighlights_8h.html#a0407132e7fd44771370ecfa03fdfce8d">NVGSDK_Highlights_ConfigureAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a> <span class="keyword">const</span>* config, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;<a class="code" href="ihighlights_8h.html#a48a359560944097729acf3dff42e34bb">NVGSDK_Highlights_GetUserSettingsAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9">NVGSDK_Highlights_GetUserSettingsCallback</a> cb, <span class="keywordtype">void</span>* cbContext);</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div><div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;<a class="code" href="ihighlights_8h.html#aa49250dbc063e242607123333f8da892">NVGSDK_Highlights_OpenGroupAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a> <span class="keyword">const</span>* params, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div><div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;<a class="code" href="ihighlights_8h.html#aa3b6190835ada28f4cee015645814e75">NVGSDK_Highlights_CloseGroupAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a> <span class="keyword">const</span>* params, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;</div><div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;<a class="code" href="ihighlights_8h.html#a16d77849897fc5dca0e1c813525cd576">NVGSDK_Highlights_SetScreenshotHighlightAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a> <span class="keyword">const</span>* params, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;</div><div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;<a class="code" href="ihighlights_8h.html#a4812495c6dedfc7cc6b2d3c421c161ed">NVGSDK_Highlights_SetVideoHighlightAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a> <span class="keyword">const</span>*, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;</div><div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;<a class="code" href="ihighlights_8h.html#ac6ee1cb402b4476571a79050f61bcd92">NVGSDK_Highlights_OpenSummaryAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a> <span class="keyword">const</span>* params, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;</div><div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;<a class="code" href="ihighlights_8h.html#afad5de18b900053c2b291ce2a55985c1">NVGSDK_Highlights_GetNumberOfHighlightsAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a> <span class="keyword">const</span>* groupParams, <a class="code" href="highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a> cb, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;</div><div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;}</div><div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;</div><div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;<span class="preprocessor">#endif // GFESDK_IHIGHLIGHTS_H</span></div><div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00051">highlights_types.h:51</a></div></div>
+<a href="ihighlights_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">*</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">* NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">* and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">* and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">* distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">* license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">*/</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifndef GFESDK_IHIGHLIGHTS_H</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define GFESDK_IHIGHLIGHTS_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">extern</span> <span class="stringliteral">&quot;C&quot;</span> {</div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="highlights__types_8h.html">gfesdk/highlights/highlights_types.h</a>&gt;</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<a class="code" href="ihighlights_8h.html#a0407132e7fd44771370ecfa03fdfce8d">NVGSDK_Highlights_ConfigureAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a> <span class="keyword">const</span>* config, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;<a class="code" href="ihighlights_8h.html#a48a359560944097729acf3dff42e34bb">NVGSDK_Highlights_GetUserSettingsAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6">NVGSDK_Highlights_GetUserSettingsCallback</a> cb, <span class="keywordtype">void</span>* cbContext);</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div><div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;<a class="code" href="ihighlights_8h.html#aa49250dbc063e242607123333f8da892">NVGSDK_Highlights_OpenGroupAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a> <span class="keyword">const</span>* params, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div><div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;<a class="code" href="ihighlights_8h.html#aa3b6190835ada28f4cee015645814e75">NVGSDK_Highlights_CloseGroupAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a> <span class="keyword">const</span>* params, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;</div><div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;<a class="code" href="ihighlights_8h.html#a16d77849897fc5dca0e1c813525cd576">NVGSDK_Highlights_SetScreenshotHighlightAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a> <span class="keyword">const</span>* params, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;</div><div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;<a class="code" href="ihighlights_8h.html#a4812495c6dedfc7cc6b2d3c421c161ed">NVGSDK_Highlights_SetVideoHighlightAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a> <span class="keyword">const</span>*, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;</div><div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;<a class="code" href="ihighlights_8h.html#ac6ee1cb402b4476571a79050f61bcd92">NVGSDK_Highlights_OpenSummaryAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a> <span class="keyword">const</span>* params, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;</div><div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi</div><div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;<a class="code" href="ihighlights_8h.html#afad5de18b900053c2b291ce2a55985c1">NVGSDK_Highlights_GetNumberOfHighlightsAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a> <span class="keyword">const</span>* groupParams, <a class="code" href="highlights__types_8h.html#a69743e304d126860275dec9f1335f16f">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a> cb, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;</div><div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;}</div><div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;</div><div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;<span class="preprocessor">#endif // GFESDK_IHIGHLIGHTS_H</span></div><div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00051">highlights_types.h:51</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_close_group_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00061">highlights_types.h:61</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00085">highlights_types.h:85</a></div></div>
-<div class="ttc" id="highlights__types_8h_html_a87a246f3f9c2a0f0670b1208b22fa2d9"><div class="ttname"><a href="highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9">NVGSDK_Highlights_GetUserSettingsCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_Highlights_GetUserSettingsCallback)(NVGSDK_RetCode, NVGSDK_Highlights_UserSettings const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00109">highlights_types.h:109</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00087">highlights_types.h:87</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_config_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00036">highlights_types.h:36</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_aa49250dbc063e242607123333f8da892"><div class="ttname"><a href="ihighlights_8h.html#aa49250dbc063e242607123333f8da892">NVGSDK_Highlights_OpenGroupAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_OpenGroupAsync(NVGSDK_HANDLE *handle, NVGSDK_HighlightOpenGroupParams const *params, NVGSDK_EmptyCallback callback, void *context)</div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00093">highlights_types.h:93</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00095">highlights_types.h:95</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_a48a359560944097729acf3dff42e34bb"><div class="ttname"><a href="ihighlights_8h.html#a48a359560944097729acf3dff42e34bb">NVGSDK_Highlights_GetUserSettingsAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_GetUserSettingsAsync(NVGSDK_HANDLE *handle, NVGSDK_Highlights_GetUserSettingsCallback cb, void *cbContext)</div></div>
 <div class="ttc" id="ihighlights_8h_html_a16d77849897fc5dca0e1c813525cd576"><div class="ttname"><a href="ihighlights_8h.html#a16d77849897fc5dca0e1c813525cd576">NVGSDK_Highlights_SetScreenshotHighlightAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_SetScreenshotHighlightAsync(NVGSDK_HANDLE *handle, NVGSDK_ScreenshotHighlightParams const *params, NVGSDK_EmptyCallback callback, void *context)</div></div>
 <div class="ttc" id="ihighlights_8h_html_a0407132e7fd44771370ecfa03fdfce8d"><div class="ttname"><a href="ihighlights_8h.html#a0407132e7fd44771370ecfa03fdfce8d">NVGSDK_Highlights_ConfigureAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_ConfigureAsync(NVGSDK_HANDLE *handle, NVGSDK_HighlightConfigParams const *config, NVGSDK_EmptyCallback callback, void *context)</div></div>
 <div class="ttc" id="ihighlights_8h_html_afad5de18b900053c2b291ce2a55985c1"><div class="ttname"><a href="ihighlights_8h.html#afad5de18b900053c2b291ce2a55985c1">NVGSDK_Highlights_GetNumberOfHighlightsAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_GetNumberOfHighlightsAsync(NVGSDK_HANDLE *handle, NVGSDK_GroupView const *groupParams, NVGSDK_Highlights_GetNumberOfHighlightsCallback cb, void *context)</div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00076">highlights_types.h:76</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00078">highlights_types.h:78</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_aa3b6190835ada28f4cee015645814e75"><div class="ttname"><a href="ihighlights_8h.html#aa3b6190835ada28f4cee015645814e75">NVGSDK_Highlights_CloseGroupAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_CloseGroupAsync(NVGSDK_HANDLE *handle, NVGSDK_HighlightCloseGroupParams const *params, NVGSDK_EmptyCallback callback, void *context)</div></div>
+<div class="ttc" id="highlights__types_8h_html_a69743e304d126860275dec9f1335f16f"><div class="ttname"><a href="highlights__types_8h.html#a69743e304d126860275dec9f1335f16f">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_Highlights_GetNumberOfHighlightsCallback)(NVGSDK_RetCode, NVGSDK_Highlights_NumberOfHighlights const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00119">highlights_types.h:119</a></div></div>
 <div class="ttc" id="sdk__types_8h_html_a1c5cd84ed88c70462c360a7268eb95ac"><div class="ttname"><a href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_EmptyCallback)(NVGSDK_RetCode, void *)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00138">sdk_types.h:138</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_a4812495c6dedfc7cc6b2d3c421c161ed"><div class="ttname"><a href="ihighlights_8h.html#a4812495c6dedfc7cc6b2d3c421c161ed">NVGSDK_Highlights_SetVideoHighlightAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_SetVideoHighlightAsync(NVGSDK_HANDLE *handle, NVGSDK_VideoHighlightParams const *, NVGSDK_EmptyCallback callback, void *context)</div></div>
-<div class="ttc" id="highlights__types_8h_html_a1ace1def4d575aa419abae45b2738db0"><div class="ttname"><a href="highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0">NVGSDK_Highlights_GetNumberOfHighlightsCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_Highlights_GetNumberOfHighlightsCallback)(NVGSDK_RetCode, NVGSDK_Highlights_NumberOfHighlights const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00117">highlights_types.h:117</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_ac6ee1cb402b4476571a79050f61bcd92"><div class="ttname"><a href="ihighlights_8h.html#ac6ee1cb402b4476571a79050f61bcd92">NVGSDK_Highlights_OpenSummaryAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_OpenSummaryAsync(NVGSDK_HANDLE *handle, NVGSDK_SummaryParams const *params, NVGSDK_EmptyCallback callback, void *context)</div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00069">highlights_types.h:69</a></div></div>
+<div class="ttc" id="highlights__types_8h_html_ac758b6034dd2bb8bbde7de7576141fd6"><div class="ttname"><a href="highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6">NVGSDK_Highlights_GetUserSettingsCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_Highlights_GetUserSettingsCallback)(NVGSDK_RetCode, NVGSDK_Highlights_UserSettings const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00111">highlights_types.h:111</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00071">highlights_types.h:71</a></div></div>
 <div class="ttc" id="highlights__types_8h_html"><div class="ttname"><a href="highlights__types_8h.html">highlights_types.h</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
@@ -113,7 +138,7 @@ $(document).ready(function(){initNavTree('ihighlights_8h_source.html','');});
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_2f4536f343cdc104d7b83de3fff7416d.html">highlights</a></li><li class="navelem"><a class="el" href="ihighlights_8h.html">ihighlights.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/ihighlights__cpp_8h.html b/doc/html/ihighlights__cpp_8h.html
index b09a16e..e84a638 100644
--- a/doc/html/ihighlights__cpp_8h.html
+++ b/doc/html/ihighlights__cpp_8h.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/highlights/ihighlights_cpp.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,32 +115,6 @@ $(document).ready(function(){initNavTree('ihighlights__cpp_8h.html','');});
 <div class="textblock"><code>#include &lt;<a class="el" href="isdk__cpp_8h_source.html">gfesdk/bindings/cpp/isdk_cpp.h</a>&gt;</code><br />
 <code>#include &lt;gfesdk/bindings/cpp/highlights/highlights_types_cpp.h&gt;</code><br />
 <code>#include &lt;<a class="el" href="ihighlights_8h_source.html">gfesdk/highlights/ihighlights.h</a>&gt;</code><br />
-</div><div class="textblock"><div class="dynheader">
-Include dependency graph for ihighlights_cpp.h:</div>
-<div class="dyncontent">
-<div class="center"><img src="ihighlights__cpp_8h__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2highlights_2ihighlights__cpp_8h" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2highlights_2ihighlights__cpp_8h" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2highlights_2ihighlights__cpp_8h">
-<area shape="rect" id="node2" href="isdk__cpp_8h.html" title="gfesdk/bindings/cpp\l/isdk_cpp.h" alt="" coords="506,131,643,173"/>
-<area shape="rect" id="node17" href="highlights__types__cpp_8h_source.html" title="gfesdk/bindings/cpp\l/highlights/highlights\l_types_cpp.h" alt="" coords="667,124,807,180"/>
-<area shape="rect" id="node19" href="ihighlights_8h.html" title="gfesdk/highlights/ihighlights.h" alt="" coords="832,139,1024,165"/>
-<area shape="rect" id="node3" href="sdk__types__cpp_8h_source.html" title="sdk_types_cpp.h" alt="" coords="595,235,717,262"/>
-<area shape="rect" id="node14" href="isdk_8h.html" title="gfesdk/isdk.h" alt="" coords="253,235,352,262"/>
-<area shape="rect" id="node7" href="sdk__types_8h.html" title="gfesdk/sdk_types.h" alt="" coords="314,317,449,344"/>
-<area shape="rect" id="node8" href="os__defines_8h_source.html" title="gfesdk/os_defines.h" alt="" coords="313,392,450,419"/>
-<area shape="rect" id="node9" href="sdk__types__ipc_8h_source.html" title="gfesdk/sdk_types_ipc.h" alt="" coords="474,392,633,419"/>
-<area shape="rect" id="node15" href="config_8h_source.html" title="gfesdk/config.h" alt="" coords="28,317,137,344"/>
-<area shape="rect" id="node16" href="gfe3__product__version_8h_source.html" title="gfe3_product_version.h" alt="" coords="5,392,160,419"/>
-<area shape="rect" id="node18" href="highlights__types_8h.html" title="gfesdk/highlights/highlights\l_types.h" alt="" coords="839,228,1017,269"/>
-</map>
-</div>
-</div><div class="textblock"><div class="dynheader">
-This graph shows which files directly or indirectly include this file:</div>
-<div class="dyncontent">
-<div class="center"><img src="ihighlights__cpp_8h__dep__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2highlights_2ihighlights__cpp_8hdep" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2highlights_2ihighlights__cpp_8hdep" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2highlights_2ihighlights__cpp_8hdep">
-<area shape="rect" id="node2" href="ihighlights__cpp__impl_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights\l_cpp_impl.h" alt="" coords="25,124,193,209"/>
-</map>
-</div>
 </div>
 <p><a href="ihighlights__cpp_8h_source.html">Go to the source code of this file.</a></p>
 <table class="memberdecls">
@@ -137,7 +136,7 @@ Classes</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li><li class="navelem"><a class="el" href="dir_9e1fb0299a0600dff10179bfe2b8a156.html">highlights</a></li><li class="navelem"><a class="el" href="ihighlights__cpp_8h.html">ihighlights_cpp.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/ihighlights__cpp_8h_source.html b/doc/html/ihighlights__cpp_8h_source.html
index 7ca55dd..871ef4e 100644
--- a/doc/html/ihighlights__cpp_8h_source.html
+++ b/doc/html/ihighlights__cpp_8h_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/highlights/ihighlights_cpp.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,15 +110,15 @@ $(document).ready(function(){initNavTree('ihighlights__cpp_8h_source.html','');}
 <div class="title">ihighlights_cpp.h</div>  </div>
 </div><!--header-->
 <div class="contents">
-<a href="ihighlights__cpp_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">*</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">* NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">* and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">* and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">* distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">* license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">*/</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#ifndef GFESDK_IHIGHLIGHTS_CPP_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#define GFESDK_IHIGHLIGHTS_CPP_H</span></div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="isdk__cpp_8h.html">gfesdk/bindings/cpp/isdk_cpp.h</a>&gt;</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &lt;gfesdk/bindings/cpp/highlights/highlights_types_cpp.h&gt;</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespace_gfe_s_d_k.html">GfeSDK</a></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;{</div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="comment">// Avoid polluting global namespace with C api, so put it inside namespace</span></div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="ihighlights_8h.html">gfesdk/highlights/ihighlights.h</a>&gt;</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div><div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights.html">   28</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a></div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;{</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;    <span class="keyword">static</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a>* Create(<a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a>* core);</div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    <span class="keyword">virtual</span> ~<a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a>() {}</div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#a8e522535c3393a1911e2bbb65c71eb52">ConfigureAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_config_params.html">HighlightConfigParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#a593d1bd58183bc0b53c7dee7991d8491">GetUserSettingsAsync</a>(TGetUserSettingsCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) <span class="keyword">const</span> = 0;</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#ab1b35bd4fe9e8aac357db3aeabfefa1b">OpenGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_open_group_params.html">HighlightOpenGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#ac53536039527813888e5404a3a20e4ab">CloseGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_close_group_params.html">HighlightCloseGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#a84475c751b97bf00d55e767b55e89bff">SetScreenshotHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_screenshot_highlight_params.html">ScreenshotHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#a982f27414a0672d50f6f156ecf557791">SetVideoHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_video_highlight_params.html">VideoHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#a9d1ab59542571efe90391aea1503411b">OpenSummaryAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_summary_params.html">SummaryParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#ad640f12621aa2ab8f0bf39b859f8d849">GetNumberOfHighlightsAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_group_view.html">GroupView</a> <span class="keyword">const</span>&amp; params, TGetNumberOfHighlightsCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;};</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;}</div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="preprocessor">#endif //GFESDK_IHIGHLIGHTS_CPP_H</span></div><div class="ttc" id="class_gfe_s_d_k_1_1_highlights_html_ad640f12621aa2ab8f0bf39b859f8d849"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights.html#ad640f12621aa2ab8f0bf39b859f8d849">GfeSDK::Highlights::GetNumberOfHighlightsAsync</a></div><div class="ttdeci">virtual void GetNumberOfHighlightsAsync(GroupView const &amp;params, TGetNumberOfHighlightsCallback cb=nullptr, void *cbContext=nullptr)=0</div></div>
+<a href="ihighlights__cpp_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">*</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">* NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">* and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">* and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">* distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">* license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">*/</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#ifndef GFESDK_IHIGHLIGHTS_CPP_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#define GFESDK_IHIGHLIGHTS_CPP_H</span></div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="isdk__cpp_8h.html">gfesdk/bindings/cpp/isdk_cpp.h</a>&gt;</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &lt;gfesdk/bindings/cpp/highlights/highlights_types_cpp.h&gt;</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespace_gfe_s_d_k.html">GfeSDK</a></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;{</div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="comment">// Avoid polluting global namespace with C api, so put it inside namespace</span></div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="ihighlights_8h.html">gfesdk/highlights/ihighlights.h</a>&gt;</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div><div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights.html">   28</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a></div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;{</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;    <span class="keyword">static</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a>* Create(<a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a>* core);</div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    <span class="keyword">virtual</span> ~<a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a>() {}</div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#a8e522535c3393a1911e2bbb65c71eb52">ConfigureAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_config_params.html">HighlightConfigParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#add1016d23068c8f2dd0cd037210aa14b">GetUserSettingsAsync</a>(TGetUserSettingsCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) <span class="keyword">const</span> = 0;</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#ab1b35bd4fe9e8aac357db3aeabfefa1b">OpenGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_open_group_params.html">HighlightOpenGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#ac53536039527813888e5404a3a20e4ab">CloseGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_close_group_params.html">HighlightCloseGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#a84475c751b97bf00d55e767b55e89bff">SetScreenshotHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_screenshot_highlight_params.html">ScreenshotHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#a982f27414a0672d50f6f156ecf557791">SetVideoHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_video_highlight_params.html">VideoHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#a9d1ab59542571efe90391aea1503411b">OpenSummaryAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_summary_params.html">SummaryParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html#ad640f12621aa2ab8f0bf39b859f8d849">GetNumberOfHighlightsAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_group_view.html">GroupView</a> <span class="keyword">const</span>&amp; params, TGetNumberOfHighlightsCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;};</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;}</div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="preprocessor">#endif //GFESDK_IHIGHLIGHTS_CPP_H</span></div><div class="ttc" id="class_gfe_s_d_k_1_1_highlights_html_ad640f12621aa2ab8f0bf39b859f8d849"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights.html#ad640f12621aa2ab8f0bf39b859f8d849">GfeSDK::Highlights::GetNumberOfHighlightsAsync</a></div><div class="ttdeci">virtual void GetNumberOfHighlightsAsync(GroupView const &amp;params, TGetNumberOfHighlightsCallback cb=nullptr, void *cbContext=nullptr)=0</div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_summary_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_summary_params.html">GfeSDK::SummaryParams</a></div><div class="ttdoc">C++ binding for NVGSDK_SummaryParams. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00082">highlights_types_cpp.h:82</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_screenshot_highlight_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_screenshot_highlight_params.html">GfeSDK::ScreenshotHighlightParams</a></div><div class="ttdoc">C++ binding for NVGSDK_ScreenshotHighlightParams. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00057">highlights_types_cpp.h:57</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_highlight_close_group_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_highlight_close_group_params.html">GfeSDK::HighlightCloseGroupParams</a></div><div class="ttdoc">C++ binding for NVGSDK_HighlightCloseGroupParams. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00050">highlights_types_cpp.h:50</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_highlight_open_group_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_highlight_open_group_params.html">GfeSDK::HighlightOpenGroupParams</a></div><div class="ttdoc">C++ binding for NVGSDK_HighlightOpenGroupParams. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00043">highlights_types_cpp.h:43</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_highlights_html_ac53536039527813888e5404a3a20e4ab"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights.html#ac53536039527813888e5404a3a20e4ab">GfeSDK::Highlights::CloseGroupAsync</a></div><div class="ttdeci">virtual void CloseGroupAsync(HighlightCloseGroupParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)=0</div></div>
+<div class="ttc" id="class_gfe_s_d_k_1_1_highlights_html_add1016d23068c8f2dd0cd037210aa14b"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights.html#add1016d23068c8f2dd0cd037210aa14b">GfeSDK::Highlights::GetUserSettingsAsync</a></div><div class="ttdeci">virtual void GetUserSettingsAsync(TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const  =0</div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_highlight_config_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_highlight_config_params.html">GfeSDK::HighlightConfigParams</a></div><div class="ttdoc">C++ binding for NVGSDK_HighlightConfigParams. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00036">highlights_types_cpp.h:36</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_video_highlight_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_video_highlight_params.html">GfeSDK::VideoHighlightParams</a></div><div class="ttdoc">C++ binding for NVGSDK_VideoHighlightParams. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00064">highlights_types_cpp.h:64</a></div></div>
-<div class="ttc" id="class_gfe_s_d_k_1_1_highlights_html_a593d1bd58183bc0b53c7dee7991d8491"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights.html#a593d1bd58183bc0b53c7dee7991d8491">GfeSDK::Highlights::GetUserSettingsAsync</a></div><div class="ttdeci">virtual void GetUserSettingsAsync(TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const =0</div></div>
 <div class="ttc" id="isdk__cpp_8h_html"><div class="ttname"><a href="isdk__cpp_8h.html">isdk_cpp.h</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_group_view_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_group_view.html">GfeSDK::GroupView</a></div><div class="ttdoc">C++ binding for NVGSDK_GroupView. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00073">highlights_types_cpp.h:73</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_highlights_html_a84475c751b97bf00d55e767b55e89bff"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights.html#a84475c751b97bf00d55e767b55e89bff">GfeSDK::Highlights::SetScreenshotHighlightAsync</a></div><div class="ttdeci">virtual void SetScreenshotHighlightAsync(ScreenshotHighlightParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)=0</div></div>
@@ -114,7 +139,7 @@ $(document).ready(function(){initNavTree('ihighlights__cpp_8h_source.html','');}
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li><li class="navelem"><a class="el" href="dir_9e1fb0299a0600dff10179bfe2b8a156.html">highlights</a></li><li class="navelem"><a class="el" href="ihighlights__cpp_8h.html">ihighlights_cpp.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/ihighlights__cpp__impl_8h.html b/doc/html/ihighlights__cpp__impl_8h.html
index 404f275..09b0fb5 100644
--- a/doc/html/ihighlights__cpp__impl_8h.html
+++ b/doc/html/ihighlights__cpp__impl_8h.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/highlights/ihighlights_cpp_impl.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,26 +115,6 @@ $(document).ready(function(){initNavTree('ihighlights__cpp__impl_8h.html','');})
 <div class="textblock"><code>#include &quot;<a class="el" href="ihighlights__cpp_8h_source.html">ihighlights_cpp.h</a>&quot;</code><br />
 <code>#include &lt;<a class="el" href="isdk__cpp__impl_8h_source.html">gfesdk/bindings/cpp/isdk_cpp_impl.h</a>&gt;</code><br />
 <code>#include &lt;memory&gt;</code><br />
-</div><div class="textblock"><div class="dynheader">
-Include dependency graph for ihighlights_cpp_impl.h:</div>
-<div class="dyncontent">
-<div class="center"><img src="ihighlights__cpp__impl_8h__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2highlights_2ihighlights__cpp__impl_8h" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2highlights_2ihighlights__cpp__impl_8h" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2highlights_2ihighlights__cpp__impl_8h">
-<area shape="rect" id="node2" href="ihighlights__cpp_8h.html" title="ihighlights_cpp.h" alt="" coords="243,146,362,173"/>
-<area shape="rect" id="node21" href="isdk__cpp__impl_8h.html" title="gfesdk/bindings/cpp\l/isdk_cpp_impl.h" alt="" coords="391,139,529,180"/>
-<area shape="rect" id="node3" href="isdk__cpp_8h.html" title="gfesdk/bindings/cpp\l/isdk_cpp.h" alt="" coords="386,235,523,277"/>
-<area shape="rect" id="node18" href="highlights__types__cpp_8h_source.html" title="gfesdk/bindings/cpp\l/highlights/highlights\l_types_cpp.h" alt="" coords="222,228,362,284"/>
-<area shape="rect" id="node20" href="ihighlights_8h.html" title="gfesdk/highlights/ihighlights.h" alt="" coords="5,243,197,269"/>
-<area shape="rect" id="node4" href="sdk__types__cpp_8h_source.html" title="sdk_types_cpp.h" alt="" coords="278,339,399,366"/>
-<area shape="rect" id="node15" href="isdk_8h.html" title="gfesdk/isdk.h" alt="" coords="648,339,747,366"/>
-<area shape="rect" id="node8" href="sdk__types_8h.html" title="gfesdk/sdk_types.h" alt="" coords="578,421,713,448"/>
-<area shape="rect" id="node9" href="os__defines_8h_source.html" title="gfesdk/os_defines.h" alt="" coords="829,496,966,523"/>
-<area shape="rect" id="node10" href="sdk__types__ipc_8h_source.html" title="gfesdk/sdk_types_ipc.h" alt="" coords="575,496,734,523"/>
-<area shape="rect" id="node16" href="config_8h_source.html" title="gfesdk/config.h" alt="" coords="975,421,1084,448"/>
-<area shape="rect" id="node17" href="gfe3__product__version_8h_source.html" title="gfe3_product_version.h" alt="" coords="991,496,1145,523"/>
-<area shape="rect" id="node19" href="highlights__types_8h.html" title="gfesdk/highlights/highlights\l_types.h" alt="" coords="12,332,191,373"/>
-</map>
-</div>
 </div>
 <p><a href="ihighlights__cpp__impl_8h_source.html">Go to the source code of this file.</a></p>
 <table class="memberdecls">
@@ -131,7 +136,7 @@ Classes</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li><li class="navelem"><a class="el" href="dir_9e1fb0299a0600dff10179bfe2b8a156.html">highlights</a></li><li class="navelem"><a class="el" href="ihighlights__cpp__impl_8h.html">ihighlights_cpp_impl.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/ihighlights__cpp__impl_8h_source.html b/doc/html/ihighlights__cpp__impl_8h_source.html
index 1ced7ab..82c2f0a 100644
--- a/doc/html/ihighlights__cpp__impl_8h_source.html
+++ b/doc/html/ihighlights__cpp__impl_8h_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/highlights/ihighlights_cpp_impl.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,10 +110,10 @@ $(document).ready(function(){initNavTree('ihighlights__cpp__impl_8h_source.html'
 <div class="title">ihighlights_cpp_impl.h</div>  </div>
 </div><!--header-->
 <div class="contents">
-<a href="ihighlights__cpp__impl_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">*</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">* NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">* and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">* and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">* distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">* license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">*/</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#ifndef GFESDK_IHIGHLIGHTS_CPP_IMPL_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#define GFESDK_IHIGHLIGHTS_CPP_IMPL_H</span></div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;<a class="code" href="ihighlights__cpp_8h.html">ihighlights_cpp.h</a>&quot;</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="isdk__cpp__impl_8h.html">gfesdk/bindings/cpp/isdk_cpp_impl.h</a>&gt;</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespace_gfe_s_d_k.html">GfeSDK</a></div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;{</div><div class="line"><a name="l00026"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html">   26</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a> : <span class="keyword">public</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a></div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;{</div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#adfee0bca7a525fd81406d719ad1aaed9">ConfigureAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_config_params.html">HighlightConfigParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040">GetUserSettingsAsync</a>(TGetUserSettingsCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) <span class="keyword">const</span>;</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a8420e07f1812fba8bf961e90e5795d3b">OpenGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_open_group_params.html">HighlightOpenGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a22481d623b4124cd7277b30a70a11fad">CloseGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_close_group_params.html">HighlightCloseGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a10ec6fa65e8afb5ea417f4cfe7f1d5ab">SetScreenshotHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_screenshot_highlight_params.html">ScreenshotHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab4989563440e14295449166c626ac3a9">SetVideoHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_video_highlight_params.html">VideoHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab31f1319b9dcf33cf9146916f8a1d5f3">OpenSummaryAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_summary_params.html">SummaryParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a358fcbe7699b79ed79952bb2eab12830">GetNumberOfHighlightsAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_group_view.html">GroupView</a> <span class="keyword">const</span>&amp; params, TGetNumberOfHighlightsCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <span class="keyword">friend</span> <span class="keyword">class </span><a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a>;</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="keyword">private</span>:</div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    <span class="comment">// Remove default construct, copy and assignment operators</span></div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>(<a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a>* core) : m_handle(core ? core-&gt;GetHandle() : <span class="keyword">nullptr</span>) {}</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>(<span class="keyword">const</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>&amp; other) {}</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>&amp; operator=(<span class="keyword">const</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>&amp; other) {}</div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="keyword">private</span>:</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    NVGSDK_HANDLE* m_handle;</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;};</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div><div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;<span class="keyword">inline</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a>* Highlights::Create(<a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a>* core)</div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;{</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">new</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>(core);</div><div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;}</div><div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div><div class="line"><a name="l00062"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#adfee0bca7a525fd81406d719ad1aaed9">   62</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#adfee0bca7a525fd81406d719ad1aaed9">HighlightsImpl::ConfigureAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_config_params.html">HighlightConfigParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;{</div><div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a> cParams;</div><div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    std::vector&lt;NVGSDK_Highlight&gt; cHighlights;</div><div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    std::vector&lt;std::vector&lt;NVGSDK_LocalizedPair&gt;&gt; cLocaleMaps;</div><div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">auto</span> it = params.highlightDefinitions.begin(); it != params.highlightDefinitions.end(); ++it)</div><div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    {</div><div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;        cLocaleMaps.push_back(std::vector&lt;NVGSDK_LocalizedPair&gt;());</div><div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;        <span class="keywordflow">for</span> (<span class="keyword">auto</span> localeIt = it-&gt;nameLocaleTable.begin(); localeIt != it-&gt;nameLocaleTable.end(); ++localeIt)</div><div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;        {</div><div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;            cLocaleMaps.back().push_back({</div><div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;                localeIt-&gt;first.c_str(),</div><div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;                localeIt-&gt;second.c_str()</div><div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;            });</div><div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;        }</div><div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;        cHighlights.push_back({</div><div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;            it-&gt;id.c_str(),</div><div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;            it-&gt;userDefaultInterest,</div><div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;            it-&gt;highlightTags,</div><div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;            it-&gt;significance,</div><div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;            it-&gt;nameLocaleTable.empty() ? <span class="keyword">nullptr</span> : &amp;cLocaleMaps.back()[0],</div><div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;            it-&gt;nameLocaleTable.size()</div><div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;        });</div><div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    }</div><div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    cParams.highlightDefinitionTable = &amp;cHighlights[0];</div><div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    cParams.highlightTableSize = cHighlights.size();</div><div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">defaultLocale</a> = params.defaultLocale.c_str();</div><div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    <a class="code" href="ihighlights_8h.html#a0407132e7fd44771370ecfa03fdfce8d">NVGSDK_Highlights_ConfigureAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;}</div><div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;</div><div class="line"><a name="l00092"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040">   92</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040">HighlightsImpl::GetUserSettingsAsync</a>(TGetUserSettingsCallback callback, <span class="keywordtype">void</span>* context)<span class="keyword"> const</span></div><div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;<span class="keyword"></span>{</div><div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    <a class="code" href="ihighlights_8h.html#a48a359560944097729acf3dff42e34bb">NVGSDK_Highlights_GetUserSettingsAsync</a>(m_handle, [](NVGSDK_RetCode rc, <a class="code" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a> <span class="keyword">const</span>* data, <span class="keywordtype">void</span>* context) {</div><div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;        std::unique_ptr&lt;CoreImpl::CallbackContext&lt;TGetUserSettingsCallback&gt;&gt; callbackContext(<span class="keyword">reinterpret_cast&lt;</span>CoreImpl::CallbackContext&lt;TGetUserSettingsCallback&gt;*<span class="keyword">&gt;</span>(context));</div><div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;        <span class="keywordflow">if</span> (!callbackContext-&gt;callback) <span class="keywordflow">return</span>;</div><div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;</div><div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;        <span class="keywordflow">if</span> (NVGSDK_FAILED(rc))</div><div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;        {</div><div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;            <span class="keywordflow">return</span> callbackContext-&gt;callback(rc, <span class="keyword">nullptr</span>, callbackContext-&gt;appContext);</div><div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;        }</div><div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;</div><div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;        <a class="code" href="struct_gfe_s_d_k_1_1_get_user_settings_response.html">GetUserSettingsResponse</a> r;</div><div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; data-&gt;highlightSettingTableSize; ++i)</div><div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;        {</div><div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;            r.highlightSettings.push_back({</div><div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;                data-&gt;highlightSettingTable[i].<a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">id</a>,</div><div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;                data-&gt;highlightSettingTable[i].<a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a44eafd6943fb886c236cd4ff356c666d">enabled</a></div><div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;            });</div><div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;        }</div><div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;        callbackContext-&gt;callback(rc, &amp;r, callbackContext-&gt;appContext);</div><div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;    }, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TGetUserSettingsCallback&gt;({ callback, context }));</div><div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;}</div><div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;</div><div class="line"><a name="l00115"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#a8420e07f1812fba8bf961e90e5795d3b">  115</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a8420e07f1812fba8bf961e90e5795d3b">HighlightsImpl::OpenGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_open_group_params.html">HighlightOpenGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;{</div><div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a> cParams;</div><div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;</div><div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;    std::vector&lt;NVGSDK_LocalizedPair&gt; localePairs;</div><div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;    CoreImpl::translateLocaleTable(params.groupDescriptionLocaleTable, localePairs);</div><div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">groupId</a> = params.groupId.c_str();</div><div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3d06bbfc6586ca5378eedc9a5984d662">groupDescriptionTable</a> = &amp;localePairs[0];</div><div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a7a3c123385683c40bd3a891e7af268bb">groupDescriptionTableSize</a> = localePairs.size();</div><div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;</div><div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    <a class="code" href="ihighlights_8h.html#aa49250dbc063e242607123333f8da892">NVGSDK_Highlights_OpenGroupAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;}</div><div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;</div><div class="line"><a name="l00128"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#a22481d623b4124cd7277b30a70a11fad">  128</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a22481d623b4124cd7277b30a70a11fad">HighlightsImpl::CloseGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_close_group_params.html">HighlightCloseGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;{</div><div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a> cParams;</div><div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">groupId</a> = params.groupId.c_str();</div><div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a3d7eae61163c4616a42569ca8d7785c6">destroyHighlights</a> = params.destroyHighlights;</div><div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;</div><div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;    <a class="code" href="ihighlights_8h.html#aa3b6190835ada28f4cee015645814e75">NVGSDK_Highlights_CloseGroupAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;}</div><div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div><div class="line"><a name="l00137"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#a10ec6fa65e8afb5ea417f4cfe7f1d5ab">  137</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a10ec6fa65e8afb5ea417f4cfe7f1d5ab">HighlightsImpl::SetScreenshotHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_screenshot_highlight_params.html">ScreenshotHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;{</div><div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a> cParams;</div><div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">groupId</a> = params.groupId.c_str();</div><div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">highlightId</a> = params.highlightId.c_str();</div><div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;    <a class="code" href="ihighlights_8h.html#a16d77849897fc5dca0e1c813525cd576">NVGSDK_Highlights_SetScreenshotHighlightAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;}</div><div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;</div><div class="line"><a name="l00145"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab4989563440e14295449166c626ac3a9">  145</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab4989563440e14295449166c626ac3a9">HighlightsImpl::SetVideoHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_video_highlight_params.html">VideoHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;{</div><div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a> cParams;</div><div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">groupId</a> = params.groupId.c_str();</div><div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">highlightId</a> = params.highlightId.c_str();</div><div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#ac526b90af6638fec62174304aa175da1">startDelta</a> = params.startDelta;</div><div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#ae63c02443b1eeb24c4e1ed4d49154277">endDelta</a> = params.endDelta;</div><div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    <a class="code" href="ihighlights_8h.html#a4812495c6dedfc7cc6b2d3c421c161ed">NVGSDK_Highlights_SetVideoHighlightAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;}</div><div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;</div><div class="line"><a name="l00155"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab31f1319b9dcf33cf9146916f8a1d5f3">  155</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab31f1319b9dcf33cf9146916f8a1d5f3">HighlightsImpl::OpenSummaryAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_summary_params.html">SummaryParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;{</div><div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;    std::vector&lt;NVGSDK_GroupView&gt; cGroupViews;</div><div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">auto</span> it = params.groupViews.begin(); it != params.groupViews.end(); ++it)</div><div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;    {</div><div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;        cGroupViews.push_back({</div><div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;            it-&gt;groupId.c_str(),</div><div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;            it-&gt;tagsFilter,</div><div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;            it-&gt;significanceFilter</div><div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;        });</div><div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;    }</div><div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;</div><div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a> cParams;</div><div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___summary_params.html#a0a6f4e491c47e1468610f813c61ff4ff">groupSummaryTable</a> = &amp;cGroupViews[0];</div><div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___summary_params.html#a8fbfd016dc92f631921e738f12ef399d">groupSummaryTableSize</a> = cGroupViews.size();</div><div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;    <a class="code" href="ihighlights_8h.html#ac6ee1cb402b4476571a79050f61bcd92">NVGSDK_Highlights_OpenSummaryAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;}</div><div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;</div><div class="line"><a name="l00173"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#a358fcbe7699b79ed79952bb2eab12830">  173</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a358fcbe7699b79ed79952bb2eab12830">HighlightsImpl::GetNumberOfHighlightsAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_group_view.html">GroupView</a> <span class="keyword">const</span>&amp; params, TGetNumberOfHighlightsCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;{</div><div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a> cParams;</div><div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">groupId</a> = params.groupId.c_str();</div><div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">tagsFilter</a> = params.tagsFilter;</div><div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___group_view.html#a88a126c5b8f2cd7c0e790bfdc3836fcb">significanceFilter</a> = params.significanceFilter;</div><div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;    <a class="code" href="ihighlights_8h.html#afad5de18b900053c2b291ce2a55985c1">NVGSDK_Highlights_GetNumberOfHighlightsAsync</a>(m_handle, &amp;cParams, [](NVGSDK_RetCode rc, <a class="code" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a> <span class="keyword">const</span>* data, <span class="keywordtype">void</span>* context) {</div><div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;        std::unique_ptr&lt;CoreImpl::CallbackContext&lt;TGetNumberOfHighlightsCallback&gt;&gt; callbackContext(<span class="keyword">reinterpret_cast&lt;</span>CoreImpl::CallbackContext&lt;TGetNumberOfHighlightsCallback&gt;*<span class="keyword">&gt;</span>(context));</div><div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;        <span class="keywordflow">if</span> (!callbackContext-&gt;callback) <span class="keywordflow">return</span>;</div><div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;</div><div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;        <span class="keywordflow">if</span> (NVGSDK_FAILED(rc))</div><div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;        {</div><div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;            <span class="keywordflow">return</span> callbackContext-&gt;callback(rc, <span class="keyword">nullptr</span>, callbackContext-&gt;appContext);</div><div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;        }</div><div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;</div><div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;        <a class="code" href="struct_gfe_s_d_k_1_1_get_number_of_highlights_response.html">GetNumberOfHighlightsResponse</a> num;</div><div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;        num.numHighlights = data-&gt;numberOfHighlights;</div><div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;        callbackContext-&gt;callback(rc, &amp;num, callbackContext-&gt;appContext);</div><div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;    }, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TGetNumberOfHighlightsCallback&gt;({ callback, context }));</div><div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;}</div><div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;</div><div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;}</div><div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;</div><div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;<span class="preprocessor">#endif //GFESDK_IHIGHLIGHTS_CPP_IMPL_H</span></div><div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_aa332ddd28accd8f72fb17adc378c1267"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">NVGSDK_VideoHighlightParams::groupId</a></div><div class="ttdeci">char const  * groupId</div><div class="ttdoc">Required ID of the group this highlight is attached to. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00078">highlights_types.h:78</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_ae63c02443b1eeb24c4e1ed4d49154277"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#ae63c02443b1eeb24c4e1ed4d49154277">NVGSDK_VideoHighlightParams::endDelta</a></div><div class="ttdeci">int32_t endDelta</div><div class="ttdoc">Milliseconds between the time of request, and end of desired video clip. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00081">highlights_types.h:81</a></div></div>
+<a href="ihighlights__cpp__impl_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">*</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">* NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">* and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">* and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">* distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">* license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">*/</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#ifndef GFESDK_IHIGHLIGHTS_CPP_IMPL_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#define GFESDK_IHIGHLIGHTS_CPP_IMPL_H</span></div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;<a class="code" href="ihighlights__cpp_8h.html">ihighlights_cpp.h</a>&quot;</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="isdk__cpp__impl_8h.html">gfesdk/bindings/cpp/isdk_cpp_impl.h</a>&gt;</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespace_gfe_s_d_k.html">GfeSDK</a></div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;{</div><div class="line"><a name="l00026"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html">   26</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a> : <span class="keyword">public</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a></div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;{</div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#adfee0bca7a525fd81406d719ad1aaed9">ConfigureAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_config_params.html">HighlightConfigParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f">GetUserSettingsAsync</a>(TGetUserSettingsCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) <span class="keyword">const</span>;</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a8420e07f1812fba8bf961e90e5795d3b">OpenGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_open_group_params.html">HighlightOpenGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a22481d623b4124cd7277b30a70a11fad">CloseGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_close_group_params.html">HighlightCloseGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a10ec6fa65e8afb5ea417f4cfe7f1d5ab">SetScreenshotHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_screenshot_highlight_params.html">ScreenshotHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab4989563440e14295449166c626ac3a9">SetVideoHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_video_highlight_params.html">VideoHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab31f1319b9dcf33cf9146916f8a1d5f3">OpenSummaryAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_summary_params.html">SummaryParams</a> <span class="keyword">const</span>&amp; params, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a358fcbe7699b79ed79952bb2eab12830">GetNumberOfHighlightsAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_group_view.html">GroupView</a> <span class="keyword">const</span>&amp; params, TGetNumberOfHighlightsCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>);</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <span class="keyword">friend</span> <span class="keyword">class </span><a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a>;</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="keyword">private</span>:</div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    <span class="comment">// Remove default construct, copy and assignment operators</span></div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>(<a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a>* core) : m_handle(core ? core-&gt;GetHandle() : <span class="keyword">nullptr</span>) {}</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>(<span class="keyword">const</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>&amp; other) {}</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>&amp; operator=(<span class="keyword">const</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>&amp; other) {}</div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="keyword">private</span>:</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    NVGSDK_HANDLE* m_handle;</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;};</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div><div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;<span class="keyword">inline</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights.html">Highlights</a>* Highlights::Create(<a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a>* core)</div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;{</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">new</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html">HighlightsImpl</a>(core);</div><div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;}</div><div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div><div class="line"><a name="l00062"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#adfee0bca7a525fd81406d719ad1aaed9">   62</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#adfee0bca7a525fd81406d719ad1aaed9">HighlightsImpl::ConfigureAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_config_params.html">HighlightConfigParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;{</div><div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a> cParams;</div><div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    std::vector&lt;NVGSDK_Highlight&gt; cHighlights;</div><div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    std::vector&lt;std::vector&lt;NVGSDK_LocalizedPair&gt;&gt; cLocaleMaps;</div><div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">auto</span> it = params.highlightDefinitions.begin(); it != params.highlightDefinitions.end(); ++it)</div><div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    {</div><div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;        cLocaleMaps.push_back(std::vector&lt;NVGSDK_LocalizedPair&gt;());</div><div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;        <span class="keywordflow">for</span> (<span class="keyword">auto</span> localeIt = it-&gt;nameLocaleTable.begin(); localeIt != it-&gt;nameLocaleTable.end(); ++localeIt)</div><div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;        {</div><div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;            cLocaleMaps.back().push_back({</div><div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;                localeIt-&gt;first.c_str(),</div><div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;                localeIt-&gt;second.c_str()</div><div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;            });</div><div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;        }</div><div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;        cHighlights.push_back({</div><div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;            it-&gt;id.c_str(),</div><div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;            it-&gt;userDefaultInterest,</div><div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;            it-&gt;highlightTags,</div><div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;            it-&gt;significance,</div><div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;            it-&gt;nameLocaleTable.empty() ? <span class="keyword">nullptr</span> : &amp;cLocaleMaps.back()[0],</div><div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;            it-&gt;nameLocaleTable.size()</div><div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;        });</div><div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    }</div><div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    cParams.highlightDefinitionTable = &amp;cHighlights[0];</div><div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    cParams.highlightTableSize = cHighlights.size();</div><div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">defaultLocale</a> = params.defaultLocale.c_str();</div><div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    <a class="code" href="ihighlights_8h.html#a0407132e7fd44771370ecfa03fdfce8d">NVGSDK_Highlights_ConfigureAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;}</div><div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;</div><div class="line"><a name="l00092"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f">   92</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f">HighlightsImpl::GetUserSettingsAsync</a>(TGetUserSettingsCallback callback, <span class="keywordtype">void</span>* context)<span class="keyword"> const</span></div><div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;<span class="keyword"></span>{</div><div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    <a class="code" href="ihighlights_8h.html#a48a359560944097729acf3dff42e34bb">NVGSDK_Highlights_GetUserSettingsAsync</a>(m_handle, [](NVGSDK_RetCode rc, <a class="code" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a> <span class="keyword">const</span>* data, <span class="keywordtype">void</span>* context) {</div><div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;        std::unique_ptr&lt;CoreImpl::CallbackContext&lt;TGetUserSettingsCallback&gt;&gt; callbackContext(<span class="keyword">reinterpret_cast&lt;</span>CoreImpl::CallbackContext&lt;TGetUserSettingsCallback&gt;*<span class="keyword">&gt;</span>(context));</div><div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;        <span class="keywordflow">if</span> (!callbackContext-&gt;callback) <span class="keywordflow">return</span>;</div><div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;</div><div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;        <span class="keywordflow">if</span> (NVGSDK_FAILED(rc))</div><div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;        {</div><div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;            <span class="keywordflow">return</span> callbackContext-&gt;callback(rc, <span class="keyword">nullptr</span>, callbackContext-&gt;appContext);</div><div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;        }</div><div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;</div><div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;        <a class="code" href="struct_gfe_s_d_k_1_1_get_user_settings_response.html">GetUserSettingsResponse</a> r;</div><div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; data-&gt;highlightSettingTableSize; ++i)</div><div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;        {</div><div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;            r.highlightSettings.push_back({</div><div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;                data-&gt;highlightSettingTable[i].<a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">id</a>,</div><div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;                data-&gt;highlightSettingTable[i].<a class="code" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a44eafd6943fb886c236cd4ff356c666d">enabled</a></div><div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;            });</div><div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;        }</div><div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;        callbackContext-&gt;callback(rc, &amp;r, callbackContext-&gt;appContext);</div><div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;    }, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TGetUserSettingsCallback&gt;({ callback, context }));</div><div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;}</div><div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;</div><div class="line"><a name="l00115"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#a8420e07f1812fba8bf961e90e5795d3b">  115</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a8420e07f1812fba8bf961e90e5795d3b">HighlightsImpl::OpenGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_open_group_params.html">HighlightOpenGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;{</div><div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a> cParams;</div><div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;</div><div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;    std::vector&lt;NVGSDK_LocalizedPair&gt; localePairs;</div><div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;    CoreImpl::translateLocaleTable(params.groupDescriptionLocaleTable, localePairs);</div><div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">groupId</a> = params.groupId.c_str();</div><div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3d06bbfc6586ca5378eedc9a5984d662">groupDescriptionTable</a> = &amp;localePairs[0];</div><div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a7a3c123385683c40bd3a891e7af268bb">groupDescriptionTableSize</a> = localePairs.size();</div><div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;</div><div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    <a class="code" href="ihighlights_8h.html#aa49250dbc063e242607123333f8da892">NVGSDK_Highlights_OpenGroupAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;}</div><div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;</div><div class="line"><a name="l00128"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#a22481d623b4124cd7277b30a70a11fad">  128</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a22481d623b4124cd7277b30a70a11fad">HighlightsImpl::CloseGroupAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_highlight_close_group_params.html">HighlightCloseGroupParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;{</div><div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a> cParams;</div><div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">groupId</a> = params.groupId.c_str();</div><div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a3d7eae61163c4616a42569ca8d7785c6">destroyHighlights</a> = params.destroyHighlights;</div><div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;</div><div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;    <a class="code" href="ihighlights_8h.html#aa3b6190835ada28f4cee015645814e75">NVGSDK_Highlights_CloseGroupAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;}</div><div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div><div class="line"><a name="l00137"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#a10ec6fa65e8afb5ea417f4cfe7f1d5ab">  137</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a10ec6fa65e8afb5ea417f4cfe7f1d5ab">HighlightsImpl::SetScreenshotHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_screenshot_highlight_params.html">ScreenshotHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;{</div><div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a> cParams;</div><div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">groupId</a> = params.groupId.c_str();</div><div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">highlightId</a> = params.highlightId.c_str();</div><div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;    <a class="code" href="ihighlights_8h.html#a16d77849897fc5dca0e1c813525cd576">NVGSDK_Highlights_SetScreenshotHighlightAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;}</div><div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;</div><div class="line"><a name="l00145"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab4989563440e14295449166c626ac3a9">  145</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab4989563440e14295449166c626ac3a9">HighlightsImpl::SetVideoHighlightAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_video_highlight_params.html">VideoHighlightParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;{</div><div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a> cParams;</div><div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">groupId</a> = params.groupId.c_str();</div><div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">highlightId</a> = params.highlightId.c_str();</div><div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#ac526b90af6638fec62174304aa175da1">startDelta</a> = params.startDelta;</div><div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___video_highlight_params.html#ae63c02443b1eeb24c4e1ed4d49154277">endDelta</a> = params.endDelta;</div><div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    <a class="code" href="ihighlights_8h.html#a4812495c6dedfc7cc6b2d3c421c161ed">NVGSDK_Highlights_SetVideoHighlightAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;}</div><div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;</div><div class="line"><a name="l00155"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab31f1319b9dcf33cf9146916f8a1d5f3">  155</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#ab31f1319b9dcf33cf9146916f8a1d5f3">HighlightsImpl::OpenSummaryAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_summary_params.html">SummaryParams</a> <span class="keyword">const</span>&amp; params, TCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;{</div><div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;    std::vector&lt;NVGSDK_GroupView&gt; cGroupViews;</div><div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">auto</span> it = params.groupViews.begin(); it != params.groupViews.end(); ++it)</div><div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;    {</div><div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;        cGroupViews.push_back({</div><div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;            it-&gt;groupId.c_str(),</div><div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;            it-&gt;tagsFilter,</div><div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;            it-&gt;significanceFilter</div><div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;        });</div><div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;    }</div><div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;</div><div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a> cParams;</div><div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___summary_params.html#a0a6f4e491c47e1468610f813c61ff4ff">groupSummaryTable</a> = &amp;cGroupViews[0];</div><div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___summary_params.html#a8fbfd016dc92f631921e738f12ef399d">groupSummaryTableSize</a> = cGroupViews.size();</div><div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;    <a class="code" href="ihighlights_8h.html#ac6ee1cb402b4476571a79050f61bcd92">NVGSDK_Highlights_OpenSummaryAsync</a>(m_handle, &amp;cParams, CoreImpl::callbackWrapper, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TCallback&gt;({ callback, context }));</div><div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;}</div><div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;</div><div class="line"><a name="l00173"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_highlights_impl.html#a358fcbe7699b79ed79952bb2eab12830">  173</a></span>&#160;<span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_highlights_impl.html#a358fcbe7699b79ed79952bb2eab12830">HighlightsImpl::GetNumberOfHighlightsAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_group_view.html">GroupView</a> <span class="keyword">const</span>&amp; params, TGetNumberOfHighlightsCallback callback, <span class="keywordtype">void</span>* context)</div><div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;{</div><div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a> cParams;</div><div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">groupId</a> = params.groupId.c_str();</div><div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">tagsFilter</a> = params.tagsFilter;</div><div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;    cParams.<a class="code" href="struct_n_v_g_s_d_k___group_view.html#a88a126c5b8f2cd7c0e790bfdc3836fcb">significanceFilter</a> = params.significanceFilter;</div><div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;    <a class="code" href="ihighlights_8h.html#afad5de18b900053c2b291ce2a55985c1">NVGSDK_Highlights_GetNumberOfHighlightsAsync</a>(m_handle, &amp;cParams, [](NVGSDK_RetCode rc, <a class="code" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a> <span class="keyword">const</span>* data, <span class="keywordtype">void</span>* context) {</div><div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;        std::unique_ptr&lt;CoreImpl::CallbackContext&lt;TGetNumberOfHighlightsCallback&gt;&gt; callbackContext(<span class="keyword">reinterpret_cast&lt;</span>CoreImpl::CallbackContext&lt;TGetNumberOfHighlightsCallback&gt;*<span class="keyword">&gt;</span>(context));</div><div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;        <span class="keywordflow">if</span> (!callbackContext-&gt;callback) <span class="keywordflow">return</span>;</div><div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;</div><div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;        <span class="keywordflow">if</span> (NVGSDK_FAILED(rc))</div><div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;        {</div><div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;            <span class="keywordflow">return</span> callbackContext-&gt;callback(rc, <span class="keyword">nullptr</span>, callbackContext-&gt;appContext);</div><div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;        }</div><div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;</div><div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;        <a class="code" href="struct_gfe_s_d_k_1_1_get_number_of_highlights_response.html">GetNumberOfHighlightsResponse</a> num;</div><div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;        num.numHighlights = data-&gt;numberOfHighlights;</div><div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;        callbackContext-&gt;callback(rc, &amp;num, callbackContext-&gt;appContext);</div><div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;    }, <span class="keyword">new</span> CoreImpl::CallbackContext&lt;TGetNumberOfHighlightsCallback&gt;({ callback, context }));</div><div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;}</div><div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;</div><div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;}</div><div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;</div><div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;<span class="preprocessor">#endif //GFESDK_IHIGHLIGHTS_CPP_IMPL_H</span></div><div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_aa332ddd28accd8f72fb17adc378c1267"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">NVGSDK_VideoHighlightParams::groupId</a></div><div class="ttdeci">char const * groupId</div><div class="ttdoc">Required ID of the group this highlight is attached to. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00080">highlights_types.h:80</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_ae63c02443b1eeb24c4e1ed4d49154277"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#ae63c02443b1eeb24c4e1ed4d49154277">NVGSDK_VideoHighlightParams::endDelta</a></div><div class="ttdeci">int32_t endDelta</div><div class="ttdoc">Milliseconds between the time of request, and end of desired video clip. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00083">highlights_types.h:83</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_summary_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_summary_params.html">GfeSDK::SummaryParams</a></div><div class="ttdoc">C++ binding for NVGSDK_SummaryParams. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00082">highlights_types_cpp.h:82</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_a88a126c5b8f2cd7c0e790bfdc3836fcb"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#a88a126c5b8f2cd7c0e790bfdc3836fcb">NVGSDK_GroupView::significanceFilter</a></div><div class="ttdeci">NVGSDK_HighlightSignificance significanceFilter</div><div class="ttdoc">If not zero, represents a bitfield of significance values to include. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00089">highlights_types.h:89</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_a88a126c5b8f2cd7c0e790bfdc3836fcb"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#a88a126c5b8f2cd7c0e790bfdc3836fcb">NVGSDK_GroupView::significanceFilter</a></div><div class="ttdeci">NVGSDK_HighlightSignificance significanceFilter</div><div class="ttdoc">If not zero, represents a bitfield of significance values to include. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00091">highlights_types.h:91</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_highlights_impl_html_a358fcbe7699b79ed79952bb2eab12830"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights_impl.html#a358fcbe7699b79ed79952bb2eab12830">GfeSDK::HighlightsImpl::GetNumberOfHighlightsAsync</a></div><div class="ttdeci">virtual void GetNumberOfHighlightsAsync(GroupView const &amp;params, TGetNumberOfHighlightsCallback cb=nullptr, void *cbContext=nullptr)</div><div class="ttdef"><b>Definition:</b> <a href="ihighlights__cpp__impl_8h_source.html#l00173">ihighlights_cpp_impl.h:173</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00051">highlights_types.h:51</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_screenshot_highlight_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_screenshot_highlight_params.html">GfeSDK::ScreenshotHighlightParams</a></div><div class="ttdoc">C++ binding for NVGSDK_ScreenshotHighlightParams. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00057">highlights_types_cpp.h:57</a></div></div>
@@ -98,51 +123,51 @@ $(document).ready(function(){initNavTree('ihighlights__cpp__impl_8h_source.html'
 <div class="ttc" id="class_gfe_s_d_k_1_1_highlights_impl_html_ab4989563440e14295449166c626ac3a9"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights_impl.html#ab4989563440e14295449166c626ac3a9">GfeSDK::HighlightsImpl::SetVideoHighlightAsync</a></div><div class="ttdeci">virtual void SetVideoHighlightAsync(VideoHighlightParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</div><div class="ttdef"><b>Definition:</b> <a href="ihighlights__cpp__impl_8h_source.html#l00145">ihighlights_cpp_impl.h:145</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_close_group_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00061">highlights_types.h:61</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_get_user_settings_response_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_get_user_settings_response.html">GfeSDK::GetUserSettingsResponse</a></div><div class="ttdoc">C++ binding for NVGSDK_Highlights_GetUserSettingsResponse. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00104">highlights_types_cpp.h:104</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00085">highlights_types.h:85</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_a622f76afc439ed07a18e97ca95564ff0"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">NVGSDK_VideoHighlightParams::highlightId</a></div><div class="ttdeci">char const  * highlightId</div><div class="ttdoc">Refers to unique highlight id in highlight table. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00079">highlights_types.h:79</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00087">highlights_types.h:87</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_a622f76afc439ed07a18e97ca95564ff0"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">NVGSDK_VideoHighlightParams::highlightId</a></div><div class="ttdeci">char const * highlightId</div><div class="ttdoc">Refers to unique highlight id in highlight table. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00081">highlights_types.h:81</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_highlights_impl_html_a22481d623b4124cd7277b30a70a11fad"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights_impl.html#a22481d623b4124cd7277b30a70a11fad">GfeSDK::HighlightsImpl::CloseGroupAsync</a></div><div class="ttdeci">virtual void CloseGroupAsync(HighlightCloseGroupParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</div><div class="ttdef"><b>Definition:</b> <a href="ihighlights__cpp__impl_8h_source.html#l00128">ihighlights_cpp_impl.h:128</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html_adef68850dccafb01bc761da47413359d"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">NVGSDK_ScreenshotHighlightParams::groupId</a></div><div class="ttdeci">char const  * groupId</div><div class="ttdoc">Required ID of the group this highlight is attached to. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00071">highlights_types.h:71</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html_adef68850dccafb01bc761da47413359d"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">NVGSDK_ScreenshotHighlightParams::groupId</a></div><div class="ttdeci">char const * groupId</div><div class="ttdoc">Required ID of the group this highlight is attached to. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00073">highlights_types.h:73</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_config_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00036">highlights_types.h:36</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlight_config_params_html_a7f4f852d4fe97048f20dcdcc401ab82b"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">NVGSDK_HighlightConfigParams::defaultLocale</a></div><div class="ttdeci">char const  * defaultLocale</div><div class="ttdoc">Default locality, used for hinting GFE which translation to use. Defaults to en-us. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00040">highlights_types.h:40</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlight_config_params_html_a7f4f852d4fe97048f20dcdcc401ab82b"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">NVGSDK_HighlightConfigParams::defaultLocale</a></div><div class="ttdeci">char const * defaultLocale</div><div class="ttdoc">Default locality, used for hinting GFE which translation to use. Defaults to en-us. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00040">highlights_types.h:40</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_highlights_impl_html_a8420e07f1812fba8bf961e90e5795d3b"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights_impl.html#a8420e07f1812fba8bf961e90e5795d3b">GfeSDK::HighlightsImpl::OpenGroupAsync</a></div><div class="ttdeci">virtual void OpenGroupAsync(HighlightOpenGroupParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</div><div class="ttdef"><b>Definition:</b> <a href="ihighlights__cpp__impl_8h_source.html#l00115">ihighlights_cpp_impl.h:115</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_highlight_config_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_highlight_config_params.html">GfeSDK::HighlightConfigParams</a></div><div class="ttdoc">C++ binding for NVGSDK_HighlightConfigParams. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00036">highlights_types_cpp.h:36</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_aa49250dbc063e242607123333f8da892"><div class="ttname"><a href="ihighlights_8h.html#aa49250dbc063e242607123333f8da892">NVGSDK_Highlights_OpenGroupAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_OpenGroupAsync(NVGSDK_HANDLE *handle, NVGSDK_HighlightOpenGroupParams const *params, NVGSDK_EmptyCallback callback, void *context)</div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_video_highlight_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_video_highlight_params.html">GfeSDK::VideoHighlightParams</a></div><div class="ttdoc">C++ binding for NVGSDK_VideoHighlightParams. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00064">highlights_types_cpp.h:64</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00093">highlights_types.h:93</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00095">highlights_types.h:95</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_highlights_impl_html_ab31f1319b9dcf33cf9146916f8a1d5f3"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights_impl.html#ab31f1319b9dcf33cf9146916f8a1d5f3">GfeSDK::HighlightsImpl::OpenSummaryAsync</a></div><div class="ttdeci">virtual void OpenSummaryAsync(SummaryParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</div><div class="ttdef"><b>Definition:</b> <a href="ihighlights__cpp__impl_8h_source.html#l00155">ihighlights_cpp_impl.h:155</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html_a3d06bbfc6586ca5378eedc9a5984d662"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3d06bbfc6586ca5378eedc9a5984d662">NVGSDK_HighlightOpenGroupParams::groupDescriptionTable</a></div><div class="ttdeci">NVGSDK_LocalizedPair * groupDescriptionTable</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00055">highlights_types.h:55</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html_a9fb8219abe683974c0df4963a6794949"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">NVGSDK_ScreenshotHighlightParams::highlightId</a></div><div class="ttdeci">char const  * highlightId</div><div class="ttdoc">Refers to unique highlight id in highlight table. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00072">highlights_types.h:72</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html_a0a6f4e491c47e1468610f813c61ff4ff"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html#a0a6f4e491c47e1468610f813c61ff4ff">NVGSDK_SummaryParams::groupSummaryTable</a></div><div class="ttdeci">NVGSDK_GroupView * groupSummaryTable</div><div class="ttdoc">Pass in all the groups to display on screen. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00095">highlights_types.h:95</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html_a9fb8219abe683974c0df4963a6794949"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">NVGSDK_ScreenshotHighlightParams::highlightId</a></div><div class="ttdeci">char const * highlightId</div><div class="ttdoc">Refers to unique highlight id in highlight table. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00074">highlights_types.h:74</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html_a0a6f4e491c47e1468610f813c61ff4ff"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html#a0a6f4e491c47e1468610f813c61ff4ff">NVGSDK_SummaryParams::groupSummaryTable</a></div><div class="ttdeci">NVGSDK_GroupView * groupSummaryTable</div><div class="ttdoc">Pass in all the groups to display on screen. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00097">highlights_types.h:97</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_a48a359560944097729acf3dff42e34bb"><div class="ttname"><a href="ihighlights_8h.html#a48a359560944097729acf3dff42e34bb">NVGSDK_Highlights_GetUserSettingsAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_GetUserSettingsAsync(NVGSDK_HANDLE *handle, NVGSDK_Highlights_GetUserSettingsCallback cb, void *cbContext)</div></div>
 <div class="ttc" id="isdk__cpp__impl_8h_html"><div class="ttname"><a href="isdk__cpp__impl_8h.html">isdk_cpp_impl.h</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlight_user_setting_html_a048402ca61d36ae60fbee7a5fb2252b4"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">NVGSDK_HighlightUserSetting::id</a></div><div class="ttdeci">char const  * id</div><div class="ttdoc">Unique id for game event. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00046">highlights_types.h:46</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlight_user_setting_html_a048402ca61d36ae60fbee7a5fb2252b4"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">NVGSDK_HighlightUserSetting::id</a></div><div class="ttdeci">char const * id</div><div class="ttdoc">Unique id for game event. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00046">highlights_types.h:46</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_a16d77849897fc5dca0e1c813525cd576"><div class="ttname"><a href="ihighlights_8h.html#a16d77849897fc5dca0e1c813525cd576">NVGSDK_Highlights_SetScreenshotHighlightAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_SetScreenshotHighlightAsync(NVGSDK_HANDLE *handle, NVGSDK_ScreenshotHighlightParams const *params, NVGSDK_EmptyCallback callback, void *context)</div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html_a8fbfd016dc92f631921e738f12ef399d"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html#a8fbfd016dc92f631921e738f12ef399d">NVGSDK_SummaryParams::groupSummaryTableSize</a></div><div class="ttdeci">size_t groupSummaryTableSize</div><div class="ttdoc">Number of groups contained in the table pointer. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00096">highlights_types.h:96</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___summary_params_html_a8fbfd016dc92f631921e738f12ef399d"><div class="ttname"><a href="struct_n_v_g_s_d_k___summary_params.html#a8fbfd016dc92f631921e738f12ef399d">NVGSDK_SummaryParams::groupSummaryTableSize</a></div><div class="ttdeci">size_t groupSummaryTableSize</div><div class="ttdoc">Number of groups contained in the table pointer. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00098">highlights_types.h:98</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_a0407132e7fd44771370ecfa03fdfce8d"><div class="ttname"><a href="ihighlights_8h.html#a0407132e7fd44771370ecfa03fdfce8d">NVGSDK_Highlights_ConfigureAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_ConfigureAsync(NVGSDK_HANDLE *handle, NVGSDK_HighlightConfigParams const *config, NVGSDK_EmptyCallback callback, void *context)</div></div>
 <div class="ttc" id="ihighlights_8h_html_afad5de18b900053c2b291ce2a55985c1"><div class="ttname"><a href="ihighlights_8h.html#afad5de18b900053c2b291ce2a55985c1">NVGSDK_Highlights_GetNumberOfHighlightsAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_GetNumberOfHighlightsAsync(NVGSDK_HANDLE *handle, NVGSDK_GroupView const *groupParams, NVGSDK_Highlights_GetNumberOfHighlightsCallback cb, void *context)</div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_highlights_impl_html_a10ec6fa65e8afb5ea417f4cfe7f1d5ab"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights_impl.html#a10ec6fa65e8afb5ea417f4cfe7f1d5ab">GfeSDK::HighlightsImpl::SetScreenshotHighlightAsync</a></div><div class="ttdeci">virtual void SetScreenshotHighlightAsync(ScreenshotHighlightParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</div><div class="ttdef"><b>Definition:</b> <a href="ihighlights__cpp__impl_8h_source.html#l00137">ihighlights_cpp_impl.h:137</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00076">highlights_types.h:76</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00078">highlights_types.h:78</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_group_view_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_group_view.html">GfeSDK::GroupView</a></div><div class="ttdoc">C++ binding for NVGSDK_GroupView. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00073">highlights_types_cpp.h:73</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_aa3b6190835ada28f4cee015645814e75"><div class="ttname"><a href="ihighlights_8h.html#aa3b6190835ada28f4cee015645814e75">NVGSDK_Highlights_CloseGroupAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_CloseGroupAsync(NVGSDK_HANDLE *handle, NVGSDK_HighlightCloseGroupParams const *params, NVGSDK_EmptyCallback callback, void *context)</div></div>
 <div class="ttc" id="ihighlights__cpp_8h_html"><div class="ttname"><a href="ihighlights__cpp_8h.html">ihighlights_cpp.h</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_a4f957ca7635183b884ce960e733bbfcc"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">NVGSDK_GroupView::groupId</a></div><div class="ttdeci">char const  * groupId</div><div class="ttdoc">Unique ID of the group to open. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00087">highlights_types.h:87</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_a4f957ca7635183b884ce960e733bbfcc"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">NVGSDK_GroupView::groupId</a></div><div class="ttdeci">char const * groupId</div><div class="ttdoc">Unique ID of the group to open. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00089">highlights_types.h:89</a></div></div>
+<div class="ttc" id="class_gfe_s_d_k_1_1_highlights_impl_html_ac1463c91e4646dafb38d2ff53c98f22f"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f">GfeSDK::HighlightsImpl::GetUserSettingsAsync</a></div><div class="ttdeci">virtual void GetUserSettingsAsync(TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const </div><div class="ttdef"><b>Definition:</b> <a href="ihighlights__cpp__impl_8h_source.html#l00092">ihighlights_cpp_impl.h:92</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_close_group_params_html_a3d7eae61163c4616a42569ca8d7785c6"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a3d7eae61163c4616a42569ca8d7785c6">NVGSDK_HighlightCloseGroupParams::destroyHighlights</a></div><div class="ttdeci">bool destroyHighlights</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00064">highlights_types.h:64</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_a4812495c6dedfc7cc6b2d3c421c161ed"><div class="ttname"><a href="ihighlights_8h.html#a4812495c6dedfc7cc6b2d3c421c161ed">NVGSDK_Highlights_SetVideoHighlightAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_SetVideoHighlightAsync(NVGSDK_HANDLE *handle, NVGSDK_VideoHighlightParams const *, NVGSDK_EmptyCallback callback, void *context)</div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_highlights_impl_html_adfee0bca7a525fd81406d719ad1aaed9"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights_impl.html#adfee0bca7a525fd81406d719ad1aaed9">GfeSDK::HighlightsImpl::ConfigureAsync</a></div><div class="ttdeci">virtual void ConfigureAsync(HighlightConfigParams const &amp;params, TCallback cb=nullptr, void *cbContext=nullptr)</div><div class="ttdef"><b>Definition:</b> <a href="ihighlights__cpp__impl_8h_source.html#l00062">ihighlights_cpp_impl.h:62</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_highlights_impl_html"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights_impl.html">GfeSDK::HighlightsImpl</a></div><div class="ttdef"><b>Definition:</b> <a href="ihighlights__cpp__impl_8h_source.html#l00026">ihighlights_cpp_impl.h:26</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_get_number_of_highlights_response_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_get_number_of_highlights_response.html">GfeSDK::GetNumberOfHighlightsResponse</a></div><div class="ttdoc">C++ binding for NVGSDK_GetNumberOfHighlightsResponse. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00097">highlights_types_cpp.h:97</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_ac526b90af6638fec62174304aa175da1"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#ac526b90af6638fec62174304aa175da1">NVGSDK_VideoHighlightParams::startDelta</a></div><div class="ttdeci">int32_t startDelta</div><div class="ttdoc">Milliseconds between the time of request, and the start of desired video clip. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00080">highlights_types.h:80</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___video_highlight_params_html_ac526b90af6638fec62174304aa175da1"><div class="ttname"><a href="struct_n_v_g_s_d_k___video_highlight_params.html#ac526b90af6638fec62174304aa175da1">NVGSDK_VideoHighlightParams::startDelta</a></div><div class="ttdeci">int32_t startDelta</div><div class="ttdoc">Milliseconds between the time of request, and the start of desired video clip. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00082">highlights_types.h:82</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_core_html"><div class="ttname"><a href="class_gfe_s_d_k_1_1_core.html">GfeSDK::Core</a></div><div class="ttdef"><b>Definition:</b> <a href="isdk__cpp_8h_source.html#l00037">isdk_cpp.h:37</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html_a7a3c123385683c40bd3a891e7af268bb"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a7a3c123385683c40bd3a891e7af268bb">NVGSDK_HighlightOpenGroupParams::groupDescriptionTableSize</a></div><div class="ttdeci">size_t groupDescriptionTableSize</div><div class="ttdoc">Number of entries in the groupDescriptionTable */. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00057">highlights_types.h:57</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_acd4b8ee94ed3a76bd9b6e7e8afe355a2"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">NVGSDK_GroupView::tagsFilter</a></div><div class="ttdeci">NVGSDK_HighlightType tagsFilter</div><div class="ttdoc">If not zero, represents a bitfield of tags to include. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00088">highlights_types.h:88</a></div></div>
-<div class="ttc" id="class_gfe_s_d_k_1_1_highlights_impl_html_ac6238d6e68d8b3ed07c2753f35ea8040"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040">GfeSDK::HighlightsImpl::GetUserSettingsAsync</a></div><div class="ttdeci">virtual void GetUserSettingsAsync(TGetUserSettingsCallback cb=nullptr, void *cbContext=nullptr) const</div><div class="ttdef"><b>Definition:</b> <a href="ihighlights__cpp__impl_8h_source.html#l00092">ihighlights_cpp_impl.h:92</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___group_view_html_acd4b8ee94ed3a76bd9b6e7e8afe355a2"><div class="ttname"><a href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">NVGSDK_GroupView::tagsFilter</a></div><div class="ttdeci">NVGSDK_HighlightType tagsFilter</div><div class="ttdoc">If not zero, represents a bitfield of tags to include. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00090">highlights_types.h:90</a></div></div>
 <div class="ttc" id="namespace_gfe_s_d_k_html"><div class="ttname"><a href="namespace_gfe_s_d_k.html">GfeSDK</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00016">highlights_types_cpp.h:16</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlights___number_of_highlights_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00112">highlights_types.h:112</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html_a3e9f6351540609fc3e853d5a16188da2"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">NVGSDK_HighlightOpenGroupParams::groupId</a></div><div class="ttdeci">char const  * groupId</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00053">highlights_types.h:53</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlights___number_of_highlights_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00114">highlights_types.h:114</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlight_open_group_params_html_a3e9f6351540609fc3e853d5a16188da2"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">NVGSDK_HighlightOpenGroupParams::groupId</a></div><div class="ttdeci">char const * groupId</div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00053">highlights_types.h:53</a></div></div>
 <div class="ttc" id="ihighlights_8h_html_ac6ee1cb402b4476571a79050f61bcd92"><div class="ttname"><a href="ihighlights_8h.html#ac6ee1cb402b4476571a79050f61bcd92">NVGSDK_Highlights_OpenSummaryAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_Highlights_OpenSummaryAsync(NVGSDK_HANDLE *handle, NVGSDK_SummaryParams const *params, NVGSDK_EmptyCallback callback, void *context)</div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlight_close_group_params_html_a6f1e0e8a5399e868588a83e1c81ad9c3"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">NVGSDK_HighlightCloseGroupParams::groupId</a></div><div class="ttdeci">char const  * groupId</div><div class="ttdoc">Unique group ID that was used to Open a group previously. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00063">highlights_types.h:63</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00069">highlights_types.h:69</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___highlights___user_settings_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00103">highlights_types.h:103</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlight_close_group_params_html_a6f1e0e8a5399e868588a83e1c81ad9c3"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">NVGSDK_HighlightCloseGroupParams::groupId</a></div><div class="ttdeci">char const * groupId</div><div class="ttdoc">Unique group ID that was used to Open a group previously. </div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00063">highlights_types.h:63</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___screenshot_highlight_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00071">highlights_types.h:71</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___highlights___user_settings_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types_8h_source.html#l00105">highlights_types.h:105</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_highlights_html"><div class="ttname"><a href="class_gfe_s_d_k_1_1_highlights.html">GfeSDK::Highlights</a></div><div class="ttdef"><b>Definition:</b> <a href="ihighlights__cpp_8h_source.html#l00028">ihighlights_cpp.h:28</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
@@ -153,7 +178,7 @@ $(document).ready(function(){initNavTree('ihighlights__cpp__impl_8h_source.html'
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li><li class="navelem"><a class="el" href="dir_9e1fb0299a0600dff10179bfe2b8a156.html">highlights</a></li><li class="navelem"><a class="el" href="ihighlights__cpp__impl_8h.html">ihighlights_cpp_impl.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/index.html b/doc/html/index.html
index 20a22de..96dfa80 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Development Guide</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,34 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li class="current"><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -123,7 +142,7 @@ $(document).ready(function(){initNavTree('index.html','');});
 Highlights Permission</div></div>
 <p> The async callback will be triggered as soon as the message is processed by the GFE backend. The user will be able to accept, deny, or defer the request. If the user accepts or denies the request, the app will recieve a <a class="el" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115">NVGSDK_NOTIFICATION_PERMISSIONS_CHANGED</a> notification with the results. If <a class="el" href="isdk_8h.html#a3e4b6afcafe9ac91c00a95b7d72305e5">NVGSDK_RequestPermissionsAsync</a> is called again when the permission is already granted or denied, the overlay will not be displayed a second time. The user can reverse their decision in either case later on in GFE3 on the games details page.</p>
 <p>Most of the calls to GfeSDK are asynchronous. This is due to the client/server architecture described in <a class="el" href="index.html#section_concepts">Concepts</a>. For each asynchronous call, a callback and an opaque void* context are passed in as arguments. If the app does not care or desire to know what happens to the call, is it fine to pass in NULL. If the app does care, supply a callback of the proper type, and optionally a pointer as a context to receive back during the callback.</p>
-<p>The callbacks are properly typed. For callbacks that return nothing but the return value and context, a <a class="el" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> is passed in. For versions that do return data, a typed callback is passed in, such as <a class="el" href="sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e">NVGSDK_GetUILanguageCallback</a>.</p>
+<p>The callbacks are properly typed. For callbacks that return nothing but the return value and context, a <a class="el" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> is passed in. For versions that do return data, a typed callback is passed in, such as <a class="el" href="sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a">NVGSDK_GetUILanguageCallback</a>.</p>
 <p>The callback will be called on one of three threads, depending on the situation. If <a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#a0bd7568c1cb3fad975562055b4581195" title="Set to true to poll for asynchronous callbacks on an app thread. If false, callbacks will occur on a ...">NVGSDK_CreateInputParams::pollForCallbacks</a> is set to false during creation, the callback will always occur on a GfeSDK controller thread. If the app desires callback to occur on their own thread, true is passed in instead. In that case, the callback will occur on the thread that calls <a class="el" href="isdk_8h.html#af5beaa7808f8dfc4660f5a0d4f8bccb3">NVGSDK_Poll</a>. The exception is that during NVGSDK_Destroy, GfeSDK pushes out all remaining callbacks. If the app is awaiting any callbacks during this time, they will be called on the same thread that called NVGSDK_Destroy. Usually, this will be the same thread that calls NVGSDK_Poll, so it shouldn't cause any surprises, but it's something to be aware of. See <a class="el" href="index.html#section_threading">Threading</a> for more information</p>
 <div class="fragment"></div><!-- fragment --><div class="fragment"></div><!-- fragment --><p> <b>Note:</b> There is currently a limitation in the GfeSDK backend that depends on game frames being rendered during certain API calls. Therefore, the game cannot block the render loop while awaiting an asynchronous callback. Doing so will result in a deadlock.</p>
 <p>In addition to the async callbacks that most of the APIs accept as an argument, the app can also register to recieve unsolicited notifications when certain events occur. For example, the app might want to know when the user can given / removed permission for recording video from the app, either through the permissions dialog, or via GFE3. See <a class="el" href="struct_n_v_g_s_d_k___create_input_params.html">NVGSDK_CreateInputParams</a> and <a class="el" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59">NVGSDK_NotificationType</a></p>
@@ -155,7 +174,7 @@ In Game Overlay</div></div>
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/isdk_8h.html b/doc/html/isdk_8h.html
index 9e89b5b..b8a2b75 100644
--- a/doc/html/isdk_8h.html
+++ b/doc/html/isdk_8h.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/isdk.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -92,29 +117,6 @@ $(document).ready(function(){initNavTree('isdk_8h.html','');});
 <code>#include &lt;gfesdk/sdk_types_ipc.h&gt;</code><br />
 <code>#include &lt;gfesdk/config.h&gt;</code><br />
 <code>#include &quot;stdint.h&quot;</code><br />
-</div><div class="textblock"><div class="dynheader">
-Include dependency graph for isdk.h:</div>
-<div class="dyncontent">
-<div class="center"><img src="isdk_8h__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2isdk_8h" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2isdk_8h" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2isdk_8h">
-<area shape="rect" id="node2" href="os__defines_8h_source.html" title="gfesdk/os_defines.h" alt="" coords="5,184,143,211"/>
-<area shape="rect" id="node3" href="sdk__types_8h.html" title="gfesdk/sdk_types.h" alt="" coords="205,109,340,136"/>
-<area shape="rect" id="node6" href="sdk__types__ipc_8h_source.html" title="gfesdk/sdk_types_ipc.h" alt="" coords="308,184,467,211"/>
-<area shape="rect" id="node8" href="config_8h_source.html" title="gfesdk/config.h" alt="" coords="471,109,581,136"/>
-<area shape="rect" id="node9" href="gfe3__product__version_8h_source.html" title="gfe3_product_version.h" alt="" coords="491,184,646,211"/>
-</map>
-</div>
-</div><div class="textblock"><div class="dynheader">
-This graph shows which files directly or indirectly include this file:</div>
-<div class="dyncontent">
-<div class="center"><img src="isdk_8h__dep__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2isdk_8hdep" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2isdk_8hdep" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2isdk_8hdep">
-<area shape="rect" id="node2" href="isdk__cpp_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/isdk_cpp.h" alt="" coords="132,109,293,180"/>
-<area shape="rect" id="node3" href="ihighlights__cpp_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights_cpp.h" alt="" coords="5,228,212,299"/>
-<area shape="rect" id="node5" href="isdk__cpp__impl_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/isdk_cpp_impl.h" alt="" coords="236,228,397,299"/>
-<area shape="rect" id="node4" href="ihighlights__cpp__impl_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights\l_cpp_impl.h" alt="" coords="129,347,297,432"/>
-</map>
-</div>
 </div>
 <p><a href="isdk_8h_source.html">Go to the source code of this file.</a></p>
 <table class="memberdecls">
@@ -128,13 +130,13 @@ Functions</h2></td></tr>
 <tr class="separator:af5beaa7808f8dfc4660f5a0d4f8bccb3"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a823df4f563527040a016bab8298869c5"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="isdk_8h.html#a823df4f563527040a016bab8298869c5">NVGSDK_SetLogLevel</a> (<a class="el" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> fileLevel)</td></tr>
 <tr class="separator:a823df4f563527040a016bab8298869c5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afc7b2b775f0ffaf80b2b5a988c4d6d11"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="isdk_8h.html#afc7b2b775f0ffaf80b2b5a988c4d6d11">NVGSDK_AttachLogListener</a> (<a class="el" href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">NVGSDK_LoggingCallback</a> callback)</td></tr>
+<tr class="memitem:afc7b2b775f0ffaf80b2b5a988c4d6d11"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="isdk_8h.html#afc7b2b775f0ffaf80b2b5a988c4d6d11">NVGSDK_AttachLogListener</a> (<a class="el" href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">NVGSDK_LoggingCallback</a> callback)</td></tr>
 <tr class="separator:afc7b2b775f0ffaf80b2b5a988c4d6d11"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a742af01ab93d41b3aa9579df90c6c00f"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="isdk_8h.html#a742af01ab93d41b3aa9579df90c6c00f">NVGSDK_SetListenerLogLevel</a> (<a class="el" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level)</td></tr>
 <tr class="separator:a742af01ab93d41b3aa9579df90c6c00f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a3e4b6afcafe9ac91c00a95b7d72305e5"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT void NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="isdk_8h.html#a3e4b6afcafe9ac91c00a95b7d72305e5">NVGSDK_RequestPermissionsAsync</a> (NVGSDK_HANDLE *handle, <a class="el" href="struct_n_v_g_s_d_k___request_permissions_params.html">NVGSDK_RequestPermissionsParams</a> const *params, <a class="el" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, void *context)</td></tr>
 <tr class="separator:a3e4b6afcafe9ac91c00a95b7d72305e5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a30ed8fc1b0066f8eae9078ab65b136de"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT void NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="isdk_8h.html#a30ed8fc1b0066f8eae9078ab65b136de">NVGSDK_GetUILanguageAsync</a> (NVGSDK_HANDLE *handle, <a class="el" href="sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e">NVGSDK_GetUILanguageCallback</a> callback, void *context)</td></tr>
+<tr class="memitem:a30ed8fc1b0066f8eae9078ab65b136de"><td class="memItemLeft" align="right" valign="top">NVGSDK_EXPORT void NVGSDKApi&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="isdk_8h.html#a30ed8fc1b0066f8eae9078ab65b136de">NVGSDK_GetUILanguageAsync</a> (NVGSDK_HANDLE *handle, <a class="el" href="sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a">NVGSDK_GetUILanguageCallback</a> callback, void *context)</td></tr>
 <tr class="separator:a30ed8fc1b0066f8eae9078ab65b136de"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
@@ -142,9 +144,7 @@ Functions</h2></td></tr>
 
 <p>Definition in file <a class="el" href="isdk_8h_source.html">isdk.h</a>.</p>
 </div><h2 class="groupheader">Function Documentation</h2>
-<a id="a95b3999b5808922e29a36375c22014b8"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a95b3999b5808922e29a36375c22014b8">&sect;&nbsp;</a></span>NVGSDK_Create()</h2>
-
+<a class="anchor" id="a95b3999b5808922e29a36375c22014b8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -203,9 +203,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="ab63d1f433313209b1febbf5736b61463"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ab63d1f433313209b1febbf5736b61463">&sect;&nbsp;</a></span>NVGSDK_Release()</h2>
-
+<a class="anchor" id="ab63d1f433313209b1febbf5736b61463"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -236,9 +234,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="af5beaa7808f8dfc4660f5a0d4f8bccb3"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#af5beaa7808f8dfc4660f5a0d4f8bccb3">&sect;&nbsp;</a></span>NVGSDK_Poll()</h2>
-
+<a class="anchor" id="af5beaa7808f8dfc4660f5a0d4f8bccb3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -261,9 +257,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="a823df4f563527040a016bab8298869c5"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a823df4f563527040a016bab8298869c5">&sect;&nbsp;</a></span>NVGSDK_SetLogLevel()</h2>
-
+<a class="anchor" id="a823df4f563527040a016bab8298869c5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -286,16 +280,14 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="afc7b2b775f0ffaf80b2b5a988c4d6d11"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#afc7b2b775f0ffaf80b2b5a988c4d6d11">&sect;&nbsp;</a></span>NVGSDK_AttachLogListener()</h2>
-
+<a class="anchor" id="afc7b2b775f0ffaf80b2b5a988c4d6d11"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi NVGSDK_AttachLogListener </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">NVGSDK_LoggingCallback</a>&#160;</td>
+          <td class="paramtype"><a class="el" href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">NVGSDK_LoggingCallback</a>&#160;</td>
           <td class="paramname"><em>callback</em></td><td>)</td>
           <td></td>
         </tr>
@@ -311,9 +303,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="a742af01ab93d41b3aa9579df90c6c00f"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a742af01ab93d41b3aa9579df90c6c00f">&sect;&nbsp;</a></span>NVGSDK_SetListenerLogLevel()</h2>
-
+<a class="anchor" id="a742af01ab93d41b3aa9579df90c6c00f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -337,9 +327,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="a3e4b6afcafe9ac91c00a95b7d72305e5"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a3e4b6afcafe9ac91c00a95b7d72305e5">&sect;&nbsp;</a></span>NVGSDK_RequestPermissionsAsync()</h2>
-
+<a class="anchor" id="a3e4b6afcafe9ac91c00a95b7d72305e5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -386,9 +374,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="a30ed8fc1b0066f8eae9078ab65b136de"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a30ed8fc1b0066f8eae9078ab65b136de">&sect;&nbsp;</a></span>NVGSDK_GetUILanguageAsync()</h2>
-
+<a class="anchor" id="a30ed8fc1b0066f8eae9078ab65b136de"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -401,7 +387,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e">NVGSDK_GetUILanguageCallback</a>&#160;</td>
+          <td class="paramtype"><a class="el" href="sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a">NVGSDK_GetUILanguageCallback</a>&#160;</td>
           <td class="paramname"><em>callback</em>, </td>
         </tr>
         <tr>
@@ -448,7 +434,7 @@ Functions</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="isdk_8h.html">isdk.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/isdk_8h_source.html b/doc/html/isdk_8h_source.html
index 7ba05de..70342cd 100644
--- a/doc/html/isdk_8h_source.html
+++ b/doc/html/isdk_8h_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/isdk.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,13 +110,13 @@ $(document).ready(function(){initNavTree('isdk_8h_source.html','');});
 <div class="title">isdk.h</div>  </div>
 </div><!--header-->
 <div class="contents">
-<a href="isdk_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment"> * NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment"> * and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> * and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifndef GFESDK_ISDK_H</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define GFESDK_ISDK_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">extern</span> <span class="stringliteral">&quot;C&quot;</span> {</div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &lt;gfesdk/os_defines.h&gt;</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="sdk__types_8h.html">gfesdk/sdk_types.h</a>&gt;</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor">#include &lt;gfesdk/sdk_types_ipc.h&gt;</span></div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &lt;gfesdk/config.h&gt;</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="preprocessor">#include &quot;stdint.h&quot;</span></div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div><div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#a95b3999b5808922e29a36375c22014b8">NVGSDK_Create</a>(NVGSDK_HANDLE** handle, <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html">NVGSDK_CreateInputParams</a> <span class="keyword">const</span>* inParams, <a class="code" href="struct_n_v_g_s_d_k___create_response.html">NVGSDK_CreateResponse</a>* outParams);</div><div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;</div><div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#ab63d1f433313209b1febbf5736b61463">NVGSDK_Release</a>(NVGSDK_HANDLE* handle);</div><div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;</div><div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#af5beaa7808f8dfc4660f5a0d4f8bccb3">NVGSDK_Poll</a>(NVGSDK_HANDLE* handle);</div><div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;</div><div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#a823df4f563527040a016bab8298869c5">NVGSDK_SetLogLevel</a>(<a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> fileLevel);</div><div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;</div><div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#afc7b2b775f0ffaf80b2b5a988c4d6d11">NVGSDK_AttachLogListener</a>(<a class="code" href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">NVGSDK_LoggingCallback</a> callback);</div><div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;</div><div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#a742af01ab93d41b3aa9579df90c6c00f">NVGSDK_SetListenerLogLevel</a>(<a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level);</div><div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;</div><div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi <a class="code" href="isdk_8h.html#a3e4b6afcafe9ac91c00a95b7d72305e5">NVGSDK_RequestPermissionsAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___request_permissions_params.html">NVGSDK_RequestPermissionsParams</a> <span class="keyword">const</span>* params, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div><div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi <a class="code" href="isdk_8h.html#a30ed8fc1b0066f8eae9078ab65b136de">NVGSDK_GetUILanguageAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e">NVGSDK_GetUILanguageCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;</div><div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;}</div><div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;</div><div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;<span class="preprocessor">#endif // GFESDK_ISDK_H</span></div><div class="ttc" id="isdk_8h_html_af5beaa7808f8dfc4660f5a0d4f8bccb3"><div class="ttname"><a href="isdk_8h.html#af5beaa7808f8dfc4660f5a0d4f8bccb3">NVGSDK_Poll</a></div><div class="ttdeci">NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi NVGSDK_Poll(NVGSDK_HANDLE *handle)</div></div>
-<div class="ttc" id="sdk__types_8h_html_a25a1eb6d5c4697e50ebdebb500d0500e"><div class="ttname"><a href="sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e">NVGSDK_GetUILanguageCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_GetUILanguageCallback)(NVGSDK_RetCode, NVGSDK_Language const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00146">sdk_types.h:146</a></div></div>
+<a href="isdk_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment"> * NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment"> * and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> * and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifndef GFESDK_ISDK_H</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define GFESDK_ISDK_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">extern</span> <span class="stringliteral">&quot;C&quot;</span> {</div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &lt;gfesdk/os_defines.h&gt;</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="sdk__types_8h.html">gfesdk/sdk_types.h</a>&gt;</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor">#include &lt;gfesdk/sdk_types_ipc.h&gt;</span></div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &lt;gfesdk/config.h&gt;</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="preprocessor">#include &quot;stdint.h&quot;</span></div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div><div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#a95b3999b5808922e29a36375c22014b8">NVGSDK_Create</a>(NVGSDK_HANDLE** handle, <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html">NVGSDK_CreateInputParams</a> <span class="keyword">const</span>* inParams, <a class="code" href="struct_n_v_g_s_d_k___create_response.html">NVGSDK_CreateResponse</a>* outParams);</div><div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;</div><div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#ab63d1f433313209b1febbf5736b61463">NVGSDK_Release</a>(NVGSDK_HANDLE* handle);</div><div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;</div><div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#af5beaa7808f8dfc4660f5a0d4f8bccb3">NVGSDK_Poll</a>(NVGSDK_HANDLE* handle);</div><div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;</div><div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#a823df4f563527040a016bab8298869c5">NVGSDK_SetLogLevel</a>(<a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> fileLevel);</div><div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;</div><div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#afc7b2b775f0ffaf80b2b5a988c4d6d11">NVGSDK_AttachLogListener</a>(<a class="code" href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">NVGSDK_LoggingCallback</a> callback);</div><div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;</div><div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi <a class="code" href="isdk_8h.html#a742af01ab93d41b3aa9579df90c6c00f">NVGSDK_SetListenerLogLevel</a>(<a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level);</div><div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;</div><div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi <a class="code" href="isdk_8h.html#a3e4b6afcafe9ac91c00a95b7d72305e5">NVGSDK_RequestPermissionsAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="struct_n_v_g_s_d_k___request_permissions_params.html">NVGSDK_RequestPermissionsParams</a> <span class="keyword">const</span>* params, <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div><div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;NVGSDK_EXPORT <span class="keywordtype">void</span> NVGSDKApi <a class="code" href="isdk_8h.html#a30ed8fc1b0066f8eae9078ab65b136de">NVGSDK_GetUILanguageAsync</a>(NVGSDK_HANDLE* handle, <a class="code" href="sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a">NVGSDK_GetUILanguageCallback</a> callback, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;</div><div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;}</div><div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;</div><div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;<span class="preprocessor">#endif // GFESDK_ISDK_H</span></div><div class="ttc" id="isdk_8h_html_af5beaa7808f8dfc4660f5a0d4f8bccb3"><div class="ttname"><a href="isdk_8h.html#af5beaa7808f8dfc4660f5a0d4f8bccb3">NVGSDK_Poll</a></div><div class="ttdeci">NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi NVGSDK_Poll(NVGSDK_HANDLE *handle)</div></div>
 <div class="ttc" id="isdk_8h_html_afc7b2b775f0ffaf80b2b5a988c4d6d11"><div class="ttname"><a href="isdk_8h.html#afc7b2b775f0ffaf80b2b5a988c4d6d11">NVGSDK_AttachLogListener</a></div><div class="ttdeci">NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi NVGSDK_AttachLogListener(NVGSDK_LoggingCallback callback)</div></div>
+<div class="ttc" id="sdk__types_8h_html_aa327c1a78bd452bd8edbcad7a4e4d86a"><div class="ttname"><a href="sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a">NVGSDK_GetUILanguageCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_GetUILanguageCallback)(NVGSDK_RetCode, NVGSDK_Language const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00146">sdk_types.h:146</a></div></div>
 <div class="ttc" id="isdk_8h_html_a3e4b6afcafe9ac91c00a95b7d72305e5"><div class="ttname"><a href="isdk_8h.html#a3e4b6afcafe9ac91c00a95b7d72305e5">NVGSDK_RequestPermissionsAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_RequestPermissionsAsync(NVGSDK_HANDLE *handle, NVGSDK_RequestPermissionsParams const *params, NVGSDK_EmptyCallback callback, void *context)</div></div>
 <div class="ttc" id="isdk_8h_html_ab63d1f433313209b1febbf5736b61463"><div class="ttname"><a href="isdk_8h.html#ab63d1f433313209b1febbf5736b61463">NVGSDK_Release</a></div><div class="ttdeci">NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi NVGSDK_Release(NVGSDK_HANDLE *handle)</div></div>
+<div class="ttc" id="sdk__types_8h_html_ab13929e496dd1748a31088399519252a"><div class="ttname"><a href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">NVGSDK_LoggingCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_LoggingCallback)(NVGSDK_LogLevel level, char const *message)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00058">sdk_types.h:58</a></div></div>
 <div class="ttc" id="sdk__types_8h_html_a1c5cd84ed88c70462c360a7268eb95ac"><div class="ttname"><a href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_EmptyCallback)(NVGSDK_RetCode, void *)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00138">sdk_types.h:138</a></div></div>
-<div class="ttc" id="sdk__types_8h_html_afdec7c9f24e19fb84c5faf34d77e9312"><div class="ttname"><a href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">NVGSDK_LoggingCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_LoggingCallback)(NVGSDK_LogLevel level, char const *message)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00058">sdk_types.h:58</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___request_permissions_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___request_permissions_params.html">NVGSDK_RequestPermissionsParams</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00120">sdk_types.h:120</a></div></div>
 <div class="ttc" id="isdk_8h_html_a30ed8fc1b0066f8eae9078ab65b136de"><div class="ttname"><a href="isdk_8h.html#a30ed8fc1b0066f8eae9078ab65b136de">NVGSDK_GetUILanguageAsync</a></div><div class="ttdeci">NVGSDK_EXPORT void NVGSDKApi NVGSDK_GetUILanguageAsync(NVGSDK_HANDLE *handle, NVGSDK_GetUILanguageCallback callback, void *context)</div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_response_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_response.html">NVGSDK_CreateResponse</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00129">sdk_types.h:129</a></div></div>
@@ -110,7 +135,7 @@ $(document).ready(function(){initNavTree('isdk_8h_source.html','');});
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="isdk_8h.html">isdk.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/isdk__cpp_8h.html b/doc/html/isdk__cpp_8h.html
index 7a329df..2433b6c 100644
--- a/doc/html/isdk__cpp_8h.html
+++ b/doc/html/isdk__cpp_8h.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/isdk_cpp.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,30 +115,6 @@ $(document).ready(function(){initNavTree('isdk__cpp_8h.html','');});
 <div class="contents">
 <div class="textblock"><code>#include &quot;sdk_types_cpp.h&quot;</code><br />
 <code>#include &lt;<a class="el" href="isdk_8h_source.html">gfesdk/isdk.h</a>&gt;</code><br />
-</div><div class="textblock"><div class="dynheader">
-Include dependency graph for isdk_cpp.h:</div>
-<div class="dyncontent">
-<div class="center"><img src="isdk__cpp_8h__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp_8h" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp_8h" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp_8h">
-<area shape="rect" id="node2" href="sdk__types__cpp_8h_source.html" title="sdk_types_cpp.h" alt="" coords="694,124,815,151"/>
-<area shape="rect" id="node13" href="isdk_8h.html" title="gfesdk/isdk.h" alt="" coords="385,124,484,151"/>
-<area shape="rect" id="node6" href="sdk__types_8h.html" title="gfesdk/sdk_types.h" alt="" coords="315,199,450,225"/>
-<area shape="rect" id="node7" href="os__defines_8h_source.html" title="gfesdk/os_defines.h" alt="" coords="185,273,322,300"/>
-<area shape="rect" id="node8" href="sdk__types__ipc_8h_source.html" title="gfesdk/sdk_types_ipc.h" alt="" coords="398,273,557,300"/>
-<area shape="rect" id="node14" href="config_8h_source.html" title="gfesdk/config.h" alt="" coords="80,199,189,225"/>
-<area shape="rect" id="node15" href="gfe3__product__version_8h_source.html" title="gfe3_product_version.h" alt="" coords="5,273,160,300"/>
-</map>
-</div>
-</div><div class="textblock"><div class="dynheader">
-This graph shows which files directly or indirectly include this file:</div>
-<div class="dyncontent">
-<div class="center"><img src="isdk__cpp_8h__dep__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp_8hdep" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp_8hdep" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp_8hdep">
-<area shape="rect" id="node2" href="ihighlights__cpp_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights_cpp.h" alt="" coords="5,124,212,195"/>
-<area shape="rect" id="node4" href="isdk__cpp__impl_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/isdk_cpp_impl.h" alt="" coords="236,124,397,195"/>
-<area shape="rect" id="node3" href="ihighlights__cpp__impl_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights\l_cpp_impl.h" alt="" coords="129,243,297,328"/>
-</map>
-</div>
 </div>
 <p><a href="isdk__cpp_8h_source.html">Go to the source code of this file.</a></p>
 <table class="memberdecls">
@@ -126,7 +127,7 @@ Classes</h2></td></tr>
 Functions</h2></td></tr>
 <tr class="memitem:aca57904e581afc0d04f28ad2cc48fa51"><td class="memItemLeft" align="right" valign="top">NVGSDK_RetCode&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="isdk__cpp_8h.html#aca57904e581afc0d04f28ad2cc48fa51">GfeSDK::SetFileLogLevel</a> (<a class="el" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level)</td></tr>
 <tr class="separator:aca57904e581afc0d04f28ad2cc48fa51"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:af7f1de849500cddff35ca621325d41d9"><td class="memItemLeft" align="right" valign="top">NVGSDK_RetCode&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="isdk__cpp_8h.html#af7f1de849500cddff35ca621325d41d9">GfeSDK::AttachLogListener</a> (<a class="el" href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">NVGSDK_LoggingCallback</a> callback)</td></tr>
+<tr class="memitem:af7f1de849500cddff35ca621325d41d9"><td class="memItemLeft" align="right" valign="top">NVGSDK_RetCode&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="isdk__cpp_8h.html#af7f1de849500cddff35ca621325d41d9">GfeSDK::AttachLogListener</a> (<a class="el" href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">NVGSDK_LoggingCallback</a> callback)</td></tr>
 <tr class="separator:af7f1de849500cddff35ca621325d41d9"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a9f469173f8579e97de20cfa4d929476d"><td class="memItemLeft" align="right" valign="top">NVGSDK_RetCode&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="isdk__cpp_8h.html#a9f469173f8579e97de20cfa4d929476d">GfeSDK::SetListenerLogLevel</a> (<a class="el" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level)</td></tr>
 <tr class="separator:a9f469173f8579e97de20cfa4d929476d"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -138,9 +139,7 @@ Functions</h2></td></tr>
 
 <p>Definition in file <a class="el" href="isdk__cpp_8h_source.html">isdk_cpp.h</a>.</p>
 </div><h2 class="groupheader">Function Documentation</h2>
-<a id="file_aca57904e581afc0d04f28ad2cc48fa51"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#file_aca57904e581afc0d04f28ad2cc48fa51">&sect;&nbsp;</a></span>SetFileLogLevel()</h2>
-
+<a class="anchor" id="file_aca57904e581afc0d04f28ad2cc48fa51"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -167,9 +166,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="file_af7f1de849500cddff35ca621325d41d9"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#file_af7f1de849500cddff35ca621325d41d9">&sect;&nbsp;</a></span>AttachLogListener()</h2>
-
+<a class="anchor" id="file_af7f1de849500cddff35ca621325d41d9"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -179,7 +176,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="memname">NVGSDK_RetCode GfeSDK::AttachLogListener </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">NVGSDK_LoggingCallback</a>&#160;</td>
+          <td class="paramtype"><a class="el" href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">NVGSDK_LoggingCallback</a>&#160;</td>
           <td class="paramname"><em>callback</em></td><td>)</td>
           <td></td>
         </tr>
@@ -196,9 +193,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="file_a9f469173f8579e97de20cfa4d929476d"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#file_a9f469173f8579e97de20cfa4d929476d">&sect;&nbsp;</a></span>SetListenerLogLevel()</h2>
-
+<a class="anchor" id="file_a9f469173f8579e97de20cfa4d929476d"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -225,9 +220,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a id="file_affb721d409d4d0153c8e6b7d0fdce243"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#file_affb721d409d4d0153c8e6b7d0fdce243">&sect;&nbsp;</a></span>RetCodeToString()</h2>
-
+<a class="anchor" id="file_affb721d409d4d0153c8e6b7d0fdce243"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -263,7 +256,7 @@ Functions</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li><li class="navelem"><a class="el" href="isdk__cpp_8h.html">isdk_cpp.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/isdk__cpp_8h_source.html b/doc/html/isdk__cpp_8h_source.html
index 0b1d6a6..c440db4 100644
--- a/doc/html/isdk__cpp_8h_source.html
+++ b/doc/html/isdk__cpp_8h_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/isdk_cpp.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,7 +110,7 @@ $(document).ready(function(){initNavTree('isdk__cpp_8h_source.html','');});
 <div class="title">isdk_cpp.h</div>  </div>
 </div><!--header-->
 <div class="contents">
-<a href="isdk__cpp_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">*</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">* NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">* and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">* and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">* distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">* license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">*/</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifndef GFESDK_ISDK_CPP_H</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define GFESDK_ISDK_CPP_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;sdk_types_cpp.h&quot;</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;</div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespace_gfe_s_d_k.html">GfeSDK</a></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;{</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment">// Avoid polluting global namespace with C api, so put it inside namespace</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="isdk_8h.html">gfesdk/isdk.h</a>&gt;</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="comment">// Static functions that don&#39;t depend on an instance of the SDK</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="comment">// Giving an alias to these to remove the NVGSDK_ prefix in lieu of the namespace</span></div><div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="isdk__cpp_8h.html#aca57904e581afc0d04f28ad2cc48fa51">   28</a></span>&#160;<span class="comment"></span><span class="keyword">inline</span> NVGSDK_RetCode <a class="code" href="isdk__cpp_8h.html#aca57904e581afc0d04f28ad2cc48fa51">SetFileLogLevel</a>(<a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level) { <span class="keywordflow">return</span> <a class="code" href="isdk_8h.html#a823df4f563527040a016bab8298869c5">NVGSDK_SetLogLevel</a>(level); }</div><div class="line"><a name="l00030"></a><span class="lineno"><a class="line" href="isdk__cpp_8h.html#af7f1de849500cddff35ca621325d41d9">   30</a></span>&#160;<span class="keyword">inline</span> NVGSDK_RetCode <a class="code" href="isdk__cpp_8h.html#af7f1de849500cddff35ca621325d41d9">AttachLogListener</a>(<a class="code" href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">NVGSDK_LoggingCallback</a> callback) { <span class="keywordflow">return</span> <a class="code" href="isdk_8h.html#afc7b2b775f0ffaf80b2b5a988c4d6d11">NVGSDK_AttachLogListener</a>(callback); }</div><div class="line"><a name="l00032"></a><span class="lineno"><a class="line" href="isdk__cpp_8h.html#a9f469173f8579e97de20cfa4d929476d">   32</a></span>&#160;<span class="keyword">inline</span> NVGSDK_RetCode <a class="code" href="isdk__cpp_8h.html#a9f469173f8579e97de20cfa4d929476d">SetListenerLogLevel</a>(<a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level) { <span class="keywordflow">return</span> <a class="code" href="isdk_8h.html#a742af01ab93d41b3aa9579df90c6c00f">NVGSDK_SetListenerLogLevel</a>(level); }</div><div class="line"><a name="l00034"></a><span class="lineno"><a class="line" href="isdk__cpp_8h.html#affb721d409d4d0153c8e6b7d0fdce243">   34</a></span>&#160;<span class="keyword">inline</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* <a class="code" href="isdk__cpp_8h.html#affb721d409d4d0153c8e6b7d0fdce243">RetCodeToString</a>(NVGSDK_RetCode rc) { <span class="keywordflow">return</span> NVGSDK_RetCodeToString(rc); }</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div><div class="line"><a name="l00037"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_core.html">   37</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a></div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;{</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    <span class="keyword">static</span> <a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a>* <a class="code" href="class_gfe_s_d_k_1_1_core.html#a0cb93acb8b273072cd37348c9b206e0d">Create</a>(<a class="code" href="struct_gfe_s_d_k_1_1_create_input_params.html">CreateInputParams</a> <span class="keyword">const</span>&amp;, <a class="code" href="struct_gfe_s_d_k_1_1_create_response.html">CreateResponse</a>&amp;);</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    <span class="keyword">virtual</span> ~<a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a>() {}</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    <span class="keyword">virtual</span> NVGSDK_RetCode <a class="code" href="class_gfe_s_d_k_1_1_core.html#a4804109b7488f52ce61b0b3d638d30fe">Poll</a>(<span class="keywordtype">void</span>) = 0;</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_core.html#ada940c792737e3fa2c6cc5cda81424b5">RequestPermissionsAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_request_permissions_params.html">RequestPermissionsParams</a> <span class="keyword">const</span>&amp;, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_core.html#ad8edbad0bf465ba656bb99353d4f2122">GetUILanguageAsync</a>(TGetUILanguageCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="comment">// Return the C API handle;</span></div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keyword">virtual</span> NVGSDK_HANDLE* GetHandle() = 0;</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;};</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;}</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;<span class="preprocessor">#endif //GFESDK_ISDK_CPP_H</span></div><div class="ttc" id="class_gfe_s_d_k_1_1_core_html_ad8edbad0bf465ba656bb99353d4f2122"><div class="ttname"><a href="class_gfe_s_d_k_1_1_core.html#ad8edbad0bf465ba656bb99353d4f2122">GfeSDK::Core::GetUILanguageAsync</a></div><div class="ttdeci">virtual void GetUILanguageAsync(TGetUILanguageCallback cb=nullptr, void *cbContext=nullptr)=0</div></div>
+<a href="isdk__cpp_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">*</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">* NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">* and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">* and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">* distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">* license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">*/</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifndef GFESDK_ISDK_CPP_H</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define GFESDK_ISDK_CPP_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;sdk_types_cpp.h&quot;</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;</div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespace_gfe_s_d_k.html">GfeSDK</a></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;{</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment">// Avoid polluting global namespace with C api, so put it inside namespace</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#include &lt;<a class="code" href="isdk_8h.html">gfesdk/isdk.h</a>&gt;</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="comment">// Static functions that don&#39;t depend on an instance of the SDK</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="comment">// Giving an alias to these to remove the NVGSDK_ prefix in lieu of the namespace</span></div><div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="isdk__cpp_8h.html#aca57904e581afc0d04f28ad2cc48fa51">   28</a></span>&#160;<span class="comment"></span><span class="keyword">inline</span> NVGSDK_RetCode <a class="code" href="isdk__cpp_8h.html#aca57904e581afc0d04f28ad2cc48fa51">SetFileLogLevel</a>(<a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level) { <span class="keywordflow">return</span> <a class="code" href="isdk_8h.html#a823df4f563527040a016bab8298869c5">NVGSDK_SetLogLevel</a>(level); }</div><div class="line"><a name="l00030"></a><span class="lineno"><a class="line" href="isdk__cpp_8h.html#af7f1de849500cddff35ca621325d41d9">   30</a></span>&#160;<span class="keyword">inline</span> NVGSDK_RetCode <a class="code" href="isdk__cpp_8h.html#af7f1de849500cddff35ca621325d41d9">AttachLogListener</a>(<a class="code" href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">NVGSDK_LoggingCallback</a> callback) { <span class="keywordflow">return</span> <a class="code" href="isdk_8h.html#afc7b2b775f0ffaf80b2b5a988c4d6d11">NVGSDK_AttachLogListener</a>(callback); }</div><div class="line"><a name="l00032"></a><span class="lineno"><a class="line" href="isdk__cpp_8h.html#a9f469173f8579e97de20cfa4d929476d">   32</a></span>&#160;<span class="keyword">inline</span> NVGSDK_RetCode <a class="code" href="isdk__cpp_8h.html#a9f469173f8579e97de20cfa4d929476d">SetListenerLogLevel</a>(<a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level) { <span class="keywordflow">return</span> <a class="code" href="isdk_8h.html#a742af01ab93d41b3aa9579df90c6c00f">NVGSDK_SetListenerLogLevel</a>(level); }</div><div class="line"><a name="l00034"></a><span class="lineno"><a class="line" href="isdk__cpp_8h.html#affb721d409d4d0153c8e6b7d0fdce243">   34</a></span>&#160;<span class="keyword">inline</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* <a class="code" href="isdk__cpp_8h.html#affb721d409d4d0153c8e6b7d0fdce243">RetCodeToString</a>(NVGSDK_RetCode rc) { <span class="keywordflow">return</span> NVGSDK_RetCodeToString(rc); }</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div><div class="line"><a name="l00037"></a><span class="lineno"><a class="line" href="class_gfe_s_d_k_1_1_core.html">   37</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a></div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;{</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    <span class="keyword">static</span> <a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a>* <a class="code" href="class_gfe_s_d_k_1_1_core.html#a0cb93acb8b273072cd37348c9b206e0d">Create</a>(<a class="code" href="struct_gfe_s_d_k_1_1_create_input_params.html">CreateInputParams</a> <span class="keyword">const</span>&amp;, <a class="code" href="struct_gfe_s_d_k_1_1_create_response.html">CreateResponse</a>&amp;);</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    <span class="keyword">virtual</span> ~<a class="code" href="class_gfe_s_d_k_1_1_core.html">Core</a>() {}</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    <span class="keyword">virtual</span> NVGSDK_RetCode <a class="code" href="class_gfe_s_d_k_1_1_core.html#a4804109b7488f52ce61b0b3d638d30fe">Poll</a>(<span class="keywordtype">void</span>) = 0;</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_core.html#ada940c792737e3fa2c6cc5cda81424b5">RequestPermissionsAsync</a>(<a class="code" href="struct_gfe_s_d_k_1_1_request_permissions_params.html">RequestPermissionsParams</a> <span class="keyword">const</span>&amp;, TCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="class_gfe_s_d_k_1_1_core.html#ad8edbad0bf465ba656bb99353d4f2122">GetUILanguageAsync</a>(TGetUILanguageCallback cb = <span class="keyword">nullptr</span>, <span class="keywordtype">void</span>* cbContext = <span class="keyword">nullptr</span>) = 0;</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="comment">// Return the C API handle;</span></div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keyword">virtual</span> NVGSDK_HANDLE* GetHandle() = 0;</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;};</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;}</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;<span class="preprocessor">#endif //GFESDK_ISDK_CPP_H</span></div><div class="ttc" id="class_gfe_s_d_k_1_1_core_html_ad8edbad0bf465ba656bb99353d4f2122"><div class="ttname"><a href="class_gfe_s_d_k_1_1_core.html#ad8edbad0bf465ba656bb99353d4f2122">GfeSDK::Core::GetUILanguageAsync</a></div><div class="ttdeci">virtual void GetUILanguageAsync(TGetUILanguageCallback cb=nullptr, void *cbContext=nullptr)=0</div></div>
 <div class="ttc" id="isdk__cpp_8h_html_a9f469173f8579e97de20cfa4d929476d"><div class="ttname"><a href="isdk__cpp_8h.html#a9f469173f8579e97de20cfa4d929476d">GfeSDK::SetListenerLogLevel</a></div><div class="ttdeci">NVGSDK_RetCode SetListenerLogLevel(NVGSDK_LogLevel level)</div><div class="ttdef"><b>Definition:</b> <a href="isdk__cpp_8h_source.html#l00032">isdk_cpp.h:32</a></div></div>
 <div class="ttc" id="isdk__cpp_8h_html_affb721d409d4d0153c8e6b7d0fdce243"><div class="ttname"><a href="isdk__cpp_8h.html#affb721d409d4d0153c8e6b7d0fdce243">GfeSDK::RetCodeToString</a></div><div class="ttdeci">const char * RetCodeToString(NVGSDK_RetCode rc)</div><div class="ttdef"><b>Definition:</b> <a href="isdk__cpp_8h_source.html#l00034">isdk_cpp.h:34</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_create_response_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_create_response.html">GfeSDK::CreateResponse</a></div><div class="ttdoc">C++ binding for NVGSDK_CreateResponse. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types__cpp_8h_source.html#l00061">sdk_types_cpp.h:61</a></div></div>
@@ -96,7 +121,7 @@ $(document).ready(function(){initNavTree('isdk__cpp_8h_source.html','');});
 <div class="ttc" id="isdk_8h_html"><div class="ttname"><a href="isdk_8h.html">isdk.h</a></div></div>
 <div class="ttc" id="isdk__cpp_8h_html_aca57904e581afc0d04f28ad2cc48fa51"><div class="ttname"><a href="isdk__cpp_8h.html#aca57904e581afc0d04f28ad2cc48fa51">GfeSDK::SetFileLogLevel</a></div><div class="ttdeci">NVGSDK_RetCode SetFileLogLevel(NVGSDK_LogLevel level)</div><div class="ttdef"><b>Definition:</b> <a href="isdk__cpp_8h_source.html#l00028">isdk_cpp.h:28</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_create_input_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_create_input_params.html">GfeSDK::CreateInputParams</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types__cpp_8h_source.html#l00038">sdk_types_cpp.h:38</a></div></div>
-<div class="ttc" id="sdk__types_8h_html_afdec7c9f24e19fb84c5faf34d77e9312"><div class="ttname"><a href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">NVGSDK_LoggingCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_LoggingCallback)(NVGSDK_LogLevel level, char const *message)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00058">sdk_types.h:58</a></div></div>
+<div class="ttc" id="sdk__types_8h_html_ab13929e496dd1748a31088399519252a"><div class="ttname"><a href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">NVGSDK_LoggingCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_LoggingCallback)(NVGSDK_LogLevel level, char const *message)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00058">sdk_types.h:58</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_core_html"><div class="ttname"><a href="class_gfe_s_d_k_1_1_core.html">GfeSDK::Core</a></div><div class="ttdef"><b>Definition:</b> <a href="isdk__cpp_8h_source.html#l00037">isdk_cpp.h:37</a></div></div>
 <div class="ttc" id="namespace_gfe_s_d_k_html"><div class="ttname"><a href="namespace_gfe_s_d_k.html">GfeSDK</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00016">highlights_types_cpp.h:16</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_core_html_a0cb93acb8b273072cd37348c9b206e0d"><div class="ttname"><a href="class_gfe_s_d_k_1_1_core.html#a0cb93acb8b273072cd37348c9b206e0d">GfeSDK::Core::Create</a></div><div class="ttdeci">static Core * Create(CreateInputParams const &amp;, CreateResponse &amp;)</div><div class="ttdef"><b>Definition:</b> <a href="isdk__cpp__impl_8h_source.html#l00065">isdk_cpp_impl.h:65</a></div></div>
@@ -113,7 +138,7 @@ $(document).ready(function(){initNavTree('isdk__cpp_8h_source.html','');});
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li><li class="navelem"><a class="el" href="isdk__cpp_8h.html">isdk_cpp.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/isdk__cpp__impl_8h.html b/doc/html/isdk__cpp__impl_8h.html
index df257fb..53d6794 100644
--- a/doc/html/isdk__cpp__impl_8h.html
+++ b/doc/html/isdk__cpp__impl_8h.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/isdk_cpp_impl.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -89,29 +114,6 @@ $(document).ready(function(){initNavTree('isdk__cpp__impl_8h.html','');});
 <div class="contents">
 <div class="textblock"><code>#include &quot;<a class="el" href="isdk__cpp_8h_source.html">isdk_cpp.h</a>&quot;</code><br />
 <code>#include &lt;memory&gt;</code><br />
-</div><div class="textblock"><div class="dynheader">
-Include dependency graph for isdk_cpp_impl.h:</div>
-<div class="dyncontent">
-<div class="center"><img src="isdk__cpp__impl_8h__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp__impl_8h" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp__impl_8h" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp__impl_8h">
-<area shape="rect" id="node2" href="isdk__cpp_8h.html" title="isdk_cpp.h" alt="" coords="577,124,663,151"/>
-<area shape="rect" id="node3" href="sdk__types__cpp_8h_source.html" title="sdk_types_cpp.h" alt="" coords="694,199,815,225"/>
-<area shape="rect" id="node14" href="isdk_8h.html" title="gfesdk/isdk.h" alt="" coords="385,199,484,225"/>
-<area shape="rect" id="node7" href="sdk__types_8h.html" title="gfesdk/sdk_types.h" alt="" coords="315,273,450,300"/>
-<area shape="rect" id="node8" href="os__defines_8h_source.html" title="gfesdk/os_defines.h" alt="" coords="185,348,322,375"/>
-<area shape="rect" id="node9" href="sdk__types__ipc_8h_source.html" title="gfesdk/sdk_types_ipc.h" alt="" coords="398,348,557,375"/>
-<area shape="rect" id="node15" href="config_8h_source.html" title="gfesdk/config.h" alt="" coords="80,273,189,300"/>
-<area shape="rect" id="node16" href="gfe3__product__version_8h_source.html" title="gfe3_product_version.h" alt="" coords="5,348,160,375"/>
-</map>
-</div>
-</div><div class="textblock"><div class="dynheader">
-This graph shows which files directly or indirectly include this file:</div>
-<div class="dyncontent">
-<div class="center"><img src="isdk__cpp__impl_8h__dep__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp__impl_8hdep" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp__impl_8hdep" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2bindings_2cpp_2isdk__cpp__impl_8hdep">
-<area shape="rect" id="node2" href="ihighlights__cpp__impl_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights\l_cpp_impl.h" alt="" coords="5,124,173,209"/>
-</map>
-</div>
 </div>
 <p><a href="isdk__cpp__impl_8h_source.html">Go to the source code of this file.</a></p>
 <table class="memberdecls">
@@ -133,7 +135,7 @@ Classes</h2></td></tr>
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li><li class="navelem"><a class="el" href="isdk__cpp__impl_8h.html">isdk_cpp_impl.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/isdk__cpp__impl_8h_source.html b/doc/html/isdk__cpp__impl_8h_source.html
index 941a904..ae6a224 100644
--- a/doc/html/isdk__cpp__impl_8h_source.html
+++ b/doc/html/isdk__cpp__impl_8h_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/isdk_cpp_impl.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -94,7 +119,7 @@ $(document).ready(function(){initNavTree('isdk__cpp__impl_8h_source.html','');})
 <div class="ttc" id="struct_n_v_g_s_d_k___overlay_state_changed_notification_html_af1c76ba9ecc3a9d83147dc4dc8d64ddc"><div class="ttname"><a href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#af1c76ba9ecc3a9d83147dc4dc8d64ddc">NVGSDK_OverlayStateChangedNotification::state</a></div><div class="ttdeci">NVGSDK_OverlayState state</div><div class="ttdoc">State the overlay is closing from or opening to. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00087">sdk_types.h:87</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_create_response_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_create_response.html">GfeSDK::CreateResponse</a></div><div class="ttdoc">C++ binding for NVGSDK_CreateResponse. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types__cpp_8h_source.html#l00061">sdk_types_cpp.h:61</a></div></div>
 <div class="ttc" id="sdk__types_8h_html_a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115"><div class="ttname"><a href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115">NVGSDK_NOTIFICATION_PERMISSIONS_CHANGED</a></div><div class="ttdoc">Sent when the user accepts/denies the permissions dialog, or toggles in GFE3. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00052">sdk_types.h:52</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_ac754df94f208f494a0a339d614bb18f3"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">NVGSDK_CreateInputParams::appName</a></div><div class="ttdeci">char const  * appName</div><div class="ttdoc">Provide the name of the application. Will be used in cases when NVIDIA cannot detect game...</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00105">sdk_types.h:105</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_ac754df94f208f494a0a339d614bb18f3"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">NVGSDK_CreateInputParams::appName</a></div><div class="ttdeci">char const * appName</div><div class="ttdoc">Provide the name of the application. Will be used in cases when NVIDIA cannot detect game...</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00105">sdk_types.h:105</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_ae0ada093d3d60a2f70226932b1a5b6fb"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#ae0ada093d3d60a2f70226932b1a5b6fb">NVGSDK_CreateInputParams::scopeTable</a></div><div class="ttdeci">NVGSDK_Scope * scopeTable</div><div class="ttdoc">List of scopes used by the application. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00106">sdk_types.h:106</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_core_impl_html"><div class="ttname"><a href="class_gfe_s_d_k_1_1_core_impl.html">GfeSDK::CoreImpl</a></div><div class="ttdef"><b>Definition:</b> <a href="isdk__cpp__impl_8h_source.html#l00025">isdk_cpp_impl.h:25</a></div></div>
 <div class="ttc" id="sdk__types_8h_html_a41214fdc112a95d5fe8e760b0c562c59"><div class="ttname"><a href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59">NVGSDK_NotificationType</a></div><div class="ttdeci">NVGSDK_NotificationType</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00050">sdk_types.h:50</a></div></div>
@@ -109,7 +134,7 @@ $(document).ready(function(){initNavTree('isdk__cpp__impl_8h_source.html','');})
 <div class="ttc" id="isdk_8h_html_ab63d1f433313209b1febbf5736b61463"><div class="ttname"><a href="isdk_8h.html#ab63d1f433313209b1febbf5736b61463">NVGSDK_Release</a></div><div class="ttdeci">NVGSDK_EXPORT NVGSDK_RetCode NVGSDKApi NVGSDK_Release(NVGSDK_HANDLE *handle)</div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_overlay_state_changed_notification_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_overlay_state_changed_notification.html">GfeSDK::OverlayStateChangedNotification</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types__cpp_8h_source.html#l00088">sdk_types_cpp.h:88</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_a0bd7568c1cb3fad975562055b4581195"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#a0bd7568c1cb3fad975562055b4581195">NVGSDK_CreateInputParams::pollForCallbacks</a></div><div class="ttdeci">bool pollForCallbacks</div><div class="ttdoc">Set to true to poll for asynchronous callbacks on an app thread. If false, callbacks will occur on a ...</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00108">sdk_types.h:108</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___language_html_a61f6b2d2a3d08a27b37919e32b13ed75"><div class="ttname"><a href="struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75">NVGSDK_Language::cultureCode</a></div><div class="ttdeci">char const  * cultureCode</div><div class="ttdoc">Will be populated by the user&amp;#39;s GFE language selection. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00143">sdk_types.h:143</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___language_html_a61f6b2d2a3d08a27b37919e32b13ed75"><div class="ttname"><a href="struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75">NVGSDK_Language::cultureCode</a></div><div class="ttdeci">char const * cultureCode</div><div class="ttdoc">Will be populated by the user&amp;#39;s GFE language selection. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00143">sdk_types.h:143</a></div></div>
 <div class="ttc" id="struct_gfe_s_d_k_1_1_create_input_params_html"><div class="ttname"><a href="struct_gfe_s_d_k_1_1_create_input_params.html">GfeSDK::CreateInputParams</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types__cpp_8h_source.html#l00038">sdk_types_cpp.h:38</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_response_html_ad1687ba8b8d53a75b13a60874f3822be"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_response.html#ad1687ba8b8d53a75b13a60874f3822be">NVGSDK_CreateResponse::versionMinor</a></div><div class="ttdeci">uint16_t versionMinor</div><div class="ttdoc">Will be populated with SDK minor version. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00132">sdk_types.h:132</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_core_impl_html_a09f4348a8362beccae2a237f92ead971"><div class="ttname"><a href="class_gfe_s_d_k_1_1_core_impl.html#a09f4348a8362beccae2a237f92ead971">GfeSDK::CoreImpl::RequestPermissionsAsync</a></div><div class="ttdeci">virtual void RequestPermissionsAsync(RequestPermissionsParams const &amp;, TCallback cb=nullptr, void *cbContext=nullptr)</div><div class="ttdef"><b>Definition:</b> <a href="isdk__cpp__impl_8h_source.html#l00138">isdk_cpp_impl.h:138</a></div></div>
@@ -123,7 +148,7 @@ $(document).ready(function(){initNavTree('isdk__cpp__impl_8h_source.html','');})
 <div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_a94b71825369290d98e08058b3c0ba537"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#a94b71825369290d98e08058b3c0ba537">NVGSDK_CreateInputParams::targetPid</a></div><div class="ttdeci">uint32_t targetPid</div><div class="ttdoc">Used for linking to game-related process&amp;#39;s PID that also supports NVIDIA Highlights. Leave empty when not used. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00113">sdk_types.h:113</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html">NVGSDK_CreateInputParams</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00103">sdk_types.h:103</a></div></div>
 <div class="ttc" id="namespace_gfe_s_d_k_html"><div class="ttname"><a href="namespace_gfe_s_d_k.html">GfeSDK</a></div><div class="ttdef"><b>Definition:</b> <a href="highlights__types__cpp_8h_source.html#l00016">highlights_types_cpp.h:16</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_adee7d43aa6948b623aa4fe84f8e8bf97"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#adee7d43aa6948b623aa4fe84f8e8bf97">NVGSDK_CreateInputParams::targetPath</a></div><div class="ttdeci">char const  * targetPath</div><div class="ttdoc">Used for linking to game-related process&amp;#39;s path that also supports NVIDIA Highlights. Must be defined if targetPid is defined. Leave empty when not used. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00115">sdk_types.h:115</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_adee7d43aa6948b623aa4fe84f8e8bf97"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#adee7d43aa6948b623aa4fe84f8e8bf97">NVGSDK_CreateInputParams::targetPath</a></div><div class="ttdeci">char const * targetPath</div><div class="ttdoc">Used for linking to game-related process&amp;#39;s path that also supports NVIDIA Highlights. Must be defined if targetPid is defined. Leave empty when not used. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00115">sdk_types.h:115</a></div></div>
 <div class="ttc" id="class_gfe_s_d_k_1_1_core_html_a0cb93acb8b273072cd37348c9b206e0d"><div class="ttname"><a href="class_gfe_s_d_k_1_1_core.html#a0cb93acb8b273072cd37348c9b206e0d">GfeSDK::Core::Create</a></div><div class="ttdeci">static Core * Create(CreateInputParams const &amp;, CreateResponse &amp;)</div><div class="ttdef"><b>Definition:</b> <a href="isdk__cpp__impl_8h_source.html#l00065">isdk_cpp_impl.h:65</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___notification_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___notification.html">NVGSDK_Notification</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00091">sdk_types.h:91</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___overlay_state_changed_notification_html_ad9684c86b575f710bcc784942e6bf256"><div class="ttname"><a href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#ad9684c86b575f710bcc784942e6bf256">NVGSDK_OverlayStateChangedNotification::open</a></div><div class="ttdeci">bool open</div><div class="ttdoc">true if the overlay is opening, false if it is closing </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00086">sdk_types.h:86</a></div></div>
@@ -141,7 +166,7 @@ $(document).ready(function(){initNavTree('isdk__cpp__impl_8h_source.html','');})
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li><li class="navelem"><a class="el" href="isdk__cpp__impl_8h.html">isdk_cpp_impl.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/jquery.js b/doc/html/jquery.js
index f5343ed..1f4d0b4 100644
--- a/doc/html/jquery.js
+++ b/doc/html/jquery.js
@@ -65,23 +65,4 @@
  Released under MIT license.
  https://raw.github.com/stevenbenner/jquery-powertip/master/LICENSE.txt
 */
-(function(a){if(typeof define==="function"&&define.amd){define(["jquery"],a)}else{a(jQuery)}}(function(k){var A=k(document),s=k(window),w=k("body");var n="displayController",e="hasActiveHover",d="forcedOpen",u="hasMouseMove",f="mouseOnToPopup",g="originalTitle",y="powertip",o="powertipjq",l="powertiptarget",E=180/Math.PI;var c={isTipOpen:false,isFixedTipOpen:false,isClosing:false,tipOpenImminent:false,activeHover:null,currentX:0,currentY:0,previousX:0,previousY:0,desyncTimeout:null,mouseTrackingActive:false,delayInProgress:false,windowWidth:0,windowHeight:0,scrollTop:0,scrollLeft:0};var p={none:0,top:1,bottom:2,left:4,right:8};k.fn.powerTip=function(F,N){if(!this.length){return this}if(k.type(F)==="string"&&k.powerTip[F]){return k.powerTip[F].call(this,this,N)}var O=k.extend({},k.fn.powerTip.defaults,F),G=new x(O);h();this.each(function M(){var R=k(this),Q=R.data(y),P=R.data(o),T=R.data(l),S;if(R.data(n)){k.powerTip.destroy(R)}S=R.attr("title");if(!Q&&!T&&!P&&S){R.data(y,S);R.data(g,S);R.removeAttr("title")}R.data(n,new t(R,O,G))});if(!O.manual){this.on({"mouseenter.powertip":function J(P){k.powerTip.show(this,P)},"mouseleave.powertip":function L(){k.powerTip.hide(this)},"focus.powertip":function K(){k.powerTip.show(this)},"blur.powertip":function H(){k.powerTip.hide(this,true)},"keydown.powertip":function I(P){if(P.keyCode===27){k.powerTip.hide(this,true)}}})}return this};k.fn.powerTip.defaults={fadeInTime:200,fadeOutTime:100,followMouse:false,popupId:"powerTip",intentSensitivity:7,intentPollInterval:100,closeDelay:100,placement:"n",smartPlacement:false,offset:10,mouseOnToPopup:false,manual:false};k.fn.powerTip.smartPlacementLists={n:["n","ne","nw","s"],e:["e","ne","se","w","nw","sw","n","s","e"],s:["s","se","sw","n"],w:["w","nw","sw","e","ne","se","n","s","w"],nw:["nw","w","sw","n","s","se","nw"],ne:["ne","e","se","n","s","sw","ne"],sw:["sw","w","nw","s","n","ne","sw"],se:["se","e","ne","s","n","nw","se"],"nw-alt":["nw-alt","n","ne-alt","sw-alt","s","se-alt","w","e"],"ne-alt":["ne-alt","n","nw-alt","se-alt","s","sw-alt","e","w"],"sw-alt":["sw-alt","s","se-alt","nw-alt","n","ne-alt","w","e"],"se-alt":["se-alt","s","sw-alt","ne-alt","n","nw-alt","e","w"]};k.powerTip={show:function z(F,G){if(G){i(G);c.previousX=G.pageX;c.previousY=G.pageY;k(F).data(n).show()}else{k(F).first().data(n).show(true,true)}return F},reposition:function r(F){k(F).first().data(n).resetPosition();return F},hide:function D(G,F){if(G){k(G).first().data(n).hide(F)}else{if(c.activeHover){c.activeHover.data(n).hide(true)}}return G},destroy:function C(G){k(G).off(".powertip").each(function F(){var I=k(this),H=[g,n,e,d];if(I.data(g)){I.attr("title",I.data(g));H.push(y)}I.removeData(H)});return G}};k.powerTip.showTip=k.powerTip.show;k.powerTip.closeTip=k.powerTip.hide;function b(){var F=this;F.top="auto";F.left="auto";F.right="auto";F.bottom="auto";F.set=function(H,G){if(k.isNumeric(G)){F[H]=Math.round(G)}}}function t(K,N,F){var J=null;function L(P,Q){M();if(!K.data(e)){if(!P){c.tipOpenImminent=true;J=setTimeout(function O(){J=null;I()},N.intentPollInterval)}else{if(Q){K.data(d,true)}F.showTip(K)}}}function G(P){M();c.tipOpenImminent=false;if(K.data(e)){K.data(d,false);if(!P){c.delayInProgress=true;J=setTimeout(function O(){J=null;F.hideTip(K);c.delayInProgress=false},N.closeDelay)}else{F.hideTip(K)}}}function I(){var Q=Math.abs(c.previousX-c.currentX),O=Math.abs(c.previousY-c.currentY),P=Q+O;if(P<N.intentSensitivity){F.showTip(K)}else{c.previousX=c.currentX;c.previousY=c.currentY;L()}}function M(){J=clearTimeout(J);c.delayInProgress=false}function H(){F.resetPosition(K)}this.show=L;this.hide=G;this.cancel=M;this.resetPosition=H}function j(){function G(M,L,J,O,P){var K=L.split("-")[0],N=new b(),I;if(q(M)){I=H(M,K)}else{I=F(M,K)}switch(L){case"n":N.set("left",I.left-(J/2));N.set("bottom",c.windowHeight-I.top+P);break;case"e":N.set("left",I.left+P);N.set("top",I.top-(O/2));break;case"s":N.set("left",I.left-(J/2));N.set("top",I.top+P);break;case"w":N.set("top",I.top-(O/2));N.set("right",c.windowWidth-I.left+P);break;case"nw":N.set("bottom",c.windowHeight-I.top+P);N.set("right",c.windowWidth-I.left-20);break;case"nw-alt":N.set("left",I.left);N.set("bottom",c.windowHeight-I.top+P);break;case"ne":N.set("left",I.left-20);N.set("bottom",c.windowHeight-I.top+P);break;case"ne-alt":N.set("bottom",c.windowHeight-I.top+P);N.set("right",c.windowWidth-I.left);break;case"sw":N.set("top",I.top+P);N.set("right",c.windowWidth-I.left-20);break;case"sw-alt":N.set("left",I.left);N.set("top",I.top+P);break;case"se":N.set("left",I.left-20);N.set("top",I.top+P);break;case"se-alt":N.set("top",I.top+P);N.set("right",c.windowWidth-I.left);break}return N}function F(K,J){var O=K.offset(),N=K.outerWidth(),I=K.outerHeight(),M,L;switch(J){case"n":M=O.left+N/2;L=O.top;break;case"e":M=O.left+N;L=O.top+I/2;break;case"s":M=O.left+N/2;L=O.top+I;break;case"w":M=O.left;L=O.top+I/2;break;case"nw":M=O.left;L=O.top;break;case"ne":M=O.left+N;L=O.top;break;case"sw":M=O.left;L=O.top+I;break;case"se":M=O.left+N;L=O.top+I;break}return{top:L,left:M}}function H(O,K){var S=O.closest("svg")[0],N=O[0],W=S.createSVGPoint(),L=N.getBBox(),V=N.getScreenCTM(),M=L.width/2,Q=L.height/2,P=[],I=["nw","n","ne","e","se","s","sw","w"],U,X,R,T;function J(){P.push(W.matrixTransform(V))}W.x=L.x;W.y=L.y;J();W.x+=M;J();W.x+=M;J();W.y+=Q;J();W.y+=Q;J();W.x-=M;J();W.x-=M;J();W.y-=Q;J();if(P[0].y!==P[1].y||P[0].x!==P[7].x){X=Math.atan2(V.b,V.a)*E;R=Math.ceil(((X%360)-22.5)/45);if(R<1){R+=8}while(R--){I.push(I.shift())}}for(T=0;T<P.length;T++){if(I[T]===K){U=P[T];break}}return{top:U.y+c.scrollTop,left:U.x+c.scrollLeft}}this.compute=G}function x(Q){var P=new j(),O=k("#"+Q.popupId);if(O.length===0){O=k("<div/>",{id:Q.popupId});if(w.length===0){w=k("body")}w.append(O)}if(Q.followMouse){if(!O.data(u)){A.on("mousemove",M);s.on("scroll",M);O.data(u,true)}}if(Q.mouseOnToPopup){O.on({mouseenter:function L(){if(O.data(f)){if(c.activeHover){c.activeHover.data(n).cancel()}}},mouseleave:function N(){if(c.activeHover){c.activeHover.data(n).hide()}}})}function I(S){S.data(e,true);O.queue(function R(T){H(S);T()})}function H(S){var U;if(!S.data(e)){return}if(c.isTipOpen){if(!c.isClosing){K(c.activeHover)}O.delay(100).queue(function R(V){H(S);V()});return}S.trigger("powerTipPreRender");U=B(S);if(U){O.empty().append(U)}else{return}S.trigger("powerTipRender");c.activeHover=S;c.isTipOpen=true;O.data(f,Q.mouseOnToPopup);if(!Q.followMouse){G(S);c.isFixedTipOpen=true}else{M()}O.fadeIn(Q.fadeInTime,function T(){if(!c.desyncTimeout){c.desyncTimeout=setInterval(J,500)}S.trigger("powerTipOpen")})}function K(R){c.isClosing=true;c.activeHover=null;c.isTipOpen=false;c.desyncTimeout=clearInterval(c.desyncTimeout);R.data(e,false);R.data(d,false);O.fadeOut(Q.fadeOutTime,function S(){var T=new b();c.isClosing=false;c.isFixedTipOpen=false;O.removeClass();T.set("top",c.currentY+Q.offset);T.set("left",c.currentX+Q.offset);O.css(T);R.trigger("powerTipClose")})}function M(){if(!c.isFixedTipOpen&&(c.isTipOpen||(c.tipOpenImminent&&O.data(u)))){var R=O.outerWidth(),V=O.outerHeight(),U=new b(),S,T;U.set("top",c.currentY+Q.offset);U.set("left",c.currentX+Q.offset);S=m(U,R,V);if(S!==p.none){T=a(S);if(T===1){if(S===p.right){U.set("left",c.windowWidth-R)}else{if(S===p.bottom){U.set("top",c.scrollTop+c.windowHeight-V)}}}else{U.set("left",c.currentX-R-Q.offset);U.set("top",c.currentY-V-Q.offset)}}O.css(U)}}function G(S){var R,T;if(Q.smartPlacement){R=k.fn.powerTip.smartPlacementLists[Q.placement];k.each(R,function(U,W){var V=m(F(S,W),O.outerWidth(),O.outerHeight());T=W;if(V===p.none){return false}})}else{F(S,Q.placement);T=Q.placement}O.addClass(T)}function F(U,T){var R=0,S,W,V=new b();V.set("top",0);V.set("left",0);O.css(V);do{S=O.outerWidth();W=O.outerHeight();V=P.compute(U,T,S,W,Q.offset);O.css(V)}while(++R<=5&&(S!==O.outerWidth()||W!==O.outerHeight()));return V}function J(){var R=false;if(c.isTipOpen&&!c.isClosing&&!c.delayInProgress){if(c.activeHover.data(e)===false||c.activeHover.is(":disabled")){R=true}else{if(!v(c.activeHover)&&!c.activeHover.is(":focus")&&!c.activeHover.data(d)){if(O.data(f)){if(!v(O)){R=true}}else{R=true}}}if(R){K(c.activeHover)}}}this.showTip=I;this.hideTip=K;this.resetPosition=G}function q(F){return window.SVGElement&&F[0] instanceof SVGElement}function h(){if(!c.mouseTrackingActive){c.mouseTrackingActive=true;k(function H(){c.scrollLeft=s.scrollLeft();c.scrollTop=s.scrollTop();c.windowWidth=s.width();c.windowHeight=s.height()});A.on("mousemove",i);s.on({resize:function G(){c.windowWidth=s.width();c.windowHeight=s.height()},scroll:function F(){var I=s.scrollLeft(),J=s.scrollTop();if(I!==c.scrollLeft){c.currentX+=I-c.scrollLeft;c.scrollLeft=I}if(J!==c.scrollTop){c.currentY+=J-c.scrollTop;c.scrollTop=J}}})}}function i(F){c.currentX=F.pageX;c.currentY=F.pageY}function v(F){var H=F.offset(),J=F[0].getBoundingClientRect(),I=J.right-J.left,G=J.bottom-J.top;return c.currentX>=H.left&&c.currentX<=H.left+I&&c.currentY>=H.top&&c.currentY<=H.top+G}function B(I){var G=I.data(y),F=I.data(o),K=I.data(l),H,J;if(G){if(k.isFunction(G)){G=G.call(I[0])}J=G}else{if(F){if(k.isFunction(F)){F=F.call(I[0])}if(F.length>0){J=F.clone(true,true)}}else{if(K){H=k("#"+K);if(H.length>0){J=H.html()}}}}return J}function m(M,L,K){var G=c.scrollTop,J=c.scrollLeft,I=G+c.windowHeight,F=J+c.windowWidth,H=p.none;if(M.top<G||Math.abs(M.bottom-c.windowHeight)-K<G){H|=p.top}if(M.top+K>I||Math.abs(M.bottom-c.windowHeight)>I){H|=p.bottom}if(M.left<J||M.right+L>F){H|=p.left}if(M.left+L>F||M.right<J){H|=p.right}return H}function a(G){var F=0;while(G){G&=G-1;F++}return F}}));/*!
- * jQuery UI Touch Punch 0.2.3
- *
- * Copyright 2011–2014, Dave Furfero
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * Depends:
- *  jquery.ui.widget.js
- *  jquery.ui.mouse.js
- */
-(function(b){b.support.touch="ontouchend" in document;if(!b.support.touch){return}var d=b.ui.mouse.prototype,f=d._mouseInit,c=d._mouseDestroy,a;function e(h,i){if(h.originalEvent.touches.length>1){return}h.preventDefault();var j=h.originalEvent.changedTouches[0],g=document.createEvent("MouseEvents");g.initMouseEvent(i,true,true,window,1,j.screenX,j.screenY,j.clientX,j.clientY,false,false,false,false,0,null);h.target.dispatchEvent(g)}d._touchStart=function(h){var g=this;if(a||!g._mouseCapture(h.originalEvent.changedTouches[0])){return}a=true;g._touchMoved=false;e(h,"mouseover");e(h,"mousemove");e(h,"mousedown")};d._touchMove=function(g){if(!a){return}this._touchMoved=true;e(g,"mousemove")};d._touchEnd=function(g){if(!a){return}e(g,"mouseup");e(g,"mouseout");if(!this._touchMoved){e(g,"click")}a=false};d._mouseInit=function(){var g=this;g.element.bind({touchstart:b.proxy(g,"_touchStart"),touchmove:b.proxy(g,"_touchMove"),touchend:b.proxy(g,"_touchEnd")});f.call(g)};d._mouseDestroy=function(){var g=this;g.element.unbind({touchstart:b.proxy(g,"_touchStart"),touchmove:b.proxy(g,"_touchMove"),touchend:b.proxy(g,"_touchEnd")});c.call(g)}})(jQuery);/*!
- * SmartMenus jQuery Plugin - v1.0.0 - January 27, 2016
- * http://www.smartmenus.org/
- *
- * Copyright Vasil Dinkov, Vadikom Web Ltd.
- * http://vadikom.com
- *
- * Licensed MIT
- */
-(function(a){if(typeof define==="function"&&define.amd){define(["jquery"],a)}else{if(typeof module==="object"&&typeof module.exports==="object"){module.exports=a(require("jquery"))}else{a(jQuery)}}}(function(a){var b=[],e=!!window.createPopup,f=false,d="ontouchstart" in window,h=false,g=window.requestAnimationFrame||function(l){return setTimeout(l,1000/60)},c=window.cancelAnimationFrame||function(l){clearTimeout(l)};function k(m){var n=".smartmenus_mouse";if(!h&&!m){var o=true,l=null;a(document).bind(i([["mousemove",function(s){var t={x:s.pageX,y:s.pageY,timeStamp:new Date().getTime()};if(l){var q=Math.abs(l.x-t.x),p=Math.abs(l.y-t.y);if((q>0||p>0)&&q<=2&&p<=2&&t.timeStamp-l.timeStamp<=300){f=true;if(o){var r=a(s.target).closest("a");if(r.is("a")){a.each(b,function(){if(a.contains(this.$root[0],r[0])){this.itemEnter({currentTarget:r[0]});return false}})}o=false}}}l=t}],[d?"touchstart":"pointerover pointermove pointerout MSPointerOver MSPointerMove MSPointerOut",function(p){if(j(p.originalEvent)){f=false}}]],n));h=true}else{if(h&&m){a(document).unbind(n);h=false}}}function j(l){return !/^(4|mouse)$/.test(l.pointerType)}function i(l,n){if(!n){n=""}var m={};a.each(l,function(o,p){m[p[0].split(" ").join(n+" ")+n]=p[1]});return m}a.SmartMenus=function(m,l){this.$root=a(m);this.opts=l;this.rootId="";this.accessIdPrefix="";this.$subArrow=null;this.activatedItems=[];this.visibleSubMenus=[];this.showTimeout=0;this.hideTimeout=0;this.scrollTimeout=0;this.clickActivated=false;this.focusActivated=false;this.zIndexInc=0;this.idInc=0;this.$firstLink=null;this.$firstSub=null;this.disabled=false;this.$disableOverlay=null;this.$touchScrollingSub=null;this.cssTransforms3d="perspective" in m.style||"webkitPerspective" in m.style;this.wasCollapsible=false;this.init()};a.extend(a.SmartMenus,{hideAll:function(){a.each(b,function(){this.menuHideAll()})},destroy:function(){while(b.length){b[0].destroy()}k(true)},prototype:{init:function(n){var l=this;if(!n){b.push(this);this.rootId=(new Date().getTime()+Math.random()+"").replace(/\D/g,"");this.accessIdPrefix="sm-"+this.rootId+"-";if(this.$root.hasClass("sm-rtl")){this.opts.rightToLeftSubMenus=true}var r=".smartmenus";this.$root.data("smartmenus",this).attr("data-smartmenus-id",this.rootId).dataSM("level",1).bind(i([["mouseover focusin",a.proxy(this.rootOver,this)],["mouseout focusout",a.proxy(this.rootOut,this)],["keydown",a.proxy(this.rootKeyDown,this)]],r)).delegate("a",i([["mouseenter",a.proxy(this.itemEnter,this)],["mouseleave",a.proxy(this.itemLeave,this)],["mousedown",a.proxy(this.itemDown,this)],["focus",a.proxy(this.itemFocus,this)],["blur",a.proxy(this.itemBlur,this)],["click",a.proxy(this.itemClick,this)]],r));r+=this.rootId;if(this.opts.hideOnClick){a(document).bind(i([["touchstart",a.proxy(this.docTouchStart,this)],["touchmove",a.proxy(this.docTouchMove,this)],["touchend",a.proxy(this.docTouchEnd,this)],["click",a.proxy(this.docClick,this)]],r))}a(window).bind(i([["resize orientationchange",a.proxy(this.winResize,this)]],r));if(this.opts.subIndicators){this.$subArrow=a("<span/>").addClass("sub-arrow");if(this.opts.subIndicatorsText){this.$subArrow.html(this.opts.subIndicatorsText)}}k()}this.$firstSub=this.$root.find("ul").each(function(){l.menuInit(a(this))}).eq(0);this.$firstLink=this.$root.find("a").eq(0);if(this.opts.markCurrentItem){var p=/(index|default)\.[^#\?\/]*/i,m=/#.*/,q=window.location.href.replace(p,""),o=q.replace(m,"");this.$root.find("a").each(function(){var s=this.href.replace(p,""),t=a(this);if(s==q||s==o){t.addClass("current");if(l.opts.markCurrentTree){t.parentsUntil("[data-smartmenus-id]","ul").each(function(){a(this).dataSM("parent-a").addClass("current")})}}})}this.wasCollapsible=this.isCollapsible()},destroy:function(m){if(!m){var n=".smartmenus";this.$root.removeData("smartmenus").removeAttr("data-smartmenus-id").removeDataSM("level").unbind(n).undelegate(n);n+=this.rootId;a(document).unbind(n);a(window).unbind(n);if(this.opts.subIndicators){this.$subArrow=null}}this.menuHideAll();var l=this;this.$root.find("ul").each(function(){var o=a(this);if(o.dataSM("scroll-arrows")){o.dataSM("scroll-arrows").remove()}if(o.dataSM("shown-before")){if(l.opts.subMenusMinWidth||l.opts.subMenusMaxWidth){o.css({width:"",minWidth:"",maxWidth:""}).removeClass("sm-nowrap")}if(o.dataSM("scroll-arrows")){o.dataSM("scroll-arrows").remove()}o.css({zIndex:"",top:"",left:"",marginLeft:"",marginTop:"",display:""})}if((o.attr("id")||"").indexOf(l.accessIdPrefix)==0){o.removeAttr("id")}}).removeDataSM("in-mega").removeDataSM("shown-before").removeDataSM("ie-shim").removeDataSM("scroll-arrows").removeDataSM("parent-a").removeDataSM("level").removeDataSM("beforefirstshowfired").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeAttr("aria-expanded");this.$root.find("a.has-submenu").each(function(){var o=a(this);if(o.attr("id").indexOf(l.accessIdPrefix)==0){o.removeAttr("id")}}).removeClass("has-submenu").removeDataSM("sub").removeAttr("aria-haspopup").removeAttr("aria-controls").removeAttr("aria-expanded").closest("li").removeDataSM("sub");if(this.opts.subIndicators){this.$root.find("span.sub-arrow").remove()}if(this.opts.markCurrentItem){this.$root.find("a.current").removeClass("current")}if(!m){this.$root=null;this.$firstLink=null;this.$firstSub=null;if(this.$disableOverlay){this.$disableOverlay.remove();this.$disableOverlay=null}b.splice(a.inArray(this,b),1)}},disable:function(l){if(!this.disabled){this.menuHideAll();if(!l&&!this.opts.isPopup&&this.$root.is(":visible")){var m=this.$root.offset();this.$disableOverlay=a('<div class="sm-jquery-disable-overlay"/>').css({position:"absolute",top:m.top,left:m.left,width:this.$root.outerWidth(),height:this.$root.outerHeight(),zIndex:this.getStartZIndex(true),opacity:0}).appendTo(document.body)}this.disabled=true}},docClick:function(l){if(this.$touchScrollingSub){this.$touchScrollingSub=null;return}if(this.visibleSubMenus.length&&!a.contains(this.$root[0],l.target)||a(l.target).is("a")){this.menuHideAll()}},docTouchEnd:function(m){if(!this.lastTouch){return}if(this.visibleSubMenus.length&&(this.lastTouch.x2===undefined||this.lastTouch.x1==this.lastTouch.x2)&&(this.lastTouch.y2===undefined||this.lastTouch.y1==this.lastTouch.y2)&&(!this.lastTouch.target||!a.contains(this.$root[0],this.lastTouch.target))){if(this.hideTimeout){clearTimeout(this.hideTimeout);this.hideTimeout=0}var l=this;this.hideTimeout=setTimeout(function(){l.menuHideAll()},350)}this.lastTouch=null},docTouchMove:function(m){if(!this.lastTouch){return}var l=m.originalEvent.touches[0];this.lastTouch.x2=l.pageX;this.lastTouch.y2=l.pageY},docTouchStart:function(m){var l=m.originalEvent.touches[0];this.lastTouch={x1:l.pageX,y1:l.pageY,target:l.target}},enable:function(){if(this.disabled){if(this.$disableOverlay){this.$disableOverlay.remove();this.$disableOverlay=null}this.disabled=false}},getClosestMenu:function(m){var l=a(m).closest("ul");while(l.dataSM("in-mega")){l=l.parent().closest("ul")}return l[0]||null},getHeight:function(l){return this.getOffset(l,true)},getOffset:function(n,l){var m;if(n.css("display")=="none"){m={position:n[0].style.position,visibility:n[0].style.visibility};n.css({position:"absolute",visibility:"hidden"}).show()}var o=n[0].getBoundingClientRect&&n[0].getBoundingClientRect(),p=o&&(l?o.height||o.bottom-o.top:o.width||o.right-o.left);if(!p&&p!==0){p=l?n[0].offsetHeight:n[0].offsetWidth}if(m){n.hide().css(m)}return p},getStartZIndex:function(l){var m=parseInt(this[l?"$root":"$firstSub"].css("z-index"));if(!l&&isNaN(m)){m=parseInt(this.$root.css("z-index"))}return !isNaN(m)?m:1},getTouchPoint:function(l){return l.touches&&l.touches[0]||l.changedTouches&&l.changedTouches[0]||l},getViewport:function(l){var m=l?"Height":"Width",o=document.documentElement["client"+m],n=window["inner"+m];if(n){o=Math.min(o,n)}return o},getViewportHeight:function(){return this.getViewport(true)},getViewportWidth:function(){return this.getViewport()},getWidth:function(l){return this.getOffset(l)},handleEvents:function(){return !this.disabled&&this.isCSSOn()},handleItemEvents:function(l){return this.handleEvents()&&!this.isLinkInMegaMenu(l)},isCollapsible:function(){return this.$firstSub.css("position")=="static"},isCSSOn:function(){return this.$firstLink.css("display")=="block"},isFixed:function(){var l=this.$root.css("position")=="fixed";if(!l){this.$root.parentsUntil("body").each(function(){if(a(this).css("position")=="fixed"){l=true;return false}})}return l},isLinkInMegaMenu:function(l){return a(this.getClosestMenu(l[0])).hasClass("mega-menu")},isTouchMode:function(){return !f||this.opts.noMouseOver||this.isCollapsible()},itemActivate:function(p,l){var n=p.closest("ul"),q=n.dataSM("level");if(q>1&&(!this.activatedItems[q-2]||this.activatedItems[q-2][0]!=n.dataSM("parent-a")[0])){var m=this;a(n.parentsUntil("[data-smartmenus-id]","ul").get().reverse()).add(n).each(function(){m.itemActivate(a(this).dataSM("parent-a"))})}if(!this.isCollapsible()||l){this.menuHideSubMenus(!this.activatedItems[q-1]||this.activatedItems[q-1][0]!=p[0]?q-1:q)}this.activatedItems[q-1]=p;if(this.$root.triggerHandler("activate.smapi",p[0])===false){return}var o=p.dataSM("sub");if(o&&(this.isTouchMode()||(!this.opts.showOnClick||this.clickActivated))){this.menuShow(o)}},itemBlur:function(m){var l=a(m.currentTarget);if(!this.handleItemEvents(l)){return}this.$root.triggerHandler("blur.smapi",l[0])},itemClick:function(o){var n=a(o.currentTarget);if(!this.handleItemEvents(n)){return}if(this.$touchScrollingSub&&this.$touchScrollingSub[0]==n.closest("ul")[0]){this.$touchScrollingSub=null;o.stopPropagation();return false}if(this.$root.triggerHandler("click.smapi",n[0])===false){return false}var p=a(o.target).is("span.sub-arrow"),m=n.dataSM("sub"),l=m?m.dataSM("level")==2:false;if(m&&!m.is(":visible")){if(this.opts.showOnClick&&l){this.clickActivated=true}this.itemActivate(n);if(m.is(":visible")){this.focusActivated=true;return false}}else{if(this.isCollapsible()&&p){this.itemActivate(n);this.menuHide(m);return false}}if(this.opts.showOnClick&&l||n.hasClass("disabled")||this.$root.triggerHandler("select.smapi",n[0])===false){return false}},itemDown:function(m){var l=a(m.currentTarget);if(!this.handleItemEvents(l)){return}l.dataSM("mousedown",true)},itemEnter:function(n){var m=a(n.currentTarget);if(!this.handleItemEvents(m)){return}if(!this.isTouchMode()){if(this.showTimeout){clearTimeout(this.showTimeout);this.showTimeout=0}var l=this;this.showTimeout=setTimeout(function(){l.itemActivate(m)},this.opts.showOnClick&&m.closest("ul").dataSM("level")==1?1:this.opts.showTimeout)}this.$root.triggerHandler("mouseenter.smapi",m[0])},itemFocus:function(m){var l=a(m.currentTarget);if(!this.handleItemEvents(l)){return}if(this.focusActivated&&(!this.isTouchMode()||!l.dataSM("mousedown"))&&(!this.activatedItems.length||this.activatedItems[this.activatedItems.length-1][0]!=l[0])){this.itemActivate(l,true)}this.$root.triggerHandler("focus.smapi",l[0])},itemLeave:function(m){var l=a(m.currentTarget);if(!this.handleItemEvents(l)){return}if(!this.isTouchMode()){l[0].blur();if(this.showTimeout){clearTimeout(this.showTimeout);this.showTimeout=0}}l.removeDataSM("mousedown");this.$root.triggerHandler("mouseleave.smapi",l[0])},menuHide:function(m){if(this.$root.triggerHandler("beforehide.smapi",m[0])===false){return}m.stop(true,true);if(m.css("display")!="none"){var l=function(){m.css("z-index","")};if(this.isCollapsible()){if(this.opts.collapsibleHideFunction){this.opts.collapsibleHideFunction.call(this,m,l)}else{m.hide(this.opts.collapsibleHideDuration,l)}}else{if(this.opts.hideFunction){this.opts.hideFunction.call(this,m,l)}else{m.hide(this.opts.hideDuration,l)}}if(m.dataSM("ie-shim")){m.dataSM("ie-shim").remove().css({"-webkit-transform":"",transform:""})}if(m.dataSM("scroll")){this.menuScrollStop(m);m.css({"touch-action":"","-ms-touch-action":"","-webkit-transform":"",transform:""}).unbind(".smartmenus_scroll").removeDataSM("scroll").dataSM("scroll-arrows").hide()}m.dataSM("parent-a").removeClass("highlighted").attr("aria-expanded","false");m.attr({"aria-expanded":"false","aria-hidden":"true"});var n=m.dataSM("level");this.activatedItems.splice(n-1,1);this.visibleSubMenus.splice(a.inArray(m,this.visibleSubMenus),1);this.$root.triggerHandler("hide.smapi",m[0])}},menuHideAll:function(){if(this.showTimeout){clearTimeout(this.showTimeout);this.showTimeout=0}var m=this.opts.isPopup?1:0;for(var l=this.visibleSubMenus.length-1;l>=m;l--){this.menuHide(this.visibleSubMenus[l])}if(this.opts.isPopup){this.$root.stop(true,true);if(this.$root.is(":visible")){if(this.opts.hideFunction){this.opts.hideFunction.call(this,this.$root)}else{this.$root.hide(this.opts.hideDuration)}if(this.$root.dataSM("ie-shim")){this.$root.dataSM("ie-shim").remove()}}}this.activatedItems=[];this.visibleSubMenus=[];this.clickActivated=false;this.focusActivated=false;this.zIndexInc=0;this.$root.triggerHandler("hideAll.smapi")},menuHideSubMenus:function(n){for(var l=this.activatedItems.length-1;l>=n;l--){var m=this.activatedItems[l].dataSM("sub");if(m){this.menuHide(m)}}},menuIframeShim:function(l){if(e&&this.opts.overlapControlsInIE&&!l.dataSM("ie-shim")){l.dataSM("ie-shim",a("<iframe/>").attr({src:"javascript:0",tabindex:-9}).css({position:"absolute",top:"auto",left:"0",opacity:0,border:"0"}))}},menuInit:function(l){if(!l.dataSM("in-mega")){if(l.hasClass("mega-menu")){l.find("ul").dataSM("in-mega",true)}var q=2,m=l[0];while((m=m.parentNode.parentNode)!=this.$root[0]){q++}var n=l.prevAll("a").eq(-1);if(!n.length){n=l.prevAll().find("a").eq(-1)}n.addClass("has-submenu").dataSM("sub",l);l.dataSM("parent-a",n).dataSM("level",q).parent().dataSM("sub",l);var o=n.attr("id")||this.accessIdPrefix+(++this.idInc),p=l.attr("id")||this.accessIdPrefix+(++this.idInc);n.attr({id:o,"aria-haspopup":"true","aria-controls":p,"aria-expanded":"false"});l.attr({id:p,role:"group","aria-hidden":"true","aria-labelledby":o,"aria-expanded":"false"});if(this.opts.subIndicators){n[this.opts.subIndicatorsPos](this.$subArrow.clone())}}},menuPosition:function(K){var r=K.dataSM("parent-a"),D=r.closest("li"),E=D.parent(),l=K.dataSM("level"),t=this.getWidth(K),J=this.getHeight(K),u=r.offset(),o=u.left,m=u.top,q=this.getWidth(r),F=this.getHeight(r),H=a(window),v=H.scrollLeft(),s=H.scrollTop(),z=this.getViewportWidth(),L=this.getViewportHeight(),w=E.parent().is("[data-sm-horizontal-sub]")||l==2&&!E.hasClass("sm-vertical"),B=this.opts.rightToLeftSubMenus&&!D.is("[data-sm-reverse]")||!this.opts.rightToLeftSubMenus&&D.is("[data-sm-reverse]"),p=l==2?this.opts.mainMenuSubOffsetX:this.opts.subMenusSubOffsetX,n=l==2?this.opts.mainMenuSubOffsetY:this.opts.subMenusSubOffsetY,C,A;if(w){C=B?q-t-p:p;A=this.opts.bottomToTopSubMenus?-J-n:F+n}else{C=B?p-t:q-p;A=this.opts.bottomToTopSubMenus?F-n-J:n}if(this.opts.keepInViewport){var N=o+C,M=m+A;if(B&&N<v){C=w?v-N+C:q-p}else{if(!B&&N+t>v+z){C=w?v+z-t-N+C:p-t}}if(!w){if(J<L&&M+J>s+L){A+=s+L-J-M}else{if(J>=L||M<s){A+=s-M}}}if(w&&(M+J>s+L+0.49||M<s)||!w&&J>L+0.49){var G=this;if(!K.dataSM("scroll-arrows")){K.dataSM("scroll-arrows",a([a('<span class="scroll-up"><span class="scroll-up-arrow"></span></span>')[0],a('<span class="scroll-down"><span class="scroll-down-arrow"></span></span>')[0]]).bind({mouseenter:function(){K.dataSM("scroll").up=a(this).hasClass("scroll-up");G.menuScroll(K)},mouseleave:function(x){G.menuScrollStop(K);G.menuScrollOut(K,x)},"mousewheel DOMMouseScroll":function(x){x.preventDefault()}}).insertAfter(K))}var I=".smartmenus_scroll";K.dataSM("scroll",{y:this.cssTransforms3d?0:A-F,step:1,itemH:F,subH:J,arrowDownH:this.getHeight(K.dataSM("scroll-arrows").eq(1))}).bind(i([["mouseover",function(x){G.menuScrollOver(K,x)}],["mouseout",function(x){G.menuScrollOut(K,x)}],["mousewheel DOMMouseScroll",function(x){G.menuScrollMousewheel(K,x)}]],I)).dataSM("scroll-arrows").css({top:"auto",left:"0",marginLeft:C+(parseInt(K.css("border-left-width"))||0),width:t-(parseInt(K.css("border-left-width"))||0)-(parseInt(K.css("border-right-width"))||0),zIndex:K.css("z-index")}).eq(w&&this.opts.bottomToTopSubMenus?0:1).show();if(this.isFixed()){K.css({"touch-action":"none","-ms-touch-action":"none"}).bind(i([[d?"touchstart touchmove touchend":"pointerdown pointermove pointerup MSPointerDown MSPointerMove MSPointerUp",function(x){G.menuScrollTouch(K,x)}]],I))}}}K.css({top:"auto",left:"0",marginLeft:C,marginTop:A-F});this.menuIframeShim(K);if(K.dataSM("ie-shim")){K.dataSM("ie-shim").css({zIndex:K.css("z-index"),width:t,height:J,marginLeft:C,marginTop:A-F})}},menuScroll:function(r,m,n){var p=r.dataSM("scroll"),q=r.dataSM("scroll-arrows"),o=p.up?p.upEnd:p.downEnd,s;if(!m&&p.momentum){p.momentum*=0.92;s=p.momentum;if(s<0.5){this.menuScrollStop(r);return}}else{s=n||(m||!this.opts.scrollAccelerate?this.opts.scrollStep:Math.floor(p.step))}var l=r.dataSM("level");if(this.activatedItems[l-1]&&this.activatedItems[l-1].dataSM("sub")&&this.activatedItems[l-1].dataSM("sub").is(":visible")){this.menuHideSubMenus(l-1)}p.y=p.up&&o<=p.y||!p.up&&o>=p.y?p.y:(Math.abs(o-p.y)>s?p.y+(p.up?s:-s):o);r.add(r.dataSM("ie-shim")).css(this.cssTransforms3d?{"-webkit-transform":"translate3d(0, "+p.y+"px, 0)",transform:"translate3d(0, "+p.y+"px, 0)"}:{marginTop:p.y});if(f&&(p.up&&p.y>p.downEnd||!p.up&&p.y<p.upEnd)){q.eq(p.up?1:0).show()}if(p.y==o){if(f){q.eq(p.up?0:1).hide()}this.menuScrollStop(r)}else{if(!m){if(this.opts.scrollAccelerate&&p.step<this.opts.scrollStep){p.step+=0.2}var t=this;this.scrollTimeout=g(function(){t.menuScroll(r)})}}},menuScrollMousewheel:function(m,n){if(this.getClosestMenu(n.target)==m[0]){n=n.originalEvent;var l=(n.wheelDelta||-n.detail)>0;if(m.dataSM("scroll-arrows").eq(l?0:1).is(":visible")){m.dataSM("scroll").up=l;this.menuScroll(m,true)}}n.preventDefault()},menuScrollOut:function(l,m){if(f){if(!/^scroll-(up|down)/.test((m.relatedTarget||"").className)&&(l[0]!=m.relatedTarget&&!a.contains(l[0],m.relatedTarget)||this.getClosestMenu(m.relatedTarget)!=l[0])){l.dataSM("scroll-arrows").css("visibility","hidden")}}},menuScrollOver:function(n,o){if(f){if(!/^scroll-(up|down)/.test(o.target.className)&&this.getClosestMenu(o.target)==n[0]){this.menuScrollRefreshData(n);var m=n.dataSM("scroll"),l=a(window).scrollTop()-n.dataSM("parent-a").offset().top-m.itemH;n.dataSM("scroll-arrows").eq(0).css("margin-top",l).end().eq(1).css("margin-top",l+this.getViewportHeight()-m.arrowDownH).end().css("visibility","visible")}}},menuScrollRefreshData:function(n){var m=n.dataSM("scroll"),l=a(window).scrollTop()-n.dataSM("parent-a").offset().top-m.itemH;if(this.cssTransforms3d){l=-(parseFloat(n.css("margin-top"))-l)}a.extend(m,{upEnd:l,downEnd:l+this.getViewportHeight()-m.subH})},menuScrollStop:function(l){if(this.scrollTimeout){c(this.scrollTimeout);this.scrollTimeout=0;l.dataSM("scroll").step=1;return true}},menuScrollTouch:function(p,q){q=q.originalEvent;if(j(q)){var m=this.getTouchPoint(q);if(this.getClosestMenu(m.target)==p[0]){var o=p.dataSM("scroll");if(/(start|down)$/i.test(q.type)){if(this.menuScrollStop(p)){q.preventDefault();this.$touchScrollingSub=p}else{this.$touchScrollingSub=null}this.menuScrollRefreshData(p);a.extend(o,{touchStartY:m.pageY,touchStartTime:q.timeStamp})}else{if(/move$/i.test(q.type)){var n=o.touchY!==undefined?o.touchY:o.touchStartY;if(n!==undefined&&n!=m.pageY){this.$touchScrollingSub=p;var l=n<m.pageY;if(o.up!==undefined&&o.up!=l){a.extend(o,{touchStartY:m.pageY,touchStartTime:q.timeStamp})}a.extend(o,{up:l,touchY:m.pageY});this.menuScroll(p,true,Math.abs(m.pageY-n))}q.preventDefault()}else{if(o.touchY!==undefined){if(o.momentum=Math.pow(Math.abs(m.pageY-o.touchStartY)/(q.timeStamp-o.touchStartTime),2)*15){this.menuScrollStop(p);this.menuScroll(p);q.preventDefault()}delete o.touchY}}}}}},menuShow:function(n){if(!n.dataSM("beforefirstshowfired")){n.dataSM("beforefirstshowfired",true);if(this.$root.triggerHandler("beforefirstshow.smapi",n[0])===false){return}}if(this.$root.triggerHandler("beforeshow.smapi",n[0])===false){return}n.dataSM("shown-before",true).stop(true,true);if(!n.is(":visible")){var m=n.dataSM("parent-a");if(this.opts.keepHighlighted||this.isCollapsible()){m.addClass("highlighted")}if(this.isCollapsible()){n.removeClass("sm-nowrap").css({zIndex:"",width:"auto",minWidth:"",maxWidth:"",top:"",left:"",marginLeft:"",marginTop:""})}else{n.css("z-index",this.zIndexInc=(this.zIndexInc||this.getStartZIndex())+1);if(this.opts.subMenusMinWidth||this.opts.subMenusMaxWidth){n.css({width:"auto",minWidth:"",maxWidth:""}).addClass("sm-nowrap");if(this.opts.subMenusMinWidth){n.css("min-width",this.opts.subMenusMinWidth)}if(this.opts.subMenusMaxWidth){var o=this.getWidth(n);n.css("max-width",this.opts.subMenusMaxWidth);if(o>this.getWidth(n)){n.removeClass("sm-nowrap").css("width",this.opts.subMenusMaxWidth)}}}this.menuPosition(n);if(n.dataSM("ie-shim")){n.dataSM("ie-shim").insertBefore(n)}}var l=function(){n.css("overflow","")};if(this.isCollapsible()){if(this.opts.collapsibleShowFunction){this.opts.collapsibleShowFunction.call(this,n,l)}else{n.show(this.opts.collapsibleShowDuration,l)}}else{if(this.opts.showFunction){this.opts.showFunction.call(this,n,l)}else{n.show(this.opts.showDuration,l)}}m.attr("aria-expanded","true");n.attr({"aria-expanded":"true","aria-hidden":"false"});this.visibleSubMenus.push(n);this.$root.triggerHandler("show.smapi",n[0])}},popupHide:function(l){if(this.hideTimeout){clearTimeout(this.hideTimeout);this.hideTimeout=0}var m=this;this.hideTimeout=setTimeout(function(){m.menuHideAll()},l?1:this.opts.hideTimeout)},popupShow:function(o,n){if(!this.opts.isPopup){alert('SmartMenus jQuery Error:\n\nIf you want to show this menu via the "popupShow" method, set the isPopup:true option.');return}if(this.hideTimeout){clearTimeout(this.hideTimeout);this.hideTimeout=0}this.$root.dataSM("shown-before",true).stop(true,true);if(!this.$root.is(":visible")){this.$root.css({left:o,top:n});this.menuIframeShim(this.$root);if(this.$root.dataSM("ie-shim")){this.$root.dataSM("ie-shim").css({zIndex:this.$root.css("z-index"),width:this.getWidth(this.$root),height:this.getHeight(this.$root),left:o,top:n}).insertBefore(this.$root)}var m=this,l=function(){m.$root.css("overflow","")};if(this.opts.showFunction){this.opts.showFunction.call(this,this.$root,l)}else{this.$root.show(this.opts.showDuration,l)}this.visibleSubMenus[0]=this.$root}},refresh:function(){this.destroy(true);this.init(true)},rootKeyDown:function(o){if(!this.handleEvents()){return}switch(o.keyCode){case 27:var m=this.activatedItems[0];if(m){this.menuHideAll();m[0].focus();var n=m.dataSM("sub");if(n){this.menuHide(n)}}break;case 32:var l=a(o.target);if(l.is("a")&&this.handleItemEvents(l)){var n=l.dataSM("sub");if(n&&!n.is(":visible")){this.itemClick({currentTarget:o.target});o.preventDefault()}}break}},rootOut:function(m){if(!this.handleEvents()||this.isTouchMode()||m.target==this.$root[0]){return}if(this.hideTimeout){clearTimeout(this.hideTimeout);this.hideTimeout=0}if(!this.opts.showOnClick||!this.opts.hideOnClick){var l=this;this.hideTimeout=setTimeout(function(){l.menuHideAll()},this.opts.hideTimeout)}},rootOver:function(l){if(!this.handleEvents()||this.isTouchMode()||l.target==this.$root[0]){return}if(this.hideTimeout){clearTimeout(this.hideTimeout);this.hideTimeout=0}},winResize:function(m){if(!this.handleEvents()){if(this.$disableOverlay){var n=this.$root.offset();this.$disableOverlay.css({top:n.top,left:n.left,width:this.$root.outerWidth(),height:this.$root.outerHeight()})}return}if(!("onorientationchange" in window)||m.type=="orientationchange"){var l=this.isCollapsible();if(!(this.wasCollapsible&&l)){if(this.activatedItems.length){this.activatedItems[this.activatedItems.length-1][0].blur()}this.menuHideAll()}this.wasCollapsible=l}}}});a.fn.dataSM=function(l,m){if(m){return this.data(l+"_smartmenus",m)}return this.data(l+"_smartmenus")};a.fn.removeDataSM=function(l){return this.removeData(l+"_smartmenus")};a.fn.smartmenus=function(m){if(typeof m=="string"){var l=arguments,o=m;Array.prototype.shift.call(l);return this.each(function(){var p=a(this).data("smartmenus");if(p&&p[o]){p[o].apply(p,l)}})}var n=a.extend({},a.fn.smartmenus.defaults,m);return this.each(function(){new a.SmartMenus(this,n)})};a.fn.smartmenus.defaults={isPopup:false,mainMenuSubOffsetX:0,mainMenuSubOffsetY:0,subMenusSubOffsetX:0,subMenusSubOffsetY:0,subMenusMinWidth:"10em",subMenusMaxWidth:"20em",subIndicators:true,subIndicatorsPos:"prepend",subIndicatorsText:"+",scrollStep:30,scrollAccelerate:true,showTimeout:250,hideTimeout:500,showDuration:0,showFunction:null,hideDuration:0,hideFunction:function(m,l){m.fadeOut(200,l)},collapsibleShowDuration:0,collapsibleShowFunction:function(m,l){m.slideDown(200,l)},collapsibleHideDuration:0,collapsibleHideFunction:function(m,l){m.slideUp(200,l)},showOnClick:false,hideOnClick:true,noMouseOver:false,keepInViewport:true,keepHighlighted:true,markCurrentItem:false,markCurrentTree:true,rightToLeftSubMenus:false,bottomToTopSubMenus:false,overlapControlsInIE:true};return a}));
\ No newline at end of file
+(function(a){if(typeof define==="function"&&define.amd){define(["jquery"],a)}else{a(jQuery)}}(function(k){var A=k(document),s=k(window),w=k("body");var n="displayController",e="hasActiveHover",d="forcedOpen",u="hasMouseMove",f="mouseOnToPopup",g="originalTitle",y="powertip",o="powertipjq",l="powertiptarget",E=180/Math.PI;var c={isTipOpen:false,isFixedTipOpen:false,isClosing:false,tipOpenImminent:false,activeHover:null,currentX:0,currentY:0,previousX:0,previousY:0,desyncTimeout:null,mouseTrackingActive:false,delayInProgress:false,windowWidth:0,windowHeight:0,scrollTop:0,scrollLeft:0};var p={none:0,top:1,bottom:2,left:4,right:8};k.fn.powerTip=function(F,N){if(!this.length){return this}if(k.type(F)==="string"&&k.powerTip[F]){return k.powerTip[F].call(this,this,N)}var O=k.extend({},k.fn.powerTip.defaults,F),G=new x(O);h();this.each(function M(){var R=k(this),Q=R.data(y),P=R.data(o),T=R.data(l),S;if(R.data(n)){k.powerTip.destroy(R)}S=R.attr("title");if(!Q&&!T&&!P&&S){R.data(y,S);R.data(g,S);R.removeAttr("title")}R.data(n,new t(R,O,G))});if(!O.manual){this.on({"mouseenter.powertip":function J(P){k.powerTip.show(this,P)},"mouseleave.powertip":function L(){k.powerTip.hide(this)},"focus.powertip":function K(){k.powerTip.show(this)},"blur.powertip":function H(){k.powerTip.hide(this,true)},"keydown.powertip":function I(P){if(P.keyCode===27){k.powerTip.hide(this,true)}}})}return this};k.fn.powerTip.defaults={fadeInTime:200,fadeOutTime:100,followMouse:false,popupId:"powerTip",intentSensitivity:7,intentPollInterval:100,closeDelay:100,placement:"n",smartPlacement:false,offset:10,mouseOnToPopup:false,manual:false};k.fn.powerTip.smartPlacementLists={n:["n","ne","nw","s"],e:["e","ne","se","w","nw","sw","n","s","e"],s:["s","se","sw","n"],w:["w","nw","sw","e","ne","se","n","s","w"],nw:["nw","w","sw","n","s","se","nw"],ne:["ne","e","se","n","s","sw","ne"],sw:["sw","w","nw","s","n","ne","sw"],se:["se","e","ne","s","n","nw","se"],"nw-alt":["nw-alt","n","ne-alt","sw-alt","s","se-alt","w","e"],"ne-alt":["ne-alt","n","nw-alt","se-alt","s","sw-alt","e","w"],"sw-alt":["sw-alt","s","se-alt","nw-alt","n","ne-alt","w","e"],"se-alt":["se-alt","s","sw-alt","ne-alt","n","nw-alt","e","w"]};k.powerTip={show:function z(F,G){if(G){i(G);c.previousX=G.pageX;c.previousY=G.pageY;k(F).data(n).show()}else{k(F).first().data(n).show(true,true)}return F},reposition:function r(F){k(F).first().data(n).resetPosition();return F},hide:function D(G,F){if(G){k(G).first().data(n).hide(F)}else{if(c.activeHover){c.activeHover.data(n).hide(true)}}return G},destroy:function C(G){k(G).off(".powertip").each(function F(){var I=k(this),H=[g,n,e,d];if(I.data(g)){I.attr("title",I.data(g));H.push(y)}I.removeData(H)});return G}};k.powerTip.showTip=k.powerTip.show;k.powerTip.closeTip=k.powerTip.hide;function b(){var F=this;F.top="auto";F.left="auto";F.right="auto";F.bottom="auto";F.set=function(H,G){if(k.isNumeric(G)){F[H]=Math.round(G)}}}function t(K,N,F){var J=null;function L(P,Q){M();if(!K.data(e)){if(!P){c.tipOpenImminent=true;J=setTimeout(function O(){J=null;I()},N.intentPollInterval)}else{if(Q){K.data(d,true)}F.showTip(K)}}}function G(P){M();c.tipOpenImminent=false;if(K.data(e)){K.data(d,false);if(!P){c.delayInProgress=true;J=setTimeout(function O(){J=null;F.hideTip(K);c.delayInProgress=false},N.closeDelay)}else{F.hideTip(K)}}}function I(){var Q=Math.abs(c.previousX-c.currentX),O=Math.abs(c.previousY-c.currentY),P=Q+O;if(P<N.intentSensitivity){F.showTip(K)}else{c.previousX=c.currentX;c.previousY=c.currentY;L()}}function M(){J=clearTimeout(J);c.delayInProgress=false}function H(){F.resetPosition(K)}this.show=L;this.hide=G;this.cancel=M;this.resetPosition=H}function j(){function G(M,L,J,O,P){var K=L.split("-")[0],N=new b(),I;if(q(M)){I=H(M,K)}else{I=F(M,K)}switch(L){case"n":N.set("left",I.left-(J/2));N.set("bottom",c.windowHeight-I.top+P);break;case"e":N.set("left",I.left+P);N.set("top",I.top-(O/2));break;case"s":N.set("left",I.left-(J/2));N.set("top",I.top+P);break;case"w":N.set("top",I.top-(O/2));N.set("right",c.windowWidth-I.left+P);break;case"nw":N.set("bottom",c.windowHeight-I.top+P);N.set("right",c.windowWidth-I.left-20);break;case"nw-alt":N.set("left",I.left);N.set("bottom",c.windowHeight-I.top+P);break;case"ne":N.set("left",I.left-20);N.set("bottom",c.windowHeight-I.top+P);break;case"ne-alt":N.set("bottom",c.windowHeight-I.top+P);N.set("right",c.windowWidth-I.left);break;case"sw":N.set("top",I.top+P);N.set("right",c.windowWidth-I.left-20);break;case"sw-alt":N.set("left",I.left);N.set("top",I.top+P);break;case"se":N.set("left",I.left-20);N.set("top",I.top+P);break;case"se-alt":N.set("top",I.top+P);N.set("right",c.windowWidth-I.left);break}return N}function F(K,J){var O=K.offset(),N=K.outerWidth(),I=K.outerHeight(),M,L;switch(J){case"n":M=O.left+N/2;L=O.top;break;case"e":M=O.left+N;L=O.top+I/2;break;case"s":M=O.left+N/2;L=O.top+I;break;case"w":M=O.left;L=O.top+I/2;break;case"nw":M=O.left;L=O.top;break;case"ne":M=O.left+N;L=O.top;break;case"sw":M=O.left;L=O.top+I;break;case"se":M=O.left+N;L=O.top+I;break}return{top:L,left:M}}function H(O,K){var S=O.closest("svg")[0],N=O[0],W=S.createSVGPoint(),L=N.getBBox(),V=N.getScreenCTM(),M=L.width/2,Q=L.height/2,P=[],I=["nw","n","ne","e","se","s","sw","w"],U,X,R,T;function J(){P.push(W.matrixTransform(V))}W.x=L.x;W.y=L.y;J();W.x+=M;J();W.x+=M;J();W.y+=Q;J();W.y+=Q;J();W.x-=M;J();W.x-=M;J();W.y-=Q;J();if(P[0].y!==P[1].y||P[0].x!==P[7].x){X=Math.atan2(V.b,V.a)*E;R=Math.ceil(((X%360)-22.5)/45);if(R<1){R+=8}while(R--){I.push(I.shift())}}for(T=0;T<P.length;T++){if(I[T]===K){U=P[T];break}}return{top:U.y+c.scrollTop,left:U.x+c.scrollLeft}}this.compute=G}function x(Q){var P=new j(),O=k("#"+Q.popupId);if(O.length===0){O=k("<div/>",{id:Q.popupId});if(w.length===0){w=k("body")}w.append(O)}if(Q.followMouse){if(!O.data(u)){A.on("mousemove",M);s.on("scroll",M);O.data(u,true)}}if(Q.mouseOnToPopup){O.on({mouseenter:function L(){if(O.data(f)){if(c.activeHover){c.activeHover.data(n).cancel()}}},mouseleave:function N(){if(c.activeHover){c.activeHover.data(n).hide()}}})}function I(S){S.data(e,true);O.queue(function R(T){H(S);T()})}function H(S){var U;if(!S.data(e)){return}if(c.isTipOpen){if(!c.isClosing){K(c.activeHover)}O.delay(100).queue(function R(V){H(S);V()});return}S.trigger("powerTipPreRender");U=B(S);if(U){O.empty().append(U)}else{return}S.trigger("powerTipRender");c.activeHover=S;c.isTipOpen=true;O.data(f,Q.mouseOnToPopup);if(!Q.followMouse){G(S);c.isFixedTipOpen=true}else{M()}O.fadeIn(Q.fadeInTime,function T(){if(!c.desyncTimeout){c.desyncTimeout=setInterval(J,500)}S.trigger("powerTipOpen")})}function K(R){c.isClosing=true;c.activeHover=null;c.isTipOpen=false;c.desyncTimeout=clearInterval(c.desyncTimeout);R.data(e,false);R.data(d,false);O.fadeOut(Q.fadeOutTime,function S(){var T=new b();c.isClosing=false;c.isFixedTipOpen=false;O.removeClass();T.set("top",c.currentY+Q.offset);T.set("left",c.currentX+Q.offset);O.css(T);R.trigger("powerTipClose")})}function M(){if(!c.isFixedTipOpen&&(c.isTipOpen||(c.tipOpenImminent&&O.data(u)))){var R=O.outerWidth(),V=O.outerHeight(),U=new b(),S,T;U.set("top",c.currentY+Q.offset);U.set("left",c.currentX+Q.offset);S=m(U,R,V);if(S!==p.none){T=a(S);if(T===1){if(S===p.right){U.set("left",c.windowWidth-R)}else{if(S===p.bottom){U.set("top",c.scrollTop+c.windowHeight-V)}}}else{U.set("left",c.currentX-R-Q.offset);U.set("top",c.currentY-V-Q.offset)}}O.css(U)}}function G(S){var R,T;if(Q.smartPlacement){R=k.fn.powerTip.smartPlacementLists[Q.placement];k.each(R,function(U,W){var V=m(F(S,W),O.outerWidth(),O.outerHeight());T=W;if(V===p.none){return false}})}else{F(S,Q.placement);T=Q.placement}O.addClass(T)}function F(U,T){var R=0,S,W,V=new b();V.set("top",0);V.set("left",0);O.css(V);do{S=O.outerWidth();W=O.outerHeight();V=P.compute(U,T,S,W,Q.offset);O.css(V)}while(++R<=5&&(S!==O.outerWidth()||W!==O.outerHeight()));return V}function J(){var R=false;if(c.isTipOpen&&!c.isClosing&&!c.delayInProgress){if(c.activeHover.data(e)===false||c.activeHover.is(":disabled")){R=true}else{if(!v(c.activeHover)&&!c.activeHover.is(":focus")&&!c.activeHover.data(d)){if(O.data(f)){if(!v(O)){R=true}}else{R=true}}}if(R){K(c.activeHover)}}}this.showTip=I;this.hideTip=K;this.resetPosition=G}function q(F){return window.SVGElement&&F[0] instanceof SVGElement}function h(){if(!c.mouseTrackingActive){c.mouseTrackingActive=true;k(function H(){c.scrollLeft=s.scrollLeft();c.scrollTop=s.scrollTop();c.windowWidth=s.width();c.windowHeight=s.height()});A.on("mousemove",i);s.on({resize:function G(){c.windowWidth=s.width();c.windowHeight=s.height()},scroll:function F(){var I=s.scrollLeft(),J=s.scrollTop();if(I!==c.scrollLeft){c.currentX+=I-c.scrollLeft;c.scrollLeft=I}if(J!==c.scrollTop){c.currentY+=J-c.scrollTop;c.scrollTop=J}}})}}function i(F){c.currentX=F.pageX;c.currentY=F.pageY}function v(F){var H=F.offset(),J=F[0].getBoundingClientRect(),I=J.right-J.left,G=J.bottom-J.top;return c.currentX>=H.left&&c.currentX<=H.left+I&&c.currentY>=H.top&&c.currentY<=H.top+G}function B(I){var G=I.data(y),F=I.data(o),K=I.data(l),H,J;if(G){if(k.isFunction(G)){G=G.call(I[0])}J=G}else{if(F){if(k.isFunction(F)){F=F.call(I[0])}if(F.length>0){J=F.clone(true,true)}}else{if(K){H=k("#"+K);if(H.length>0){J=H.html()}}}}return J}function m(M,L,K){var G=c.scrollTop,J=c.scrollLeft,I=G+c.windowHeight,F=J+c.windowWidth,H=p.none;if(M.top<G||Math.abs(M.bottom-c.windowHeight)-K<G){H|=p.top}if(M.top+K>I||Math.abs(M.bottom-c.windowHeight)>I){H|=p.bottom}if(M.left<J||M.right+L>F){H|=p.left}if(M.left+L>F||M.right<J){H|=p.right}return H}function a(G){var F=0;while(G){G&=G-1;F++}return F}}));
\ No newline at end of file
diff --git a/doc/html/md_C b/doc/html/md_C
new file mode 100644
index 0000000..e69de29
diff --git a/doc/html/navtree.css b/doc/html/navtree.css
index e7e9a1e..128ae40 100644
--- a/doc/html/navtree.css
+++ b/doc/html/navtree.css
@@ -94,11 +94,8 @@
 }
 
 .ui-resizable-e {
-  background-image:url("splitbar.png");
-  background-size:100%;
-  background-repeat:no-repeat;
-  background-attachment: scroll;
-  cursor:ew-resize;
+  background:url("splitbar.png") repeat scroll right center transparent;
+  cursor:e-resize;
   height:100%;
   right:0;
   top:0;
diff --git a/doc/html/navtree.js b/doc/html/navtree.js
index e6d31b0..9df45a7 100644
--- a/doc/html/navtree.js
+++ b/doc/html/navtree.js
@@ -1,6 +1,4 @@
 var navTreeSubIndices = new Array();
-var arrowDown = '&#9660;';
-var arrowRight = '&#9658;';
 
 function getData(varName)
 {
@@ -73,17 +71,17 @@ function cachedLink()
 
 function getScript(scriptName,func,show)
 {
-  var head = document.getElementsByTagName("head")[0];
+  var head = document.getElementsByTagName("head")[0]; 
   var script = document.createElement('script');
   script.id = scriptName;
   script.type = 'text/javascript';
-  script.onload = func;
-  script.src = scriptName+'.js';
-  if ($.browser.msie && $.browser.version<=8) {
+  script.onload = func; 
+  script.src = scriptName+'.js'; 
+  if ($.browser.msie && $.browser.version<=8) { 
     // script.onload does not work with older versions of IE
     script.onreadystatechange = function() {
-      if (script.readyState=='complete' || script.readyState=='loaded') {
-        func(); if (show) showRoot();
+      if (script.readyState=='complete' || script.readyState=='loaded') { 
+        func(); if (show) showRoot(); 
       }
     }
   }
@@ -96,17 +94,18 @@ function createIndent(o,domNode,node,level)
   var n = node;
   while (n.parentNode) { level++; n=n.parentNode; }
   if (node.childrenData) {
-    var imgNode = document.createElement("span");
-    imgNode.className = 'arrow';
+    var imgNode = document.createElement("img");
     imgNode.style.paddingLeft=(16*level).toString()+'px';
-    imgNode.innerHTML=arrowRight;
+    imgNode.width  = 16;
+    imgNode.height = 22;
+    imgNode.border = 0;
     node.plus_img = imgNode;
     node.expandToggle = document.createElement("a");
     node.expandToggle.href = "javascript:void(0)";
     node.expandToggle.onclick = function() {
       if (node.expanded) {
         $(node.getChildrenUL()).slideUp("fast");
-        node.plus_img.innerHTML=arrowRight;
+        node.plus_img.src = node.relpath+"arrowright.png";
         node.expanded = false;
       } else {
         expandNode(o, node, false, false);
@@ -114,13 +113,15 @@ function createIndent(o,domNode,node,level)
     }
     node.expandToggle.appendChild(imgNode);
     domNode.appendChild(node.expandToggle);
+    imgNode.src = node.relpath+"arrowright.png";
   } else {
     var span = document.createElement("span");
-    span.className = 'arrow';
+    span.style.display = 'inline-block';
     span.style.width   = 16*(level+1)+'px';
+    span.style.height  = '22px';
     span.innerHTML = '&#160;';
     domNode.appendChild(span);
-  }
+  } 
 }
 
 var animationInProgress = false;
@@ -194,7 +195,7 @@ function newNode(o, po, text, link, childrenData, lastNode)
       var aname = '#'+link.split('#')[1];
       var srcPage = stripPath(pathName());
       var targetPage = stripPath(link.split('#')[0]);
-      a.href = srcPage!=targetPage ? url : "javascript:void(0)";
+      a.href = srcPage!=targetPage ? url : "javascript:void(0)"; 
       a.onclick = function(){
         storeLink(link);
         if (!$(a).parent().parent().hasClass('selected'))
@@ -212,7 +213,7 @@ function newNode(o, po, text, link, childrenData, lastNode)
       a.onclick = function() { storeLink(link); }
     }
   } else {
-    if (childrenData != null)
+    if (childrenData != null) 
     {
       a.className = "nolink";
       a.href = "javascript:void(0)";
@@ -261,13 +262,17 @@ function expandNode(o, node, imm, showRoot)
     } else {
       if (!node.childrenVisited) {
         getNode(o, node);
-      } if (imm || ($.browser.msie && $.browser.version>8)) {
+      } if (imm || ($.browser.msie && $.browser.version>8)) { 
         // somehow slideDown jumps to the start of tree for IE9 :-(
         $(node.getChildrenUL()).show();
       } else {
         $(node.getChildrenUL()).slideDown("fast");
       }
-      node.plus_img.innerHTML = arrowDown;
+      if (node.isLast) {
+        node.plus_img.src = node.relpath+"arrowdown.png";
+      } else {
+        node.plus_img.src = node.relpath+"arrowdown.png";
+      }
       node.expanded = true;
     }
   }
@@ -336,7 +341,7 @@ function showNode(o, node, index, hash)
         getNode(o, node);
       }
       $(node.getChildrenUL()).css({'display':'block'});
-      node.plus_img.innerHTML = arrowDown;
+      node.plus_img.src = node.relpath+"arrowdown.png";
       node.expanded = true;
       var n = node.children[o.breadcrumbs[index]];
       if (index+1<o.breadcrumbs.length) {
@@ -473,9 +478,10 @@ function initNavTree(toroot,relpath)
   o.node.relpath = relpath;
   o.node.expanded = false;
   o.node.isLast = true;
-  o.node.plus_img = document.createElement("span");
-  o.node.plus_img.className = 'arrow';
-  o.node.plus_img.innerHTML = arrowRight;
+  o.node.plus_img = document.createElement("img");
+  o.node.plus_img.src = relpath+"arrowright.png";
+  o.node.plus_img.width = 16;
+  o.node.plus_img.height = 22;
 
   if (localStorageSupported()) {
     var navSync = $('#nav-sync');
diff --git a/doc/html/navtreedata.js b/doc/html/navtreedata.js
index 10a3659..7cb0fe9 100644
--- a/doc/html/navtreedata.js
+++ b/doc/html/navtreedata.js
@@ -2,7 +2,7 @@ var NAVTREE =
 [
   [ "NVIDIAGeForceExperienceSDK", "index.html", [
     [ "Development Guide", "index.html", null ],
-    [ "Changelog", "md__c_1_u_workspace_dev_sdkwinauto_doc__c_h_a_n_g_e_l_o_g.html", null ],
+    [ "Changelog", "md_C:_u_workspace_dev_sdkwinauto_doc_CHANGELOG.html", null ],
     [ "Classes", "annotated.html", [
       [ "Class List", "annotated.html", "annotated_dup" ],
       [ "Class Index", "classes.html", null ],
diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js
index b19432e..18d2b92 100644
--- a/doc/html/navtreeindex0.js
+++ b/doc/html/navtreeindex0.js
@@ -18,7 +18,6 @@ var NAVTREEINDEX0 =
 "class_gfe_s_d_k_1_1_core_impl.html#ae18b5099054ba29e309259c47462cc25":[2,0,4,1,7],
 "class_gfe_s_d_k_1_1_core_impl.html#ae6471c6a01e1a96d23d375d803ba28be":[2,0,4,1,4],
 "class_gfe_s_d_k_1_1_highlights.html":[2,0,4,12],
-"class_gfe_s_d_k_1_1_highlights.html#a593d1bd58183bc0b53c7dee7991d8491":[2,0,4,12,2],
 "class_gfe_s_d_k_1_1_highlights.html#a84475c751b97bf00d55e767b55e89bff":[2,0,4,12,5],
 "class_gfe_s_d_k_1_1_highlights.html#a8e522535c3393a1911e2bbb65c71eb52":[2,0,4,12,1],
 "class_gfe_s_d_k_1_1_highlights.html#a982f27414a0672d50f6f156ecf557791":[2,0,4,12,6],
@@ -27,6 +26,7 @@ var NAVTREEINDEX0 =
 "class_gfe_s_d_k_1_1_highlights.html#ab1b35bd4fe9e8aac357db3aeabfefa1b":[2,0,4,12,3],
 "class_gfe_s_d_k_1_1_highlights.html#ac53536039527813888e5404a3a20e4ab":[2,0,4,12,4],
 "class_gfe_s_d_k_1_1_highlights.html#ad640f12621aa2ab8f0bf39b859f8d849":[2,0,4,12,8],
+"class_gfe_s_d_k_1_1_highlights.html#add1016d23068c8f2dd0cd037210aa14b":[2,0,4,12,2],
 "class_gfe_s_d_k_1_1_highlights_impl.html":[2,0,4,13],
 "class_gfe_s_d_k_1_1_highlights_impl.html#a10ec6fa65e8afb5ea417f4cfe7f1d5ab":[2,0,4,13,4],
 "class_gfe_s_d_k_1_1_highlights_impl.html#a22481d623b4124cd7277b30a70a11fad":[2,0,4,13,3],
@@ -35,18 +35,18 @@ var NAVTREEINDEX0 =
 "class_gfe_s_d_k_1_1_highlights_impl.html#a8420e07f1812fba8bf961e90e5795d3b":[2,0,4,13,2],
 "class_gfe_s_d_k_1_1_highlights_impl.html#ab31f1319b9dcf33cf9146916f8a1d5f3":[2,0,4,13,6],
 "class_gfe_s_d_k_1_1_highlights_impl.html#ab4989563440e14295449166c626ac3a9":[2,0,4,13,5],
-"class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040":[2,0,4,13,1],
+"class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f":[2,0,4,13,1],
 "class_gfe_s_d_k_1_1_highlights_impl.html#adfee0bca7a525fd81406d719ad1aaed9":[2,0,4,13,0],
 "classes.html":[2,1],
 "config_8h_source.html":[3,0,0,0,0,0],
-"dir_21dfd2273a7f43571f69ea7d9a7bef28.html":[3,0,0],
+"dir_0e11d6b9f607d0ef730b98f1fc6a7102.html":[3,0,0,0,0],
+"dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html":[3,0,0],
 "dir_2f4536f343cdc104d7b83de3fff7416d.html":[3,0,1,0,0,1],
 "dir_37f49c9d6a230916a5077fbd270eac2a.html":[3,0,1,0],
 "dir_4522e853adfb3285c34ceee6be627ffe.html":[3,0,1],
 "dir_9e1fb0299a0600dff10179bfe2b8a156.html":[3,0,1,0,0,0,0,0],
 "dir_ab8ba62fc8fdaf78364406bae0a66d43.html":[3,0,1,0,0,0,0],
-"dir_c8951a4514ffd6dca1d0bd1443098010.html":[3,0,0,0],
-"dir_e789e2e8a554a90f7e478c85f971e5ee.html":[3,0,0,0,0],
+"dir_e31eb9cae286691b323708fcb3cc0b5c.html":[3,0,0,0],
 "dir_eb56eea0ff74c30c2a48b22915222057.html":[3,0,1,0,0],
 "dir_f78f74a3131a0cfd456c5ed856861cff.html":[3,0,1,0,0,0],
 "files.html":[3,0],
@@ -61,8 +61,8 @@ var NAVTREEINDEX0 =
 "globals_type.html":[3,1,2],
 "hierarchy.html":[2,2],
 "highlights__types_8h.html":[3,0,1,0,0,1,0],
-"highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0":[3,0,1,0,0,1,0,12],
-"highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9":[3,0,1,0,0,1,0,11],
+"highlights__types_8h.html#a69743e304d126860275dec9f1335f16f":[3,0,1,0,0,1,0,12],
+"highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6":[3,0,1,0,0,1,0,11],
 "highlights__types_8h_source.html":[3,0,1,0,0,1,0],
 "highlights__types__cpp_8h_source.html":[3,0,1,0,0,0,0,0,0],
 "ihighlights_8h.html":[3,0,1,0,0,1,1],
@@ -115,19 +115,18 @@ var NAVTREEINDEX0 =
 "isdk__cpp_8h_source.html":[3,0,1,0,0,0,0,1],
 "isdk__cpp__impl_8h.html":[3,0,1,0,0,0,0,2],
 "isdk__cpp__impl_8h_source.html":[3,0,1,0,0,0,0,2],
-"md__c_1_u_workspace_dev_sdkwinauto_doc__c_h_a_n_g_e_l_o_g.html":[1],
+"md_C:_u_workspace_dev_sdkwinauto_doc_CHANGELOG.html":[1],
 "os__defines_8h_source.html":[3,0,1,0,0,3],
 "pages.html":[],
 "sdk__types_8h.html":[3,0,1,0,0,4],
 "sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac":[3,0,1,0,0,4,14],
-"sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e":[3,0,1,0,0,4,15],
 "sdk__types_8h.html#a383fe79c6f8cbcefdd3851311c79dc38":[3,0,1,0,0,4,19],
 "sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59":[3,0,1,0,0,4,17],
 "sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59a48f6024fe57066b62087872b05ad8c67":[3,0,1,0,0,4,17,2],
 "sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59aa833a35cd4938b11579b3f22c1e346d7":[3,0,1,0,0,4,17,1],
 "sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115":[3,0,1,0,0,4,17,0],
+"sdk__types_8h.html#a566dcf90cf24d750d3f2cdd0133a7f80":[3,0,1,0,0,4,13],
 "sdk__types_8h.html#a5e7291fcbabe1eb01aaf45832f67e4d9":[3,0,1,0,0,4,10],
-"sdk__types_8h.html#a8a2bd9c66dc5657faea5603d2f44b6f7":[3,0,1,0,0,4,13],
 "sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857":[3,0,1,0,0,4,16],
 "sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857a29a17d48238f5658a1ac4de23b59e9fc":[3,0,1,0,0,4,16,2],
 "sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857a344d28d16c37e37ace6691ec8a3e21fc":[3,0,1,0,0,4,16,0],
@@ -136,8 +135,9 @@ var NAVTREEINDEX0 =
 "sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857acbf6d8e9bbe4968749bcaa59b3a2302e":[3,0,1,0,0,4,16,5],
 "sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857af4fd2befa34e4d6b6c30d942c01534c4":[3,0,1,0,0,4,16,4],
 "sdk__types_8h.html#aa02df902597c4bb232e4015536659b75":[3,0,1,0,0,4,18],
+"sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a":[3,0,1,0,0,4,15],
 "sdk__types_8h.html#aadea61767b96d0a17f2943170f9a6924":[3,0,1,0,0,4,11],
-"sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312":[3,0,1,0,0,4,12],
+"sdk__types_8h.html#ab13929e496dd1748a31088399519252a":[3,0,1,0,0,4,12],
 "sdk__types_8h_source.html":[3,0,1,0,0,4],
 "sdk__types__cpp_8h_source.html":[3,0,1,0,0,0,0,3],
 "sdk__types__ipc_8h_source.html":[3,0,0,0,0,2],
diff --git a/doc/html/os__defines_8h_source.html b/doc/html/os__defines_8h_source.html
index 27c790f..2bb127d 100644
--- a/doc/html/os__defines_8h_source.html
+++ b/doc/html/os__defines_8h_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/os_defines.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -94,7 +119,7 @@ $(document).ready(function(){initNavTree('os__defines_8h_source.html','');});
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><b>os_defines.h</b></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/pages.html b/doc/html/pages.html
index a60af89..d185e84 100644
--- a/doc/html/pages.html
+++ b/doc/html/pages.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Related Pages</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,34 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li class="current"><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -87,7 +106,7 @@ $(document).ready(function(){initNavTree('pages.html','');});
 <div class="contents">
 <div class="textblock">Here is a list of all related documentation pages:</div><div class="directory">
 <table class="directory">
-<tr id="row_0_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md__c_1_u_workspace_dev_sdkwinauto_doc__c_h_a_n_g_e_l_o_g.html" target="_self">Changelog</a></td><td class="desc"></td></tr>
+<tr id="row_0_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="md_C:_u_workspace_dev_sdkwinauto_doc_CHANGELOG.html" target="_self">Changelog</a></td><td class="desc"></td></tr>
 </table>
 </div><!-- directory -->
 </div><!-- contents -->
@@ -98,7 +117,7 @@ $(document).ready(function(){initNavTree('pages.html','');});
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/resize.js b/doc/html/resize.js
index 6d78f5b..2b86c36 100644
--- a/doc/html/resize.js
+++ b/doc/html/resize.js
@@ -1,113 +1,97 @@
-function initResizable()
-{
-  var cookie_namespace = 'doxygen';
-  var sidenav,navtree,content,header,collapsed,collapsedWidth=0,barWidth=6,desktop_vp=768,titleHeight;
+var cookie_namespace = 'doxygen'; 
+var sidenav,navtree,content,header;
 
-  function readCookie(cookie)
+function readCookie(cookie) 
+{
+  var myCookie = cookie_namespace+"_"+cookie+"=";
+  if (document.cookie) 
   {
-    var myCookie = cookie_namespace+"_"+cookie+"=";
-    if (document.cookie) {
-      var index = document.cookie.indexOf(myCookie);
-      if (index != -1) {
-        var valStart = index + myCookie.length;
-        var valEnd = document.cookie.indexOf(";", valStart);
-        if (valEnd == -1) {
-          valEnd = document.cookie.length;
-        }
-        var val = document.cookie.substring(valStart, valEnd);
-        return val;
+    var index = document.cookie.indexOf(myCookie);
+    if (index != -1) 
+    {
+      var valStart = index + myCookie.length;
+      var valEnd = document.cookie.indexOf(";", valStart);
+      if (valEnd == -1) 
+      {
+        valEnd = document.cookie.length;
       }
+      var val = document.cookie.substring(valStart, valEnd);
+      return val;
     }
-    return 0;
-  }
-
-  function writeCookie(cookie, val, expiration)
-  {
-    if (val==undefined) return;
-    if (expiration == null) {
-      var date = new Date();
-      date.setTime(date.getTime()+(10*365*24*60*60*1000)); // default expiration is one week
-      expiration = date.toGMTString();
-    }
-    document.cookie = cookie_namespace + "_" + cookie + "=" + val + "; expires=" + expiration+"; path=/";
-  }
-
-  function resizeWidth()
-  {
-    var windowWidth = $(window).width() + "px";
-    var sidenavWidth = $(sidenav).outerWidth();
-    content.css({marginLeft:parseInt(sidenavWidth)+"px"});
-    writeCookie('width',sidenavWidth-barWidth, null);
   }
+  return 0;
+}
 
-  function restoreWidth(navWidth)
+function writeCookie(cookie, val, expiration) 
+{
+  if (val==undefined) return;
+  if (expiration == null) 
   {
-    var windowWidth = $(window).width() + "px";
-    content.css({marginLeft:parseInt(navWidth)+barWidth+"px"});
-    sidenav.css({width:navWidth + "px"});
+    var date = new Date();
+    date.setTime(date.getTime()+(10*365*24*60*60*1000)); // default expiration is one week
+    expiration = date.toGMTString();
   }
+  document.cookie = cookie_namespace + "_" + cookie + "=" + val + "; expires=" + expiration+"; path=/";
+}
+ 
+function resizeWidth() 
+{
+  var windowWidth = $(window).width() + "px";
+  var sidenavWidth = $(sidenav).outerWidth();
+  content.css({marginLeft:parseInt(sidenavWidth)+"px"}); 
+  writeCookie('width',sidenavWidth, null);
+}
 
-  function resizeHeight()
-  {
-    var headerHeight = header.outerHeight();
-    var footerHeight = footer.outerHeight();
-    var windowHeight = $(window).height() - headerHeight - footerHeight;
-    content.css({height:windowHeight + "px"});
-    navtree.css({height:windowHeight + "px"});
-    sidenav.css({height:windowHeight + "px"});
-    var width=$(window).width();
-    if (width!=collapsedWidth) {
-      if (width<desktop_vp && collapsedWidth>=desktop_vp) {
-        if (!collapsed) {
-          collapseExpand();
-        }
-      } else if (width>desktop_vp && collapsedWidth<desktop_vp) {
-        if (collapsed) {
-          collapseExpand();
-        }
-      }
-      collapsedWidth=width;
-    }
-  }
+function restoreWidth(navWidth)
+{
+  var windowWidth = $(window).width() + "px";
+  content.css({marginLeft:parseInt(navWidth)+6+"px"});
+  sidenav.css({width:navWidth + "px"});
+}
 
-  function collapseExpand()
-  {
-    if (sidenav.width()>0) {
-      restoreWidth(0);
-      collapsed=true;
-    }
-    else {
-      var width = readCookie('width');
-      if (width>200 && width<$(window).width()) { restoreWidth(width); } else { restoreWidth(200); }
-      collapsed=false;
-    }
-  }
+function resizeHeight() 
+{
+  var headerHeight = header.outerHeight();
+  var footerHeight = footer.outerHeight();
+  var windowHeight = $(window).height() - headerHeight - footerHeight;
+  content.css({height:windowHeight + "px"});
+  navtree.css({height:windowHeight + "px"});
+  sidenav.css({height:windowHeight + "px"});
+}
 
+function initResizable()
+{
   header  = $("#top");
   sidenav = $("#side-nav");
   content = $("#doc-content");
   navtree = $("#nav-tree");
   footer  = $("#nav-path");
   $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
-  $(sidenav).resizable({ minWidth: 0 });
   $(window).resize(function() { resizeHeight(); });
-  var device = navigator.userAgent.toLowerCase();
-  var touch_device = device.match(/(iphone|ipod|ipad|android)/);
-  if (touch_device) { /* wider split bar for touch only devices */
-    $(sidenav).css({ paddingRight:'20px' });
-    $('.ui-resizable-e').css({ width:'20px' });
-    $('#nav-sync').css({ right:'34px' });
-    barWidth=20;
-  }
   var width = readCookie('width');
   if (width) { restoreWidth(width); } else { resizeWidth(); }
+  resizeHeight();
   var url = location.href;
   var i=url.indexOf("#");
   if (i>=0) window.location.hash=url.substr(i);
   var _preventDefault = function(evt) { evt.preventDefault(); };
   $("#splitbar").bind("dragstart", _preventDefault).bind("selectstart", _preventDefault);
-  $(".ui-resizable-handle").dblclick(collapseExpand);
-  $(window).load(resizeHeight);
+  $(document).bind('touchmove',function(e){
+    var device = navigator.userAgent.toLowerCase();
+    var ios = device.match(/(iphone|ipod|ipad)/);
+    if (ios) {
+      try {
+        var target = e.target;
+        while (target) {
+          if ($(target).css('-webkit-overflow-scrolling')=='touch') return;
+          target = target.parentNode;
+        }
+        e.preventDefault();
+      } catch(err) {
+        e.preventDefault();
+      }
+    }
+  });
 }
 
 
diff --git a/doc/html/sdk__types_8h.html b/doc/html/sdk__types_8h.html
index 2c6760e..d850f8f 100644
--- a/doc/html/sdk__types_8h.html
+++ b/doc/html/sdk__types_8h.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/sdk_types.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -95,31 +120,6 @@ $(document).ready(function(){initNavTree('sdk__types_8h.html','');});
 <code>#include &lt;stdbool.h&gt;</code><br />
 <code>#include &lt;gfesdk/os_defines.h&gt;</code><br />
 <code>#include &lt;gfesdk/sdk_types_ipc.h&gt;</code><br />
-</div><div class="textblock"><div class="dynheader">
-Include dependency graph for sdk_types.h:</div>
-<div class="dyncontent">
-<div class="center"><img src="sdk__types_8h__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2sdk__types_8h" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2sdk__types_8h" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2sdk__types_8h">
-<area shape="rect" id="node4" href="os__defines_8h_source.html" title="gfesdk/os_defines.h" alt="" coords="147,109,284,136"/>
-<area shape="rect" id="node5" href="sdk__types__ipc_8h_source.html" title="gfesdk/sdk_types_ipc.h" alt="" coords="308,109,467,136"/>
-</map>
-</div>
-</div><div class="textblock"><div class="dynheader">
-This graph shows which files directly or indirectly include this file:</div>
-<div class="dyncontent">
-<div class="center"><img src="sdk__types_8h__dep__incl.png" border="0" usemap="#_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2sdk__types_8hdep" alt=""/></div>
-<map name="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2sdk__types_8hdep" id="_c_1_2u_2workspace_2dev_2sdkwinauto_2sdkclient_2include_2gfesdk_2sdk__types_8hdep">
-<area shape="rect" id="node2" href="sdk__types__cpp_8h_source.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/sdk_types_cpp.h" alt="" coords="209,109,370,180"/>
-<area shape="rect" id="node8" href="highlights__types_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/highlights\l/highlights_types.h" alt="" coords="16,109,184,180"/>
-<area shape="rect" id="node10" href="isdk_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/isdk.h" alt="" coords="394,117,542,173"/>
-<area shape="rect" id="node3" href="highlights__types__cpp_8h_source.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/highlights\l_types_cpp.h" alt="" coords="197,228,363,313"/>
-<area shape="rect" id="node6" href="isdk__cpp_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/isdk_cpp.h" alt="" coords="387,235,549,306"/>
-<area shape="rect" id="node4" href="ihighlights__cpp_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights_cpp.h" alt="" coords="166,361,373,432"/>
-<area shape="rect" id="node5" href="ihighlights__cpp__impl_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/highlights/ihighlights\l_cpp_impl.h" alt="" coords="289,480,457,565"/>
-<area shape="rect" id="node7" href="isdk__cpp__impl_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/bindings\l/cpp/isdk_cpp_impl.h" alt="" coords="397,361,558,432"/>
-<area shape="rect" id="node9" href="ihighlights_8h.html" title="C:/u/workspace/dev\l/sdkwinauto/sdkclient\l/include/gfesdk/highlights\l/ihighlights.h" alt="" coords="5,235,173,306"/>
-</map>
-</div>
 </div>
 <p><a href="sdk__types_8h_source.html">Go to the source code of this file.</a></p>
 <table class="memberdecls">
@@ -148,24 +148,24 @@ Classes</h2></td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
 Macros</h2></td></tr>
-<tr class="memitem:a5e7291fcbabe1eb01aaf45832f67e4d9"><td class="memItemLeft" align="right" valign="top"><a id="a5e7291fcbabe1eb01aaf45832f67e4d9"></a>
+<tr class="memitem:a5e7291fcbabe1eb01aaf45832f67e4d9"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5e7291fcbabe1eb01aaf45832f67e4d9"></a>
 #define&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_MAX_LENGTH</b>&#160;&#160;&#160;256</td></tr>
 <tr class="separator:a5e7291fcbabe1eb01aaf45832f67e4d9"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr class="memitem:aadea61767b96d0a17f2943170f9a6924"><td class="memItemLeft" align="right" valign="top"><a id="aadea61767b96d0a17f2943170f9a6924"></a>
+<tr class="memitem:aadea61767b96d0a17f2943170f9a6924"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aadea61767b96d0a17f2943170f9a6924"></a>
 typedef struct NVGSDK_HANDLE&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_HANDLE</b></td></tr>
 <tr class="separator:aadea61767b96d0a17f2943170f9a6924"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afdec7c9f24e19fb84c5faf34d77e9312"><td class="memItemLeft" align="right" valign="top">typedef void(__stdcall *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">NVGSDK_LoggingCallback</a>) (<a class="el" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level, char const *message)</td></tr>
-<tr class="separator:afdec7c9f24e19fb84c5faf34d77e9312"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a8a2bd9c66dc5657faea5603d2f44b6f7"><td class="memItemLeft" align="right" valign="top"><a id="a8a2bd9c66dc5657faea5603d2f44b6f7"></a>
+<tr class="memitem:ab13929e496dd1748a31088399519252a"><td class="memItemLeft" align="right" valign="top">typedef void(__stdcall *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">NVGSDK_LoggingCallback</a>) (<a class="el" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level, char const *message)</td></tr>
+<tr class="separator:ab13929e496dd1748a31088399519252a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a566dcf90cf24d750d3f2cdd0133a7f80"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a566dcf90cf24d750d3f2cdd0133a7f80"></a>
 typedef void(__stdcall *&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_NotificationCallback</b>) (<a class="el" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59">NVGSDK_NotificationType</a>, <a class="el" href="struct_n_v_g_s_d_k___notification.html">NVGSDK_Notification</a> const *response, void *context)</td></tr>
-<tr class="separator:a8a2bd9c66dc5657faea5603d2f44b6f7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="separator:a566dcf90cf24d750d3f2cdd0133a7f80"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a1c5cd84ed88c70462c360a7268eb95ac"><td class="memItemLeft" align="right" valign="top">typedef void(__stdcall *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a>) (NVGSDK_RetCode, void *)</td></tr>
 <tr class="separator:a1c5cd84ed88c70462c360a7268eb95ac"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a25a1eb6d5c4697e50ebdebb500d0500e"><td class="memItemLeft" align="right" valign="top">typedef void(__stdcall *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e">NVGSDK_GetUILanguageCallback</a>) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___language.html">NVGSDK_Language</a> const *, void *)</td></tr>
-<tr class="separator:a25a1eb6d5c4697e50ebdebb500d0500e"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa327c1a78bd452bd8edbcad7a4e4d86a"><td class="memItemLeft" align="right" valign="top">typedef void(__stdcall *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a">NVGSDK_GetUILanguageCallback</a>) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___language.html">NVGSDK_Language</a> const *, void *)</td></tr>
+<tr class="separator:aa327c1a78bd452bd8edbcad7a4e4d86a"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
 Enumerations</h2></td></tr>
@@ -188,10 +188,10 @@ Enumerations</h2></td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="var-members"></a>
 Variables</h2></td></tr>
-<tr class="memitem:aa02df902597c4bb232e4015536659b75"><td class="memItemLeft" align="right" valign="top"><a id="aa02df902597c4bb232e4015536659b75"></a>
+<tr class="memitem:aa02df902597c4bb232e4015536659b75"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa02df902597c4bb232e4015536659b75"></a>
 size_t const&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_MAX_LOCALE</b> = 128</td></tr>
 <tr class="separator:aa02df902597c4bb232e4015536659b75"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a383fe79c6f8cbcefdd3851311c79dc38"><td class="memItemLeft" align="right" valign="top"><a id="a383fe79c6f8cbcefdd3851311c79dc38"></a>
+<tr class="memitem:a383fe79c6f8cbcefdd3851311c79dc38"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a383fe79c6f8cbcefdd3851311c79dc38"></a>
 size_t const&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_MAX_HIGHLIGHT_TABLE</b> = 128</td></tr>
 <tr class="separator:a383fe79c6f8cbcefdd3851311c79dc38"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -200,14 +200,12 @@ size_t const&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_MAX_HI
 
 <p>Definition in file <a class="el" href="sdk__types_8h_source.html">sdk_types.h</a>.</p>
 </div><h2 class="groupheader">Typedef Documentation</h2>
-<a id="afdec7c9f24e19fb84c5faf34d77e9312"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#afdec7c9f24e19fb84c5faf34d77e9312">&sect;&nbsp;</a></span>NVGSDK_LoggingCallback</h2>
-
+<a class="anchor" id="ab13929e496dd1748a31088399519252a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void(__stdcall* NVGSDK_LoggingCallback) (<a class="el" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level, char const  *message)</td>
+          <td class="memname">typedef void(__stdcall* NVGSDK_LoggingCallback) (<a class="el" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level, char const *message)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -217,9 +215,7 @@ size_t const&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_MAX_HI
 
 </div>
 </div>
-<a id="a1c5cd84ed88c70462c360a7268eb95ac"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a1c5cd84ed88c70462c360a7268eb95ac">&sect;&nbsp;</a></span>NVGSDK_EmptyCallback</h2>
-
+<a class="anchor" id="a1c5cd84ed88c70462c360a7268eb95ac"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -234,14 +230,12 @@ size_t const&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_MAX_HI
 
 </div>
 </div>
-<a id="a25a1eb6d5c4697e50ebdebb500d0500e"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a25a1eb6d5c4697e50ebdebb500d0500e">&sect;&nbsp;</a></span>NVGSDK_GetUILanguageCallback</h2>
-
+<a class="anchor" id="aa327c1a78bd452bd8edbcad7a4e4d86a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void(__stdcall* NVGSDK_GetUILanguageCallback) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___language.html">NVGSDK_Language</a> const  *, void *)</td>
+          <td class="memname">typedef void(__stdcall* NVGSDK_GetUILanguageCallback) (NVGSDK_RetCode, <a class="el" href="struct_n_v_g_s_d_k___language.html">NVGSDK_Language</a> const *, void *)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -252,9 +246,7 @@ size_t const&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_MAX_HI
 </div>
 </div>
 <h2 class="groupheader">Enumeration Type Documentation</h2>
-<a id="a8ad6f8cbc3c4ba6587912a4a4638d857"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a8ad6f8cbc3c4ba6587912a4a4638d857">&sect;&nbsp;</a></span>NVGSDK_LogLevel</h2>
-
+<a class="anchor" id="a8ad6f8cbc3c4ba6587912a4a4638d857"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -269,9 +261,7 @@ size_t const&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_MAX_HI
 
 </div>
 </div>
-<a id="a41214fdc112a95d5fe8e760b0c562c59"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a41214fdc112a95d5fe8e760b0c562c59">&sect;&nbsp;</a></span>NVGSDK_NotificationType</h2>
-
+<a class="anchor" id="a41214fdc112a95d5fe8e760b0c562c59"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -282,9 +272,11 @@ size_t const&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_MAX_HI
 </div><div class="memdoc">
 <p>Types of unsolicited notifications </p>
 <table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><a id="a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115"></a>NVGSDK_NOTIFICATION_PERMISSIONS_CHANGED&#160;</td><td class="fielddoc"><p>Sent when the user accepts/denies the permissions dialog, or toggles in GFE3. </p>
+<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><a class="anchor" id="a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115"></a>NVGSDK_NOTIFICATION_PERMISSIONS_CHANGED&#160;</td><td class="fielddoc">
+<p>Sent when the user accepts/denies the permissions dialog, or toggles in GFE3. </p>
 </td></tr>
-<tr><td class="fieldname"><a id="a41214fdc112a95d5fe8e760b0c562c59aa833a35cd4938b11579b3f22c1e346d7"></a>NVGSDK_NOTIFICATION_OVERLAY_STATE_CHANGED&#160;</td><td class="fielddoc"><p>Sent when the in-game overlay is shown or removed. </p>
+<tr><td class="fieldname"><a class="anchor" id="a41214fdc112a95d5fe8e760b0c562c59aa833a35cd4938b11579b3f22c1e346d7"></a>NVGSDK_NOTIFICATION_OVERLAY_STATE_CHANGED&#160;</td><td class="fielddoc">
+<p>Sent when the in-game overlay is shown or removed. </p>
 </td></tr>
 </table>
 
@@ -301,7 +293,7 @@ size_t const&#160;</td><td class="memItemRight" valign="bottom"><b>NVGSDK_MAX_HI
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="sdk__types_8h.html">sdk_types.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/sdk__types_8h.js b/doc/html/sdk__types_8h.js
index d3dfa26..d649a78 100644
--- a/doc/html/sdk__types_8h.js
+++ b/doc/html/sdk__types_8h.js
@@ -12,10 +12,10 @@ var sdk__types_8h =
     [ "NVGSDK_Language", "struct_n_v_g_s_d_k___language.html", "struct_n_v_g_s_d_k___language" ],
     [ "NVGSDK_MAX_LENGTH", "sdk__types_8h.html#a5e7291fcbabe1eb01aaf45832f67e4d9", null ],
     [ "NVGSDK_HANDLE", "sdk__types_8h.html#aadea61767b96d0a17f2943170f9a6924", null ],
-    [ "NVGSDK_LoggingCallback", "sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312", null ],
-    [ "NVGSDK_NotificationCallback", "sdk__types_8h.html#a8a2bd9c66dc5657faea5603d2f44b6f7", null ],
+    [ "NVGSDK_LoggingCallback", "sdk__types_8h.html#ab13929e496dd1748a31088399519252a", null ],
+    [ "NVGSDK_NotificationCallback", "sdk__types_8h.html#a566dcf90cf24d750d3f2cdd0133a7f80", null ],
     [ "NVGSDK_EmptyCallback", "sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac", null ],
-    [ "NVGSDK_GetUILanguageCallback", "sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e", null ],
+    [ "NVGSDK_GetUILanguageCallback", "sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a", null ],
     [ "NVGSDK_LogLevel", "sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857", [
       [ "NVGSDK_LOG_NONE", "sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857a344d28d16c37e37ace6691ec8a3e21fc", null ],
       [ "NVGSDK_LOG_ERROR", "sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857acb2c3058e6beb31d004654adebc18b98", null ],
diff --git a/doc/html/sdk__types_8h_source.html b/doc/html/sdk__types_8h_source.html
index c2571f8..0d25fe6 100644
--- a/doc/html/sdk__types_8h_source.html
+++ b/doc/html/sdk__types_8h_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/sdk_types.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,32 +110,32 @@ $(document).ready(function(){initNavTree('sdk__types_8h_source.html','');});
 <div class="title">sdk_types.h</div>  </div>
 </div><!--header-->
 <div class="contents">
-<a href="sdk__types_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment"> * NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment"> * and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> * and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifndef GFESDK_SDK_TYPES_H</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define GFESDK_SDK_TYPES_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &lt;stdint.h&gt;</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &lt;stdbool.h&gt;</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &lt;gfesdk/os_defines.h&gt;</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &lt;gfesdk/sdk_types_ipc.h&gt;</span></div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;</div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#define NVGSDK_MAX_LENGTH 256</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keywordtype">size_t</span> <span class="keyword">const</span> NVGSDK_MAX_LOCALE = 128;</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keywordtype">size_t</span> <span class="keyword">const</span> NVGSDK_MAX_HIGHLIGHT_TABLE = 128;</div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">struct </span>NVGSDK_HANDLE;</div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct </span>NVGSDK_HANDLE NVGSDK_HANDLE;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div><div class="line"><a name="l00031"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___version.html">   31</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;{</div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    uint16_t major;</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    uint16_t minor;</div><div class="line"><a name="l00035"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___version.html#abdb04097bd3c65601de459467fa4dc2b">   35</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___version.html#abdb04097bd3c65601de459467fa4dc2b">gfeVersionStr</a>;  </div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___version.html">NVGSDK_Version</a>;</div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;</div><div class="line"><a name="l00039"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">   39</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;{</div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    NVGSDK_LOG_NONE  = 0,</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    NVGSDK_LOG_ERROR = 1,</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    NVGSDK_LOG_INFO  = 2,</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    NVGSDK_LOG_DEBUG = 3,</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    NVGSDK_LOG_VERBOSE = 4,</div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    NVGSDK_LOG_MAX</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;} <a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a>;</div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div><div class="line"><a name="l00050"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59">   50</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;{</div><div class="line"><a name="l00052"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115">   52</a></span>&#160;    <a class="code" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115">NVGSDK_NOTIFICATION_PERMISSIONS_CHANGED</a>,    </div><div class="line"><a name="l00053"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59aa833a35cd4938b11579b3f22c1e346d7">   53</a></span>&#160;    <a class="code" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59aa833a35cd4938b11579b3f22c1e346d7">NVGSDK_NOTIFICATION_OVERLAY_STATE_CHANGED</a>,  </div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    NVGSDK_NOTIFICATION_MAX</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;} <a class="code" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59">NVGSDK_NotificationType</a>;</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div><div class="line"><a name="l00058"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">   58</a></span>&#160;<span class="keyword">typedef</span> void (__stdcall* <a class="code" href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">NVGSDK_LoggingCallback</a>)(<a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level, <span class="keywordtype">char</span> <span class="keyword">const</span>* message);</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div><div class="line"><a name="l00061"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___localized_pair.html">   61</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;{</div><div class="line"><a name="l00063"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___localized_pair.html#aa070c22ef7cf737497855504fb8795d6">   63</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___localized_pair.html#aa070c22ef7cf737497855504fb8795d6">localeCode</a>;         </div><div class="line"><a name="l00064"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___localized_pair.html#a02d3e482f16824ccc790f1a3dc8b8952">   64</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___localized_pair.html#a02d3e482f16824ccc790f1a3dc8b8952">localizedString</a>;    </div><div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a>;</div><div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;</div><div class="line"><a name="l00068"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___scope_permission.html">   68</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;{</div><div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    NVGSDK_Scope scope;</div><div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    NVGSDK_Permission permission;</div><div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a>;</div><div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div><div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;</div><div class="line"><a name="l00077"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___permissions_changed_notification.html">   77</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;{</div><div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a>* scopePermissionTable;</div><div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="keywordtype">size_t</span> scopePermissionTableSize;</div><div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___permissions_changed_notification.html">NVGSDK_PermissionsChangedNotification</a>;</div><div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;</div><div class="line"><a name="l00084"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html">   84</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;{</div><div class="line"><a name="l00086"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#ad9684c86b575f710bcc784942e6bf256">   86</a></span>&#160;    <span class="keywordtype">bool</span> <a class="code" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#ad9684c86b575f710bcc784942e6bf256">open</a>;                  </div><div class="line"><a name="l00087"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#af1c76ba9ecc3a9d83147dc4dc8d64ddc">   87</a></span>&#160;    NVGSDK_OverlayState <a class="code" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#af1c76ba9ecc3a9d83147dc4dc8d64ddc">state</a>;  </div><div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html">NVGSDK_OverlayStateChangedNotification</a>;</div><div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;</div><div class="line"><a name="l00091"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___notification.html">   91</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;{</div><div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="keywordtype">void</span>* context;</div><div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    <span class="keyword">union</span></div><div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    {</div><div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;        <a class="code" href="struct_n_v_g_s_d_k___permissions_changed_notification.html">NVGSDK_PermissionsChangedNotification</a> permissionsChanged;</div><div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;        <a class="code" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html">NVGSDK_OverlayStateChangedNotification</a> overlayStateChanged;</div><div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    };</div><div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___notification.html">NVGSDK_Notification</a>;</div><div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;<span class="keyword">typedef</span> void(__stdcall* NVGSDK_NotificationCallback)(<a class="code" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59">NVGSDK_NotificationType</a>, <a class="code" href="struct_n_v_g_s_d_k___notification.html">NVGSDK_Notification</a> <span class="keyword">const</span>* response, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;</div><div class="line"><a name="l00103"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html">  103</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;{</div><div class="line"><a name="l00105"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">  105</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">appName</a>;        </div><div class="line"><a name="l00106"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#ae0ada093d3d60a2f70226932b1a5b6fb">  106</a></span>&#160;    NVGSDK_Scope* <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#ae0ada093d3d60a2f70226932b1a5b6fb">scopeTable</a>;   </div><div class="line"><a name="l00107"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#a8941e0c803ec2f821101cfc55a7f60a3">  107</a></span>&#160;    <span class="keywordtype">size_t</span> <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#a8941e0c803ec2f821101cfc55a7f60a3">scopeTableSize</a>;      </div><div class="line"><a name="l00108"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#a0bd7568c1cb3fad975562055b4581195">  108</a></span>&#160;    <span class="keywordtype">bool</span> <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#a0bd7568c1cb3fad975562055b4581195">pollForCallbacks</a>;      </div><div class="line"><a name="l00110"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#adde61c0a8ea3a728c57081ec97081a72">  110</a></span>&#160;    NVGSDK_NotificationCallback notificationCallback;   </div><div class="line"><a name="l00111"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#ad30b1588618ec4bfbc1e9fa13c22b9a7">  111</a></span>&#160;    <span class="keywordtype">void</span>* <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#ad30b1588618ec4bfbc1e9fa13c22b9a7">notificationCallbackContext</a>;                  </div><div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;</div><div class="line"><a name="l00113"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#a94b71825369290d98e08058b3c0ba537">  113</a></span>&#160;    uint32_t <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#a94b71825369290d98e08058b3c0ba537">targetPid</a>;         </div><div class="line"><a name="l00115"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#adee7d43aa6948b623aa4fe84f8e8bf97">  115</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#adee7d43aa6948b623aa4fe84f8e8bf97">targetPath</a>;     </div><div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html">NVGSDK_CreateInputParams</a>;</div><div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;</div><div class="line"><a name="l00120"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___request_permissions_params.html">  120</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;{</div><div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    NVGSDK_Scope* scopeTable;</div><div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;    <span class="keywordtype">size_t</span> scopeTableSize;</div><div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___request_permissions_params.html">NVGSDK_RequestPermissionsParams</a>;</div><div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;</div><div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;</div><div class="line"><a name="l00129"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html">  129</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;{</div><div class="line"><a name="l00131"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html#aa595214daf18bdbc638ef98e1f22a30f">  131</a></span>&#160;    uint16_t <a class="code" href="struct_n_v_g_s_d_k___create_response.html#aa595214daf18bdbc638ef98e1f22a30f">versionMajor</a>;                          </div><div class="line"><a name="l00132"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html#ad1687ba8b8d53a75b13a60874f3822be">  132</a></span>&#160;    uint16_t <a class="code" href="struct_n_v_g_s_d_k___create_response.html#ad1687ba8b8d53a75b13a60874f3822be">versionMinor</a>;                          </div><div class="line"><a name="l00133"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html#aacdf644f5f6eb996dad6bb90b4145deb">  133</a></span>&#160;    <span class="keywordtype">char</span> gfeVersionStr[NVGSDK_MAX_LENGTH];          </div><div class="line"><a name="l00134"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html#a9bc3e75a15cf9fcbc1084f2a7fde5a8f">  134</a></span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a>* <a class="code" href="struct_n_v_g_s_d_k___create_response.html#a9bc3e75a15cf9fcbc1084f2a7fde5a8f">scopePermissionTable</a>;   </div><div class="line"><a name="l00135"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html#a60aec9d469d10e8fe0efd7c010fb96e7">  135</a></span>&#160;    <span class="keywordtype">size_t</span> <a class="code" href="struct_n_v_g_s_d_k___create_response.html#a60aec9d469d10e8fe0efd7c010fb96e7">scopePermissionTableSize</a>;                </div><div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___create_response.html">NVGSDK_CreateResponse</a>;</div><div class="line"><a name="l00138"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">  138</a></span>&#160;<span class="keyword">typedef</span> void(__stdcall* <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a>)(NVGSDK_RetCode, <span class="keywordtype">void</span>*);</div><div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;</div><div class="line"><a name="l00141"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___language.html">  141</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;{</div><div class="line"><a name="l00143"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75">  143</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75">cultureCode</a>;  </div><div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___language.html">NVGSDK_Language</a>;</div><div class="line"><a name="l00146"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e">  146</a></span>&#160;<span class="keyword">typedef</span> void(__stdcall* <a class="code" href="sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e">NVGSDK_GetUILanguageCallback</a>)(NVGSDK_RetCode, <a class="code" href="struct_n_v_g_s_d_k___language.html">NVGSDK_Language</a> <span class="keyword">const</span>*, <span class="keywordtype">void</span>*);</div><div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;</div><div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;<span class="preprocessor">#endif // GFESDK_SDK_TYPES_H</span></div><div class="ttc" id="struct_n_v_g_s_d_k___scope_permission_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00068">sdk_types.h:68</a></div></div>
+<a href="sdk__types_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment"> * NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment"> * and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> * and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifndef GFESDK_SDK_TYPES_H</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define GFESDK_SDK_TYPES_H</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &lt;stdint.h&gt;</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &lt;stdbool.h&gt;</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &lt;gfesdk/os_defines.h&gt;</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &lt;gfesdk/sdk_types_ipc.h&gt;</span></div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;</div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#define NVGSDK_MAX_LENGTH 256</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keywordtype">size_t</span> <span class="keyword">const</span> NVGSDK_MAX_LOCALE = 128;</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keywordtype">size_t</span> <span class="keyword">const</span> NVGSDK_MAX_HIGHLIGHT_TABLE = 128;</div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">struct </span>NVGSDK_HANDLE;</div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct </span>NVGSDK_HANDLE NVGSDK_HANDLE;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div><div class="line"><a name="l00031"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___version.html">   31</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;{</div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    uint16_t major;</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    uint16_t minor;</div><div class="line"><a name="l00035"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___version.html#abdb04097bd3c65601de459467fa4dc2b">   35</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___version.html#abdb04097bd3c65601de459467fa4dc2b">gfeVersionStr</a>;  </div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___version.html">NVGSDK_Version</a>;</div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;</div><div class="line"><a name="l00039"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">   39</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;{</div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    NVGSDK_LOG_NONE  = 0,</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    NVGSDK_LOG_ERROR = 1,</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    NVGSDK_LOG_INFO  = 2,</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    NVGSDK_LOG_DEBUG = 3,</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    NVGSDK_LOG_VERBOSE = 4,</div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    NVGSDK_LOG_MAX</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;} <a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a>;</div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div><div class="line"><a name="l00050"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59">   50</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;{</div><div class="line"><a name="l00052"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115">   52</a></span>&#160;    <a class="code" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115">NVGSDK_NOTIFICATION_PERMISSIONS_CHANGED</a>,    </div><div class="line"><a name="l00053"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59aa833a35cd4938b11579b3f22c1e346d7">   53</a></span>&#160;    <a class="code" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59aa833a35cd4938b11579b3f22c1e346d7">NVGSDK_NOTIFICATION_OVERLAY_STATE_CHANGED</a>,  </div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    NVGSDK_NOTIFICATION_MAX</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;} <a class="code" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59">NVGSDK_NotificationType</a>;</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div><div class="line"><a name="l00058"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">   58</a></span>&#160;<span class="keyword">typedef</span> void (__stdcall* <a class="code" href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">NVGSDK_LoggingCallback</a>)(<a class="code" href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a> level, <span class="keywordtype">char</span> <span class="keyword">const</span>* message);</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div><div class="line"><a name="l00061"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___localized_pair.html">   61</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;{</div><div class="line"><a name="l00063"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___localized_pair.html#aa070c22ef7cf737497855504fb8795d6">   63</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___localized_pair.html#aa070c22ef7cf737497855504fb8795d6">localeCode</a>;         </div><div class="line"><a name="l00064"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___localized_pair.html#a02d3e482f16824ccc790f1a3dc8b8952">   64</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___localized_pair.html#a02d3e482f16824ccc790f1a3dc8b8952">localizedString</a>;    </div><div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a>;</div><div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;</div><div class="line"><a name="l00068"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___scope_permission.html">   68</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;{</div><div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    NVGSDK_Scope scope;</div><div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    NVGSDK_Permission permission;</div><div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a>;</div><div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div><div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;</div><div class="line"><a name="l00077"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___permissions_changed_notification.html">   77</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;{</div><div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a>* scopePermissionTable;</div><div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="keywordtype">size_t</span> scopePermissionTableSize;</div><div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___permissions_changed_notification.html">NVGSDK_PermissionsChangedNotification</a>;</div><div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;</div><div class="line"><a name="l00084"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html">   84</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;{</div><div class="line"><a name="l00086"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#ad9684c86b575f710bcc784942e6bf256">   86</a></span>&#160;    <span class="keywordtype">bool</span> <a class="code" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#ad9684c86b575f710bcc784942e6bf256">open</a>;                  </div><div class="line"><a name="l00087"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#af1c76ba9ecc3a9d83147dc4dc8d64ddc">   87</a></span>&#160;    NVGSDK_OverlayState <a class="code" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#af1c76ba9ecc3a9d83147dc4dc8d64ddc">state</a>;  </div><div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html">NVGSDK_OverlayStateChangedNotification</a>;</div><div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;</div><div class="line"><a name="l00091"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___notification.html">   91</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;{</div><div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="keywordtype">void</span>* context;</div><div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    <span class="keyword">union</span></div><div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    {</div><div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;        <a class="code" href="struct_n_v_g_s_d_k___permissions_changed_notification.html">NVGSDK_PermissionsChangedNotification</a> permissionsChanged;</div><div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;        <a class="code" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html">NVGSDK_OverlayStateChangedNotification</a> overlayStateChanged;</div><div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    };</div><div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___notification.html">NVGSDK_Notification</a>;</div><div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;<span class="keyword">typedef</span> void(__stdcall* NVGSDK_NotificationCallback)(<a class="code" href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59">NVGSDK_NotificationType</a>, <a class="code" href="struct_n_v_g_s_d_k___notification.html">NVGSDK_Notification</a> <span class="keyword">const</span>* response, <span class="keywordtype">void</span>* context);</div><div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;</div><div class="line"><a name="l00103"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html">  103</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;{</div><div class="line"><a name="l00105"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">  105</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">appName</a>;        </div><div class="line"><a name="l00106"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#ae0ada093d3d60a2f70226932b1a5b6fb">  106</a></span>&#160;    NVGSDK_Scope* <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#ae0ada093d3d60a2f70226932b1a5b6fb">scopeTable</a>;   </div><div class="line"><a name="l00107"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#a8941e0c803ec2f821101cfc55a7f60a3">  107</a></span>&#160;    <span class="keywordtype">size_t</span> <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#a8941e0c803ec2f821101cfc55a7f60a3">scopeTableSize</a>;      </div><div class="line"><a name="l00108"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#a0bd7568c1cb3fad975562055b4581195">  108</a></span>&#160;    <span class="keywordtype">bool</span> <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#a0bd7568c1cb3fad975562055b4581195">pollForCallbacks</a>;      </div><div class="line"><a name="l00110"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#adde61c0a8ea3a728c57081ec97081a72">  110</a></span>&#160;    NVGSDK_NotificationCallback <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#adde61c0a8ea3a728c57081ec97081a72">notificationCallback</a>;   </div><div class="line"><a name="l00111"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#ad30b1588618ec4bfbc1e9fa13c22b9a7">  111</a></span>&#160;    <span class="keywordtype">void</span>* <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#ad30b1588618ec4bfbc1e9fa13c22b9a7">notificationCallbackContext</a>;                  </div><div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;</div><div class="line"><a name="l00113"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#a94b71825369290d98e08058b3c0ba537">  113</a></span>&#160;    uint32_t <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#a94b71825369290d98e08058b3c0ba537">targetPid</a>;         </div><div class="line"><a name="l00115"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_input_params.html#adee7d43aa6948b623aa4fe84f8e8bf97">  115</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html#adee7d43aa6948b623aa4fe84f8e8bf97">targetPath</a>;     </div><div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___create_input_params.html">NVGSDK_CreateInputParams</a>;</div><div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;</div><div class="line"><a name="l00120"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___request_permissions_params.html">  120</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;{</div><div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    NVGSDK_Scope* scopeTable;</div><div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;    <span class="keywordtype">size_t</span> scopeTableSize;</div><div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___request_permissions_params.html">NVGSDK_RequestPermissionsParams</a>;</div><div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;</div><div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;</div><div class="line"><a name="l00129"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html">  129</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;{</div><div class="line"><a name="l00131"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html#aa595214daf18bdbc638ef98e1f22a30f">  131</a></span>&#160;    uint16_t <a class="code" href="struct_n_v_g_s_d_k___create_response.html#aa595214daf18bdbc638ef98e1f22a30f">versionMajor</a>;                          </div><div class="line"><a name="l00132"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html#ad1687ba8b8d53a75b13a60874f3822be">  132</a></span>&#160;    uint16_t <a class="code" href="struct_n_v_g_s_d_k___create_response.html#ad1687ba8b8d53a75b13a60874f3822be">versionMinor</a>;                          </div><div class="line"><a name="l00133"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html#aacdf644f5f6eb996dad6bb90b4145deb">  133</a></span>&#160;    <span class="keywordtype">char</span> gfeVersionStr[NVGSDK_MAX_LENGTH];          </div><div class="line"><a name="l00134"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html#a9bc3e75a15cf9fcbc1084f2a7fde5a8f">  134</a></span>&#160;    <a class="code" href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a>* <a class="code" href="struct_n_v_g_s_d_k___create_response.html#a9bc3e75a15cf9fcbc1084f2a7fde5a8f">scopePermissionTable</a>;   </div><div class="line"><a name="l00135"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___create_response.html#a60aec9d469d10e8fe0efd7c010fb96e7">  135</a></span>&#160;    <span class="keywordtype">size_t</span> <a class="code" href="struct_n_v_g_s_d_k___create_response.html#a60aec9d469d10e8fe0efd7c010fb96e7">scopePermissionTableSize</a>;                </div><div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___create_response.html">NVGSDK_CreateResponse</a>;</div><div class="line"><a name="l00138"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">  138</a></span>&#160;<span class="keyword">typedef</span> void(__stdcall* <a class="code" href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a>)(NVGSDK_RetCode, <span class="keywordtype">void</span>*);</div><div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;</div><div class="line"><a name="l00141"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___language.html">  141</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct</span></div><div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;{</div><div class="line"><a name="l00143"></a><span class="lineno"><a class="line" href="struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75">  143</a></span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span>* <a class="code" href="struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75">cultureCode</a>;  </div><div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;} <a class="code" href="struct_n_v_g_s_d_k___language.html">NVGSDK_Language</a>;</div><div class="line"><a name="l00146"></a><span class="lineno"><a class="line" href="sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a">  146</a></span>&#160;<span class="keyword">typedef</span> void(__stdcall* <a class="code" href="sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a">NVGSDK_GetUILanguageCallback</a>)(NVGSDK_RetCode, <a class="code" href="struct_n_v_g_s_d_k___language.html">NVGSDK_Language</a> <span class="keyword">const</span>*, <span class="keywordtype">void</span>*);</div><div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;</div><div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;<span class="preprocessor">#endif // GFESDK_SDK_TYPES_H</span></div><div class="ttc" id="struct_n_v_g_s_d_k___scope_permission_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00068">sdk_types.h:68</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___version_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___version.html">NVGSDK_Version</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00031">sdk_types.h:31</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_response_html_a9bc3e75a15cf9fcbc1084f2a7fde5a8f"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_response.html#a9bc3e75a15cf9fcbc1084f2a7fde5a8f">NVGSDK_CreateResponse::scopePermissionTable</a></div><div class="ttdeci">NVGSDK_ScopePermission * scopePermissionTable</div><div class="ttdoc">Must be provided to call. Will be filled with scope/permission pairs. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00134">sdk_types.h:134</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___language_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___language.html">NVGSDK_Language</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00141">sdk_types.h:141</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___overlay_state_changed_notification_html_af1c76ba9ecc3a9d83147dc4dc8d64ddc"><div class="ttname"><a href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#af1c76ba9ecc3a9d83147dc4dc8d64ddc">NVGSDK_OverlayStateChangedNotification::state</a></div><div class="ttdeci">NVGSDK_OverlayState state</div><div class="ttdoc">State the overlay is closing from or opening to. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00087">sdk_types.h:87</a></div></div>
-<div class="ttc" id="sdk__types_8h_html_a25a1eb6d5c4697e50ebdebb500d0500e"><div class="ttname"><a href="sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e">NVGSDK_GetUILanguageCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_GetUILanguageCallback)(NVGSDK_RetCode, NVGSDK_Language const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00146">sdk_types.h:146</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___localized_pair_html_aa070c22ef7cf737497855504fb8795d6"><div class="ttname"><a href="struct_n_v_g_s_d_k___localized_pair.html#aa070c22ef7cf737497855504fb8795d6">NVGSDK_LocalizedPair::localeCode</a></div><div class="ttdeci">char const  * localeCode</div><div class="ttdoc">locale code, such as en-us, fr-fr, etc </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00063">sdk_types.h:63</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___localized_pair_html_aa070c22ef7cf737497855504fb8795d6"><div class="ttname"><a href="struct_n_v_g_s_d_k___localized_pair.html#aa070c22ef7cf737497855504fb8795d6">NVGSDK_LocalizedPair::localeCode</a></div><div class="ttdeci">char const * localeCode</div><div class="ttdoc">locale code, such as en-us, fr-fr, etc </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00063">sdk_types.h:63</a></div></div>
 <div class="ttc" id="sdk__types_8h_html_a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115"><div class="ttname"><a href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59ab4d95c5d0180de2ae500c1b33bd0c115">NVGSDK_NOTIFICATION_PERMISSIONS_CHANGED</a></div><div class="ttdoc">Sent when the user accepts/denies the permissions dialog, or toggles in GFE3. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00052">sdk_types.h:52</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_ac754df94f208f494a0a339d614bb18f3"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">NVGSDK_CreateInputParams::appName</a></div><div class="ttdeci">char const  * appName</div><div class="ttdoc">Provide the name of the application. Will be used in cases when NVIDIA cannot detect game...</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00105">sdk_types.h:105</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___localized_pair_html_a02d3e482f16824ccc790f1a3dc8b8952"><div class="ttname"><a href="struct_n_v_g_s_d_k___localized_pair.html#a02d3e482f16824ccc790f1a3dc8b8952">NVGSDK_LocalizedPair::localizedString</a></div><div class="ttdeci">char const  * localizedString</div><div class="ttdoc">String translated for given locale. Max length NVGSDK_MAX_LENGTH - 1. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00064">sdk_types.h:64</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_ac754df94f208f494a0a339d614bb18f3"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">NVGSDK_CreateInputParams::appName</a></div><div class="ttdeci">char const * appName</div><div class="ttdoc">Provide the name of the application. Will be used in cases when NVIDIA cannot detect game...</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00105">sdk_types.h:105</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___localized_pair_html_a02d3e482f16824ccc790f1a3dc8b8952"><div class="ttname"><a href="struct_n_v_g_s_d_k___localized_pair.html#a02d3e482f16824ccc790f1a3dc8b8952">NVGSDK_LocalizedPair::localizedString</a></div><div class="ttdeci">char const * localizedString</div><div class="ttdoc">String translated for given locale. Max length NVGSDK_MAX_LENGTH - 1. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00064">sdk_types.h:64</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_ae0ada093d3d60a2f70226932b1a5b6fb"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#ae0ada093d3d60a2f70226932b1a5b6fb">NVGSDK_CreateInputParams::scopeTable</a></div><div class="ttdeci">NVGSDK_Scope * scopeTable</div><div class="ttdoc">List of scopes used by the application. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00106">sdk_types.h:106</a></div></div>
+<div class="ttc" id="sdk__types_8h_html_aa327c1a78bd452bd8edbcad7a4e4d86a"><div class="ttname"><a href="sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a">NVGSDK_GetUILanguageCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_GetUILanguageCallback)(NVGSDK_RetCode, NVGSDK_Language const *, void *)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00146">sdk_types.h:146</a></div></div>
 <div class="ttc" id="sdk__types_8h_html_a41214fdc112a95d5fe8e760b0c562c59"><div class="ttname"><a href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59">NVGSDK_NotificationType</a></div><div class="ttdeci">NVGSDK_NotificationType</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00050">sdk_types.h:50</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_a8941e0c803ec2f821101cfc55a7f60a3"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#a8941e0c803ec2f821101cfc55a7f60a3">NVGSDK_CreateInputParams::scopeTableSize</a></div><div class="ttdeci">size_t scopeTableSize</div><div class="ttdoc">Number of entries in the scope table. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00107">sdk_types.h:107</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___overlay_state_changed_notification_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html">NVGSDK_OverlayStateChangedNotification</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00084">sdk_types.h:84</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_ad30b1588618ec4bfbc1e9fa13c22b9a7"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#ad30b1588618ec4bfbc1e9fa13c22b9a7">NVGSDK_CreateInputParams::notificationCallbackContext</a></div><div class="ttdeci">void * notificationCallbackContext</div><div class="ttdoc">Passed along unchanged with each notification. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00111">sdk_types.h:111</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_a0bd7568c1cb3fad975562055b4581195"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#a0bd7568c1cb3fad975562055b4581195">NVGSDK_CreateInputParams::pollForCallbacks</a></div><div class="ttdeci">bool pollForCallbacks</div><div class="ttdoc">Set to true to poll for asynchronous callbacks on an app thread. If false, callbacks will occur on a ...</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00108">sdk_types.h:108</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___language_html_a61f6b2d2a3d08a27b37919e32b13ed75"><div class="ttname"><a href="struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75">NVGSDK_Language::cultureCode</a></div><div class="ttdeci">char const  * cultureCode</div><div class="ttdoc">Will be populated by the user&amp;#39;s GFE language selection. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00143">sdk_types.h:143</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___language_html_a61f6b2d2a3d08a27b37919e32b13ed75"><div class="ttname"><a href="struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75">NVGSDK_Language::cultureCode</a></div><div class="ttdeci">char const * cultureCode</div><div class="ttdoc">Will be populated by the user&amp;#39;s GFE language selection. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00143">sdk_types.h:143</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_response_html_ad1687ba8b8d53a75b13a60874f3822be"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_response.html#ad1687ba8b8d53a75b13a60874f3822be">NVGSDK_CreateResponse::versionMinor</a></div><div class="ttdeci">uint16_t versionMinor</div><div class="ttdoc">Will be populated with SDK minor version. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00132">sdk_types.h:132</a></div></div>
+<div class="ttc" id="sdk__types_8h_html_ab13929e496dd1748a31088399519252a"><div class="ttname"><a href="sdk__types_8h.html#ab13929e496dd1748a31088399519252a">NVGSDK_LoggingCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_LoggingCallback)(NVGSDK_LogLevel level, char const *message)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00058">sdk_types.h:58</a></div></div>
 <div class="ttc" id="sdk__types_8h_html_a1c5cd84ed88c70462c360a7268eb95ac"><div class="ttname"><a href="sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac">NVGSDK_EmptyCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_EmptyCallback)(NVGSDK_RetCode, void *)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00138">sdk_types.h:138</a></div></div>
-<div class="ttc" id="sdk__types_8h_html_afdec7c9f24e19fb84c5faf34d77e9312"><div class="ttname"><a href="sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312">NVGSDK_LoggingCallback</a></div><div class="ttdeci">void(__stdcall * NVGSDK_LoggingCallback)(NVGSDK_LogLevel level, char const *message)</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00058">sdk_types.h:58</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___request_permissions_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___request_permissions_params.html">NVGSDK_RequestPermissionsParams</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00120">sdk_types.h:120</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_response_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_response.html">NVGSDK_CreateResponse</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00129">sdk_types.h:129</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_a94b71825369290d98e08058b3c0ba537"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#a94b71825369290d98e08058b3c0ba537">NVGSDK_CreateInputParams::targetPid</a></div><div class="ttdeci">uint32_t targetPid</div><div class="ttdoc">Used for linking to game-related process&amp;#39;s PID that also supports NVIDIA Highlights. Leave empty when not used. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00113">sdk_types.h:113</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html">NVGSDK_CreateInputParams</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00103">sdk_types.h:103</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___version_html_abdb04097bd3c65601de459467fa4dc2b"><div class="ttname"><a href="struct_n_v_g_s_d_k___version.html#abdb04097bd3c65601de459467fa4dc2b">NVGSDK_Version::gfeVersionStr</a></div><div class="ttdeci">char const  * gfeVersionStr</div><div class="ttdoc">Current version installed by the user. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00035">sdk_types.h:35</a></div></div>
-<div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_adee7d43aa6948b623aa4fe84f8e8bf97"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#adee7d43aa6948b623aa4fe84f8e8bf97">NVGSDK_CreateInputParams::targetPath</a></div><div class="ttdeci">char const  * targetPath</div><div class="ttdoc">Used for linking to game-related process&amp;#39;s path that also supports NVIDIA Highlights. Must be defined if targetPid is defined. Leave empty when not used. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00115">sdk_types.h:115</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___version_html_abdb04097bd3c65601de459467fa4dc2b"><div class="ttname"><a href="struct_n_v_g_s_d_k___version.html#abdb04097bd3c65601de459467fa4dc2b">NVGSDK_Version::gfeVersionStr</a></div><div class="ttdeci">char const * gfeVersionStr</div><div class="ttdoc">Current version installed by the user. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00035">sdk_types.h:35</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_adee7d43aa6948b623aa4fe84f8e8bf97"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#adee7d43aa6948b623aa4fe84f8e8bf97">NVGSDK_CreateInputParams::targetPath</a></div><div class="ttdeci">char const * targetPath</div><div class="ttdoc">Used for linking to game-related process&amp;#39;s path that also supports NVIDIA Highlights. Must be defined if targetPid is defined. Leave empty when not used. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00115">sdk_types.h:115</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___permissions_changed_notification_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___permissions_changed_notification.html">NVGSDK_PermissionsChangedNotification</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00077">sdk_types.h:77</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___notification_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___notification.html">NVGSDK_Notification</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00091">sdk_types.h:91</a></div></div>
 <div class="ttc" id="sdk__types_8h_html_a8ad6f8cbc3c4ba6587912a4a4638d857"><div class="ttname"><a href="sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857">NVGSDK_LogLevel</a></div><div class="ttdeci">NVGSDK_LogLevel</div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00039">sdk_types.h:39</a></div></div>
@@ -118,6 +143,7 @@ $(document).ready(function(){initNavTree('sdk__types_8h_source.html','');});
 <div class="ttc" id="struct_n_v_g_s_d_k___localized_pair_html"><div class="ttname"><a href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a></div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00061">sdk_types.h:61</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_response_html_aa595214daf18bdbc638ef98e1f22a30f"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_response.html#aa595214daf18bdbc638ef98e1f22a30f">NVGSDK_CreateResponse::versionMajor</a></div><div class="ttdeci">uint16_t versionMajor</div><div class="ttdoc">Will be populated with SDK major version. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00131">sdk_types.h:131</a></div></div>
 <div class="ttc" id="sdk__types_8h_html_a41214fdc112a95d5fe8e760b0c562c59aa833a35cd4938b11579b3f22c1e346d7"><div class="ttname"><a href="sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59aa833a35cd4938b11579b3f22c1e346d7">NVGSDK_NOTIFICATION_OVERLAY_STATE_CHANGED</a></div><div class="ttdoc">Sent when the in-game overlay is shown or removed. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00053">sdk_types.h:53</a></div></div>
+<div class="ttc" id="struct_n_v_g_s_d_k___create_input_params_html_adde61c0a8ea3a728c57081ec97081a72"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_input_params.html#adde61c0a8ea3a728c57081ec97081a72">NVGSDK_CreateInputParams::notificationCallback</a></div><div class="ttdeci">NVGSDK_NotificationCallback notificationCallback</div><div class="ttdoc">Called on unsolicited notifications. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00110">sdk_types.h:110</a></div></div>
 <div class="ttc" id="struct_n_v_g_s_d_k___create_response_html_a60aec9d469d10e8fe0efd7c010fb96e7"><div class="ttname"><a href="struct_n_v_g_s_d_k___create_response.html#a60aec9d469d10e8fe0efd7c010fb96e7">NVGSDK_CreateResponse::scopePermissionTableSize</a></div><div class="ttdeci">size_t scopePermissionTableSize</div><div class="ttdoc">Must be provided to call. </div><div class="ttdef"><b>Definition:</b> <a href="sdk__types_8h_source.html#l00135">sdk_types.h:135</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
@@ -128,7 +154,7 @@ $(document).ready(function(){initNavTree('sdk__types_8h_source.html','');});
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="sdk__types_8h.html">sdk_types.h</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/sdk__types__cpp_8h_source.html b/doc/html/sdk__types__cpp_8h_source.html
index 3a422d6..14b3b93 100644
--- a/doc/html/sdk__types__cpp_8h_source.html
+++ b/doc/html/sdk__types__cpp_8h_source.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/bindings/cpp/sdk_types_cpp.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -105,7 +130,7 @@ $(document).ready(function(){initNavTree('sdk__types__cpp_8h_source.html','');})
     <li class="navelem"><a class="el" href="dir_4522e853adfb3285c34ceee6be627ffe.html">sdkclient</a></li><li class="navelem"><a class="el" href="dir_37f49c9d6a230916a5077fbd270eac2a.html">include</a></li><li class="navelem"><a class="el" href="dir_eb56eea0ff74c30c2a48b22915222057.html">gfesdk</a></li><li class="navelem"><a class="el" href="dir_f78f74a3131a0cfd456c5ed856861cff.html">bindings</a></li><li class="navelem"><a class="el" href="dir_ab8ba62fc8fdaf78364406bae0a66d43.html">cpp</a></li><li class="navelem"><b>sdk_types_cpp.h</b></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/sdk__types__ipc_8h_source.html b/doc/html/sdk__types__ipc_8h_source.html
index 44748f6..eed7608 100644
--- a/doc/html/sdk__types__ipc_8h_source.html
+++ b/doc/html/sdk__types__ipc_8h_source.html
@@ -4,9 +4,9 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/x64-release-uwp/sdk/include/gfesdk/sdk_types_ipc.h Source File</title>
+<title>NVIDIAGeForceExperienceSDK: C:/u/workspace/dev/sdkwinauto/_build/sdkclient-win/x64-release-uwp/sdk/include/gfesdk/sdk_types_ipc.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,40 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -85,16 +110,16 @@ $(document).ready(function(){initNavTree('sdk__types__ipc_8h_source.html','');})
 <div class="title">sdk_types_ipc.h</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">// Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">// NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">// and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">// and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">// distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">// license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;</div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#ifndef NVSDKAPI_IPC_H</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#define NVSDKAPI_IPC_H</span></div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;</div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;wchar.h&gt;</span></div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;stdbool.h&gt;</span></div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="keyword">extern</span> <span class="stringliteral">&quot;C&quot;</span> {</div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;<span class="keywordtype">int</span> <span class="keyword">const</span> NVGSDK_IPC_VERSION_MAJOR = 1;</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;<span class="keywordtype">int</span> <span class="keyword">const</span> NVGSDK_IPC_VERSION_MINOR = 1;</div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span> _NVGSDK_RetCode</div><div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;{</div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    NVGSDK_SUCCESS                       = 0,</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    NVGSDK_SUCCESS_VERSION_OLD_SDK       = 1001,</div><div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    NVGSDK_SUCCESS_VERSION_OLD_GFE       = 1002,</div><div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    NVGSDK_SUCCESS_PENDING               = 1003,</div><div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    NVGSDK_SUCCESS_USER_NOT_INTERESTED   = 1004,</div><div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    NVGSDK_SUCCESS_PERMISSION_GRANTED    = 1005,</div><div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    NVGSDK_SUCCESS_LINKED                = 1006,</div><div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;</div><div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    NVGSDK_ERR_GENERIC                   = -1001,</div><div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    NVGSDK_ERR_GFE_VERSION               = -1002,</div><div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    NVGSDK_ERR_SDK_VERSION               = -1003,</div><div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    NVGSDK_ERR_NOT_IMPLEMENTED           = -1004,</div><div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    NVGSDK_ERR_INVALID_PARAMETER         = -1005,</div><div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    NVGSDK_ERR_NOT_SET                   = -1006,</div><div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    NVGSDK_ERR_SHADOWPLAY_IR_DISABLED    = -1007,</div><div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    NVGSDK_ERR_SDK_IN_USE                = -1008,</div><div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;    NVGSDK_ERR_GROUP_NOT_FOUND           = -1009,</div><div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    NVGSDK_ERR_FILE_NOT_FOUND            = -1010,</div><div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED   = -1011,</div><div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED = -1012,</div><div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED    = -1013,</div><div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    NVGSDK_ERR_UNEXPECTED_EXCEPTION      = -1014,</div><div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    NVGSDK_ERR_NO_HIGHLIGHTS             = -1015,</div><div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    NVGSDK_ERR_NO_CONNECTION             = -1016,</div><div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    NVGSDK_ERR_PERMISSION_NOT_GRANTED    = -1017,</div><div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    NVGSDK_ERR_PERMISSION_DENIED         = -1018,</div><div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    NVGSDK_ERR_INVALID_HANDLE            = -1019,</div><div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    NVGSDK_ERR_UNHANDLED_EXCEPTION       = -1020,</div><div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    NVGSDK_ERR_OUT_OF_MEMORY             = -1021,</div><div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    NVGSDK_ERR_LOAD_LIBRARY              = -1022,</div><div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    NVGSDK_ERR_LIB_CALL_FAILED           = -1023,</div><div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    NVGSDK_ERR_IPC_FAILED                = -1024,</div><div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    NVGSDK_ERR_CONNECTION                = -1025,</div><div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    NVGSDK_ERR_MODULE_NOT_LOADED         = -1026,</div><div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    NVGSDK_ERR_LIB_CALL_TIMEOUT          = -1027,</div><div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    NVGSDK_ERR_APPLICATION_LOOKUP_FAILED = -1028,</div><div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    NVGSDK_ERR_APPLICATION_NOT_KNOWN     = -1029,</div><div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    NVGSDK_ERR_FEATURE_DISABLED          = -1030,</div><div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    NVGSDK_ERR_APP_NO_OPTIMIZATION       = -1031,</div><div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;    NVGSDK_ERR_APP_SETTINGS_READ         = -1032,</div><div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    NVGSDK_ERR_APP_SETTINGS_WRITE        = -1033,</div><div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    NVGSDK_ERR_HIGHLIGHT_NOT_DEFINED     = -1034</div><div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;} NVGSDK_RetCode;</div><div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;</div><div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;<span class="comment">// not using macros to avoid polluting namespace of SDK unnecessarily</span></div><div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;</div><div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;<span class="keyword">inline</span> <span class="keywordtype">bool</span> NVGSDK_SUCCEEDED(NVGSDK_RetCode r)</div><div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;{</div><div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    <span class="keywordflow">return</span> r &gt;= 0;</div><div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;}</div><div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;</div><div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;<span class="keyword">inline</span> <span class="keywordtype">bool</span> NVGSDK_FAILED(NVGSDK_RetCode r)</div><div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;{</div><div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;    <span class="keywordflow">return</span> r &lt; 0;</div><div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;}</div><div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;</div><div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;{</div><div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    NVGSDK_HIGHLIGHT_TYPE_NONE = 0x00000000,</div><div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;    NVGSDK_HIGHLIGHT_TYPE_MILESTONE = 0x00000001,</div><div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;    NVGSDK_HIGHLIGHT_TYPE_ACHIEVEMENT = 0x00000002,</div><div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;    NVGSDK_HIGHLIGHT_TYPE_INCIDENT = 0x00000004,</div><div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;    NVGSDK_HIGHLIGHT_TYPE_STATE_CHANGE = 0x00000008,</div><div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;    NVGSDK_HIGHLIGHT_TYPE_UNANNOUNCED = 0x00000010,</div><div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    NVGSDK_HIGHLIGHT_TYPE_MAX = 0x00000020</div><div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;} NVGSDK_HighlightType;</div><div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;</div><div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;{</div><div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;    NVGSDK_HIGHLIGHT_SIGNIFICANCE_NONE = 0x00000000,</div><div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_BAD = 0x00000001,</div><div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;    NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_BAD = 0x00000002,</div><div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;    NVGSDK_HIGHLIGHT_SIGNIFICANCE_BAD = 0x00000004,</div><div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;    NVGSDK_HIGHLIGHT_SIGNIFICANCE_NEUTRAL = 0x00000010,</div><div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;    NVGSDK_HIGHLIGHT_SIGNIFICANCE_GOOD = 0x00000100,</div><div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;    NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_GOOD = 0x00000200,</div><div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;    NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_GOOD = 0x00000400,</div><div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;</div><div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;    NVGSDK_HIGHLIGHT_SIGNIFICANCE_MAX = 0x00000800</div><div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;} NVGSDK_HighlightSignificance;</div><div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;</div><div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;{</div><div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;    NVGSDK_SCOPE_HIGHLIGHTS = 0,            </div><div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;    NVGSDK_SCOPE_HIGHLIGHTS_VIDEO = 1,      </div><div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;    NVGSDK_SCOPE_HIGHLIGHTS_SCREENSHOT = 2, </div><div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;    NVGSDK_SCOPE_OPS = 3,                   </div><div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;    NVGSDK_SCOPE_MAX</div><div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;} NVGSDK_Scope;</div><div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;</div><div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;{</div><div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;    NVGSDK_PERMISSION_GRANTED = 0,  </div><div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;    NVGSDK_PERMISSION_MUST_ASK = 1, </div><div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;    NVGSDK_PERMISSION_DENIED = 2,   </div><div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;    NVGSDK_PERMISSION_UNKNOWN = 3,  </div><div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;    NVGSDK_PERMISSION_MAX</div><div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;} NVGSDK_Permission;</div><div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;</div><div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;{</div><div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;    NVGSDK_OVERLAY_STATE_MAIN,              </div><div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;    NVGSDK_OVERLAY_STATE_PERMISSION,        </div><div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;    NVGSDK_OVERLAY_STATE_HIGHLIGHTS_SUMMARY,</div><div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;    NVGSDK_OVERLAY_STATE_MAX</div><div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;} NVGSDK_OverlayState;</div><div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;</div><div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;<span class="keyword">inline</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* NVGSDK_RetCodeToString(NVGSDK_RetCode <span class="keyword">const</span> ret)</div><div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;{</div><div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;    <span class="keywordflow">switch</span> (ret)</div><div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;    {</div><div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;    <span class="keywordflow">case</span> NVGSDK_SUCCESS:                        <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS&quot;</span>;</div><div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;    <span class="keywordflow">case</span> NVGSDK_SUCCESS_VERSION_OLD_SDK:        <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_VERSION_OLD_SDK&quot;</span>;</div><div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;    <span class="keywordflow">case</span> NVGSDK_SUCCESS_VERSION_OLD_GFE:        <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_VERSION_OLD_GFE&quot;</span>;</div><div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;    <span class="keywordflow">case</span> NVGSDK_SUCCESS_PENDING:                <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_PENDING&quot;</span>;</div><div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;    <span class="keywordflow">case</span> NVGSDK_SUCCESS_USER_NOT_INTERESTED:    <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_USER_NOT_INTERESTED&quot;</span>;</div><div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;    <span class="keywordflow">case</span> NVGSDK_SUCCESS_PERMISSION_GRANTED:     <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_PERMISSION_GRANTED&quot;</span>;</div><div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;    <span class="keywordflow">case</span> NVGSDK_SUCCESS_LINKED:                 <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_LINKED&quot;</span>;</div><div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_GENERIC:                    <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_GENERIC&quot;</span>;</div><div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_GFE_VERSION:                <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_GFE_VERSION&quot;</span>;</div><div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_SDK_VERSION:                <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_SDK_VERSION&quot;</span>;</div><div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_NOT_IMPLEMENTED:            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_NOT_IMPLEMENTED&quot;</span>;</div><div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_INVALID_PARAMETER:          <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_INVALID_PARAMETER&quot;</span>;</div><div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_NOT_SET:                    <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_NOT_SET&quot;</span>;</div><div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_SHADOWPLAY_IR_DISABLED:     <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_SHADOWPLAY_IR_DISABLED&quot;</span>;</div><div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_SDK_IN_USE:                 <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_SDK_IN_USE&quot;</span>;</div><div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_GROUP_NOT_FOUND:            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_GROUP_NOT_FOUND&quot;</span>;</div><div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_FILE_NOT_FOUND:             <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_FILE_NOT_FOUND&quot;</span>;</div><div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED:    <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED&quot;</span>;</div><div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED:  <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED&quot;</span>;</div><div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED:     <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED&quot;</span>;</div><div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_UNEXPECTED_EXCEPTION:       <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_UNEXPECTED_EXCEPTION&quot;</span>;</div><div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_NO_HIGHLIGHTS:              <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_NO_HIGHLIGHTS&quot;</span>;</div><div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_NO_CONNECTION:              <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_NO_CONNECTION&quot;</span>;</div><div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_PERMISSION_NOT_GRANTED:     <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_PERMISSION_NOT_GRANTED&quot;</span>;</div><div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_PERMISSION_DENIED:          <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_PERMISSION_DENIED&quot;</span>;</div><div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_INVALID_HANDLE:             <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_INVALID_HANDLE&quot;</span>;</div><div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_UNHANDLED_EXCEPTION:        <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_UNHANDLED_EXCEPTION&quot;</span>;</div><div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_OUT_OF_MEMORY:              <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_OUT_OF_MEMORY&quot;</span>;</div><div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_LOAD_LIBRARY:               <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_LOAD_LIBRARY&quot;</span>;</div><div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_LIB_CALL_FAILED:            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_LIB_CALL_FAILED&quot;</span>;</div><div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_IPC_FAILED:                 <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_IPC_FAILED&quot;</span>;</div><div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_CONNECTION:                 <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_CONNECTION&quot;</span>;</div><div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_MODULE_NOT_LOADED:          <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_MODULE_NOT_LOADED&quot;</span>;</div><div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_LIB_CALL_TIMEOUT:           <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_LIB_CALL_TIMEOUT&quot;</span>;</div><div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_APPLICATION_LOOKUP_FAILED:  <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_APPLICATION_LOOKUP_FAILED&quot;</span>;</div><div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_APPLICATION_NOT_KNOWN:      <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_APPLICATION_NOT_KNOWN&quot;</span>;</div><div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_FEATURE_DISABLED:           <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_FEATURE_DISABLED&quot;</span>;</div><div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_APP_NO_OPTIMIZATION:        <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_APP_NO_OPTIMIZATION&quot;</span>;</div><div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_APP_SETTINGS_READ:          <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_APP_SETTINGS_READ&quot;</span>;</div><div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_APP_SETTINGS_WRITE:         <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_APP_SETTINGS_WRITE&quot;</span>;</div><div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;    <span class="keywordflow">case</span> NVGSDK_ERR_HIGHLIGHT_NOT_DEFINED:      <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_HIGHLIGHT_NOT_DEFINED&quot;</span>;</div><div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;    }</div><div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;    <span class="keywordflow">return</span> <span class="stringliteral">&quot;Unknown code&quot;</span>;</div><div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;}</div><div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;</div><div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;<span class="comment">// All alphanumeric and the hyphen</span></div><div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;<span class="keywordtype">char</span> <span class="keyword">const</span> VALID_GROUPID_CHARS[] = <span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;<span class="keywordtype">wchar_t</span> <span class="keyword">const</span> VALID_GROUPID_WCHARS[] = L<span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;</div><div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;<span class="keywordtype">char</span> <span class="keyword">const</span> VALID_HIGHLIGHT_DEF_ID_CHARS[] = <span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;<span class="keywordtype">wchar_t</span> <span class="keyword">const</span> VALID_HIGHLIGHT_DEF_ID_WCHARS[] = L<span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;</div><div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;<span class="keywordtype">char</span> <span class="keyword">const</span> VALID_GAMENAME_CHARS[] = <span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;<span class="keywordtype">wchar_t</span> <span class="keyword">const</span> VALID_GAMENAME_WCHARS[] = L<span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;</div><div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;<span class="keywordtype">char</span> <span class="keyword">const</span> VALID_LOCALE_CODE_CHARS[] = <span class="stringliteral">&quot;^[a-zA-Z\\-]+$&quot;</span>;</div><div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;<span class="keywordtype">wchar_t</span> <span class="keyword">const</span> VALID_LOCALE_CODE_WCHARS[] = L<span class="stringliteral">&quot;^[a-zA-Z\\-]+$&quot;</span>;</div><div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;</div><div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;<span class="keywordtype">size_t</span> <span class="keyword">const</span> VALID_HIGHLIGHT_SIGNIFICANCE_WIDTH = 0x8FF;</div><div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;<span class="keywordtype">size_t</span> <span class="keyword">const</span> VALID_HIGHLIGHT_TAG_WIDTH = 0x1F;</div><div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;</div><div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;}</div><div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;</div><div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;<span class="preprocessor">#endif // NVSDKAPI_IPC_H</span></div></div><!-- fragment --></div><!-- contents -->
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">// Copyright (c) 2016-2019, NVIDIA CORPORATION.  All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">// NVIDIA CORPORATION and its licensors retain all intellectual property</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">// and proprietary rights in and to this software, related documentation</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">// and any modifications thereto.  Any use, reproduction, disclosure or</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">// distribution of this software and related documentation without an express</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">// license agreement from NVIDIA CORPORATION is strictly prohibited.</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;</div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#ifndef NVSDKAPI_IPC_H</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#define NVSDKAPI_IPC_H</span></div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;</div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;wchar.h&gt;</span></div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;stdbool.h&gt;</span></div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="keyword">extern</span> <span class="stringliteral">&quot;C&quot;</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;{</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="keywordtype">int</span> <span class="keyword">const</span> NVGSDK_IPC_VERSION_MAJOR = 1;</div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keywordtype">int</span> <span class="keyword">const</span> NVGSDK_IPC_VERSION_MINOR = 1;</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div><div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    <span class="keyword">typedef</span> <span class="keyword">enum</span> _NVGSDK_RetCode</div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    {</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;        NVGSDK_SUCCESS = 0,</div><div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;        NVGSDK_SUCCESS_VERSION_OLD_SDK = 1001,</div><div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;        NVGSDK_SUCCESS_VERSION_OLD_GFE = 1002,</div><div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;        NVGSDK_SUCCESS_PENDING = 1003,</div><div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;        NVGSDK_SUCCESS_USER_NOT_INTERESTED = 1004,</div><div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;        NVGSDK_SUCCESS_PERMISSION_GRANTED = 1005,</div><div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;        NVGSDK_SUCCESS_LINKED = 1006,</div><div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;</div><div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;        NVGSDK_ERR_GENERIC = -1001,</div><div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;        NVGSDK_ERR_GFE_VERSION = -1002,</div><div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;        NVGSDK_ERR_SDK_VERSION = -1003,</div><div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;        NVGSDK_ERR_NOT_IMPLEMENTED = -1004,</div><div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;        NVGSDK_ERR_INVALID_PARAMETER = -1005,</div><div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;        NVGSDK_ERR_NOT_SET = -1006,</div><div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;        NVGSDK_ERR_SHADOWPLAY_IR_DISABLED = -1007,</div><div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;        NVGSDK_ERR_SDK_IN_USE = -1008,</div><div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;        NVGSDK_ERR_GROUP_NOT_FOUND = -1009,</div><div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;        NVGSDK_ERR_FILE_NOT_FOUND = -1010,</div><div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;        NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED = -1011,</div><div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;        NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED = -1012,</div><div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;        NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED = -1013,</div><div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;        NVGSDK_ERR_UNEXPECTED_EXCEPTION = -1014,</div><div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;        NVGSDK_ERR_NO_HIGHLIGHTS = -1015,</div><div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;        NVGSDK_ERR_NO_CONNECTION = -1016,</div><div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;        NVGSDK_ERR_PERMISSION_NOT_GRANTED = -1017,</div><div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;        NVGSDK_ERR_PERMISSION_DENIED = -1018,</div><div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;        NVGSDK_ERR_INVALID_HANDLE = -1019,</div><div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;        NVGSDK_ERR_UNHANDLED_EXCEPTION = -1020,</div><div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;        NVGSDK_ERR_OUT_OF_MEMORY = -1021,</div><div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;        NVGSDK_ERR_LOAD_LIBRARY = -1022,</div><div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;        NVGSDK_ERR_LIB_CALL_FAILED = -1023,</div><div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;        NVGSDK_ERR_IPC_FAILED = -1024,</div><div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;        NVGSDK_ERR_CONNECTION = -1025,</div><div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;        NVGSDK_ERR_MODULE_NOT_LOADED = -1026,</div><div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;        NVGSDK_ERR_LIB_CALL_TIMEOUT = -1027,</div><div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;        NVGSDK_ERR_APPLICATION_LOOKUP_FAILED = -1028,</div><div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;        NVGSDK_ERR_APPLICATION_NOT_KNOWN = -1029,</div><div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;        NVGSDK_ERR_FEATURE_DISABLED = -1030,</div><div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;        NVGSDK_ERR_APP_NO_OPTIMIZATION = -1031,</div><div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;        NVGSDK_ERR_APP_SETTINGS_READ = -1032,</div><div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;        NVGSDK_ERR_APP_SETTINGS_WRITE = -1033,</div><div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;        NVGSDK_ERR_HIGHLIGHT_NOT_DEFINED = -1034,</div><div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;        NVGSDK_ERR_CAP_LIMIT_REACHED = -1035,</div><div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;        NVGSDK_ERR_DISK_LIMIT_REACHED = -1036</div><div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    } NVGSDK_RetCode;</div><div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;</div><div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    <span class="comment">// not using macros to avoid polluting namespace of SDK unnecessarily</span></div><div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;</div><div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    <span class="keyword">inline</span> <span class="keywordtype">bool</span> NVGSDK_SUCCEEDED(NVGSDK_RetCode r)</div><div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    {</div><div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;        <span class="keywordflow">return</span> r &gt;= 0;</div><div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    }</div><div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;</div><div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;    <span class="keyword">inline</span> <span class="keywordtype">bool</span> NVGSDK_FAILED(NVGSDK_RetCode r)</div><div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;    {</div><div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;        <span class="keywordflow">return</span> r &lt; 0;</div><div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;    }</div><div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;</div><div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;    <span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    {</div><div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;        NVGSDK_HIGHLIGHT_TYPE_NONE = 0x00000000,</div><div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;        NVGSDK_HIGHLIGHT_TYPE_MILESTONE = 0x00000001,</div><div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;        NVGSDK_HIGHLIGHT_TYPE_ACHIEVEMENT = 0x00000002,</div><div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;        NVGSDK_HIGHLIGHT_TYPE_INCIDENT = 0x00000004,</div><div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;        NVGSDK_HIGHLIGHT_TYPE_STATE_CHANGE = 0x00000008,</div><div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;        NVGSDK_HIGHLIGHT_TYPE_UNANNOUNCED = 0x00000010,</div><div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;        NVGSDK_HIGHLIGHT_TYPE_MAX = 0x00000020</div><div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    } NVGSDK_HighlightType;</div><div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;</div><div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;    <span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    {</div><div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;        NVGSDK_HIGHLIGHT_SIGNIFICANCE_NONE = 0x00000000,</div><div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;        NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_BAD = 0x00000001,</div><div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;        NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_BAD = 0x00000002,</div><div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;        NVGSDK_HIGHLIGHT_SIGNIFICANCE_BAD = 0x00000004,</div><div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;        NVGSDK_HIGHLIGHT_SIGNIFICANCE_NEUTRAL = 0x00000010,</div><div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;        NVGSDK_HIGHLIGHT_SIGNIFICANCE_GOOD = 0x00000100,</div><div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;        NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_GOOD = 0x00000200,</div><div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;        NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_GOOD = 0x00000400,</div><div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;</div><div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;        NVGSDK_HIGHLIGHT_SIGNIFICANCE_MAX = 0x00000800</div><div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;    } NVGSDK_HighlightSignificance;</div><div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;</div><div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;    <span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;    {</div><div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;        NVGSDK_SCOPE_HIGHLIGHTS = 0,       </div><div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;        NVGSDK_SCOPE_HIGHLIGHTS_VIDEO = 1, </div><div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;        NVGSDK_SCOPE_HIGHLIGHTS_SCREENSHOT = 2, </div><div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;        NVGSDK_SCOPE_OPS = 3,                   </div><div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;        NVGSDK_SCOPE_MAX</div><div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;    } NVGSDK_Scope;</div><div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;</div><div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;    <span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;    {</div><div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;        NVGSDK_PERMISSION_GRANTED = 0,  </div><div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;        NVGSDK_PERMISSION_MUST_ASK = 1, </div><div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;        NVGSDK_PERMISSION_DENIED = 2,   </div><div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;        NVGSDK_PERMISSION_UNKNOWN = 3,  </div><div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;        NVGSDK_PERMISSION_MAX</div><div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;    } NVGSDK_Permission;</div><div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;</div><div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;    <span class="keyword">typedef</span> <span class="keyword">enum</span></div><div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;    {</div><div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;        NVGSDK_OVERLAY_STATE_MAIN,               </div><div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;        NVGSDK_OVERLAY_STATE_PERMISSION,         </div><div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;        NVGSDK_OVERLAY_STATE_HIGHLIGHTS_SUMMARY, </div><div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;        NVGSDK_OVERLAY_STATE_MAX</div><div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;    } NVGSDK_OverlayState;</div><div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;</div><div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;    <span class="keyword">inline</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *NVGSDK_RetCodeToString(NVGSDK_RetCode <span class="keyword">const</span> ret)</div><div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;    {</div><div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;        <span class="keywordflow">switch</span> (ret)</div><div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;        {</div><div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;        <span class="keywordflow">case</span> NVGSDK_SUCCESS:</div><div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS&quot;</span>;</div><div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;        <span class="keywordflow">case</span> NVGSDK_SUCCESS_VERSION_OLD_SDK:</div><div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_VERSION_OLD_SDK&quot;</span>;</div><div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;        <span class="keywordflow">case</span> NVGSDK_SUCCESS_VERSION_OLD_GFE:</div><div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_VERSION_OLD_GFE&quot;</span>;</div><div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;        <span class="keywordflow">case</span> NVGSDK_SUCCESS_PENDING:</div><div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_PENDING&quot;</span>;</div><div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;        <span class="keywordflow">case</span> NVGSDK_SUCCESS_USER_NOT_INTERESTED:</div><div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_USER_NOT_INTERESTED&quot;</span>;</div><div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;        <span class="keywordflow">case</span> NVGSDK_SUCCESS_PERMISSION_GRANTED:</div><div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_PERMISSION_GRANTED&quot;</span>;</div><div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;        <span class="keywordflow">case</span> NVGSDK_SUCCESS_LINKED:</div><div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_SUCCESS_LINKED&quot;</span>;</div><div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_GENERIC:</div><div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_GENERIC&quot;</span>;</div><div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_GFE_VERSION:</div><div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_GFE_VERSION&quot;</span>;</div><div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_SDK_VERSION:</div><div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_SDK_VERSION&quot;</span>;</div><div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_NOT_IMPLEMENTED:</div><div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_NOT_IMPLEMENTED&quot;</span>;</div><div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_INVALID_PARAMETER:</div><div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_INVALID_PARAMETER&quot;</span>;</div><div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_NOT_SET:</div><div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_NOT_SET&quot;</span>;</div><div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_SHADOWPLAY_IR_DISABLED:</div><div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_SHADOWPLAY_IR_DISABLED&quot;</span>;</div><div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_SDK_IN_USE:</div><div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_SDK_IN_USE&quot;</span>;</div><div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_GROUP_NOT_FOUND:</div><div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_GROUP_NOT_FOUND&quot;</span>;</div><div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_FILE_NOT_FOUND:</div><div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_FILE_NOT_FOUND&quot;</span>;</div><div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED:</div><div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED&quot;</span>;</div><div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED:</div><div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED&quot;</span>;</div><div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED:</div><div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED&quot;</span>;</div><div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_UNEXPECTED_EXCEPTION:</div><div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_UNEXPECTED_EXCEPTION&quot;</span>;</div><div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_NO_HIGHLIGHTS:</div><div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_NO_HIGHLIGHTS&quot;</span>;</div><div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_NO_CONNECTION:</div><div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_NO_CONNECTION&quot;</span>;</div><div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_PERMISSION_NOT_GRANTED:</div><div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_PERMISSION_NOT_GRANTED&quot;</span>;</div><div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_PERMISSION_DENIED:</div><div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_PERMISSION_DENIED&quot;</span>;</div><div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_INVALID_HANDLE:</div><div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_INVALID_HANDLE&quot;</span>;</div><div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_UNHANDLED_EXCEPTION:</div><div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_UNHANDLED_EXCEPTION&quot;</span>;</div><div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_OUT_OF_MEMORY:</div><div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_OUT_OF_MEMORY&quot;</span>;</div><div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_LOAD_LIBRARY:</div><div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_LOAD_LIBRARY&quot;</span>;</div><div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_LIB_CALL_FAILED:</div><div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_LIB_CALL_FAILED&quot;</span>;</div><div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_IPC_FAILED:</div><div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_IPC_FAILED&quot;</span>;</div><div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_CONNECTION:</div><div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_CONNECTION&quot;</span>;</div><div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_MODULE_NOT_LOADED:</div><div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_MODULE_NOT_LOADED&quot;</span>;</div><div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_LIB_CALL_TIMEOUT:</div><div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_LIB_CALL_TIMEOUT&quot;</span>;</div><div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_APPLICATION_LOOKUP_FAILED:</div><div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_APPLICATION_LOOKUP_FAILED&quot;</span>;</div><div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_APPLICATION_NOT_KNOWN:</div><div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_APPLICATION_NOT_KNOWN&quot;</span>;</div><div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_FEATURE_DISABLED:</div><div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_FEATURE_DISABLED&quot;</span>;</div><div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_APP_NO_OPTIMIZATION:</div><div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_APP_NO_OPTIMIZATION&quot;</span>;</div><div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_APP_SETTINGS_READ:</div><div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_APP_SETTINGS_READ&quot;</span>;</div><div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_APP_SETTINGS_WRITE:</div><div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_APP_SETTINGS_WRITE&quot;</span>;</div><div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_HIGHLIGHT_NOT_DEFINED:</div><div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_HIGHLIGHT_NOT_DEFINED&quot;</span>;</div><div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_CAP_LIMIT_REACHED:</div><div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_CAP_LIMIT_REACHED&quot;</span>;</div><div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;        <span class="keywordflow">case</span> NVGSDK_ERR_DISK_LIMIT_REACHED:</div><div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;            <span class="keywordflow">return</span> <span class="stringliteral">&quot;NVGSDK_ERR_DISK_LIMIT_REACHED&quot;</span>;</div><div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;        }</div><div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;        <span class="keywordflow">return</span> <span class="stringliteral">&quot;Unknown code&quot;</span>;</div><div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;    }</div><div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;</div><div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;    <span class="comment">// All alphanumeric and the hyphen</span></div><div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span> VALID_GROUPID_CHARS[] = <span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;    <span class="keywordtype">wchar_t</span> <span class="keyword">const</span> VALID_GROUPID_WCHARS[] = L<span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;</div><div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span> VALID_HIGHLIGHT_DEF_ID_CHARS[] = <span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;    <span class="keywordtype">wchar_t</span> <span class="keyword">const</span> VALID_HIGHLIGHT_DEF_ID_WCHARS[] = L<span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;</div><div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span> VALID_GAMENAME_CHARS[] = <span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;    <span class="keywordtype">wchar_t</span> <span class="keyword">const</span> VALID_GAMENAME_WCHARS[] = L<span class="stringliteral">&quot;^[a-zA-Z0-9\\-\\._ &#39;]+$&quot;</span>;</div><div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;</div><div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;    <span class="keywordtype">char</span> <span class="keyword">const</span> VALID_LOCALE_CODE_CHARS[] = <span class="stringliteral">&quot;^[a-zA-Z\\-]+$&quot;</span>;</div><div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;    <span class="keywordtype">wchar_t</span> <span class="keyword">const</span> VALID_LOCALE_CODE_WCHARS[] = L<span class="stringliteral">&quot;^[a-zA-Z\\-]+$&quot;</span>;</div><div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;</div><div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;    <span class="keywordtype">size_t</span> <span class="keyword">const</span> VALID_HIGHLIGHT_SIGNIFICANCE_WIDTH = 0x8FF;</div><div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;    <span class="keywordtype">size_t</span> <span class="keyword">const</span> VALID_HIGHLIGHT_TAG_WIDTH = 0x1F;</div><div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;</div><div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div><div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;}</div><div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;</div><div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;<span class="preprocessor">#endif // NVSDKAPI_IPC_H</span></div></div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- HTML footer for doxygen 1.8.12-->
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="navelem"><a class="el" href="dir_21dfd2273a7f43571f69ea7d9a7bef28.html">sdk</a></li><li class="navelem"><a class="el" href="dir_c8951a4514ffd6dca1d0bd1443098010.html">include</a></li><li class="navelem"><a class="el" href="dir_e789e2e8a554a90f7e478c85f971e5ee.html">gfesdk</a></li><li class="navelem"><b>sdk_types_ipc.h</b></li>
+    <li class="navelem"><a class="el" href="dir_22a05cd20f85fd3b5d06bb82cdaa6ca8.html">sdk</a></li><li class="navelem"><a class="el" href="dir_e31eb9cae286691b323708fcb3cc0b5c.html">include</a></li><li class="navelem"><a class="el" href="dir_0e11d6b9f607d0ef730b98f1fc6a7102.html">gfesdk</a></li><li class="navelem"><b>sdk_types_ipc.h</b></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/search/all_0.html b/doc/html/search/all_0.html
index 4359463..d54e0bd 100644
--- a/doc/html/search/all_0.html
+++ b/doc/html/search/all_0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_1.html b/doc/html/search/all_1.html
index bc87ea8..8cc6a1d 100644
--- a/doc/html/search/all_1.html
+++ b/doc/html/search/all_1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_1.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_1.js b/doc/html/search/all_1.js
index 706fe95..d044eec 100644
--- a/doc/html/search/all_1.js
+++ b/doc/html/search/all_1.js
@@ -8,5 +8,5 @@ var searchData=
   ['createinputparams',['CreateInputParams',['../struct_gfe_s_d_k_1_1_create_input_params.html',1,'GfeSDK']]],
   ['createresponse',['CreateResponse',['../struct_gfe_s_d_k_1_1_create_response.html',1,'GfeSDK']]],
   ['culturecode',['cultureCode',['../struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75',1,'NVGSDK_Language']]],
-  ['changelog',['Changelog',['../md__c_1_u_workspace_dev_sdkwinauto_doc__c_h_a_n_g_e_l_o_g.html',1,'']]]
+  ['changelog',['Changelog',['../md_C:_u_workspace_dev_sdkwinauto_doc_CHANGELOG.html',1,'']]]
 ];
diff --git a/doc/html/search/all_2.html b/doc/html/search/all_2.html
index 0f777c2..d15ac65 100644
--- a/doc/html/search/all_2.html
+++ b/doc/html/search/all_2.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_2.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_3.html b/doc/html/search/all_3.html
index ac9dbf9..9f526c6 100644
--- a/doc/html/search/all_3.html
+++ b/doc/html/search/all_3.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_3.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_4.html b/doc/html/search/all_4.html
index 8308168..7b814aa 100644
--- a/doc/html/search/all_4.html
+++ b/doc/html/search/all_4.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_4.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_4.js b/doc/html/search/all_4.js
index c876776..e13c865 100644
--- a/doc/html/search/all_4.js
+++ b/doc/html/search/all_4.js
@@ -4,7 +4,7 @@ var searchData=
   ['getnumberofhighlightsresponse',['GetNumberOfHighlightsResponse',['../struct_gfe_s_d_k_1_1_get_number_of_highlights_response.html',1,'GfeSDK']]],
   ['getuilanguageasync',['GetUILanguageAsync',['../class_gfe_s_d_k_1_1_core.html#ad8edbad0bf465ba656bb99353d4f2122',1,'GfeSDK::Core::GetUILanguageAsync()'],['../class_gfe_s_d_k_1_1_core_impl.html#a95587bb5dc50b0f8b11d7fd75a8ecea3',1,'GfeSDK::CoreImpl::GetUILanguageAsync()']]],
   ['getuilanguageresponse',['GetUILanguageResponse',['../struct_gfe_s_d_k_1_1_get_u_i_language_response.html',1,'GfeSDK']]],
-  ['getusersettingsasync',['GetUserSettingsAsync',['../class_gfe_s_d_k_1_1_highlights.html#a593d1bd58183bc0b53c7dee7991d8491',1,'GfeSDK::Highlights::GetUserSettingsAsync()'],['../class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040',1,'GfeSDK::HighlightsImpl::GetUserSettingsAsync()']]],
+  ['getusersettingsasync',['GetUserSettingsAsync',['../class_gfe_s_d_k_1_1_highlights.html#add1016d23068c8f2dd0cd037210aa14b',1,'GfeSDK::Highlights::GetUserSettingsAsync()'],['../class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f',1,'GfeSDK::HighlightsImpl::GetUserSettingsAsync()']]],
   ['getusersettingsresponse',['GetUserSettingsResponse',['../struct_gfe_s_d_k_1_1_get_user_settings_response.html',1,'GfeSDK']]],
   ['gfeversionstr',['gfeVersionStr',['../struct_n_v_g_s_d_k___version.html#abdb04097bd3c65601de459467fa4dc2b',1,'NVGSDK_Version::gfeVersionStr()'],['../struct_n_v_g_s_d_k___create_response.html#aacdf644f5f6eb996dad6bb90b4145deb',1,'NVGSDK_CreateResponse::gfeVersionStr()']]],
   ['groupdescriptiontable',['groupDescriptionTable',['../struct_n_v_g_s_d_k___highlight_open_group_params.html#a3d06bbfc6586ca5378eedc9a5984d662',1,'NVGSDK_HighlightOpenGroupParams']]],
diff --git a/doc/html/search/all_5.html b/doc/html/search/all_5.html
index 7919cd4..d8de556 100644
--- a/doc/html/search/all_5.html
+++ b/doc/html/search/all_5.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_5.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_6.html b/doc/html/search/all_6.html
index 89d590c..9ba0cc2 100644
--- a/doc/html/search/all_6.html
+++ b/doc/html/search/all_6.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_6.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_7.html b/doc/html/search/all_7.html
index 0e8c527..9384ec9 100644
--- a/doc/html/search/all_7.html
+++ b/doc/html/search/all_7.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_7.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_8.html b/doc/html/search/all_8.html
index 80bda06..37566c5 100644
--- a/doc/html/search/all_8.html
+++ b/doc/html/search/all_8.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_8.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_8.js b/doc/html/search/all_8.js
index aa03dba..02cd61c 100644
--- a/doc/html/search/all_8.js
+++ b/doc/html/search/all_8.js
@@ -12,7 +12,7 @@ var searchData=
   ['nvgsdk_5fcreateresponse',['NVGSDK_CreateResponse',['../struct_n_v_g_s_d_k___create_response.html',1,'']]],
   ['nvgsdk_5femptycallback',['NVGSDK_EmptyCallback',['../sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac',1,'sdk_types.h']]],
   ['nvgsdk_5fgetuilanguageasync',['NVGSDK_GetUILanguageAsync',['../isdk_8h.html#a30ed8fc1b0066f8eae9078ab65b136de',1,'isdk.h']]],
-  ['nvgsdk_5fgetuilanguagecallback',['NVGSDK_GetUILanguageCallback',['../sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e',1,'sdk_types.h']]],
+  ['nvgsdk_5fgetuilanguagecallback',['NVGSDK_GetUILanguageCallback',['../sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a',1,'sdk_types.h']]],
   ['nvgsdk_5fgroupview',['NVGSDK_GroupView',['../struct_n_v_g_s_d_k___group_view.html',1,'']]],
   ['nvgsdk_5fhighlight',['NVGSDK_Highlight',['../struct_n_v_g_s_d_k___highlight.html',1,'']]],
   ['nvgsdk_5fhighlightclosegroupparams',['NVGSDK_HighlightCloseGroupParams',['../struct_n_v_g_s_d_k___highlight_close_group_params.html',1,'']]],
@@ -21,9 +21,9 @@ var searchData=
   ['nvgsdk_5fhighlights_5fclosegroupasync',['NVGSDK_Highlights_CloseGroupAsync',['../ihighlights_8h.html#aa3b6190835ada28f4cee015645814e75',1,'ihighlights.h']]],
   ['nvgsdk_5fhighlights_5fconfigureasync',['NVGSDK_Highlights_ConfigureAsync',['../ihighlights_8h.html#a0407132e7fd44771370ecfa03fdfce8d',1,'ihighlights.h']]],
   ['nvgsdk_5fhighlights_5fgetnumberofhighlightsasync',['NVGSDK_Highlights_GetNumberOfHighlightsAsync',['../ihighlights_8h.html#afad5de18b900053c2b291ce2a55985c1',1,'ihighlights.h']]],
-  ['nvgsdk_5fhighlights_5fgetnumberofhighlightscallback',['NVGSDK_Highlights_GetNumberOfHighlightsCallback',['../highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0',1,'highlights_types.h']]],
+  ['nvgsdk_5fhighlights_5fgetnumberofhighlightscallback',['NVGSDK_Highlights_GetNumberOfHighlightsCallback',['../highlights__types_8h.html#a69743e304d126860275dec9f1335f16f',1,'highlights_types.h']]],
   ['nvgsdk_5fhighlights_5fgetusersettingsasync',['NVGSDK_Highlights_GetUserSettingsAsync',['../ihighlights_8h.html#a48a359560944097729acf3dff42e34bb',1,'ihighlights.h']]],
-  ['nvgsdk_5fhighlights_5fgetusersettingscallback',['NVGSDK_Highlights_GetUserSettingsCallback',['../highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9',1,'highlights_types.h']]],
+  ['nvgsdk_5fhighlights_5fgetusersettingscallback',['NVGSDK_Highlights_GetUserSettingsCallback',['../highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6',1,'highlights_types.h']]],
   ['nvgsdk_5fhighlights_5fnumberofhighlights',['NVGSDK_Highlights_NumberOfHighlights',['../struct_n_v_g_s_d_k___highlights___number_of_highlights.html',1,'']]],
   ['nvgsdk_5fhighlights_5fopengroupasync',['NVGSDK_Highlights_OpenGroupAsync',['../ihighlights_8h.html#aa49250dbc063e242607123333f8da892',1,'ihighlights.h']]],
   ['nvgsdk_5fhighlights_5fopensummaryasync',['NVGSDK_Highlights_OpenSummaryAsync',['../ihighlights_8h.html#ac6ee1cb402b4476571a79050f61bcd92',1,'ihighlights.h']]],
@@ -33,7 +33,7 @@ var searchData=
   ['nvgsdk_5fhighlightusersetting',['NVGSDK_HighlightUserSetting',['../struct_n_v_g_s_d_k___highlight_user_setting.html',1,'']]],
   ['nvgsdk_5flanguage',['NVGSDK_Language',['../struct_n_v_g_s_d_k___language.html',1,'']]],
   ['nvgsdk_5flocalizedpair',['NVGSDK_LocalizedPair',['../struct_n_v_g_s_d_k___localized_pair.html',1,'']]],
-  ['nvgsdk_5floggingcallback',['NVGSDK_LoggingCallback',['../sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312',1,'sdk_types.h']]],
+  ['nvgsdk_5floggingcallback',['NVGSDK_LoggingCallback',['../sdk__types_8h.html#ab13929e496dd1748a31088399519252a',1,'sdk_types.h']]],
   ['nvgsdk_5floglevel',['NVGSDK_LogLevel',['../sdk__types_8h.html#a8ad6f8cbc3c4ba6587912a4a4638d857',1,'sdk_types.h']]],
   ['nvgsdk_5fnotification',['NVGSDK_Notification',['../struct_n_v_g_s_d_k___notification.html',1,'']]],
   ['nvgsdk_5fnotification_5foverlay_5fstate_5fchanged',['NVGSDK_NOTIFICATION_OVERLAY_STATE_CHANGED',['../sdk__types_8h.html#a41214fdc112a95d5fe8e760b0c562c59aa833a35cd4938b11579b3f22c1e346d7',1,'sdk_types.h']]],
diff --git a/doc/html/search/all_9.html b/doc/html/search/all_9.html
index 8ebc8a2..c8c5102 100644
--- a/doc/html/search/all_9.html
+++ b/doc/html/search/all_9.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_9.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_a.html b/doc/html/search/all_a.html
index f17bf66..4cb31f0 100644
--- a/doc/html/search/all_a.html
+++ b/doc/html/search/all_a.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_a.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_b.html b/doc/html/search/all_b.html
index 6ef469e..d34a612 100644
--- a/doc/html/search/all_b.html
+++ b/doc/html/search/all_b.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_b.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_c.html b/doc/html/search/all_c.html
index 4ca7bb9..c1ae2ca 100644
--- a/doc/html/search/all_c.html
+++ b/doc/html/search/all_c.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_c.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_d.html b/doc/html/search/all_d.html
index fedf606..712223c 100644
--- a/doc/html/search/all_d.html
+++ b/doc/html/search/all_d.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_d.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_e.html b/doc/html/search/all_e.html
index 9b78086..d553ffa 100644
--- a/doc/html/search/all_e.html
+++ b/doc/html/search/all_e.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_e.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/all_f.html b/doc/html/search/all_f.html
index 3bf97c6..c77391a 100644
--- a/doc/html/search/all_f.html
+++ b/doc/html/search/all_f.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_f.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/classes_0.html b/doc/html/search/classes_0.html
index 2e45b2c..025587a 100644
--- a/doc/html/search/classes_0.html
+++ b/doc/html/search/classes_0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="classes_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/classes_1.html b/doc/html/search/classes_1.html
index 5f1bc63..86dc4ff 100644
--- a/doc/html/search/classes_1.html
+++ b/doc/html/search/classes_1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="classes_1.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/classes_2.html b/doc/html/search/classes_2.html
index e3a6f9c..014caf8 100644
--- a/doc/html/search/classes_2.html
+++ b/doc/html/search/classes_2.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="classes_2.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/classes_3.html b/doc/html/search/classes_3.html
index ed4b46e..2e97201 100644
--- a/doc/html/search/classes_3.html
+++ b/doc/html/search/classes_3.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="classes_3.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/classes_4.html b/doc/html/search/classes_4.html
index b1f5f93..776fee3 100644
--- a/doc/html/search/classes_4.html
+++ b/doc/html/search/classes_4.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="classes_4.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/classes_5.html b/doc/html/search/classes_5.html
index 7f718b3..69bbcc8 100644
--- a/doc/html/search/classes_5.html
+++ b/doc/html/search/classes_5.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="classes_5.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/classes_6.html b/doc/html/search/classes_6.html
index 1c02825..2db08a0 100644
--- a/doc/html/search/classes_6.html
+++ b/doc/html/search/classes_6.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="classes_6.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/classes_7.html b/doc/html/search/classes_7.html
index 2af8b70..fd67346 100644
--- a/doc/html/search/classes_7.html
+++ b/doc/html/search/classes_7.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="classes_7.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/classes_8.html b/doc/html/search/classes_8.html
index a57aeae..369fe52 100644
--- a/doc/html/search/classes_8.html
+++ b/doc/html/search/classes_8.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="classes_8.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/enums_0.html b/doc/html/search/enums_0.html
index f3028ad..aba8d79 100644
--- a/doc/html/search/enums_0.html
+++ b/doc/html/search/enums_0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="enums_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/enumvalues_0.html b/doc/html/search/enumvalues_0.html
index 96eafe7..83192d3 100644
--- a/doc/html/search/enumvalues_0.html
+++ b/doc/html/search/enumvalues_0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="enumvalues_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/files_0.html b/doc/html/search/files_0.html
index 63c6ce0..0b637cf 100644
--- a/doc/html/search/files_0.html
+++ b/doc/html/search/files_0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="files_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/files_1.html b/doc/html/search/files_1.html
index 5b37391..1094e74 100644
--- a/doc/html/search/files_1.html
+++ b/doc/html/search/files_1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="files_1.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/files_2.html b/doc/html/search/files_2.html
index f5456fb..a08dbd3 100644
--- a/doc/html/search/files_2.html
+++ b/doc/html/search/files_2.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="files_2.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/functions_0.html b/doc/html/search/functions_0.html
index 03cae5d..6bc52b6 100644
--- a/doc/html/search/functions_0.html
+++ b/doc/html/search/functions_0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="functions_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/functions_1.html b/doc/html/search/functions_1.html
index 5d7a2e3..648831f 100644
--- a/doc/html/search/functions_1.html
+++ b/doc/html/search/functions_1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="functions_1.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/functions_2.html b/doc/html/search/functions_2.html
index c21af16..c93d089 100644
--- a/doc/html/search/functions_2.html
+++ b/doc/html/search/functions_2.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="functions_2.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/functions_2.js b/doc/html/search/functions_2.js
index 976063d..9f63782 100644
--- a/doc/html/search/functions_2.js
+++ b/doc/html/search/functions_2.js
@@ -2,5 +2,5 @@ var searchData=
 [
   ['getnumberofhighlightsasync',['GetNumberOfHighlightsAsync',['../class_gfe_s_d_k_1_1_highlights.html#ad640f12621aa2ab8f0bf39b859f8d849',1,'GfeSDK::Highlights::GetNumberOfHighlightsAsync()'],['../class_gfe_s_d_k_1_1_highlights_impl.html#a358fcbe7699b79ed79952bb2eab12830',1,'GfeSDK::HighlightsImpl::GetNumberOfHighlightsAsync()']]],
   ['getuilanguageasync',['GetUILanguageAsync',['../class_gfe_s_d_k_1_1_core.html#ad8edbad0bf465ba656bb99353d4f2122',1,'GfeSDK::Core::GetUILanguageAsync()'],['../class_gfe_s_d_k_1_1_core_impl.html#a95587bb5dc50b0f8b11d7fd75a8ecea3',1,'GfeSDK::CoreImpl::GetUILanguageAsync()']]],
-  ['getusersettingsasync',['GetUserSettingsAsync',['../class_gfe_s_d_k_1_1_highlights.html#a593d1bd58183bc0b53c7dee7991d8491',1,'GfeSDK::Highlights::GetUserSettingsAsync()'],['../class_gfe_s_d_k_1_1_highlights_impl.html#ac6238d6e68d8b3ed07c2753f35ea8040',1,'GfeSDK::HighlightsImpl::GetUserSettingsAsync()']]]
+  ['getusersettingsasync',['GetUserSettingsAsync',['../class_gfe_s_d_k_1_1_highlights.html#add1016d23068c8f2dd0cd037210aa14b',1,'GfeSDK::Highlights::GetUserSettingsAsync()'],['../class_gfe_s_d_k_1_1_highlights_impl.html#ac1463c91e4646dafb38d2ff53c98f22f',1,'GfeSDK::HighlightsImpl::GetUserSettingsAsync()']]]
 ];
diff --git a/doc/html/search/functions_3.html b/doc/html/search/functions_3.html
index e6f4744..caa48ea 100644
--- a/doc/html/search/functions_3.html
+++ b/doc/html/search/functions_3.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="functions_3.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/functions_4.html b/doc/html/search/functions_4.html
index 9ae34ff..a9c64ad 100644
--- a/doc/html/search/functions_4.html
+++ b/doc/html/search/functions_4.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="functions_4.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/functions_5.html b/doc/html/search/functions_5.html
index 54f53d0..9d135fa 100644
--- a/doc/html/search/functions_5.html
+++ b/doc/html/search/functions_5.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="functions_5.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/functions_6.html b/doc/html/search/functions_6.html
index c7bc6fb..5fca897 100644
--- a/doc/html/search/functions_6.html
+++ b/doc/html/search/functions_6.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="functions_6.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/functions_7.html b/doc/html/search/functions_7.html
index 7f10e2b..02631a3 100644
--- a/doc/html/search/functions_7.html
+++ b/doc/html/search/functions_7.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="functions_7.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/pages_0.html b/doc/html/search/pages_0.html
index d0102ff..0db7267 100644
--- a/doc/html/search/pages_0.html
+++ b/doc/html/search/pages_0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="pages_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/pages_0.js b/doc/html/search/pages_0.js
index 328e5e5..bd9838c 100644
--- a/doc/html/search/pages_0.js
+++ b/doc/html/search/pages_0.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['changelog',['Changelog',['../md__c_1_u_workspace_dev_sdkwinauto_doc__c_h_a_n_g_e_l_o_g.html',1,'']]]
+  ['changelog',['Changelog',['../md_C:_u_workspace_dev_sdkwinauto_doc_CHANGELOG.html',1,'']]]
 ];
diff --git a/doc/html/search/pages_1.html b/doc/html/search/pages_1.html
index d447b6a..2c67a8e 100644
--- a/doc/html/search/pages_1.html
+++ b/doc/html/search/pages_1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="pages_1.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/search.css b/doc/html/search/search.css
index 03a95f1..c9fa23c 100644
--- a/doc/html/search/search.css
+++ b/doc/html/search/search.css
@@ -6,12 +6,14 @@
 
 #MSearchBox {
     white-space : nowrap;
+    position: absolute;
     float: none;
+    display: inline;
     margin-top: 8px;
     right: 0px;
     width: 170px;
-    height: 24px;
     z-index: 102;
+    background-color: white;
 }
 
 #MSearchBox .left
@@ -46,13 +48,12 @@
     height:19px;
     background:url('search_m.png') repeat-x;
     border:none;
-    width:115px;
+    width:111px;
     margin-left:20px;
     padding-left:4px;
     color: #909090;
     outline: none;
     font: 9pt Arial, Verdana, sans-serif;
-    -webkit-border-radius: 0px;
 }
 
 #FSearchBox #MSearchField {
@@ -63,7 +64,7 @@
     display:block;
     position:absolute;
     right:10px;
-    top:8px;
+    top:0px;
     width:20px;
     height:19px;
     background:url('search_r.png') no-repeat;
@@ -101,7 +102,7 @@
     left: 0; top: 0;
     border: 1px solid #69A600;
     background-color: #F6FFE7;
-    z-index: 10001;
+    z-index: 1;
     padding-top: 4px;
     padding-bottom: 4px;
     -moz-border-radius: 4px;
@@ -164,7 +165,6 @@ iframe#MSearchResults {
     left: 0; top: 0;
     border: 1px solid #000;
     background-color: #E5FFB9;
-    z-index:10000;
 }
 
 /* ----------------------------------- */
diff --git a/doc/html/search/typedefs_0.html b/doc/html/search/typedefs_0.html
index 3a58062..fb07195 100644
--- a/doc/html/search/typedefs_0.html
+++ b/doc/html/search/typedefs_0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="typedefs_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/typedefs_0.js b/doc/html/search/typedefs_0.js
index 97e46a9..e55a844 100644
--- a/doc/html/search/typedefs_0.js
+++ b/doc/html/search/typedefs_0.js
@@ -1,8 +1,8 @@
 var searchData=
 [
   ['nvgsdk_5femptycallback',['NVGSDK_EmptyCallback',['../sdk__types_8h.html#a1c5cd84ed88c70462c360a7268eb95ac',1,'sdk_types.h']]],
-  ['nvgsdk_5fgetuilanguagecallback',['NVGSDK_GetUILanguageCallback',['../sdk__types_8h.html#a25a1eb6d5c4697e50ebdebb500d0500e',1,'sdk_types.h']]],
-  ['nvgsdk_5fhighlights_5fgetnumberofhighlightscallback',['NVGSDK_Highlights_GetNumberOfHighlightsCallback',['../highlights__types_8h.html#a1ace1def4d575aa419abae45b2738db0',1,'highlights_types.h']]],
-  ['nvgsdk_5fhighlights_5fgetusersettingscallback',['NVGSDK_Highlights_GetUserSettingsCallback',['../highlights__types_8h.html#a87a246f3f9c2a0f0670b1208b22fa2d9',1,'highlights_types.h']]],
-  ['nvgsdk_5floggingcallback',['NVGSDK_LoggingCallback',['../sdk__types_8h.html#afdec7c9f24e19fb84c5faf34d77e9312',1,'sdk_types.h']]]
+  ['nvgsdk_5fgetuilanguagecallback',['NVGSDK_GetUILanguageCallback',['../sdk__types_8h.html#aa327c1a78bd452bd8edbcad7a4e4d86a',1,'sdk_types.h']]],
+  ['nvgsdk_5fhighlights_5fgetnumberofhighlightscallback',['NVGSDK_Highlights_GetNumberOfHighlightsCallback',['../highlights__types_8h.html#a69743e304d126860275dec9f1335f16f',1,'highlights_types.h']]],
+  ['nvgsdk_5fhighlights_5fgetusersettingscallback',['NVGSDK_Highlights_GetUserSettingsCallback',['../highlights__types_8h.html#ac758b6034dd2bb8bbde7de7576141fd6',1,'highlights_types.h']]],
+  ['nvgsdk_5floggingcallback',['NVGSDK_LoggingCallback',['../sdk__types_8h.html#ab13929e496dd1748a31088399519252a',1,'sdk_types.h']]]
 ];
diff --git a/doc/html/search/variables_0.html b/doc/html/search/variables_0.html
index 164aa54..3835278 100644
--- a/doc/html/search/variables_0.html
+++ b/doc/html/search/variables_0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_1.html b/doc/html/search/variables_1.html
index 857fbbd..3c65cf2 100644
--- a/doc/html/search/variables_1.html
+++ b/doc/html/search/variables_1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_1.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_2.html b/doc/html/search/variables_2.html
index 35233e3..7b43e0a 100644
--- a/doc/html/search/variables_2.html
+++ b/doc/html/search/variables_2.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_2.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_3.html b/doc/html/search/variables_3.html
index e45e613..ea0392d 100644
--- a/doc/html/search/variables_3.html
+++ b/doc/html/search/variables_3.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_3.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_4.html b/doc/html/search/variables_4.html
index 97ec255..1ed95cb 100644
--- a/doc/html/search/variables_4.html
+++ b/doc/html/search/variables_4.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_4.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_5.html b/doc/html/search/variables_5.html
index d77fa84..ecc883b 100644
--- a/doc/html/search/variables_5.html
+++ b/doc/html/search/variables_5.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_5.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_6.html b/doc/html/search/variables_6.html
index c656bb6..0c1a66b 100644
--- a/doc/html/search/variables_6.html
+++ b/doc/html/search/variables_6.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_6.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_7.html b/doc/html/search/variables_7.html
index 8aac836..e0da2ef 100644
--- a/doc/html/search/variables_7.html
+++ b/doc/html/search/variables_7.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_7.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_8.html b/doc/html/search/variables_8.html
index a74c6ca..0c3d1df 100644
--- a/doc/html/search/variables_8.html
+++ b/doc/html/search/variables_8.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_8.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_9.html b/doc/html/search/variables_9.html
index 3968526..e14a107 100644
--- a/doc/html/search/variables_9.html
+++ b/doc/html/search/variables_9.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_9.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_a.html b/doc/html/search/variables_a.html
index ce54923..4e38be7 100644
--- a/doc/html/search/variables_a.html
+++ b/doc/html/search/variables_a.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_a.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_b.html b/doc/html/search/variables_b.html
index 4825aed..c98ef41 100644
--- a/doc/html/search/variables_b.html
+++ b/doc/html/search/variables_b.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_b.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_c.html b/doc/html/search/variables_c.html
index 40b9b9a..d5f4449 100644
--- a/doc/html/search/variables_c.html
+++ b/doc/html/search/variables_c.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_c.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_d.html b/doc/html/search/variables_d.html
index 125bf94..a57e383 100644
--- a/doc/html/search/variables_d.html
+++ b/doc/html/search/variables_d.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_d.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/search/variables_e.html b/doc/html/search/variables_e.html
index 3f5bb66..d1502e0 100644
--- a/doc/html/search/variables_e.html
+++ b/doc/html/search/variables_e.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_e.js"></script>
 <script type="text/javascript" src="search.js"></script>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_create_input_params-members.html b/doc/html/struct_gfe_s_d_k_1_1_create_input_params-members.html
index 2c0d686..d2766bd 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_create_input_params-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_create_input_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -104,7 +131,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_create_input_para
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_create_input_params.html b/doc/html/struct_gfe_s_d_k_1_1_create_input_params.html
index c4f4519..28cc3e2 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_create_input_params.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_create_input_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::CreateInputParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -91,26 +118,26 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_create_input_para
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a3d101bfc3a6a28b678537d3f1198ab5e"><td class="memItemLeft" align="right" valign="top"><a id="a3d101bfc3a6a28b678537d3f1198ab5e"></a>
+<tr class="memitem:a3d101bfc3a6a28b678537d3f1198ab5e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3d101bfc3a6a28b678537d3f1198ab5e"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>appName</b></td></tr>
 <tr class="separator:a3d101bfc3a6a28b678537d3f1198ab5e"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad7e63dbf5a858737e0e3f5b8f168e53e"><td class="memItemLeft" align="right" valign="top"><a id="ad7e63dbf5a858737e0e3f5b8f168e53e"></a>
+<tr class="memitem:ad7e63dbf5a858737e0e3f5b8f168e53e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad7e63dbf5a858737e0e3f5b8f168e53e"></a>
 TScopes&#160;</td><td class="memItemRight" valign="bottom"><b>requiredScopes</b></td></tr>
 <tr class="separator:ad7e63dbf5a858737e0e3f5b8f168e53e"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a642a81dc589d578d1c415099e85b9891"><td class="memItemLeft" align="right" valign="top"><a id="a642a81dc589d578d1c415099e85b9891"></a>
+<tr class="memitem:a642a81dc589d578d1c415099e85b9891"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a642a81dc589d578d1c415099e85b9891"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>pollForCallbacks</b></td></tr>
 <tr class="separator:a642a81dc589d578d1c415099e85b9891"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac5a3e3b18dab8b5f0a1fdca82b8f569f"><td class="memItemLeft" align="right" valign="top"><a id="ac5a3e3b18dab8b5f0a1fdca82b8f569f"></a>
+<tr class="memitem:ac5a3e3b18dab8b5f0a1fdca82b8f569f"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac5a3e3b18dab8b5f0a1fdca82b8f569f"></a>
 TNotificationCallback&#160;</td><td class="memItemRight" valign="bottom"><b>notificationCallback</b></td></tr>
 <tr class="separator:ac5a3e3b18dab8b5f0a1fdca82b8f569f"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ab0617abb7f1bff434a7ea285fca5e1eb"><td class="memItemLeft" align="right" valign="top"><a id="ab0617abb7f1bff434a7ea285fca5e1eb"></a>
+<tr class="memitem:ab0617abb7f1bff434a7ea285fca5e1eb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab0617abb7f1bff434a7ea285fca5e1eb"></a>
 void *&#160;</td><td class="memItemRight" valign="bottom"><b>notificationCallbackContext</b></td></tr>
 <tr class="separator:ab0617abb7f1bff434a7ea285fca5e1eb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:acbfe50b94ef46d11155d786af7aaae5b"><td class="memItemLeft" align="right" valign="top"><a id="acbfe50b94ef46d11155d786af7aaae5b"></a>
+<tr class="memitem:acbfe50b94ef46d11155d786af7aaae5b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="acbfe50b94ef46d11155d786af7aaae5b"></a>
 uint32_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_gfe_s_d_k_1_1_create_input_params.html#acbfe50b94ef46d11155d786af7aaae5b">targetPid</a></td></tr>
 <tr class="memdesc:acbfe50b94ef46d11155d786af7aaae5b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Advanced usage. <br /></td></tr>
 <tr class="separator:acbfe50b94ef46d11155d786af7aaae5b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ab4d909fa827bbc7631af877c97fc0cc3"><td class="memItemLeft" align="right" valign="top"><a id="ab4d909fa827bbc7631af877c97fc0cc3"></a>
+<tr class="memitem:ab4d909fa827bbc7631af877c97fc0cc3"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab4d909fa827bbc7631af877c97fc0cc3"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_gfe_s_d_k_1_1_create_input_params.html#ab4d909fa827bbc7631af877c97fc0cc3">targetPath</a></td></tr>
 <tr class="memdesc:ab4d909fa827bbc7631af877c97fc0cc3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Advanced usage. <br /></td></tr>
 <tr class="separator:ab4d909fa827bbc7631af877c97fc0cc3"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -130,7 +157,7 @@ std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hre
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_create_input_params.html">CreateInputParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_create_response-members.html b/doc/html/struct_gfe_s_d_k_1_1_create_response-members.html
index ced2c0a..bb9d687 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_create_response-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_create_response-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -101,7 +128,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_create_response.h
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_create_response.html b/doc/html/struct_gfe_s_d_k_1_1_create_response.html
index 2654cfe..aaf7fb6 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_create_response.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_create_response.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::CreateResponse Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,19 +123,19 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_create_response.h
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:ad8789491524900c7658dc297eedabdfd"><td class="memItemLeft" align="right" valign="top"><a id="ad8789491524900c7658dc297eedabdfd"></a>
+<tr class="memitem:ad8789491524900c7658dc297eedabdfd"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad8789491524900c7658dc297eedabdfd"></a>
 NVGSDK_RetCode&#160;</td><td class="memItemRight" valign="bottom"><b>returnCode</b></td></tr>
 <tr class="separator:ad8789491524900c7658dc297eedabdfd"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a26808a314a57df97a4456ee9e6e24ce6"><td class="memItemLeft" align="right" valign="top"><a id="a26808a314a57df97a4456ee9e6e24ce6"></a>
+<tr class="memitem:a26808a314a57df97a4456ee9e6e24ce6"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a26808a314a57df97a4456ee9e6e24ce6"></a>
 uint16_t&#160;</td><td class="memItemRight" valign="bottom"><b>versionMajor</b></td></tr>
 <tr class="separator:a26808a314a57df97a4456ee9e6e24ce6"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac7c9d1a348e4dda4964d6190e05f0d44"><td class="memItemLeft" align="right" valign="top"><a id="ac7c9d1a348e4dda4964d6190e05f0d44"></a>
+<tr class="memitem:ac7c9d1a348e4dda4964d6190e05f0d44"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac7c9d1a348e4dda4964d6190e05f0d44"></a>
 uint16_t&#160;</td><td class="memItemRight" valign="bottom"><b>versionMinor</b></td></tr>
 <tr class="separator:ac7c9d1a348e4dda4964d6190e05f0d44"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a6aea276209f1b77f5e312b9ea2b02bcf"><td class="memItemLeft" align="right" valign="top"><a id="a6aea276209f1b77f5e312b9ea2b02bcf"></a>
+<tr class="memitem:a6aea276209f1b77f5e312b9ea2b02bcf"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6aea276209f1b77f5e312b9ea2b02bcf"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>nvidiaGfeVersion</b></td></tr>
 <tr class="separator:a6aea276209f1b77f5e312b9ea2b02bcf"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aecec4ca4c7506ef915d4c5bbfff4b921"><td class="memItemLeft" align="right" valign="top"><a id="aecec4ca4c7506ef915d4c5bbfff4b921"></a>
+<tr class="memitem:aecec4ca4c7506ef915d4c5bbfff4b921"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aecec4ca4c7506ef915d4c5bbfff4b921"></a>
 TScopePermissions&#160;</td><td class="memItemRight" valign="bottom"><b>scopePermissions</b></td></tr>
 <tr class="separator:aecec4ca4c7506ef915d4c5bbfff4b921"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -128,7 +155,7 @@ TScopePermissions&#160;</td><td class="memItemRight" valign="bottom"><b>scopePer
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_create_response.html">CreateResponse</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_get_number_of_highlights_response-members.html b/doc/html/struct_gfe_s_d_k_1_1_get_number_of_highlights_response-members.html
index ec34fed..49a9d54 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_get_number_of_highlights_response-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_get_number_of_highlights_response-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -97,7 +124,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_get_number_of_hig
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_get_number_of_highlights_response.html b/doc/html/struct_gfe_s_d_k_1_1_get_number_of_highlights_response.html
index c128a3b..bfb8d58 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_get_number_of_highlights_response.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_get_number_of_highlights_response.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::GetNumberOfHighlightsResponse Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,7 +123,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_get_number_of_hig
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a4fc89055fd4c12c733a5563867590ac1"><td class="memItemLeft" align="right" valign="top"><a id="a4fc89055fd4c12c733a5563867590ac1"></a>
+<tr class="memitem:a4fc89055fd4c12c733a5563867590ac1"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4fc89055fd4c12c733a5563867590ac1"></a>
 uint16_t&#160;</td><td class="memItemRight" valign="bottom"><b>numHighlights</b></td></tr>
 <tr class="separator:a4fc89055fd4c12c733a5563867590ac1"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -116,7 +143,7 @@ uint16_t&#160;</td><td class="memItemRight" valign="bottom"><b>numHighlights</b>
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_get_number_of_highlights_response.html">GetNumberOfHighlightsResponse</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_get_u_i_language_response-members.html b/doc/html/struct_gfe_s_d_k_1_1_get_u_i_language_response-members.html
index 7d5e238..c10b7fd 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_get_u_i_language_response-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_get_u_i_language_response-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -97,7 +124,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_get_u_i_language_
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_get_u_i_language_response.html b/doc/html/struct_gfe_s_d_k_1_1_get_u_i_language_response.html
index 782c821..ce2e301 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_get_u_i_language_response.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_get_u_i_language_response.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::GetUILanguageResponse Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,7 +123,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_get_u_i_language_
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a43b428dbba81150ffb27a4ae72a461ae"><td class="memItemLeft" align="right" valign="top"><a id="a43b428dbba81150ffb27a4ae72a461ae"></a>
+<tr class="memitem:a43b428dbba81150ffb27a4ae72a461ae"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a43b428dbba81150ffb27a4ae72a461ae"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>cultureCode</b></td></tr>
 <tr class="separator:a43b428dbba81150ffb27a4ae72a461ae"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -116,7 +143,7 @@ std::string&#160;</td><td class="memItemRight" valign="bottom"><b>cultureCode</b
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_get_u_i_language_response.html">GetUILanguageResponse</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_get_user_settings_response-members.html b/doc/html/struct_gfe_s_d_k_1_1_get_user_settings_response-members.html
index 8b74eb5..ac730ac 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_get_user_settings_response-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_get_user_settings_response-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -97,7 +124,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_get_user_settings
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_get_user_settings_response.html b/doc/html/struct_gfe_s_d_k_1_1_get_user_settings_response.html
index d78a7d1..6d67bf3 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_get_user_settings_response.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_get_user_settings_response.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::GetUserSettingsResponse Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,7 +123,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_get_user_settings
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:af308fd0306ecf578a58290d5e2dfa566"><td class="memItemLeft" align="right" valign="top"><a id="af308fd0306ecf578a58290d5e2dfa566"></a>
+<tr class="memitem:af308fd0306ecf578a58290d5e2dfa566"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af308fd0306ecf578a58290d5e2dfa566"></a>
 std::vector&lt; <a class="el" href="struct_gfe_s_d_k_1_1_highlight_user_setting.html">HighlightUserSetting</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>highlightSettings</b></td></tr>
 <tr class="separator:af308fd0306ecf578a58290d5e2dfa566"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -116,7 +143,7 @@ std::vector&lt; <a class="el" href="struct_gfe_s_d_k_1_1_highlight_user_setting.
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_get_user_settings_response.html">GetUserSettingsResponse</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_group_view-members.html b/doc/html/struct_gfe_s_d_k_1_1_group_view-members.html
index c00d49c..53eb5b5 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_group_view-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_group_view-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -100,7 +127,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_group_view.html',
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_group_view.html b/doc/html/struct_gfe_s_d_k_1_1_group_view.html
index bc1bea7..06e7f5f 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_group_view.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_group_view.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::GroupView Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,13 +123,13 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_group_view.html',
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:ad5dd5bab7ad625b3708bb63bc7405b16"><td class="memItemLeft" align="right" valign="top"><a id="ad5dd5bab7ad625b3708bb63bc7405b16"></a>
+<tr class="memitem:ad5dd5bab7ad625b3708bb63bc7405b16"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad5dd5bab7ad625b3708bb63bc7405b16"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>groupId</b></td></tr>
 <tr class="separator:ad5dd5bab7ad625b3708bb63bc7405b16"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:abde8e2e9e5c96c1b33885face697103e"><td class="memItemLeft" align="right" valign="top"><a id="abde8e2e9e5c96c1b33885face697103e"></a>
+<tr class="memitem:abde8e2e9e5c96c1b33885face697103e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abde8e2e9e5c96c1b33885face697103e"></a>
 NVGSDK_HighlightType&#160;</td><td class="memItemRight" valign="bottom"><b>tagsFilter</b></td></tr>
 <tr class="separator:abde8e2e9e5c96c1b33885face697103e"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ab431654e4341d1dae7526cd4f8afedb7"><td class="memItemLeft" align="right" valign="top"><a id="ab431654e4341d1dae7526cd4f8afedb7"></a>
+<tr class="memitem:ab431654e4341d1dae7526cd4f8afedb7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab431654e4341d1dae7526cd4f8afedb7"></a>
 NVGSDK_HighlightSignificance&#160;</td><td class="memItemRight" valign="bottom"><b>significanceFilter</b></td></tr>
 <tr class="separator:ab431654e4341d1dae7526cd4f8afedb7"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -122,7 +149,7 @@ NVGSDK_HighlightSignificance&#160;</td><td class="memItemRight" valign="bottom">
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_group_view.html">GroupView</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_highlight_close_group_params-members.html b/doc/html/struct_gfe_s_d_k_1_1_highlight_close_group_params-members.html
index 8017074..49ef3e6 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_highlight_close_group_params-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_highlight_close_group_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_highlight_close_g
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_highlight_close_group_params.html b/doc/html/struct_gfe_s_d_k_1_1_highlight_close_group_params.html
index aac1ed2..8114e2a 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_highlight_close_group_params.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_highlight_close_group_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::HighlightCloseGroupParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,10 +123,10 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_highlight_close_g
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a0c406dc2f572613debe93954eefed6b8"><td class="memItemLeft" align="right" valign="top"><a id="a0c406dc2f572613debe93954eefed6b8"></a>
+<tr class="memitem:a0c406dc2f572613debe93954eefed6b8"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0c406dc2f572613debe93954eefed6b8"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>groupId</b></td></tr>
 <tr class="separator:a0c406dc2f572613debe93954eefed6b8"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afc63ccf8460719220f07f8434d590302"><td class="memItemLeft" align="right" valign="top"><a id="afc63ccf8460719220f07f8434d590302"></a>
+<tr class="memitem:afc63ccf8460719220f07f8434d590302"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afc63ccf8460719220f07f8434d590302"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>destroyHighlights</b></td></tr>
 <tr class="separator:afc63ccf8460719220f07f8434d590302"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -119,7 +146,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>destroyHighlights</b>
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_close_group_params.html">HighlightCloseGroupParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_highlight_config_params-members.html b/doc/html/struct_gfe_s_d_k_1_1_highlight_config_params-members.html
index 32d40e2..76b13de 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_highlight_config_params-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_highlight_config_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_highlight_config_
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_highlight_config_params.html b/doc/html/struct_gfe_s_d_k_1_1_highlight_config_params.html
index 63682b1..52aec0b 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_highlight_config_params.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_highlight_config_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::HighlightConfigParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,10 +123,10 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_highlight_config_
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a038125c4b077c14c5a70baa039eb615d"><td class="memItemLeft" align="right" valign="top"><a id="a038125c4b077c14c5a70baa039eb615d"></a>
+<tr class="memitem:a038125c4b077c14c5a70baa039eb615d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a038125c4b077c14c5a70baa039eb615d"></a>
 std::vector&lt; <a class="el" href="struct_gfe_s_d_k_1_1_highlight_definition.html">HighlightDefinition</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>highlightDefinitions</b></td></tr>
 <tr class="separator:a038125c4b077c14c5a70baa039eb615d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a80af4e463434dab5dc28d251f4f5cea5"><td class="memItemLeft" align="right" valign="top"><a id="a80af4e463434dab5dc28d251f4f5cea5"></a>
+<tr class="memitem:a80af4e463434dab5dc28d251f4f5cea5"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a80af4e463434dab5dc28d251f4f5cea5"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>defaultLocale</b></td></tr>
 <tr class="separator:a80af4e463434dab5dc28d251f4f5cea5"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -119,7 +146,7 @@ std::string&#160;</td><td class="memItemRight" valign="bottom"><b>defaultLocale<
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_config_params.html">HighlightConfigParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_highlight_definition-members.html b/doc/html/struct_gfe_s_d_k_1_1_highlight_definition-members.html
index 7835c40..34841d8 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_highlight_definition-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_highlight_definition-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -102,7 +129,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_highlight_definit
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_highlight_definition.html b/doc/html/struct_gfe_s_d_k_1_1_highlight_definition.html
index 60e9259..3b6c772 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_highlight_definition.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_highlight_definition.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::HighlightDefinition Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,19 +123,19 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_highlight_definit
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a2fc01319783b3d556e27de2926b48465"><td class="memItemLeft" align="right" valign="top"><a id="a2fc01319783b3d556e27de2926b48465"></a>
+<tr class="memitem:a2fc01319783b3d556e27de2926b48465"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2fc01319783b3d556e27de2926b48465"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>id</b></td></tr>
 <tr class="separator:a2fc01319783b3d556e27de2926b48465"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:abe789864cb6f6650f8ceda43281d50c2"><td class="memItemLeft" align="right" valign="top"><a id="abe789864cb6f6650f8ceda43281d50c2"></a>
+<tr class="memitem:abe789864cb6f6650f8ceda43281d50c2"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abe789864cb6f6650f8ceda43281d50c2"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>userDefaultInterest</b></td></tr>
 <tr class="separator:abe789864cb6f6650f8ceda43281d50c2"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a56bfb064a70bc8f3eb63c3d8e487facb"><td class="memItemLeft" align="right" valign="top"><a id="a56bfb064a70bc8f3eb63c3d8e487facb"></a>
+<tr class="memitem:a56bfb064a70bc8f3eb63c3d8e487facb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a56bfb064a70bc8f3eb63c3d8e487facb"></a>
 NVGSDK_HighlightType&#160;</td><td class="memItemRight" valign="bottom"><b>highlightTags</b></td></tr>
 <tr class="separator:a56bfb064a70bc8f3eb63c3d8e487facb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad2e8628cc2000a7e1b76c002892cd2b5"><td class="memItemLeft" align="right" valign="top"><a id="ad2e8628cc2000a7e1b76c002892cd2b5"></a>
+<tr class="memitem:ad2e8628cc2000a7e1b76c002892cd2b5"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad2e8628cc2000a7e1b76c002892cd2b5"></a>
 NVGSDK_HighlightSignificance&#160;</td><td class="memItemRight" valign="bottom"><b>significance</b></td></tr>
 <tr class="separator:ad2e8628cc2000a7e1b76c002892cd2b5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a2511ee17dafd2a096b15e6f62b1f77b2"><td class="memItemLeft" align="right" valign="top"><a id="a2511ee17dafd2a096b15e6f62b1f77b2"></a>
+<tr class="memitem:a2511ee17dafd2a096b15e6f62b1f77b2"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2511ee17dafd2a096b15e6f62b1f77b2"></a>
 TTranslationTable&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_definition.html#a2511ee17dafd2a096b15e6f62b1f77b2">nameLocaleTable</a></td></tr>
 <tr class="memdesc:a2511ee17dafd2a096b15e6f62b1f77b2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Locale/translation pairs. <br /></td></tr>
 <tr class="separator:a2511ee17dafd2a096b15e6f62b1f77b2"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -129,7 +156,7 @@ TTranslationTable&#160;</td><td class="memItemRight" valign="bottom"><a class="e
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_definition.html">HighlightDefinition</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_highlight_open_group_params-members.html b/doc/html/struct_gfe_s_d_k_1_1_highlight_open_group_params-members.html
index c2aab2b..a533a36 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_highlight_open_group_params-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_highlight_open_group_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_highlight_open_gr
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_highlight_open_group_params.html b/doc/html/struct_gfe_s_d_k_1_1_highlight_open_group_params.html
index e8d3f52..2e5b540 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_highlight_open_group_params.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_highlight_open_group_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::HighlightOpenGroupParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,10 +123,10 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_highlight_open_gr
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a422c6e5ec6da4db56a7ca0196562f1fb"><td class="memItemLeft" align="right" valign="top"><a id="a422c6e5ec6da4db56a7ca0196562f1fb"></a>
+<tr class="memitem:a422c6e5ec6da4db56a7ca0196562f1fb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a422c6e5ec6da4db56a7ca0196562f1fb"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>groupId</b></td></tr>
 <tr class="separator:a422c6e5ec6da4db56a7ca0196562f1fb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a2da61f15e755ef0f4fa9f304a7c6465f"><td class="memItemLeft" align="right" valign="top"><a id="a2da61f15e755ef0f4fa9f304a7c6465f"></a>
+<tr class="memitem:a2da61f15e755ef0f4fa9f304a7c6465f"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2da61f15e755ef0f4fa9f304a7c6465f"></a>
 TTranslationTable&#160;</td><td class="memItemRight" valign="bottom"><b>groupDescriptionLocaleTable</b></td></tr>
 <tr class="separator:a2da61f15e755ef0f4fa9f304a7c6465f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -119,7 +146,7 @@ TTranslationTable&#160;</td><td class="memItemRight" valign="bottom"><b>groupDes
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_open_group_params.html">HighlightOpenGroupParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_highlight_user_setting-members.html b/doc/html/struct_gfe_s_d_k_1_1_highlight_user_setting-members.html
index 1a2ec86..a9837fd 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_highlight_user_setting-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_highlight_user_setting-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_highlight_user_se
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_highlight_user_setting.html b/doc/html/struct_gfe_s_d_k_1_1_highlight_user_setting.html
index 28e69c2..dd5a422 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_highlight_user_setting.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_highlight_user_setting.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::HighlightUserSetting Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,11 +123,11 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_highlight_user_se
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a867bd13b05ece98cbebadd0d34e778b9"><td class="memItemLeft" align="right" valign="top"><a id="a867bd13b05ece98cbebadd0d34e778b9"></a>
+<tr class="memitem:a867bd13b05ece98cbebadd0d34e778b9"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a867bd13b05ece98cbebadd0d34e778b9"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_user_setting.html#a867bd13b05ece98cbebadd0d34e778b9">highlightId</a></td></tr>
 <tr class="memdesc:a867bd13b05ece98cbebadd0d34e778b9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Unique id for game event. <br /></td></tr>
 <tr class="separator:a867bd13b05ece98cbebadd0d34e778b9"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aee344169ace39e645bd57a3b0387e556"><td class="memItemLeft" align="right" valign="top"><a id="aee344169ace39e645bd57a3b0387e556"></a>
+<tr class="memitem:aee344169ace39e645bd57a3b0387e556"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aee344169ace39e645bd57a3b0387e556"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_user_setting.html#aee344169ace39e645bd57a3b0387e556">enabled</a></td></tr>
 <tr class="memdesc:aee344169ace39e645bd57a3b0387e556"><td class="mdescLeft">&#160;</td><td class="mdescRight">Boolean for whether the user wants to record this type of highlight. <br /></td></tr>
 <tr class="separator:aee344169ace39e645bd57a3b0387e556"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -121,7 +148,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="stru
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_highlight_user_setting.html">HighlightUserSetting</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_notification_base-members.html b/doc/html/struct_gfe_s_d_k_1_1_notification_base-members.html
index c926f9f..042e033 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_notification_base-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_notification_base-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -97,7 +124,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_notification_base
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_notification_base.html b/doc/html/struct_gfe_s_d_k_1_1_notification_base.html
index d1cc389..d46af8c 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_notification_base.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_notification_base.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::NotificationBase Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -91,16 +118,17 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_notification_base
 <div class="dynheader">
 Inheritance diagram for GfeSDK::NotificationBase:</div>
 <div class="dyncontent">
-<div class="center"><img src="struct_gfe_s_d_k_1_1_notification_base__inherit__graph.png" border="0" usemap="#_gfe_s_d_k_1_1_notification_base_inherit__map" alt="Inheritance graph"/></div>
-<map name="_gfe_s_d_k_1_1_notification_base_inherit__map" id="_gfe_s_d_k_1_1_notification_base_inherit__map">
-<area shape="rect" id="node2" href="struct_gfe_s_d_k_1_1_overlay_state_changed_notification.html" title="GfeSDK::OverlayStateChanged\lNotification" alt="" coords="5,80,208,121"/>
-<area shape="rect" id="node3" href="struct_gfe_s_d_k_1_1_permissions_changed_notification.html" title="GfeSDK::PermissionsChanged\lNotification" alt="" coords="232,80,432,121"/>
+ <div class="center">
+  <img src="struct_gfe_s_d_k_1_1_notification_base.png" usemap="#GfeSDK::NotificationBase_map" alt=""/>
+  <map id="GfeSDK::NotificationBase_map" name="GfeSDK::NotificationBase_map">
+<area href="struct_gfe_s_d_k_1_1_overlay_state_changed_notification.html" alt="GfeSDK::OverlayStateChangedNotification" shape="rect" coords="0,56,251,80"/>
+<area href="struct_gfe_s_d_k_1_1_permissions_changed_notification.html" alt="GfeSDK::PermissionsChangedNotification" shape="rect" coords="261,56,512,80"/>
 </map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
+ </div></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a68146a9952bf8c91bb091d218cbcab72"><td class="memItemLeft" align="right" valign="top"><a id="a68146a9952bf8c91bb091d218cbcab72"></a>
+<tr class="memitem:a68146a9952bf8c91bb091d218cbcab72"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a68146a9952bf8c91bb091d218cbcab72"></a>
 void *&#160;</td><td class="memItemRight" valign="bottom"><b>context</b></td></tr>
 <tr class="separator:a68146a9952bf8c91bb091d218cbcab72"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -119,7 +147,7 @@ void *&#160;</td><td class="memItemRight" valign="bottom"><b>context</b></td></t
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_notification_base.html">NotificationBase</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_notification_base.png b/doc/html/struct_gfe_s_d_k_1_1_notification_base.png
new file mode 100644
index 0000000..690d51f
Binary files /dev/null and b/doc/html/struct_gfe_s_d_k_1_1_notification_base.png differ
diff --git a/doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification-members.html b/doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification-members.html
index f850578..1c9fc40 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -99,7 +126,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_overlay_state_cha
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification.html b/doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification.html
index 9083d3a..bc7bcae 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::OverlayStateChangedNotification Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -91,30 +118,23 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_overlay_state_cha
 <div class="dynheader">
 Inheritance diagram for GfeSDK::OverlayStateChangedNotification:</div>
 <div class="dyncontent">
-<div class="center"><img src="struct_gfe_s_d_k_1_1_overlay_state_changed_notification__inherit__graph.png" border="0" usemap="#_gfe_s_d_k_1_1_overlay_state_changed_notification_inherit__map" alt="Inheritance graph"/></div>
-<map name="_gfe_s_d_k_1_1_overlay_state_changed_notification_inherit__map" id="_gfe_s_d_k_1_1_overlay_state_changed_notification_inherit__map">
-<area shape="rect" id="node2" href="struct_gfe_s_d_k_1_1_notification_base.html" title="GfeSDK::NotificationBase" alt="" coords="21,5,192,32"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
-<div class="dynheader">
-Collaboration diagram for GfeSDK::OverlayStateChangedNotification:</div>
-<div class="dyncontent">
-<div class="center"><img src="struct_gfe_s_d_k_1_1_overlay_state_changed_notification__coll__graph.png" border="0" usemap="#_gfe_s_d_k_1_1_overlay_state_changed_notification_coll__map" alt="Collaboration graph"/></div>
-<map name="_gfe_s_d_k_1_1_overlay_state_changed_notification_coll__map" id="_gfe_s_d_k_1_1_overlay_state_changed_notification_coll__map">
-<area shape="rect" id="node2" href="struct_gfe_s_d_k_1_1_notification_base.html" title="GfeSDK::NotificationBase" alt="" coords="21,5,192,32"/>
+ <div class="center">
+  <img src="struct_gfe_s_d_k_1_1_overlay_state_changed_notification.png" usemap="#GfeSDK::OverlayStateChangedNotification_map" alt=""/>
+  <map id="GfeSDK::OverlayStateChangedNotification_map" name="GfeSDK::OverlayStateChangedNotification_map">
+<area href="struct_gfe_s_d_k_1_1_notification_base.html" alt="GfeSDK::NotificationBase" shape="rect" coords="0,0,251,24"/>
 </map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
+ </div></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a777c1bd046e2e9836c785cef22b9f5d2"><td class="memItemLeft" align="right" valign="top"><a id="a777c1bd046e2e9836c785cef22b9f5d2"></a>
+<tr class="memitem:a777c1bd046e2e9836c785cef22b9f5d2"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a777c1bd046e2e9836c785cef22b9f5d2"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>open</b></td></tr>
 <tr class="separator:a777c1bd046e2e9836c785cef22b9f5d2"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aef63d5b8cd25c3ffb8daed495e6e6f41"><td class="memItemLeft" align="right" valign="top"><a id="aef63d5b8cd25c3ffb8daed495e6e6f41"></a>
+<tr class="memitem:aef63d5b8cd25c3ffb8daed495e6e6f41"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aef63d5b8cd25c3ffb8daed495e6e6f41"></a>
 NVGSDK_OverlayState&#160;</td><td class="memItemRight" valign="bottom"><b>state</b></td></tr>
 <tr class="separator:aef63d5b8cd25c3ffb8daed495e6e6f41"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_attribs_struct_gfe_s_d_k_1_1_notification_base"><td colspan="2" onclick="javascript:toggleInherit('pub_attribs_struct_gfe_s_d_k_1_1_notification_base')"><img src="closed.png" alt="-"/>&#160;Public Attributes inherited from <a class="el" href="struct_gfe_s_d_k_1_1_notification_base.html">GfeSDK::NotificationBase</a></td></tr>
-<tr class="memitem:a68146a9952bf8c91bb091d218cbcab72 inherit pub_attribs_struct_gfe_s_d_k_1_1_notification_base"><td class="memItemLeft" align="right" valign="top"><a id="a68146a9952bf8c91bb091d218cbcab72"></a>
+<tr class="memitem:a68146a9952bf8c91bb091d218cbcab72 inherit pub_attribs_struct_gfe_s_d_k_1_1_notification_base"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a68146a9952bf8c91bb091d218cbcab72"></a>
 void *&#160;</td><td class="memItemRight" valign="bottom"><b>context</b></td></tr>
 <tr class="separator:a68146a9952bf8c91bb091d218cbcab72 inherit pub_attribs_struct_gfe_s_d_k_1_1_notification_base"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -133,7 +153,7 @@ void *&#160;</td><td class="memItemRight" valign="bottom"><b>context</b></td></t
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_overlay_state_changed_notification.html">OverlayStateChangedNotification</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification.png b/doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification.png
new file mode 100644
index 0000000..7fd3c0d
Binary files /dev/null and b/doc/html/struct_gfe_s_d_k_1_1_overlay_state_changed_notification.png differ
diff --git a/doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification-members.html b/doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification-members.html
index ae189b7..5c9f198 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_permissions_chang
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification.html b/doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification.html
index 0eed5fe..65a7689 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::PermissionsChangedNotification Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -91,27 +118,20 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_permissions_chang
 <div class="dynheader">
 Inheritance diagram for GfeSDK::PermissionsChangedNotification:</div>
 <div class="dyncontent">
-<div class="center"><img src="struct_gfe_s_d_k_1_1_permissions_changed_notification__inherit__graph.png" border="0" usemap="#_gfe_s_d_k_1_1_permissions_changed_notification_inherit__map" alt="Inheritance graph"/></div>
-<map name="_gfe_s_d_k_1_1_permissions_changed_notification_inherit__map" id="_gfe_s_d_k_1_1_permissions_changed_notification_inherit__map">
-<area shape="rect" id="node2" href="struct_gfe_s_d_k_1_1_notification_base.html" title="GfeSDK::NotificationBase" alt="" coords="20,5,191,32"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
-<div class="dynheader">
-Collaboration diagram for GfeSDK::PermissionsChangedNotification:</div>
-<div class="dyncontent">
-<div class="center"><img src="struct_gfe_s_d_k_1_1_permissions_changed_notification__coll__graph.png" border="0" usemap="#_gfe_s_d_k_1_1_permissions_changed_notification_coll__map" alt="Collaboration graph"/></div>
-<map name="_gfe_s_d_k_1_1_permissions_changed_notification_coll__map" id="_gfe_s_d_k_1_1_permissions_changed_notification_coll__map">
-<area shape="rect" id="node2" href="struct_gfe_s_d_k_1_1_notification_base.html" title="GfeSDK::NotificationBase" alt="" coords="20,5,191,32"/>
+ <div class="center">
+  <img src="struct_gfe_s_d_k_1_1_permissions_changed_notification.png" usemap="#GfeSDK::PermissionsChangedNotification_map" alt=""/>
+  <map id="GfeSDK::PermissionsChangedNotification_map" name="GfeSDK::PermissionsChangedNotification_map">
+<area href="struct_gfe_s_d_k_1_1_notification_base.html" alt="GfeSDK::NotificationBase" shape="rect" coords="0,0,244,24"/>
 </map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
+ </div></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a9a09cf072faeba34d9f5dd6c367209e7"><td class="memItemLeft" align="right" valign="top"><a id="a9a09cf072faeba34d9f5dd6c367209e7"></a>
+<tr class="memitem:a9a09cf072faeba34d9f5dd6c367209e7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9a09cf072faeba34d9f5dd6c367209e7"></a>
 TScopePermissions&#160;</td><td class="memItemRight" valign="bottom"><b>scopePermissions</b></td></tr>
 <tr class="separator:a9a09cf072faeba34d9f5dd6c367209e7"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_attribs_struct_gfe_s_d_k_1_1_notification_base"><td colspan="2" onclick="javascript:toggleInherit('pub_attribs_struct_gfe_s_d_k_1_1_notification_base')"><img src="closed.png" alt="-"/>&#160;Public Attributes inherited from <a class="el" href="struct_gfe_s_d_k_1_1_notification_base.html">GfeSDK::NotificationBase</a></td></tr>
-<tr class="memitem:a68146a9952bf8c91bb091d218cbcab72 inherit pub_attribs_struct_gfe_s_d_k_1_1_notification_base"><td class="memItemLeft" align="right" valign="top"><a id="a68146a9952bf8c91bb091d218cbcab72"></a>
+<tr class="memitem:a68146a9952bf8c91bb091d218cbcab72 inherit pub_attribs_struct_gfe_s_d_k_1_1_notification_base"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a68146a9952bf8c91bb091d218cbcab72"></a>
 void *&#160;</td><td class="memItemRight" valign="bottom"><b>context</b></td></tr>
 <tr class="separator:a68146a9952bf8c91bb091d218cbcab72 inherit pub_attribs_struct_gfe_s_d_k_1_1_notification_base"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -130,7 +150,7 @@ void *&#160;</td><td class="memItemRight" valign="bottom"><b>context</b></td></t
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_permissions_changed_notification.html">PermissionsChangedNotification</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification.png b/doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification.png
new file mode 100644
index 0000000..52f3fe3
Binary files /dev/null and b/doc/html/struct_gfe_s_d_k_1_1_permissions_changed_notification.png differ
diff --git a/doc/html/struct_gfe_s_d_k_1_1_request_permissions_params-members.html b/doc/html/struct_gfe_s_d_k_1_1_request_permissions_params-members.html
index 4561430..c6affeb 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_request_permissions_params-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_request_permissions_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -97,7 +124,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_request_permissio
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_request_permissions_params.html b/doc/html/struct_gfe_s_d_k_1_1_request_permissions_params.html
index b28b6c2..4156141 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_request_permissions_params.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_request_permissions_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::RequestPermissionsParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -91,7 +118,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_request_permissio
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a5f944fe510c1328536209cee50d229ad"><td class="memItemLeft" align="right" valign="top"><a id="a5f944fe510c1328536209cee50d229ad"></a>
+<tr class="memitem:a5f944fe510c1328536209cee50d229ad"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5f944fe510c1328536209cee50d229ad"></a>
 TScopes&#160;</td><td class="memItemRight" valign="bottom"><b>scopes</b></td></tr>
 <tr class="separator:a5f944fe510c1328536209cee50d229ad"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -110,7 +137,7 @@ TScopes&#160;</td><td class="memItemRight" valign="bottom"><b>scopes</b></td></t
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_request_permissions_params.html">RequestPermissionsParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_screenshot_highlight_params-members.html b/doc/html/struct_gfe_s_d_k_1_1_screenshot_highlight_params-members.html
index 2b6dddc..c022af6 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_screenshot_highlight_params-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_screenshot_highlight_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_screenshot_highli
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_screenshot_highlight_params.html b/doc/html/struct_gfe_s_d_k_1_1_screenshot_highlight_params.html
index 8cfe28d..a50eaf3 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_screenshot_highlight_params.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_screenshot_highlight_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::ScreenshotHighlightParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,10 +123,10 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_screenshot_highli
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:ad1f3c90efaf606eb1f16cdcfdc10074d"><td class="memItemLeft" align="right" valign="top"><a id="ad1f3c90efaf606eb1f16cdcfdc10074d"></a>
+<tr class="memitem:ad1f3c90efaf606eb1f16cdcfdc10074d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad1f3c90efaf606eb1f16cdcfdc10074d"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>groupId</b></td></tr>
 <tr class="separator:ad1f3c90efaf606eb1f16cdcfdc10074d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a3f7c33d1efdfe0ce34cca3b3ed6ce8ee"><td class="memItemLeft" align="right" valign="top"><a id="a3f7c33d1efdfe0ce34cca3b3ed6ce8ee"></a>
+<tr class="memitem:a3f7c33d1efdfe0ce34cca3b3ed6ce8ee"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3f7c33d1efdfe0ce34cca3b3ed6ce8ee"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>highlightId</b></td></tr>
 <tr class="separator:a3f7c33d1efdfe0ce34cca3b3ed6ce8ee"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -119,7 +146,7 @@ std::string&#160;</td><td class="memItemRight" valign="bottom"><b>highlightId</b
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_screenshot_highlight_params.html">ScreenshotHighlightParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_summary_params-members.html b/doc/html/struct_gfe_s_d_k_1_1_summary_params-members.html
index ae1d5df..e837ff3 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_summary_params-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_summary_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -97,7 +124,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_summary_params.ht
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_summary_params.html b/doc/html/struct_gfe_s_d_k_1_1_summary_params.html
index 6b00de1..9cff410 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_summary_params.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_summary_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::SummaryParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,7 +123,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_summary_params.ht
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:ab56c9fed6b6bb37e2dfea0896fe251df"><td class="memItemLeft" align="right" valign="top"><a id="ab56c9fed6b6bb37e2dfea0896fe251df"></a>
+<tr class="memitem:ab56c9fed6b6bb37e2dfea0896fe251df"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab56c9fed6b6bb37e2dfea0896fe251df"></a>
 std::vector&lt; <a class="el" href="struct_gfe_s_d_k_1_1_group_view.html">GroupView</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>groupViews</b></td></tr>
 <tr class="separator:ab56c9fed6b6bb37e2dfea0896fe251df"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -116,7 +143,7 @@ std::vector&lt; <a class="el" href="struct_gfe_s_d_k_1_1_group_view.html">GroupV
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_summary_params.html">SummaryParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_video_highlight_params-members.html b/doc/html/struct_gfe_s_d_k_1_1_video_highlight_params-members.html
index 7ff86ea..bdd5045 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_video_highlight_params-members.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_video_highlight_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -100,7 +127,7 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_video_highlight_p
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_gfe_s_d_k_1_1_video_highlight_params.html b/doc/html/struct_gfe_s_d_k_1_1_video_highlight_params.html
index b222d58..16bef92 100644
--- a/doc/html/struct_gfe_s_d_k_1_1_video_highlight_params.html
+++ b/doc/html/struct_gfe_s_d_k_1_1_video_highlight_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: GfeSDK::VideoHighlightParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -96,16 +123,16 @@ $(document).ready(function(){initNavTree('struct_gfe_s_d_k_1_1_video_highlight_p
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a274e5cc616a5feb6b6f3b0c48195cf4d"><td class="memItemLeft" align="right" valign="top"><a id="a274e5cc616a5feb6b6f3b0c48195cf4d"></a>
+<tr class="memitem:a274e5cc616a5feb6b6f3b0c48195cf4d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a274e5cc616a5feb6b6f3b0c48195cf4d"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>groupId</b></td></tr>
 <tr class="separator:a274e5cc616a5feb6b6f3b0c48195cf4d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a2e9b151ae9ccd76aecc2bc1b6311248a"><td class="memItemLeft" align="right" valign="top"><a id="a2e9b151ae9ccd76aecc2bc1b6311248a"></a>
+<tr class="memitem:a2e9b151ae9ccd76aecc2bc1b6311248a"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2e9b151ae9ccd76aecc2bc1b6311248a"></a>
 std::string&#160;</td><td class="memItemRight" valign="bottom"><b>highlightId</b></td></tr>
 <tr class="separator:a2e9b151ae9ccd76aecc2bc1b6311248a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac2dadbb03419729fa5567e2a6b10f4a1"><td class="memItemLeft" align="right" valign="top"><a id="ac2dadbb03419729fa5567e2a6b10f4a1"></a>
+<tr class="memitem:ac2dadbb03419729fa5567e2a6b10f4a1"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac2dadbb03419729fa5567e2a6b10f4a1"></a>
 int32_t&#160;</td><td class="memItemRight" valign="bottom"><b>startDelta</b></td></tr>
 <tr class="separator:ac2dadbb03419729fa5567e2a6b10f4a1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad09711518b7d8eb7165ab46a8e9d2e00"><td class="memItemLeft" align="right" valign="top"><a id="ad09711518b7d8eb7165ab46a8e9d2e00"></a>
+<tr class="memitem:ad09711518b7d8eb7165ab46a8e9d2e00"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad09711518b7d8eb7165ab46a8e9d2e00"></a>
 int32_t&#160;</td><td class="memItemRight" valign="bottom"><b>endDelta</b></td></tr>
 <tr class="separator:ad09711518b7d8eb7165ab46a8e9d2e00"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -125,7 +152,7 @@ int32_t&#160;</td><td class="memItemRight" valign="bottom"><b>endDelta</b></td><
     <li class="navelem"><b>GfeSDK</b></li><li class="navelem"><a class="el" href="struct_gfe_s_d_k_1_1_video_highlight_params.html">VideoHighlightParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___create_input_params-members.html b/doc/html/struct_n_v_g_s_d_k___create_input_params-members.html
index 0b5e85f..63cce9e 100644
--- a/doc/html/struct_n_v_g_s_d_k___create_input_params-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___create_input_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -104,7 +131,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___create_input_para
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___create_input_params.html b/doc/html/struct_n_v_g_s_d_k___create_input_params.html
index 02a492f..26f4edc 100644
--- a/doc/html/struct_n_v_g_s_d_k___create_input_params.html
+++ b/doc/html/struct_n_v_g_s_d_k___create_input_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_CreateInputParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,50 +117,39 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___create_input_para
 <div class="contents">
 
 <p><code>#include &lt;<a class="el" href="sdk__types_8h_source.html">sdk_types.h</a>&gt;</code></p>
-<div class="dynheader">
-Collaboration diagram for NVGSDK_CreateInputParams:</div>
-<div class="dyncontent">
-<div class="center"><img src="struct_n_v_g_s_d_k___create_input_params__coll__graph.png" border="0" usemap="#_n_v_g_s_d_k___create_input_params_coll__map" alt="Collaboration graph"/></div>
-<map name="_n_v_g_s_d_k___create_input_params_coll__map" id="_n_v_g_s_d_k___create_input_params_coll__map">
-<area shape="rect" id="node2" href="struct_n_v_g_s_d_k___notification.html" title="NVGSDK_Notification" alt="" coords="188,199,336,225"/>
-<area shape="rect" id="node3" href="struct_n_v_g_s_d_k___permissions_changed_notification.html" title="NVGSDK_PermissionsChanged\lNotification" alt="" coords="5,95,212,136"/>
-<area shape="rect" id="node4" href="struct_n_v_g_s_d_k___scope_permission.html" title="NVGSDK_ScopePermission" alt="" coords="15,5,202,32"/>
-<area shape="rect" id="node5" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html" title="NVGSDK_OverlayStateChanged\lNotification" alt="" coords="236,95,445,136"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:ac754df94f208f494a0a339d614bb18f3"><td class="memItemLeft" align="right" valign="top"><a id="ac754df94f208f494a0a339d614bb18f3"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">appName</a></td></tr>
+<tr class="memitem:ac754df94f208f494a0a339d614bb18f3"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac754df94f208f494a0a339d614bb18f3"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#ac754df94f208f494a0a339d614bb18f3">appName</a></td></tr>
 <tr class="memdesc:ac754df94f208f494a0a339d614bb18f3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Provide the name of the application. Will be used in cases when NVIDIA cannot detect game. <br /></td></tr>
 <tr class="separator:ac754df94f208f494a0a339d614bb18f3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae0ada093d3d60a2f70226932b1a5b6fb"><td class="memItemLeft" align="right" valign="top"><a id="ae0ada093d3d60a2f70226932b1a5b6fb"></a>
+<tr class="memitem:ae0ada093d3d60a2f70226932b1a5b6fb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae0ada093d3d60a2f70226932b1a5b6fb"></a>
 NVGSDK_Scope *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#ae0ada093d3d60a2f70226932b1a5b6fb">scopeTable</a></td></tr>
 <tr class="memdesc:ae0ada093d3d60a2f70226932b1a5b6fb"><td class="mdescLeft">&#160;</td><td class="mdescRight">List of scopes used by the application. <br /></td></tr>
 <tr class="separator:ae0ada093d3d60a2f70226932b1a5b6fb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a8941e0c803ec2f821101cfc55a7f60a3"><td class="memItemLeft" align="right" valign="top"><a id="a8941e0c803ec2f821101cfc55a7f60a3"></a>
+<tr class="memitem:a8941e0c803ec2f821101cfc55a7f60a3"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8941e0c803ec2f821101cfc55a7f60a3"></a>
 size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#a8941e0c803ec2f821101cfc55a7f60a3">scopeTableSize</a></td></tr>
 <tr class="memdesc:a8941e0c803ec2f821101cfc55a7f60a3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Number of entries in the scope table. <br /></td></tr>
 <tr class="separator:a8941e0c803ec2f821101cfc55a7f60a3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a0bd7568c1cb3fad975562055b4581195"><td class="memItemLeft" align="right" valign="top"><a id="a0bd7568c1cb3fad975562055b4581195"></a>
+<tr class="memitem:a0bd7568c1cb3fad975562055b4581195"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0bd7568c1cb3fad975562055b4581195"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#a0bd7568c1cb3fad975562055b4581195">pollForCallbacks</a></td></tr>
 <tr class="memdesc:a0bd7568c1cb3fad975562055b4581195"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set to true to poll for asynchronous callbacks on an app thread. If false, callbacks will occur on a GfeSDK controlled thread, no polling necessary. <br /></td></tr>
 <tr class="separator:a0bd7568c1cb3fad975562055b4581195"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:adde61c0a8ea3a728c57081ec97081a72"><td class="memItemLeft" align="right" valign="top"><a id="adde61c0a8ea3a728c57081ec97081a72"></a>
+<tr class="memitem:adde61c0a8ea3a728c57081ec97081a72"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adde61c0a8ea3a728c57081ec97081a72"></a>
 NVGSDK_NotificationCallback&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#adde61c0a8ea3a728c57081ec97081a72">notificationCallback</a></td></tr>
 <tr class="memdesc:adde61c0a8ea3a728c57081ec97081a72"><td class="mdescLeft">&#160;</td><td class="mdescRight">Called on unsolicited notifications. <br /></td></tr>
 <tr class="separator:adde61c0a8ea3a728c57081ec97081a72"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad30b1588618ec4bfbc1e9fa13c22b9a7"><td class="memItemLeft" align="right" valign="top"><a id="ad30b1588618ec4bfbc1e9fa13c22b9a7"></a>
+<tr class="memitem:ad30b1588618ec4bfbc1e9fa13c22b9a7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad30b1588618ec4bfbc1e9fa13c22b9a7"></a>
 void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#ad30b1588618ec4bfbc1e9fa13c22b9a7">notificationCallbackContext</a></td></tr>
 <tr class="memdesc:ad30b1588618ec4bfbc1e9fa13c22b9a7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Passed along unchanged with each notification. <br /></td></tr>
 <tr class="separator:ad30b1588618ec4bfbc1e9fa13c22b9a7"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a94b71825369290d98e08058b3c0ba537"><td class="memItemLeft" align="right" valign="top"><a id="a94b71825369290d98e08058b3c0ba537"></a>
+<tr class="memitem:a94b71825369290d98e08058b3c0ba537"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a94b71825369290d98e08058b3c0ba537"></a>
 uint32_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#a94b71825369290d98e08058b3c0ba537">targetPid</a></td></tr>
 <tr class="memdesc:a94b71825369290d98e08058b3c0ba537"><td class="mdescLeft">&#160;</td><td class="mdescRight">Used for linking to game-related process's PID that also supports NVIDIA Highlights. Leave empty when not used. <br /></td></tr>
 <tr class="separator:a94b71825369290d98e08058b3c0ba537"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:adee7d43aa6948b623aa4fe84f8e8bf97"><td class="memItemLeft" align="right" valign="top"><a id="adee7d43aa6948b623aa4fe84f8e8bf97"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#adee7d43aa6948b623aa4fe84f8e8bf97">targetPath</a></td></tr>
+<tr class="memitem:adee7d43aa6948b623aa4fe84f8e8bf97"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adee7d43aa6948b623aa4fe84f8e8bf97"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html#adee7d43aa6948b623aa4fe84f8e8bf97">targetPath</a></td></tr>
 <tr class="memdesc:adee7d43aa6948b623aa4fe84f8e8bf97"><td class="mdescLeft">&#160;</td><td class="mdescRight">Used for linking to game-related process's path that also supports NVIDIA Highlights. Must be defined if targetPid is defined. Leave empty when not used. <br /></td></tr>
 <tr class="separator:adee7d43aa6948b623aa4fe84f8e8bf97"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -153,7 +169,7 @@ char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" h
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___create_input_params.html">NVGSDK_CreateInputParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___create_response-members.html b/doc/html/struct_n_v_g_s_d_k___create_response-members.html
index 545e11b..cde908f 100644
--- a/doc/html/struct_n_v_g_s_d_k___create_response-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___create_response-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -101,7 +128,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___create_response.h
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___create_response.html b/doc/html/struct_n_v_g_s_d_k___create_response.html
index d168fad..0f6687c 100644
--- a/doc/html/struct_n_v_g_s_d_k___create_response.html
+++ b/doc/html/struct_n_v_g_s_d_k___create_response.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_CreateResponse Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,34 +117,26 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___create_response.h
 <div class="contents">
 
 <p><code>#include &lt;<a class="el" href="sdk__types_8h_source.html">sdk_types.h</a>&gt;</code></p>
-<div class="dynheader">
-Collaboration diagram for NVGSDK_CreateResponse:</div>
-<div class="dyncontent">
-<div class="center"><img src="struct_n_v_g_s_d_k___create_response__coll__graph.png" border="0" usemap="#_n_v_g_s_d_k___create_response_coll__map" alt="Collaboration graph"/></div>
-<map name="_n_v_g_s_d_k___create_response_coll__map" id="_n_v_g_s_d_k___create_response_coll__map">
-<area shape="rect" id="node2" href="struct_n_v_g_s_d_k___scope_permission.html" title="NVGSDK_ScopePermission" alt="" coords="5,5,192,32"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:aa595214daf18bdbc638ef98e1f22a30f"><td class="memItemLeft" align="right" valign="top"><a id="aa595214daf18bdbc638ef98e1f22a30f"></a>
+<tr class="memitem:aa595214daf18bdbc638ef98e1f22a30f"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa595214daf18bdbc638ef98e1f22a30f"></a>
 uint16_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_response.html#aa595214daf18bdbc638ef98e1f22a30f">versionMajor</a></td></tr>
 <tr class="memdesc:aa595214daf18bdbc638ef98e1f22a30f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Will be populated with SDK major version. <br /></td></tr>
 <tr class="separator:aa595214daf18bdbc638ef98e1f22a30f"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad1687ba8b8d53a75b13a60874f3822be"><td class="memItemLeft" align="right" valign="top"><a id="ad1687ba8b8d53a75b13a60874f3822be"></a>
+<tr class="memitem:ad1687ba8b8d53a75b13a60874f3822be"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad1687ba8b8d53a75b13a60874f3822be"></a>
 uint16_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_response.html#ad1687ba8b8d53a75b13a60874f3822be">versionMinor</a></td></tr>
 <tr class="memdesc:ad1687ba8b8d53a75b13a60874f3822be"><td class="mdescLeft">&#160;</td><td class="mdescRight">Will be populated with SDK minor version. <br /></td></tr>
 <tr class="separator:ad1687ba8b8d53a75b13a60874f3822be"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aacdf644f5f6eb996dad6bb90b4145deb"><td class="memItemLeft" align="right" valign="top"><a id="aacdf644f5f6eb996dad6bb90b4145deb"></a>
+<tr class="memitem:aacdf644f5f6eb996dad6bb90b4145deb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aacdf644f5f6eb996dad6bb90b4145deb"></a>
 char&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_response.html#aacdf644f5f6eb996dad6bb90b4145deb">gfeVersionStr</a> [NVGSDK_MAX_LENGTH]</td></tr>
 <tr class="memdesc:aacdf644f5f6eb996dad6bb90b4145deb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Must be provided to call. Will be populated by GFE version string. <br /></td></tr>
 <tr class="separator:aacdf644f5f6eb996dad6bb90b4145deb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a9bc3e75a15cf9fcbc1084f2a7fde5a8f"><td class="memItemLeft" align="right" valign="top"><a id="a9bc3e75a15cf9fcbc1084f2a7fde5a8f"></a>
+<tr class="memitem:a9bc3e75a15cf9fcbc1084f2a7fde5a8f"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9bc3e75a15cf9fcbc1084f2a7fde5a8f"></a>
 <a class="el" href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_response.html#a9bc3e75a15cf9fcbc1084f2a7fde5a8f">scopePermissionTable</a></td></tr>
 <tr class="memdesc:a9bc3e75a15cf9fcbc1084f2a7fde5a8f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Must be provided to call. Will be filled with scope/permission pairs. <br /></td></tr>
 <tr class="separator:a9bc3e75a15cf9fcbc1084f2a7fde5a8f"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a60aec9d469d10e8fe0efd7c010fb96e7"><td class="memItemLeft" align="right" valign="top"><a id="a60aec9d469d10e8fe0efd7c010fb96e7"></a>
+<tr class="memitem:a60aec9d469d10e8fe0efd7c010fb96e7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a60aec9d469d10e8fe0efd7c010fb96e7"></a>
 size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___create_response.html#a60aec9d469d10e8fe0efd7c010fb96e7">scopePermissionTableSize</a></td></tr>
 <tr class="memdesc:a60aec9d469d10e8fe0efd7c010fb96e7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Must be provided to call. <br /></td></tr>
 <tr class="separator:a60aec9d469d10e8fe0efd7c010fb96e7"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -138,7 +157,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="st
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___create_response.html">NVGSDK_CreateResponse</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___group_view-members.html b/doc/html/struct_n_v_g_s_d_k___group_view-members.html
index 676b535..15161da 100644
--- a/doc/html/struct_n_v_g_s_d_k___group_view-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___group_view-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -99,7 +126,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___group_view.html',
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___group_view.html b/doc/html/struct_n_v_g_s_d_k___group_view.html
index 13b008f..8ce5a8b 100644
--- a/doc/html/struct_n_v_g_s_d_k___group_view.html
+++ b/doc/html/struct_n_v_g_s_d_k___group_view.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_GroupView Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,15 +120,15 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___group_view.html',
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a4f957ca7635183b884ce960e733bbfcc"><td class="memItemLeft" align="right" valign="top"><a id="a4f957ca7635183b884ce960e733bbfcc"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">groupId</a></td></tr>
+<tr class="memitem:a4f957ca7635183b884ce960e733bbfcc"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4f957ca7635183b884ce960e733bbfcc"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___group_view.html#a4f957ca7635183b884ce960e733bbfcc">groupId</a></td></tr>
 <tr class="memdesc:a4f957ca7635183b884ce960e733bbfcc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Unique ID of the group to open. <br /></td></tr>
 <tr class="separator:a4f957ca7635183b884ce960e733bbfcc"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:acd4b8ee94ed3a76bd9b6e7e8afe355a2"><td class="memItemLeft" align="right" valign="top"><a id="acd4b8ee94ed3a76bd9b6e7e8afe355a2"></a>
+<tr class="memitem:acd4b8ee94ed3a76bd9b6e7e8afe355a2"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="acd4b8ee94ed3a76bd9b6e7e8afe355a2"></a>
 NVGSDK_HighlightType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___group_view.html#acd4b8ee94ed3a76bd9b6e7e8afe355a2">tagsFilter</a></td></tr>
 <tr class="memdesc:acd4b8ee94ed3a76bd9b6e7e8afe355a2"><td class="mdescLeft">&#160;</td><td class="mdescRight">If not zero, represents a bitfield of tags to include. <br /></td></tr>
 <tr class="separator:acd4b8ee94ed3a76bd9b6e7e8afe355a2"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a88a126c5b8f2cd7c0e790bfdc3836fcb"><td class="memItemLeft" align="right" valign="top"><a id="a88a126c5b8f2cd7c0e790bfdc3836fcb"></a>
+<tr class="memitem:a88a126c5b8f2cd7c0e790bfdc3836fcb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a88a126c5b8f2cd7c0e790bfdc3836fcb"></a>
 NVGSDK_HighlightSignificance&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___group_view.html#a88a126c5b8f2cd7c0e790bfdc3836fcb">significanceFilter</a></td></tr>
 <tr class="memdesc:a88a126c5b8f2cd7c0e790bfdc3836fcb"><td class="mdescLeft">&#160;</td><td class="mdescRight">If not zero, represents a bitfield of significance values to include. <br /></td></tr>
 <tr class="separator:a88a126c5b8f2cd7c0e790bfdc3836fcb"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -109,7 +136,7 @@ NVGSDK_HighlightSignificance&#160;</td><td class="memItemRight" valign="bottom">
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Represents a filtered highlight group </p>
 
-<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00085">85</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
+<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00087">87</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights/<a class="el" href="highlights__types_8h_source.html">highlights_types.h</a></li>
 </ul>
@@ -122,7 +149,7 @@ NVGSDK_HighlightSignificance&#160;</td><td class="memItemRight" valign="bottom">
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlight-members.html b/doc/html/struct_n_v_g_s_d_k___highlight-members.html
index abf45ce..261f6d5 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlight-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlight-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -102,7 +129,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlight.html','
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlight.html b/doc/html/struct_n_v_g_s_d_k___highlight.html
index 256d6f9..5467def 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlight.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlight.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_Highlight Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,34 +117,26 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlight.html','
 <div class="contents">
 
 <p><code>#include &lt;<a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>&gt;</code></p>
-<div class="dynheader">
-Collaboration diagram for NVGSDK_Highlight:</div>
-<div class="dyncontent">
-<div class="center"><img src="struct_n_v_g_s_d_k___highlight__coll__graph.png" border="0" usemap="#_n_v_g_s_d_k___highlight_coll__map" alt="Collaboration graph"/></div>
-<map name="_n_v_g_s_d_k___highlight_coll__map" id="_n_v_g_s_d_k___highlight_coll__map">
-<area shape="rect" id="node2" href="struct_n_v_g_s_d_k___localized_pair.html" title="NVGSDK_LocalizedPair" alt="" coords="5,5,168,32"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a1f95d7645df3e535efa830685488ae9b"><td class="memItemLeft" align="right" valign="top"><a id="a1f95d7645df3e535efa830685488ae9b"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight.html#a1f95d7645df3e535efa830685488ae9b">id</a></td></tr>
+<tr class="memitem:a1f95d7645df3e535efa830685488ae9b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1f95d7645df3e535efa830685488ae9b"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight.html#a1f95d7645df3e535efa830685488ae9b">id</a></td></tr>
 <tr class="memdesc:a1f95d7645df3e535efa830685488ae9b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Unique id for game event. Max length NVGSDK_MAX_LENGTH - 1. <br /></td></tr>
 <tr class="separator:a1f95d7645df3e535efa830685488ae9b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a9e0d5a1ba9081cb7f9b549499af61927"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight.html#a9e0d5a1ba9081cb7f9b549499af61927">userInterest</a></td></tr>
 <tr class="separator:a9e0d5a1ba9081cb7f9b549499af61927"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a1e55e8efeca6cfabc9c68583e24f410b"><td class="memItemLeft" align="right" valign="top"><a id="a1e55e8efeca6cfabc9c68583e24f410b"></a>
+<tr class="memitem:a1e55e8efeca6cfabc9c68583e24f410b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1e55e8efeca6cfabc9c68583e24f410b"></a>
 NVGSDK_HighlightType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight.html#a1e55e8efeca6cfabc9c68583e24f410b">highlightTags</a></td></tr>
 <tr class="memdesc:a1e55e8efeca6cfabc9c68583e24f410b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Tags for this highlight. <br /></td></tr>
 <tr class="separator:a1e55e8efeca6cfabc9c68583e24f410b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a3ecee6a0bd80c21b630559fb8ecfc0be"><td class="memItemLeft" align="right" valign="top"><a id="a3ecee6a0bd80c21b630559fb8ecfc0be"></a>
+<tr class="memitem:a3ecee6a0bd80c21b630559fb8ecfc0be"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3ecee6a0bd80c21b630559fb8ecfc0be"></a>
 NVGSDK_HighlightSignificance&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight.html#a3ecee6a0bd80c21b630559fb8ecfc0be">significance</a></td></tr>
 <tr class="memdesc:a3ecee6a0bd80c21b630559fb8ecfc0be"><td class="mdescLeft">&#160;</td><td class="mdescRight">How significant the highlight is. <br /></td></tr>
 <tr class="separator:a3ecee6a0bd80c21b630559fb8ecfc0be"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a3aa8849a5921b0189c2642840c257247"><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight.html#a3aa8849a5921b0189c2642840c257247">nameTable</a></td></tr>
 <tr class="separator:a3aa8849a5921b0189c2642840c257247"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a5522ae0afe385ba7d17afd83d19ed729"><td class="memItemLeft" align="right" valign="top"><a id="a5522ae0afe385ba7d17afd83d19ed729"></a>
+<tr class="memitem:a5522ae0afe385ba7d17afd83d19ed729"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5522ae0afe385ba7d17afd83d19ed729"></a>
 size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight.html#a5522ae0afe385ba7d17afd83d19ed729">nameTableSize</a></td></tr>
 <tr class="memdesc:a5522ae0afe385ba7d17afd83d19ed729"><td class="mdescLeft">&#160;</td><td class="mdescRight">Number of entries in the localeNameTable */. <br /></td></tr>
 <tr class="separator:a5522ae0afe385ba7d17afd83d19ed729"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -127,9 +146,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="st
 
 <p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00023">23</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 </div><h2 class="groupheader">Member Data Documentation</h2>
-<a id="a9e0d5a1ba9081cb7f9b549499af61927"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a9e0d5a1ba9081cb7f9b549499af61927">&sect;&nbsp;</a></span>userInterest</h2>
-
+<a class="anchor" id="a9e0d5a1ba9081cb7f9b549499af61927"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -144,9 +161,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="st
 
 </div>
 </div>
-<a id="a3aa8849a5921b0189c2642840c257247"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a3aa8849a5921b0189c2642840c257247">&sect;&nbsp;</a></span>nameTable</h2>
-
+<a class="anchor" id="a3aa8849a5921b0189c2642840c257247"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -173,7 +188,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="st
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___highlight.html">NVGSDK_Highlight</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlight_close_group_params-members.html b/doc/html/struct_n_v_g_s_d_k___highlight_close_group_params-members.html
index bd8e778..606bbba 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlight_close_group_params-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlight_close_group_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlight_close_g
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlight_close_group_params.html b/doc/html/struct_n_v_g_s_d_k___highlight_close_group_params.html
index 6fff305..9ee6676 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlight_close_group_params.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlight_close_group_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_HighlightCloseGroupParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,8 +120,8 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlight_close_g
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a6f1e0e8a5399e868588a83e1c81ad9c3"><td class="memItemLeft" align="right" valign="top"><a id="a6f1e0e8a5399e868588a83e1c81ad9c3"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">groupId</a></td></tr>
+<tr class="memitem:a6f1e0e8a5399e868588a83e1c81ad9c3"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6f1e0e8a5399e868588a83e1c81ad9c3"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a6f1e0e8a5399e868588a83e1c81ad9c3">groupId</a></td></tr>
 <tr class="memdesc:a6f1e0e8a5399e868588a83e1c81ad9c3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Unique group ID that was used to Open a group previously. <br /></td></tr>
 <tr class="separator:a6f1e0e8a5399e868588a83e1c81ad9c3"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a3d7eae61163c4616a42569ca8d7785c6"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_close_group_params.html#a3d7eae61163c4616a42569ca8d7785c6">destroyHighlights</a></td></tr>
@@ -105,9 +132,7 @@ char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" h
 
 <p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00061">61</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 </div><h2 class="groupheader">Member Data Documentation</h2>
-<a id="a3d7eae61163c4616a42569ca8d7785c6"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a3d7eae61163c4616a42569ca8d7785c6">&sect;&nbsp;</a></span>destroyHighlights</h2>
-
+<a class="anchor" id="a3d7eae61163c4616a42569ca8d7785c6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -116,7 +141,7 @@ char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" h
         </tr>
       </table>
 </div><div class="memdoc">
-<p>If set to true, deletes the persisted highlights from disk. Highlights that have been moved to gallery are not removed </p>
+<p>If set to true, deletes the persisted highlights from disk. Highlights that have been moved to gallery are not removed. Note:: With the new sidebar-based overlay UX, all Highlights are now part of Gallery by default and this flag is ignored </p>
 
 <p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00064">64</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 
@@ -134,7 +159,7 @@ char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" h
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___highlight_close_group_params.html">NVGSDK_HighlightCloseGroupParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlight_config_params-members.html b/doc/html/struct_n_v_g_s_d_k___highlight_config_params-members.html
index f625dd5..65cfd6e 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlight_config_params-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlight_config_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -99,7 +126,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlight_config_
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlight_config_params.html b/doc/html/struct_n_v_g_s_d_k___highlight_config_params.html
index 2677d35..bb081c6 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlight_config_params.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlight_config_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_HighlightConfigParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,26 +117,17 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlight_config_
 <div class="contents">
 
 <p><code>#include &lt;<a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>&gt;</code></p>
-<div class="dynheader">
-Collaboration diagram for NVGSDK_HighlightConfigParams:</div>
-<div class="dyncontent">
-<div class="center"><img src="struct_n_v_g_s_d_k___highlight_config_params__coll__graph.png" border="0" usemap="#_n_v_g_s_d_k___highlight_config_params_coll__map" alt="Collaboration graph"/></div>
-<map name="_n_v_g_s_d_k___highlight_config_params_coll__map" id="_n_v_g_s_d_k___highlight_config_params_coll__map">
-<area shape="rect" id="node2" href="struct_n_v_g_s_d_k___highlight.html" title="NVGSDK_Highlight" alt="" coords="45,95,180,121"/>
-<area shape="rect" id="node3" href="struct_n_v_g_s_d_k___localized_pair.html" title="NVGSDK_LocalizedPair" alt="" coords="31,5,194,32"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a64eb12cdd5f3b05af9686cfa4077a4e5"><td class="memItemLeft" align="right" valign="top"><a id="a64eb12cdd5f3b05af9686cfa4077a4e5"></a>
+<tr class="memitem:a64eb12cdd5f3b05af9686cfa4077a4e5"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a64eb12cdd5f3b05af9686cfa4077a4e5"></a>
 <a class="el" href="struct_n_v_g_s_d_k___highlight.html">NVGSDK_Highlight</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>highlightDefinitionTable</b></td></tr>
 <tr class="separator:a64eb12cdd5f3b05af9686cfa4077a4e5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad64bab4bc54c4e9a15b14590f293adb4"><td class="memItemLeft" align="right" valign="top"><a id="ad64bab4bc54c4e9a15b14590f293adb4"></a>
+<tr class="memitem:ad64bab4bc54c4e9a15b14590f293adb4"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad64bab4bc54c4e9a15b14590f293adb4"></a>
 size_t&#160;</td><td class="memItemRight" valign="bottom"><b>highlightTableSize</b></td></tr>
 <tr class="separator:ad64bab4bc54c4e9a15b14590f293adb4"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a7f4f852d4fe97048f20dcdcc401ab82b"><td class="memItemLeft" align="right" valign="top"><a id="a7f4f852d4fe97048f20dcdcc401ab82b"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">defaultLocale</a></td></tr>
+<tr class="memitem:a7f4f852d4fe97048f20dcdcc401ab82b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7f4f852d4fe97048f20dcdcc401ab82b"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_config_params.html#a7f4f852d4fe97048f20dcdcc401ab82b">defaultLocale</a></td></tr>
 <tr class="memdesc:a7f4f852d4fe97048f20dcdcc401ab82b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Default locality, used for hinting GFE which translation to use. Defaults to en-us. <br /></td></tr>
 <tr class="separator:a7f4f852d4fe97048f20dcdcc401ab82b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -129,7 +147,7 @@ char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" h
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___highlight_config_params.html">NVGSDK_HighlightConfigParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlight_open_group_params-members.html b/doc/html/struct_n_v_g_s_d_k___highlight_open_group_params-members.html
index 991a788..1d15412 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlight_open_group_params-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlight_open_group_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -99,7 +126,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlight_open_gr
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlight_open_group_params.html b/doc/html/struct_n_v_g_s_d_k___highlight_open_group_params.html
index 8e93647..6ce6824 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlight_open_group_params.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlight_open_group_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_HighlightOpenGroupParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,22 +117,14 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlight_open_gr
 <div class="contents">
 
 <p><code>#include &lt;<a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>&gt;</code></p>
-<div class="dynheader">
-Collaboration diagram for NVGSDK_HighlightOpenGroupParams:</div>
-<div class="dyncontent">
-<div class="center"><img src="struct_n_v_g_s_d_k___highlight_open_group_params__coll__graph.png" border="0" usemap="#_n_v_g_s_d_k___highlight_open_group_params_coll__map" alt="Collaboration graph"/></div>
-<map name="_n_v_g_s_d_k___highlight_open_group_params_coll__map" id="_n_v_g_s_d_k___highlight_open_group_params_coll__map">
-<area shape="rect" id="node2" href="struct_n_v_g_s_d_k___localized_pair.html" title="NVGSDK_LocalizedPair" alt="" coords="24,5,187,32"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a3e9f6351540609fc3e853d5a16188da2"><td class="memItemLeft" align="right" valign="top">char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">groupId</a></td></tr>
+<tr class="memitem:a3e9f6351540609fc3e853d5a16188da2"><td class="memItemLeft" align="right" valign="top">char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3e9f6351540609fc3e853d5a16188da2">groupId</a></td></tr>
 <tr class="separator:a3e9f6351540609fc3e853d5a16188da2"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a3d06bbfc6586ca5378eedc9a5984d662"><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a3d06bbfc6586ca5378eedc9a5984d662">groupDescriptionTable</a></td></tr>
 <tr class="separator:a3d06bbfc6586ca5378eedc9a5984d662"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a7a3c123385683c40bd3a891e7af268bb"><td class="memItemLeft" align="right" valign="top"><a id="a7a3c123385683c40bd3a891e7af268bb"></a>
+<tr class="memitem:a7a3c123385683c40bd3a891e7af268bb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7a3c123385683c40bd3a891e7af268bb"></a>
 size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_open_group_params.html#a7a3c123385683c40bd3a891e7af268bb">groupDescriptionTableSize</a></td></tr>
 <tr class="memdesc:a7a3c123385683c40bd3a891e7af268bb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Number of entries in the groupDescriptionTable */. <br /></td></tr>
 <tr class="separator:a7a3c123385683c40bd3a891e7af268bb"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -115,9 +134,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="st
 
 <p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00051">51</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 </div><h2 class="groupheader">Member Data Documentation</h2>
-<a id="a3e9f6351540609fc3e853d5a16188da2"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a3e9f6351540609fc3e853d5a16188da2">&sect;&nbsp;</a></span>groupId</h2>
-
+<a class="anchor" id="a3e9f6351540609fc3e853d5a16188da2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -132,9 +149,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="st
 
 </div>
 </div>
-<a id="a3d06bbfc6586ca5378eedc9a5984d662"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a3d06bbfc6586ca5378eedc9a5984d662">&sect;&nbsp;</a></span>groupDescriptionTable</h2>
-
+<a class="anchor" id="a3d06bbfc6586ca5378eedc9a5984d662"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -161,7 +176,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="st
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___highlight_open_group_params.html">NVGSDK_HighlightOpenGroupParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlight_user_setting-members.html b/doc/html/struct_n_v_g_s_d_k___highlight_user_setting-members.html
index eb36853..969e723 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlight_user_setting-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlight_user_setting-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlight_user_se
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlight_user_setting.html b/doc/html/struct_n_v_g_s_d_k___highlight_user_setting.html
index 83e0b70..d54a40d 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlight_user_setting.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlight_user_setting.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_HighlightUserSetting Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,11 +120,11 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlight_user_se
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a048402ca61d36ae60fbee7a5fb2252b4"><td class="memItemLeft" align="right" valign="top"><a id="a048402ca61d36ae60fbee7a5fb2252b4"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">id</a></td></tr>
+<tr class="memitem:a048402ca61d36ae60fbee7a5fb2252b4"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a048402ca61d36ae60fbee7a5fb2252b4"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a048402ca61d36ae60fbee7a5fb2252b4">id</a></td></tr>
 <tr class="memdesc:a048402ca61d36ae60fbee7a5fb2252b4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Unique id for game event. <br /></td></tr>
 <tr class="separator:a048402ca61d36ae60fbee7a5fb2252b4"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a44eafd6943fb886c236cd4ff356c666d"><td class="memItemLeft" align="right" valign="top"><a id="a44eafd6943fb886c236cd4ff356c666d"></a>
+<tr class="memitem:a44eafd6943fb886c236cd4ff356c666d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a44eafd6943fb886c236cd4ff356c666d"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___highlight_user_setting.html#a44eafd6943fb886c236cd4ff356c666d">enabled</a></td></tr>
 <tr class="memdesc:a44eafd6943fb886c236cd4ff356c666d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Boolean for whether the user wants to record this type of highlight. <br /></td></tr>
 <tr class="separator:a44eafd6943fb886c236cd4ff356c666d"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -118,7 +145,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="stru
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___highlight_user_setting.html">NVGSDK_HighlightUserSetting</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlights___number_of_highlights-members.html b/doc/html/struct_n_v_g_s_d_k___highlights___number_of_highlights-members.html
index e797603..86c9e08 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlights___number_of_highlights-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlights___number_of_highlights-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -97,7 +124,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlights___numb
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlights___number_of_highlights.html b/doc/html/struct_n_v_g_s_d_k___highlights___number_of_highlights.html
index 2e75629..069d4a8 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlights___number_of_highlights.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlights___number_of_highlights.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_Highlights_NumberOfHighlights Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,14 +120,14 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlights___numb
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a1226750096e85e394fc282afc3b6f50b"><td class="memItemLeft" align="right" valign="top"><a id="a1226750096e85e394fc282afc3b6f50b"></a>
+<tr class="memitem:a1226750096e85e394fc282afc3b6f50b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1226750096e85e394fc282afc3b6f50b"></a>
 uint16_t&#160;</td><td class="memItemRight" valign="bottom"><b>numberOfHighlights</b></td></tr>
 <tr class="separator:a1226750096e85e394fc282afc3b6f50b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Returned data from NVGSDK_Highlights_GetNumberOfHighlightsAsync </p>
 
-<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00112">112</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
+<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00114">114</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights/<a class="el" href="highlights__types_8h_source.html">highlights_types.h</a></li>
 </ul>
@@ -113,7 +140,7 @@ uint16_t&#160;</td><td class="memItemRight" valign="bottom"><b>numberOfHighlight
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___highlights___number_of_highlights.html">NVGSDK_Highlights_NumberOfHighlights</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlights___user_settings-members.html b/doc/html/struct_n_v_g_s_d_k___highlights___user_settings-members.html
index ad5f793..31a20c2 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlights___user_settings-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlights___user_settings-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlights___user
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___highlights___user_settings.html b/doc/html/struct_n_v_g_s_d_k___highlights___user_settings.html
index e92dcb6..23b2e4d 100644
--- a/doc/html/struct_n_v_g_s_d_k___highlights___user_settings.html
+++ b/doc/html/struct_n_v_g_s_d_k___highlights___user_settings.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_Highlights_UserSettings Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,28 +117,20 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___highlights___user
 <div class="contents">
 
 <p><code>#include &lt;<a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>&gt;</code></p>
-<div class="dynheader">
-Collaboration diagram for NVGSDK_Highlights_UserSettings:</div>
-<div class="dyncontent">
-<div class="center"><img src="struct_n_v_g_s_d_k___highlights___user_settings__coll__graph.png" border="0" usemap="#_n_v_g_s_d_k___highlights___user_settings_coll__map" alt="Collaboration graph"/></div>
-<map name="_n_v_g_s_d_k___highlights___user_settings_coll__map" id="_n_v_g_s_d_k___highlights___user_settings_coll__map">
-<area shape="rect" id="node2" href="struct_n_v_g_s_d_k___highlight_user_setting.html" title="NVGSDK_HighlightUserSetting" alt="" coords="15,5,218,32"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a31406fadf965296a274739456563c559"><td class="memItemLeft" align="right" valign="top"><a id="a31406fadf965296a274739456563c559"></a>
+<tr class="memitem:a31406fadf965296a274739456563c559"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a31406fadf965296a274739456563c559"></a>
 <a class="el" href="struct_n_v_g_s_d_k___highlight_user_setting.html">NVGSDK_HighlightUserSetting</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>highlightSettingTable</b></td></tr>
 <tr class="separator:a31406fadf965296a274739456563c559"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a54b5fe0acd73c7168c533b975c1be482"><td class="memItemLeft" align="right" valign="top"><a id="a54b5fe0acd73c7168c533b975c1be482"></a>
+<tr class="memitem:a54b5fe0acd73c7168c533b975c1be482"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a54b5fe0acd73c7168c533b975c1be482"></a>
 size_t&#160;</td><td class="memItemRight" valign="bottom"><b>highlightSettingTableSize</b></td></tr>
 <tr class="separator:a54b5fe0acd73c7168c533b975c1be482"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Returned data from NVGSDK_Highlights_GetUserSettings </p>
 
-<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00103">103</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
+<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00105">105</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights/<a class="el" href="highlights__types_8h_source.html">highlights_types.h</a></li>
 </ul>
@@ -124,7 +143,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><b>highlightSettingTab
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___highlights___user_settings.html">NVGSDK_Highlights_UserSettings</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___language-members.html b/doc/html/struct_n_v_g_s_d_k___language-members.html
index 951d5f3..ac20f7f 100644
--- a/doc/html/struct_n_v_g_s_d_k___language-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___language-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -97,7 +124,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___language.html',''
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___language.html b/doc/html/struct_n_v_g_s_d_k___language.html
index 90b6247..835fe4e 100644
--- a/doc/html/struct_n_v_g_s_d_k___language.html
+++ b/doc/html/struct_n_v_g_s_d_k___language.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_Language Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,8 +120,8 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___language.html',''
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a61f6b2d2a3d08a27b37919e32b13ed75"><td class="memItemLeft" align="right" valign="top"><a id="a61f6b2d2a3d08a27b37919e32b13ed75"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75">cultureCode</a></td></tr>
+<tr class="memitem:a61f6b2d2a3d08a27b37919e32b13ed75"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a61f6b2d2a3d08a27b37919e32b13ed75"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___language.html#a61f6b2d2a3d08a27b37919e32b13ed75">cultureCode</a></td></tr>
 <tr class="memdesc:a61f6b2d2a3d08a27b37919e32b13ed75"><td class="mdescLeft">&#160;</td><td class="mdescRight">Will be populated by the user's GFE language selection. <br /></td></tr>
 <tr class="separator:a61f6b2d2a3d08a27b37919e32b13ed75"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -114,7 +141,7 @@ char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" h
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___language.html">NVGSDK_Language</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___localized_pair-members.html b/doc/html/struct_n_v_g_s_d_k___localized_pair-members.html
index 5a3e4ec..45ff7b2 100644
--- a/doc/html/struct_n_v_g_s_d_k___localized_pair-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___localized_pair-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___localized_pair.ht
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___localized_pair.html b/doc/html/struct_n_v_g_s_d_k___localized_pair.html
index 182721f..594c70d 100644
--- a/doc/html/struct_n_v_g_s_d_k___localized_pair.html
+++ b/doc/html/struct_n_v_g_s_d_k___localized_pair.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_LocalizedPair Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,12 +120,12 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___localized_pair.ht
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:aa070c22ef7cf737497855504fb8795d6"><td class="memItemLeft" align="right" valign="top"><a id="aa070c22ef7cf737497855504fb8795d6"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___localized_pair.html#aa070c22ef7cf737497855504fb8795d6">localeCode</a></td></tr>
+<tr class="memitem:aa070c22ef7cf737497855504fb8795d6"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa070c22ef7cf737497855504fb8795d6"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___localized_pair.html#aa070c22ef7cf737497855504fb8795d6">localeCode</a></td></tr>
 <tr class="memdesc:aa070c22ef7cf737497855504fb8795d6"><td class="mdescLeft">&#160;</td><td class="mdescRight">locale code, such as en-us, fr-fr, etc <br /></td></tr>
 <tr class="separator:aa070c22ef7cf737497855504fb8795d6"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a02d3e482f16824ccc790f1a3dc8b8952"><td class="memItemLeft" align="right" valign="top"><a id="a02d3e482f16824ccc790f1a3dc8b8952"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___localized_pair.html#a02d3e482f16824ccc790f1a3dc8b8952">localizedString</a></td></tr>
+<tr class="memitem:a02d3e482f16824ccc790f1a3dc8b8952"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a02d3e482f16824ccc790f1a3dc8b8952"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___localized_pair.html#a02d3e482f16824ccc790f1a3dc8b8952">localizedString</a></td></tr>
 <tr class="memdesc:a02d3e482f16824ccc790f1a3dc8b8952"><td class="mdescLeft">&#160;</td><td class="mdescRight">String translated for given locale. Max length NVGSDK_MAX_LENGTH - 1. <br /></td></tr>
 <tr class="separator:a02d3e482f16824ccc790f1a3dc8b8952"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -118,7 +145,7 @@ char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" h
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___localized_pair.html">NVGSDK_LocalizedPair</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___notification-members.html b/doc/html/struct_n_v_g_s_d_k___notification-members.html
index 49479e1..36aee24 100644
--- a/doc/html/struct_n_v_g_s_d_k___notification-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___notification-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -99,7 +126,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___notification.html
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___notification.html b/doc/html/struct_n_v_g_s_d_k___notification.html
index 9d0ad9e..2023585 100644
--- a/doc/html/struct_n_v_g_s_d_k___notification.html
+++ b/doc/html/struct_n_v_g_s_d_k___notification.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_Notification Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,23 +117,13 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___notification.html
 <div class="contents">
 
 <p><code>#include &lt;<a class="el" href="sdk__types_8h_source.html">sdk_types.h</a>&gt;</code></p>
-<div class="dynheader">
-Collaboration diagram for NVGSDK_Notification:</div>
-<div class="dyncontent">
-<div class="center"><img src="struct_n_v_g_s_d_k___notification__coll__graph.png" border="0" usemap="#_n_v_g_s_d_k___notification_coll__map" alt="Collaboration graph"/></div>
-<map name="_n_v_g_s_d_k___notification_coll__map" id="_n_v_g_s_d_k___notification_coll__map">
-<area shape="rect" id="node2" href="struct_n_v_g_s_d_k___permissions_changed_notification.html" title="NVGSDK_PermissionsChanged\lNotification" alt="" coords="5,95,212,136"/>
-<area shape="rect" id="node3" href="struct_n_v_g_s_d_k___scope_permission.html" title="NVGSDK_ScopePermission" alt="" coords="15,5,202,32"/>
-<area shape="rect" id="node4" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html" title="NVGSDK_OverlayStateChanged\lNotification" alt="" coords="236,95,445,136"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:ab56db16d074922b2f17dfa597db1db35"><td class="memItemLeft" align="right" valign="top"><a id="ab56db16d074922b2f17dfa597db1db35"></a>
+<tr class="memitem:ab56db16d074922b2f17dfa597db1db35"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab56db16d074922b2f17dfa597db1db35"></a>
 void *&#160;</td><td class="memItemRight" valign="bottom"><b>context</b></td></tr>
 <tr class="separator:ab56db16d074922b2f17dfa597db1db35"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aa1f2a5908ddaabc4d97d8628d0abc1f3"><td class="memItemLeft" ><a id="aa1f2a5908ddaabc4d97d8628d0abc1f3"></a>
+<tr class="memitem:aa1f2a5908ddaabc4d97d8628d0abc1f3"><td class="memItemLeft" ><a class="anchor" id="aa1f2a5908ddaabc4d97d8628d0abc1f3"></a>
 union {</td></tr>
 <tr class="memitem:a42cfa8bd17b6300d82e3ebb2a3f30a2b"><td class="memItemLeft" >
 &#160;&#160;&#160;<a class="el" href="struct_n_v_g_s_d_k___permissions_changed_notification.html">NVGSDK_PermissionsChangedNotification</a>&#160;&#160;&#160;<b>permissionsChanged</b></td></tr>
@@ -133,7 +150,7 @@ union {</td></tr>
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___notification.html">NVGSDK_Notification</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___overlay_state_changed_notification-members.html b/doc/html/struct_n_v_g_s_d_k___overlay_state_changed_notification-members.html
index 0b31c83..f448544 100644
--- a/doc/html/struct_n_v_g_s_d_k___overlay_state_changed_notification-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___overlay_state_changed_notification-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___overlay_state_cha
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___overlay_state_changed_notification.html b/doc/html/struct_n_v_g_s_d_k___overlay_state_changed_notification.html
index ab2ab73..e58a611 100644
--- a/doc/html/struct_n_v_g_s_d_k___overlay_state_changed_notification.html
+++ b/doc/html/struct_n_v_g_s_d_k___overlay_state_changed_notification.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_OverlayStateChangedNotification Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,11 +120,11 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___overlay_state_cha
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:ad9684c86b575f710bcc784942e6bf256"><td class="memItemLeft" align="right" valign="top"><a id="ad9684c86b575f710bcc784942e6bf256"></a>
+<tr class="memitem:ad9684c86b575f710bcc784942e6bf256"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad9684c86b575f710bcc784942e6bf256"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#ad9684c86b575f710bcc784942e6bf256">open</a></td></tr>
 <tr class="memdesc:ad9684c86b575f710bcc784942e6bf256"><td class="mdescLeft">&#160;</td><td class="mdescRight">true if the overlay is opening, false if it is closing <br /></td></tr>
 <tr class="separator:ad9684c86b575f710bcc784942e6bf256"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:af1c76ba9ecc3a9d83147dc4dc8d64ddc"><td class="memItemLeft" align="right" valign="top"><a id="af1c76ba9ecc3a9d83147dc4dc8d64ddc"></a>
+<tr class="memitem:af1c76ba9ecc3a9d83147dc4dc8d64ddc"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af1c76ba9ecc3a9d83147dc4dc8d64ddc"></a>
 NVGSDK_OverlayState&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html#af1c76ba9ecc3a9d83147dc4dc8d64ddc">state</a></td></tr>
 <tr class="memdesc:af1c76ba9ecc3a9d83147dc4dc8d64ddc"><td class="mdescLeft">&#160;</td><td class="mdescRight">State the overlay is closing from or opening to. <br /></td></tr>
 <tr class="separator:af1c76ba9ecc3a9d83147dc4dc8d64ddc"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -118,7 +145,7 @@ NVGSDK_OverlayState&#160;</td><td class="memItemRight" valign="bottom"><a class=
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___overlay_state_changed_notification.html">NVGSDK_OverlayStateChangedNotification</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___permissions_changed_notification-members.html b/doc/html/struct_n_v_g_s_d_k___permissions_changed_notification-members.html
index 1a571d4..43ab053 100644
--- a/doc/html/struct_n_v_g_s_d_k___permissions_changed_notification-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___permissions_changed_notification-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___permissions_chang
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___permissions_changed_notification.html b/doc/html/struct_n_v_g_s_d_k___permissions_changed_notification.html
index a66b087..8370236 100644
--- a/doc/html/struct_n_v_g_s_d_k___permissions_changed_notification.html
+++ b/doc/html/struct_n_v_g_s_d_k___permissions_changed_notification.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_PermissionsChangedNotification Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,21 +117,13 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___permissions_chang
 <div class="contents">
 
 <p><code>#include &lt;<a class="el" href="sdk__types_8h_source.html">sdk_types.h</a>&gt;</code></p>
-<div class="dynheader">
-Collaboration diagram for NVGSDK_PermissionsChangedNotification:</div>
-<div class="dyncontent">
-<div class="center"><img src="struct_n_v_g_s_d_k___permissions_changed_notification__coll__graph.png" border="0" usemap="#_n_v_g_s_d_k___permissions_changed_notification_coll__map" alt="Collaboration graph"/></div>
-<map name="_n_v_g_s_d_k___permissions_changed_notification_coll__map" id="_n_v_g_s_d_k___permissions_changed_notification_coll__map">
-<area shape="rect" id="node2" href="struct_n_v_g_s_d_k___scope_permission.html" title="NVGSDK_ScopePermission" alt="" coords="15,5,202,32"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:ad1b34df38d46d082a795d188cafac4fa"><td class="memItemLeft" align="right" valign="top"><a id="ad1b34df38d46d082a795d188cafac4fa"></a>
+<tr class="memitem:ad1b34df38d46d082a795d188cafac4fa"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad1b34df38d46d082a795d188cafac4fa"></a>
 <a class="el" href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>scopePermissionTable</b></td></tr>
 <tr class="separator:ad1b34df38d46d082a795d188cafac4fa"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:af4af47db7eee41671afffd741ab3537b"><td class="memItemLeft" align="right" valign="top"><a id="af4af47db7eee41671afffd741ab3537b"></a>
+<tr class="memitem:af4af47db7eee41671afffd741ab3537b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af4af47db7eee41671afffd741ab3537b"></a>
 size_t&#160;</td><td class="memItemRight" valign="bottom"><b>scopePermissionTableSize</b></td></tr>
 <tr class="separator:af4af47db7eee41671afffd741ab3537b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -124,7 +143,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><b>scopePermissionTabl
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___permissions_changed_notification.html">NVGSDK_PermissionsChangedNotification</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___request_permissions_params-members.html b/doc/html/struct_n_v_g_s_d_k___request_permissions_params-members.html
index 5d1d082..89d2a29 100644
--- a/doc/html/struct_n_v_g_s_d_k___request_permissions_params-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___request_permissions_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___request_permissio
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___request_permissions_params.html b/doc/html/struct_n_v_g_s_d_k___request_permissions_params.html
index 96a1902..fb872a6 100644
--- a/doc/html/struct_n_v_g_s_d_k___request_permissions_params.html
+++ b/doc/html/struct_n_v_g_s_d_k___request_permissions_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_RequestPermissionsParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,10 +120,10 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___request_permissio
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a36a73d73ec2310789fee89b696ea730b"><td class="memItemLeft" align="right" valign="top"><a id="a36a73d73ec2310789fee89b696ea730b"></a>
+<tr class="memitem:a36a73d73ec2310789fee89b696ea730b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a36a73d73ec2310789fee89b696ea730b"></a>
 NVGSDK_Scope *&#160;</td><td class="memItemRight" valign="bottom"><b>scopeTable</b></td></tr>
 <tr class="separator:a36a73d73ec2310789fee89b696ea730b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a4b24949f80b714247979a93e6c69471d"><td class="memItemLeft" align="right" valign="top"><a id="a4b24949f80b714247979a93e6c69471d"></a>
+<tr class="memitem:a4b24949f80b714247979a93e6c69471d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4b24949f80b714247979a93e6c69471d"></a>
 size_t&#160;</td><td class="memItemRight" valign="bottom"><b>scopeTableSize</b></td></tr>
 <tr class="separator:a4b24949f80b714247979a93e6c69471d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -116,7 +143,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><b>scopeTableSize</b><
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___request_permissions_params.html">NVGSDK_RequestPermissionsParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___scope_permission-members.html b/doc/html/struct_n_v_g_s_d_k___scope_permission-members.html
index a1f2244..fdecb7f 100644
--- a/doc/html/struct_n_v_g_s_d_k___scope_permission-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___scope_permission-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___scope_permission.
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___scope_permission.html b/doc/html/struct_n_v_g_s_d_k___scope_permission.html
index 340da60..d81313e 100644
--- a/doc/html/struct_n_v_g_s_d_k___scope_permission.html
+++ b/doc/html/struct_n_v_g_s_d_k___scope_permission.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_ScopePermission Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,10 +120,10 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___scope_permission.
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:aa3792f23714888c3f4640ef4458ab4fa"><td class="memItemLeft" align="right" valign="top"><a id="aa3792f23714888c3f4640ef4458ab4fa"></a>
+<tr class="memitem:aa3792f23714888c3f4640ef4458ab4fa"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa3792f23714888c3f4640ef4458ab4fa"></a>
 NVGSDK_Scope&#160;</td><td class="memItemRight" valign="bottom"><b>scope</b></td></tr>
 <tr class="separator:aa3792f23714888c3f4640ef4458ab4fa"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a711dd565ab2d07e96cbca376c823d77c"><td class="memItemLeft" align="right" valign="top"><a id="a711dd565ab2d07e96cbca376c823d77c"></a>
+<tr class="memitem:a711dd565ab2d07e96cbca376c823d77c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a711dd565ab2d07e96cbca376c823d77c"></a>
 NVGSDK_Permission&#160;</td><td class="memItemRight" valign="bottom"><b>permission</b></td></tr>
 <tr class="separator:a711dd565ab2d07e96cbca376c823d77c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -116,7 +143,7 @@ NVGSDK_Permission&#160;</td><td class="memItemRight" valign="bottom"><b>permissi
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___scope_permission.html">NVGSDK_ScopePermission</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___screenshot_highlight_params-members.html b/doc/html/struct_n_v_g_s_d_k___screenshot_highlight_params-members.html
index ddcbf77..385db7f 100644
--- a/doc/html/struct_n_v_g_s_d_k___screenshot_highlight_params-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___screenshot_highlight_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___screenshot_highli
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___screenshot_highlight_params.html b/doc/html/struct_n_v_g_s_d_k___screenshot_highlight_params.html
index e006c03..6965cef 100644
--- a/doc/html/struct_n_v_g_s_d_k___screenshot_highlight_params.html
+++ b/doc/html/struct_n_v_g_s_d_k___screenshot_highlight_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_ScreenshotHighlightParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,19 +120,19 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___screenshot_highli
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:adef68850dccafb01bc761da47413359d"><td class="memItemLeft" align="right" valign="top"><a id="adef68850dccafb01bc761da47413359d"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">groupId</a></td></tr>
+<tr class="memitem:adef68850dccafb01bc761da47413359d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adef68850dccafb01bc761da47413359d"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#adef68850dccafb01bc761da47413359d">groupId</a></td></tr>
 <tr class="memdesc:adef68850dccafb01bc761da47413359d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Required ID of the group this highlight is attached to. <br /></td></tr>
 <tr class="separator:adef68850dccafb01bc761da47413359d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a9fb8219abe683974c0df4963a6794949"><td class="memItemLeft" align="right" valign="top"><a id="a9fb8219abe683974c0df4963a6794949"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">highlightId</a></td></tr>
+<tr class="memitem:a9fb8219abe683974c0df4963a6794949"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9fb8219abe683974c0df4963a6794949"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html#a9fb8219abe683974c0df4963a6794949">highlightId</a></td></tr>
 <tr class="memdesc:a9fb8219abe683974c0df4963a6794949"><td class="mdescLeft">&#160;</td><td class="mdescRight">Refers to unique highlight id in highlight table. <br /></td></tr>
 <tr class="separator:a9fb8219abe683974c0df4963a6794949"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Passed into NVGSDK_Highlights_SetScreenshotHighlightAsync </p>
 
-<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00069">69</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
+<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00071">71</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights/<a class="el" href="highlights__types_8h_source.html">highlights_types.h</a></li>
 </ul>
@@ -118,7 +145,7 @@ char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" h
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___screenshot_highlight_params.html">NVGSDK_ScreenshotHighlightParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___summary_params-members.html b/doc/html/struct_n_v_g_s_d_k___summary_params-members.html
index c21c95f..a980e76 100644
--- a/doc/html/struct_n_v_g_s_d_k___summary_params-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___summary_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -98,7 +125,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___summary_params.ht
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___summary_params.html b/doc/html/struct_n_v_g_s_d_k___summary_params.html
index e46e1a2..24e603e 100644
--- a/doc/html/struct_n_v_g_s_d_k___summary_params.html
+++ b/doc/html/struct_n_v_g_s_d_k___summary_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_SummaryParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -90,22 +117,14 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___summary_params.ht
 <div class="contents">
 
 <p><code>#include &lt;<a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>&gt;</code></p>
-<div class="dynheader">
-Collaboration diagram for NVGSDK_SummaryParams:</div>
-<div class="dyncontent">
-<div class="center"><img src="struct_n_v_g_s_d_k___summary_params__coll__graph.png" border="0" usemap="#_n_v_g_s_d_k___summary_params_coll__map" alt="Collaboration graph"/></div>
-<map name="_n_v_g_s_d_k___summary_params_coll__map" id="_n_v_g_s_d_k___summary_params_coll__map">
-<area shape="rect" id="node2" href="struct_n_v_g_s_d_k___group_view.html" title="NVGSDK_GroupView" alt="" coords="25,5,171,32"/>
-</map>
-<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a0a6f4e491c47e1468610f813c61ff4ff"><td class="memItemLeft" align="right" valign="top"><a id="a0a6f4e491c47e1468610f813c61ff4ff"></a>
+<tr class="memitem:a0a6f4e491c47e1468610f813c61ff4ff"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0a6f4e491c47e1468610f813c61ff4ff"></a>
 <a class="el" href="struct_n_v_g_s_d_k___group_view.html">NVGSDK_GroupView</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___summary_params.html#a0a6f4e491c47e1468610f813c61ff4ff">groupSummaryTable</a></td></tr>
 <tr class="memdesc:a0a6f4e491c47e1468610f813c61ff4ff"><td class="mdescLeft">&#160;</td><td class="mdescRight">Pass in all the groups to display on screen. <br /></td></tr>
 <tr class="separator:a0a6f4e491c47e1468610f813c61ff4ff"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a8fbfd016dc92f631921e738f12ef399d"><td class="memItemLeft" align="right" valign="top"><a id="a8fbfd016dc92f631921e738f12ef399d"></a>
+<tr class="memitem:a8fbfd016dc92f631921e738f12ef399d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8fbfd016dc92f631921e738f12ef399d"></a>
 size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___summary_params.html#a8fbfd016dc92f631921e738f12ef399d">groupSummaryTableSize</a></td></tr>
 <tr class="memdesc:a8fbfd016dc92f631921e738f12ef399d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Number of groups contained in the table pointer. <br /></td></tr>
 <tr class="separator:a8fbfd016dc92f631921e738f12ef399d"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -113,7 +132,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="st
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Choose the highlights to display in the group summary </p>
 
-<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00093">93</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
+<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00095">95</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights/<a class="el" href="highlights__types_8h_source.html">highlights_types.h</a></li>
 </ul>
@@ -126,7 +145,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="st
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___summary_params.html">NVGSDK_SummaryParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___version-members.html b/doc/html/struct_n_v_g_s_d_k___version-members.html
index 9e47027..1247cd4 100644
--- a/doc/html/struct_n_v_g_s_d_k___version-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___version-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -99,7 +126,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___version.html','')
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___version.html b/doc/html/struct_n_v_g_s_d_k___version.html
index 0c3a40d..5fd8b97 100644
--- a/doc/html/struct_n_v_g_s_d_k___version.html
+++ b/doc/html/struct_n_v_g_s_d_k___version.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_Version Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,14 +120,14 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___version.html','')
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:a588701009e3fe0c3b6e74a8f751c122d"><td class="memItemLeft" align="right" valign="top"><a id="a588701009e3fe0c3b6e74a8f751c122d"></a>
+<tr class="memitem:a588701009e3fe0c3b6e74a8f751c122d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a588701009e3fe0c3b6e74a8f751c122d"></a>
 uint16_t&#160;</td><td class="memItemRight" valign="bottom"><b>major</b></td></tr>
 <tr class="separator:a588701009e3fe0c3b6e74a8f751c122d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a9080331fc2364580c4411e50a7808425"><td class="memItemLeft" align="right" valign="top"><a id="a9080331fc2364580c4411e50a7808425"></a>
+<tr class="memitem:a9080331fc2364580c4411e50a7808425"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9080331fc2364580c4411e50a7808425"></a>
 uint16_t&#160;</td><td class="memItemRight" valign="bottom"><b>minor</b></td></tr>
 <tr class="separator:a9080331fc2364580c4411e50a7808425"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:abdb04097bd3c65601de459467fa4dc2b"><td class="memItemLeft" align="right" valign="top"><a id="abdb04097bd3c65601de459467fa4dc2b"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___version.html#abdb04097bd3c65601de459467fa4dc2b">gfeVersionStr</a></td></tr>
+<tr class="memitem:abdb04097bd3c65601de459467fa4dc2b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abdb04097bd3c65601de459467fa4dc2b"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___version.html#abdb04097bd3c65601de459467fa4dc2b">gfeVersionStr</a></td></tr>
 <tr class="memdesc:abdb04097bd3c65601de459467fa4dc2b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Current version installed by the user. <br /></td></tr>
 <tr class="separator:abdb04097bd3c65601de459467fa4dc2b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -120,7 +147,7 @@ char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" h
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___version.html">NVGSDK_Version</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___video_highlight_params-members.html b/doc/html/struct_n_v_g_s_d_k___video_highlight_params-members.html
index 47382cf..6063bfb 100644
--- a/doc/html/struct_n_v_g_s_d_k___video_highlight_params-members.html
+++ b/doc/html/struct_n_v_g_s_d_k___video_highlight_params-members.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -100,7 +127,7 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___video_highlight_p
   <ul>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/struct_n_v_g_s_d_k___video_highlight_params.html b/doc/html/struct_n_v_g_s_d_k___video_highlight_params.html
index d5c9481..83d49ea 100644
--- a/doc/html/struct_n_v_g_s_d_k___video_highlight_params.html
+++ b/doc/html/struct_n_v_g_s_d_k___video_highlight_params.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.12"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>NVIDIAGeForceExperienceSDK: NVGSDK_VideoHighlightParams Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -16,10 +16,14 @@
 <script type="text/javascript" src="navtree.js"></script>
 <script type="text/javascript">
   $(document).ready(initResizable);
+  $(window).load(resizeHeight);
 </script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
 </head>
@@ -38,19 +42,42 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.12 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
-<script type="text/javascript" src="menudata.js"></script>
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript">
-$(function() {
-  initMenu('',true,false,'search.php','Search');
-  $(document).ready(function() { init_search(); });
-});
-</script>
-<div id="main-nav"></div>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+      <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+    </ul>
+  </div>
 </div><!-- top -->
 <div id="side-nav" class="ui-resizable side-nav-resizable">
   <div id="nav-tree">
@@ -93,19 +120,19 @@ $(document).ready(function(){initNavTree('struct_n_v_g_s_d_k___video_highlight_p
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
 Public Attributes</h2></td></tr>
-<tr class="memitem:aa332ddd28accd8f72fb17adc378c1267"><td class="memItemLeft" align="right" valign="top"><a id="aa332ddd28accd8f72fb17adc378c1267"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">groupId</a></td></tr>
+<tr class="memitem:aa332ddd28accd8f72fb17adc378c1267"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa332ddd28accd8f72fb17adc378c1267"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___video_highlight_params.html#aa332ddd28accd8f72fb17adc378c1267">groupId</a></td></tr>
 <tr class="memdesc:aa332ddd28accd8f72fb17adc378c1267"><td class="mdescLeft">&#160;</td><td class="mdescRight">Required ID of the group this highlight is attached to. <br /></td></tr>
 <tr class="separator:aa332ddd28accd8f72fb17adc378c1267"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a622f76afc439ed07a18e97ca95564ff0"><td class="memItemLeft" align="right" valign="top"><a id="a622f76afc439ed07a18e97ca95564ff0"></a>
-char const  *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">highlightId</a></td></tr>
+<tr class="memitem:a622f76afc439ed07a18e97ca95564ff0"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a622f76afc439ed07a18e97ca95564ff0"></a>
+char const *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___video_highlight_params.html#a622f76afc439ed07a18e97ca95564ff0">highlightId</a></td></tr>
 <tr class="memdesc:a622f76afc439ed07a18e97ca95564ff0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Refers to unique highlight id in highlight table. <br /></td></tr>
 <tr class="separator:a622f76afc439ed07a18e97ca95564ff0"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac526b90af6638fec62174304aa175da1"><td class="memItemLeft" align="right" valign="top"><a id="ac526b90af6638fec62174304aa175da1"></a>
+<tr class="memitem:ac526b90af6638fec62174304aa175da1"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac526b90af6638fec62174304aa175da1"></a>
 int32_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___video_highlight_params.html#ac526b90af6638fec62174304aa175da1">startDelta</a></td></tr>
 <tr class="memdesc:ac526b90af6638fec62174304aa175da1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Milliseconds between the time of request, and the start of desired video clip. <br /></td></tr>
 <tr class="separator:ac526b90af6638fec62174304aa175da1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae63c02443b1eeb24c4e1ed4d49154277"><td class="memItemLeft" align="right" valign="top"><a id="ae63c02443b1eeb24c4e1ed4d49154277"></a>
+<tr class="memitem:ae63c02443b1eeb24c4e1ed4d49154277"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae63c02443b1eeb24c4e1ed4d49154277"></a>
 int32_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct_n_v_g_s_d_k___video_highlight_params.html#ae63c02443b1eeb24c4e1ed4d49154277">endDelta</a></td></tr>
 <tr class="memdesc:ae63c02443b1eeb24c4e1ed4d49154277"><td class="mdescLeft">&#160;</td><td class="mdescRight">Milliseconds between the time of request, and end of desired video clip. <br /></td></tr>
 <tr class="separator:ae63c02443b1eeb24c4e1ed4d49154277"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -113,7 +140,7 @@ int32_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="s
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Passed into NVGSDK_Highlights_SetVideoHighlightAsync </p>
 
-<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00076">76</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
+<p>Definition at line <a class="el" href="highlights__types_8h_source.html#l00078">78</a> of file <a class="el" href="highlights__types_8h_source.html">highlights_types.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>C:/u/workspace/dev/sdkwinauto/sdkclient/include/gfesdk/highlights/<a class="el" href="highlights__types_8h_source.html">highlights_types.h</a></li>
 </ul>
@@ -126,7 +153,7 @@ int32_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="s
     <li class="navelem"><a class="el" href="struct_n_v_g_s_d_k___video_highlight_params.html">NVGSDK_VideoHighlightParams</a></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    doxygen</a> 1.8.12 </li>
+    doxygen</a> 1.8.11 </li>
   </ul>
 </div>
 </body>
diff --git a/doc/html/tabs.css b/doc/html/tabs.css
index a28614b..b3e3c6b 100644
--- a/doc/html/tabs.css
+++ b/doc/html/tabs.css
@@ -1 +1,60 @@
-.sm{position:relative;z-index:9999}.sm,.sm ul,.sm li{display:block;list-style:none;margin:0;padding:0;line-height:normal;direction:ltr;text-align:left;-webkit-tap-highlight-color:rgba(0,0,0,0)}.sm-rtl,.sm-rtl ul,.sm-rtl li{direction:rtl;text-align:right}.sm>li>h1,.sm>li>h2,.sm>li>h3,.sm>li>h4,.sm>li>h5,.sm>li>h6{margin:0;padding:0}.sm ul{display:none}.sm li,.sm a{position:relative}.sm a{display:block}.sm a.disabled{cursor:not-allowed}.sm:after{content:"\00a0";display:block;height:0;font:0/0 serif;clear:both;visibility:hidden;overflow:hidden}.sm,.sm *,.sm *:before,.sm *:after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}#doc-content{overflow:auto;display:block;padding:0;margin:0;-webkit-overflow-scrolling:touch}.sm-dox{background-image:url("tab_b.png")}.sm-dox a,.sm-dox a:focus,.sm-dox a:hover,.sm-dox a:active{padding:0 12px;padding-right:43px;font-family:"Lucida Grande","Geneva","Helvetica",Arial,sans-serif;font-size:13px;font-weight:bold;line-height:36px;text-decoration:none;text-shadow:0 1px 1px rgba(255,255,255,0.9);color:#283a5d;outline:0}.sm-dox a:hover{background-image:url("tab_a.png");background-repeat:repeat-x;color:white;text-shadow:0 1px 1px black}.sm-dox a.current{color:#d23600}.sm-dox a.disabled{color:#bbb}.sm-dox a span.sub-arrow{position:absolute;top:50%;margin-top:-14px;left:auto;right:3px;width:28px;height:28px;overflow:hidden;font:bold 12px/28px monospace!important;text-align:center;text-shadow:none;background:rgba(255,255,255,0.5);-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.sm-dox a.highlighted span.sub-arrow:before{display:block;content:'-'}.sm-dox>li:first-child>a,.sm-dox>li:first-child>:not(ul) a{-moz-border-radius:5px 5px 0 0;-webkit-border-radius:5px;border-radius:5px 5px 0 0}.sm-dox>li:last-child>a,.sm-dox>li:last-child>*:not(ul) a,.sm-dox>li:last-child>ul,.sm-dox>li:last-child>ul>li:last-child>a,.sm-dox>li:last-child>ul>li:last-child>*:not(ul) a,.sm-dox>li:last-child>ul>li:last-child>ul,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul{-moz-border-radius:0 0 5px 5px;-webkit-border-radius:0;border-radius:0 0 5px 5px}.sm-dox>li:last-child>a.highlighted,.sm-dox>li:last-child>*:not(ul) a.highlighted,.sm-dox>li:last-child>ul>li:last-child>a.highlighted,.sm-dox>li:last-child>ul>li:last-child>*:not(ul) a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a.highlighted{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0}.sm-dox ul{background:rgba(162,162,162,0.1)}.sm-dox ul a,.sm-dox ul a:focus,.sm-dox ul a:hover,.sm-dox ul a:active{font-size:12px;border-left:8px solid transparent;line-height:36px;text-shadow:none;background-color:white;background-image:none}.sm-dox ul a:hover{background-image:url("tab_a.png");background-repeat:repeat-x;color:white;text-shadow:0 1px 1px black}.sm-dox ul ul a,.sm-dox ul ul a:hover,.sm-dox ul ul a:focus,.sm-dox ul ul a:active{border-left:16px solid transparent}.sm-dox ul ul ul a,.sm-dox ul ul ul a:hover,.sm-dox ul ul ul a:focus,.sm-dox ul ul ul a:active{border-left:24px solid transparent}.sm-dox ul ul ul ul a,.sm-dox ul ul ul ul a:hover,.sm-dox ul ul ul ul a:focus,.sm-dox ul ul ul ul a:active{border-left:32px solid transparent}.sm-dox ul ul ul ul ul a,.sm-dox ul ul ul ul ul a:hover,.sm-dox ul ul ul ul ul a:focus,.sm-dox ul ul ul ul ul a:active{border-left:40px solid transparent}@media(min-width:768px){.sm-dox ul{position:absolute;width:12em}.sm-dox li{float:left}.sm-dox.sm-rtl li{float:right}.sm-dox ul li,.sm-dox.sm-rtl ul li,.sm-dox.sm-vertical li{float:none}.sm-dox a{white-space:nowrap}.sm-dox ul a,.sm-dox.sm-vertical a{white-space:normal}.sm-dox .sm-nowrap>li>a,.sm-dox .sm-nowrap>li>:not(ul) a{white-space:nowrap}.sm-dox{padding:0 10px;background-image:url("tab_b.png");line-height:36px}.sm-dox a span.sub-arrow{top:50%;margin-top:-2px;right:12px;width:0;height:0;border-width:4px;border-style:solid dashed dashed dashed;border-color:#283a5d transparent transparent transparent;background:transparent;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0}.sm-dox a,.sm-dox a:focus,.sm-dox a:active,.sm-dox a:hover,.sm-dox a.highlighted{padding:0 12px;background-image:url("tab_s.png");background-repeat:no-repeat;background-position:right;-moz-border-radius:0!important;-webkit-border-radius:0;border-radius:0!important}.sm-dox a:hover{background-image:url("tab_a.png");background-repeat:repeat-x;color:white;text-shadow:0 1px 1px black}.sm-dox a:hover span.sub-arrow{border-color:white transparent transparent transparent}.sm-dox a.has-submenu{padding-right:24px}.sm-dox li{border-top:0}.sm-dox>li>ul:before,.sm-dox>li>ul:after{content:'';position:absolute;top:-18px;left:30px;width:0;height:0;overflow:hidden;border-width:9px;border-style:dashed dashed solid dashed;border-color:transparent transparent #bbb transparent}.sm-dox>li>ul:after{top:-16px;left:31px;border-width:8px;border-color:transparent transparent #fff transparent}.sm-dox ul{border:1px solid #bbb;padding:5px 0;background:#fff;-moz-border-radius:5px!important;-webkit-border-radius:5px;border-radius:5px!important;-moz-box-shadow:0 5px 9px rgba(0,0,0,0.2);-webkit-box-shadow:0 5px 9px rgba(0,0,0,0.2);box-shadow:0 5px 9px rgba(0,0,0,0.2)}.sm-dox ul a span.sub-arrow{right:8px;top:50%;margin-top:-5px;border-width:5px;border-color:transparent transparent transparent #555;border-style:dashed dashed dashed solid}.sm-dox ul a,.sm-dox ul a:hover,.sm-dox ul a:focus,.sm-dox ul a:active,.sm-dox ul a.highlighted{color:#555;background-image:none;border:0!important;color:#555;background-image:none}.sm-dox ul a:hover{background-image:url("tab_a.png");background-repeat:repeat-x;color:white;text-shadow:0 1px 1px black}.sm-dox ul a:hover span.sub-arrow{border-color:transparent transparent transparent white}.sm-dox span.scroll-up,.sm-dox span.scroll-down{position:absolute;display:none;visibility:hidden;overflow:hidden;background:#fff;height:36px}.sm-dox span.scroll-up:hover,.sm-dox span.scroll-down:hover{background:#eee}.sm-dox span.scroll-up:hover span.scroll-up-arrow,.sm-dox span.scroll-up:hover span.scroll-down-arrow{border-color:transparent transparent #d23600 transparent}.sm-dox span.scroll-down:hover span.scroll-down-arrow{border-color:#d23600 transparent transparent transparent}.sm-dox span.scroll-up-arrow,.sm-dox span.scroll-down-arrow{position:absolute;top:0;left:50%;margin-left:-6px;width:0;height:0;overflow:hidden;border-width:6px;border-style:dashed dashed solid dashed;border-color:transparent transparent #555 transparent}.sm-dox span.scroll-down-arrow{top:8px;border-style:solid dashed dashed dashed;border-color:#555 transparent transparent transparent}.sm-dox.sm-rtl a.has-submenu{padding-right:12px;padding-left:24px}.sm-dox.sm-rtl a span.sub-arrow{right:auto;left:12px}.sm-dox.sm-rtl.sm-vertical a.has-submenu{padding:10px 20px}.sm-dox.sm-rtl.sm-vertical a span.sub-arrow{right:auto;left:8px;border-style:dashed solid dashed dashed;border-color:transparent #555 transparent transparent}.sm-dox.sm-rtl>li>ul:before{left:auto;right:30px}.sm-dox.sm-rtl>li>ul:after{left:auto;right:31px}.sm-dox.sm-rtl ul a.has-submenu{padding:10px 20px!important}.sm-dox.sm-rtl ul a span.sub-arrow{right:auto;left:8px;border-style:dashed solid dashed dashed;border-color:transparent #555 transparent transparent}.sm-dox.sm-vertical{padding:10px 0;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.sm-dox.sm-vertical a{padding:10px 20px}.sm-dox.sm-vertical a:hover,.sm-dox.sm-vertical a:focus,.sm-dox.sm-vertical a:active,.sm-dox.sm-vertical a.highlighted{background:#fff}.sm-dox.sm-vertical a.disabled{background-image:url("tab_b.png")}.sm-dox.sm-vertical a span.sub-arrow{right:8px;top:50%;margin-top:-5px;border-width:5px;border-style:dashed dashed dashed solid;border-color:transparent transparent transparent #555}.sm-dox.sm-vertical>li>ul:before,.sm-dox.sm-vertical>li>ul:after{display:none}.sm-dox.sm-vertical ul a{padding:10px 20px}.sm-dox.sm-vertical ul a:hover,.sm-dox.sm-vertical ul a:focus,.sm-dox.sm-vertical ul a:active,.sm-dox.sm-vertical ul a.highlighted{background:#eee}.sm-dox.sm-vertical ul a.disabled{background:#fff}}
\ No newline at end of file
+.tabs, .tabs2, .tabs3 {
+    background-image: url('tab_b.png');
+    width: 100%;
+    z-index: 101;
+    font-size: 13px;
+    font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
+}
+
+.tabs2 {
+    font-size: 10px;
+}
+.tabs3 {
+    font-size: 9px;
+}
+
+.tablist {
+    margin: 0;
+    padding: 0;
+    display: table;
+}
+
+.tablist li {
+    float: left;
+    display: table-cell;
+    background-image: url('tab_b.png');
+    line-height: 36px;
+    list-style: none;
+}
+
+.tablist a {
+    display: block;
+    padding: 0 20px;
+    font-weight: bold;
+    background-image:url('tab_s.png');
+    background-repeat:no-repeat;
+    background-position:right;
+    color: #050900;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+    text-decoration: none;
+    outline: none;
+}
+
+.tabs3 .tablist a {
+    padding: 0 10px;
+}
+
+.tablist a:hover {
+    background-image: url('tab_h.png');
+    background-repeat:repeat-x;
+    color: #fff;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
+    text-decoration: none;
+}
+
+.tablist li.current a {
+    background-image: url('tab_a.png');
+    background-repeat:repeat-x;
+    color: #fff;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
+}
diff --git a/include/gfesdk/config.h b/include/gfesdk/config.h
index 264ea4a..6ca38ae 100644
--- a/include/gfesdk/config.h
+++ b/include/gfesdk/config.h
@@ -14,12 +14,12 @@
 
 #include "gfe3_product_version.h"
 
-#define NVGSDK_PROJECT_NAME "GfeSDK"
+#define NVGSDK_PROJECT_NAME "GfeSDK-sdkclient-win"
 
 #define NVGSDK_VERSION_MAJOR   1
 #define NVGSDK_VERSION_MINOR   1
-#define NVGSDK_BUILD_NUMBER    201
-#define NVGSDK_BUILD_HASH      4c06af57
-#define NVGSDK_BUILD_HASH_STR  "4c06af57"
+#define NVGSDK_BUILD_NUMBER    232
+#define NVGSDK_BUILD_HASH      4cdf2529
+#define NVGSDK_BUILD_HASH_STR  "4cdf2529"
 
 #endif // _NVGSDK_CONFIG_H_
diff --git a/include/gfesdk/gfe3_product_version.h b/include/gfesdk/gfe3_product_version.h
index 34d8970..ae9486b 100644
--- a/include/gfesdk/gfe3_product_version.h
+++ b/include/gfesdk/gfe3_product_version.h
@@ -10,10 +10,10 @@
 // N - Build counter.
 //
 #define NVIDIA_GFE3_VERSION_MAJOR 3
-#define NVIDIA_GFE3_VERSION_MINOR 14
+#define NVIDIA_GFE3_VERSION_MINOR 21
 #define NVIDIA_GFE3_VERSION_DEV_REBASE 0
 #define NVIDIA_GFE3_VERSION_RNEXT_REBASE 0
-#define NVIDIA_GFE3_VERSION_BUILD 76
+#define NVIDIA_GFE3_VERSION_BUILD 449
 
 //
 // Composite version values. We don't concatenate them here automatically because
@@ -22,11 +22,11 @@
 //
 
 // Format: A,B,XY,N
-#define NVIDIA_GFE3_VERSION          3,14,0,76
+#define NVIDIA_GFE3_VERSION          3,21,0,449
 // Format: A.B.XY.N
-#define NVIDIA_GFE3_VERSION_DOT      3.14.0.76
+#define NVIDIA_GFE3_VERSION_DOT      3.21.0.449
 // Format: "A.B.XY.N"
-#define NVIDIA_GFE3_VERSION_STRING   "3.14.0.76"
+#define NVIDIA_GFE3_VERSION_STRING   "3.21.0.449"
 
 //
 // Some common strings
@@ -39,6 +39,6 @@
 #define NV_COMPANY_NAME_STRING_SHORT "NVIDIA"
 #define NV_COMPANY_NAME_STRING_FULL  "NVIDIA Corporation"
 #define NV_COMPANY_NAME_STRING       NV_COMPANY_NAME_STRING_FULL
-#define NV_COPYRIGHT_YEAR            "2017"
+#define NV_COPYRIGHT_YEAR            "2020"
 #define NV_COPYRIGHT                 "(C) " NV_COPYRIGHT_YEAR " " NV_COMPANY_NAME_STRING_FULL ". All rights reserved."  // Please do not use the non-ascii copyright symbol for (C).
 
diff --git a/include/gfesdk/highlights/highlights_types.h b/include/gfesdk/highlights/highlights_types.h
index 52ffe01..37c38ae 100644
--- a/include/gfesdk/highlights/highlights_types.h
+++ b/include/gfesdk/highlights/highlights_types.h
@@ -62,7 +62,9 @@ typedef struct
 {
     char const* groupId;            //!< Unique group ID that was used to Open a group previously
     bool        destroyHighlights;  /*!< If set to true, deletes the persisted highlights from disk.
-                                    *   Highlights that have been moved to gallery are not removed */
+                                    *   Highlights that have been moved to gallery are not removed.
+                                    * Note:: With the new sidebar-based overlay UX, all Highlights
+                                    * are now part of Gallery by default and this flag is ignored */
 } NVGSDK_HighlightCloseGroupParams;
 
 /*! Passed into NVGSDK_Highlights_SetScreenshotHighlightAsync */
diff --git a/include/gfesdk/sdk_types.h b/include/gfesdk/sdk_types.h
index 19375c0..6302f22 100644
--- a/include/gfesdk/sdk_types.h
+++ b/include/gfesdk/sdk_types.h
@@ -106,12 +106,14 @@ typedef struct
     NVGSDK_Scope* scopeTable;   //!< List of scopes used by the application
     size_t scopeTableSize;      //!< Number of entries in the scope table
     bool pollForCallbacks;      /*!< \brief Set to true to poll for asynchronous callbacks on an app thread.
-                                 *   If false, callbacks will occur on a GfeSDK controlled thread, no polling necessary */  
+                                 *   If false, callbacks will occur on a GfeSDK controlled thread, no polling necessary */
     NVGSDK_NotificationCallback notificationCallback;   //!< Called on unsolicited notifications
     void* notificationCallbackContext;                  //!< Passed along unchanged with each notification
 
-    uint32_t targetPid;         //!< Advanced usage
-    char const* targetPath;     //!< Advanced usage
+    uint32_t targetPid;         /*!< \brief Used for linking to game-related process's PID that also supports NVIDIA Highlights. 
+                                *   Leave empty when not used. */
+    char const* targetPath;     /*!< \brief Used for linking to game-related process's path that also supports NVIDIA Highlights. 
+                                * Must be defined if targetPid is defined. Leave empty when not used. */
 } NVGSDK_CreateInputParams;
 
 /*! Parameters given to \ref NVGSDK_RequestPermissionsAsync */
diff --git a/include/gfesdk/sdk_types_ipc.h b/include/gfesdk/sdk_types_ipc.h
index 3e0e14e..add9aaa 100644
--- a/include/gfesdk/sdk_types_ipc.h
+++ b/include/gfesdk/sdk_types_ipc.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
+// Copyright (c) 2016-2019, NVIDIA CORPORATION.  All rights reserved.
 //
 // NVIDIA CORPORATION and its licensors retain all intellectual property
 // and proprietary rights in and to this software, related documentation
@@ -13,252 +13,302 @@
 #include <stdbool.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-/**
- * The API distributed with the game represents a single version of the GfeSDK.
- * The installed version of GFE may or may not be compatible with this version. A
- * version check is initiated when the SDK is initialized.
- *
- * Whenever the API between the SDK and GFE backend gets updated, one of these version numbers
- * gets bumped as follows:
- *  MAJOR.MINOR
- * MINOR - An API has changed, but the old API is still being supported for backward compatibility
- *  Example: An existing call is reconfigured, or an optional field is added
- *    Case 1: SDK DLL version and GFE Backend version are equal. No problem
- *      Creation will return NVGSDK_SUCCESS
- *    Case 2: SDK DLL version is 0.2, and GFE Backend version is 0.1
- *      API is likely to function as expected, but functionality new to 0.2 won't be expected
- *      to work. Game should consider asking the user to upgrade GFE
- *      Creation will return NVGSDK_SUCCESS_VERSION_OLD_GFE
- *    Case 3: SDK DLL version is 0.1 and GFE Backend version is 0.2. The game needs to update
- *      the distributed DLL to get access to the latest feature, but otherwise it will work correctly.
- *      The game should update to latest SDK version when possible.
- *      Creation will return NVGSDK_SUCCESS_VERSION_OLD_SDK
- * MAJOR - The update will break backward compatibility completely. THIS IS NEVER TO BE USED IF POSSIBLE
- *    Case 1: SDK DLL version and GFE Backend version are equal. No problem
- *      Creation will return NVGSDK_SUCCESS
- *    Case 2: SDK DLL version is 1.0, and GFE Backend version is 0.1.
- *      SDK won't work as expected. GFE3 must be upgraded.
- *      Creation will return NVGSDK_ERR_GFE_VERSION
- *    Case 3: SDK DLL version is 0.1 and GFE Backend version is 1.0.
- *      SDK won't work as expected. Game must ship with a newer SDK DLL.
- *      Creation will return NVGSDK_ERR_SDK_VERSION
- */
+    /**
+     * The API distributed with the game represents a single version of the GfeSDK.
+     * The installed version of GFE may or may not be compatible with this version. A
+     * version check is initiated when the SDK is initialized.
+     *
+     * Whenever the API between the SDK and GFE backend gets updated, one of these version numbers
+     * gets bumped as follows:
+     *  MAJOR.MINOR
+     * MINOR - An API has changed, but the old API is still being supported for backward compatibility
+     *  Example: An existing call is reconfigured, or an optional field is added
+     *    Case 1: SDK DLL version and GFE Backend version are equal. No problem
+     *      Creation will return NVGSDK_SUCCESS
+     *    Case 2: SDK DLL version is 0.2, and GFE Backend version is 0.1
+     *      API is likely to function as expected, but functionality new to 0.2 won't be expected
+     *      to work. Game should consider asking the user to upgrade GFE
+     *      Creation will return NVGSDK_SUCCESS_VERSION_OLD_GFE
+     *    Case 3: SDK DLL version is 0.1 and GFE Backend version is 0.2. The game needs to update
+     *      the distributed DLL to get access to the latest feature, but otherwise it will work correctly.
+     *      The game should update to latest SDK version when possible.
+     *      Creation will return NVGSDK_SUCCESS_VERSION_OLD_SDK
+     * MAJOR - The update will break backward compatibility completely. THIS IS NEVER TO BE USED IF POSSIBLE
+     *    Case 1: SDK DLL version and GFE Backend version are equal. No problem
+     *      Creation will return NVGSDK_SUCCESS
+     *    Case 2: SDK DLL version is 1.0, and GFE Backend version is 0.1.
+     *      SDK won't work as expected. GFE3 must be upgraded.
+     *      Creation will return NVGSDK_ERR_GFE_VERSION
+     *    Case 3: SDK DLL version is 0.1 and GFE Backend version is 1.0.
+     *      SDK won't work as expected. Game must ship with a newer SDK DLL.
+     *      Creation will return NVGSDK_ERR_SDK_VERSION
+     */
 
-int const NVGSDK_IPC_VERSION_MAJOR = 1;
-int const NVGSDK_IPC_VERSION_MINOR = 1;
+    int const NVGSDK_IPC_VERSION_MAJOR = 1;
+    int const NVGSDK_IPC_VERSION_MINOR = 1;
 
-/*!
-* \brief Possible return values of all external APIs
-*/
-typedef enum _NVGSDK_RetCode
-{
-    NVGSDK_SUCCESS                       = 0,
-    NVGSDK_SUCCESS_VERSION_OLD_SDK       = 1001,
-    NVGSDK_SUCCESS_VERSION_OLD_GFE       = 1002,
-    NVGSDK_SUCCESS_PENDING               = 1003,
-    NVGSDK_SUCCESS_USER_NOT_INTERESTED   = 1004,
-    NVGSDK_SUCCESS_PERMISSION_GRANTED    = 1005,
-    NVGSDK_SUCCESS_LINKED                = 1006,
+    /*!
+     * \brief Possible return values of all external APIs
+     */
+    typedef enum _NVGSDK_RetCode
+    {
+        NVGSDK_SUCCESS = 0,
+        NVGSDK_SUCCESS_VERSION_OLD_SDK = 1001,
+        NVGSDK_SUCCESS_VERSION_OLD_GFE = 1002,
+        NVGSDK_SUCCESS_PENDING = 1003,
+        NVGSDK_SUCCESS_USER_NOT_INTERESTED = 1004,
+        NVGSDK_SUCCESS_PERMISSION_GRANTED = 1005,
+        NVGSDK_SUCCESS_LINKED = 1006,
 
-    NVGSDK_ERR_GENERIC                   = -1001,
-    NVGSDK_ERR_GFE_VERSION               = -1002,
-    NVGSDK_ERR_SDK_VERSION               = -1003,
-    NVGSDK_ERR_NOT_IMPLEMENTED           = -1004,
-    NVGSDK_ERR_INVALID_PARAMETER         = -1005,
-    NVGSDK_ERR_NOT_SET                   = -1006,
-    NVGSDK_ERR_SHADOWPLAY_IR_DISABLED    = -1007,
-    NVGSDK_ERR_SDK_IN_USE                = -1008,
-    NVGSDK_ERR_GROUP_NOT_FOUND           = -1009,
-    NVGSDK_ERR_FILE_NOT_FOUND            = -1010,
-    NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED   = -1011,
-    NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED = -1012,
-    NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED    = -1013,
-    NVGSDK_ERR_UNEXPECTED_EXCEPTION      = -1014,
-    NVGSDK_ERR_NO_HIGHLIGHTS             = -1015,
-    NVGSDK_ERR_NO_CONNECTION             = -1016,
-    NVGSDK_ERR_PERMISSION_NOT_GRANTED    = -1017,
-    NVGSDK_ERR_PERMISSION_DENIED         = -1018,
-    NVGSDK_ERR_INVALID_HANDLE            = -1019,
-    NVGSDK_ERR_UNHANDLED_EXCEPTION       = -1020,
-    NVGSDK_ERR_OUT_OF_MEMORY             = -1021,
-    NVGSDK_ERR_LOAD_LIBRARY              = -1022,
-    NVGSDK_ERR_LIB_CALL_FAILED           = -1023,
-    NVGSDK_ERR_IPC_FAILED                = -1024,
-    NVGSDK_ERR_CONNECTION                = -1025,
-    NVGSDK_ERR_MODULE_NOT_LOADED         = -1026,
-    NVGSDK_ERR_LIB_CALL_TIMEOUT          = -1027,
-    NVGSDK_ERR_APPLICATION_LOOKUP_FAILED = -1028,
-    NVGSDK_ERR_APPLICATION_NOT_KNOWN     = -1029,
-    NVGSDK_ERR_FEATURE_DISABLED          = -1030,
-    NVGSDK_ERR_APP_NO_OPTIMIZATION       = -1031,
-    NVGSDK_ERR_APP_SETTINGS_READ         = -1032,
-    NVGSDK_ERR_APP_SETTINGS_WRITE        = -1033,
-} NVGSDK_RetCode;
+        NVGSDK_ERR_GENERIC = -1001,
+        NVGSDK_ERR_GFE_VERSION = -1002,
+        NVGSDK_ERR_SDK_VERSION = -1003,
+        NVGSDK_ERR_NOT_IMPLEMENTED = -1004,
+        NVGSDK_ERR_INVALID_PARAMETER = -1005,
+        NVGSDK_ERR_NOT_SET = -1006,
+        NVGSDK_ERR_SHADOWPLAY_IR_DISABLED = -1007,
+        NVGSDK_ERR_SDK_IN_USE = -1008,
+        NVGSDK_ERR_GROUP_NOT_FOUND = -1009,
+        NVGSDK_ERR_FILE_NOT_FOUND = -1010,
+        NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED = -1011,
+        NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED = -1012,
+        NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED = -1013,
+        NVGSDK_ERR_UNEXPECTED_EXCEPTION = -1014,
+        NVGSDK_ERR_NO_HIGHLIGHTS = -1015,
+        NVGSDK_ERR_NO_CONNECTION = -1016,
+        NVGSDK_ERR_PERMISSION_NOT_GRANTED = -1017,
+        NVGSDK_ERR_PERMISSION_DENIED = -1018,
+        NVGSDK_ERR_INVALID_HANDLE = -1019,
+        NVGSDK_ERR_UNHANDLED_EXCEPTION = -1020,
+        NVGSDK_ERR_OUT_OF_MEMORY = -1021,
+        NVGSDK_ERR_LOAD_LIBRARY = -1022,
+        NVGSDK_ERR_LIB_CALL_FAILED = -1023,
+        NVGSDK_ERR_IPC_FAILED = -1024,
+        NVGSDK_ERR_CONNECTION = -1025,
+        NVGSDK_ERR_MODULE_NOT_LOADED = -1026,
+        NVGSDK_ERR_LIB_CALL_TIMEOUT = -1027,
+        NVGSDK_ERR_APPLICATION_LOOKUP_FAILED = -1028,
+        NVGSDK_ERR_APPLICATION_NOT_KNOWN = -1029,
+        NVGSDK_ERR_FEATURE_DISABLED = -1030,
+        NVGSDK_ERR_APP_NO_OPTIMIZATION = -1031,
+        NVGSDK_ERR_APP_SETTINGS_READ = -1032,
+        NVGSDK_ERR_APP_SETTINGS_WRITE = -1033,
+        NVGSDK_ERR_HIGHLIGHT_NOT_DEFINED = -1034,
+        NVGSDK_ERR_CAP_LIMIT_REACHED = -1035,
+        NVGSDK_ERR_DISK_LIMIT_REACHED = -1036
+    } NVGSDK_RetCode;
 
-// not using macros to avoid polluting namespace of SDK unnecessarily
+    // not using macros to avoid polluting namespace of SDK unnecessarily
 
-/*! NVGSDK_RetCode success function */
-inline bool NVGSDK_SUCCEEDED(NVGSDK_RetCode r)
-{
-    return r >= 0;
-}
+    /*! NVGSDK_RetCode success function */
+    inline bool NVGSDK_SUCCEEDED(NVGSDK_RetCode r)
+    {
+        return r >= 0;
+    }
 
-/*! NVGSDK_RetCode failure function */
-inline bool NVGSDK_FAILED(NVGSDK_RetCode r)
-{
-    return r < 0;
-}
+    /*! NVGSDK_RetCode failure function */
+    inline bool NVGSDK_FAILED(NVGSDK_RetCode r)
+    {
+        return r < 0;
+    }
 
-/*! Possible values for highlight types */
-typedef enum
-{
-    /*!
-    * No tags are attached to the highlight
-    */
-    NVGSDK_HIGHLIGHT_TYPE_NONE = 0x00000000,
-    /*!
-    * Signifies direct progress towards completing the game. (e.g. completing a level)
-    */
-    NVGSDK_HIGHLIGHT_TYPE_MILESTONE = 0x00000001,
-    /*!
-    * Player accomplishment of extra challenges independent of progress in completing a game.
-    * (e.g. perfect score in a level, found the easter egg)
-    */
-    NVGSDK_HIGHLIGHT_TYPE_ACHIEVEMENT = 0x00000002,
-    /*!
-    * Event not significant in competion of game. (e.g. player kills a minion)
-    */
-    NVGSDK_HIGHLIGHT_TYPE_INCIDENT = 0x00000004,
-    /*!
-    * Change in player state, triggered by player or externally by game.
-    * (e.g. equipping a weapon)
-    */
-    NVGSDK_HIGHLIGHT_TYPE_STATE_CHANGE = 0x00000008,
-    /*!
-    * Special highlight type that does not notify the user as it happens, to avoid giving
-    * the user a competetive advantage. e.g. A game doesn't tell the user that they recorded
-    * a kill, but wants the highlight later for the user after the round is over.
-    */
-    NVGSDK_HIGHLIGHT_TYPE_UNANNOUNCED = 0x00000010,
-    //! Invalid default value
-    NVGSDK_HIGHLIGHT_TYPE_MAX = 0x00000020
-} NVGSDK_HighlightType;
+    /*! Possible values for highlight types */
+    typedef enum
+    {
+        /*!
+         * No tags are attached to the highlight
+         */
+        NVGSDK_HIGHLIGHT_TYPE_NONE = 0x00000000,
+        /*!
+         * Signifies direct progress towards completing the game. (e.g. completing a level)
+         */
+        NVGSDK_HIGHLIGHT_TYPE_MILESTONE = 0x00000001,
+        /*!
+         * Player accomplishment of extra challenges independent of progress in completing a game.
+         * (e.g. perfect score in a level, found the easter egg)
+         */
+        NVGSDK_HIGHLIGHT_TYPE_ACHIEVEMENT = 0x00000002,
+        /*!
+         * Event not significant in competion of game. (e.g. player kills a minion)
+         */
+        NVGSDK_HIGHLIGHT_TYPE_INCIDENT = 0x00000004,
+        /*!
+         * Change in player state, triggered by player or externally by game.
+         * (e.g. equipping a weapon)
+         */
+        NVGSDK_HIGHLIGHT_TYPE_STATE_CHANGE = 0x00000008,
+        /*!
+         * Special highlight type that does not notify the user as it happens, to avoid giving
+         * the user a competetive advantage. e.g. A game doesn't tell the user that they recorded
+         * a kill, but wants the highlight later for the user after the round is over.
+         */
+        NVGSDK_HIGHLIGHT_TYPE_UNANNOUNCED = 0x00000010,
+        //! Invalid default value
+        NVGSDK_HIGHLIGHT_TYPE_MAX = 0x00000020
+    } NVGSDK_HighlightType;
 
-/*! Possible significance values */
-typedef enum
-{
-    /*! No significance is attached to the highlights */
-    NVGSDK_HIGHLIGHT_SIGNIFICANCE_NONE = 0x00000000,
-    NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_BAD = 0x00000001,
-    NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_BAD = 0x00000002,
-    NVGSDK_HIGHLIGHT_SIGNIFICANCE_BAD = 0x00000004,
-    NVGSDK_HIGHLIGHT_SIGNIFICANCE_NEUTRAL = 0x00000010,
-    NVGSDK_HIGHLIGHT_SIGNIFICANCE_GOOD = 0x00000100,
-    NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_GOOD = 0x00000200,
-    NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_GOOD = 0x00000400,
+    /*! Possible significance values */
+    typedef enum
+    {
+        /*! No significance is attached to the highlights */
+        NVGSDK_HIGHLIGHT_SIGNIFICANCE_NONE = 0x00000000,
+        NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_BAD = 0x00000001,
+        NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_BAD = 0x00000002,
+        NVGSDK_HIGHLIGHT_SIGNIFICANCE_BAD = 0x00000004,
+        NVGSDK_HIGHLIGHT_SIGNIFICANCE_NEUTRAL = 0x00000010,
+        NVGSDK_HIGHLIGHT_SIGNIFICANCE_GOOD = 0x00000100,
+        NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_GOOD = 0x00000200,
+        NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_GOOD = 0x00000400,
 
-    //! Invalid default value
-    NVGSDK_HIGHLIGHT_SIGNIFICANCE_MAX = 0x00000800
-} NVGSDK_HighlightSignificance;
+        //! Invalid default value
+        NVGSDK_HIGHLIGHT_SIGNIFICANCE_MAX = 0x00000800
+    } NVGSDK_HighlightSignificance;
 
-/*! Functionality supported by the SDK and possibly requiring user permission */
-typedef enum
-{
-    NVGSDK_SCOPE_HIGHLIGHTS = 0,            //!< Scope required to access highlights information, open group summary, etc
-    NVGSDK_SCOPE_HIGHLIGHTS_VIDEO = 1,      //!< Scope required to save video highlights
-    NVGSDK_SCOPE_HIGHLIGHTS_SCREENSHOT = 2, //!< Scope required to save screenshot highlights
-    NVGSDK_SCOPE_OPS = 3,                   //!< Scope required to optimize the game
-    NVGSDK_SCOPE_MAX
-} NVGSDK_Scope;
+    /*! Functionality supported by the SDK and possibly requiring user permission */
+    typedef enum
+    {
+        NVGSDK_SCOPE_HIGHLIGHTS = 0,       //!< Scope required to access highlights information, open group summary, etc
+        NVGSDK_SCOPE_HIGHLIGHTS_VIDEO = 1, //!< Scope required to save video highlights
+        NVGSDK_SCOPE_HIGHLIGHTS_SCREENSHOT = 2, //!< Scope required to save screenshot highlights
+        NVGSDK_SCOPE_OPS = 3,                   //!< Scope required to optimize the game
+        NVGSDK_SCOPE_MAX
+    } NVGSDK_Scope;
 
-/*! Possible permissions that may be implicitly given by GFE, or explicitly decided by the user */
-typedef enum
-{
-    NVGSDK_PERMISSION_GRANTED = 0,  //!< Requested permission has been granted to the app by the user
-    NVGSDK_PERMISSION_MUST_ASK = 1, //!< Requested permission must be granted by the user.
-    NVGSDK_PERMISSION_DENIED = 2,   //!< Requested permission has been denied to the app, feature won't function
-    NVGSDK_PERMISSION_UNKNOWN = 3,  //!< Scope does not match list of known scopes. Version mismatch?
-    NVGSDK_PERMISSION_MAX
-} NVGSDK_Permission;
+    /*! Possible permissions that may be implicitly given by GFE, or explicitly decided by the user */
+    typedef enum
+    {
+        NVGSDK_PERMISSION_GRANTED = 0,  //!< Requested permission has been granted to the app by the user
+        NVGSDK_PERMISSION_MUST_ASK = 1, //!< Requested permission must be granted by the user.
+        NVGSDK_PERMISSION_DENIED = 2,   //!< Requested permission has been denied to the app, feature won't function
+        NVGSDK_PERMISSION_UNKNOWN = 3,  //!< Scope does not match list of known scopes. Version mismatch?
+        NVGSDK_PERMISSION_MAX
+    } NVGSDK_Permission;
 
-/*! State that the overlay can be in when it opens and closes */
-typedef enum
-{
-    NVGSDK_OVERLAY_STATE_MAIN,              //!< Normal overlay menu
-    NVGSDK_OVERLAY_STATE_PERMISSION,        //!< Menu that appears to ask user for permissions
-    NVGSDK_OVERLAY_STATE_HIGHLIGHTS_SUMMARY,//!< Menu that appears to show the user the highlights group summary
-    NVGSDK_OVERLAY_STATE_MAX
-} NVGSDK_OverlayState;
+    /*! State that the overlay can be in when it opens and closes */
+    typedef enum
+    {
+        NVGSDK_OVERLAY_STATE_MAIN,               //!< Normal overlay menu
+        NVGSDK_OVERLAY_STATE_PERMISSION,         //!< Menu that appears to ask user for permissions
+        NVGSDK_OVERLAY_STATE_HIGHLIGHTS_SUMMARY, //!< Menu that appears to show the user the highlights group summary
+        NVGSDK_OVERLAY_STATE_MAX
+    } NVGSDK_OverlayState;
 
-/*!
- * Converts the code returns from an NVGSDK_* API to a printable string
- */
-inline const char* NVGSDK_RetCodeToString(NVGSDK_RetCode const ret)
-{
-    switch (ret)
+    /*!
+     * Converts the code returns from an NVGSDK_* API to a printable string
+     */
+    inline const char *NVGSDK_RetCodeToString(NVGSDK_RetCode const ret)
     {
-    case NVGSDK_SUCCESS:                        return "NVGSDK_SUCCESS";
-    case NVGSDK_SUCCESS_VERSION_OLD_SDK:        return "NVGSDK_SUCCESS_VERSION_OLD_SDK";
-    case NVGSDK_SUCCESS_VERSION_OLD_GFE:        return "NVGSDK_SUCCESS_VERSION_OLD_GFE";
-    case NVGSDK_SUCCESS_PENDING:                return "NVGSDK_SUCCESS_PENDING";
-    case NVGSDK_SUCCESS_USER_NOT_INTERESTED:    return "NVGSDK_SUCCESS_USER_NOT_INTERESTED";
-    case NVGSDK_SUCCESS_PERMISSION_GRANTED:     return "NVGSDK_SUCCESS_PERMISSION_GRANTED";
-    case NVGSDK_SUCCESS_LINKED:                 return "NVGSDK_SUCCESS_LINKED";        
-    case NVGSDK_ERR_GENERIC:                    return "NVGSDK_ERR_GENERIC";
-    case NVGSDK_ERR_GFE_VERSION:                return "NVGSDK_ERR_GFE_VERSION";
-    case NVGSDK_ERR_SDK_VERSION:                return "NVGSDK_ERR_SDK_VERSION";
-    case NVGSDK_ERR_NOT_IMPLEMENTED:            return "NVGSDK_ERR_NOT_IMPLEMENTED";
-    case NVGSDK_ERR_INVALID_PARAMETER:          return "NVGSDK_ERR_INVALID_PARAMETER";
-    case NVGSDK_ERR_NOT_SET:                    return "NVGSDK_ERR_NOT_SET";
-    case NVGSDK_ERR_SHADOWPLAY_IR_DISABLED:     return "NVGSDK_ERR_SHADOWPLAY_IR_DISABLED";
-    case NVGSDK_ERR_SDK_IN_USE:                 return "NVGSDK_ERR_SDK_IN_USE";
-    case NVGSDK_ERR_GROUP_NOT_FOUND:            return "NVGSDK_ERR_GROUP_NOT_FOUND";
-    case NVGSDK_ERR_FILE_NOT_FOUND:             return "NVGSDK_ERR_FILE_NOT_FOUND";
-    case NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED:    return "NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED";
-    case NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED:  return "NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED";
-    case NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED:     return "NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED";
-    case NVGSDK_ERR_UNEXPECTED_EXCEPTION:       return "NVGSDK_ERR_UNEXPECTED_EXCEPTION";
-    case NVGSDK_ERR_NO_HIGHLIGHTS:              return "NVGSDK_ERR_NO_HIGHLIGHTS";
-    case NVGSDK_ERR_NO_CONNECTION:              return "NVGSDK_ERR_NO_CONNECTION";
-    case NVGSDK_ERR_PERMISSION_NOT_GRANTED:     return "NVGSDK_ERR_PERMISSION_NOT_GRANTED";
-    case NVGSDK_ERR_PERMISSION_DENIED:          return "NVGSDK_ERR_PERMISSION_DENIED";
-    case NVGSDK_ERR_INVALID_HANDLE:             return "NVGSDK_ERR_INVALID_HANDLE";
-    case NVGSDK_ERR_UNHANDLED_EXCEPTION:        return "NVGSDK_ERR_UNHANDLED_EXCEPTION";
-    case NVGSDK_ERR_OUT_OF_MEMORY:              return "NVGSDK_ERR_OUT_OF_MEMORY";
-    case NVGSDK_ERR_LOAD_LIBRARY:               return "NVGSDK_ERR_LOAD_LIBRARY";
-    case NVGSDK_ERR_LIB_CALL_FAILED:            return "NVGSDK_ERR_LIB_CALL_FAILED";
-    case NVGSDK_ERR_IPC_FAILED:                 return "NVGSDK_ERR_IPC_FAILED";
-    case NVGSDK_ERR_CONNECTION:                 return "NVGSDK_ERR_CONNECTION";
-    case NVGSDK_ERR_MODULE_NOT_LOADED:          return "NVGSDK_ERR_MODULE_NOT_LOADED";
-    case NVGSDK_ERR_LIB_CALL_TIMEOUT:           return "NVGSDK_ERR_LIB_CALL_TIMEOUT";
-    case NVGSDK_ERR_APPLICATION_LOOKUP_FAILED:  return "NVGSDK_ERR_APPLICATION_LOOKUP_FAILED";
-    case NVGSDK_ERR_APPLICATION_NOT_KNOWN:      return "NVGSDK_ERR_APPLICATION_NOT_KNOWN";
-    case NVGSDK_ERR_FEATURE_DISABLED:           return "NVGSDK_ERR_FEATURE_DISABLED";
-    case NVGSDK_ERR_APP_NO_OPTIMIZATION:        return "NVGSDK_ERR_APP_NO_OPTIMIZATION";
-    case NVGSDK_ERR_APP_SETTINGS_READ:          return "NVGSDK_ERR_APP_SETTINGS_READ";
-    case NVGSDK_ERR_APP_SETTINGS_WRITE:         return "NVGSDK_ERR_APP_SETTINGS_WRITE";
+        switch (ret)
+        {
+        case NVGSDK_SUCCESS:
+            return "NVGSDK_SUCCESS";
+        case NVGSDK_SUCCESS_VERSION_OLD_SDK:
+            return "NVGSDK_SUCCESS_VERSION_OLD_SDK";
+        case NVGSDK_SUCCESS_VERSION_OLD_GFE:
+            return "NVGSDK_SUCCESS_VERSION_OLD_GFE";
+        case NVGSDK_SUCCESS_PENDING:
+            return "NVGSDK_SUCCESS_PENDING";
+        case NVGSDK_SUCCESS_USER_NOT_INTERESTED:
+            return "NVGSDK_SUCCESS_USER_NOT_INTERESTED";
+        case NVGSDK_SUCCESS_PERMISSION_GRANTED:
+            return "NVGSDK_SUCCESS_PERMISSION_GRANTED";
+        case NVGSDK_SUCCESS_LINKED:
+            return "NVGSDK_SUCCESS_LINKED";
+        case NVGSDK_ERR_GENERIC:
+            return "NVGSDK_ERR_GENERIC";
+        case NVGSDK_ERR_GFE_VERSION:
+            return "NVGSDK_ERR_GFE_VERSION";
+        case NVGSDK_ERR_SDK_VERSION:
+            return "NVGSDK_ERR_SDK_VERSION";
+        case NVGSDK_ERR_NOT_IMPLEMENTED:
+            return "NVGSDK_ERR_NOT_IMPLEMENTED";
+        case NVGSDK_ERR_INVALID_PARAMETER:
+            return "NVGSDK_ERR_INVALID_PARAMETER";
+        case NVGSDK_ERR_NOT_SET:
+            return "NVGSDK_ERR_NOT_SET";
+        case NVGSDK_ERR_SHADOWPLAY_IR_DISABLED:
+            return "NVGSDK_ERR_SHADOWPLAY_IR_DISABLED";
+        case NVGSDK_ERR_SDK_IN_USE:
+            return "NVGSDK_ERR_SDK_IN_USE";
+        case NVGSDK_ERR_GROUP_NOT_FOUND:
+            return "NVGSDK_ERR_GROUP_NOT_FOUND";
+        case NVGSDK_ERR_FILE_NOT_FOUND:
+            return "NVGSDK_ERR_FILE_NOT_FOUND";
+        case NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED:
+            return "NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED";
+        case NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED:
+            return "NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED";
+        case NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED:
+            return "NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED";
+        case NVGSDK_ERR_UNEXPECTED_EXCEPTION:
+            return "NVGSDK_ERR_UNEXPECTED_EXCEPTION";
+        case NVGSDK_ERR_NO_HIGHLIGHTS:
+            return "NVGSDK_ERR_NO_HIGHLIGHTS";
+        case NVGSDK_ERR_NO_CONNECTION:
+            return "NVGSDK_ERR_NO_CONNECTION";
+        case NVGSDK_ERR_PERMISSION_NOT_GRANTED:
+            return "NVGSDK_ERR_PERMISSION_NOT_GRANTED";
+        case NVGSDK_ERR_PERMISSION_DENIED:
+            return "NVGSDK_ERR_PERMISSION_DENIED";
+        case NVGSDK_ERR_INVALID_HANDLE:
+            return "NVGSDK_ERR_INVALID_HANDLE";
+        case NVGSDK_ERR_UNHANDLED_EXCEPTION:
+            return "NVGSDK_ERR_UNHANDLED_EXCEPTION";
+        case NVGSDK_ERR_OUT_OF_MEMORY:
+            return "NVGSDK_ERR_OUT_OF_MEMORY";
+        case NVGSDK_ERR_LOAD_LIBRARY:
+            return "NVGSDK_ERR_LOAD_LIBRARY";
+        case NVGSDK_ERR_LIB_CALL_FAILED:
+            return "NVGSDK_ERR_LIB_CALL_FAILED";
+        case NVGSDK_ERR_IPC_FAILED:
+            return "NVGSDK_ERR_IPC_FAILED";
+        case NVGSDK_ERR_CONNECTION:
+            return "NVGSDK_ERR_CONNECTION";
+        case NVGSDK_ERR_MODULE_NOT_LOADED:
+            return "NVGSDK_ERR_MODULE_NOT_LOADED";
+        case NVGSDK_ERR_LIB_CALL_TIMEOUT:
+            return "NVGSDK_ERR_LIB_CALL_TIMEOUT";
+        case NVGSDK_ERR_APPLICATION_LOOKUP_FAILED:
+            return "NVGSDK_ERR_APPLICATION_LOOKUP_FAILED";
+        case NVGSDK_ERR_APPLICATION_NOT_KNOWN:
+            return "NVGSDK_ERR_APPLICATION_NOT_KNOWN";
+        case NVGSDK_ERR_FEATURE_DISABLED:
+            return "NVGSDK_ERR_FEATURE_DISABLED";
+        case NVGSDK_ERR_APP_NO_OPTIMIZATION:
+            return "NVGSDK_ERR_APP_NO_OPTIMIZATION";
+        case NVGSDK_ERR_APP_SETTINGS_READ:
+            return "NVGSDK_ERR_APP_SETTINGS_READ";
+        case NVGSDK_ERR_APP_SETTINGS_WRITE:
+            return "NVGSDK_ERR_APP_SETTINGS_WRITE";
+        case NVGSDK_ERR_HIGHLIGHT_NOT_DEFINED:
+            return "NVGSDK_ERR_HIGHLIGHT_NOT_DEFINED";
+        case NVGSDK_ERR_CAP_LIMIT_REACHED:
+            return "NVGSDK_ERR_CAP_LIMIT_REACHED";
+        case NVGSDK_ERR_DISK_LIMIT_REACHED:
+            return "NVGSDK_ERR_DISK_LIMIT_REACHED";
+        }
+        return "Unknown code";
     }
-    return "Unknown code";
-}
 
-// All alphanumeric and the hyphen
-char const VALID_GROUPID_CHARS[] = "^[a-zA-Z0-9\\-\\._ ']+$";
-wchar_t const VALID_GROUPID_WCHARS[] = L"^[a-zA-Z0-9\\-\\._ ']+$";
+    // All alphanumeric and the hyphen
+    char const VALID_GROUPID_CHARS[] = "^[a-zA-Z0-9\\-\\._ ']+$";
+    wchar_t const VALID_GROUPID_WCHARS[] = L"^[a-zA-Z0-9\\-\\._ ']+$";
 
-char const VALID_HIGHLIGHT_DEF_ID_CHARS[] = "^[a-zA-Z0-9\\-\\._ ']+$";
-wchar_t const VALID_HIGHLIGHT_DEF_ID_WCHARS[] = L"^[a-zA-Z0-9\\-\\._ ']+$";
+    char const VALID_HIGHLIGHT_DEF_ID_CHARS[] = "^[a-zA-Z0-9\\-\\._ ']+$";
+    wchar_t const VALID_HIGHLIGHT_DEF_ID_WCHARS[] = L"^[a-zA-Z0-9\\-\\._ ']+$";
 
-char const VALID_GAMENAME_CHARS[] = "^[a-zA-Z0-9\\-\\._ ']+$";
-wchar_t const VALID_GAMENAME_WCHARS[] = L"^[a-zA-Z0-9\\-\\._ ']+$";
+    char const VALID_GAMENAME_CHARS[] = "^[a-zA-Z0-9\\-\\._ ']+$";
+    wchar_t const VALID_GAMENAME_WCHARS[] = L"^[a-zA-Z0-9\\-\\._ ']+$";
 
-char const VALID_LOCALE_CODE_CHARS[] = "^[a-zA-Z\\-]+$";
-wchar_t const VALID_LOCALE_CODE_WCHARS[] = L"^[a-zA-Z\\-]+$";
+    char const VALID_LOCALE_CODE_CHARS[] = "^[a-zA-Z\\-]+$";
+    wchar_t const VALID_LOCALE_CODE_WCHARS[] = L"^[a-zA-Z\\-]+$";
 
-size_t const VALID_HIGHLIGHT_SIGNIFICANCE_WIDTH = 0x8FF;
-size_t const VALID_HIGHLIGHT_TAG_WIDTH = 0x1F;
+    size_t const VALID_HIGHLIGHT_SIGNIFICANCE_WIDTH = 0x8FF;
+    size_t const VALID_HIGHLIGHT_TAG_WIDTH = 0x1F;
 
 #ifdef __cplusplus
 }
diff --git a/lib/win32/GfeSDK.lib b/lib/win32/GfeSDK.lib
index 8be5ad8..eee0075 100644
Binary files a/lib/win32/GfeSDK.lib and b/lib/win32/GfeSDK.lib differ
diff --git a/lib/win32_uwp/GfeSDK.lib b/lib/win32_uwp/GfeSDK.lib
new file mode 100644
index 0000000..2725c13
Binary files /dev/null and b/lib/win32_uwp/GfeSDK.lib differ
diff --git a/lib/win64/GfeSDK.lib b/lib/win64/GfeSDK.lib
index eed7f0e..65e8d14 100644
Binary files a/lib/win64/GfeSDK.lib and b/lib/win64/GfeSDK.lib differ
diff --git a/lib/win64_uwp/GfeSDK.lib b/lib/win64_uwp/GfeSDK.lib
new file mode 100644
index 0000000..3cf3d39
Binary files /dev/null and b/lib/win64_uwp/GfeSDK.lib differ
diff --git a/redist/win32/GfeSDK.dll b/redist/win32/GfeSDK.dll
index b7fd915..813a5ec 100644
Binary files a/redist/win32/GfeSDK.dll and b/redist/win32/GfeSDK.dll differ
diff --git a/redist/win32_uwp/GfeSDK.dll b/redist/win32_uwp/GfeSDK.dll
new file mode 100644
index 0000000..f9a89b1
Binary files /dev/null and b/redist/win32_uwp/GfeSDK.dll differ
diff --git a/redist/win64/GfeSDK.dll b/redist/win64/GfeSDK.dll
index b8c1609..3de2740 100644
Binary files a/redist/win64/GfeSDK.dll and b/redist/win64/GfeSDK.dll differ
diff --git a/redist/win64_uwp/GfeSDK.dll b/redist/win64_uwp/GfeSDK.dll
new file mode 100644
index 0000000..66223a7
Binary files /dev/null and b/redist/win64_uwp/GfeSDK.dll differ
diff --git a/samples/DX_APIUsage/DXUT/Core/DDSTextureLoader.cpp b/samples/DX_APIUsage/DXUT/Core/DDSTextureLoader.cpp
new file mode 100644
index 0000000..3d72d9e
--- /dev/null
+++ b/samples/DX_APIUsage/DXUT/Core/DDSTextureLoader.cpp
@@ -0,0 +1,1825 @@
+//--------------------------------------------------------------------------------------
+// File: DDSTextureLoader.cpp
+//
+// Functions for loading a DDS texture and creating a Direct3D runtime resource for it
+//
+// Note these functions are useful as a light-weight runtime loader for DDS files. For
+// a full-featured DDS file reader, writer, and texture processing pipeline see
+// the 'Texconv' sample and the 'DirectXTex' library.
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248926
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#include "dxut.h"
+
+#include "DDSTextureLoader.h"
+
+#include <assert.h>
+#include <algorithm>
+#include <memory>
+
+#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
+#pragma comment(lib,"dxguid.lib")
+#endif
+
+using namespace DirectX;
+
+//--------------------------------------------------------------------------------------
+// Macros
+//--------------------------------------------------------------------------------------
+#ifndef MAKEFOURCC
+    #define MAKEFOURCC(ch0, ch1, ch2, ch3)                              \
+                ((uint32_t)(uint8_t)(ch0) | ((uint32_t)(uint8_t)(ch1) << 8) |       \
+                ((uint32_t)(uint8_t)(ch2) << 16) | ((uint32_t)(uint8_t)(ch3) << 24 ))
+#endif /* defined(MAKEFOURCC) */
+
+//--------------------------------------------------------------------------------------
+// DDS file structure definitions
+//
+// See DDS.h in the 'Texconv' sample and the 'DirectXTex' library
+//--------------------------------------------------------------------------------------
+#pragma pack(push,1)
+
+const uint32_t DDS_MAGIC = 0x20534444; // "DDS "
+
+struct DDS_PIXELFORMAT
+{
+    uint32_t    size;
+    uint32_t    flags;
+    uint32_t    fourCC;
+    uint32_t    RGBBitCount;
+    uint32_t    RBitMask;
+    uint32_t    GBitMask;
+    uint32_t    BBitMask;
+    uint32_t    ABitMask;
+};
+
+#define DDS_FOURCC      0x00000004  // DDPF_FOURCC
+#define DDS_RGB         0x00000040  // DDPF_RGB
+#define DDS_LUMINANCE   0x00020000  // DDPF_LUMINANCE
+#define DDS_ALPHA       0x00000002  // DDPF_ALPHA
+#define DDS_BUMPDUDV    0x00080000  // DDPF_BUMPDUDV
+
+#define DDS_HEADER_FLAGS_VOLUME         0x00800000  // DDSD_DEPTH
+
+#define DDS_HEIGHT 0x00000002 // DDSD_HEIGHT
+#define DDS_WIDTH  0x00000004 // DDSD_WIDTH
+
+#define DDS_CUBEMAP_POSITIVEX 0x00000600 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEX
+#define DDS_CUBEMAP_NEGATIVEX 0x00000a00 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEX
+#define DDS_CUBEMAP_POSITIVEY 0x00001200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEY
+#define DDS_CUBEMAP_NEGATIVEY 0x00002200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEY
+#define DDS_CUBEMAP_POSITIVEZ 0x00004200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEZ
+#define DDS_CUBEMAP_NEGATIVEZ 0x00008200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEZ
+
+#define DDS_CUBEMAP_ALLFACES ( DDS_CUBEMAP_POSITIVEX | DDS_CUBEMAP_NEGATIVEX |\
+                               DDS_CUBEMAP_POSITIVEY | DDS_CUBEMAP_NEGATIVEY |\
+                               DDS_CUBEMAP_POSITIVEZ | DDS_CUBEMAP_NEGATIVEZ )
+
+#define DDS_CUBEMAP 0x00000200 // DDSCAPS2_CUBEMAP
+
+enum DDS_MISC_FLAGS2
+{
+    DDS_MISC_FLAGS2_ALPHA_MODE_MASK = 0x7L,
+};
+
+struct DDS_HEADER
+{
+    uint32_t        size;
+    uint32_t        flags;
+    uint32_t        height;
+    uint32_t        width;
+    uint32_t        pitchOrLinearSize;
+    uint32_t        depth; // only if DDS_HEADER_FLAGS_VOLUME is set in flags
+    uint32_t        mipMapCount;
+    uint32_t        reserved1[11];
+    DDS_PIXELFORMAT ddspf;
+    uint32_t        caps;
+    uint32_t        caps2;
+    uint32_t        caps3;
+    uint32_t        caps4;
+    uint32_t        reserved2;
+};
+
+struct DDS_HEADER_DXT10
+{
+    DXGI_FORMAT     dxgiFormat;
+    uint32_t        resourceDimension;
+    uint32_t        miscFlag; // see D3D11_RESOURCE_MISC_FLAG
+    uint32_t        arraySize;
+    uint32_t        miscFlags2;
+};
+
+#pragma pack(pop)
+
+//--------------------------------------------------------------------------------------
+namespace
+{
+    struct handle_closer { void operator()(HANDLE h) { if (h) CloseHandle(h); } };
+
+    typedef public std::unique_ptr<void, handle_closer> ScopedHandle;
+
+    inline HANDLE safe_handle( HANDLE h ) { return (h == INVALID_HANDLE_VALUE) ? 0 : h; }
+
+    template<UINT TNameLength>
+    inline void SetDebugObjectName(_In_ ID3D11DeviceChild* resource, _In_ const char (&name)[TNameLength])
+    {
+    #if defined(_DEBUG) || defined(PROFILE)
+        resource->SetPrivateData(WKPDID_D3DDebugObjectName, TNameLength - 1, name);
+    #else
+        UNREFERENCED_PARAMETER(resource);
+        UNREFERENCED_PARAMETER(name);
+    #endif
+    }
+
+    //--------------------------------------------------------------------------------------
+    HRESULT LoadTextureDataFromFile(
+        _In_z_ const wchar_t* fileName,
+        std::unique_ptr<uint8_t[]>& ddsData,
+        const DDS_HEADER** header,
+        const uint8_t** bitData,
+        size_t* bitSize)
+    {
+        if (!header || !bitData || !bitSize)
+        {
+            return E_POINTER;
+        }
+
+        // open the file
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
+        ScopedHandle hFile(safe_handle(CreateFile2(fileName,
+            GENERIC_READ,
+            FILE_SHARE_READ,
+            OPEN_EXISTING,
+            nullptr)));
+#else
+        ScopedHandle hFile(safe_handle(CreateFileW(fileName,
+            GENERIC_READ,
+            FILE_SHARE_READ,
+            nullptr,
+            OPEN_EXISTING,
+            FILE_ATTRIBUTE_NORMAL,
+            nullptr)));
+#endif
+
+        if (!hFile)
+        {
+            return HRESULT_FROM_WIN32(GetLastError());
+        }
+
+        // Get the file size
+        FILE_STANDARD_INFO fileInfo;
+        if (!GetFileInformationByHandleEx(hFile.get(), FileStandardInfo, &fileInfo, sizeof(fileInfo)))
+        {
+            return HRESULT_FROM_WIN32(GetLastError());
+        }
+
+        // File is too big for 32-bit allocation, so reject read
+        if (fileInfo.EndOfFile.HighPart > 0)
+        {
+            return E_FAIL;
+        }
+
+        // Need at least enough data to fill the header and magic number to be a valid DDS
+        if (fileInfo.EndOfFile.LowPart < (sizeof(DDS_HEADER) + sizeof(uint32_t)))
+        {
+            return E_FAIL;
+        }
+
+        // create enough space for the file data
+        ddsData.reset(new (std::nothrow) uint8_t[fileInfo.EndOfFile.LowPart]);
+        if (!ddsData)
+        {
+            return E_OUTOFMEMORY;
+        }
+
+        // read the data in
+        DWORD BytesRead = 0;
+        if (!ReadFile(hFile.get(),
+            ddsData.get(),
+            fileInfo.EndOfFile.LowPart,
+            &BytesRead,
+            nullptr
+        ))
+        {
+            return HRESULT_FROM_WIN32(GetLastError());
+        }
+
+        if (BytesRead < fileInfo.EndOfFile.LowPart)
+        {
+            return E_FAIL;
+        }
+
+        // DDS files always start with the same magic number ("DDS ")
+        uint32_t dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
+        if (dwMagicNumber != DDS_MAGIC)
+        {
+            return E_FAIL;
+        }
+
+        auto hdr = reinterpret_cast<const DDS_HEADER*>(ddsData.get() + sizeof(uint32_t));
+
+        // Verify header to validate DDS file
+        if (hdr->size != sizeof(DDS_HEADER) ||
+            hdr->ddspf.size != sizeof(DDS_PIXELFORMAT))
+        {
+            return E_FAIL;
+        }
+
+        // Check for DX10 extension
+        bool bDXT10Header = false;
+        if ((hdr->ddspf.flags & DDS_FOURCC) &&
+            (MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
+        {
+            // Must be long enough for both headers and magic value
+            if (fileInfo.EndOfFile.LowPart < (sizeof(DDS_HEADER) + sizeof(uint32_t) + sizeof(DDS_HEADER_DXT10)))
+            {
+                return E_FAIL;
+            }
+
+            bDXT10Header = true;
+        }
+
+        // setup the pointers in the process request
+        *header = hdr;
+        ptrdiff_t offset = sizeof(uint32_t) + sizeof(DDS_HEADER)
+            + (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0);
+        *bitData = ddsData.get() + offset;
+        *bitSize = fileInfo.EndOfFile.LowPart - offset;
+
+        return S_OK;
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    // Return the BPP for a particular format
+    //--------------------------------------------------------------------------------------
+    size_t BitsPerPixel(_In_ DXGI_FORMAT fmt)
+    {
+        switch (fmt)
+        {
+        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
+        case DXGI_FORMAT_R32G32B32A32_FLOAT:
+        case DXGI_FORMAT_R32G32B32A32_UINT:
+        case DXGI_FORMAT_R32G32B32A32_SINT:
+            return 128;
+
+        case DXGI_FORMAT_R32G32B32_TYPELESS:
+        case DXGI_FORMAT_R32G32B32_FLOAT:
+        case DXGI_FORMAT_R32G32B32_UINT:
+        case DXGI_FORMAT_R32G32B32_SINT:
+            return 96;
+
+        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
+        case DXGI_FORMAT_R16G16B16A16_FLOAT:
+        case DXGI_FORMAT_R16G16B16A16_UNORM:
+        case DXGI_FORMAT_R16G16B16A16_UINT:
+        case DXGI_FORMAT_R16G16B16A16_SNORM:
+        case DXGI_FORMAT_R16G16B16A16_SINT:
+        case DXGI_FORMAT_R32G32_TYPELESS:
+        case DXGI_FORMAT_R32G32_FLOAT:
+        case DXGI_FORMAT_R32G32_UINT:
+        case DXGI_FORMAT_R32G32_SINT:
+        case DXGI_FORMAT_R32G8X24_TYPELESS:
+        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
+        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
+        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
+        case DXGI_FORMAT_Y416:
+        case DXGI_FORMAT_Y210:
+        case DXGI_FORMAT_Y216:
+            return 64;
+
+        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
+        case DXGI_FORMAT_R10G10B10A2_UNORM:
+        case DXGI_FORMAT_R10G10B10A2_UINT:
+        case DXGI_FORMAT_R11G11B10_FLOAT:
+        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
+        case DXGI_FORMAT_R8G8B8A8_UNORM:
+        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
+        case DXGI_FORMAT_R8G8B8A8_UINT:
+        case DXGI_FORMAT_R8G8B8A8_SNORM:
+        case DXGI_FORMAT_R8G8B8A8_SINT:
+        case DXGI_FORMAT_R16G16_TYPELESS:
+        case DXGI_FORMAT_R16G16_FLOAT:
+        case DXGI_FORMAT_R16G16_UNORM:
+        case DXGI_FORMAT_R16G16_UINT:
+        case DXGI_FORMAT_R16G16_SNORM:
+        case DXGI_FORMAT_R16G16_SINT:
+        case DXGI_FORMAT_R32_TYPELESS:
+        case DXGI_FORMAT_D32_FLOAT:
+        case DXGI_FORMAT_R32_FLOAT:
+        case DXGI_FORMAT_R32_UINT:
+        case DXGI_FORMAT_R32_SINT:
+        case DXGI_FORMAT_R24G8_TYPELESS:
+        case DXGI_FORMAT_D24_UNORM_S8_UINT:
+        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
+        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
+        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
+        case DXGI_FORMAT_R8G8_B8G8_UNORM:
+        case DXGI_FORMAT_G8R8_G8B8_UNORM:
+        case DXGI_FORMAT_B8G8R8A8_UNORM:
+        case DXGI_FORMAT_B8G8R8X8_UNORM:
+        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
+        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
+        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
+        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
+        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
+        case DXGI_FORMAT_AYUV:
+        case DXGI_FORMAT_Y410:
+        case DXGI_FORMAT_YUY2:
+            return 32;
+
+        case DXGI_FORMAT_P010:
+        case DXGI_FORMAT_P016:
+            return 24;
+
+        case DXGI_FORMAT_R8G8_TYPELESS:
+        case DXGI_FORMAT_R8G8_UNORM:
+        case DXGI_FORMAT_R8G8_UINT:
+        case DXGI_FORMAT_R8G8_SNORM:
+        case DXGI_FORMAT_R8G8_SINT:
+        case DXGI_FORMAT_R16_TYPELESS:
+        case DXGI_FORMAT_R16_FLOAT:
+        case DXGI_FORMAT_D16_UNORM:
+        case DXGI_FORMAT_R16_UNORM:
+        case DXGI_FORMAT_R16_UINT:
+        case DXGI_FORMAT_R16_SNORM:
+        case DXGI_FORMAT_R16_SINT:
+        case DXGI_FORMAT_B5G6R5_UNORM:
+        case DXGI_FORMAT_B5G5R5A1_UNORM:
+        case DXGI_FORMAT_A8P8:
+        case DXGI_FORMAT_B4G4R4A4_UNORM:
+            return 16;
+
+        case DXGI_FORMAT_NV12:
+        case DXGI_FORMAT_420_OPAQUE:
+        case DXGI_FORMAT_NV11:
+            return 12;
+
+        case DXGI_FORMAT_R8_TYPELESS:
+        case DXGI_FORMAT_R8_UNORM:
+        case DXGI_FORMAT_R8_UINT:
+        case DXGI_FORMAT_R8_SNORM:
+        case DXGI_FORMAT_R8_SINT:
+        case DXGI_FORMAT_A8_UNORM:
+        case DXGI_FORMAT_AI44:
+        case DXGI_FORMAT_IA44:
+        case DXGI_FORMAT_P8:
+            return 8;
+
+        case DXGI_FORMAT_R1_UNORM:
+            return 1;
+
+        case DXGI_FORMAT_BC1_TYPELESS:
+        case DXGI_FORMAT_BC1_UNORM:
+        case DXGI_FORMAT_BC1_UNORM_SRGB:
+        case DXGI_FORMAT_BC4_TYPELESS:
+        case DXGI_FORMAT_BC4_UNORM:
+        case DXGI_FORMAT_BC4_SNORM:
+            return 4;
+
+        case DXGI_FORMAT_BC2_TYPELESS:
+        case DXGI_FORMAT_BC2_UNORM:
+        case DXGI_FORMAT_BC2_UNORM_SRGB:
+        case DXGI_FORMAT_BC3_TYPELESS:
+        case DXGI_FORMAT_BC3_UNORM:
+        case DXGI_FORMAT_BC3_UNORM_SRGB:
+        case DXGI_FORMAT_BC5_TYPELESS:
+        case DXGI_FORMAT_BC5_UNORM:
+        case DXGI_FORMAT_BC5_SNORM:
+        case DXGI_FORMAT_BC6H_TYPELESS:
+        case DXGI_FORMAT_BC6H_UF16:
+        case DXGI_FORMAT_BC6H_SF16:
+        case DXGI_FORMAT_BC7_TYPELESS:
+        case DXGI_FORMAT_BC7_UNORM:
+        case DXGI_FORMAT_BC7_UNORM_SRGB:
+            return 8;
+
+        default:
+            return 0;
+        }
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    // Get surface information for a particular format
+    //--------------------------------------------------------------------------------------
+    void GetSurfaceInfo(
+        _In_ size_t width,
+        _In_ size_t height,
+        _In_ DXGI_FORMAT fmt,
+        size_t* outNumBytes,
+        _Out_opt_ size_t* outRowBytes,
+        _Out_opt_ size_t* outNumRows)
+    {
+        size_t numBytes = 0;
+        size_t rowBytes = 0;
+        size_t numRows = 0;
+
+        bool bc = false;
+        bool packed = false;
+        bool planar = false;
+        size_t bpe = 0;
+        switch (fmt)
+        {
+        case DXGI_FORMAT_BC1_TYPELESS:
+        case DXGI_FORMAT_BC1_UNORM:
+        case DXGI_FORMAT_BC1_UNORM_SRGB:
+        case DXGI_FORMAT_BC4_TYPELESS:
+        case DXGI_FORMAT_BC4_UNORM:
+        case DXGI_FORMAT_BC4_SNORM:
+            bc = true;
+            bpe = 8;
+            break;
+
+        case DXGI_FORMAT_BC2_TYPELESS:
+        case DXGI_FORMAT_BC2_UNORM:
+        case DXGI_FORMAT_BC2_UNORM_SRGB:
+        case DXGI_FORMAT_BC3_TYPELESS:
+        case DXGI_FORMAT_BC3_UNORM:
+        case DXGI_FORMAT_BC3_UNORM_SRGB:
+        case DXGI_FORMAT_BC5_TYPELESS:
+        case DXGI_FORMAT_BC5_UNORM:
+        case DXGI_FORMAT_BC5_SNORM:
+        case DXGI_FORMAT_BC6H_TYPELESS:
+        case DXGI_FORMAT_BC6H_UF16:
+        case DXGI_FORMAT_BC6H_SF16:
+        case DXGI_FORMAT_BC7_TYPELESS:
+        case DXGI_FORMAT_BC7_UNORM:
+        case DXGI_FORMAT_BC7_UNORM_SRGB:
+            bc = true;
+            bpe = 16;
+            break;
+
+        case DXGI_FORMAT_R8G8_B8G8_UNORM:
+        case DXGI_FORMAT_G8R8_G8B8_UNORM:
+        case DXGI_FORMAT_YUY2:
+            packed = true;
+            bpe = 4;
+            break;
+
+        case DXGI_FORMAT_Y210:
+        case DXGI_FORMAT_Y216:
+            packed = true;
+            bpe = 8;
+            break;
+
+        case DXGI_FORMAT_NV12:
+        case DXGI_FORMAT_420_OPAQUE:
+            planar = true;
+            bpe = 2;
+            break;
+
+        case DXGI_FORMAT_P010:
+        case DXGI_FORMAT_P016:
+            planar = true;
+            bpe = 4;
+            break;
+        }
+
+        if (bc)
+        {
+            size_t numBlocksWide = 0;
+            if (width > 0)
+            {
+                numBlocksWide = std::max<size_t>(1, (width + 3) / 4);
+            }
+            size_t numBlocksHigh = 0;
+            if (height > 0)
+            {
+                numBlocksHigh = std::max<size_t>(1, (height + 3) / 4);
+            }
+            rowBytes = numBlocksWide * bpe;
+            numRows = numBlocksHigh;
+            numBytes = rowBytes * numBlocksHigh;
+        }
+        else if (packed)
+        {
+            rowBytes = ((width + 1) >> 1) * bpe;
+            numRows = height;
+            numBytes = rowBytes * height;
+        }
+        else if (fmt == DXGI_FORMAT_NV11)
+        {
+            rowBytes = ((width + 3) >> 2) * 4;
+            numRows = height * 2; // Direct3D makes this simplifying assumption, although it is larger than the 4:1:1 data
+            numBytes = rowBytes * numRows;
+        }
+        else if (planar)
+        {
+            rowBytes = ((width + 1) >> 1) * bpe;
+            numBytes = (rowBytes * height) + ((rowBytes * height + 1) >> 1);
+            numRows = height + ((height + 1) >> 1);
+        }
+        else
+        {
+            size_t bpp = BitsPerPixel(fmt);
+            rowBytes = (width * bpp + 7) / 8; // round up to nearest byte
+            numRows = height;
+            numBytes = rowBytes * height;
+        }
+
+        if (outNumBytes)
+        {
+            *outNumBytes = numBytes;
+        }
+        if (outRowBytes)
+        {
+            *outRowBytes = rowBytes;
+        }
+        if (outNumRows)
+        {
+            *outNumRows = numRows;
+        }
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    #define ISBITMASK( r,g,b,a ) ( ddpf.RBitMask == r && ddpf.GBitMask == g && ddpf.BBitMask == b && ddpf.ABitMask == a )
+
+    DXGI_FORMAT GetDXGIFormat(const DDS_PIXELFORMAT& ddpf)
+    {
+        if (ddpf.flags & DDS_RGB)
+        {
+            // Note that sRGB formats are written using the "DX10" extended header
+
+            switch (ddpf.RGBBitCount)
+            {
+            case 32:
+                if (ISBITMASK(0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000))
+                {
+                    return DXGI_FORMAT_R8G8B8A8_UNORM;
+                }
+
+                if (ISBITMASK(0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000))
+                {
+                    return DXGI_FORMAT_B8G8R8A8_UNORM;
+                }
+
+                if (ISBITMASK(0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000))
+                {
+                    return DXGI_FORMAT_B8G8R8X8_UNORM;
+                }
+
+                // No DXGI format maps to ISBITMASK(0x000000ff,0x0000ff00,0x00ff0000,0x00000000) aka D3DFMT_X8B8G8R8
+
+                // Note that many common DDS reader/writers (including D3DX) swap the
+                // the RED/BLUE masks for 10:10:10:2 formats. We assume
+                // below that the 'backwards' header mask is being used since it is most
+                // likely written by D3DX. The more robust solution is to use the 'DX10'
+                // header extension and specify the DXGI_FORMAT_R10G10B10A2_UNORM format directly
+
+                // For 'correct' writers, this should be 0x000003ff,0x000ffc00,0x3ff00000 for RGB data
+                if (ISBITMASK(0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000))
+                {
+                    return DXGI_FORMAT_R10G10B10A2_UNORM;
+                }
+
+                // No DXGI format maps to ISBITMASK(0x000003ff,0x000ffc00,0x3ff00000,0xc0000000) aka D3DFMT_A2R10G10B10
+
+                if (ISBITMASK(0x0000ffff, 0xffff0000, 0x00000000, 0x00000000))
+                {
+                    return DXGI_FORMAT_R16G16_UNORM;
+                }
+
+                if (ISBITMASK(0xffffffff, 0x00000000, 0x00000000, 0x00000000))
+                {
+                    // Only 32-bit color channel format in D3D9 was R32F
+                    return DXGI_FORMAT_R32_FLOAT; // D3DX writes this out as a FourCC of 114
+                }
+                break;
+
+            case 24:
+                // No 24bpp DXGI formats aka D3DFMT_R8G8B8
+                break;
+
+            case 16:
+                if (ISBITMASK(0x7c00, 0x03e0, 0x001f, 0x8000))
+                {
+                    return DXGI_FORMAT_B5G5R5A1_UNORM;
+                }
+                if (ISBITMASK(0xf800, 0x07e0, 0x001f, 0x0000))
+                {
+                    return DXGI_FORMAT_B5G6R5_UNORM;
+                }
+
+                // No DXGI format maps to ISBITMASK(0x7c00,0x03e0,0x001f,0x0000) aka D3DFMT_X1R5G5B5
+
+                if (ISBITMASK(0x0f00, 0x00f0, 0x000f, 0xf000))
+                {
+                    return DXGI_FORMAT_B4G4R4A4_UNORM;
+                }
+
+                // No DXGI format maps to ISBITMASK(0x0f00,0x00f0,0x000f,0x0000) aka D3DFMT_X4R4G4B4
+
+                // No 3:3:2, 3:3:2:8, or paletted DXGI formats aka D3DFMT_A8R3G3B2, D3DFMT_R3G3B2, D3DFMT_P8, D3DFMT_A8P8, etc.
+                break;
+            }
+        }
+        else if (ddpf.flags & DDS_LUMINANCE)
+        {
+            if (8 == ddpf.RGBBitCount)
+            {
+                if (ISBITMASK(0x000000ff, 0x00000000, 0x00000000, 0x00000000))
+                {
+                    return DXGI_FORMAT_R8_UNORM; // D3DX10/11 writes this out as DX10 extension
+                }
+
+                // No DXGI format maps to ISBITMASK(0x0f,0x00,0x00,0xf0) aka D3DFMT_A4L4
+
+                if (ISBITMASK(0x000000ff, 0x00000000, 0x00000000, 0x0000ff00))
+                {
+                    return DXGI_FORMAT_R8G8_UNORM; // Some DDS writers assume the bitcount should be 8 instead of 16
+                }
+            }
+
+            if (16 == ddpf.RGBBitCount)
+            {
+                if (ISBITMASK(0x0000ffff, 0x00000000, 0x00000000, 0x00000000))
+                {
+                    return DXGI_FORMAT_R16_UNORM; // D3DX10/11 writes this out as DX10 extension
+                }
+                if (ISBITMASK(0x000000ff, 0x00000000, 0x00000000, 0x0000ff00))
+                {
+                    return DXGI_FORMAT_R8G8_UNORM; // D3DX10/11 writes this out as DX10 extension
+                }
+            }
+        }
+        else if (ddpf.flags & DDS_ALPHA)
+        {
+            if (8 == ddpf.RGBBitCount)
+            {
+                return DXGI_FORMAT_A8_UNORM;
+            }
+        }
+        else if (ddpf.flags & DDS_BUMPDUDV)
+        {
+            if (16 == ddpf.RGBBitCount)
+            {
+                if (ISBITMASK(0x00ff, 0xff00, 0x0000, 0x0000))
+                {
+                    return DXGI_FORMAT_R8G8_SNORM; // D3DX10/11 writes this out as DX10 extension
+                }
+            }
+
+            if (32 == ddpf.RGBBitCount)
+            {
+                if (ISBITMASK(0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000))
+                {
+                    return DXGI_FORMAT_R8G8B8A8_SNORM; // D3DX10/11 writes this out as DX10 extension
+                }
+                if (ISBITMASK(0x0000ffff, 0xffff0000, 0x00000000, 0x00000000))
+                {
+                    return DXGI_FORMAT_R16G16_SNORM; // D3DX10/11 writes this out as DX10 extension
+                }
+
+                // No DXGI format maps to ISBITMASK(0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000) aka D3DFMT_A2W10V10U10
+            }
+        }
+        else if (ddpf.flags & DDS_FOURCC)
+        {
+            if (MAKEFOURCC('D', 'X', 'T', '1') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_BC1_UNORM;
+            }
+            if (MAKEFOURCC('D', 'X', 'T', '3') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_BC2_UNORM;
+            }
+            if (MAKEFOURCC('D', 'X', 'T', '5') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_BC3_UNORM;
+            }
+
+            // While pre-multiplied alpha isn't directly supported by the DXGI formats,
+            // they are basically the same as these BC formats so they can be mapped
+            if (MAKEFOURCC('D', 'X', 'T', '2') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_BC2_UNORM;
+            }
+            if (MAKEFOURCC('D', 'X', 'T', '4') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_BC3_UNORM;
+            }
+
+            if (MAKEFOURCC('A', 'T', 'I', '1') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_BC4_UNORM;
+            }
+            if (MAKEFOURCC('B', 'C', '4', 'U') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_BC4_UNORM;
+            }
+            if (MAKEFOURCC('B', 'C', '4', 'S') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_BC4_SNORM;
+            }
+
+            if (MAKEFOURCC('A', 'T', 'I', '2') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_BC5_UNORM;
+            }
+            if (MAKEFOURCC('B', 'C', '5', 'U') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_BC5_UNORM;
+            }
+            if (MAKEFOURCC('B', 'C', '5', 'S') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_BC5_SNORM;
+            }
+
+            // BC6H and BC7 are written using the "DX10" extended header
+
+            if (MAKEFOURCC('R', 'G', 'B', 'G') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_R8G8_B8G8_UNORM;
+            }
+            if (MAKEFOURCC('G', 'R', 'G', 'B') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_G8R8_G8B8_UNORM;
+            }
+
+            if (MAKEFOURCC('Y', 'U', 'Y', '2') == ddpf.fourCC)
+            {
+                return DXGI_FORMAT_YUY2;
+            }
+
+            // Check for D3DFORMAT enums being set here
+            switch (ddpf.fourCC)
+            {
+            case 36: // D3DFMT_A16B16G16R16
+                return DXGI_FORMAT_R16G16B16A16_UNORM;
+
+            case 110: // D3DFMT_Q16W16V16U16
+                return DXGI_FORMAT_R16G16B16A16_SNORM;
+
+            case 111: // D3DFMT_R16F
+                return DXGI_FORMAT_R16_FLOAT;
+
+            case 112: // D3DFMT_G16R16F
+                return DXGI_FORMAT_R16G16_FLOAT;
+
+            case 113: // D3DFMT_A16B16G16R16F
+                return DXGI_FORMAT_R16G16B16A16_FLOAT;
+
+            case 114: // D3DFMT_R32F
+                return DXGI_FORMAT_R32_FLOAT;
+
+            case 115: // D3DFMT_G32R32F
+                return DXGI_FORMAT_R32G32_FLOAT;
+
+            case 116: // D3DFMT_A32B32G32R32F
+                return DXGI_FORMAT_R32G32B32A32_FLOAT;
+            }
+        }
+
+        return DXGI_FORMAT_UNKNOWN;
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    DXGI_FORMAT MakeSRGB(_In_ DXGI_FORMAT format)
+    {
+        switch (format)
+        {
+        case DXGI_FORMAT_R8G8B8A8_UNORM:
+            return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
+
+        case DXGI_FORMAT_BC1_UNORM:
+            return DXGI_FORMAT_BC1_UNORM_SRGB;
+
+        case DXGI_FORMAT_BC2_UNORM:
+            return DXGI_FORMAT_BC2_UNORM_SRGB;
+
+        case DXGI_FORMAT_BC3_UNORM:
+            return DXGI_FORMAT_BC3_UNORM_SRGB;
+
+        case DXGI_FORMAT_B8G8R8A8_UNORM:
+            return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB;
+
+        case DXGI_FORMAT_B8G8R8X8_UNORM:
+            return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB;
+
+        case DXGI_FORMAT_BC7_UNORM:
+            return DXGI_FORMAT_BC7_UNORM_SRGB;
+
+        default:
+            return format;
+        }
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    HRESULT FillInitData(
+        _In_ size_t width,
+        _In_ size_t height,
+        _In_ size_t depth,
+        _In_ size_t mipCount,
+        _In_ size_t arraySize,
+        _In_ DXGI_FORMAT format,
+        _In_ size_t maxsize,
+        _In_ size_t bitSize,
+        _In_reads_bytes_(bitSize) const uint8_t* bitData,
+        _Out_ size_t& twidth,
+        _Out_ size_t& theight,
+        _Out_ size_t& tdepth,
+        _Out_ size_t& skipMip,
+        _Out_writes_(mipCount*arraySize) D3D11_SUBRESOURCE_DATA* initData)
+    {
+        if (!bitData || !initData)
+        {
+            return E_POINTER;
+        }
+
+        skipMip = 0;
+        twidth = 0;
+        theight = 0;
+        tdepth = 0;
+
+        size_t NumBytes = 0;
+        size_t RowBytes = 0;
+        const uint8_t* pSrcBits = bitData;
+        const uint8_t* pEndBits = bitData + bitSize;
+
+        size_t index = 0;
+        for (size_t j = 0; j < arraySize; j++)
+        {
+            size_t w = width;
+            size_t h = height;
+            size_t d = depth;
+            for (size_t i = 0; i < mipCount; i++)
+            {
+                GetSurfaceInfo(w,
+                    h,
+                    format,
+                    &NumBytes,
+                    &RowBytes,
+                    nullptr
+                );
+
+                if ((mipCount <= 1) || !maxsize || (w <= maxsize && h <= maxsize && d <= maxsize))
+                {
+                    if (!twidth)
+                    {
+                        twidth = w;
+                        theight = h;
+                        tdepth = d;
+                    }
+
+                    assert(index < mipCount * arraySize);
+                    _Analysis_assume_(index < mipCount * arraySize);
+                    initData[index].pSysMem = (const void*)pSrcBits;
+                    initData[index].SysMemPitch = static_cast<UINT>(RowBytes);
+                    initData[index].SysMemSlicePitch = static_cast<UINT>(NumBytes);
+                    ++index;
+                }
+                else if (!j)
+                {
+                    // Count number of skipped mipmaps (first item only)
+                    ++skipMip;
+                }
+
+                if (pSrcBits + (NumBytes*d) > pEndBits)
+                {
+                    return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF);
+                }
+
+                pSrcBits += NumBytes * d;
+
+                w = w >> 1;
+                h = h >> 1;
+                d = d >> 1;
+                if (w == 0)
+                {
+                    w = 1;
+                }
+                if (h == 0)
+                {
+                    h = 1;
+                }
+                if (d == 0)
+                {
+                    d = 1;
+                }
+            }
+        }
+
+        return (index > 0) ? S_OK : E_FAIL;
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    HRESULT CreateD3DResources(
+        _In_ ID3D11Device* d3dDevice,
+        _In_ uint32_t resDim,
+        _In_ size_t width,
+        _In_ size_t height,
+        _In_ size_t depth,
+        _In_ size_t mipCount,
+        _In_ size_t arraySize,
+        _In_ DXGI_FORMAT format,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ bool forceSRGB,
+        _In_ bool isCubeMap,
+        _In_reads_opt_(mipCount*arraySize) D3D11_SUBRESOURCE_DATA* initData,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView)
+    {
+        if (!d3dDevice)
+            return E_POINTER;
+
+        HRESULT hr = E_FAIL;
+
+        if (forceSRGB)
+        {
+            format = MakeSRGB(format);
+        }
+
+        switch (resDim)
+        {
+        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
+        {
+            D3D11_TEXTURE1D_DESC desc;
+            desc.Width = static_cast<UINT>(width);
+            desc.MipLevels = static_cast<UINT>(mipCount);
+            desc.ArraySize = static_cast<UINT>(arraySize);
+            desc.Format = format;
+            desc.Usage = usage;
+            desc.BindFlags = bindFlags;
+            desc.CPUAccessFlags = cpuAccessFlags;
+            desc.MiscFlags = miscFlags & ~D3D11_RESOURCE_MISC_TEXTURECUBE;
+
+            ID3D11Texture1D* tex = nullptr;
+            hr = d3dDevice->CreateTexture1D(&desc,
+                initData,
+                &tex
+            );
+            if (SUCCEEDED(hr) && tex != 0)
+            {
+                if (textureView != 0)
+                {
+                    D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc = {};
+                    SRVDesc.Format = format;
+
+                    if (arraySize > 1)
+                    {
+                        SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1DARRAY;
+                        SRVDesc.Texture1DArray.MipLevels = (!mipCount) ? -1 : desc.MipLevels;
+                        SRVDesc.Texture1DArray.ArraySize = static_cast<UINT>(arraySize);
+                    }
+                    else
+                    {
+                        SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1D;
+                        SRVDesc.Texture1D.MipLevels = (!mipCount) ? -1 : desc.MipLevels;
+                    }
+
+                    hr = d3dDevice->CreateShaderResourceView(tex,
+                        &SRVDesc,
+                        textureView
+                    );
+                    if (FAILED(hr))
+                    {
+                        tex->Release();
+                        return hr;
+                    }
+                }
+
+                if (texture != 0)
+                {
+                    *texture = tex;
+                }
+                else
+                {
+                    SetDebugObjectName(tex, "DDSTextureLoader");
+                    tex->Release();
+                }
+            }
+        }
+        break;
+
+        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
+        {
+            D3D11_TEXTURE2D_DESC desc;
+            desc.Width = static_cast<UINT>(width);
+            desc.Height = static_cast<UINT>(height);
+            desc.MipLevels = static_cast<UINT>(mipCount);
+            desc.ArraySize = static_cast<UINT>(arraySize);
+            desc.Format = format;
+            desc.SampleDesc.Count = 1;
+            desc.SampleDesc.Quality = 0;
+            desc.Usage = usage;
+            desc.BindFlags = bindFlags;
+            desc.CPUAccessFlags = cpuAccessFlags;
+            if (isCubeMap)
+            {
+                desc.MiscFlags = miscFlags | D3D11_RESOURCE_MISC_TEXTURECUBE;
+            }
+            else
+            {
+                desc.MiscFlags = miscFlags & ~D3D11_RESOURCE_MISC_TEXTURECUBE;
+            }
+
+            ID3D11Texture2D* tex = nullptr;
+            hr = d3dDevice->CreateTexture2D(&desc,
+                initData,
+                &tex
+            );
+            if (SUCCEEDED(hr) && tex != 0)
+            {
+                if (textureView != 0)
+                {
+                    D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc = {};
+                    SRVDesc.Format = format;
+
+                    if (isCubeMap)
+                    {
+                        if (arraySize > 6)
+                        {
+                            SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBEARRAY;
+                            SRVDesc.TextureCubeArray.MipLevels = (!mipCount) ? -1 : desc.MipLevels;
+
+                            // Earlier we set arraySize to (NumCubes * 6)
+                            SRVDesc.TextureCubeArray.NumCubes = static_cast<UINT>(arraySize / 6);
+                        }
+                        else
+                        {
+                            SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE;
+                            SRVDesc.TextureCube.MipLevels = (!mipCount) ? -1 : desc.MipLevels;
+                        }
+                    }
+                    else if (arraySize > 1)
+                    {
+                        SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
+                        SRVDesc.Texture2DArray.MipLevels = (!mipCount) ? -1 : desc.MipLevels;
+                        SRVDesc.Texture2DArray.ArraySize = static_cast<UINT>(arraySize);
+                    }
+                    else
+                    {
+                        SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
+                        SRVDesc.Texture2D.MipLevels = (!mipCount) ? -1 : desc.MipLevels;
+                    }
+
+                    hr = d3dDevice->CreateShaderResourceView(tex,
+                        &SRVDesc,
+                        textureView
+                    );
+                    if (FAILED(hr))
+                    {
+                        tex->Release();
+                        return hr;
+                    }
+                }
+
+                if (texture != 0)
+                {
+                    *texture = tex;
+                }
+                else
+                {
+                    SetDebugObjectName(tex, "DDSTextureLoader");
+                    tex->Release();
+                }
+            }
+        }
+        break;
+
+        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
+        {
+            D3D11_TEXTURE3D_DESC desc;
+            desc.Width = static_cast<UINT>(width);
+            desc.Height = static_cast<UINT>(height);
+            desc.Depth = static_cast<UINT>(depth);
+            desc.MipLevels = static_cast<UINT>(mipCount);
+            desc.Format = format;
+            desc.Usage = usage;
+            desc.BindFlags = bindFlags;
+            desc.CPUAccessFlags = cpuAccessFlags;
+            desc.MiscFlags = miscFlags & ~D3D11_RESOURCE_MISC_TEXTURECUBE;
+
+            ID3D11Texture3D* tex = nullptr;
+            hr = d3dDevice->CreateTexture3D(&desc,
+                initData,
+                &tex
+            );
+            if (SUCCEEDED(hr) && tex != 0)
+            {
+                if (textureView != 0)
+                {
+                    D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc = {};
+                    SRVDesc.Format = format;
+
+                    SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
+                    SRVDesc.Texture3D.MipLevels = (!mipCount) ? -1 : desc.MipLevels;
+
+                    hr = d3dDevice->CreateShaderResourceView(tex,
+                        &SRVDesc,
+                        textureView
+                    );
+                    if (FAILED(hr))
+                    {
+                        tex->Release();
+                        return hr;
+                    }
+                }
+
+                if (texture != 0)
+                {
+                    *texture = tex;
+                }
+                else
+                {
+                    SetDebugObjectName(tex, "DDSTextureLoader");
+                    tex->Release();
+                }
+            }
+        }
+        break;
+        }
+
+        return hr;
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    HRESULT CreateTextureFromDDS(
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+        _In_ const DDS_HEADER* header,
+        _In_reads_bytes_(bitSize) const uint8_t* bitData,
+        _In_ size_t bitSize,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ bool forceSRGB,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView)
+    {
+        HRESULT hr = S_OK;
+
+        UINT width = header->width;
+        UINT height = header->height;
+        UINT depth = header->depth;
+
+        uint32_t resDim = D3D11_RESOURCE_DIMENSION_UNKNOWN;
+        UINT arraySize = 1;
+        DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN;
+        bool isCubeMap = false;
+
+        size_t mipCount = header->mipMapCount;
+        if (0 == mipCount)
+        {
+            mipCount = 1;
+        }
+
+        if ((header->ddspf.flags & DDS_FOURCC) &&
+            (MAKEFOURCC('D', 'X', '1', '0') == header->ddspf.fourCC))
+        {
+            auto d3d10ext = reinterpret_cast<const DDS_HEADER_DXT10*>((const char*)header + sizeof(DDS_HEADER));
+
+            arraySize = d3d10ext->arraySize;
+            if (arraySize == 0)
+            {
+                return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+            }
+
+            switch (d3d10ext->dxgiFormat)
+            {
+            case DXGI_FORMAT_AI44:
+            case DXGI_FORMAT_IA44:
+            case DXGI_FORMAT_P8:
+            case DXGI_FORMAT_A8P8:
+                return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+
+            default:
+                if (BitsPerPixel(d3d10ext->dxgiFormat) == 0)
+                {
+                    return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+                }
+            }
+
+            format = d3d10ext->dxgiFormat;
+
+            switch (d3d10ext->resourceDimension)
+            {
+            case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
+                // D3DX writes 1D textures with a fixed Height of 1
+                if ((header->flags & DDS_HEIGHT) && height != 1)
+                {
+                    return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+                }
+                height = depth = 1;
+                break;
+
+            case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
+                if (d3d10ext->miscFlag & D3D11_RESOURCE_MISC_TEXTURECUBE)
+                {
+                    arraySize *= 6;
+                    isCubeMap = true;
+                }
+                depth = 1;
+                break;
+
+            case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
+                if (!(header->flags & DDS_HEADER_FLAGS_VOLUME))
+                {
+                    return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+                }
+
+                if (arraySize > 1)
+                {
+                    return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+                }
+                break;
+
+            default:
+                return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+            }
+
+            resDim = d3d10ext->resourceDimension;
+        }
+        else
+        {
+            format = GetDXGIFormat(header->ddspf);
+
+            if (format == DXGI_FORMAT_UNKNOWN)
+            {
+                return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+            }
+
+            if (header->flags & DDS_HEADER_FLAGS_VOLUME)
+            {
+                resDim = D3D11_RESOURCE_DIMENSION_TEXTURE3D;
+            }
+            else
+            {
+                if (header->caps2 & DDS_CUBEMAP)
+                {
+                    // We require all six faces to be defined
+                    if ((header->caps2 & DDS_CUBEMAP_ALLFACES) != DDS_CUBEMAP_ALLFACES)
+                    {
+                        return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+                    }
+
+                    arraySize = 6;
+                    isCubeMap = true;
+                }
+
+                depth = 1;
+                resDim = D3D11_RESOURCE_DIMENSION_TEXTURE2D;
+
+                // Note there's no way for a legacy Direct3D 9 DDS to express a '1D' texture
+            }
+
+            assert(BitsPerPixel(format) != 0);
+        }
+
+        // Bound sizes (for security purposes we don't trust DDS file metadata larger than the D3D 11.x hardware requirements)
+        if (mipCount > D3D11_REQ_MIP_LEVELS)
+        {
+            return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+        }
+
+        switch (resDim)
+        {
+        case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
+            if ((arraySize > D3D11_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION) ||
+                (width > D3D11_REQ_TEXTURE1D_U_DIMENSION))
+            {
+                return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+            }
+            break;
+
+        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
+            if (isCubeMap)
+            {
+                // This is the right bound because we set arraySize to (NumCubes*6) above
+                if ((arraySize > D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION) ||
+                    (width > D3D11_REQ_TEXTURECUBE_DIMENSION) ||
+                    (height > D3D11_REQ_TEXTURECUBE_DIMENSION))
+                {
+                    return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+                }
+            }
+            else if ((arraySize > D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION) ||
+                (width > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION) ||
+                (height > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION))
+            {
+                return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+            }
+            break;
+
+        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
+            if ((arraySize > 1) ||
+                (width > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION) ||
+                (height > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION) ||
+                (depth > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION))
+            {
+                return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+            }
+            break;
+
+        default:
+            return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+        }
+
+        bool autogen = false;
+        if (mipCount == 1 && d3dContext != 0 && textureView != 0) // Must have context and shader-view to auto generate mipmaps
+        {
+            // See if format is supported for auto-gen mipmaps (varies by feature level)
+            UINT fmtSupport = 0;
+            hr = d3dDevice->CheckFormatSupport(format, &fmtSupport);
+            if (SUCCEEDED(hr) && (fmtSupport & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN))
+            {
+                // 10level9 feature levels do not support auto-gen mipgen for volume textures
+                if ((resDim != D3D11_RESOURCE_DIMENSION_TEXTURE3D)
+                    || (d3dDevice->GetFeatureLevel() >= D3D_FEATURE_LEVEL_10_0))
+                {
+                    autogen = true;
+                }
+            }
+        }
+
+        if (autogen)
+        {
+            // Create texture with auto-generated mipmaps
+            ID3D11Resource* tex = nullptr;
+            hr = CreateD3DResources(d3dDevice, resDim, width, height, depth, 0, arraySize,
+                format, usage,
+                bindFlags | D3D11_BIND_RENDER_TARGET,
+                cpuAccessFlags,
+                miscFlags | D3D11_RESOURCE_MISC_GENERATE_MIPS, forceSRGB,
+                isCubeMap, nullptr, &tex, textureView);
+            if (SUCCEEDED(hr))
+            {
+                size_t numBytes = 0;
+                size_t rowBytes = 0;
+                GetSurfaceInfo(width, height, format, &numBytes, &rowBytes, nullptr);
+
+                if (numBytes > bitSize)
+                {
+                    (*textureView)->Release();
+                    *textureView = nullptr;
+                    tex->Release();
+                    return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF);
+                }
+
+                D3D11_SHADER_RESOURCE_VIEW_DESC desc;
+                (*textureView)->GetDesc(&desc);
+
+                UINT mipLevels = 1;
+
+                switch (desc.ViewDimension)
+                {
+                case D3D_SRV_DIMENSION_TEXTURE1D:       mipLevels = desc.Texture1D.MipLevels; break;
+                case D3D_SRV_DIMENSION_TEXTURE1DARRAY:  mipLevels = desc.Texture1DArray.MipLevels; break;
+                case D3D_SRV_DIMENSION_TEXTURE2D:       mipLevels = desc.Texture2D.MipLevels; break;
+                case D3D_SRV_DIMENSION_TEXTURE2DARRAY:  mipLevels = desc.Texture2DArray.MipLevels; break;
+                case D3D_SRV_DIMENSION_TEXTURECUBE:     mipLevels = desc.TextureCube.MipLevels; break;
+                case D3D_SRV_DIMENSION_TEXTURECUBEARRAY:mipLevels = desc.TextureCubeArray.MipLevels; break;
+                case D3D_SRV_DIMENSION_TEXTURE3D:       mipLevels = desc.Texture3D.MipLevels; break;
+                default:
+                    (*textureView)->Release();
+                    *textureView = nullptr;
+                    tex->Release();
+                    return E_UNEXPECTED;
+                }
+
+                if (arraySize > 1)
+                {
+                    const uint8_t* pSrcBits = bitData;
+                    const uint8_t* pEndBits = bitData + bitSize;
+                    for (UINT item = 0; item < arraySize; ++item)
+                    {
+                        if ((pSrcBits + numBytes) > pEndBits)
+                        {
+                            (*textureView)->Release();
+                            *textureView = nullptr;
+                            tex->Release();
+                            return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF);
+                        }
+
+                        UINT res = D3D11CalcSubresource(0, item, mipLevels);
+                        d3dContext->UpdateSubresource(tex, res, nullptr, pSrcBits, static_cast<UINT>(rowBytes), static_cast<UINT>(numBytes));
+                        pSrcBits += numBytes;
+                    }
+                }
+                else
+                {
+                    d3dContext->UpdateSubresource(tex, 0, nullptr, bitData, static_cast<UINT>(rowBytes), static_cast<UINT>(numBytes));
+                }
+
+                d3dContext->GenerateMips(*textureView);
+
+                if (texture)
+                {
+                    *texture = tex;
+                }
+                else
+                {
+                    tex->Release();
+                }
+            }
+        }
+        else
+        {
+            // Create the texture
+            std::unique_ptr<D3D11_SUBRESOURCE_DATA[]> initData(new (std::nothrow) D3D11_SUBRESOURCE_DATA[mipCount * arraySize]);
+            if (!initData)
+            {
+                return E_OUTOFMEMORY;
+            }
+
+            size_t skipMip = 0;
+            size_t twidth = 0;
+            size_t theight = 0;
+            size_t tdepth = 0;
+            hr = FillInitData(width, height, depth, mipCount, arraySize, format, maxsize, bitSize, bitData,
+                twidth, theight, tdepth, skipMip, initData.get());
+
+            if (SUCCEEDED(hr))
+            {
+                hr = CreateD3DResources(d3dDevice, resDim, twidth, theight, tdepth, mipCount - skipMip, arraySize,
+                    format, usage, bindFlags, cpuAccessFlags, miscFlags, forceSRGB,
+                    isCubeMap, initData.get(), texture, textureView);
+
+                if (FAILED(hr) && !maxsize && (mipCount > 1))
+                {
+                    // Retry with a maxsize determined by feature level
+                    switch (d3dDevice->GetFeatureLevel())
+                    {
+                    case D3D_FEATURE_LEVEL_9_1:
+                    case D3D_FEATURE_LEVEL_9_2:
+                        if (isCubeMap)
+                        {
+                            maxsize = 512 /*D3D_FL9_1_REQ_TEXTURECUBE_DIMENSION*/;
+                        }
+                        else
+                        {
+                            maxsize = (resDim == D3D11_RESOURCE_DIMENSION_TEXTURE3D)
+                                ? 256 /*D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION*/
+                                : 2048 /*D3D_FL9_1_REQ_TEXTURE2D_U_OR_V_DIMENSION*/;
+                        }
+                        break;
+
+                    case D3D_FEATURE_LEVEL_9_3:
+                        maxsize = (resDim == D3D11_RESOURCE_DIMENSION_TEXTURE3D)
+                            ? 256 /*D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION*/
+                            : 4096 /*D3D_FL9_3_REQ_TEXTURE2D_U_OR_V_DIMENSION*/;
+                        break;
+
+                    default: // D3D_FEATURE_LEVEL_10_0 & D3D_FEATURE_LEVEL_10_1
+                        maxsize = (resDim == D3D11_RESOURCE_DIMENSION_TEXTURE3D)
+                            ? 2048 /*D3D10_REQ_TEXTURE3D_U_V_OR_W_DIMENSION*/
+                            : 8192 /*D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION*/;
+                        break;
+                    }
+
+                    hr = FillInitData(width, height, depth, mipCount, arraySize, format, maxsize, bitSize, bitData,
+                        twidth, theight, tdepth, skipMip, initData.get());
+                    if (SUCCEEDED(hr))
+                    {
+                        hr = CreateD3DResources(d3dDevice, resDim, twidth, theight, tdepth, mipCount - skipMip, arraySize,
+                            format, usage, bindFlags, cpuAccessFlags, miscFlags, forceSRGB,
+                            isCubeMap, initData.get(), texture, textureView);
+                    }
+                }
+            }
+        }
+
+        return hr;
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    DDS_ALPHA_MODE GetAlphaMode(_In_ const DDS_HEADER* header)
+    {
+        if (header->ddspf.flags & DDS_FOURCC)
+        {
+            if (MAKEFOURCC('D', 'X', '1', '0') == header->ddspf.fourCC)
+            {
+                auto d3d10ext = reinterpret_cast<const DDS_HEADER_DXT10*>((const char*)header + sizeof(DDS_HEADER));
+                auto mode = static_cast<DDS_ALPHA_MODE>(d3d10ext->miscFlags2 & DDS_MISC_FLAGS2_ALPHA_MODE_MASK);
+                switch (mode)
+                {
+                case DDS_ALPHA_MODE_STRAIGHT:
+                case DDS_ALPHA_MODE_PREMULTIPLIED:
+                case DDS_ALPHA_MODE_OPAQUE:
+                case DDS_ALPHA_MODE_CUSTOM:
+                    return mode;
+                }
+            }
+            else if ((MAKEFOURCC('D', 'X', 'T', '2') == header->ddspf.fourCC)
+                || (MAKEFOURCC('D', 'X', 'T', '4') == header->ddspf.fourCC))
+            {
+                return DDS_ALPHA_MODE_PREMULTIPLIED;
+            }
+        }
+
+        return DDS_ALPHA_MODE_UNKNOWN;
+    }
+} // anonymous namespace
+
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+HRESULT DirectX::CreateDDSTextureFromMemory(ID3D11Device* d3dDevice,
+    const uint8_t* ddsData,
+    size_t ddsDataSize,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    size_t maxsize,
+    DDS_ALPHA_MODE* alphaMode)
+{
+    return CreateDDSTextureFromMemoryEx(d3dDevice, nullptr, ddsData, ddsDataSize, maxsize,
+        D3D11_USAGE_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0, 0, false,
+        texture, textureView, alphaMode);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateDDSTextureFromMemory(ID3D11Device* d3dDevice,
+    ID3D11DeviceContext* d3dContext,
+    const uint8_t* ddsData,
+    size_t ddsDataSize,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    size_t maxsize,
+    DDS_ALPHA_MODE* alphaMode)
+{
+    return CreateDDSTextureFromMemoryEx(d3dDevice, d3dContext, ddsData, ddsDataSize, maxsize,
+        D3D11_USAGE_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0, 0, false,
+        texture, textureView, alphaMode);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateDDSTextureFromMemoryEx(ID3D11Device* d3dDevice,
+    const uint8_t* ddsData,
+    size_t ddsDataSize,
+    size_t maxsize,
+    D3D11_USAGE usage,
+    unsigned int bindFlags,
+    unsigned int cpuAccessFlags,
+    unsigned int miscFlags,
+    bool forceSRGB,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    DDS_ALPHA_MODE* alphaMode)
+{
+    return CreateDDSTextureFromMemoryEx(d3dDevice, nullptr, ddsData, ddsDataSize, maxsize,
+        usage, bindFlags, cpuAccessFlags, miscFlags, forceSRGB,
+        texture, textureView, alphaMode);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateDDSTextureFromMemoryEx(ID3D11Device* d3dDevice,
+    ID3D11DeviceContext* d3dContext,
+    const uint8_t* ddsData,
+    size_t ddsDataSize,
+    size_t maxsize,
+    D3D11_USAGE usage,
+    unsigned int bindFlags,
+    unsigned int cpuAccessFlags,
+    unsigned int miscFlags,
+    bool forceSRGB,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    DDS_ALPHA_MODE* alphaMode)
+{
+    if (texture)
+    {
+        *texture = nullptr;
+    }
+    if (textureView)
+    {
+        *textureView = nullptr;
+    }
+    if (alphaMode)
+    {
+        *alphaMode = DDS_ALPHA_MODE_UNKNOWN;
+    }
+
+    if (!d3dDevice || !ddsData || (!texture && !textureView))
+    {
+        return E_INVALIDARG;
+    }
+
+    // Validate DDS file in memory
+    if (ddsDataSize < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
+    {
+        return E_FAIL;
+    }
+
+    uint32_t dwMagicNumber = *(const uint32_t*)(ddsData);
+    if (dwMagicNumber != DDS_MAGIC)
+    {
+        return E_FAIL;
+    }
+
+    auto header = reinterpret_cast<const DDS_HEADER*>(ddsData + sizeof(uint32_t));
+
+    // Verify header to validate DDS file
+    if (header->size != sizeof(DDS_HEADER) ||
+        header->ddspf.size != sizeof(DDS_PIXELFORMAT))
+    {
+        return E_FAIL;
+    }
+
+    // Check for DX10 extension
+    bool bDXT10Header = false;
+    if ((header->ddspf.flags & DDS_FOURCC) &&
+        (MAKEFOURCC('D', 'X', '1', '0') == header->ddspf.fourCC))
+    {
+        // Must be long enough for both headers and magic value
+        if (ddsDataSize < (sizeof(DDS_HEADER) + sizeof(uint32_t) + sizeof(DDS_HEADER_DXT10)))
+        {
+            return E_FAIL;
+        }
+
+        bDXT10Header = true;
+    }
+
+    ptrdiff_t offset = sizeof(uint32_t)
+        + sizeof(DDS_HEADER)
+        + (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0);
+
+    HRESULT hr = CreateTextureFromDDS(d3dDevice, d3dContext, header,
+        ddsData + offset, ddsDataSize - offset, maxsize,
+        usage, bindFlags, cpuAccessFlags, miscFlags, forceSRGB,
+        texture, textureView);
+    if (SUCCEEDED(hr))
+    {
+        if (texture != 0 && *texture != 0)
+        {
+            SetDebugObjectName(*texture, "DDSTextureLoader");
+        }
+
+        if (textureView != 0 && *textureView != 0)
+        {
+            SetDebugObjectName(*textureView, "DDSTextureLoader");
+        }
+
+        if (alphaMode)
+            *alphaMode = GetAlphaMode(header);
+    }
+
+    return hr;
+}
+
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+HRESULT DirectX::CreateDDSTextureFromFile(ID3D11Device* d3dDevice,
+    const wchar_t* fileName,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    size_t maxsize,
+    DDS_ALPHA_MODE* alphaMode)
+{
+    return CreateDDSTextureFromFileEx(d3dDevice, nullptr, fileName, maxsize,
+        D3D11_USAGE_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0, 0, false,
+        texture, textureView, alphaMode);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateDDSTextureFromFile(ID3D11Device* d3dDevice,
+    ID3D11DeviceContext* d3dContext,
+    const wchar_t* fileName,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    size_t maxsize,
+    DDS_ALPHA_MODE* alphaMode)
+{
+    return CreateDDSTextureFromFileEx(d3dDevice, d3dContext, fileName, maxsize,
+        D3D11_USAGE_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0, 0, false,
+        texture, textureView, alphaMode);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateDDSTextureFromFileEx(ID3D11Device* d3dDevice,
+    const wchar_t* fileName,
+    size_t maxsize,
+    D3D11_USAGE usage,
+    unsigned int bindFlags,
+    unsigned int cpuAccessFlags,
+    unsigned int miscFlags,
+    bool forceSRGB,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    DDS_ALPHA_MODE* alphaMode)
+{
+    return CreateDDSTextureFromFileEx(d3dDevice, nullptr, fileName, maxsize,
+        usage, bindFlags, cpuAccessFlags, miscFlags, forceSRGB,
+        texture, textureView, alphaMode);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateDDSTextureFromFileEx(ID3D11Device* d3dDevice,
+    ID3D11DeviceContext* d3dContext,
+    const wchar_t* fileName,
+    size_t maxsize,
+    D3D11_USAGE usage,
+    unsigned int bindFlags,
+    unsigned int cpuAccessFlags,
+    unsigned int miscFlags,
+    bool forceSRGB,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    DDS_ALPHA_MODE* alphaMode)
+{
+    if (texture)
+    {
+        *texture = nullptr;
+    }
+    if (textureView)
+    {
+        *textureView = nullptr;
+    }
+    if (alphaMode)
+    {
+        *alphaMode = DDS_ALPHA_MODE_UNKNOWN;
+    }
+
+    if (!d3dDevice || !fileName || (!texture && !textureView))
+    {
+        return E_INVALIDARG;
+    }
+
+    const DDS_HEADER* header = nullptr;
+    const uint8_t* bitData = nullptr;
+    size_t bitSize = 0;
+
+    std::unique_ptr<uint8_t[]> ddsData;
+    HRESULT hr = LoadTextureDataFromFile(fileName,
+        ddsData,
+        &header,
+        &bitData,
+        &bitSize
+    );
+    if (FAILED(hr))
+    {
+        return hr;
+    }
+
+    hr = CreateTextureFromDDS(d3dDevice, d3dContext, header,
+        bitData, bitSize, maxsize,
+        usage, bindFlags, cpuAccessFlags, miscFlags, forceSRGB,
+        texture, textureView);
+
+    if (SUCCEEDED(hr))
+    {
+#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
+        if (texture != 0 || textureView != 0)
+        {
+            CHAR strFileA[MAX_PATH];
+            int result = WideCharToMultiByte(CP_ACP,
+                WC_NO_BEST_FIT_CHARS,
+                fileName,
+                -1,
+                strFileA,
+                MAX_PATH,
+                nullptr,
+                FALSE
+            );
+            if (result > 0)
+            {
+                const CHAR* pstrName = strrchr(strFileA, '\\');
+                if (!pstrName)
+                {
+                    pstrName = strFileA;
+                }
+                else
+                {
+                    pstrName++;
+                }
+
+                if (texture != 0 && *texture != 0)
+                {
+                    (*texture)->SetPrivateData(WKPDID_D3DDebugObjectName,
+                        static_cast<UINT>(strnlen_s(pstrName, MAX_PATH)),
+                        pstrName
+                    );
+                }
+
+                if (textureView != 0 && *textureView != 0)
+                {
+                    (*textureView)->SetPrivateData(WKPDID_D3DDebugObjectName,
+                        static_cast<UINT>(strnlen_s(pstrName, MAX_PATH)),
+                        pstrName
+                    );
+                }
+            }
+        }
+#endif
+
+        if (alphaMode)
+            *alphaMode = GetAlphaMode(header);
+    }
+
+    return hr;
+}
diff --git a/samples/DX_APIUsage/DXUT/Core/DDSTextureLoader.h b/samples/DX_APIUsage/DXUT/Core/DDSTextureLoader.h
new file mode 100644
index 0000000..0b5cb19
--- /dev/null
+++ b/samples/DX_APIUsage/DXUT/Core/DDSTextureLoader.h
@@ -0,0 +1,129 @@
+//--------------------------------------------------------------------------------------
+// File: DDSTextureLoader.h
+//
+// Functions for loading a DDS texture and creating a Direct3D runtime resource for it
+//
+// Note these functions are useful as a light-weight runtime loader for DDS files. For
+// a full-featured DDS file reader, writer, and texture processing pipeline see
+// the 'Texconv' sample and the 'DirectXTex' library.
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248926
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#include <d3d11_1.h>
+#include <stdint.h>
+
+
+namespace DirectX
+{
+    enum DDS_ALPHA_MODE
+    {
+        DDS_ALPHA_MODE_UNKNOWN       = 0,
+        DDS_ALPHA_MODE_STRAIGHT      = 1,
+        DDS_ALPHA_MODE_PREMULTIPLIED = 2,
+        DDS_ALPHA_MODE_OPAQUE        = 3,
+        DDS_ALPHA_MODE_CUSTOM        = 4,
+    };
+
+    // Standard version
+    HRESULT CreateDDSTextureFromMemory(
+        _In_ ID3D11Device* d3dDevice,
+        _In_reads_bytes_(ddsDataSize) const uint8_t* ddsData,
+        _In_ size_t ddsDataSize,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
+
+    HRESULT CreateDDSTextureFromFile(
+        _In_ ID3D11Device* d3dDevice,
+        _In_z_ const wchar_t* szFileName,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
+
+    // Standard version with optional auto-gen mipmap support
+    HRESULT CreateDDSTextureFromMemory(
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+        _In_reads_bytes_(ddsDataSize) const uint8_t* ddsData,
+        _In_ size_t ddsDataSize,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
+
+    HRESULT CreateDDSTextureFromFile(
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+        _In_z_ const wchar_t* szFileName,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
+
+    // Extended version
+    HRESULT CreateDDSTextureFromMemoryEx(
+        _In_ ID3D11Device* d3dDevice,
+        _In_reads_bytes_(ddsDataSize) const uint8_t* ddsData,
+        _In_ size_t ddsDataSize,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ bool forceSRGB,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
+
+    HRESULT CreateDDSTextureFromFileEx(
+        _In_ ID3D11Device* d3dDevice,
+        _In_z_ const wchar_t* szFileName,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ bool forceSRGB,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
+
+    // Extended version with optional auto-gen mipmap support
+    HRESULT CreateDDSTextureFromMemoryEx(
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+        _In_reads_bytes_(ddsDataSize) const uint8_t* ddsData,
+        _In_ size_t ddsDataSize,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ bool forceSRGB,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
+
+    HRESULT CreateDDSTextureFromFileEx(
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+        _In_z_ const wchar_t* szFileName,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ bool forceSRGB,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
+}
\ No newline at end of file
diff --git a/samples/DX_APIUsage/DXUT/Core/DXUT.cpp b/samples/DX_APIUsage/DXUT/Core/DXUT.cpp
index 03ff1e8..3a0e913 100644
--- a/samples/DX_APIUsage/DXUT/Core/DXUT.cpp
+++ b/samples/DX_APIUsage/DXUT/Core/DXUT.cpp
@@ -2,22 +2,20 @@
 // File: DXUT.cpp
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #include "DXUT.h"
+
+#ifndef NDEBUG
+#include <dxgidebug.h>
+#endif
+
 #define DXUT_MIN_WINDOW_SIZE_X 200
 #define DXUT_MIN_WINDOW_SIZE_Y 200
 #define DXUT_COUNTER_STAT_LENGTH 2048
-#undef min // use __min instead inside this source file
-#undef max // use __max instead inside this source file
 
-#ifndef ARRAYSIZE
-extern "C++" // templates cannot be declared to have 'C' linkage
-template <typename T, size_t N>
-char (*RtlpNumberOf( UNALIGNED T (&)[N] ))[N];
-
-#define RTL_NUMBER_OF_V2(A) (sizeof(*RtlpNumberOf(A)))
-#define ARRAYSIZE(A)    RTL_NUMBER_OF_V2(A)
-#endif
 
 //--------------------------------------------------------------------------------------
 // Thread safety
@@ -32,8 +30,10 @@ bool                g_bThreadSafe = true;
 class DXUTLock
 {
 public:
-    inline DXUTLock()  { if( g_bThreadSafe ) EnterCriticalSection( &g_cs ); }
-    inline ~DXUTLock() { if( g_bThreadSafe ) LeaveCriticalSection( &g_cs ); }
+#pragma prefast( suppress:26166, "g_bThreadSafe controls behavior" )
+    inline _Acquires_lock_(g_cs) DXUTLock()  { if( g_bThreadSafe ) EnterCriticalSection( &g_cs ); }
+#pragma prefast( suppress:26165, "g_bThreadSafe controls behavior" )
+    inline _Releases_lock_(g_cs) ~DXUTLock() { if( g_bThreadSafe ) LeaveCriticalSection( &g_cs ); }
 };
 
 //--------------------------------------------------------------------------------------
@@ -62,7 +62,6 @@ struct DXUT_TIMER
 };
 
 
-
 //--------------------------------------------------------------------------------------
 // Stores DXUT state and data access is done with thread safety (if g_bThreadSafe==true)
 //--------------------------------------------------------------------------------------
@@ -71,16 +70,9 @@ class DXUTState
 protected:
     struct STATE
     {
-        // D3D9 specific
-        IDirect3D9*             m_D3D9;                    // the main D3D9 object
-        IDirect3DDevice9*       m_D3D9Device;              // the D3D9 rendering device
         DXUTDeviceSettings*     m_CurrentDeviceSettings;   // current device settings
-        D3DSURFACE_DESC         m_BackBufferSurfaceDesc9;  // D3D9 back buffer surface description
-        D3DCAPS9                m_Caps;                    // D3D caps for current device
-
-        // D3D11 specific
-        IDXGIFactory1*           m_DXGIFactory;             // DXGI Factory object
-        IDXGIAdapter1*           m_DXGIAdapter;            // The DXGI adapter object for the D3D11 device
+        IDXGIFactory1*          m_DXGIFactory;             // DXGI Factory object
+        IDXGIAdapter1*          m_DXGIAdapter;            // The DXGI adapter object for the D3D11 device
         IDXGIOutput**           m_DXGIOutputArray;        // The array of output obj for the D3D11 adapter obj
         UINT                    m_DXGIOutputArraySize;    // Number of elements in m_D3D11OutputArray
         IDXGISwapChain*         m_DXGISwapChain;          // the D3D11 swapchain
@@ -89,20 +81,41 @@ protected:
         bool                    m_DoNotStoreBufferSize;    // Do not store the buffer size on WM_SIZE messages
 
         // D3D11 specific
-        bool                    m_D3D11Available;          // if true, then D3D11 is available 
-        ID3D11Device*			m_D3D11Device;             // the D3D11 rendering device
+        ID3D11Device*           m_D3D11Device;             // the D3D11 rendering device
         ID3D11DeviceContext*	m_D3D11DeviceContext;	   // the D3D11 immediate device context
-        D3D_FEATURE_LEVEL		m_D3D11FeatureLevel;	   // the D3D11 feature level that this device supports
+        D3D_FEATURE_LEVEL       m_D3D11FeatureLevel;	   // the D3D11 feature level that this device supports
         ID3D11Texture2D*        m_D3D11DepthStencil;       // the D3D11 depth stencil texture (optional)
         ID3D11DepthStencilView* m_D3D11DepthStencilView;   // the D3D11 depth stencil view (optional)
         ID3D11RenderTargetView* m_D3D11RenderTargetView;   // the D3D11 render target view
         ID3D11RasterizerState*  m_D3D11RasterizerState;    // the D3D11 Rasterizer state
 
+        // D3D11.1 specific
+        ID3D11Device1*          m_D3D11Device1;            // the D3D11.1 rendering device
+        ID3D11DeviceContext1*	m_D3D11DeviceContext1;	   // the D3D11.1 immediate device context
+
+#ifdef USE_DIRECT3D11_2
+        // D3D11.2 specific
+        ID3D11Device2*          m_D3D11Device2;            // the D3D11.2 rendering device
+        ID3D11DeviceContext2*	m_D3D11DeviceContext2;	   // the D3D11.2 immediate device context
+#endif
+
+#ifdef USE_DIRECT3D11_3
+                                                           // D3D11.3 specific
+        ID3D11Device3*          m_D3D11Device3;            // the D3D11.3 rendering device
+        ID3D11DeviceContext3*	m_D3D11DeviceContext3;	   // the D3D11.3 immediate device context
+#endif
+
+#ifdef USE_DIRECT3D11_4
+                                                           // D3D11.4 specific
+        ID3D11Device4*          m_D3D11Device4;            // the D3D11.4 rendering device
+        ID3D11DeviceContext4*	m_D3D11DeviceContext4;	   // the D3D11.4 immediate device context
+#endif
+
         // General
         HWND  m_HWNDFocus;                  // the main app focus window
         HWND  m_HWNDDeviceFullScreen;       // the main app device window in fullscreen mode
         HWND  m_HWNDDeviceWindowed;         // the main app device window in windowed mode
-        HMONITOR m_AdapterMonitor;          // the monitor of the adapter 
+        HMONITOR m_AdapterMonitor;          // the monitor of the adapter
         HMENU m_Menu;                       // handle to menu
 
         UINT m_FullScreenBackBufferWidthAtModeChange;  // back buffer size of fullscreen mode right before switching to windowed mode.  Used to restore to same resolution when toggling back to fullscreen
@@ -111,7 +124,7 @@ protected:
         UINT m_WindowBackBufferHeightAtModeChange; // back buffer size of windowed mode right before switching to fullscreen mode.  Used to restore to same resolution when toggling back to windowed mode
         DWORD m_WindowedStyleAtModeChange;  // window style
         WINDOWPLACEMENT m_WindowedPlacement;// record of windowed HWND position/show state/etc
-        bool  m_TopmostWhileWindowed;       // if true, the windowed HWND is topmost 
+        bool  m_TopmostWhileWindowed;       // if true, the windowed HWND is topmost
         bool  m_Minimized;                  // if true, the HWND is minimized
         bool  m_Maximized;                  // if true, the HWND is maximized
         bool  m_MinimizedWhileFullscreen;   // if true, the HWND is minimized due to a focus switch away when fullscreen mode
@@ -127,18 +140,14 @@ protected:
         float m_FPS;                        // frames per second
         int   m_CurrentFrameNumber;         // the current frame number
         HHOOK m_KeyboardHook;               // handle to keyboard hook
-        bool  m_AllowShortcutKeysWhenFullscreen; // if true, when fullscreen enable shortcut keys (Windows keys, StickyKeys shortcut, ToggleKeys shortcut, FilterKeys shortcut) 
-        bool  m_AllowShortcutKeysWhenWindowed;   // if true, when windowed enable shortcut keys (Windows keys, StickyKeys shortcut, ToggleKeys shortcut, FilterKeys shortcut) 
+        bool  m_AllowShortcutKeysWhenFullscreen; // if true, when fullscreen enable shortcut keys (Windows keys, StickyKeys shortcut, ToggleKeys shortcut, FilterKeys shortcut)
+        bool  m_AllowShortcutKeysWhenWindowed;   // if true, when windowed enable shortcut keys (Windows keys, StickyKeys shortcut, ToggleKeys shortcut, FilterKeys shortcut)
         bool  m_AllowShortcutKeys;          // if true, then shortcut keys are currently disabled (Windows key, etc)
         bool  m_CallDefWindowProc;          // if true, DXUTStaticWndProc will call DefWindowProc for unhandled messages. Applications rendering to a dialog may need to set this to false.
         STICKYKEYS m_StartupStickyKeys;     // StickyKey settings upon startup so they can be restored later
         TOGGLEKEYS m_StartupToggleKeys;     // ToggleKey settings upon startup so they can be restored later
         FILTERKEYS m_StartupFilterKeys;     // FilterKey settings upon startup so they can be restored later
 
-        bool  m_AppSupportsD3D9Override;    // true if app sets via DXUTSetD3DVersionSupport()
-        bool  m_AppSupportsD3D11Override;   // true if app sets via DXUTSetD3DVersionSupport()
-        bool  m_UseD3DVersionOverride;      // true if the app ever calls DXUTSetD3DVersionSupport()
-
         bool  m_HandleEscape;               // if true, then DXUT will handle escape to quit
         bool  m_HandleAltEnter;             // if true, then DXUT will handle alt-enter to toggle fullscreen
         bool  m_HandlePause;                // if true, then DXUT will handle pause to toggle time pausing
@@ -148,18 +157,18 @@ protected:
         bool  m_ShowCursorWhenFullScreen;   // if true, then DXUT will show a cursor when full screen
         bool  m_ConstantFrameTime;          // if true, then elapsed frame time will always be 0.05f seconds which is good for debugging or automated capture
         float m_TimePerFrame;               // the constant time per frame in seconds, only valid if m_ConstantFrameTime==true
-        bool  m_WireframeMode;              // if true, then D3DRS_FILLMODE==D3DFILL_WIREFRAME else D3DRS_FILLMODE==D3DFILL_SOLID 
+        bool  m_WireframeMode;              // if true, then D3DRS_FILLMODE==D3DFILL_WIREFRAME else D3DRS_FILLMODE==D3DFILL_SOLID
         bool  m_AutoChangeAdapter;          // if true, then the adapter will automatically change if the window is different monitor
         bool  m_WindowCreatedWithDefaultPositions; // if true, then CW_USEDEFAULT was used and the window should be moved to the right adapter
         int   m_ExitCode;                   // the exit code to be returned to the command line
 
         bool  m_DXUTInited;                 // if true, then DXUTInit() has succeeded
         bool  m_WindowCreated;              // if true, then DXUTCreateWindow() or DXUTSetWindow() has succeeded
-        bool  m_DeviceCreated;              // if true, then DXUTCreateDevice() or DXUTSetD3D*Device() has succeeded
+        bool  m_DeviceCreated;              // if true, then DXUTCreateDevice() has succeeded
 
         bool  m_DXUTInitCalled;             // if true, then DXUTInit() was called
         bool  m_WindowCreateCalled;         // if true, then DXUTCreateWindow() or DXUTSetWindow() was called
-        bool  m_DeviceCreateCalled;         // if true, then DXUTCreateDevice() or DXUTSetD3D*Device() was called
+        bool  m_DeviceCreateCalled;         // if true, then DXUTCreateDevice() was called
 
         bool  m_DeviceObjectsCreated;       // if true, then DeviceCreated callback has been called (if non-NULL)
         bool  m_DeviceObjectsReset;         // if true, then DeviceReset callback has been called (if non-NULL)
@@ -175,14 +184,13 @@ protected:
         bool  m_Automation;                 // if true, automation is enabled
         bool  m_InSizeMove;                 // if true, app is inside a WM_ENTERSIZEMOVE
         UINT  m_TimerLastID;                // last ID of the DXUT timer
-        bool  m_MessageWhenD3D11NotAvailable; 
-        
+        bool  m_MessageWhenD3D11NotAvailable;
+
         D3D_FEATURE_LEVEL  m_OverrideForceFeatureLevel; // if != -1, then overrid to use a featurelevel
         WCHAR m_ScreenShotName[256];        // command line screen shot name
         bool m_SaveScreenShot;              // command line save screen shot
         bool m_ExitAfterScreenShot;         // command line exit after screen shot
-        
-        int   m_OverrideForceAPI;               // if != -1, then override to use this Direct3D API version
+
         int   m_OverrideAdapterOrdinal;         // if != -1, then override to use this adapter ordinal
         bool  m_OverrideWindowed;               // if true, then force to start windowed
         int   m_OverrideOutput;                 // if != -1, then override to use the particular output on the adapter
@@ -193,14 +201,14 @@ protected:
         int   m_OverrideHeight;                 // if != 0, then override to this height
         bool  m_OverrideForceHAL;               // if true, then force to HAL device (failing if one doesn't exist)
         bool  m_OverrideForceREF;               // if true, then force to REF device (failing if one doesn't exist)
+        bool  m_OverrideForceWARP;              // if true, then force to WARP device (failing if one doesn't exist)
         bool  m_OverrideConstantFrameTime;      // if true, then force to constant frame time
         float m_OverrideConstantTimePerFrame;   // the constant time per frame in seconds if m_OverrideConstantFrameTime==true
         int   m_OverrideQuitAfterFrame;         // if != 0, then it will force the app to quit after that frame
         int   m_OverrideForceVsync;             // if == 0, then it will force the app to use D3DPRESENT_INTERVAL_IMMEDIATE, if == 1 force use of D3DPRESENT_INTERVAL_DEFAULT
-        bool  m_OverrideRelaunchMCE;            // if true, then force relaunch of MCE at exit
         bool  m_AppCalledWasKeyPressed;         // true if the app ever calls DXUTWasKeyPressed().  Allows for optimzation
-        bool  m_ReleasingSwapChain;		        // if true, the app is releasing its swapchain
-        bool  m_IsInGammaCorrectMode;		    // Tell DXUTRes and DXUTMisc that we are in gamma correct mode
+        bool  m_ReleasingSwapChain;             // if true, the app is releasing its swapchain
+        bool  m_IsInGammaCorrectMode;           // Tell DXUTRes and DXUTMisc that we are in gamma correct mode
 
         LPDXUTCALLBACKMODIFYDEVICESETTINGS      m_ModifyDeviceSettingsFunc;     // modify Direct3D device settings callback
         LPDXUTCALLBACKDEVICEREMOVED             m_DeviceRemovedFunc;            // Direct3D device removed callback
@@ -208,13 +216,7 @@ protected:
         LPDXUTCALLBACKKEYBOARD                  m_KeyboardFunc;                 // keyboard callback
         LPDXUTCALLBACKMOUSE                     m_MouseFunc;                    // mouse callback
         LPDXUTCALLBACKMSGPROC                   m_WindowMsgFunc;                // window messages callback
-
-        LPDXUTCALLBACKISD3D9DEVICEACCEPTABLE    m_IsD3D9DeviceAcceptableFunc;   // D3D9 is device acceptable callback
-        LPDXUTCALLBACKD3D9DEVICECREATED         m_D3D9DeviceCreatedFunc;        // D3D9 device created callback
-        LPDXUTCALLBACKD3D9DEVICERESET           m_D3D9DeviceResetFunc;          // D3D9 device reset callback
-        LPDXUTCALLBACKD3D9DEVICELOST            m_D3D9DeviceLostFunc;           // D3D9 device lost callback
-        LPDXUTCALLBACKD3D9DEVICEDESTROYED       m_D3D9DeviceDestroyedFunc;      // D3D9 device destroyed callback
-        LPDXUTCALLBACKD3D9FRAMERENDER           m_D3D9FrameRenderFunc;          // D3D9 frame render callback
+        LPDXUTCALLBACKQUIT                      m_QuitFunc;                     // quit callback
 
         LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE   m_IsD3D11DeviceAcceptableFunc;  // D3D11 is device acceptable callback
         LPDXUTCALLBACKD3D11DEVICECREATED        m_D3D11DeviceCreatedFunc;       // D3D11 device created callback
@@ -223,20 +225,13 @@ protected:
         LPDXUTCALLBACKD3D11DEVICEDESTROYED      m_D3D11DeviceDestroyedFunc;     // D3D11 device destroyed callback
         LPDXUTCALLBACKD3D11FRAMERENDER          m_D3D11FrameRenderFunc;         // D3D11 frame render callback
 
-
         void* m_ModifyDeviceSettingsFuncUserContext;     // user context for modify Direct3D device settings callback
         void* m_DeviceRemovedFuncUserContext;            // user context for Direct3D device removed callback
         void* m_FrameMoveFuncUserContext;                // user context for frame move callback
         void* m_KeyboardFuncUserContext;                 // user context for keyboard callback
         void* m_MouseFuncUserContext;                    // user context for mouse callback
         void* m_WindowMsgFuncUserContext;                // user context for window messages callback
-
-        void* m_IsD3D9DeviceAcceptableFuncUserContext;   // user context for is D3D9 device acceptable callback
-        void* m_D3D9DeviceCreatedFuncUserContext;        // user context for D3D9 device created callback
-        void* m_D3D9DeviceResetFuncUserContext;          // user context for D3D9 device reset callback
-        void* m_D3D9DeviceLostFuncUserContext;           // user context for D3D9 device lost callback
-        void* m_D3D9DeviceDestroyedFuncUserContext;      // user context for D3D9 device destroyed callback
-        void* m_D3D9FrameRenderFuncUserContext;          // user context for D3D9 frame render callback
+        void* m_QuitFuncUserContext;                     // user context for quit callback
 
         void* m_IsD3D11DeviceAcceptableFuncUserContext;  // user context for is D3D11 device acceptable callback
         void* m_D3D11DeviceCreatedFuncUserContext;       // user context for D3D11 device created callback
@@ -249,8 +244,8 @@ protected:
         bool m_LastKeys[256];                            // array of last key state
         bool m_MouseButtons[5];                          // array of mouse states
 
-        CGrowableArray<DXUT_TIMER>*  m_TimerList;        // list of DXUT_TIMER structs
-        WCHAR m_StaticFrameStats[256];                   // static part of frames stats 
+        std::vector<DXUT_TIMER>*  m_TimerList;           // list of DXUT_TIMER structs
+        WCHAR m_StaticFrameStats[256];                   // static part of frames stats
         WCHAR m_FPSStats[64];                            // fps stats
         WCHAR m_FrameStats[256];                         // frame stats (fps, width, etc)
         WCHAR m_DeviceStats[256];                        // device stats (description, device type, etc)
@@ -263,10 +258,10 @@ public:
     DXUTState()  { Create(); }
     ~DXUTState() { Destroy(); }
 
-    void                                                                                    Create()
+    void Create()
     {
         g_bThreadSafe = true;
-        InitializeCriticalSectionAndSpinCount( &g_cs, 1000 );
+        (void)InitializeCriticalSectionAndSpinCount( &g_cs, 1000 );
 
         ZeroMemory( &m_state, sizeof( STATE ) );
         m_state.m_OverrideStartX = -1;
@@ -275,7 +270,6 @@ public:
         m_state.m_ScreenShotName[0] = 0;
         m_state.m_SaveScreenShot = false;
         m_state.m_ExitAfterScreenShot = false;
-        m_state.m_OverrideForceAPI = -1;
         m_state.m_OverrideAdapterOrdinal = -1;
         m_state.m_OverrideOutput = -1;
         m_state.m_OverrideForceVsync = -1;
@@ -288,7 +282,7 @@ public:
         m_state.m_HandleAltEnter = true;
         m_state.m_HandlePause = true;
         m_state.m_IsInGammaCorrectMode = true;
-		m_state.m_FPS = 1.0f;
+        m_state.m_FPS = 1.0f;
         m_state.m_MessageWhenD3D11NotAvailable = true;
     }
 
@@ -299,15 +293,9 @@ public:
         DeleteCriticalSection( &g_cs );
     }
 
-    // Macros to define access functions for thread safe access into m_state 
+    // Macros to define access functions for thread safe access into m_state
     GET_SET_ACCESSOR( DXUTDeviceSettings*, CurrentDeviceSettings );
 
-    // D3D9 specific
-    GET_SET_ACCESSOR( IDirect3D9*, D3D9 );
-    GET_SET_ACCESSOR( IDirect3DDevice9*, D3D9Device );
-    GETP_SETP_ACCESSOR( D3DSURFACE_DESC, BackBufferSurfaceDesc9 );
-    GETP_SETP_ACCESSOR( D3DCAPS9, Caps );
-
     // D3D11 specific
     GET_SET_ACCESSOR( IDXGIFactory1*, DXGIFactory );
     GET_SET_ACCESSOR( IDXGIAdapter1*, DXGIAdapter );
@@ -318,23 +306,37 @@ public:
     GET_SET_ACCESSOR( bool, RenderingOccluded );
     GET_SET_ACCESSOR( bool, DoNotStoreBufferSize );
 
-    // D3D11 specific
-    GET_SET_ACCESSOR( bool, D3D11Available );
     GET_SET_ACCESSOR( ID3D11Device*, D3D11Device );
     GET_SET_ACCESSOR( ID3D11DeviceContext*, D3D11DeviceContext );
     GET_SET_ACCESSOR( D3D_FEATURE_LEVEL, D3D11FeatureLevel );
     GET_SET_ACCESSOR( ID3D11Texture2D*, D3D11DepthStencil );
-    GET_SET_ACCESSOR( ID3D11DepthStencilView*, D3D11DepthStencilView );   
+    GET_SET_ACCESSOR( ID3D11DepthStencilView*, D3D11DepthStencilView );
     GET_SET_ACCESSOR( ID3D11RenderTargetView*, D3D11RenderTargetView );
     GET_SET_ACCESSOR( ID3D11RasterizerState*, D3D11RasterizerState );
 
+    GET_SET_ACCESSOR( ID3D11Device1*, D3D11Device1 );
+    GET_SET_ACCESSOR( ID3D11DeviceContext1*, D3D11DeviceContext1 );
+
+#ifdef USE_DIRECT3D11_2
+    GET_SET_ACCESSOR(ID3D11Device2*, D3D11Device2);
+    GET_SET_ACCESSOR(ID3D11DeviceContext2*, D3D11DeviceContext2);
+#endif
+
+#ifdef USE_DIRECT3D11_3
+    GET_SET_ACCESSOR(ID3D11Device3*, D3D11Device3);
+    GET_SET_ACCESSOR(ID3D11DeviceContext3*, D3D11DeviceContext3);
+#endif
+
+#ifdef USE_DIRECT3D11_4
+    GET_SET_ACCESSOR(ID3D11Device4*, D3D11Device4);
+    GET_SET_ACCESSOR(ID3D11DeviceContext4*, D3D11DeviceContext4);
+#endif
 
     GET_SET_ACCESSOR( HWND, HWNDFocus );
     GET_SET_ACCESSOR( HWND, HWNDDeviceFullScreen );
     GET_SET_ACCESSOR( HWND, HWNDDeviceWindowed );
     GET_SET_ACCESSOR( HMONITOR, AdapterMonitor );
-    GET_SET_ACCESSOR( HMENU, Menu );   
-
+    GET_SET_ACCESSOR( HMENU, Menu );
 
     GET_SET_ACCESSOR( UINT, FullScreenBackBufferWidthAtModeChange );
     GET_SET_ACCESSOR( UINT, FullScreenBackBufferHeightAtModeChange );
@@ -346,16 +348,16 @@ public:
     GET_SET_ACCESSOR( bool, Minimized );
     GET_SET_ACCESSOR( bool, Maximized );
     GET_SET_ACCESSOR( bool, MinimizedWhileFullscreen );
-    GET_SET_ACCESSOR( bool, IgnoreSizeChange );   
+    GET_SET_ACCESSOR( bool, IgnoreSizeChange );
 
     GET_SET_ACCESSOR( double, Time );
     GET_SET_ACCESSOR( double, AbsoluteTime );
     GET_SET_ACCESSOR( float, ElapsedTime );
 
     GET_SET_ACCESSOR( HINSTANCE, HInstance );
-    GET_SET_ACCESSOR( double, LastStatsUpdateTime );   
-    GET_SET_ACCESSOR( DWORD, LastStatsUpdateFrames );   
-    GET_SET_ACCESSOR( float, FPS );    
+    GET_SET_ACCESSOR( double, LastStatsUpdateTime );
+    GET_SET_ACCESSOR( DWORD, LastStatsUpdateFrames );
+    GET_SET_ACCESSOR( float, FPS );
     GET_SET_ACCESSOR( int, CurrentFrameNumber );
     GET_SET_ACCESSOR( HHOOK, KeyboardHook );
     GET_SET_ACCESSOR( bool, AllowShortcutKeysWhenFullscreen );
@@ -366,20 +368,16 @@ public:
     GET_SET_ACCESSOR( TOGGLEKEYS, StartupToggleKeys );
     GET_SET_ACCESSOR( FILTERKEYS, StartupFilterKeys );
 
-    GET_SET_ACCESSOR( bool, AppSupportsD3D9Override );
-    GET_SET_ACCESSOR( bool, AppSupportsD3D11Override );
-    GET_SET_ACCESSOR( bool, UseD3DVersionOverride );
-
     GET_SET_ACCESSOR( bool, HandleEscape );
     GET_SET_ACCESSOR( bool, HandleAltEnter );
     GET_SET_ACCESSOR( bool, HandlePause );
     GET_SET_ACCESSOR( bool, ShowMsgBoxOnError );
     GET_SET_ACCESSOR( bool, NoStats );
-    GET_SET_ACCESSOR( bool, ClipCursorWhenFullScreen );   
+    GET_SET_ACCESSOR( bool, ClipCursorWhenFullScreen );
     GET_SET_ACCESSOR( bool, ShowCursorWhenFullScreen );
     GET_SET_ACCESSOR( bool, ConstantFrameTime );
     GET_SET_ACCESSOR( float, TimePerFrame );
-    GET_SET_ACCESSOR( bool, WireframeMode );   
+    GET_SET_ACCESSOR( bool, WireframeMode );
     GET_SET_ACCESSOR( bool, AutoChangeAdapter );
     GET_SET_ACCESSOR( bool, WindowCreatedWithDefaultPositions );
     GET_SET_ACCESSOR( int, ExitCode );
@@ -412,8 +410,6 @@ public:
     GET_SET_ACCESSOR( bool, SaveScreenShot );
     GET_SET_ACCESSOR( bool, ExitAfterScreenShot );
 
-    
-    GET_SET_ACCESSOR( int, OverrideForceAPI );
     GET_SET_ACCESSOR( int, OverrideAdapterOrdinal );
     GET_SET_ACCESSOR( bool, OverrideWindowed );
     GET_SET_ACCESSOR( int, OverrideOutput );
@@ -424,27 +420,21 @@ public:
     GET_SET_ACCESSOR( int, OverrideHeight );
     GET_SET_ACCESSOR( bool, OverrideForceHAL );
     GET_SET_ACCESSOR( bool, OverrideForceREF );
+    GET_SET_ACCESSOR( bool, OverrideForceWARP );
     GET_SET_ACCESSOR( bool, OverrideConstantFrameTime );
     GET_SET_ACCESSOR( float, OverrideConstantTimePerFrame );
     GET_SET_ACCESSOR( int, OverrideQuitAfterFrame );
     GET_SET_ACCESSOR( int, OverrideForceVsync );
-    GET_SET_ACCESSOR( bool, OverrideRelaunchMCE );
     GET_SET_ACCESSOR( bool, ReleasingSwapChain );
     GET_SET_ACCESSOR( bool, IsInGammaCorrectMode );
-    
+
     GET_SET_ACCESSOR( LPDXUTCALLBACKMODIFYDEVICESETTINGS, ModifyDeviceSettingsFunc );
     GET_SET_ACCESSOR( LPDXUTCALLBACKDEVICEREMOVED, DeviceRemovedFunc );
     GET_SET_ACCESSOR( LPDXUTCALLBACKFRAMEMOVE, FrameMoveFunc );
     GET_SET_ACCESSOR( LPDXUTCALLBACKKEYBOARD, KeyboardFunc );
     GET_SET_ACCESSOR( LPDXUTCALLBACKMOUSE, MouseFunc );
     GET_SET_ACCESSOR( LPDXUTCALLBACKMSGPROC, WindowMsgFunc );
-
-    GET_SET_ACCESSOR( LPDXUTCALLBACKISD3D9DEVICEACCEPTABLE, IsD3D9DeviceAcceptableFunc );
-    GET_SET_ACCESSOR( LPDXUTCALLBACKD3D9DEVICECREATED, D3D9DeviceCreatedFunc );
-    GET_SET_ACCESSOR( LPDXUTCALLBACKD3D9DEVICERESET, D3D9DeviceResetFunc );
-    GET_SET_ACCESSOR( LPDXUTCALLBACKD3D9DEVICELOST, D3D9DeviceLostFunc );
-    GET_SET_ACCESSOR( LPDXUTCALLBACKD3D9DEVICEDESTROYED, D3D9DeviceDestroyedFunc );
-    GET_SET_ACCESSOR( LPDXUTCALLBACKD3D9FRAMERENDER, D3D9FrameRenderFunc );
+    GET_SET_ACCESSOR( LPDXUTCALLBACKQUIT, QuitFunc);
 
     GET_SET_ACCESSOR( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE, IsD3D11DeviceAcceptableFunc );
     GET_SET_ACCESSOR( LPDXUTCALLBACKD3D11DEVICECREATED, D3D11DeviceCreatedFunc );
@@ -459,13 +449,7 @@ public:
     GET_SET_ACCESSOR( void*, KeyboardFuncUserContext );
     GET_SET_ACCESSOR( void*, MouseFuncUserContext );
     GET_SET_ACCESSOR( void*, WindowMsgFuncUserContext );
-
-    GET_SET_ACCESSOR( void*, IsD3D9DeviceAcceptableFuncUserContext );
-    GET_SET_ACCESSOR( void*, D3D9DeviceCreatedFuncUserContext );
-    GET_SET_ACCESSOR( void*, D3D9DeviceResetFuncUserContext );
-    GET_SET_ACCESSOR( void*, D3D9DeviceLostFuncUserContext );
-    GET_SET_ACCESSOR( void*, D3D9DeviceDestroyedFuncUserContext );
-    GET_SET_ACCESSOR( void*, D3D9FrameRenderFuncUserContext );
+    GET_SET_ACCESSOR( void*, QuitFuncUserContext );
 
     GET_SET_ACCESSOR( void*, IsD3D11DeviceAcceptableFuncUserContext );
     GET_SET_ACCESSOR( void*, D3D11DeviceCreatedFuncUserContext );
@@ -474,29 +458,29 @@ public:
     GET_SET_ACCESSOR( void*, D3D11SwapChainReleasingFuncUserContext );
     GET_SET_ACCESSOR( void*, D3D11FrameRenderFuncUserContext );
 
-    GET_SET_ACCESSOR( CGrowableArray<DXUT_TIMER>*, TimerList );
+    GET_SET_ACCESSOR( std::vector<DXUT_TIMER>*, TimerList );
     GET_ACCESSOR( bool*, Keys );
     GET_ACCESSOR( bool*, LastKeys );
     GET_ACCESSOR( bool*, MouseButtons );
     GET_ACCESSOR( WCHAR*, StaticFrameStats );
     GET_ACCESSOR( WCHAR*, FPSStats );
     GET_ACCESSOR( WCHAR*, FrameStats );
-    GET_ACCESSOR( WCHAR*, DeviceStats );    
+    GET_ACCESSOR( WCHAR*, DeviceStats );
     GET_ACCESSOR( WCHAR*, WindowTitle );
 };
 
 
 //--------------------------------------------------------------------------------------
-// Global state 
+// Global state
 //--------------------------------------------------------------------------------------
-DXUTState*          g_pDXUTState = NULL;
+DXUTState*          g_pDXUTState = nullptr;
 
 HRESULT WINAPI DXUTCreateState()
 {
-    if( g_pDXUTState == NULL )
+    if( !g_pDXUTState )
     {
-        g_pDXUTState = new DXUTState;
-        if( NULL == g_pDXUTState )
+        g_pDXUTState = new (std::nothrow) DXUTState;
+        if( !g_pDXUTState )
             return E_OUTOFMEMORY;
     }
     return S_OK;
@@ -514,13 +498,13 @@ public:
     ~DXUTMemoryHelper() { DXUTDestroyState(); }
 };
 
-
 DXUTState& GetDXUTState()
 {
     // This class will auto create the memory when its first accessed and delete it after the program exits WinMain.
-    // However the application can also call DXUTCreateState() & DXUTDestroyState() independantly if its wants 
+    // However the application can also call DXUTCreateState() & DXUTDestroyState() independantly if its wants
     static DXUTMemoryHelper memory;
-    assert( g_pDXUTState != NULL );
+    assert( g_pDXUTState );
+    _Analysis_assume_( g_pDXUTState );
     return *g_pDXUTState;
 }
 
@@ -528,117 +512,81 @@ DXUTState& GetDXUTState()
 //--------------------------------------------------------------------------------------
 // Internal functions forward declarations
 //--------------------------------------------------------------------------------------
-void DXUTParseCommandLine( __inout WCHAR* strCommandLine, 
-                           bool bIgnoreFirstCommand = true );
-bool DXUTIsNextArg( __inout WCHAR*& strCmdLine, __in const WCHAR* strArg );
-bool DXUTGetCmdParam( __inout WCHAR*& strCmdLine, __out WCHAR* strFlag );
-void DXUTAllowShortcutKeys( bool bAllowKeys );
+void DXUTParseCommandLine( _In_z_ WCHAR* strCommandLine,
+                           _In_ bool bIgnoreFirstCommand = true );
+bool DXUTIsNextArg( _Inout_ WCHAR*& strCmdLine, _In_ const WCHAR* strArg );
+bool DXUTGetCmdParam( _Inout_ WCHAR*& strCmdLine, _Out_cap_(cchDest) WCHAR* strFlag, _In_ int cchDest );
+void DXUTAllowShortcutKeys( _In_ bool bAllowKeys );
 void DXUTUpdateStaticFrameStats();
 void DXUTUpdateFrameStats();
 
-LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
+LRESULT CALLBACK DXUTStaticWndProc( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam );
 void DXUTHandleTimers();
-void DXUTDisplayErrorMessage( HRESULT hr );
-int DXUTMapButtonToArrayIndex( BYTE vButton );
+void DXUTDisplayErrorMessage( _In_ HRESULT hr );
+int DXUTMapButtonToArrayIndex( _In_ BYTE vButton );
 
-HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
-                          IDirect3DDevice9* pd3d9DeviceFromApp,
-                          ID3D11Device* pd3d11DeviceFromApp,
-                          bool bForceRecreate,
-                          bool bClipWindowToSingleAdapter );
+HRESULT DXUTChangeDevice( _In_ DXUTDeviceSettings* pNewDeviceSettings,
+                          _In_ bool bClipWindowToSingleAdapter );
 
-bool DXUTCanDeviceBeReset( DXUTDeviceSettings* pOldDeviceSettings,
-                           DXUTDeviceSettings* pNewDeviceSettings,
-                           IDirect3DDevice9* pd3d9DeviceFromApp,
-                           ID3D11Device* pd3d11DeviceFromApp );
+bool DXUTCanDeviceBeReset( _In_ DXUTDeviceSettings* pOldDeviceSettings,
+                           _In_ DXUTDeviceSettings* pNewDeviceSettings,
+                           _In_ ID3D11Device* pd3d11DeviceFromApp );
 
 
 HRESULT DXUTDelayLoadDXGI();
-HRESULT DXUTDelayLoadD3D9();
-HRESULT DXUTSnapDeviceSettingsToEnumDevice( DXUTDeviceSettings* pDeviceSettings, bool forceEnum, D3D_FEATURE_LEVEL forceFL = D3D_FEATURE_LEVEL(0) );
-void DXUTUpdateDeviceSettingsWithOverrides( DXUTDeviceSettings* pDeviceSettings );
+HRESULT DXUTSnapDeviceSettingsToEnumDevice( _In_ DXUTDeviceSettings* pDeviceSettings, _In_ bool forceEnum, _In_ D3D_FEATURE_LEVEL forceFL = D3D_FEATURE_LEVEL(0) );
+void DXUTUpdateDeviceSettingsWithOverrides( _Inout_ DXUTDeviceSettings* pDeviceSettings );
 void DXUTCheckForDXGIFullScreenSwitch();
-void DXUTResizeDXGIBuffers( UINT Width, UINT Height, BOOL bFullscreen );
+void DXUTResizeDXGIBuffers( _In_ UINT Width, _In_ UINT Height, _In_ BOOL bFullscreen );
 void DXUTCheckForDXGIBufferChange();
 void DXUTCheckForWindowSizeChange();
 void DXUTCheckForWindowChangingMonitors();
-void DXUTCleanup3DEnvironment( bool bReleaseSettings );
-HMONITOR DXUTGetMonitorFromAdapter( DXUTDeviceSettings* pDeviceSettings );
-HRESULT DXUTGetAdapterOrdinalFromMonitor( HMONITOR hMonitor, UINT* pAdapterOrdinal );
-HRESULT DXUTGetOutputOrdinalFromMonitor( HMONITOR hMonitor, UINT* pOutputOrdinal );
+void DXUTCleanup3DEnvironment( _In_ bool bReleaseSettings );
+HMONITOR DXUTGetMonitorFromAdapter( _In_ DXUTDeviceSettings* pDeviceSettings );
+HRESULT DXUTGetAdapterOrdinalFromMonitor( _In_ HMONITOR hMonitor, _Out_ UINT* pAdapterOrdinal );
+HRESULT DXUTGetOutputOrdinalFromMonitor( _In_ HMONITOR hMonitor, _Out_ UINT* pOutputOrdinal );
 HRESULT DXUTHandleDeviceRemoved();
 void DXUTUpdateBackBufferDesc();
 void DXUTSetupCursor();
 
-// Direct3D 9
-HRESULT DXUTCreate3DEnvironment9( IDirect3DDevice9* pd3dDeviceFromApp );
-HRESULT DXUTReset3DEnvironment9();
-void DXUTRender3DEnvironment9();
-void DXUTCleanup3DEnvironment9( bool bReleaseSettings = true );
-HRESULT DXUTSetD3D9DeviceCursor( IDirect3DDevice9* pd3dDevice, HCURSOR hCursor, bool bAddWatermark );
-void DXUTUpdateD3D9DeviceStats( D3DDEVTYPE DeviceType, DWORD BehaviorFlags,
-                                D3DADAPTER_IDENTIFIER9* pAdapterIdentifier );
-HRESULT DXUTFindD3D9AdapterFormat( UINT AdapterOrdinal, D3DDEVTYPE DeviceType, D3DFORMAT BackBufferFormat,
-                                   BOOL Windowed, D3DFORMAT* pAdapterFormat );
-
 // Direct3D 11
-HRESULT DXUTCreateD3D11Views( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dDeviceContext, DXUTDeviceSettings* pDeviceSettings );
-HRESULT DXUTCreate3DEnvironment11( ID3D11Device* pd3dDeviceFromApp );
+HRESULT DXUTCreateD3D11Views( _In_ ID3D11Device* pd3dDevice, _In_ ID3D11DeviceContext* pd3dDeviceContext, _In_ DXUTDeviceSettings* pDeviceSettings );
+HRESULT DXUTCreate3DEnvironment11();
 HRESULT DXUTReset3DEnvironment11();
-void DXUTRender3DEnvironment11();
-void DXUTCleanup3DEnvironment11( bool bReleaseSettings = true );
-void DXUTUpdateD3D11DeviceStats( D3D_DRIVER_TYPE DeviceType, DXGI_ADAPTER_DESC* pAdapterDesc );
+void DXUTUpdateD3D11DeviceStats( _In_ D3D_DRIVER_TYPE DeviceType, _In_ D3D_FEATURE_LEVEL featureLevel, _In_ DXGI_ADAPTER_DESC* pAdapterDesc );
 
 
 //--------------------------------------------------------------------------------------
-// Internal helper functions 
+// Internal helper functions
 //--------------------------------------------------------------------------------------
-bool DXUTIsD3D9( DXUTDeviceSettings* pDeviceSettings )                          { return (pDeviceSettings && pDeviceSettings->ver == DXUT_D3D9_DEVICE ); };
-bool DXUTIsCurrentDeviceD3D9()                                                  { DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();  return DXUTIsD3D9(pDeviceSettings); };
-UINT DXUTGetBackBufferWidthFromDS( DXUTDeviceSettings* pNewDeviceSettings )     
-{ 
-    if( DXUTIsD3D9( pNewDeviceSettings ) )
-        return pNewDeviceSettings->d3d9.pp.BackBufferWidth; 
-    else
-        return pNewDeviceSettings->d3d11.sd.BufferDesc.Width; 
+UINT DXUTGetBackBufferWidthFromDS( _In_ DXUTDeviceSettings* pNewDeviceSettings )
+{
+    return pNewDeviceSettings->d3d11.sd.BufferDesc.Width;
 }
-UINT DXUTGetBackBufferHeightFromDS( DXUTDeviceSettings* pNewDeviceSettings )    
-{ 
-    if( DXUTIsD3D9(pNewDeviceSettings) )
-        return pNewDeviceSettings->d3d9.pp.BackBufferHeight;
-    else
-        return pNewDeviceSettings->d3d11.sd.BufferDesc.Height; 
+UINT DXUTGetBackBufferHeightFromDS( _In_ DXUTDeviceSettings* pNewDeviceSettings )
+{
+    return pNewDeviceSettings->d3d11.sd.BufferDesc.Height;
 }
-bool DXUTGetIsWindowedFromDS( DXUTDeviceSettings* pNewDeviceSettings )          
-{ 
-    if (!pNewDeviceSettings) 
-        return true; 
-    
-    if( DXUTIsD3D9(pNewDeviceSettings) )
-        return pNewDeviceSettings->d3d9.pp.Windowed ? true : false;
-    else
-        return pNewDeviceSettings->d3d11.sd.Windowed ? true : false; 
+bool DXUTGetIsWindowedFromDS( _In_ DXUTDeviceSettings* pNewDeviceSettings )
+{
+    if (!pNewDeviceSettings)
+        return true;
+
+    return pNewDeviceSettings->d3d11.sd.Windowed ? true : false;
 }
 
 
 //--------------------------------------------------------------------------------------
 // External state access functions
 //--------------------------------------------------------------------------------------
-BOOL WINAPI DXUTGetMSAASwapChainCreated() { 
+bool WINAPI DXUTGetMSAASwapChainCreated()
+{
     DXUTDeviceSettings *psettings = GetDXUTState().GetCurrentDeviceSettings();
-    if (psettings->ver == DXUT_D3D11_DEVICE) {
-        return psettings->d3d11.sd.SampleDesc.Count > 1;
-    }else if (psettings->ver == DXUT_D3D9_DEVICE) {
-        return (psettings->d3d9.pp.MultiSampleType >= D3DMULTISAMPLE_2_SAMPLES);
-    }
-    else return false;
+    if ( !psettings )
+        return false;
+    return (psettings->d3d11.sd.SampleDesc.Count > 1);
 }
-IDirect3DDevice9* WINAPI DXUTGetD3D9Device()               { return GetDXUTState().GetD3D9Device(); }
-const D3DSURFACE_DESC* WINAPI DXUTGetD3D9BackBufferSurfaceDesc() { return GetDXUTState().GetBackBufferSurfaceDesc9(); }
-const D3DCAPS9* WINAPI DXUTGetD3D9DeviceCaps()             { return GetDXUTState().GetCaps(); }
-ID3D11Device* WINAPI DXUTGetD3D11Device()                  { return GetDXUTState().GetD3D11Device(); }
-D3D_FEATURE_LEVEL	 WINAPI DXUTGetD3D11DeviceFeatureLevel() { return GetDXUTState().GetD3D11FeatureLevel(); }
-ID3D11DeviceContext* WINAPI DXUTGetD3D11DeviceContext()    { return GetDXUTState().GetD3D11DeviceContext(); }
+D3D_FEATURE_LEVEL WINAPI DXUTGetD3D11DeviceFeatureLevel()  { return GetDXUTState().GetD3D11FeatureLevel(); }
 IDXGISwapChain* WINAPI DXUTGetDXGISwapChain()              { return GetDXUTState().GetDXGISwapChain(); }
 ID3D11RenderTargetView* WINAPI DXUTGetD3D11RenderTargetView() { return GetDXUTState().GetD3D11RenderTargetView(); }
 ID3D11DepthStencilView* WINAPI DXUTGetD3D11DepthStencilView() { return GetDXUTState().GetD3D11DepthStencilView(); }
@@ -651,8 +599,8 @@ HWND WINAPI DXUTGetHWNDDeviceWindowed()                    { return GetDXUTState
 RECT WINAPI DXUTGetWindowClientRect()                      { RECT rc; GetClientRect( DXUTGetHWND(), &rc ); return rc; }
 LONG WINAPI DXUTGetWindowWidth()                           { RECT rc = DXUTGetWindowClientRect(); return ((LONG)rc.right - rc.left); }
 LONG WINAPI DXUTGetWindowHeight()                          { RECT rc = DXUTGetWindowClientRect(); return ((LONG)rc.bottom - rc.top); }
-RECT WINAPI DXUTGetWindowClientRectAtModeChange()          { RECT rc = { 0, 0, GetDXUTState().GetWindowBackBufferWidthAtModeChange(), GetDXUTState().GetWindowBackBufferHeightAtModeChange() }; return rc; }
-RECT WINAPI DXUTGetFullsceenClientRectAtModeChange()       { RECT rc = { 0, 0, GetDXUTState().GetFullScreenBackBufferWidthAtModeChange(), GetDXUTState().GetFullScreenBackBufferHeightAtModeChange() }; return rc; }
+RECT WINAPI DXUTGetWindowClientRectAtModeChange()          { RECT rc = { 0, 0, static_cast<LONG>( GetDXUTState().GetWindowBackBufferWidthAtModeChange() ), static_cast<LONG>( GetDXUTState().GetWindowBackBufferHeightAtModeChange() ) }; return rc; }
+RECT WINAPI DXUTGetFullsceenClientRectAtModeChange()       { RECT rc = { 0, 0, static_cast<LONG>( GetDXUTState().GetFullScreenBackBufferWidthAtModeChange() ), static_cast<LONG>( GetDXUTState().GetFullScreenBackBufferHeightAtModeChange() ) }; return rc; }
 double WINAPI DXUTGetTime()                                { return GetDXUTState().GetTime(); }
 float WINAPI DXUTGetElapsedTime()                          { return GetDXUTState().GetElapsedTime(); }
 float WINAPI DXUTGetFPS()                                  { return GetDXUTState().GetFPS(); }
@@ -666,60 +614,65 @@ bool WINAPI DXUTGetShowMsgBoxOnError()                     { return GetDXUTState
 bool WINAPI DXUTGetAutomation()                            { return GetDXUTState().GetAutomation(); }
 bool WINAPI DXUTIsWindowed()                               { return DXUTGetIsWindowedFromDS( GetDXUTState().GetCurrentDeviceSettings() ); }
 bool WINAPI DXUTIsInGammaCorrectMode()                     { return GetDXUTState().GetIsInGammaCorrectMode(); }
-IDirect3D9* WINAPI DXUTGetD3D9Object()                     { DXUTDelayLoadD3D9(); return GetDXUTState().GetD3D9(); }
-IDXGIFactory1* WINAPI DXUTGetDXGIFactory()                  { DXUTDelayLoadDXGI(); return GetDXUTState().GetDXGIFactory(); }
-bool WINAPI DXUTIsD3D11Available()                         { DXUTDelayLoadDXGI(); return GetDXUTState().GetD3D11Available(); }
-bool WINAPI DXUTIsAppRenderingWithD3D9()                   { return (GetDXUTState().GetD3D9Device() != NULL); }
-bool WINAPI DXUTIsAppRenderingWithD3D11()                  { return (GetDXUTState().GetD3D11Device() != NULL); }
+IDXGIFactory1* WINAPI DXUTGetDXGIFactory()                 { DXUTDelayLoadDXGI(); return GetDXUTState().GetDXGIFactory(); }
+
+ID3D11Device* WINAPI DXUTGetD3D11Device()                  { return GetDXUTState().GetD3D11Device(); }
+ID3D11DeviceContext* WINAPI DXUTGetD3D11DeviceContext()    { return GetDXUTState().GetD3D11DeviceContext(); }
+ID3D11Device1* WINAPI DXUTGetD3D11Device1()                { return GetDXUTState().GetD3D11Device1(); }
+ID3D11DeviceContext1* WINAPI DXUTGetD3D11DeviceContext1()  { return GetDXUTState().GetD3D11DeviceContext1(); }
+
+#ifdef USE_DIRECT3D11_2
+ID3D11Device2* WINAPI DXUTGetD3D11Device2()                { return GetDXUTState().GetD3D11Device2(); }
+ID3D11DeviceContext2* WINAPI DXUTGetD3D11DeviceContext2()  { return GetDXUTState().GetD3D11DeviceContext2(); }
+#endif
+
+#ifdef USE_DIRECT3D11_3
+ID3D11Device3* WINAPI DXUTGetD3D11Device3() { return GetDXUTState().GetD3D11Device3(); }
+ID3D11DeviceContext3* WINAPI DXUTGetD3D11DeviceContext3() { return GetDXUTState().GetD3D11DeviceContext3(); }
+#endif
+
+#ifdef USE_DIRECT3D11_4
+ID3D11Device4* WINAPI DXUTGetD3D11Device4() { return GetDXUTState().GetD3D11Device4(); }
+ID3D11DeviceContext4* WINAPI DXUTGetD3D11DeviceContext4() { return GetDXUTState().GetD3D11DeviceContext4(); }
+#endif
 
 //--------------------------------------------------------------------------------------
 // External callback setup functions
 //--------------------------------------------------------------------------------------
 
 // General callbacks
-void WINAPI DXUTSetCallbackDeviceChanging( LPDXUTCALLBACKMODIFYDEVICESETTINGS pCallback, void* pUserContext )                  { GetDXUTState().SetModifyDeviceSettingsFunc( pCallback ); GetDXUTState().SetModifyDeviceSettingsFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackDeviceRemoved( LPDXUTCALLBACKDEVICEREMOVED pCallback, void* pUserContext )                          { GetDXUTState().SetDeviceRemovedFunc( pCallback ); GetDXUTState().SetDeviceRemovedFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackFrameMove( LPDXUTCALLBACKFRAMEMOVE pCallback, void* pUserContext )                                  { GetDXUTState().SetFrameMoveFunc( pCallback );  GetDXUTState().SetFrameMoveFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackKeyboard( LPDXUTCALLBACKKEYBOARD pCallback, void* pUserContext )                                    { GetDXUTState().SetKeyboardFunc( pCallback );  GetDXUTState().SetKeyboardFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackMouse( LPDXUTCALLBACKMOUSE pCallback, bool bIncludeMouseMove, void* pUserContext )                  { GetDXUTState().SetMouseFunc( pCallback ); GetDXUTState().SetNotifyOnMouseMove( bIncludeMouseMove );  GetDXUTState().SetMouseFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackMsgProc( LPDXUTCALLBACKMSGPROC pCallback, void* pUserContext )                                      { GetDXUTState().SetWindowMsgFunc( pCallback );  GetDXUTState().SetWindowMsgFuncUserContext( pUserContext ); }
-
-// Direct3D 9 callbacks
-void WINAPI DXUTSetCallbackD3D9DeviceAcceptable( LPDXUTCALLBACKISD3D9DEVICEACCEPTABLE pCallback, void* pUserContext )          { GetDXUTState().SetIsD3D9DeviceAcceptableFunc( pCallback ); GetDXUTState().SetIsD3D9DeviceAcceptableFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackD3D9DeviceCreated( LPDXUTCALLBACKD3D9DEVICECREATED pCallback, void* pUserContext )                  { GetDXUTState().SetD3D9DeviceCreatedFunc( pCallback ); GetDXUTState().SetD3D9DeviceCreatedFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackD3D9DeviceReset( LPDXUTCALLBACKD3D9DEVICERESET pCallback, void* pUserContext )                      { GetDXUTState().SetD3D9DeviceResetFunc( pCallback );  GetDXUTState().SetD3D9DeviceResetFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackD3D9DeviceLost( LPDXUTCALLBACKD3D9DEVICELOST pCallback, void* pUserContext )                        { GetDXUTState().SetD3D9DeviceLostFunc( pCallback );  GetDXUTState().SetD3D9DeviceLostFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackD3D9DeviceDestroyed( LPDXUTCALLBACKD3D9DEVICEDESTROYED pCallback, void* pUserContext )              { GetDXUTState().SetD3D9DeviceDestroyedFunc( pCallback );  GetDXUTState().SetD3D9DeviceDestroyedFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackD3D9FrameRender( LPDXUTCALLBACKD3D9FRAMERENDER pCallback, void* pUserContext )                      { GetDXUTState().SetD3D9FrameRenderFunc( pCallback );  GetDXUTState().SetD3D9FrameRenderFuncUserContext( pUserContext ); }
-void DXUTGetCallbackD3D9DeviceAcceptable( LPDXUTCALLBACKISD3D9DEVICEACCEPTABLE* ppCallback, void** ppUserContext )             { *ppCallback = GetDXUTState().GetIsD3D9DeviceAcceptableFunc(); *ppUserContext = GetDXUTState().GetIsD3D9DeviceAcceptableFuncUserContext(); }
+void WINAPI DXUTSetCallbackDeviceChanging( _In_ LPDXUTCALLBACKMODIFYDEVICESETTINGS pCallback, _In_opt_ void* pUserContext )    { GetDXUTState().SetModifyDeviceSettingsFunc( pCallback ); GetDXUTState().SetModifyDeviceSettingsFuncUserContext( pUserContext ); }
+void WINAPI DXUTSetCallbackDeviceRemoved( _In_ LPDXUTCALLBACKDEVICEREMOVED pCallback, _In_opt_ void* pUserContext )            { GetDXUTState().SetDeviceRemovedFunc( pCallback ); GetDXUTState().SetDeviceRemovedFuncUserContext( pUserContext ); }
+void WINAPI DXUTSetCallbackFrameMove( _In_ LPDXUTCALLBACKFRAMEMOVE pCallback, _In_opt_ void* pUserContext )                    { GetDXUTState().SetFrameMoveFunc( pCallback );  GetDXUTState().SetFrameMoveFuncUserContext( pUserContext ); }
+void WINAPI DXUTSetCallbackKeyboard( _In_ LPDXUTCALLBACKKEYBOARD pCallback, _In_opt_ void* pUserContext )                      { GetDXUTState().SetKeyboardFunc( pCallback );  GetDXUTState().SetKeyboardFuncUserContext( pUserContext ); }
+void WINAPI DXUTSetCallbackMouse( _In_ LPDXUTCALLBACKMOUSE pCallback, bool bIncludeMouseMove, _In_opt_ void* pUserContext )    { GetDXUTState().SetMouseFunc( pCallback ); GetDXUTState().SetNotifyOnMouseMove( bIncludeMouseMove );  GetDXUTState().SetMouseFuncUserContext( pUserContext ); }
+void WINAPI DXUTSetCallbackMsgProc( _In_ LPDXUTCALLBACKMSGPROC pCallback, _In_opt_ void* pUserContext )                        { GetDXUTState().SetWindowMsgFunc( pCallback );  GetDXUTState().SetWindowMsgFuncUserContext( pUserContext ); }
+void WINAPI DXUTSetCallbackQuit( _In_ LPDXUTCALLBACKQUIT pCallback, _In_opt_ void* pUserContext)                                { GetDXUTState().SetQuitFunc( pCallback );  GetDXUTState().SetQuitFuncUserContext( pUserContext ); }
 
 // Direct3D 11 callbacks
-void WINAPI DXUTSetCallbackD3D11DeviceAcceptable( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE pCallback, void* pUserContext )        { GetDXUTState().SetIsD3D11DeviceAcceptableFunc( pCallback ); GetDXUTState().SetIsD3D11DeviceAcceptableFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackD3D11DeviceCreated( LPDXUTCALLBACKD3D11DEVICECREATED pCallback, void* pUserContext )                { GetDXUTState().SetD3D11DeviceCreatedFunc( pCallback ); GetDXUTState().SetD3D11DeviceCreatedFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackD3D11SwapChainResized( LPDXUTCALLBACKD3D11SWAPCHAINRESIZED pCallback, void* pUserContext )          { GetDXUTState().SetD3D11SwapChainResizedFunc( pCallback );  GetDXUTState().SetD3D11SwapChainResizedFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackD3D11FrameRender( LPDXUTCALLBACKD3D11FRAMERENDER pCallback, void* pUserContext )                    { GetDXUTState().SetD3D11FrameRenderFunc( pCallback );  GetDXUTState().SetD3D11FrameRenderFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackD3D11SwapChainReleasing( LPDXUTCALLBACKD3D11SWAPCHAINRELEASING pCallback, void* pUserContext )      { GetDXUTState().SetD3D11SwapChainReleasingFunc( pCallback );  GetDXUTState().SetD3D11SwapChainReleasingFuncUserContext( pUserContext ); }
-void WINAPI DXUTSetCallbackD3D11DeviceDestroyed( LPDXUTCALLBACKD3D11DEVICEDESTROYED pCallback, void* pUserContext )            { GetDXUTState().SetD3D11DeviceDestroyedFunc( pCallback );  GetDXUTState().SetD3D11DeviceDestroyedFuncUserContext( pUserContext ); }
-void DXUTGetCallbackD3D11DeviceAcceptable( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE* ppCallback, void** ppUserContext )           { *ppCallback = GetDXUTState().GetIsD3D11DeviceAcceptableFunc(); *ppUserContext = GetDXUTState().GetIsD3D11DeviceAcceptableFuncUserContext(); }
+void WINAPI DXUTSetCallbackD3D11DeviceAcceptable( _In_ LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE pCallback, _In_opt_ void* pUserContext )   { GetDXUTState().SetIsD3D11DeviceAcceptableFunc( pCallback ); GetDXUTState().SetIsD3D11DeviceAcceptableFuncUserContext( pUserContext ); }
+void WINAPI DXUTSetCallbackD3D11DeviceCreated( _In_ LPDXUTCALLBACKD3D11DEVICECREATED pCallback, _In_opt_ void* pUserContext )           { GetDXUTState().SetD3D11DeviceCreatedFunc( pCallback ); GetDXUTState().SetD3D11DeviceCreatedFuncUserContext( pUserContext ); }
+void WINAPI DXUTSetCallbackD3D11SwapChainResized( _In_ LPDXUTCALLBACKD3D11SWAPCHAINRESIZED pCallback, _In_opt_ void* pUserContext )     { GetDXUTState().SetD3D11SwapChainResizedFunc( pCallback );  GetDXUTState().SetD3D11SwapChainResizedFuncUserContext( pUserContext ); }
+void WINAPI DXUTSetCallbackD3D11FrameRender( _In_ LPDXUTCALLBACKD3D11FRAMERENDER pCallback, _In_opt_ void* pUserContext )               { GetDXUTState().SetD3D11FrameRenderFunc( pCallback );  GetDXUTState().SetD3D11FrameRenderFuncUserContext( pUserContext ); }
+void WINAPI DXUTSetCallbackD3D11SwapChainReleasing( _In_ LPDXUTCALLBACKD3D11SWAPCHAINRELEASING pCallback, _In_opt_ void* pUserContext ) { GetDXUTState().SetD3D11SwapChainReleasingFunc( pCallback );  GetDXUTState().SetD3D11SwapChainReleasingFuncUserContext( pUserContext ); }
+void WINAPI DXUTSetCallbackD3D11DeviceDestroyed( _In_ LPDXUTCALLBACKD3D11DEVICEDESTROYED pCallback, _In_opt_ void* pUserContext )       { GetDXUTState().SetD3D11DeviceDestroyedFunc( pCallback );  GetDXUTState().SetD3D11DeviceDestroyedFuncUserContext( pUserContext ); }
+void DXUTGetCallbackD3D11DeviceAcceptable( _In_ LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE* ppCallback, _Outptr_ void** ppUserContext )      { *ppCallback = GetDXUTState().GetIsD3D11DeviceAcceptableFunc(); *ppUserContext = GetDXUTState().GetIsD3D11DeviceAcceptableFuncUserContext(); }
 
 
 //--------------------------------------------------------------------------------------
 // Optionally parses the command line and sets if default hotkeys are handled
 //
 //       Possible command line parameters are:
-//          -forcefeaturelevel:fl     forces app to use a specified direct3D11 feature level    
+//          -forcefeaturelevel:fl     forces app to use a specified direct3D11 feature level
 //          -screenshotexit:filename save a screenshot to the filename.bmp and exit.
-//          -forceapi:#             forces app to use specified Direct3D API version (fails if the application doesn't support this API or if no device is found)
 //          -adapter:#              forces app to use this adapter # (fails if the adapter doesn't exist)
-//          -output:#               [D3D11 only] forces app to use a particular output on the adapter (fails if the output doesn't exist) 
+//          -output:#               forces app to use a particular output on the adapter (fails if the output doesn't exist)
 //          -windowed               forces app to start windowed
 //          -fullscreen             forces app to start full screen
 //          -forcehal               forces app to use HAL (fails if HAL doesn't exist)
 //          -forceref               forces app to use REF (fails if REF doesn't exist)
-//          -forcepurehwvp          [D3D9 only] forces app to use pure HWVP (fails if device doesn't support it)
-//          -forcehwvp              [D3D9 only] forces app to use HWVP (fails if device doesn't support it)
-//          -forceswvp              [D3D9 only] forces app to use SWVP 
-//          -forcevsync:#           if # is 0, then vsync is disabled 
+//          -forcewarp              forces app to use WARP (fails if WARP doesn't exist)
+//          -forcevsync:#           if # is 0, then vsync is disabled
 //          -width:#                forces app to use # for width. for full screen, it will pick the closest possible supported mode
 //          -height:#               forces app to use # for height. for full screen, it will pick the closest possible supported mode
 //          -startx:#               forces app to use # for the x coord of the window position for windowed mode
@@ -728,16 +681,20 @@ void DXUTGetCallbackD3D11DeviceAcceptable( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE
 //          -quitafterframe:x       forces app to quit after # frames
 //          -noerrormsgboxes        prevents the display of message boxes generated by the framework so the application can be run without user interaction
 //          -nostats                prevents the display of the stats
-//          -relaunchmce            re-launches the MCE UI after the app exits
-//          -automation             a hint to other components that automation is active 
+//          -automation             a hint to other components that automation is active
 //--------------------------------------------------------------------------------------
-HRESULT WINAPI DXUTInit( bool bParseCommandLine, 
-                         bool bShowMsgBoxOnError, 
-                         __in_opt WCHAR* strExtraCommandLineParams, 
+_Use_decl_annotations_
+HRESULT WINAPI DXUTInit( bool bParseCommandLine,
+                         bool bShowMsgBoxOnError,
+                         WCHAR* strExtraCommandLineParams,
                          bool bThreadSafeDXUT )
 {
     g_bThreadSafe = bThreadSafeDXUT;
 
+    HRESULT hr = CoInitializeEx( nullptr, COINIT_MULTITHREADED );
+    if ( FAILED(hr) )
+        return hr;
+
     GetDXUTState().SetDXUTInitCalled( true );
 
     // Not always needed, but lets the app create GDI dialogs
@@ -745,15 +702,18 @@ HRESULT WINAPI DXUTInit( bool bParseCommandLine,
 
     // Save the current sticky/toggle/filter key settings so DXUT can restore them later
     STICKYKEYS sk = {sizeof(STICKYKEYS), 0};
-    SystemParametersInfo(SPI_GETSTICKYKEYS, sizeof(STICKYKEYS), &sk, 0);
+    if ( !SystemParametersInfo(SPI_GETSTICKYKEYS, sizeof(STICKYKEYS), &sk, 0) )
+        memset( &sk, 0, sizeof(sk) );
     GetDXUTState().SetStartupStickyKeys( sk );
 
     TOGGLEKEYS tk = {sizeof(TOGGLEKEYS), 0};
-    SystemParametersInfo(SPI_GETTOGGLEKEYS, sizeof(TOGGLEKEYS), &tk, 0);
+   if ( !SystemParametersInfo(SPI_GETTOGGLEKEYS, sizeof(TOGGLEKEYS), &tk, 0) )
+        memset( &tk, 0, sizeof(tk) );
     GetDXUTState().SetStartupToggleKeys( tk );
 
     FILTERKEYS fk = {sizeof(FILTERKEYS), 0};
-    SystemParametersInfo(SPI_GETFILTERKEYS, sizeof(FILTERKEYS), &fk, 0);
+    if ( !SystemParametersInfo(SPI_GETFILTERKEYS, sizeof(FILTERKEYS), &fk, 0) )
+        memset( &fk, 0, sizeof(fk) );
     GetDXUTState().SetStartupFilterKeys( fk );
 
     GetDXUTState().SetShowMsgBoxOnError( bShowMsgBoxOnError );
@@ -773,18 +733,19 @@ HRESULT WINAPI DXUTInit( bool bParseCommandLine,
 
 
 //--------------------------------------------------------------------------------------
-// Parses the command line for parameters.  See DXUTInit() for list 
+// Parses the command line for parameters.  See DXUTInit() for list
 //--------------------------------------------------------------------------------------
-void DXUTParseCommandLine(__inout WCHAR* strCommandLine, 
+_Use_decl_annotations_
+void DXUTParseCommandLine(WCHAR* strCommandLine,
                           bool bIgnoreFirstCommand  )
 {
     WCHAR* strCmdLine;
     WCHAR strFlag[MAX_PATH];
 
     int nNumArgs;
-    LPWSTR* pstrArgList = CommandLineToArgvW( strCommandLine, &nNumArgs );
-	int iArgStart = 0;
-	if( bIgnoreFirstCommand )
+    auto pstrArgList = CommandLineToArgvW( strCommandLine, &nNumArgs );
+    int iArgStart = 0;
+    if( bIgnoreFirstCommand )
         iArgStart = 1;
     for( int iArg = iArgStart; iArg < nNumArgs; iArg++ )
     {
@@ -797,9 +758,20 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
 
             if( DXUTIsNextArg( strCmdLine, L"forcefeaturelevel" ) )
             {
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
+                if( DXUTGetCmdParam( strCmdLine, strFlag, MAX_PATH ) )
                 {
-                    if (_wcsnicmp( strFlag, L"D3D_FEATURE_LEVEL_11_0", MAX_PATH) == 0 ) {
+#if defined(USE_DIRECT3D11_3) || defined(USE_DIRECT3D11_4)
+                    if (_wcsnicmp(strFlag, L"D3D_FEATURE_LEVEL_12_1", MAX_PATH) == 0) {
+                        GetDXUTState().SetOverrideForceFeatureLevel(D3D_FEATURE_LEVEL_12_1);
+                    }
+                    else if (_wcsnicmp(strFlag, L"D3D_FEATURE_LEVEL_12_0", MAX_PATH) == 0) {
+                        GetDXUTState().SetOverrideForceFeatureLevel(D3D_FEATURE_LEVEL_12_0);
+                    }
+                    else
+#endif
+                    if (_wcsnicmp( strFlag, L"D3D_FEATURE_LEVEL_11_1", MAX_PATH) == 0 ) {
+                        GetDXUTState().SetOverrideForceFeatureLevel(D3D_FEATURE_LEVEL_11_1);
+                    }else if (_wcsnicmp( strFlag, L"D3D_FEATURE_LEVEL_11_0", MAX_PATH) == 0 ) {
                         GetDXUTState().SetOverrideForceFeatureLevel(D3D_FEATURE_LEVEL_11_0);
                     }else if (_wcsnicmp( strFlag, L"D3D_FEATURE_LEVEL_10_1", MAX_PATH) == 0 ) {
                         GetDXUTState().SetOverrideForceFeatureLevel(D3D_FEATURE_LEVEL_10_1);
@@ -812,25 +784,13 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
                     }else if (_wcsnicmp( strFlag, L"D3D_FEATURE_LEVEL_9_1", MAX_PATH) == 0 ) {
                         GetDXUTState().SetOverrideForceFeatureLevel(D3D_FEATURE_LEVEL_9_1);
                     }
-
-
-                    continue;
-                }
-            }
-            
-            if( DXUTIsNextArg( strCmdLine, L"forceapi" ) )
-            {
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
-                {
-                    int nAPIVersion = _wtoi( strFlag );
-                    GetDXUTState().SetOverrideForceAPI( nAPIVersion );
                     continue;
                 }
             }
 
             if( DXUTIsNextArg( strCmdLine, L"adapter" ) )
             {
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
+                if( DXUTGetCmdParam( strCmdLine, strFlag, MAX_PATH ) )
                 {
                     int nAdapter = _wtoi( strFlag );
                     GetDXUTState().SetOverrideAdapterOrdinal( nAdapter );
@@ -846,7 +806,7 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
 
             if( DXUTIsNextArg( strCmdLine, L"output" ) )
             {
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
+                if( DXUTGetCmdParam( strCmdLine, strFlag, MAX_PATH ) )
                 {
                     int Output = _wtoi( strFlag );
                     GetDXUTState().SetOverrideOutput( Output );
@@ -866,11 +826,11 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
                 continue;
             }
             if( DXUTIsNextArg( strCmdLine, L"screenshotexit" ) ) {
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
+                if( DXUTGetCmdParam( strCmdLine, strFlag, MAX_PATH ) )
                 {
                     GetDXUTState().SetExitAfterScreenShot( true );
                     GetDXUTState().SetSaveScreenShot( true );
-                    swprintf_s( GetDXUTState().GetScreenShotName(), 256, L"%s.bmp", strFlag );
+                    swprintf_s( GetDXUTState().GetScreenShotName(), 256, L"%ls.bmp", strFlag );
                     continue;
                 }
             }
@@ -879,10 +839,15 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
                 GetDXUTState().SetOverrideForceREF( true );
                 continue;
             }
+            if( DXUTIsNextArg( strCmdLine, L"forcewarp" ) )
+            {
+                GetDXUTState().SetOverrideForceWARP( true );
+                continue;
+            }
 
             if( DXUTIsNextArg( strCmdLine, L"forcevsync" ) )
             {
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
+                if( DXUTGetCmdParam( strCmdLine, strFlag, MAX_PATH ) )
                 {
                     int nOn = _wtoi( strFlag );
                     GetDXUTState().SetOverrideForceVsync( nOn );
@@ -892,7 +857,7 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
 
             if( DXUTIsNextArg( strCmdLine, L"width" ) )
             {
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
+                if( DXUTGetCmdParam( strCmdLine, strFlag, MAX_PATH ) )
                 {
                     int nWidth = _wtoi( strFlag );
                     GetDXUTState().SetOverrideWidth( nWidth );
@@ -902,7 +867,7 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
 
             if( DXUTIsNextArg( strCmdLine, L"height" ) )
             {
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
+                if( DXUTGetCmdParam( strCmdLine, strFlag, MAX_PATH ) )
                 {
                     int nHeight = _wtoi( strFlag );
                     GetDXUTState().SetOverrideHeight( nHeight );
@@ -912,7 +877,7 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
 
             if( DXUTIsNextArg( strCmdLine, L"startx" ) )
             {
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
+                if( DXUTGetCmdParam( strCmdLine, strFlag, MAX_PATH ) )
                 {
                     int nX = _wtoi( strFlag );
                     GetDXUTState().SetOverrideStartX( nX );
@@ -922,7 +887,7 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
 
             if( DXUTIsNextArg( strCmdLine, L"starty" ) )
             {
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
+                if( DXUTGetCmdParam( strCmdLine, strFlag, MAX_PATH ) )
                 {
                     int nY = _wtoi( strFlag );
                     GetDXUTState().SetOverrideStartY( nY );
@@ -933,8 +898,8 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
             if( DXUTIsNextArg( strCmdLine, L"constantframetime" ) )
             {
                 float fTimePerFrame;
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
-                    fTimePerFrame = ( float )wcstod( strFlag, NULL );
+                if( DXUTGetCmdParam( strCmdLine, strFlag, MAX_PATH ) )
+                    fTimePerFrame = ( float )wcstod( strFlag, nullptr );
                 else
                     fTimePerFrame = 0.0333f;
                 GetDXUTState().SetOverrideConstantFrameTime( true );
@@ -945,7 +910,7 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
 
             if( DXUTIsNextArg( strCmdLine, L"quitafterframe" ) )
             {
-                if( DXUTGetCmdParam( strCmdLine, strFlag ) )
+                if( DXUTGetCmdParam( strCmdLine, strFlag, MAX_PATH ) )
                 {
                     int nFrame = _wtoi( strFlag );
                     GetDXUTState().SetOverrideQuitAfterFrame( nFrame );
@@ -965,12 +930,6 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
                 continue;
             }
 
-            if( DXUTIsNextArg( strCmdLine, L"relaunchmce" ) )
-            {
-                GetDXUTState().SetOverrideRelaunchMCE( true );
-                continue;
-            }
-
             if( DXUTIsNextArg( strCmdLine, L"automation" ) )
             {
                 GetDXUTState().SetAutomation( true );
@@ -985,7 +944,7 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
             strSpace++;
         *strSpace = 0;
 
-        DXUTOutputDebugString( L"Unrecognized flag: %s", strFlag );
+        DXUTOutputDebugString( L"Unrecognized flag: %ls", strFlag );
         strCmdLine += wcslen( strFlag );
     }
 
@@ -996,10 +955,11 @@ void DXUTParseCommandLine(__inout WCHAR* strCommandLine,
 //--------------------------------------------------------------------------------------
 // Helper function for DXUTParseCommandLine
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool DXUTIsNextArg( WCHAR*& strCmdLine, const WCHAR* strArg )
 {
-    int nArgLen = ( int )wcslen( strArg );
-    int nCmdLen = ( int )wcslen( strCmdLine );
+    size_t nArgLen = wcslen( strArg );
+    size_t nCmdLen = wcslen( strCmdLine );
 
     if( nCmdLen >= nArgLen &&
         _wcsnicmp( strCmdLine, strArg, nArgLen ) == 0 &&
@@ -1014,21 +974,27 @@ bool DXUTIsNextArg( WCHAR*& strCmdLine, const WCHAR* strArg )
 
 
 //--------------------------------------------------------------------------------------
-// Helper function for DXUTParseCommandLine.  Updates strCmdLine and strFlag 
+// Helper function for DXUTParseCommandLine.  Updates strCmdLine and strFlag
 //      Example: if strCmdLine=="-width:1024 -forceref"
 // then after: strCmdLine==" -forceref" and strFlag=="1024"
 //--------------------------------------------------------------------------------------
-bool DXUTGetCmdParam( WCHAR*& strCmdLine, WCHAR* strFlag )
+_Use_decl_annotations_
+bool DXUTGetCmdParam( WCHAR*& strCmdLine, WCHAR* strFlag, int cchDest )
 {
     if( *strCmdLine == L':' )
     {
         strCmdLine++; // Skip ':'
 
-        // Place NULL terminator in strFlag after current token
-        wcscpy_s( strFlag, MAX_PATH, strCmdLine );
+        // Place nul terminator in strFlag after current token
+        wcscpy_s( strFlag, cchDest, strCmdLine );
+
         WCHAR* strSpace = strFlag;
-        while( *strSpace && ( *strSpace > L' ' ) )
-            strSpace++;
+        int count = 0;
+        while( *strSpace && ( *strSpace > L' ' ) && (count < cchDest) )
+        {
+            ++strSpace;
+            ++count;
+        }
         *strSpace = 0;
 
         // Update strCmdLine
@@ -1044,11 +1010,12 @@ bool DXUTGetCmdParam( WCHAR*& strCmdLine, WCHAR* strFlag )
 
 
 //--------------------------------------------------------------------------------------
-// Creates a window with the specified window title, icon, menu, and 
+// Creates a window with the specified window title, icon, menu, and
 // starting position.  If DXUTInit() has not already been called, it will
-// call it with the default parameters.  Instead of calling this, you can 
-// call DXUTSetWindow() to use an existing window.  
+// call it with the default parameters.  Instead of calling this, you can
+// call DXUTSetWindow() to use an existing window.
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT WINAPI DXUTCreateWindow( const WCHAR* strWindowTitle, HINSTANCE hInstance,
                                  HICON hIcon, HMENU hMenu, int x, int y )
 {
@@ -1074,15 +1041,15 @@ HRESULT WINAPI DXUTCreateWindow( const WCHAR* strWindowTitle, HINSTANCE hInstanc
             return hr;
     }
 
-    if( DXUTGetHWNDFocus() == NULL )
+    if( !DXUTGetHWNDFocus() )
     {
-        if( hInstance == NULL )
-            hInstance = ( HINSTANCE )GetModuleHandle( NULL );
+        if( !hInstance )
+            hInstance = ( HINSTANCE )GetModuleHandle( nullptr );
         GetDXUTState().SetHInstance( hInstance );
 
         WCHAR szExePath[MAX_PATH];
-        GetModuleFileName( NULL, szExePath, MAX_PATH );
-        if( hIcon == NULL ) // If the icon is NULL, then use the first one found in the exe
+        GetModuleFileName( nullptr, szExePath, MAX_PATH );
+        if( !hIcon ) // If the icon is NULL, then use the first one found in the exe
             hIcon = ExtractIcon( hInstance, szExePath, 0 );
 
         // Register the windows class
@@ -1093,9 +1060,9 @@ HRESULT WINAPI DXUTCreateWindow( const WCHAR* strWindowTitle, HINSTANCE hInstanc
         wndClass.cbWndExtra = 0;
         wndClass.hInstance = hInstance;
         wndClass.hIcon = hIcon;
-        wndClass.hCursor = LoadCursor( NULL, IDC_ARROW );
+        wndClass.hCursor = LoadCursor( nullptr, IDC_ARROW );
         wndClass.hbrBackground = ( HBRUSH )GetStockObject( BLACK_BRUSH );
-        wndClass.lpszMenuName = NULL;
+        wndClass.lpszMenuName = nullptr;
         wndClass.lpszClassName = L"Direct3DWindowClass";
 
         if( !RegisterClass( &wndClass ) )
@@ -1116,8 +1083,8 @@ HRESULT WINAPI DXUTCreateWindow( const WCHAR* strWindowTitle, HINSTANCE hInstanc
             GetDXUTState().SetWindowCreatedWithDefaultPositions( true );
 
         // Find the window's initial size, but it might be changed later
-        int nDefaultWidth = 640;
-        int nDefaultHeight = 480;
+        int nDefaultWidth = 800;
+        int nDefaultHeight = 600;
         if( GetDXUTState().GetOverrideWidth() != 0 )
             nDefaultWidth = GetDXUTState().GetOverrideWidth();
         if( GetDXUTState().GetOverrideHeight() != 0 )
@@ -1125,7 +1092,7 @@ HRESULT WINAPI DXUTCreateWindow( const WCHAR* strWindowTitle, HINSTANCE hInstanc
 
         RECT rc;
         SetRect( &rc, 0, 0, nDefaultWidth, nDefaultHeight );
-        AdjustWindowRect( &rc, WS_OVERLAPPEDWINDOW, ( hMenu != NULL ) ? true : false );
+        AdjustWindowRect( &rc, WS_OVERLAPPEDWINDOW, ( hMenu ) ? true : false );
 
         WCHAR* strCachedWindowTitle = GetDXUTState().GetWindowTitle();
         wcscpy_s( strCachedWindowTitle, 256, strWindowTitle );
@@ -1134,7 +1101,7 @@ HRESULT WINAPI DXUTCreateWindow( const WCHAR* strWindowTitle, HINSTANCE hInstanc
         HWND hWnd = CreateWindow( L"Direct3DWindowClass", strWindowTitle, WS_OVERLAPPEDWINDOW,
                                   x, y, ( rc.right - rc.left ), ( rc.bottom - rc.top ), 0,
                                   hMenu, hInstance, 0 );
-        if( hWnd == NULL )
+        if( !hWnd )
         {
             DWORD dwError = GetLastError();
             return DXUT_ERR_MSGBOX( L"CreateWindow", HRESULT_FROM_WIN32(dwError) );
@@ -1151,10 +1118,11 @@ HRESULT WINAPI DXUTCreateWindow( const WCHAR* strWindowTitle, HINSTANCE hInstanc
 
 
 //--------------------------------------------------------------------------------------
-// Sets a previously created window for the framework to use.  If DXUTInit() 
-// has not already been called, it will call it with the default parameters.  
-// Instead of calling this, you can call DXUTCreateWindow() to create a new window.  
+// Sets a previously created window for the framework to use.  If DXUTInit()
+// has not already been called, it will call it with the default parameters.
+// Instead of calling this, you can call DXUTCreateWindow() to create a new window.
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT WINAPI DXUTSetWindow( HWND hWndFocus, HWND hWndDeviceFullScreen, HWND hWndDeviceWindowed, bool bHandleMessages )
 {
     HRESULT hr;
@@ -1165,10 +1133,10 @@ HRESULT WINAPI DXUTSetWindow( HWND hWndFocus, HWND hWndDeviceFullScreen, HWND hW
 
     GetDXUTState().SetWindowCreateCalled( true );
 
-    // To avoid confusion, we do not allow any HWND to be NULL here.  The
+    // To avoid confusion, we do not allow any HWND to be nullptr here.  The
     // caller must pass in valid HWND for all three parameters.  The same
     // HWND may be used for more than one parameter.
-    if( hWndFocus == NULL || hWndDeviceFullScreen == NULL || hWndDeviceWindowed == NULL )
+    if( !hWndFocus || !hWndDeviceFullScreen || !hWndDeviceWindowed )
         return DXUT_ERR_MSGBOX( L"DXUTSetWindow", E_INVALIDARG );
 
     // If subclassing the window, set the pointer to the local window procedure
@@ -1213,11 +1181,12 @@ HRESULT WINAPI DXUTSetWindow( HWND hWndFocus, HWND hWndDeviceFullScreen, HWND hW
 
 
 //--------------------------------------------------------------------------------------
-// Handles window messages 
+// Handles window messages
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
-    
+
     // Consolidate the keyboard messages and pass them to the app's keyboard callback
     if( uMsg == WM_KEYDOWN ||
         uMsg == WM_SYSKEYDOWN ||
@@ -1289,7 +1258,9 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
                             xPos, yPos, GetDXUTState().GetMouseFuncUserContext() );
     }
 
-    // Pass all messages to the app's MsgProc callback, and don't 
+    // TODO - WM_POINTER for touch when on Windows 8.0
+
+    // Pass all messages to the app's MsgProc callback, and don't
     // process further messages if the apps says not to.
     LPDXUTCALLBACKMSGPROC pCallbackMsgProc = GetDXUTState().GetWindowMsgFunc();
     if( pCallbackMsgProc )
@@ -1305,7 +1276,6 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
     {
         case WM_PAINT:
         {
-            
             // Handle paint messages when the app is paused
             if( DXUTIsRenderingPaused() &&
                 GetDXUTState().GetDeviceObjectsCreated() && GetDXUTState().GetDeviceObjectsReset() )
@@ -1314,49 +1284,13 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
                 double fTime = DXUTGetTime();
                 float fElapsedTime = DXUTGetElapsedTime();
 
-                if( DXUTIsCurrentDeviceD3D9() )
-                {
-                    IDirect3DDevice9* pd3dDevice = DXUTGetD3D9Device();
-                    if( pd3dDevice )
-                    {
-                        LPDXUTCALLBACKD3D9FRAMERENDER pCallbackFrameRender = GetDXUTState().GetD3D9FrameRenderFunc();
-                        if( pCallbackFrameRender != NULL )
-                            pCallbackFrameRender( pd3dDevice, fTime, fElapsedTime,
-                                                  GetDXUTState().GetD3D9FrameRenderFuncUserContext() );
-
-                        hr = pd3dDevice->Present( NULL, NULL, NULL, NULL );
-                        if( D3DERR_DEVICELOST == hr )
-                        {
-                            GetDXUTState().SetDeviceLost( true );
-                        }
-                        else if( D3DERR_DRIVERINTERNALERROR == hr )
-                        {
-                            // When D3DERR_DRIVERINTERNALERROR is returned from Present(),
-                            // the application can do one of the following:
-                            // 
-                            // - End, with the pop-up window saying that the application cannot continue 
-                            //   because of problems in the display adapter and that the user should 
-                            //   contact the adapter manufacturer.
-                            //
-                            // - Attempt to restart by calling IDirect3DDevice9::Reset, which is essentially the same 
-                            //   path as recovering from a lost device. If IDirect3DDevice9::Reset fails with 
-                            //   D3DERR_DRIVERINTERNALERROR, the application should end immediately with the message 
-                            //   that the user should contact the adapter manufacturer.
-                            // 
-                            // The framework attempts the path of resetting the device
-                            // 
-                            GetDXUTState().SetDeviceLost( true );
-                        }
-                    }
-                }
-               else
                 {
-                    ID3D11Device* pd3dDevice = DXUTGetD3D11Device();
-                    ID3D11DeviceContext *pDeferred = DXUTGetD3D11DeviceContext();
+                    auto pd3dDevice = DXUTGetD3D11Device();
+                    auto pDeferred = DXUTGetD3D11DeviceContext();
                     if( pd3dDevice )
                     {
                         LPDXUTCALLBACKD3D11FRAMERENDER pCallbackFrameRender = GetDXUTState().GetD3D11FrameRenderFunc();
-                        if( pCallbackFrameRender != NULL &&
+                        if( pCallbackFrameRender &&
                             !GetDXUTState().GetRenderingOccluded() )
                         {
                             pCallbackFrameRender( pd3dDevice,pDeferred, fTime, fElapsedTime,
@@ -1369,8 +1303,8 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
                         else
                             dwFlags = GetDXUTState().GetCurrentDeviceSettings()->d3d11.PresentFlags;
 
-                        IDXGISwapChain* pSwapChain = DXUTGetDXGISwapChain();
-                        hr = pSwapChain->Present( 0, GetDXUTState().GetCurrentDeviceSettings()->d3d11.PresentFlags );
+                        auto pSwapChain = DXUTGetDXGISwapChain();
+                        hr = pSwapChain->Present( 0, dwFlags );
                         if( DXGI_STATUS_OCCLUDED == hr )
                         {
                             // There is a window covering our entire rendering area.
@@ -1393,7 +1327,7 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
         }
 
         case WM_SIZE:
-            
+
            if( SIZE_MINIMIZED == wParam )
             {
                 DXUTPause( true, true ); // Pause while we're minimized
@@ -1408,7 +1342,7 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
                 if( rcCurrentClient.top == 0 && rcCurrentClient.bottom == 0 )
                 {
                     // Rapidly clicking the task bar to minimize and restore a window
-                    // can cause a WM_SIZE message with SIZE_RESTORED when 
+                    // can cause a WM_SIZE message with SIZE_RESTORED when
                     // the window has actually become minimized due to rapid change
                     // so just ignore this message
                 }
@@ -1439,24 +1373,22 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
                     }
                     else if( GetDXUTState().GetInSizeMove() )
                     {
-                        // If we're neither maximized nor minimized, the window size 
-                        // is changing by the user dragging the window edges.  In this 
-                        // case, we don't reset the device yet -- we wait until the 
+                        // If we're neither maximized nor minimized, the window size
+                        // is changing by the user dragging the window edges.  In this
+                        // case, we don't reset the device yet -- we wait until the
                         // user stops dragging, and a WM_EXITSIZEMOVE message comes.
                     }
                     else
                     {
-                        // This WM_SIZE come from resizing the window via an API like SetWindowPos() so 
+                        // This WM_SIZE come from resizing the window via an API like SetWindowPos() so
                         // resize and reset the device now.
                         DXUTCheckForWindowSizeChange();
                         DXUTCheckForWindowChangingMonitors();
                     }
                 }
             }
-            
             break;
 
-
         case WM_GETMINMAXINFO:
             ( ( MINMAXINFO* )lParam )->ptMinTrackSize.x = DXUT_MIN_WINDOW_SIZE_X;
             ( ( MINMAXINFO* )lParam )->ptMinTrackSize.y = DXUT_MIN_WINDOW_SIZE_Y;
@@ -1475,48 +1407,18 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
             GetDXUTState().SetInSizeMove( false );
             break;
 
-        case WM_MOUSEMOVE:
-            if( DXUTIsActive() && !DXUTIsWindowed() )
-            {
-                if( DXUTIsCurrentDeviceD3D9() )
-                {
-                    IDirect3DDevice9* pd3dDevice = DXUTGetD3D9Device();
-                    if( pd3dDevice )
-                    {
-                        POINT ptCursor;
-                        GetCursorPos( &ptCursor );
-                        pd3dDevice->SetCursorPosition( ptCursor.x, ptCursor.y, 0 );
-                    }
-                }
-                else
-                {
-                    // For D3D11, no processing is necessary.  D3D11 cursor
-                    // is handled in the traditional Windows manner.
-                }
-            }
-            break;
-
         case WM_SETCURSOR:
             if( DXUTIsActive() && !DXUTIsWindowed() )
             {
-                if( DXUTIsCurrentDeviceD3D9() )
-                {
-                    IDirect3DDevice9* pd3dDevice = DXUTGetD3D9Device();
-                    if( pd3dDevice && GetDXUTState().GetShowCursorWhenFullScreen() )
-                        pd3dDevice->ShowCursor( true );
-                }
-                else
-                {
-                    if( !GetDXUTState().GetShowCursorWhenFullScreen() )
-                        SetCursor( NULL );
-                }
+                if( !GetDXUTState().GetShowCursorWhenFullScreen() )
+                    SetCursor( nullptr );
 
                 return true; // prevent Windows from setting cursor to window class cursor
             }
             break;
 
         case WM_ACTIVATEAPP:
-            if( wParam == TRUE && !DXUTIsActive() ) // Handle only if previously not active 
+            if( wParam == TRUE && !DXUTIsActive() ) // Handle only if previously not active
             {
                 GetDXUTState().SetActive( true );
 
@@ -1524,27 +1426,22 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
                 DXUTEnableXInput( true );
 
                 // The GetMinimizedWhileFullscreen() varible is used instead of !DXUTIsWindowed()
-                // to handle the rare case toggling to windowed mode while the fullscreen application 
+                // to handle the rare case toggling to windowed mode while the fullscreen application
                 // is minimized and thus making the pause count wrong
                 if( GetDXUTState().GetMinimizedWhileFullscreen() )
                 {
-                    if( DXUTIsD3D9( GetDXUTState().GetCurrentDeviceSettings() ) )
-                        DXUTPause( false, false ); // Unpause since we're no longer minimized
                     GetDXUTState().SetMinimizedWhileFullscreen( false );
 
-                    if( DXUTIsAppRenderingWithD3D11() )
-                    {
-                      DXUTToggleFullScreen();
-                    }
+                    DXUTToggleFullScreen();
                 }
 
-                // Upon returning to this app, potentially disable shortcut keys 
-                // (Windows key, accessibility shortcuts) 
+                // Upon returning to this app, potentially disable shortcut keys
+                // (Windows key, accessibility shortcuts)
                 DXUTAllowShortcutKeys( ( DXUTIsWindowed() ) ? GetDXUTState().GetAllowShortcutKeysWhenWindowed() :
                                        GetDXUTState().GetAllowShortcutKeysWhenFullscreen() );
 
             }
-            else if( wParam == FALSE && DXUTIsActive() ) // Handle only if previously active 
+            else if( wParam == FALSE && DXUTIsActive() ) // Handle only if previously active
             {
                 GetDXUTState().SetActive( false );
 
@@ -1553,17 +1450,15 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
 
                 if( !DXUTIsWindowed() )
                 {
-                    // Going from full screen to a minimized state 
-                    ClipCursor( NULL );      // don't limit the cursor anymore
-                    if( DXUTIsD3D9( GetDXUTState().GetCurrentDeviceSettings() ) )
-                        DXUTPause( true, true ); // Pause while we're minimized (take care not to pause twice by handling this message twice)
+                    // Going from full screen to a minimized state
+                    ClipCursor( nullptr );      // don't limit the cursor anymore
                     GetDXUTState().SetMinimizedWhileFullscreen( true );
                 }
 
                 // Restore shortcut keys (Windows key, accessibility shortcuts) to original state
                 //
-                // This is important to call here if the shortcuts are disabled, 
-                // because if this is not done then the Windows key will continue to 
+                // This is important to call here if the shortcuts are disabled,
+                // because if this is not done then the Windows key will continue to
                 // be disabled while this app is running which is very bad.
                 // If the app crashes, the Windows key will return to normal.
                 DXUTAllowShortcutKeys( true );
@@ -1594,9 +1489,6 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
         case WM_POWERBROADCAST:
             switch( wParam )
             {
-#ifndef PBT_APMQUERYSUSPEND
-#define PBT_APMQUERYSUSPEND 0x0000
-#endif
                 case PBT_APMQUERYSUSPEND:
                     // At this point, the app should save any data for open
                     // network connections, files, etc., and prepare to go into
@@ -1604,9 +1496,6 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
                     // to handle this if desired.
                     return true;
 
-#ifndef PBT_APMRESUMESUSPEND
-#define PBT_APMRESUMESUSPEND 0x0007
-#endif
                 case PBT_APMRESUMESUSPEND:
                     // At this point, the app should recover any data, network
                     // connections, files, etc., and resume running from when
@@ -1635,31 +1524,6 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
             }
             break;
 
-        case WM_SYSKEYDOWN:
-        {
-            switch( wParam )
-            {
-                case VK_RETURN:
-                {
-                    if( GetDXUTState().GetHandleAltEnter() && DXUTIsAppRenderingWithD3D9() )
-                    {
-                        // Toggle full screen upon alt-enter 
-                        DWORD dwMask = ( 1 << 29 );
-                        if( ( lParam & dwMask ) != 0 ) // Alt is down also
-                        {
-                            // Toggle the full screen/window mode
-                            DXUTPause( true, true );
-                            DXUTToggleFullScreen();
-                            DXUTPause( false, false );
-                            return 0;
-                        }
-                    }
-                   
-                }
-            }
-            break;
-        }
-
         case WM_KEYDOWN:
         {
             switch( wParam )
@@ -1692,25 +1556,30 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
         {
             HMENU hMenu;
             hMenu = GetMenu( hWnd );
-            if( hMenu != NULL )
+            if( hMenu )
                 DestroyMenu( hMenu );
             DestroyWindow( hWnd );
-            UnregisterClass( L"Direct3DWindowClass", NULL );
-            GetDXUTState().SetHWNDFocus( NULL );
-            GetDXUTState().SetHWNDDeviceFullScreen( NULL );
-            GetDXUTState().SetHWNDDeviceWindowed( NULL );
+            UnregisterClass( L"Direct3DWindowClass", nullptr );
+            GetDXUTState().SetHWNDFocus( nullptr );
+            GetDXUTState().SetHWNDDeviceFullScreen( nullptr );
+            GetDXUTState().SetHWNDDeviceWindowed( nullptr );
             return 0;
         }
 
         case WM_DESTROY:
-            PostQuitMessage( 0 );
-            break;
+        {
+            LPDXUTCALLBACKQUIT pQuitCallback = GetDXUTState().GetQuitFunc();
+            if (pQuitCallback)
+            {
+                pQuitCallback(GetDXUTState().GetQuitFuncUserContext());
+            }
+        }
     }
 
     // Don't allow the F10 key to act as a shortcut to the menu bar
     // by not passing these messages to the DefWindowProc only when
     // there's no menu present
-    if( !GetDXUTState().GetCallDefWindowProc() || GetDXUTState().GetMenu() == NULL &&
+    if( !GetDXUTState().GetCallDefWindowProc() || !GetDXUTState().GetMenu() &&
         ( uMsg == WM_SYSKEYDOWN || uMsg == WM_SYSKEYUP ) && wParam == VK_F10 )
         return 0;
     else
@@ -1719,10 +1588,10 @@ LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
 
 
 //--------------------------------------------------------------------------------------
-// Handles app's message loop and rendering when idle.  If DXUTCreateDevice() or DXUTSetD3D*Device() 
-// has not already been called, it will call DXUTCreateWindow() with the default parameters.  
+// Handles app's message loop and rendering when idle.  If DXUTCreateDevice()
+// has not already been called, it will call DXUTCreateWindow() with the default parameters.
 //--------------------------------------------------------------------------------------
-HRESULT WINAPI DXUTMainLoop( HACCEL hAccel )
+HRESULT WINAPI DXUTMainLoop( _In_opt_ HACCEL hAccel )
 {
     HRESULT hr;
 
@@ -1736,8 +1605,8 @@ HRESULT WINAPI DXUTMainLoop( HACCEL hAccel )
 
     GetDXUTState().SetInsideMainloop( true );
 
-    // If DXUTCreateDevice() or DXUTSetD3D*Device() has not already been called, 
-    // then call DXUTCreateDevice() with the default parameters.         
+    // If DXUTCreateDevice() has not already been called,
+    // then call DXUTCreateDevice() with the default parameters.
     if( !GetDXUTState().GetDeviceCreated() )
     {
         if( GetDXUTState().GetDeviceCreateCalled() )
@@ -1747,7 +1616,7 @@ HRESULT WINAPI DXUTMainLoop( HACCEL hAccel )
             return E_FAIL; // DXUTCreateDevice() must first succeed for this function to succeed
         }
 
-        hr = DXUTCreateDevice(D3D_FEATURE_LEVEL_10_0, true, 640, 480);
+        hr = DXUTCreateDevice(D3D_FEATURE_LEVEL_10_0, true, 800, 600);
         if( FAILED( hr ) )
         {
             if( ( GetDXUTState().GetExitCode() == 0 ) || ( GetDXUTState().GetExitCode() == 10 ) )
@@ -1760,7 +1629,7 @@ HRESULT WINAPI DXUTMainLoop( HACCEL hAccel )
 
     // DXUTInit() must have been called and succeeded for this function to proceed
     // DXUTCreateWindow() or DXUTSetWindow() must have been called and succeeded for this function to proceed
-    // DXUTCreateDevice() or DXUTCreateDeviceFromSettings() or DXUTSetD3D*Device() must have been called and succeeded for this function to proceed
+    // DXUTCreateDevice() or DXUTCreateDeviceFromSettings() must have been called and succeeded for this function to proceed
     if( !GetDXUTState().GetDXUTInited() || !GetDXUTState().GetWindowCreated() || !GetDXUTState().GetDeviceCreated() )
     {
         if( ( GetDXUTState().GetExitCode() == 0 ) || ( GetDXUTState().GetExitCode() == 10 ) )
@@ -1772,17 +1641,17 @@ HRESULT WINAPI DXUTMainLoop( HACCEL hAccel )
     bool bGotMsg;
     MSG msg;
     msg.message = WM_NULL;
-    PeekMessage( &msg, NULL, 0U, 0U, PM_NOREMOVE );
+    PeekMessage( &msg, nullptr, 0U, 0U, PM_NOREMOVE );
 
     while( WM_QUIT != msg.message )
     {
-        // Use PeekMessage() so we can use idle time to render the scene. 
-        bGotMsg = ( PeekMessage( &msg, NULL, 0U, 0U, PM_REMOVE ) != 0 );
+        // Use PeekMessage() so we can use idle time to render the scene.
+        bGotMsg = ( PeekMessage( &msg, nullptr, 0U, 0U, PM_REMOVE ) != 0 );
 
         if( bGotMsg )
         {
             // Translate and dispatch the message
-            if( hAccel == NULL || hWnd == NULL ||
+            if( !hAccel || !hWnd ||
                 0 == TranslateAccelerator( hWnd, hAccel, &msg ) )
             {
                 TranslateMessage( &msg );
@@ -1797,7 +1666,7 @@ HRESULT WINAPI DXUTMainLoop( HACCEL hAccel )
     }
 
     // Cleanup the accelerator table
-    if( hAccel != NULL )
+    if( hAccel )
         DestroyAcceleratorTable( hAccel );
 
     GetDXUTState().SetInsideMainloop( false );
@@ -1811,18 +1680,19 @@ HRESULT WINAPI DXUTMainLoop( HACCEL hAccel )
 // Direct3D section
 //======================================================================================
 //======================================================================================
-HRESULT WINAPI DXUTCreateDevice(D3D_FEATURE_LEVEL reqFL,  bool bWindowed, int nSuggestedWidth, int nSuggestedHeight) {
+_Use_decl_annotations_
+HRESULT WINAPI DXUTCreateDevice(D3D_FEATURE_LEVEL reqFL,  bool bWindowed, int nSuggestedWidth, int nSuggestedHeight)
+{
     HRESULT hr = S_OK;
-    
-   
+
     // Not allowed to call this from inside the device callbacks
     if( GetDXUTState().GetInsideDeviceCallback() )
-        return DXUT_ERR_MSGBOX( L"DXUTCreateWindow", E_FAIL );
+        return DXUT_ERR_MSGBOX( L"DXUTCreateDevice", E_FAIL );
 
     GetDXUTState().SetDeviceCreateCalled( true );
 
-    // If DXUTCreateWindow() or DXUTSetWindow() has not already been called, 
-    // then call DXUTCreateWindow() with the default parameters.         
+    // If DXUTCreateWindow() or DXUTSetWindow() has not already been called,
+    // then call DXUTCreateWindow() with the default parameters.
     if( !GetDXUTState().GetWindowCreated() )
     {
         // If DXUTCreateWindow() or DXUTSetWindow() was already called and failed, then fail.
@@ -1830,104 +1700,90 @@ HRESULT WINAPI DXUTCreateDevice(D3D_FEATURE_LEVEL reqFL,  bool bWindowed, int nS
         if( GetDXUTState().GetWindowCreateCalled() )
             return E_FAIL;
 
-        // If DXUTCreateWindow() or DXUTSetWindow() hasn't been called, then 
+        // If DXUTCreateWindow() or DXUTSetWindow() hasn't been called, then
         // automatically call DXUTCreateWindow() with default params
         hr = DXUTCreateWindow();
         if( FAILED( hr ) )
             return hr;
     }
-    
-    DXUTDeviceSettings deviceSettings ;
+
+    DXUTDeviceSettings deviceSettings;
     DXUTApplyDefaultDeviceSettings(&deviceSettings);
     deviceSettings.MinimumFeatureLevel = reqFL;
     deviceSettings.d3d11.sd.BufferDesc.Width = nSuggestedWidth;
     deviceSettings.d3d11.sd.BufferDesc.Height = nSuggestedHeight;
     deviceSettings.d3d11.sd.Windowed = bWindowed;
 
-    deviceSettings.d3d9.pp.Windowed = bWindowed;
-    deviceSettings.d3d9.pp.BackBufferWidth= nSuggestedWidth;
-    deviceSettings.d3d9.pp.BackBufferHeight = nSuggestedHeight;
-
-    bool bAppSupportsD3D9 = DXUTDoesAppSupportD3D9();
-    bool bAppSupportsD3D11 = DXUTDoesAppSupportD3D11();
-
-    if (bAppSupportsD3D11) {
-        deviceSettings.ver = DXUT_D3D11_DEVICE;
-    }
-    else if (bAppSupportsD3D9) {
-        deviceSettings.ver = DXUT_D3D9_DEVICE;
-    }
+    DXUTUpdateDeviceSettingsWithOverrides(&deviceSettings);
 
-    DXUTUpdateDeviceSettingsWithOverrides(&deviceSettings); 
+    GetDXUTState().SetWindowBackBufferWidthAtModeChange(deviceSettings.d3d11.sd.BufferDesc.Width);
+    GetDXUTState().SetWindowBackBufferHeightAtModeChange(deviceSettings.d3d11.sd.BufferDesc.Height);
+    GetDXUTState().SetFullScreenBackBufferWidthAtModeChange(deviceSettings.d3d11.sd.BufferDesc.Width);
+    GetDXUTState().SetFullScreenBackBufferHeightAtModeChange(deviceSettings.d3d11.sd.BufferDesc.Height);
 
-    // Change to a Direct3D device created from the new device settings.  
+    // Change to a Direct3D device created from the new device settings.
     // If there is an existing device, then either reset or recreated the scene
-    hr = DXUTChangeDevice( &deviceSettings, NULL, NULL, false, true );
+    hr = DXUTChangeDevice( &deviceSettings, true );
 
-    if ( hr ==  DXUTERR_NODIRECT3D11 && GetDXUTState().GetMessageWhenD3D11NotAvailable() ) {
-        
+    if ( hr ==  DXUTERR_NODIRECT3D && GetDXUTState().GetMessageWhenD3D11NotAvailable() )
+    {
         OSVERSIONINFOEX osv;
         memset( &osv, 0, sizeof(osv) );
         osv.dwOSVersionInfoSize = sizeof(osv);
+#pragma warning( suppress : 4996 28159 )
         GetVersionEx( (LPOSVERSIONINFO)&osv );
-        
 
         if ( ( osv.dwMajorVersion > 6 )
-            || ( osv.dwMajorVersion == 6 && osv.dwMinorVersion >= 1 ) 
+            || ( osv.dwMajorVersion == 6 && osv.dwMinorVersion >= 1 )
             || ( osv.dwMajorVersion == 6 && osv.dwMinorVersion == 0 && osv.dwBuildNumber > 6002 ) )
         {
-
             MessageBox( 0, L"Direct3D 11 components were not found.", L"Error", MB_ICONEXCLAMATION );
            // This should not happen, but is here for completeness as the system could be
            // corrupted or some future OS version could pull D3D11.DLL for some reason
         }
         else if ( osv.dwMajorVersion == 6 && osv.dwMinorVersion == 0 && osv.dwBuildNumber == 6002 )
         {
-
             MessageBox( 0, L"Direct3D 11 components were not found, but are available for"\
             L" this version of Windows.\n"\
             L"For details see Microsoft Knowledge Base Article #971644\n"\
             L"http://go.microsoft.com/fwlink/?LinkId=160189", L"Error", MB_ICONEXCLAMATION );
-           
         }
         else if ( osv.dwMajorVersion == 6 && osv.dwMinorVersion == 0 )
         {
             MessageBox( 0, L"Direct3D 11 components were not found. Please install the latest Service Pack.\n"\
             L"For details see Microsoft Knowledge Base Article #935791\n"\
             L"http://support.microsoft.com/kb/935791/", L"Error", MB_ICONEXCLAMATION );
-            
         }
         else
         {
             MessageBox( 0, L"Direct3D 11 is not supported on this OS.", L"Error", MB_ICONEXCLAMATION );
         }
-
-
-
     }
 
-
     if( FAILED( hr ) )
         return hr;
-    
+
     return hr;
 }
 
+
 //--------------------------------------------------------------------------------------
 // Tells the framework to change to a device created from the passed in device settings
-// If DXUTCreateWindow() has not already been called, it will call it with the 
-// default parameters.  Instead of calling this, you can call DXUTCreateDevice() 
-// or DXUTSetD3D*Device() 
+// If DXUTCreateWindow() has not already been called, it will call it with the
+// default parameters.  Instead of calling this, you can call DXUTCreateDevice()
 //--------------------------------------------------------------------------------------
-HRESULT WINAPI DXUTCreateDeviceFromSettings( DXUTDeviceSettings* pDeviceSettings, bool bPreserveInput,
-                                             bool bClipWindowToSingleAdapter )
+_Use_decl_annotations_
+HRESULT WINAPI DXUTCreateDeviceFromSettings( DXUTDeviceSettings* pDeviceSettings, bool bClipWindowToSingleAdapter )
 {
+    if ( !pDeviceSettings )
+        return E_INVALIDARG;
+
     HRESULT hr;
 
     GetDXUTState().SetDeviceCreateCalled( true );
 
-    // If DXUTCreateWindow() or DXUTSetWindow() has not already been called, 
-    // then call DXUTCreateWindow() with the default parameters.         
+    // If DXUTCreateWindow() or DXUTSetWindow() has not already been called,
+    // then call DXUTCreateWindow() with the default parameters.
     if( !GetDXUTState().GetWindowCreated() )
     {
         // If DXUTCreateWindow() or DXUTSetWindow() was already called and failed, then fail.
@@ -1935,18 +1791,23 @@ HRESULT WINAPI DXUTCreateDeviceFromSettings( DXUTDeviceSettings* pDeviceSettings
         if( GetDXUTState().GetWindowCreateCalled() )
             return E_FAIL;
 
-        // If DXUTCreateWindow() or DXUTSetWindow() hasn't been called, then 
+        // If DXUTCreateWindow() or DXUTSetWindow() hasn't been called, then
         // automatically call DXUTCreateWindow() with default params
         hr = DXUTCreateWindow();
         if( FAILED( hr ) )
             return hr;
     }
-    DXUTUpdateDeviceSettingsWithOverrides(pDeviceSettings); 
 
-    
-    // Change to a Direct3D device created from the new device settings.  
+    DXUTUpdateDeviceSettingsWithOverrides(pDeviceSettings);
+
+    GetDXUTState().SetWindowBackBufferWidthAtModeChange(pDeviceSettings->d3d11.sd.BufferDesc.Width);
+    GetDXUTState().SetWindowBackBufferHeightAtModeChange(pDeviceSettings->d3d11.sd.BufferDesc.Height);
+    GetDXUTState().SetFullScreenBackBufferWidthAtModeChange(pDeviceSettings->d3d11.sd.BufferDesc.Width);
+    GetDXUTState().SetFullScreenBackBufferHeightAtModeChange(pDeviceSettings->d3d11.sd.BufferDesc.Height);
+
+    // Change to a Direct3D device created from the new device settings.
     // If there is an existing device, then either reset or recreate the scene
-    hr = DXUTChangeDevice( pDeviceSettings, NULL, NULL, false, bClipWindowToSingleAdapter );
+    hr = DXUTChangeDevice( pDeviceSettings, bClipWindowToSingleAdapter );
     if( FAILED( hr ) )
         return hr;
 
@@ -1955,51 +1816,38 @@ HRESULT WINAPI DXUTCreateDeviceFromSettings( DXUTDeviceSettings* pDeviceSettings
 
 
 //--------------------------------------------------------------------------------------
-// All device changes are sent to this function.  It looks at the current 
-// device (if any) and the new device and determines the best course of action.  It 
+// All device changes are sent to this function.  It looks at the current
+// device (if any) and the new device and determines the best course of action.  It
 // also remembers and restores the window state if toggling between windowed and fullscreen
 // as well as sets the proper window and system state for switching to the new device.
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
-                          IDirect3DDevice9* pd3d9DeviceFromApp, 
-                          ID3D11Device* pd3d11DeviceFromApp,
-                          bool bForceRecreate, bool bClipWindowToSingleAdapter )
+                          bool bClipWindowToSingleAdapter )
 {
+    if ( GetDXUTState().GetReleasingSwapChain() )
+        return S_FALSE;
+
     HRESULT hr = S_OK;
     DXUTDeviceSettings* pOldDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
 
     if( !pNewDeviceSettings )
         return S_FALSE;
 
-
-
-    if ( pNewDeviceSettings->ver == DXUT_D3D11_DEVICE ) {
-        hr = DXUTDelayLoadDXGI();
-    }
-
-
-    if ( pNewDeviceSettings->ver == DXUT_D3D9_DEVICE || 
-        ( FAILED( hr ) && DXUTDoesAppSupportD3D9() ) ) {
-        hr = DXUTDelayLoadD3D9();
-        pNewDeviceSettings->ver = DXUT_D3D9_DEVICE;
-        if ( !FAILED( hr ) ) {
-            pNewDeviceSettings->ver = DXUT_D3D9_DEVICE;
-        }
-    }
+    hr = DXUTDelayLoadDXGI();
 
     if( FAILED( hr ) )
         return hr;
 
     // Make a copy of the pNewDeviceSettings on the heap
-    DXUTDeviceSettings* pNewDeviceSettingsOnHeap = new DXUTDeviceSettings;
-    if( pNewDeviceSettingsOnHeap == NULL )
+    DXUTDeviceSettings* pNewDeviceSettingsOnHeap = new (std::nothrow) DXUTDeviceSettings;
+    if( !pNewDeviceSettingsOnHeap )
         return E_OUTOFMEMORY;
     memcpy( pNewDeviceSettingsOnHeap, pNewDeviceSettings, sizeof( DXUTDeviceSettings ) );
     pNewDeviceSettings = pNewDeviceSettingsOnHeap;
 
-
     GetDXUTState().SetCurrentDeviceSettings(pNewDeviceSettingsOnHeap);
-    DXUTSnapDeviceSettingsToEnumDevice(pNewDeviceSettingsOnHeap, false);
+    hr = DXUTSnapDeviceSettingsToEnumDevice(pNewDeviceSettingsOnHeap, false);
 
     if( FAILED( hr ) ) // the call will fail if no valid devices were found
     {
@@ -2007,22 +1855,22 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
         return DXUT_ERR( L"DXUTFindValidDeviceSettings", hr );
     }
 
-    // If the ModifyDeviceSettings callback is non-NULL, then call it to let the app 
+    // If the ModifyDeviceSettings callback is non-NULL, then call it to let the app
     // change the settings or reject the device change by returning false.
     LPDXUTCALLBACKMODIFYDEVICESETTINGS pCallbackModifyDeviceSettings = GetDXUTState().GetModifyDeviceSettingsFunc();
-    if( pCallbackModifyDeviceSettings && pd3d9DeviceFromApp == NULL )
+    if( pCallbackModifyDeviceSettings )
     {
         bool bContinue = pCallbackModifyDeviceSettings( pNewDeviceSettings,
                                                         GetDXUTState().GetModifyDeviceSettingsFuncUserContext() );
         if( !bContinue )
         {
             // The app rejected the device change by returning false, so just use the current device if there is one.
-            if( pOldDeviceSettings == NULL )
+            if( !pOldDeviceSettings )
                 DXUTDisplayErrorMessage( DXUTERR_NOCOMPATIBLEDEVICES );
             SAFE_DELETE( pNewDeviceSettings );
             return E_ABORT;
         }
-        if( GetDXUTState().GetD3D9() == NULL && GetDXUTState().GetDXGIFactory() == NULL ) // if DXUTShutdown() was called in the modify callback, just return
+        if( !GetDXUTState().GetDXGIFactory() ) // if DXUTShutdown() was called in the modify callback, just return
         {
             SAFE_DELETE( pNewDeviceSettings );
             return S_FALSE;
@@ -2041,13 +1889,6 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
 
     DXUTPause( true, true );
 
-    // When a WM_SIZE message is received, it calls DXUTCheckForWindowSizeChange().
-    // A WM_SIZE message might be sent when adjusting the window, so tell 
-    // DXUTCheckForWindowSizeChange() to ignore size changes temporarily
-    if( DXUTIsCurrentDeviceD3D9() )
-        GetDXUTState().SetIgnoreSizeChange( true );
-
-
     // Take note if the backbuffer width & height are 0 now as they will change after pd3dDevice->Reset()
     bool bKeepCurrentWindowSize = false;
     if( DXUTGetBackBufferWidthFromDS( pNewDeviceSettings ) == 0 &&
@@ -2058,125 +1899,30 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
     // Before reset
     /////////////////////////
 
-    // If we are using D3D9, adjust window style when switching from windowed to fullscreen and
-    // vice versa.  Note that this is not necessary in D3D11 because DXGI handles this.  If both
-    // DXUT and DXGI handle this, incorrect behavior would result.
-    if( DXUTIsCurrentDeviceD3D9() )
+    if( DXUTGetIsWindowedFromDS( pNewDeviceSettings ) )
     {
-        if( DXUTGetIsWindowedFromDS( pNewDeviceSettings ) )
-        {
-            // Going to windowed mode
-
-            if( pOldDeviceSettings && !DXUTGetIsWindowedFromDS( pOldDeviceSettings ) )
-            {
-                // Going from fullscreen -> windowed
-                GetDXUTState().SetFullScreenBackBufferWidthAtModeChange( DXUTGetBackBufferWidthFromDS(
-                                                                         pOldDeviceSettings ) );
-                GetDXUTState().SetFullScreenBackBufferHeightAtModeChange( DXUTGetBackBufferHeightFromDS(
-                                                                          pOldDeviceSettings ) );
-
-                // Restore windowed mode style
-                SetWindowLong( DXUTGetHWNDDeviceWindowed(), GWL_STYLE, GetDXUTState().GetWindowedStyleAtModeChange() );
-            }
-
-            // If different device windows are used for windowed mode and fullscreen mode,
-            // hide the fullscreen window so that it doesn't obscure the screen.
-            if( DXUTGetHWNDDeviceFullScreen() != DXUTGetHWNDDeviceWindowed() )
-                ShowWindow( DXUTGetHWNDDeviceFullScreen(), SW_HIDE );
-
-            // If using the same window for windowed and fullscreen mode, reattach menu if one exists
-            if( DXUTGetHWNDDeviceFullScreen() == DXUTGetHWNDDeviceWindowed() )
-            {
-                if( GetDXUTState().GetMenu() != NULL )
-                    SetMenu( DXUTGetHWNDDeviceWindowed(), GetDXUTState().GetMenu() );
-            }
-        }
-        else
+        // Going to windowed mode
+        if( pOldDeviceSettings && !DXUTGetIsWindowedFromDS( pOldDeviceSettings ) )
         {
-            // Going to fullscreen mode
-
-            if( pOldDeviceSettings == NULL || ( pOldDeviceSettings && DXUTGetIsWindowedFromDS( pOldDeviceSettings ) ) )
-            {
-                // Transistioning to full screen mode from a standard window so 
-                // save current window position/size/style now in case the user toggles to windowed mode later 
-                WINDOWPLACEMENT* pwp = GetDXUTState().GetWindowedPlacement();
-                ZeroMemory( pwp, sizeof( WINDOWPLACEMENT ) );
-                pwp->length = sizeof( WINDOWPLACEMENT );
-                GetWindowPlacement( DXUTGetHWNDDeviceWindowed(), pwp );
-                bool bIsTopmost = ( ( GetWindowLong( DXUTGetHWNDDeviceWindowed(),
-                                                     GWL_EXSTYLE ) & WS_EX_TOPMOST ) != 0 );
-                GetDXUTState().SetTopmostWhileWindowed( bIsTopmost );
-                DWORD dwStyle = GetWindowLong( DXUTGetHWNDDeviceWindowed(), GWL_STYLE );
-                dwStyle &= ~WS_MAXIMIZE & ~WS_MINIMIZE; // remove minimize/maximize style
-                GetDXUTState().SetWindowedStyleAtModeChange( dwStyle );
-                if( pOldDeviceSettings )
-                {
-                    GetDXUTState().SetWindowBackBufferWidthAtModeChange( DXUTGetBackBufferWidthFromDS(
-                                                                         pOldDeviceSettings ) );
-                    GetDXUTState().SetWindowBackBufferHeightAtModeChange( DXUTGetBackBufferHeightFromDS(
-                                                                          pOldDeviceSettings ) );
-                }
-            }
-
-            // Hide the window to avoid animation of blank windows
-            ShowWindow( DXUTGetHWNDDeviceFullScreen(), SW_HIDE );
-
-            // Set FS window style
-            SetWindowLong( DXUTGetHWNDDeviceFullScreen(), GWL_STYLE, WS_POPUP | WS_SYSMENU );
-
-            // If using the same window for windowed and fullscreen mode, save and remove menu 
-            if( DXUTGetHWNDDeviceFullScreen() == DXUTGetHWNDDeviceWindowed() )
-            {
-                HMENU hMenu = GetMenu( DXUTGetHWNDDeviceFullScreen() );
-                GetDXUTState().SetMenu( hMenu );
-                SetMenu( DXUTGetHWNDDeviceFullScreen(), NULL );
-            }
-
-            WINDOWPLACEMENT wpFullscreen;
-            ZeroMemory( &wpFullscreen, sizeof( WINDOWPLACEMENT ) );
-            wpFullscreen.length = sizeof( WINDOWPLACEMENT );
-            GetWindowPlacement( DXUTGetHWNDDeviceFullScreen(), &wpFullscreen );
-            if( ( wpFullscreen.flags & WPF_RESTORETOMAXIMIZED ) != 0 )
-            {
-                // Restore the window to normal if the window was maximized then minimized.  This causes the 
-                // WPF_RESTORETOMAXIMIZED flag to be set which will cause SW_RESTORE to restore the 
-                // window from minimized to maxmized which isn't what we want
-                wpFullscreen.flags &= ~WPF_RESTORETOMAXIMIZED;
-                wpFullscreen.showCmd = SW_RESTORE;
-                SetWindowPlacement( DXUTGetHWNDDeviceFullScreen(), &wpFullscreen );
-            }
+            // Going from fullscreen -> windowed
+            GetDXUTState().SetFullScreenBackBufferWidthAtModeChange( DXUTGetBackBufferWidthFromDS(
+                                                                        pOldDeviceSettings ) );
+            GetDXUTState().SetFullScreenBackBufferHeightAtModeChange( DXUTGetBackBufferHeightFromDS(
+                                                                        pOldDeviceSettings ) );
         }
     }
     else
     {
-        if( DXUTGetIsWindowedFromDS( pNewDeviceSettings ) )
-        {
-            // Going to windowed mode
-           if( pOldDeviceSettings && !DXUTGetIsWindowedFromDS( pOldDeviceSettings ) )
-            {
-                // Going from fullscreen -> windowed
-                GetDXUTState().SetFullScreenBackBufferWidthAtModeChange( DXUTGetBackBufferWidthFromDS(
-                                                                         pOldDeviceSettings ) );
-                GetDXUTState().SetFullScreenBackBufferHeightAtModeChange( DXUTGetBackBufferHeightFromDS(
-                                                                          pOldDeviceSettings ) );
-                //DXGI should handle this, but in the case where switching from d3d9 full screen to windowed d3d11 it does not.
-                SetWindowLong( DXUTGetHWNDDeviceWindowed(), GWL_STYLE, GetDXUTState().GetWindowedStyleAtModeChange() );
-
-           }
-        }
-        else
+        // Going to fullscreen mode
+        if( !pOldDeviceSettings || ( pOldDeviceSettings && DXUTGetIsWindowedFromDS( pOldDeviceSettings ) ) )
         {
-            // Going to fullscreen mode
-            if( pOldDeviceSettings == NULL || ( pOldDeviceSettings && DXUTGetIsWindowedFromDS( pOldDeviceSettings ) ) )
+            // Transistioning to full screen mode from a standard window so
+            if( pOldDeviceSettings )
             {
-                // Transistioning to full screen mode from a standard window so 
-                if( pOldDeviceSettings )
-                {
-                    GetDXUTState().SetWindowBackBufferWidthAtModeChange( DXUTGetBackBufferWidthFromDS(
-                                                                         pOldDeviceSettings ) );
-                    GetDXUTState().SetWindowBackBufferHeightAtModeChange( DXUTGetBackBufferHeightFromDS(
-                                                                          pOldDeviceSettings ) );
-                }
+                GetDXUTState().SetWindowBackBufferWidthAtModeChange( DXUTGetBackBufferWidthFromDS(
+                                                                        pOldDeviceSettings ) );
+                GetDXUTState().SetWindowBackBufferHeightAtModeChange( DXUTGetBackBufferHeightFromDS(
+                                                                        pOldDeviceSettings ) );
             }
         }
     }
@@ -2185,12 +1931,7 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
         DXUTCleanup3DEnvironment( false );
 
     // Create the D3D device and call the app's device callbacks
-    if( DXUTIsD3D9( pNewDeviceSettings ) ) {
-        hr = DXUTCreate3DEnvironment9( pd3d9DeviceFromApp );
-    }
-    else {
-        hr = DXUTCreate3DEnvironment11( pd3d11DeviceFromApp );
-    }
+    hr = DXUTCreate3DEnvironment11();
     if( FAILED( hr ) )
     {
         SAFE_DELETE( pOldDeviceSettings );
@@ -2201,7 +1942,7 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
         return hr;
     }
 
-    // Enable/disable StickKeys shortcut, ToggleKeys shortcut, FilterKeys shortcut, and Windows key 
+    // Enable/disable StickKeys shortcut, ToggleKeys shortcut, FilterKeys shortcut, and Windows key
     // to prevent accidental task switching
     DXUTAllowShortcutKeys( ( DXUTGetIsWindowedFromDS( pNewDeviceSettings ) ) ?
                            GetDXUTState().GetAllowShortcutKeysWhenWindowed() :
@@ -2219,10 +1960,10 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
         // Going from fullscreen -> windowed
 
         // Restore the show state, and positions/size of the window to what it was
-        // It is important to adjust the window size 
-        // after resetting the device rather than beforehand to ensure 
+        // It is important to adjust the window size
+        // after resetting the device rather than beforehand to ensure
         // that the monitor resolution is correct and does not limit the size of the new window.
-        WINDOWPLACEMENT* pwp = GetDXUTState().GetWindowedPlacement();
+        auto pwp = GetDXUTState().GetWindowedPlacement();
         SetWindowPlacement( DXUTGetHWNDDeviceWindowed(), pwp );
 
         // Also restore the z-order of window to previous state
@@ -2231,9 +1972,9 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
                       SWP_NOMOVE | SWP_NOREDRAW | SWP_NOSIZE );
     }
 
-    // Check to see if the window needs to be resized.  
+    // Check to see if the window needs to be resized.
     // Handle cases where the window is minimized and maxmimized as well.
- 
+
     bool bNeedToResize = false;
     if( DXUTGetIsWindowedFromDS( pNewDeviceSettings ) && // only resize if in windowed mode
         !bKeepCurrentWindowSize )                      // only resize if pp.BackbufferWidth/Height were not 0
@@ -2242,8 +1983,8 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
         UINT nClientHeight;
         if( IsIconic( DXUTGetHWNDDeviceWindowed() ) )
         {
-            // Window is currently minimized. To tell if it needs to resize, 
-            // get the client rect of window when its restored the 
+            // Window is currently minimized. To tell if it needs to resize,
+            // get the client rect of window when its restored the
             // hard way using GetWindowPlacement()
             WINDOWPLACEMENT wp;
             ZeroMemory( &wp, sizeof( WINDOWPLACEMENT ) );
@@ -2253,8 +1994,8 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
             if( ( wp.flags & WPF_RESTORETOMAXIMIZED ) != 0 && wp.showCmd == SW_SHOWMINIMIZED )
             {
                 // WPF_RESTORETOMAXIMIZED means that when the window is restored it will
-                // be maximized.  So maximize the window temporarily to get the client rect 
-                // when the window is maximized.  GetSystemMetrics( SM_CXMAXIMIZED ) will give this 
+                // be maximized.  So maximize the window temporarily to get the client rect
+                // when the window is maximized.  GetSystemMetrics( SM_CXMAXIMIZED ) will give this
                 // information if the window is on the primary but this will work on multimon.
                 ShowWindow( DXUTGetHWNDDeviceWindowed(), SW_RESTORE );
                 RECT rcClient;
@@ -2265,10 +2006,10 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
             }
             else
             {
-                // Use wp.rcNormalPosition to get the client rect, but wp.rcNormalPosition 
+                // Use wp.rcNormalPosition to get the client rect, but wp.rcNormalPosition
                 // includes the window frame so subtract it
-                RECT rcFrame = {0};
-                AdjustWindowRect( &rcFrame, GetDXUTState().GetWindowedStyleAtModeChange(), GetDXUTState().GetMenu() != NULL );
+                RECT rcFrame = {};
+                AdjustWindowRect( &rcFrame, GetDXUTState().GetWindowedStyleAtModeChange(), GetDXUTState().GetMenu() != 0 );
                 LONG nFrameWidth = rcFrame.right - rcFrame.left;
                 LONG nFrameHeight = rcFrame.bottom - rcFrame.top;
                 nClientWidth = ( UINT )( wp.rcNormalPosition.right - wp.rcNormalPosition.left - nFrameWidth );
@@ -2313,8 +2054,8 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
             {
                 if( hWindowMonitor == hAdapterMonitor && IsZoomed( DXUTGetHWNDDeviceWindowed() ) )
                 {
-                    // If the window is maximized and on the same monitor as the adapter, then 
-                    // no need to clip to single adapter as the window is already clipped 
+                    // If the window is maximized and on the same monitor as the adapter, then
+                    // no need to clip to single adapter as the window is already clipped
                     // even though the rcWindow rect is outside of the miAdapter.rcWork
                 }
                 else
@@ -2325,7 +2066,7 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
         }
     }
 
-    // Only resize window if needed 
+    // Only resize window if needed
 
     if( bNeedToResize )
     {
@@ -2366,7 +2107,7 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
             rcResizedWindow.top = 0;
             rcResizedWindow.bottom = nClientHeight;
             AdjustWindowRect( &rcResizedWindow, GetWindowLong( DXUTGetHWNDDeviceWindowed(), GWL_STYLE ),
-                              GetDXUTState().GetMenu() != NULL );
+                              GetDXUTState().GetMenu() != 0 );
 
             int nWindowWidth = rcResizedWindow.right - rcResizedWindow.left;
             int nWindowHeight = rcResizedWindow.bottom - rcResizedWindow.top;
@@ -2390,8 +2131,8 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
                 rcResizedWindow.bottom = miAdapter.rcWork.top + nWindowOffsetY + nWindowHeight;
             }
 
-            // Resize the window.  It is important to adjust the window size 
-            // after resetting the device rather than beforehand to ensure 
+            // Resize the window.  It is important to adjust the window size
+            // after resetting the device rather than beforehand to ensure
             // that the monitor resolution is correct and does not limit the size of the new window.
             SetWindowPos( DXUTGetHWNDDeviceWindowed(), 0, rcResizedWindow.left, rcResizedWindow.top, nWindowWidth,
                           nWindowHeight, SWP_NOZORDER );
@@ -2399,21 +2140,21 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
         else
         {
             // Make a window rect with a client rect that is the same size as the backbuffer
-            RECT rcWindow = {0};
+            RECT rcWindow = {};
             rcWindow.right = (long)( DXUTGetBackBufferWidthFromDS(pNewDeviceSettings) );
             rcWindow.bottom = (long)( DXUTGetBackBufferHeightFromDS(pNewDeviceSettings) );
-            AdjustWindowRect( &rcWindow, GetWindowLong( DXUTGetHWNDDeviceWindowed(), GWL_STYLE ), GetDXUTState().GetMenu() != NULL );
+            AdjustWindowRect( &rcWindow, GetWindowLong( DXUTGetHWNDDeviceWindowed(), GWL_STYLE ), GetDXUTState().GetMenu() != 0 );
 
-            // Resize the window.  It is important to adjust the window size 
-            // after resetting the device rather than beforehand to ensure 
+            // Resize the window.  It is important to adjust the window size
+            // after resetting the device rather than beforehand to ensure
             // that the monitor resolution is correct and does not limit the size of the new window.
             int cx = ( int )( rcWindow.right - rcWindow.left );
             int cy = ( int )( rcWindow.bottom - rcWindow.top );
             SetWindowPos( DXUTGetHWNDDeviceWindowed(), 0, 0, 0, cx, cy, SWP_NOZORDER | SWP_NOMOVE );
         }
 
-        // Its possible that the new window size is not what we asked for.  
-        // No window can be sized larger than the desktop, so see if the Windows OS resized the 
+        // Its possible that the new window size is not what we asked for.
+        // No window can be sized larger than the desktop, so see if the Windows OS resized the
         // window to something smaller to fit on the desktop.  Also if WM_GETMINMAXINFO
         // will put a limit on the smallest/largest window size.
         RECT rcClient;
@@ -2423,13 +2164,13 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
         if( nClientWidth != DXUTGetBackBufferWidthFromDS( pNewDeviceSettings ) ||
             nClientHeight != DXUTGetBackBufferHeightFromDS( pNewDeviceSettings ) )
         {
-            // If its different, then resize the backbuffer again.  This time create a backbuffer that matches the 
+            // If its different, then resize the backbuffer again.  This time create a backbuffer that matches the
             // client rect of the current window w/o resizing the window.
-            DXUTDeviceSettings deviceSettings = DXUTGetDeviceSettings();
-            if( DXUTIsD3D9( &deviceSettings ) ) deviceSettings.d3d9.pp.BackBufferWidth = 0; else deviceSettings.d3d11.sd.BufferDesc.Width = 0; 
-            if( DXUTIsD3D9( &deviceSettings ) ) deviceSettings.d3d9.pp.BackBufferHeight = 0; else deviceSettings.d3d11.sd.BufferDesc.Height = 0;
+            auto deviceSettings = DXUTGetDeviceSettings();
+            deviceSettings.d3d11.sd.BufferDesc.Width = 0;
+            deviceSettings.d3d11.sd.BufferDesc.Height = 0;
 
-            hr = DXUTChangeDevice( &deviceSettings, NULL, NULL, false, bClipWindowToSingleAdapter );
+            hr = DXUTChangeDevice( &deviceSettings, bClipWindowToSingleAdapter );
             if( FAILED( hr ) )
             {
                 SAFE_DELETE( pOldDeviceSettings );
@@ -2442,8 +2183,8 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
     }
 
     //if (DXUTGetIsWindowedFromDS( pNewDeviceSettings )) {
-    //    RECT rcFrame = {0};
-    //    AdjustWindowRect( &rcFrame, GetDXUTState().GetWindowedStyleAtModeChange(), GetDXUTState().GetMenu() != NULL );
+    //    RECT rcFrame = {};
+    //    AdjustWindowRect( &rcFrame, GetDXUTState().GetWindowedStyleAtModeChange(), GetDXUTState().GetMenu() );
    // }
 
     // Make the window visible
@@ -2466,963 +2207,140 @@ HRESULT DXUTChangeDevice( DXUTDeviceSettings* pNewDeviceSettings,
 
 
 //--------------------------------------------------------------------------------------
-// Creates a DXGI factory object if one has not already been created  
+// Creates a DXGI factory object if one has not already been created
 //--------------------------------------------------------------------------------------
 HRESULT DXUTDelayLoadDXGI()
 {
-    IDXGIFactory1* pDXGIFactory = GetDXUTState().GetDXGIFactory();
-    if( pDXGIFactory == NULL )
+    auto pDXGIFactory = GetDXUTState().GetDXGIFactory();
+    if( !pDXGIFactory )
     {
-        DXUT_Dynamic_CreateDXGIFactory1( __uuidof( IDXGIFactory1 ), ( LPVOID* )&pDXGIFactory );
-        GetDXUTState().SetDXGIFactory( pDXGIFactory );
-        if( pDXGIFactory == NULL )
-        {
-            // If still NULL, then DXGI is not availible
-            GetDXUTState().SetD3D11Available( false );
-            return DXUTERR_NODIRECT3D11;
-        }
-
-        // DXGI 1.1 implies Direct3D 11
-
-        GetDXUTState().SetD3D11Available( true );
-    }
-
-    return S_OK;
-}
-
+        HRESULT hr = DXUT_Dynamic_CreateDXGIFactory1( IID_PPV_ARGS(&pDXGIFactory) );
+        if ( FAILED(hr) )
+            return hr;
 
-//--------------------------------------------------------------------------------------
-// Creates a Direct3D object if one has not already been created  
-//--------------------------------------------------------------------------------------
-HRESULT DXUTDelayLoadD3D9()
-{
-    IDirect3D9* pD3D = GetDXUTState().GetD3D9();
-    if( pD3D == NULL )
-    {
-        // This may fail if Direct3D 9 isn't installed
-        // This may also fail if the Direct3D headers are somehow out of sync with the installed Direct3D DLLs
-        pD3D = DXUT_Dynamic_Direct3DCreate9( D3D_SDK_VERSION );
-        if( pD3D == NULL )
+        GetDXUTState().SetDXGIFactory( pDXGIFactory );
+        if( !pDXGIFactory )
         {
-            // If still NULL, then D3D9 is not availible
             return DXUTERR_NODIRECT3D;
         }
 
-        GetDXUTState().SetD3D9( pD3D );
+        // DXGI 1.1 implies Direct3D 11
     }
 
     return S_OK;
 }
 
 
-
 //--------------------------------------------------------------------------------------
-// Updates the device settings with default values..  
+// Updates the device settings with default values..
 //--------------------------------------------------------------------------------------
-void DXUTUpdateDeviceSettingsWithOverrides( DXUTDeviceSettings* pDeviceSettings )
+void DXUTUpdateDeviceSettingsWithOverrides( _Inout_ DXUTDeviceSettings* pDeviceSettings )
 {
     // Override with settings from the command line
     if( GetDXUTState().GetOverrideWidth() != 0 )
     {
-        pDeviceSettings->d3d9.pp.BackBufferWidth = GetDXUTState().GetOverrideWidth();
         pDeviceSettings->d3d11.sd.BufferDesc.Width = GetDXUTState().GetOverrideWidth();
     }
     if( GetDXUTState().GetOverrideHeight() != 0 )
     {
-        pDeviceSettings->d3d9.pp.BackBufferHeight = GetDXUTState().GetOverrideHeight();
         pDeviceSettings->d3d11.sd.BufferDesc.Height = GetDXUTState().GetOverrideHeight();
     }
 
     if( GetDXUTState().GetOverrideAdapterOrdinal() != -1 )
     {
-        pDeviceSettings->d3d9.AdapterOrdinal = GetDXUTState().GetOverrideAdapterOrdinal();
         pDeviceSettings->d3d11.AdapterOrdinal = GetDXUTState().GetOverrideAdapterOrdinal();
     }
 
     if( GetDXUTState().GetOverrideFullScreen() )
     {
-        pDeviceSettings->d3d9.pp.Windowed = FALSE;
         pDeviceSettings->d3d11.sd.Windowed = FALSE;
     }
 
-    if( GetDXUTState().GetOverrideWindowed() ) {
-        pDeviceSettings->d3d9.pp.Windowed = TRUE;
+    if( GetDXUTState().GetOverrideWindowed() )
+    {
         pDeviceSettings->d3d11.sd.Windowed = TRUE;
     }
 
     if( GetDXUTState().GetOverrideForceHAL() )
     {
-        pDeviceSettings->d3d9.DeviceType = D3DDEVTYPE_HAL;
         pDeviceSettings->d3d11.DriverType = D3D_DRIVER_TYPE_HARDWARE;
     }
 
     if( GetDXUTState().GetOverrideForceREF() )
     {
-        pDeviceSettings->d3d9.DeviceType = D3DDEVTYPE_REF;
         pDeviceSettings->d3d11.DriverType = D3D_DRIVER_TYPE_REFERENCE;
     }
 
+    if( GetDXUTState().GetOverrideForceWARP() )
+    {
+        pDeviceSettings->d3d11.DriverType = D3D_DRIVER_TYPE_WARP;
+        pDeviceSettings->d3d11.sd.Windowed = TRUE;
+    }
+
     if( GetDXUTState().GetOverrideForceVsync() == 0 )
     {
-        pDeviceSettings->d3d9.pp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
         pDeviceSettings->d3d11.SyncInterval = 0;
     }
     else if( GetDXUTState().GetOverrideForceVsync() == 1 )
     {
-        pDeviceSettings->d3d9.pp.PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT;
         pDeviceSettings->d3d11.SyncInterval = 1;
     }
 
-    if( GetDXUTState().GetOverrideForceAPI() != -1 )
+    if (GetDXUTState().GetOverrideForceFeatureLevel() != 0)
     {
-        if( GetDXUTState().GetOverrideForceAPI() == 9 )
-        {
-            pDeviceSettings->ver = DXUT_D3D9_DEVICE;
-        }
-        else if( GetDXUTState().GetOverrideForceAPI() == 11 )
-        {
-            pDeviceSettings->ver = DXUT_D3D11_DEVICE;
-        }
-    }
-    
-    if (GetDXUTState().GetOverrideForceFeatureLevel() != 0) {
-        pDeviceSettings->d3d11.DeviceFeatureLevel = (D3D_FEATURE_LEVEL)GetDXUTState().GetOverrideForceFeatureLevel();
+        pDeviceSettings->d3d11.DeviceFeatureLevel = GetDXUTState().GetOverrideForceFeatureLevel();
     }
 }
 
 
 //--------------------------------------------------------------------------------------
-// Allows the app to explictly state if it supports D3D9 or D3D11.  Typically
-// calling this is not needed as DXUT will auto-detect this based on the callbacks set.
+// Sets the viewport, render target view, and depth stencil view.
 //--------------------------------------------------------------------------------------
-void WINAPI DXUTSetD3DVersionSupport( bool bAppCanUseD3D9,  bool bAppCanUseD3D11 )
+HRESULT WINAPI DXUTSetupD3D11Views( _In_ ID3D11DeviceContext* pd3dDeviceContext )
 {
-    GetDXUTState().SetUseD3DVersionOverride( true );
-    GetDXUTState().SetAppSupportsD3D9Override( bAppCanUseD3D9 );
-    GetDXUTState().SetAppSupportsD3D11Override( bAppCanUseD3D11 );
-}
+    HRESULT hr = S_OK;
+
+    // Setup the viewport to match the backbuffer
+    D3D11_VIEWPORT vp;
+    vp.Width = (FLOAT)DXUTGetDXGIBackBufferSurfaceDesc()->Width;
+    vp.Height = (FLOAT)DXUTGetDXGIBackBufferSurfaceDesc()->Height;
+    vp.MinDepth = 0;
+    vp.MaxDepth = 1;
+    vp.TopLeftX = 0;
+    vp.TopLeftY = 0;
+    pd3dDeviceContext->RSSetViewports( 1, &vp );
 
+    // Set the render targets
+    auto pRTV = GetDXUTState().GetD3D11RenderTargetView();
+    auto pDSV = GetDXUTState().GetD3D11DepthStencilView();
+    pd3dDeviceContext->OMSetRenderTargets( 1, &pRTV, pDSV );
 
-//--------------------------------------------------------------------------------------
-// Returns true if app has registered any D3D9 callbacks or 
-// used the DXUTSetD3DVersionSupport API and passed true for bAppCanUseD3D9
-//--------------------------------------------------------------------------------------
-bool WINAPI DXUTDoesAppSupportD3D9()
-{
-    if( GetDXUTState().GetUseD3DVersionOverride() )
-        return GetDXUTState().GetAppSupportsD3D9Override();
-    else
-        return GetDXUTState().GetIsD3D9DeviceAcceptableFunc() ||
-            GetDXUTState().GetD3D9DeviceCreatedFunc() ||
-            GetDXUTState().GetD3D9DeviceResetFunc() ||
-            GetDXUTState().GetD3D9DeviceLostFunc() ||
-            GetDXUTState().GetD3D9DeviceDestroyedFunc() ||
-            GetDXUTState().GetD3D9FrameRenderFunc();
+    return hr;
 }
 
 
 //--------------------------------------------------------------------------------------
-// Returns true if app has registered any D3D11 callbacks or 
-// used the DXUTSetD3DVersionSupport API and passed true for bAppCanUseD3D11
-//--------------------------------------------------------------------------------------
-bool WINAPI DXUTDoesAppSupportD3D11()
-{
-    if( GetDXUTState().GetUseD3DVersionOverride() )
-        return GetDXUTState().GetAppSupportsD3D11Override();
-    else
-        return GetDXUTState().GetIsD3D11DeviceAcceptableFunc() ||
-            GetDXUTState().GetD3D11DeviceCreatedFunc() ||
-            GetDXUTState().GetD3D11SwapChainResizedFunc() ||
-            GetDXUTState().GetD3D11FrameRenderFunc() ||
-            GetDXUTState().GetD3D11SwapChainReleasingFunc() ||
-            GetDXUTState().GetD3D11DeviceDestroyedFunc();
-}
-
-
-//======================================================================================
-//======================================================================================
-// Direct3D 9 section
-//======================================================================================
-//======================================================================================
-
-
-//--------------------------------------------------------------------------------------
-// Passes a previously created Direct3D9 device for use by the framework.  
-// If DXUTCreateWindow() has not already been called, it will call it with the 
-// default parameters.  Instead of calling this, you can call DXUTCreateDevice() or 
-// DXUTCreateDeviceFromSettings() 
-//--------------------------------------------------------------------------------------
-HRESULT WINAPI DXUTSetD3D9Device( IDirect3DDevice9* pd3dDevice )
-{
-    HRESULT hr;
-
-    if( pd3dDevice == NULL )
-        return DXUT_ERR_MSGBOX( L"DXUTSetD3D9Device", E_INVALIDARG );
-
-    // Not allowed to call this from inside the device callbacks
-    if( GetDXUTState().GetInsideDeviceCallback() )
-        return DXUT_ERR_MSGBOX( L"DXUTSetD3D9Device", E_FAIL );
-
-    GetDXUTState().SetDeviceCreateCalled( true );
-
-    // If DXUTCreateWindow() or DXUTSetWindow() has not already been called, 
-    // then call DXUTCreateWindow() with the default parameters.         
-    if( !GetDXUTState().GetWindowCreated() )
-    {
-        // If DXUTCreateWindow() or DXUTSetWindow() was already called and failed, then fail.
-        // DXUTCreateWindow() or DXUTSetWindow() must first succeed for this function to succeed
-        if( GetDXUTState().GetWindowCreateCalled() )
-            return E_FAIL;
-
-        // If DXUTCreateWindow() or DXUTSetWindow() hasn't been called, then 
-        // automatically call DXUTCreateWindow() with default params
-        hr = DXUTCreateWindow();
-        if( FAILED( hr ) )
-            return hr;
-    }
-
-    DXUTDeviceSettings DeviceSettings;
-    ZeroMemory( &DeviceSettings, sizeof( DXUTDeviceSettings ) );
-    DeviceSettings.ver = DXUT_D3D9_DEVICE;
-
-    // Get the present params from the swap chain
-    IDirect3DSurface9* pBackBuffer = NULL;
-    hr = pd3dDevice->GetBackBuffer( 0, 0, D3DBACKBUFFER_TYPE_MONO, &pBackBuffer );
-    if( SUCCEEDED( hr ) )
-    {
-        IDirect3DSwapChain9* pSwapChain = NULL;
-        hr = pBackBuffer->GetContainer( IID_IDirect3DSwapChain9, ( void** )&pSwapChain );
-        if( SUCCEEDED( hr ) )
-        {
-            pSwapChain->GetPresentParameters( &DeviceSettings.d3d9.pp );
-            SAFE_RELEASE( pSwapChain );
-        }
-
-        SAFE_RELEASE( pBackBuffer );
-    }
-
-    D3DDEVICE_CREATION_PARAMETERS d3dCreationParams;
-    pd3dDevice->GetCreationParameters( &d3dCreationParams );
-
-    // Fill out the rest of the device settings struct
-    DeviceSettings.d3d9.AdapterOrdinal = d3dCreationParams.AdapterOrdinal;
-    DeviceSettings.d3d9.DeviceType = d3dCreationParams.DeviceType;
-    DXUTFindD3D9AdapterFormat( DeviceSettings.d3d9.AdapterOrdinal, DeviceSettings.d3d9.DeviceType,
-                               DeviceSettings.d3d9.pp.BackBufferFormat, DeviceSettings.d3d9.pp.Windowed,
-                               &DeviceSettings.d3d9.AdapterFormat );
-    DeviceSettings.d3d9.BehaviorFlags = d3dCreationParams.BehaviorFlags;
-
-    // Change to the Direct3D device passed in
-    hr = DXUTChangeDevice( &DeviceSettings, pd3dDevice,  NULL, false, false );
-    if( FAILED( hr ) )
-        return hr;
-
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Creates the 3D environment
-//--------------------------------------------------------------------------------------
-HRESULT DXUTCreate3DEnvironment9( IDirect3DDevice9* pd3dDeviceFromApp )
-{
-    HRESULT hr = S_OK;
-
-    IDirect3DDevice9* pd3dDevice = NULL;
-    DXUTDeviceSettings* pNewDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-    assert( pNewDeviceSettings != NULL );
-
-    // Only create a Direct3D device if one hasn't been supplied by the app
-    if( pd3dDeviceFromApp == NULL )
-    {
-        // Try to create the device with the chosen settings
-        IDirect3D9* pD3D = DXUTGetD3D9Object();
-        assert( pD3D != NULL );
-        hr = pD3D->CreateDevice( pNewDeviceSettings->d3d9.AdapterOrdinal, pNewDeviceSettings->d3d9.DeviceType,
-                                 DXUTGetHWNDFocus(), pNewDeviceSettings->d3d9.BehaviorFlags,
-                                 &pNewDeviceSettings->d3d9.pp, &pd3dDevice );
-        if( hr == D3DERR_DEVICELOST )
-        {
-            GetDXUTState().SetDeviceLost( true );
-            return S_OK;
-        }
-        else if( FAILED( hr ) )
-        {
-            DXUT_ERR( L"CreateDevice", hr );
-            return DXUTERR_CREATINGDEVICE;
-        }
-    }
-    else
-    {
-        pd3dDeviceFromApp->AddRef();
-        pd3dDevice = pd3dDeviceFromApp;
-    }
-
-    GetDXUTState().SetD3D9Device( pd3dDevice );
-
-    // If switching to REF, set the exit code to 10.  If switching to HAL and exit code was 10, then set it back to 0.
-    if( pNewDeviceSettings->d3d9.DeviceType == D3DDEVTYPE_REF && GetDXUTState().GetExitCode() == 0 )
-        GetDXUTState().SetExitCode( 10 );
-    else if( pNewDeviceSettings->d3d9.DeviceType == D3DDEVTYPE_HAL && GetDXUTState().GetExitCode() == 10 )
-        GetDXUTState().SetExitCode( 0 );
-
-    // Update back buffer desc before calling app's device callbacks
-    DXUTUpdateBackBufferDesc();
-
-    // Setup cursor based on current settings (window/fullscreen mode, show cursor state, clip cursor state)
-    DXUTSetupCursor();
-
-    // Update GetDXUTState()'s copy of D3D caps 
-    D3DCAPS9* pd3dCaps = GetDXUTState().GetCaps();
-    pd3dDevice->GetDeviceCaps( pd3dCaps );
-
-    // Update the device stats text
-    CD3D9Enumeration* pd3dEnum = DXUTGetD3D9Enumeration();
-    assert( pd3dEnum != NULL );
-    CD3D9EnumAdapterInfo* pAdapterInfo = pd3dEnum->GetAdapterInfo( pNewDeviceSettings->d3d9.AdapterOrdinal );
-    DXUTUpdateD3D9DeviceStats( pNewDeviceSettings->d3d9.DeviceType,
-                               pNewDeviceSettings->d3d9.BehaviorFlags,
-                               &pAdapterInfo->AdapterIdentifier );
-
-    // Call the app's device created callback if non-NULL
-    const D3DSURFACE_DESC* pBackBufferSurfaceDesc = DXUTGetD3D9BackBufferSurfaceDesc();
-    GetDXUTState().SetInsideDeviceCallback( true );
-    LPDXUTCALLBACKD3D9DEVICECREATED pCallbackDeviceCreated = GetDXUTState().GetD3D9DeviceCreatedFunc();
-    hr = S_OK;
-    if( pCallbackDeviceCreated != NULL )
-        hr = pCallbackDeviceCreated( DXUTGetD3D9Device(), pBackBufferSurfaceDesc,
-                                     GetDXUTState().GetD3D9DeviceCreatedFuncUserContext() );
-    GetDXUTState().SetInsideDeviceCallback( false );
-    if( DXUTGetD3D9Device() == NULL ) // Handle DXUTShutdown from inside callback
-        return E_FAIL;
-    if( FAILED( hr ) )
-    {
-        DXUT_ERR( L"DeviceCreated callback", hr );
-        return ( hr == DXUTERR_MEDIANOTFOUND ) ? DXUTERR_MEDIANOTFOUND : DXUTERR_CREATINGDEVICEOBJECTS;
-    }
-    GetDXUTState().SetDeviceObjectsCreated( true );
-
-    // Call the app's device reset callback if non-NULL
-    GetDXUTState().SetInsideDeviceCallback( true );
-    LPDXUTCALLBACKD3D9DEVICERESET pCallbackDeviceReset = GetDXUTState().GetD3D9DeviceResetFunc();
-    hr = S_OK;
-    if( pCallbackDeviceReset != NULL )
-        hr = pCallbackDeviceReset( DXUTGetD3D9Device(), pBackBufferSurfaceDesc,
-                                   GetDXUTState().GetD3D9DeviceResetFuncUserContext() );
-    GetDXUTState().SetInsideDeviceCallback( false );
-    if( DXUTGetD3D9Device() == NULL ) // Handle DXUTShutdown from inside callback
-        return E_FAIL;
-    if( FAILED( hr ) )
-    {
-        DXUT_ERR( L"DeviceReset callback", hr );
-        return ( hr == DXUTERR_MEDIANOTFOUND ) ? DXUTERR_MEDIANOTFOUND : DXUTERR_RESETTINGDEVICEOBJECTS;
-    }
-    GetDXUTState().SetDeviceObjectsReset( true );
-
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Resets the 3D environment by:
-//      - Calls the device lost callback 
-//      - Resets the device
-//      - Stores the back buffer description
-//      - Sets up the full screen Direct3D cursor if requested
-//      - Calls the device reset callback 
-//--------------------------------------------------------------------------------------
-HRESULT DXUTReset3DEnvironment9()
-{
-    HRESULT hr;
-
-    IDirect3DDevice9* pd3dDevice = DXUTGetD3D9Device();
-    assert( pd3dDevice != NULL );
-
-    // Call the app's device lost callback
-    if( GetDXUTState().GetDeviceObjectsReset() == true )
-    {
-        GetDXUTState().SetInsideDeviceCallback( true );
-        LPDXUTCALLBACKD3D9DEVICELOST pCallbackDeviceLost = GetDXUTState().GetD3D9DeviceLostFunc();
-        if( pCallbackDeviceLost != NULL )
-            pCallbackDeviceLost( GetDXUTState().GetD3D9DeviceLostFuncUserContext() );
-        GetDXUTState().SetDeviceObjectsReset( false );
-        GetDXUTState().SetInsideDeviceCallback( false );
-    }
-
-    // Reset the device
-    DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-    hr = pd3dDevice->Reset( &pDeviceSettings->d3d9.pp );
-    if( FAILED( hr ) )
-    {
-        if( hr == D3DERR_DEVICELOST )
-            return D3DERR_DEVICELOST; // Reset could legitimately fail if the device is lost
-        else
-            return DXUT_ERR( L"Reset", DXUTERR_RESETTINGDEVICE );
-    }
-
-    // Update back buffer desc before calling app's device callbacks
-    DXUTUpdateBackBufferDesc();
-
-    // Setup cursor based on current settings (window/fullscreen mode, show cursor state, clip cursor state)
-    DXUTSetupCursor();
-
-    // Call the app's OnDeviceReset callback
-    GetDXUTState().SetInsideDeviceCallback( true );
-    const D3DSURFACE_DESC* pBackBufferSurfaceDesc = DXUTGetD3D9BackBufferSurfaceDesc();
-    LPDXUTCALLBACKD3D9DEVICERESET pCallbackDeviceReset = GetDXUTState().GetD3D9DeviceResetFunc();
-    hr = S_OK;
-    if( pCallbackDeviceReset != NULL )
-        hr = pCallbackDeviceReset( pd3dDevice, pBackBufferSurfaceDesc,
-                                   GetDXUTState().GetD3D9DeviceResetFuncUserContext() );
-    GetDXUTState().SetInsideDeviceCallback( false );
-    if( FAILED( hr ) )
-    {
-        // If callback failed, cleanup
-        DXUT_ERR( L"DeviceResetCallback", hr );
-        if( hr != DXUTERR_MEDIANOTFOUND )
-            hr = DXUTERR_RESETTINGDEVICEOBJECTS;
-
-        GetDXUTState().SetInsideDeviceCallback( true );
-        LPDXUTCALLBACKD3D9DEVICELOST pCallbackDeviceLost = GetDXUTState().GetD3D9DeviceLostFunc();
-        if( pCallbackDeviceLost != NULL )
-            pCallbackDeviceLost( GetDXUTState().GetD3D9DeviceLostFuncUserContext() );
-        GetDXUTState().SetInsideDeviceCallback( false );
-        return hr;
-    }
-
-    // Success
-    GetDXUTState().SetDeviceObjectsReset( true );
-
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Render the 3D environment by:
-//      - Checking if the device is lost and trying to reset it if it is
-//      - Get the elapsed time since the last frame
-//      - Calling the app's framemove and render callback
-//      - Calling Present()
-//--------------------------------------------------------------------------------------
-void DXUTRender3DEnvironment9()
-{
-    HRESULT hr;
-
-    if( GetDXUTState().GetDeviceLost() || DXUTIsRenderingPaused() || !DXUTIsActive() )
-    {
-        // Window is minimized or paused so yield CPU time to other processes
-        Sleep( 50 );
-    }
-
-    // If no device created yet because device was lost (ie. another fullscreen exclusive device exists), 
-    // then wait and try to create every so often.
-    IDirect3DDevice9* pd3dDevice = DXUTGetD3D9Device();
-    if( NULL == pd3dDevice )
-    {
-        if( GetDXUTState().GetDeviceLost() )
-        {
-            DXUTDeviceSettings deviceSettings = DXUTGetDeviceSettings();
-            DXUTChangeDevice( &deviceSettings, NULL,  NULL, false, true );
-        }
-
-        return;
-    }
-
-    if( GetDXUTState().GetDeviceLost() && !GetDXUTState().GetRenderingPaused() )
-    {
-        // Test the cooperative level to see if it's okay to render.
-        if( FAILED( hr = pd3dDevice->TestCooperativeLevel() ) )
-        {
-            if( D3DERR_DEVICELOST == hr )
-            {
-                // The device has been lost but cannot be reset at this time.
-                // So wait until it can be reset.
-                return;
-            }
-
-            // If we are windowed, read the desktop format and 
-            // ensure that the Direct3D device is using the same format 
-            // since the user could have changed the desktop bitdepth 
-            if( DXUTIsWindowed() )
-            {
-                D3DDISPLAYMODE adapterDesktopDisplayMode;
-                IDirect3D9* pD3D = DXUTGetD3D9Object();
-                DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-                pD3D->GetAdapterDisplayMode( pDeviceSettings->d3d9.AdapterOrdinal, &adapterDesktopDisplayMode );
-                if( pDeviceSettings->d3d9.AdapterFormat != adapterDesktopDisplayMode.Format )
-                {
-
-                    DXUTDeviceSettings deviceSettings = DXUTGetDeviceSettings();
-                    deviceSettings.d3d9.AdapterFormat = adapterDesktopDisplayMode.Format;
-
-                    hr = DXUTSnapDeviceSettingsToEnumDevice(&deviceSettings, false);
-                    if( FAILED( hr ) ) // the call will fail if no valid devices were found
-                    {
-                        DXUTDisplayErrorMessage( DXUTERR_NOCOMPATIBLEDEVICES );
-                        DXUTShutdown();
-                    }
-
-                    // Change to a Direct3D device created from the new device settings.
-                    // If there is an existing device, then either reset or recreate the scene
-                    hr = DXUTChangeDevice( &deviceSettings, NULL,  NULL, false, false );
-                    if( FAILED( hr ) )
-                    {
-                        // If this fails, try to go fullscreen and if this fails also shutdown.
-                        if( FAILED( DXUTToggleFullScreen() ) )
-                            DXUTShutdown();
-                    }
-
-                    return;
-                }
-            }
-
-            // Try to reset the device
-            if( FAILED( hr = DXUTReset3DEnvironment9() ) )
-            {
-                if( D3DERR_DEVICELOST == hr )
-                {
-                    // The device was lost again, so continue waiting until it can be reset.
-                    return;
-                }
-                else if( DXUTERR_RESETTINGDEVICEOBJECTS == hr ||
-                         DXUTERR_MEDIANOTFOUND == hr )
-                {
-                    DXUTDisplayErrorMessage( hr );
-                    DXUTShutdown();
-                    return;
-                }
-                else
-                {
-                    // Reset failed, but the device wasn't lost so something bad happened, 
-                    // so recreate the device to try to recover
-                    DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-                    if( FAILED( DXUTChangeDevice( pDeviceSettings, NULL,  NULL, true, false ) ) )
-                    {
-                        DXUTShutdown();
-                        return;
-                    }
-                }
-            }
-        }
-
-        GetDXUTState().SetDeviceLost( false );
-    }
-
-    // Get the app's time, in seconds. Skip rendering if no time elapsed
-    double fTime, fAbsTime; float fElapsedTime;
-    DXUTGetGlobalTimer()->GetTimeValues( &fTime, &fAbsTime, &fElapsedTime );
-
-    // Store the time for the app
-    if( GetDXUTState().GetConstantFrameTime() )
-    {
-        fElapsedTime = GetDXUTState().GetTimePerFrame();
-        fTime = DXUTGetTime() + fElapsedTime;
-    }
-
-    GetDXUTState().SetTime( fTime );
-    GetDXUTState().SetAbsoluteTime( fAbsTime );
-    GetDXUTState().SetElapsedTime( fElapsedTime );
-
-    // Update the FPS stats
-    DXUTUpdateFrameStats();
-
-    DXUTHandleTimers();
-
-    // Animate the scene by calling the app's frame move callback
-    LPDXUTCALLBACKFRAMEMOVE pCallbackFrameMove = GetDXUTState().GetFrameMoveFunc();
-    if( pCallbackFrameMove != NULL )
-    {
-        pCallbackFrameMove( fTime, fElapsedTime, GetDXUTState().GetFrameMoveFuncUserContext() );
-        pd3dDevice = DXUTGetD3D9Device();
-        if( NULL == pd3dDevice ) // Handle DXUTShutdown from inside callback
-            return;
-    }
-
-    if( !GetDXUTState().GetRenderingPaused() )
-    {
-        // Render the scene by calling the app's render callback
-        LPDXUTCALLBACKD3D9FRAMERENDER pCallbackFrameRender = GetDXUTState().GetD3D9FrameRenderFunc();
-        if( pCallbackFrameRender != NULL )
-        {
-            pCallbackFrameRender( pd3dDevice, fTime, fElapsedTime,
-                                  GetDXUTState().GetD3D9FrameRenderFuncUserContext() );
-            pd3dDevice = DXUTGetD3D9Device();
-            if( NULL == pd3dDevice ) // Handle DXUTShutdown from inside callback
-                return;
-        }
-
-#if defined(DEBUG) || defined(_DEBUG)
-        // The back buffer should always match the client rect 
-        // if the Direct3D backbuffer covers the entire window
-        RECT rcClient;
-        GetClientRect( DXUTGetHWND(), &rcClient );
-        if( !IsIconic( DXUTGetHWND() ) )
-        {
-            GetClientRect( DXUTGetHWND(), &rcClient );
-            assert( DXUTGetD3D9BackBufferSurfaceDesc()->Width == (UINT)rcClient.right );
-            assert( DXUTGetD3D9BackBufferSurfaceDesc()->Height == (UINT)rcClient.bottom );
-        }
-#endif
-
-        // Show the frame on the primary surface.
-        hr = pd3dDevice->Present( NULL, NULL, NULL, NULL );
-        if( FAILED( hr ) )
-        {
-            if( D3DERR_DEVICELOST == hr )
-            {
-                GetDXUTState().SetDeviceLost( true );
-            }
-            else if( D3DERR_DRIVERINTERNALERROR == hr )
-            {
-                // When D3DERR_DRIVERINTERNALERROR is returned from Present(),
-                // the application can do one of the following:
-                // 
-                // - End, with the pop-up window saying that the application cannot continue 
-                //   because of problems in the display adapter and that the user should 
-                //   contact the adapter manufacturer.
-                //
-                // - Attempt to restart by calling IDirect3DDevice9::Reset, which is essentially the same 
-                //   path as recovering from a lost device. If IDirect3DDevice9::Reset fails with 
-                //   D3DERR_DRIVERINTERNALERROR, the application should end immediately with the message 
-                //   that the user should contact the adapter manufacturer.
-                // 
-                // The framework attempts the path of resetting the device
-                // 
-                GetDXUTState().SetDeviceLost( true );
-            }
-        }
-    }
-
-    // If the app called DXUTWasKeyPressed() then do the work 
-    // to store the current state of the keys in bLastKeys
-    if( GetDXUTState().GetAppCalledWasKeyPressed() )
-    {
-        bool* bLastKeys = GetDXUTState().GetLastKeys();
-        bool* bKeys = GetDXUTState().GetKeys();
-        memcpy( bLastKeys, bKeys, sizeof( bool ) * 256 );
-    }
-
-    // Update current frame #
-    int nFrame = GetDXUTState().GetCurrentFrameNumber();
-    nFrame++;
-    GetDXUTState().SetCurrentFrameNumber( nFrame );
-
-    // Check to see if the app should shutdown due to cmdline
-    if( GetDXUTState().GetOverrideQuitAfterFrame() != 0 )
-    {
-        if( nFrame > GetDXUTState().GetOverrideQuitAfterFrame() )
-            DXUTShutdown();
-    }
-
-    return;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Cleans up the 3D environment by:
-//      - Calls the device lost callback 
-//      - Calls the device destroyed callback 
-//      - Releases the D3D device
-//--------------------------------------------------------------------------------------
-void DXUTCleanup3DEnvironment9( bool bReleaseSettings )
-{
-    IDirect3DDevice9* pd3dDevice = DXUTGetD3D9Device();
-    if( pd3dDevice != NULL )
-    {
-        GetDXUTState().SetInsideDeviceCallback( true );
-
-        // Call the app's device lost callback
-        if( GetDXUTState().GetDeviceObjectsReset() == true )
-        {
-            LPDXUTCALLBACKD3D9DEVICELOST pCallbackDeviceLost = GetDXUTState().GetD3D9DeviceLostFunc();
-            if( pCallbackDeviceLost != NULL )
-                pCallbackDeviceLost( GetDXUTState().GetD3D9DeviceLostFuncUserContext() );
-            GetDXUTState().SetDeviceObjectsReset( false );
-        }
-
-        // Call the app's device destroyed callback
-        if( GetDXUTState().GetDeviceObjectsCreated() == true )
-        {
-            LPDXUTCALLBACKD3D9DEVICEDESTROYED pCallbackDeviceDestroyed = GetDXUTState().GetD3D9DeviceDestroyedFunc();
-            if( pCallbackDeviceDestroyed != NULL )
-                pCallbackDeviceDestroyed( GetDXUTState().GetD3D9DeviceDestroyedFuncUserContext() );
-            GetDXUTState().SetDeviceObjectsCreated( false );
-        }
-
-        GetDXUTState().SetInsideDeviceCallback( false );
-
-        // Release the D3D device and in debug configs, displays a message box if there 
-        // are unrelease objects.
-        if( pd3dDevice )
-        {
-            UINT references = pd3dDevice->Release();
-            if( references > 0 )
-            {
-                DXUTDisplayErrorMessage( DXUTERR_NONZEROREFCOUNT );
-                DXUT_ERR( L"DXUTCleanup3DEnvironment", DXUTERR_NONZEROREFCOUNT );
-            }
-        }
-        GetDXUTState().SetD3D9Device( NULL );
-
-        if( bReleaseSettings )
-        {
-            DXUTDeviceSettings* pOldDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-            SAFE_DELETE(pOldDeviceSettings);
-            GetDXUTState().SetCurrentDeviceSettings( NULL );
-        }
-
-        D3DSURFACE_DESC* pBackBufferSurfaceDesc = GetDXUTState().GetBackBufferSurfaceDesc9();
-        ZeroMemory( pBackBufferSurfaceDesc, sizeof( D3DSURFACE_DESC ) );
-
-        D3DCAPS9* pd3dCaps = GetDXUTState().GetCaps();
-        ZeroMemory( pd3dCaps, sizeof( D3DCAPS9 ) );
-
-        GetDXUTState().SetDeviceCreated( false );
-    }
-}
-
-
-//--------------------------------------------------------------------------------------
-// Gives the D3D device a cursor with image and hotspot from hCursor.
-//--------------------------------------------------------------------------------------
-HRESULT DXUTSetD3D9DeviceCursor( IDirect3DDevice9* pd3dDevice, HCURSOR hCursor, bool bAddWatermark )
-{
-    HRESULT hr = E_FAIL;
-    ICONINFO iconinfo;
-    bool bBWCursor = false;
-    LPDIRECT3DSURFACE9 pCursorSurface = NULL;
-    HDC hdcColor = NULL;
-    HDC hdcMask = NULL;
-    HDC hdcScreen = NULL;
-    BITMAP bm;
-    DWORD dwWidth = 0;
-    DWORD dwHeightSrc = 0;
-    DWORD dwHeightDest = 0;
-    COLORREF crColor;
-    COLORREF crMask;
-    UINT x;
-    UINT y;
-    BITMAPINFO bmi;
-    COLORREF* pcrArrayColor = NULL;
-    COLORREF* pcrArrayMask = NULL;
-    DWORD* pBitmap;
-    HGDIOBJ hgdiobjOld;
-
-    ZeroMemory( &iconinfo, sizeof( iconinfo ) );
-    if( !GetIconInfo( hCursor, &iconinfo ) )
-        goto End;
-
-    if( 0 == GetObject( ( HGDIOBJ )iconinfo.hbmMask, sizeof( BITMAP ), ( LPVOID )&bm ) )
-        goto End;
-    dwWidth = bm.bmWidth;
-    dwHeightSrc = bm.bmHeight;
-
-    if( iconinfo.hbmColor == NULL )
-    {
-        bBWCursor = TRUE;
-        dwHeightDest = dwHeightSrc / 2;
-    }
-    else
-    {
-        bBWCursor = FALSE;
-        dwHeightDest = dwHeightSrc;
-    }
-
-    // Create a surface for the fullscreen cursor
-    if( FAILED( hr = pd3dDevice->CreateOffscreenPlainSurface( dwWidth, dwHeightDest,
-                                                              D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &pCursorSurface,
-                                                              NULL ) ) )
-    {
-        goto End;
-    }
-
-    pcrArrayMask = new DWORD[dwWidth * dwHeightSrc];
-
-    ZeroMemory( &bmi, sizeof( bmi ) );
-    bmi.bmiHeader.biSize = sizeof( bmi.bmiHeader );
-    bmi.bmiHeader.biWidth = dwWidth;
-    bmi.bmiHeader.biHeight = dwHeightSrc;
-    bmi.bmiHeader.biPlanes = 1;
-    bmi.bmiHeader.biBitCount = 32;
-    bmi.bmiHeader.biCompression = BI_RGB;
-
-    hdcScreen = GetDC( NULL );
-    hdcMask = CreateCompatibleDC( hdcScreen );
-    if( hdcMask == NULL )
-    {
-        hr = E_FAIL;
-        goto End;
-    }
-    hgdiobjOld = SelectObject( hdcMask, iconinfo.hbmMask );
-    GetDIBits( hdcMask, iconinfo.hbmMask, 0, dwHeightSrc,
-               pcrArrayMask, &bmi, DIB_RGB_COLORS );
-    SelectObject( hdcMask, hgdiobjOld );
-
-    if( !bBWCursor )
-    {
-        pcrArrayColor = new DWORD[dwWidth * dwHeightDest];
-        hdcColor = CreateCompatibleDC( hdcScreen );
-        if( hdcColor == NULL )
-        {
-            hr = E_FAIL;
-            goto End;
-        }
-        SelectObject( hdcColor, iconinfo.hbmColor );
-        GetDIBits( hdcColor, iconinfo.hbmColor, 0, dwHeightDest,
-                   pcrArrayColor, &bmi, DIB_RGB_COLORS );
-    }
-
-    // Transfer cursor image into the surface
-    D3DLOCKED_RECT lr;
-    pCursorSurface->LockRect( &lr, NULL, 0 );
-    pBitmap = ( DWORD* )lr.pBits;
-    for( y = 0; y < dwHeightDest; y++ )
-    {
-        for( x = 0; x < dwWidth; x++ )
-        {
-            if( bBWCursor )
-            {
-                crColor = pcrArrayMask[dwWidth * ( dwHeightDest - 1 - y ) + x];
-                crMask = pcrArrayMask[dwWidth * ( dwHeightSrc - 1 - y ) + x];
-            }
-            else
-            {
-                crColor = pcrArrayColor[dwWidth * ( dwHeightDest - 1 - y ) + x];
-                crMask = pcrArrayMask[dwWidth * ( dwHeightDest - 1 - y ) + x];
-            }
-            if( crMask == 0 )
-                pBitmap[dwWidth * y + x] = 0xff000000 | crColor;
-            else
-                pBitmap[dwWidth * y + x] = 0x00000000;
-
-            // It may be helpful to make the D3D cursor look slightly 
-            // different from the Windows cursor so you can distinguish 
-            // between the two when developing/testing code.  When
-            // bAddWatermark is TRUE, the following code adds some
-            // small grey "D3D" characters to the upper-left corner of
-            // the D3D cursor image.
-            if( bAddWatermark && x < 12 && y < 5 )
-            {
-                // 11.. 11.. 11.. .... CCC0
-                // 1.1. ..1. 1.1. .... A2A0
-                // 1.1. .1.. 1.1. .... A4A0
-                // 1.1. ..1. 1.1. .... A2A0
-                // 11.. 11.. 11.. .... CCC0
-
-                const WORD wMask[5] = { 0xccc0, 0xa2a0, 0xa4a0, 0xa2a0, 0xccc0 };
-                if( wMask[y] & (1 << (15 - x)) )
-                {
-                    pBitmap[dwWidth*y + x] |= 0xff808080;
-                }
-            }
-        }
-    }
-    pCursorSurface->UnlockRect();
-
-    // Set the device cursor
-    if( FAILED( hr = pd3dDevice->SetCursorProperties( iconinfo.xHotspot,
-                                                      iconinfo.yHotspot, pCursorSurface ) ) )
-    {
-        goto End;
-    }
-
-    hr = S_OK;
-
-End:
-    if( iconinfo.hbmMask != NULL )
-        DeleteObject( iconinfo.hbmMask );
-    if( iconinfo.hbmColor != NULL )
-        DeleteObject( iconinfo.hbmColor );
-    if( hdcScreen != NULL )
-        ReleaseDC( NULL, hdcScreen );
-    if( hdcColor != NULL )
-        DeleteDC( hdcColor );
-    if( hdcMask != NULL )
-        DeleteDC( hdcMask );
-    SAFE_DELETE_ARRAY( pcrArrayColor );
-    SAFE_DELETE_ARRAY( pcrArrayMask );
-    SAFE_RELEASE( pCursorSurface );
-    return hr;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Internal helper function to return the adapter format from the first device settings 
-// combo that matches the passed adapter ordinal, device type, backbuffer format, and windowed.  
-//--------------------------------------------------------------------------------------
-HRESULT DXUTFindD3D9AdapterFormat( UINT AdapterOrdinal, D3DDEVTYPE DeviceType, D3DFORMAT BackBufferFormat,
-                                   BOOL Windowed, D3DFORMAT* pAdapterFormat )
-{
-    CD3D9Enumeration* pd3dEnum = DXUTGetD3D9Enumeration( false );
-    assert( pd3dEnum != NULL );
-    CD3D9EnumDeviceInfo* pDeviceInfo = pd3dEnum->GetDeviceInfo( AdapterOrdinal, DeviceType );
-    if( pDeviceInfo )
-    {
-        for( int iDeviceCombo = 0; iDeviceCombo < pDeviceInfo->deviceSettingsComboList.GetSize(); iDeviceCombo++ )
-        {
-            CD3D9EnumDeviceSettingsCombo* pDeviceSettingsCombo = pDeviceInfo->deviceSettingsComboList.GetAt(
-                iDeviceCombo );
-            if( pDeviceSettingsCombo->BackBufferFormat == BackBufferFormat &&
-                pDeviceSettingsCombo->Windowed == Windowed )
-            {
-                // Return the adapter format from the first match
-                *pAdapterFormat = pDeviceSettingsCombo->AdapterFormat;
-                return S_OK;
-            }
-        }
-    }
-
-    *pAdapterFormat = BackBufferFormat;
-    return E_FAIL;
-}
-
-//--------------------------------------------------------------------------------------
-// Sets the viewport, render target view, and depth stencil view.
-//--------------------------------------------------------------------------------------
-HRESULT WINAPI DXUTSetupD3D11Views( ID3D11DeviceContext* pd3dDeviceContext )
-{
-    HRESULT hr = S_OK;
-
-    // Setup the viewport to match the backbuffer
-    D3D11_VIEWPORT vp;
-    vp.Width = (FLOAT)DXUTGetDXGIBackBufferSurfaceDesc()->Width;
-    vp.Height = (FLOAT)DXUTGetDXGIBackBufferSurfaceDesc()->Height;
-    vp.MinDepth = 0;
-    vp.MaxDepth = 1;
-    vp.TopLeftX = 0;
-    vp.TopLeftY = 0;
-    pd3dDeviceContext->RSSetViewports( 1, &vp );
-
-    // Set the render targets
-    ID3D11RenderTargetView* pRTV = GetDXUTState().GetD3D11RenderTargetView();
-    ID3D11DepthStencilView* pDSV = GetDXUTState().GetD3D11DepthStencilView();
-    pd3dDeviceContext->OMSetRenderTargets( 1, &pRTV, pDSV );
-
-    return hr;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Creates a render target view, and depth stencil texture and view.
+// Creates a render target view, and depth stencil texture and view.
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT DXUTCreateD3D11Views( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext,
                              DXUTDeviceSettings* pDeviceSettings )
 {
     HRESULT hr = S_OK;
-    IDXGISwapChain* pSwapChain = DXUTGetDXGISwapChain();
-    ID3D11DepthStencilView* pDSV = NULL;
-    ID3D11RenderTargetView* pRTV = NULL;
+    auto pSwapChain = DXUTGetDXGISwapChain();
+    ID3D11DepthStencilView* pDSV = nullptr;
+    ID3D11RenderTargetView* pRTV = nullptr;
 
     // Get the back buffer and desc
     ID3D11Texture2D* pBackBuffer;
-    hr = pSwapChain->GetBuffer( 0, __uuidof( *pBackBuffer ), ( LPVOID* )&pBackBuffer );
+    hr = pSwapChain->GetBuffer( 0, IID_PPV_ARGS(&pBackBuffer) );
     if( FAILED( hr ) )
         return hr;
     D3D11_TEXTURE2D_DESC backBufferSurfaceDesc;
     pBackBuffer->GetDesc( &backBufferSurfaceDesc );
 
     // Create the render target view
-    hr = pd3dDevice->CreateRenderTargetView( pBackBuffer, NULL, &pRTV );
+    hr = pd3dDevice->CreateRenderTargetView( pBackBuffer, nullptr, &pRTV );
     SAFE_RELEASE( pBackBuffer );
     if( FAILED( hr ) )
         return hr;
@@ -3432,7 +2350,7 @@ HRESULT DXUTCreateD3D11Views( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3
     if( pDeviceSettings->d3d11.AutoCreateDepthStencil )
     {
         // Create depth stencil texture
-        ID3D11Texture2D* pDepthStencil = NULL;
+        ID3D11Texture2D* pDepthStencil = nullptr;
         D3D11_TEXTURE2D_DESC descDepth;
         descDepth.Width = backBufferSurfaceDesc.Width;
         descDepth.Height = backBufferSurfaceDesc.Height;
@@ -3445,7 +2363,7 @@ HRESULT DXUTCreateD3D11Views( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3
         descDepth.BindFlags = D3D11_BIND_DEPTH_STENCIL;
         descDepth.CPUAccessFlags = 0;
         descDepth.MiscFlags = 0;
-        hr = pd3dDevice->CreateTexture2D( &descDepth, NULL, &pDepthStencil );
+        hr = pd3dDevice->CreateTexture2D( &descDepth, nullptr, &pDepthStencil );
         if( FAILED( hr ) )
             return hr;
         DXUT_SetDebugName( pDepthStencil, "DXUT" );
@@ -3478,172 +2396,277 @@ HRESULT DXUTCreateD3D11Views( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3
 //--------------------------------------------------------------------------------------
 // Creates the 3D environment
 //--------------------------------------------------------------------------------------
-HRESULT DXUTCreate3DEnvironment11( ID3D11Device* pd3d11DeviceFromApp )
+HRESULT DXUTCreate3DEnvironment11()
 {
     HRESULT hr = S_OK;
 
-    ID3D11Device* pd3d11Device = NULL;
-    ID3D11DeviceContext* pd3dImmediateContext = NULL;
-    D3D_FEATURE_LEVEL FeatureLevel = D3D_FEATURE_LEVEL_11_0;
+    ID3D11Device* pd3d11Device = nullptr;
+    ID3D11DeviceContext* pd3dImmediateContext = nullptr;
+    D3D_FEATURE_LEVEL FeatureLevel = D3D_FEATURE_LEVEL_11_1;
+
+    IDXGISwapChain* pSwapChain = nullptr;
+    auto pNewDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
+    assert( pNewDeviceSettings );
+    _Analysis_assume_( pNewDeviceSettings );
 
-    IDXGISwapChain* pSwapChain = NULL;
-    DXUTDeviceSettings* pNewDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-    assert( pNewDeviceSettings != NULL );
-        
-    IDXGIFactory1* pDXGIFactory = DXUTGetDXGIFactory();
-    assert( pDXGIFactory != NULL );
+    auto pDXGIFactory = DXUTGetDXGIFactory();
+    assert( pDXGIFactory );
+    _Analysis_assume_( pDXGIFactory );
     hr = pDXGIFactory->MakeWindowAssociation( DXUTGetHWND(), 0  );
 
-    // Only create a Direct3D device if one hasn't been supplied by the app
-    if( pd3d11DeviceFromApp == NULL )
+    // Try to create the device with the chosen settings
+    IDXGIAdapter1* pAdapter = nullptr;
+
+    hr = S_OK;
+    D3D_DRIVER_TYPE ddt = pNewDeviceSettings->d3d11.DriverType;
+    if( pNewDeviceSettings->d3d11.DriverType == D3D_DRIVER_TYPE_HARDWARE )
+    {
+        hr = pDXGIFactory->EnumAdapters1( pNewDeviceSettings->d3d11.AdapterOrdinal, &pAdapter );
+        if ( FAILED( hr) )
+        {
+            return E_FAIL;
+        }
+        ddt = D3D_DRIVER_TYPE_UNKNOWN;
+    }
+    else if (pNewDeviceSettings->d3d11.DriverType == D3D_DRIVER_TYPE_WARP)
+    {
+        ddt = D3D_DRIVER_TYPE_WARP;
+        pAdapter = nullptr;
+    }
+    else if (pNewDeviceSettings->d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE)
+    {
+        ddt = D3D_DRIVER_TYPE_REFERENCE;
+        pAdapter = nullptr;
+    }
+
+    if( SUCCEEDED( hr ) )
     {
-        // Try to create the device with the chosen settings
-        IDXGIAdapter1* pAdapter = NULL;
+        hr = DXUT_Dynamic_D3D11CreateDevice( pAdapter,
+                                             ddt,
+                                             ( HMODULE )0,
+                                             pNewDeviceSettings->d3d11.CreateFlags,
+                                             &pNewDeviceSettings->d3d11.DeviceFeatureLevel,
+                                             1,
+                                             D3D11_SDK_VERSION,
+                                             &pd3d11Device,
+                                             &FeatureLevel,
+                                             &pd3dImmediateContext
+                                             );
 
-        hr = S_OK;
-        D3D_DRIVER_TYPE ddt = pNewDeviceSettings->d3d11.DriverType;
-        if( pNewDeviceSettings->d3d11.DriverType == D3D_DRIVER_TYPE_HARDWARE ) 
+        if ( FAILED( hr ) )
         {
-            hr = pDXGIFactory->EnumAdapters1( pNewDeviceSettings->d3d11.AdapterOrdinal, &pAdapter );
-            if ( FAILED( hr) ) 
+            pAdapter = nullptr;
+            // Remote desktop does not allow you to enumerate the adapter.  In this case, we let D3D11 do the enumeration.
+            if ( ddt == D3D_DRIVER_TYPE_UNKNOWN )
+            {
+                hr = DXUT_Dynamic_D3D11CreateDevice( pAdapter,
+                                                     D3D_DRIVER_TYPE_HARDWARE,
+                                                     ( HMODULE )0,
+                                                     pNewDeviceSettings->d3d11.CreateFlags,
+                                                     &pNewDeviceSettings->d3d11.DeviceFeatureLevel,
+                                                     1,
+                                                     D3D11_SDK_VERSION,
+                                                     &pd3d11Device,
+                                                     &FeatureLevel,
+                                                     &pd3dImmediateContext
+                                                     );
+            }
+            if ( FAILED ( hr ) )
             {
-                return E_FAIL;
+                DXUT_ERR( L"D3D11CreateDevice", hr );
+                return DXUTERR_CREATINGDEVICE;
             }
-            ddt = D3D_DRIVER_TYPE_UNKNOWN;    
         }
-        else if (pNewDeviceSettings->d3d11.DriverType == D3D_DRIVER_TYPE_WARP) 
+    }
+
+#ifndef NDEBUG
+    if( SUCCEEDED( hr ) )
+    {
+        ID3D11Debug * d3dDebug = nullptr;
+        if( SUCCEEDED( pd3d11Device->QueryInterface(IID_PPV_ARGS(&d3dDebug) ) ) )
         {
-            ddt = D3D_DRIVER_TYPE_WARP;  
-            pAdapter = NULL;
+            ID3D11InfoQueue* infoQueue = nullptr;
+            if( SUCCEEDED( d3dDebug->QueryInterface( IID_PPV_ARGS(&infoQueue) ) ) )
+            {
+                // ignore some "expected" errors
+                D3D11_MESSAGE_ID denied [] =
+                {
+                    D3D11_MESSAGE_ID_SETPRIVATEDATA_CHANGINGPARAMS,
+                };
+
+                D3D11_INFO_QUEUE_FILTER filter;
+                memset( &filter, 0, sizeof(filter) );
+                filter.DenyList.NumIDs = _countof(denied);
+                filter.DenyList.pIDList = denied;
+                infoQueue->AddStorageFilterEntries( &filter );
+                infoQueue->Release();
+            }
+            d3dDebug->Release();
         }
-        else if (pNewDeviceSettings->d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE) 
+    }
+#endif
+
+    if( SUCCEEDED( hr ) )
+    {
+        IDXGIDevice1* pDXGIDev = nullptr;
+        hr = pd3d11Device->QueryInterface( IID_PPV_ARGS(&pDXGIDev) );
+        if( SUCCEEDED( hr ) && pDXGIDev )
         {
-            ddt = D3D_DRIVER_TYPE_REFERENCE;
-            pAdapter = NULL;
+            if ( !pAdapter )
+            {
+                IDXGIAdapter *pTempAdapter = nullptr;
+                V_RETURN( pDXGIDev->GetAdapter( &pTempAdapter ) );
+                V_RETURN( pTempAdapter->QueryInterface( IID_PPV_ARGS(&pAdapter) ) );
+                V_RETURN( pAdapter->GetParent( IID_PPV_ARGS(&pDXGIFactory) ) );
+                SAFE_RELEASE ( pTempAdapter );
+                if ( GetDXUTState().GetDXGIFactory() != pDXGIFactory )
+                    GetDXUTState().GetDXGIFactory()->Release();
+                GetDXUTState().SetDXGIFactory( pDXGIFactory );
+            }
         }
+        SAFE_RELEASE( pDXGIDev );
+        GetDXUTState().SetDXGIAdapter( pAdapter );
+    }
 
-        if( SUCCEEDED( hr ) )
+    if( FAILED( hr ) )
+    {
+        DXUT_ERR( L"D3D11CreateDevice", hr );
+        return DXUTERR_CREATINGDEVICE;
+    }
+
+    // set default render state to msaa enabled
+    D3D11_RASTERIZER_DESC drd = {
+        D3D11_FILL_SOLID, //D3D11_FILL_MODE FillMode;
+        D3D11_CULL_BACK,//D3D11_CULL_MODE CullMode;
+        FALSE, //BOOL FrontCounterClockwise;
+        0, //INT DepthBias;
+        0.0f,//FLOAT DepthBiasClamp;
+        0.0f,//FLOAT SlopeScaledDepthBias;
+        TRUE,//BOOL DepthClipEnable;
+        FALSE,//BOOL ScissorEnable;
+        TRUE,//BOOL MultisampleEnable;
+        FALSE//BOOL AntialiasedLineEnable;
+    };
+    ID3D11RasterizerState* pRS = nullptr;
+    hr = pd3d11Device->CreateRasterizerState(&drd, &pRS);
+    if ( FAILED( hr ) )
+    {
+        DXUT_ERR( L"CreateRasterizerState", hr );
+        return DXUTERR_CREATINGDEVICE;
+    }
+    DXUT_SetDebugName( pRS, "DXUT Default" );
+    GetDXUTState().SetD3D11RasterizerState(pRS);
+    pd3dImmediateContext->RSSetState(pRS);
+
+    // Enumerate its outputs.
+    UINT OutputCount, iOutput;
+    for( OutputCount = 0; ; ++OutputCount )
+    {
+        IDXGIOutput* pOutput;
+        if( FAILED( pAdapter->EnumOutputs( OutputCount, &pOutput ) ) )
+            break;
+        SAFE_RELEASE( pOutput );
+    }
+    auto ppOutputArray = new (std::nothrow) IDXGIOutput*[OutputCount];
+    if( !ppOutputArray )
+        return E_OUTOFMEMORY;
+    for( iOutput = 0; iOutput < OutputCount; ++iOutput )
+        pAdapter->EnumOutputs( iOutput, ppOutputArray + iOutput );
+    GetDXUTState().SetDXGIOutputArray( ppOutputArray );
+    GetDXUTState().SetDXGIOutputArraySize( OutputCount );
+
+    // Create the swapchain
+    hr = pDXGIFactory->CreateSwapChain( pd3d11Device, &pNewDeviceSettings->d3d11.sd, &pSwapChain );
+    if( FAILED( hr ) )
+    {
+        DXUT_ERR( L"CreateSwapChain", hr );
+        return DXUTERR_CREATINGDEVICE;
+    }
+
+    GetDXUTState().SetD3D11Device( pd3d11Device );
+    GetDXUTState().SetD3D11DeviceContext( pd3dImmediateContext );
+    GetDXUTState().SetD3D11FeatureLevel( FeatureLevel );
+    GetDXUTState().SetDXGISwapChain( pSwapChain );
+
+    assert( pd3d11Device );
+    _Analysis_assume_( pd3d11Device );
+
+    assert( pd3dImmediateContext );
+    _Analysis_assume_( pd3dImmediateContext );
+
+    // Direct3D 11.1
+    {
+        ID3D11Device1* pd3d11Device1 = nullptr;
+        hr = pd3d11Device->QueryInterface(IID_PPV_ARGS(&pd3d11Device1));
+        if( SUCCEEDED( hr ) && pd3d11Device1 )
         {
+            GetDXUTState().SetD3D11Device1( pd3d11Device1 );
 
-            hr = DXUT_Dynamic_D3D11CreateDevice( pAdapter,
-                                                 ddt,
-                                                 ( HMODULE )0,
-                                                 pNewDeviceSettings->d3d11.CreateFlags,
-                                                 &pNewDeviceSettings->d3d11.DeviceFeatureLevel,
-                                                 1,
-                                                 D3D11_SDK_VERSION,
-                                                 &pd3d11Device,
-                                                 &FeatureLevel,
-                                                 &pd3dImmediateContext
-                                                 );
-            
-            if ( FAILED( hr ) ) {
-                pAdapter = NULL;
-                // Remote desktop does not allow you to enumerate the adapter.  In this case, we let D3D11 do the enumeration.
-                if ( ddt == D3D_DRIVER_TYPE_UNKNOWN ) { 
-                    hr = DXUT_Dynamic_D3D11CreateDevice( pAdapter,
-                                                         D3D_DRIVER_TYPE_HARDWARE,
-                                                         ( HMODULE )0,
-                                                         pNewDeviceSettings->d3d11.CreateFlags,
-                                                         &pNewDeviceSettings->d3d11.DeviceFeatureLevel,
-                                                         1,
-                                                         D3D11_SDK_VERSION,
-                                                         &pd3d11Device,
-                                                         &FeatureLevel,
-                                                         &pd3dImmediateContext
-                                                         );
-                }
-                if ( FAILED ( hr ) ) {
-                    DXUT_ERR( L"D3D11CreateDevice", hr );
-                    return DXUTERR_CREATINGDEVICE;
-                }
+            ID3D11DeviceContext1* pd3dImmediateContext1 = nullptr;
+            hr = pd3dImmediateContext->QueryInterface(IID_PPV_ARGS(&pd3dImmediateContext1));
+            if( SUCCEEDED( hr ) && pd3dImmediateContext1 )
+            {
+                GetDXUTState().SetD3D11DeviceContext1( pd3dImmediateContext1 );
             }
         }
+    }
 
-        if( SUCCEEDED( hr ) )
+#ifdef USE_DIRECT3D11_2
+    // Direct3D 11.2
+    {
+        ID3D11Device2* pd3d11Device2 = nullptr;
+        hr = pd3d11Device->QueryInterface(IID_PPV_ARGS(&pd3d11Device2));
+        if (SUCCEEDED(hr) && pd3d11Device2)
         {
-            IDXGIDevice1* pDXGIDev = NULL;
-            hr = pd3d11Device->QueryInterface( __uuidof( IDXGIDevice1 ), ( LPVOID* )&pDXGIDev );
-            if( SUCCEEDED( hr ) && pDXGIDev )
+            GetDXUTState().SetD3D11Device2(pd3d11Device2);
+
+            ID3D11DeviceContext2* pd3dImmediateContext2 = nullptr;
+            hr = pd3dImmediateContext->QueryInterface(IID_PPV_ARGS(&pd3dImmediateContext2));
+            if (SUCCEEDED(hr) && pd3dImmediateContext2)
             {
-                if ( pAdapter == NULL ) 
-                {
-                    IDXGIAdapter *pTempAdapter;
-                    pDXGIDev->GetAdapter( &pTempAdapter );
-                    V_RETURN( pTempAdapter->QueryInterface( __uuidof( IDXGIAdapter1 ), (LPVOID*) &pAdapter ) );
-                    V_RETURN( pAdapter->GetParent( __uuidof( IDXGIFactory1 ), (LPVOID*) &pDXGIFactory ) );
-                    SAFE_RELEASE ( pTempAdapter );
-                    GetDXUTState().SetDXGIFactory( pDXGIFactory );
-                }
+                GetDXUTState().SetD3D11DeviceContext2(pd3dImmediateContext2);
             }
-            SAFE_RELEASE( pDXGIDev );
-            GetDXUTState().SetDXGIAdapter( pAdapter );
         }
+    }
+#endif
 
-        if( FAILED( hr ) )
-        {
-            DXUT_ERR( L"D3D11CreateDevice", hr );
-            return DXUTERR_CREATINGDEVICE;
-        }
-        // set default render state to msaa enabled
-        D3D11_RASTERIZER_DESC drd = {
-            D3D11_FILL_SOLID, //D3D11_FILL_MODE FillMode;
-            D3D11_CULL_BACK,//D3D11_CULL_MODE CullMode;
-            FALSE, //BOOL FrontCounterClockwise;
-            0, //INT DepthBias;
-            0.0f,//FLOAT DepthBiasClamp;
-            0.0f,//FLOAT SlopeScaledDepthBias;
-            TRUE,//BOOL DepthClipEnable;
-            FALSE,//BOOL ScissorEnable;
-            TRUE,//BOOL MultisampleEnable;
-            FALSE//BOOL AntialiasedLineEnable;        
-        };
-        ID3D11RasterizerState* pRS = NULL;
-        hr = pd3d11Device->CreateRasterizerState(&drd, &pRS);
-        if ( FAILED( hr ) )
+#ifdef USE_DIRECT3D11_3
+    // Direct3D 11.3
+    {
+        ID3D11Device3* pd3d11Device3 = nullptr;
+        hr = pd3d11Device->QueryInterface( IID_PPV_ARGS(&pd3d11Device3) );
+        if (SUCCEEDED(hr) && pd3d11Device3)
         {
-            DXUT_ERR( L"CreateRasterizerState", hr );
-            return DXUTERR_CREATINGDEVICE;
-        }
-        DXUT_SetDebugName( pRS, "DXUT Default" );
-        GetDXUTState().SetD3D11RasterizerState(pRS);
-        pd3dImmediateContext->RSSetState(pRS);
+            GetDXUTState().SetD3D11Device3(pd3d11Device3);
 
-        // Enumerate its outputs.
-        UINT OutputCount, iOutput;
-        for( OutputCount = 0; ; ++OutputCount )
-        {
-            IDXGIOutput* pOutput;
-            if( FAILED( pAdapter->EnumOutputs( OutputCount, &pOutput ) ) )
-                break;
-            SAFE_RELEASE( pOutput );
+            ID3D11DeviceContext3* pd3dImmediateContext3 = nullptr;
+            hr = pd3dImmediateContext->QueryInterface(IID_PPV_ARGS(&pd3dImmediateContext3));
+            if (SUCCEEDED(hr) && pd3dImmediateContext3)
+            {
+                GetDXUTState().SetD3D11DeviceContext3(pd3dImmediateContext3);
+            }
         }
-        IDXGIOutput** ppOutputArray = new IDXGIOutput*[OutputCount];
-        if( !ppOutputArray )
-            return E_OUTOFMEMORY;
-        for( iOutput = 0; iOutput < OutputCount; ++iOutput )
-            pAdapter->EnumOutputs( iOutput, ppOutputArray + iOutput );
-        GetDXUTState().SetDXGIOutputArray( ppOutputArray );
-        GetDXUTState().SetDXGIOutputArraySize( OutputCount );
+    }
+#endif
 
-        // Create the swapchain
-        hr = pDXGIFactory->CreateSwapChain( pd3d11Device, &pNewDeviceSettings->d3d11.sd, &pSwapChain );
-        if( FAILED( hr ) )
+#ifdef USE_DIRECT3D11_4
+    // Direct3D 11.4
+    {
+        ID3D11Device4* pd3d11Device4 = nullptr;
+        hr = pd3d11Device->QueryInterface(IID_PPV_ARGS(&pd3d11Device4));
+        if (SUCCEEDED(hr) && pd3d11Device4)
         {
-            DXUT_ERR( L"CreateSwapChain", hr );
-            return DXUTERR_CREATINGDEVICE;
+            GetDXUTState().SetD3D11Device4(pd3d11Device4);
+
+            ID3D11DeviceContext4* pd3dImmediateContext4 = nullptr;
+            hr = pd3dImmediateContext->QueryInterface(IID_PPV_ARGS(&pd3dImmediateContext4));
+            if (SUCCEEDED(hr) && pd3dImmediateContext4)
+            {
+                GetDXUTState().SetD3D11DeviceContext4(pd3dImmediateContext4);
+            }
         }
     }
-    else
-    {
-        pd3d11DeviceFromApp->AddRef();
-        pd3d11Device = pd3d11DeviceFromApp;
-    }
-
-    GetDXUTState().SetD3D11Device( pd3d11Device );
-    GetDXUTState().SetD3D11DeviceContext( pd3dImmediateContext );
-    GetDXUTState().SetD3D11FeatureLevel( FeatureLevel );
-    GetDXUTState().SetDXGISwapChain( pSwapChain );
+#endif
 
     // If switching to REF, set the exit code to 11.  If switching to HAL and exit code was 11, then set it back to 0.
     if( pNewDeviceSettings->d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE && GetDXUTState().GetExitCode() == 0 )
@@ -3658,21 +2681,22 @@ HRESULT DXUTCreate3DEnvironment11( ID3D11Device* pd3d11DeviceFromApp )
     DXUTSetupCursor();
 
     // Update the device stats text
-    CD3D11Enumeration* pd3dEnum = DXUTGetD3D11Enumeration();
-    assert( pd3dEnum != NULL );
-    CD3D11EnumAdapterInfo* pAdapterInfo = pd3dEnum->GetAdapterInfo( pNewDeviceSettings->d3d11.AdapterOrdinal );
-    DXUTUpdateD3D11DeviceStats( pNewDeviceSettings->d3d11.DriverType, &pAdapterInfo->AdapterDesc );
+    auto pd3dEnum = DXUTGetD3D11Enumeration();
+    assert( pd3dEnum );
+    _Analysis_assume_( pd3dEnum );
+    auto pAdapterInfo = pd3dEnum->GetAdapterInfo( pNewDeviceSettings->d3d11.AdapterOrdinal );
+    DXUTUpdateD3D11DeviceStats( pNewDeviceSettings->d3d11.DriverType, pNewDeviceSettings->d3d11.DeviceFeatureLevel, &pAdapterInfo->AdapterDesc );
 
     // Call the app's device created callback if non-NULL
-    const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc = DXUTGetDXGIBackBufferSurfaceDesc();
+    auto pBackBufferSurfaceDesc = DXUTGetDXGIBackBufferSurfaceDesc();
     GetDXUTState().SetInsideDeviceCallback( true );
-    LPDXUTCALLBACKD3D11DEVICECREATED pCallbackDeviceCreated = GetDXUTState().GetD3D11DeviceCreatedFunc();
+    auto pCallbackDeviceCreated = GetDXUTState().GetD3D11DeviceCreatedFunc();
     hr = S_OK;
-    if( pCallbackDeviceCreated != NULL )
+    if( pCallbackDeviceCreated )
         hr = pCallbackDeviceCreated( DXUTGetD3D11Device(), pBackBufferSurfaceDesc,
                                      GetDXUTState().GetD3D11DeviceCreatedFuncUserContext() );
     GetDXUTState().SetInsideDeviceCallback( false );
-    if( DXUTGetD3D11Device() == NULL ) // Handle DXUTShutdown from inside callback
+    if( !DXUTGetD3D11Device() ) // Handle DXUTShutdown from inside callback
         return E_FAIL;
     if( FAILED( hr ) )
     {
@@ -3689,18 +2713,15 @@ HRESULT DXUTCreate3DEnvironment11( ID3D11Device* pd3d11DeviceFromApp )
         return DXUTERR_CREATINGDEVICEOBJECTS;
     }
 
-    // Create performance counters
-    //DXUTCreateD3D11Counters( pd3d11Device );
-
     // Call the app's swap chain reset callback if non-NULL
     GetDXUTState().SetInsideDeviceCallback( true );
     LPDXUTCALLBACKD3D11SWAPCHAINRESIZED pCallbackSwapChainResized = GetDXUTState().GetD3D11SwapChainResizedFunc();
     hr = S_OK;
-    if( pCallbackSwapChainResized != NULL )
+    if( pCallbackSwapChainResized )
         hr = pCallbackSwapChainResized( DXUTGetD3D11Device(), pSwapChain, pBackBufferSurfaceDesc,
                                         GetDXUTState().GetD3D11SwapChainResizedFuncUserContext() );
     GetDXUTState().SetInsideDeviceCallback( false );
-    if( DXUTGetD3D11Device() == NULL ) // Handle DXUTShutdown from inside callback
+    if( !DXUTGetD3D11Device() ) // Handle DXUTShutdown from inside callback
         return E_FAIL;
     if( FAILED( hr ) )
     {
@@ -3715,11 +2736,11 @@ HRESULT DXUTCreate3DEnvironment11( ID3D11Device* pd3d11DeviceFromApp )
 
 //--------------------------------------------------------------------------------------
 // Resets the 3D environment by:
-//      - Calls the device lost callback 
+//      - Calls the device lost callback
 //      - Resets the device
 //      - Stores the back buffer description
 //      - Sets up the full screen Direct3D cursor if requested
-//      - Calls the device reset callback 
+//      - Calls the device reset callback
 //--------------------------------------------------------------------------------------
 HRESULT DXUTReset3DEnvironment11()
 {
@@ -3729,12 +2750,14 @@ HRESULT DXUTReset3DEnvironment11()
     DXUTPause( true, true );
 
     bool bDeferredDXGIAction = false;
-    DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-    IDXGISwapChain* pSwapChain = DXUTGetDXGISwapChain();
-    assert( pSwapChain != NULL );
+    auto pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
+    auto pSwapChain = DXUTGetDXGISwapChain();
+    assert( pSwapChain );
+    _Analysis_assume_( pSwapChain );
 
     DXGI_SWAP_CHAIN_DESC SCDesc;
-    pSwapChain->GetDesc( &SCDesc );
+    if ( FAILED( pSwapChain->GetDesc(&SCDesc)) )
+        memset( &SCDesc, 0, sizeof(SCDesc) );
 
     // Resize backbuffer and target of the swapchain in case they have changed.
     // For windowed mode, use the client rect as the desired size. Unlike D3D9,
@@ -3757,7 +2780,7 @@ HRESULT DXUTReset3DEnvironment11()
         // Set the fullscreen state
         if( pDeviceSettings->d3d11.sd.Windowed )
         {
-            V_RETURN( pSwapChain->SetFullscreenState( FALSE, NULL ) );
+            V_RETURN( pSwapChain->SetFullscreenState( FALSE, nullptr ) );
             bDeferredDXGIAction = true;
         }
         else
@@ -3766,12 +2789,12 @@ HRESULT DXUTReset3DEnvironment11()
             // to the desired value.
 
             // SetFullscreenState causes a WM_SIZE message to be sent to the window.  The WM_SIZE message calls
-            // DXUTCheckForDXGIBufferChange which normally stores the new height and width in 
+            // DXUTCheckForDXGIBufferChange which normally stores the new height and width in
             // pDeviceSettings->d3d11.sd.BufferDesc.  SetDoNotStoreBufferSize tells DXUTCheckForDXGIBufferChange
             // not to store the height and width so that we have the correct values when calling ResizeTarget.
 
             GetDXUTState().SetDoNotStoreBufferSize( true );
-            V_RETURN( pSwapChain->SetFullscreenState( TRUE, NULL ) );
+            V_RETURN( pSwapChain->SetFullscreenState( TRUE, nullptr ) );
             GetDXUTState().SetDoNotStoreBufferSize( false );
 
             V_RETURN( pSwapChain->ResizeTarget( &pDeviceSettings->d3d11.sd.BufferDesc ) );
@@ -3796,7 +2819,7 @@ HRESULT DXUTReset3DEnvironment11()
     }
 
     // If no deferred DXGI actions are to take place, mark the device as reset.
-    // If there is a deferred DXGI action, then the device isn't reset until DXGI sends us a 
+    // If there is a deferred DXGI action, then the device isn't reset until DXGI sends us a
     // window message.  Only then can we mark the device as reset.
     if( !bDeferredDXGIAction )
         GetDXUTState().SetDeviceObjectsReset( true );
@@ -3813,20 +2836,20 @@ HRESULT DXUTReset3DEnvironment11()
 //      - Calling the app's framemove and render callback
 //      - Calling Present()
 //--------------------------------------------------------------------------------------
-void DXUTRender3DEnvironment11()
+void WINAPI DXUTRender3DEnvironment()
 {
     HRESULT hr;
 
-    ID3D11Device* pd3dDevice = DXUTGetD3D11Device();
-    if( NULL == pd3dDevice )
+    auto pd3dDevice = DXUTGetD3D11Device();
+    if( !pd3dDevice )
         return;
 
-    ID3D11DeviceContext* pd3dImmediateContext = DXUTGetD3D11DeviceContext();
-    if( NULL == pd3dImmediateContext )
+    auto pd3dImmediateContext = DXUTGetD3D11DeviceContext();
+    if( !pd3dImmediateContext )
         return;
 
-    IDXGISwapChain* pSwapChain = DXUTGetDXGISwapChain();
-    if( NULL == pSwapChain )
+    auto pSwapChain = DXUTGetDXGISwapChain();
+    if( !pSwapChain )
         return;
 
     if( DXUTIsRenderingPaused() || !DXUTIsActive() || GetDXUTState().GetRenderingOccluded() )
@@ -3850,8 +2873,6 @@ void DXUTRender3DEnvironment11()
     GetDXUTState().SetAbsoluteTime( fAbsTime );
     GetDXUTState().SetElapsedTime( fElapsedTime );
 
-    // Start Performance Counters
-
     // Update the FPS stats
     DXUTUpdateFrameStats();
 
@@ -3859,11 +2880,11 @@ void DXUTRender3DEnvironment11()
 
     // Animate the scene by calling the app's frame move callback
     LPDXUTCALLBACKFRAMEMOVE pCallbackFrameMove = GetDXUTState().GetFrameMoveFunc();
-    if( pCallbackFrameMove != NULL )
+    if( pCallbackFrameMove )
     {
         pCallbackFrameMove( fTime, fElapsedTime, GetDXUTState().GetFrameMoveFuncUserContext() );
         pd3dDevice = DXUTGetD3D11Device();
-        if( NULL == pd3dDevice ) // Handle DXUTShutdown from inside callback
+        if( !pd3dDevice ) // Handle DXUTShutdown from inside callback
             return;
     }
 
@@ -3871,35 +2892,37 @@ void DXUTRender3DEnvironment11()
     {
         // Render the scene by calling the app's render callback
         LPDXUTCALLBACKD3D11FRAMERENDER pCallbackFrameRender = GetDXUTState().GetD3D11FrameRenderFunc();
-        if( pCallbackFrameRender != NULL && !GetDXUTState().GetRenderingOccluded() )
+        if( pCallbackFrameRender && !GetDXUTState().GetRenderingOccluded() )
         {
             pCallbackFrameRender( pd3dDevice, pd3dImmediateContext, fTime, fElapsedTime,
                                   GetDXUTState().GetD3D11FrameRenderFuncUserContext() );
-            
+
             pd3dDevice = DXUTGetD3D11Device();
-            if( NULL == pd3dDevice ) // Handle DXUTShutdown from inside callback
+            if( !pd3dDevice ) // Handle DXUTShutdown from inside callback
                 return;
         }
 
 #if defined(DEBUG) || defined(_DEBUG)
-        // The back buffer should always match the client rect 
+        // The back buffer should always match the client rect
         // if the Direct3D backbuffer covers the entire window
         RECT rcClient;
         GetClientRect( DXUTGetHWND(), &rcClient );
         if( !IsIconic( DXUTGetHWND() ) )
         {
             GetClientRect( DXUTGetHWND(), &rcClient );
-            
+
             assert( DXUTGetDXGIBackBufferSurfaceDesc()->Width == (UINT)rcClient.right );
             assert( DXUTGetDXGIBackBufferSurfaceDesc()->Height == (UINT)rcClient.bottom );
         }
 #endif
     }
 
-    if ( GetDXUTState().GetSaveScreenShot() ) {
-        DXUTSnapD3D11Screenshot( GetDXUTState().GetScreenShotName(), D3DX11_IFF_BMP );
+    if ( GetDXUTState().GetSaveScreenShot() )
+    {
+        DXUTSnapD3D11Screenshot( GetDXUTState().GetScreenShotName(), false );
     }
-    if ( GetDXUTState().GetExitAfterScreenShot() ) {
+    if ( GetDXUTState().GetExitAfterScreenShot() )
+    {
         DXUTShutdown();
         return;
     }
@@ -3933,10 +2956,10 @@ void DXUTRender3DEnvironment11()
             }
             else
             {
-                // Reset failed, but the device wasn't lost so something bad happened, 
+                // Reset failed, but the device wasn't lost so something bad happened,
                 // so recreate the device to try to recover
-                DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-                if( FAILED( DXUTChangeDevice( pDeviceSettings, NULL, NULL, true, false ) ) )
+                auto pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
+                if( FAILED( DXUTChangeDevice( pDeviceSettings, false ) ) )
                 {
                     DXUTShutdown();
                     return;
@@ -3948,7 +2971,7 @@ void DXUTRender3DEnvironment11()
     }
     else if( DXGI_ERROR_DEVICE_REMOVED == hr )
     {
-        // Use a callback to ask the app if it would like to find a new device.  
+        // Use a callback to ask the app if it would like to find a new device.
         // If no device removed callback is set, then look for a new device
         if( FAILED( DXUTHandleDeviceRemoved() ) )
         {
@@ -3973,10 +2996,6 @@ void DXUTRender3DEnvironment11()
     nFrame++;
     GetDXUTState().SetCurrentFrameNumber( nFrame );
 
-
-    // Update the D3D11 counter stats
-    //DXUTUpdateD3D11CounterStats();
-
     // Check to see if the app should shutdown due to cmdline
     if( GetDXUTState().GetOverrideQuitAfterFrame() != 0 )
     {
@@ -3987,113 +3006,51 @@ void DXUTRender3DEnvironment11()
     return;
 }
 
-void ClearD3D11DeviceContext( ID3D11DeviceContext* pd3dDeviceContext )
-{
-    // Unbind all objects from the immediate context
-    if (pd3dDeviceContext == NULL) return;
-
-    ID3D11ShaderResourceView* pSRVs[16] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
-    ID3D11RenderTargetView* pRTVs[16] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
-    ID3D11DepthStencilView* pDSV = NULL;
-    ID3D11Buffer* pBuffers[16] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
-    ID3D11SamplerState* pSamplers[16] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
-    UINT StrideOffset[16] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
-
-    // Shaders
-    pd3dDeviceContext->VSSetShader( NULL, NULL, 0 );
-    pd3dDeviceContext->HSSetShader( NULL, NULL, 0 );
-    pd3dDeviceContext->DSSetShader( NULL, NULL, 0 );
-    pd3dDeviceContext->GSSetShader( NULL, NULL, 0 );
-    pd3dDeviceContext->PSSetShader( NULL, NULL, 0 );
-
-    // IA clear
-    pd3dDeviceContext->IASetVertexBuffers( 0, 16, pBuffers, StrideOffset, StrideOffset );
-    pd3dDeviceContext->IASetIndexBuffer( NULL, DXGI_FORMAT_R16_UINT, 0 );
-    pd3dDeviceContext->IASetInputLayout( NULL );
-
-    // Constant buffers
-    pd3dDeviceContext->VSSetConstantBuffers( 0, 14, pBuffers );
-    pd3dDeviceContext->HSSetConstantBuffers( 0, 14, pBuffers );
-    pd3dDeviceContext->DSSetConstantBuffers( 0, 14, pBuffers );
-    pd3dDeviceContext->GSSetConstantBuffers( 0, 14, pBuffers );
-    pd3dDeviceContext->PSSetConstantBuffers( 0, 14, pBuffers );
-
-    // Resources
-    pd3dDeviceContext->VSSetShaderResources( 0, 16, pSRVs );
-    pd3dDeviceContext->HSSetShaderResources( 0, 16, pSRVs );
-    pd3dDeviceContext->DSSetShaderResources( 0, 16, pSRVs );
-    pd3dDeviceContext->GSSetShaderResources( 0, 16, pSRVs );
-    pd3dDeviceContext->PSSetShaderResources( 0, 16, pSRVs );
-
-    // Samplers
-    pd3dDeviceContext->VSSetSamplers( 0, 16, pSamplers );
-    pd3dDeviceContext->HSSetSamplers( 0, 16, pSamplers );
-    pd3dDeviceContext->DSSetSamplers( 0, 16, pSamplers );
-    pd3dDeviceContext->GSSetSamplers( 0, 16, pSamplers );
-    pd3dDeviceContext->PSSetSamplers( 0, 16, pSamplers );
-
-    // Render targets
-    pd3dDeviceContext->OMSetRenderTargets( 8, pRTVs, pDSV );
-
-    // States
-    FLOAT blendFactor[4] = { 0,0,0,0 };
-    pd3dDeviceContext->OMSetBlendState( NULL, blendFactor, 0xFFFFFFFF );
-    pd3dDeviceContext->OMSetDepthStencilState( NULL, 0 );
-    pd3dDeviceContext->RSSetState( NULL );
-}
 
 //--------------------------------------------------------------------------------------
 // Cleans up the 3D environment by:
-//      - Calls the device lost callback 
-//      - Calls the device destroyed callback 
+//      - Calls the device lost callback
+//      - Calls the device destroyed callback
 //      - Releases the D3D device
 //--------------------------------------------------------------------------------------
-void DXUTCleanup3DEnvironment11( bool bReleaseSettings )
+void DXUTCleanup3DEnvironment( _In_ bool bReleaseSettings )
 {
-    ID3D11Device* pd3dDevice = DXUTGetD3D11Device();
+    auto pd3dDevice = DXUTGetD3D11Device();
 
-    if( pd3dDevice != NULL )
+    if( pd3dDevice )
     {
-        if (GetDXUTState().GetD3D11RasterizerState()!= NULL ) 
+        if (GetDXUTState().GetD3D11RasterizerState())
             GetDXUTState().GetD3D11RasterizerState()->Release();
 
-        // Call ClearState to avoid tons of messy debug spew telling us that we're deleting bound objects
-        ID3D11DeviceContext* pImmediateContext = DXUTGetD3D11DeviceContext();
-        ClearD3D11DeviceContext( pImmediateContext );
-
-        // Clear state and flush
-        pImmediateContext->ClearState();
-        pImmediateContext->Flush();
-
         // Call the app's SwapChain lost callback
         GetDXUTState().SetInsideDeviceCallback( true );
         if( GetDXUTState().GetDeviceObjectsReset() )
         {
             LPDXUTCALLBACKD3D11SWAPCHAINRELEASING pCallbackSwapChainReleasing =
                 GetDXUTState().GetD3D11SwapChainReleasingFunc();
-            if( pCallbackSwapChainReleasing != NULL )
+            if( pCallbackSwapChainReleasing )
                 pCallbackSwapChainReleasing( GetDXUTState().GetD3D11SwapChainReleasingFuncUserContext() );
             GetDXUTState().SetDeviceObjectsReset( false );
         }
 
-        // Release our old depth stencil texture and view 
-        ID3D11Texture2D* pDS = GetDXUTState().GetD3D11DepthStencil();
+        // Release our old depth stencil texture and view
+        auto pDS = GetDXUTState().GetD3D11DepthStencil();
         SAFE_RELEASE( pDS );
-        GetDXUTState().SetD3D11DepthStencil( NULL );
-        ID3D11DepthStencilView* pDSV = GetDXUTState().GetD3D11DepthStencilView();
+        GetDXUTState().SetD3D11DepthStencil( nullptr );
+        auto pDSV = GetDXUTState().GetD3D11DepthStencilView();
         SAFE_RELEASE( pDSV );
-        GetDXUTState().SetD3D11DepthStencilView( NULL );
+        GetDXUTState().SetD3D11DepthStencilView( nullptr );
 
         // Cleanup the render target view
-        ID3D11RenderTargetView* pRTV = GetDXUTState().GetD3D11RenderTargetView();
+        auto pRTV = GetDXUTState().GetD3D11RenderTargetView();
         SAFE_RELEASE( pRTV );
-        GetDXUTState().SetD3D11RenderTargetView( NULL );
+        GetDXUTState().SetD3D11RenderTargetView( nullptr );
 
         // Call the app's device destroyed callback
         if( GetDXUTState().GetDeviceObjectsCreated() )
         {
-            LPDXUTCALLBACKD3D11DEVICEDESTROYED pCallbackDeviceDestroyed = GetDXUTState().GetD3D11DeviceDestroyedFunc();
-            if( pCallbackDeviceDestroyed != NULL )
+            auto pCallbackDeviceDestroyed = GetDXUTState().GetD3D11DeviceDestroyedFunc();
+            if( pCallbackDeviceDestroyed )
                 pCallbackDeviceDestroyed( GetDXUTState().GetD3D11DeviceDestroyedFuncUserContext() );
             GetDXUTState().SetDeviceObjectsCreated( false );
         }
@@ -4102,41 +3059,97 @@ void DXUTCleanup3DEnvironment11( bool bReleaseSettings )
 
         // Release the swap chain
         GetDXUTState().SetReleasingSwapChain( true );
-        IDXGISwapChain* pSwapChain = DXUTGetDXGISwapChain();
+        auto pSwapChain = DXUTGetDXGISwapChain();
         if( pSwapChain )
         {
             pSwapChain->SetFullscreenState( FALSE, 0 );
         }
         SAFE_RELEASE( pSwapChain );
-        GetDXUTState().SetDXGISwapChain( NULL );
+        GetDXUTState().SetDXGISwapChain( nullptr );
         GetDXUTState().SetReleasingSwapChain( false );
 
         // Release the outputs.
-        IDXGIOutput** ppOutputArray = GetDXUTState().GetDXGIOutputArray();
+        auto ppOutputArray = GetDXUTState().GetDXGIOutputArray();
         UINT OutputCount = GetDXUTState().GetDXGIOutputArraySize();
         for( UINT o = 0; o < OutputCount; ++o )
         SAFE_RELEASE( ppOutputArray[o] );
         delete[] ppOutputArray;
-        GetDXUTState().SetDXGIOutputArray( NULL );
+        GetDXUTState().SetDXGIOutputArray( nullptr );
         GetDXUTState().SetDXGIOutputArraySize( 0 );
 
         // Release the D3D adapter.
-        IDXGIAdapter* pAdapter = GetDXUTState().GetDXGIAdapter();
+        auto pAdapter = GetDXUTState().GetDXGIAdapter();
         SAFE_RELEASE( pAdapter );
-        GetDXUTState().SetDXGIAdapter( NULL );
+        GetDXUTState().SetDXGIAdapter( nullptr );
 
-        // Release the counters
-        //DXUTDestroyD3D11Counters();
+        // Call ClearState to avoid tons of messy debug spew telling us that we're deleting bound objects
+        auto pImmediateContext = DXUTGetD3D11DeviceContext();
+        assert( pImmediateContext );
+        pImmediateContext->ClearState();
+        pImmediateContext->Flush();
 
         // Release the D3D11 immediate context (if it exists) because it has a extra ref count on it
-        ID3D11DeviceContext* pd3d11DeviceContext = GetDXUTState().GetD3D11DeviceContext();
-        SAFE_RELEASE( pd3d11DeviceContext );
-        GetDXUTState().SetD3D11DeviceContext( NULL );
+        SAFE_RELEASE( pImmediateContext );
+        GetDXUTState().SetD3D11DeviceContext( nullptr );
+
+        auto pImmediateContext1 = DXUTGetD3D11DeviceContext1();
+        SAFE_RELEASE( pImmediateContext1 );
+        GetDXUTState().SetD3D11DeviceContext1( nullptr );
+
+#ifdef USE_DIRECT3D11_2
+        auto pImmediateContext2 = DXUTGetD3D11DeviceContext2();
+        SAFE_RELEASE(pImmediateContext2);
+        GetDXUTState().SetD3D11DeviceContext2(nullptr);
+#endif
+
+#ifdef USE_DIRECT3D11_3
+        auto pImmediateContext3 = DXUTGetD3D11DeviceContext3();
+        SAFE_RELEASE(pImmediateContext3);
+        GetDXUTState().SetD3D11DeviceContext3(nullptr);
+#endif
+
+#ifdef USE_DIRECT3D11_4
+        auto pImmediateContext4 = DXUTGetD3D11DeviceContext4();
+        SAFE_RELEASE(pImmediateContext4);
+        GetDXUTState().SetD3D11DeviceContext4(nullptr);
+#endif
 
-        // Release the D3D device and in debug configs, displays a message box if there 
-        // are unrelease objects.
-        if( pd3dDevice )
+        // Report live objects
+        if ( pd3dDevice )
         {
+#ifndef NDEBUG
+            ID3D11Debug * d3dDebug = nullptr;
+            if( SUCCEEDED( pd3dDevice->QueryInterface( IID_PPV_ARGS(&d3dDebug) ) ) )
+            {
+                d3dDebug->ReportLiveDeviceObjects( D3D11_RLDO_SUMMARY | D3D11_RLDO_DETAIL );
+                d3dDebug->Release();
+            }
+#endif
+
+            auto pd3dDevice1 = DXUTGetD3D11Device1();
+            SAFE_RELEASE( pd3dDevice1 );
+            GetDXUTState().SetD3D11Device1(nullptr);
+
+#ifdef USE_DIRECT3D11_2
+            auto pd3dDevice2 = DXUTGetD3D11Device2();
+            SAFE_RELEASE(pd3dDevice2);
+            GetDXUTState().SetD3D11Device2(nullptr);
+#endif
+
+#ifdef USE_DIRECT3D11_3
+            auto pd3dDevice3 = DXUTGetD3D11Device3();
+            SAFE_RELEASE(pd3dDevice3);
+            GetDXUTState().SetD3D11Device3(nullptr);
+#endif
+
+#ifdef USE_DIRECT3D11_4
+            auto pd3dDevice4 = DXUTGetD3D11Device4();
+            SAFE_RELEASE(pd3dDevice4);
+            GetDXUTState().SetD3D11Device4(nullptr);
+#endif
+
+            // Release the D3D device and in debug configs, displays a message box if there
+            // are unrelease objects.
             UINT references = pd3dDevice->Release();
             if( references > 0 )
             {
@@ -4144,16 +3157,27 @@ void DXUTCleanup3DEnvironment11( bool bReleaseSettings )
                 DXUT_ERR( L"DXUTCleanup3DEnvironment", DXUTERR_NONZEROREFCOUNT );
             }
         }
-        GetDXUTState().SetD3D11Device( NULL );
+        GetDXUTState().SetD3D11Device( nullptr );
+
+#ifndef NDEBUG
+        {
+            IDXGIDebug* dxgiDebug = nullptr;
+            if ( SUCCEEDED( DXUT_Dynamic_DXGIGetDebugInterface( IID_IDXGIDebug, reinterpret_cast<void**>( &dxgiDebug ) ) ) )
+            {
+                dxgiDebug->ReportLiveObjects( DXGI_DEBUG_ALL, DXGI_DEBUG_RLO_ALL );
+                dxgiDebug->Release();
+            }
+        }
+#endif
 
         if( bReleaseSettings )
         {
-            DXUTDeviceSettings* pOldDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
+            auto pOldDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
             SAFE_DELETE(pOldDeviceSettings);
-            GetDXUTState().SetCurrentDeviceSettings( NULL );
+            GetDXUTState().SetCurrentDeviceSettings( nullptr );
         }
 
-        DXGI_SURFACE_DESC* pBackBufferSurfaceDesc = GetDXUTState().GetBackBufferSurfaceDescDXGI();
+        auto pBackBufferSurfaceDesc = GetDXUTState().GetBackBufferSurfaceDescDXGI();
         ZeroMemory( pBackBufferSurfaceDesc, sizeof( DXGI_SURFACE_DESC ) );
 
         GetDXUTState().SetDeviceCreated( false );
@@ -4162,15 +3186,15 @@ void DXUTCleanup3DEnvironment11( bool bReleaseSettings )
 
 
 //--------------------------------------------------------------------------------------
-// Low level keyboard hook to disable Windows key to prevent accidental task switching.  
+// Low level keyboard hook to disable Windows key to prevent accidental task switching.
 //--------------------------------------------------------------------------------------
 LRESULT CALLBACK DXUTLowLevelKeyboardProc( int nCode, WPARAM wParam, LPARAM lParam )
 {
-    if( nCode < 0 || nCode != HC_ACTION )  // do not process message 
+    if( nCode < 0 || nCode != HC_ACTION )  // do not process message
         return CallNextHookEx( GetDXUTState().GetKeyboardHook(), nCode, wParam, lParam );
 
     bool bEatKeystroke = false;
-    KBDLLHOOKSTRUCT* p = ( KBDLLHOOKSTRUCT* )lParam;
+    auto p = reinterpret_cast<KBDLLHOOKSTRUCT*>( lParam );
     switch( wParam )
     {
         case WM_KEYDOWN:
@@ -4189,11 +3213,11 @@ LRESULT CALLBACK DXUTLowLevelKeyboardProc( int nCode, WPARAM wParam, LPARAM lPar
 }
 
 
-
 //--------------------------------------------------------------------------------------
-// Controls how DXUT behaves when fullscreen and windowed mode with regard to 
-// shortcut keys (Windows keys, StickyKeys shortcut, ToggleKeys shortcut, FilterKeys shortcut) 
+// Controls how DXUT behaves when fullscreen and windowed mode with regard to
+// shortcut keys (Windows keys, StickyKeys shortcut, ToggleKeys shortcut, FilterKeys shortcut)
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void WINAPI DXUTSetShortcutKeySettings( bool bAllowWhenFullscreen, bool bAllowWhenWindowed )
 {
     GetDXUTState().SetAllowShortcutKeysWhenWindowed( bAllowWhenWindowed );
@@ -4211,16 +3235,16 @@ void WINAPI DXUTSetShortcutKeySettings( bool bAllowWhenFullscreen, bool bAllowWh
 
 
 //--------------------------------------------------------------------------------------
-// Enables/disables Windows keys, and disables or restores the StickyKeys/ToggleKeys/FilterKeys 
+// Enables/disables Windows keys, and disables or restores the StickyKeys/ToggleKeys/FilterKeys
 // shortcut to help prevent accidental task switching
 //--------------------------------------------------------------------------------------
-void DXUTAllowShortcutKeys( bool bAllowKeys )
+void DXUTAllowShortcutKeys( _In_ bool bAllowKeys )
 {
     GetDXUTState().SetAllowShortcutKeys( bAllowKeys );
 
     if( bAllowKeys )
     {
-        // Restore StickyKeys/etc to original state and enable Windows key      
+        // Restore StickyKeys/etc to original state and enable Windows key
         STICKYKEYS sk = GetDXUTState().GetStartupStickyKeys();
         TOGGLEKEYS tk = GetDXUTState().GetStartupToggleKeys();
         FILTERKEYS fk = GetDXUTState().GetStartupFilterKeys();
@@ -4233,27 +3257,21 @@ void DXUTAllowShortcutKeys( bool bAllowKeys )
         if( GetDXUTState().GetKeyboardHook() )
         {
             UnhookWindowsHookEx( GetDXUTState().GetKeyboardHook() );
-            GetDXUTState().SetKeyboardHook( NULL );
+            GetDXUTState().SetKeyboardHook( nullptr );
         }
     }
     else
     {
         // Set low level keyboard hook if haven't already
-        if( GetDXUTState().GetKeyboardHook() == NULL )
+        if( !GetDXUTState().GetKeyboardHook() )
         {
-            // Set the low-level hook procedure.  Only works on Windows 2000 and above
-            OSVERSIONINFO OSVersionInfo;
-            OSVersionInfo.dwOSVersionInfoSize = sizeof( OSVersionInfo );
-            GetVersionEx( &OSVersionInfo );
-            if( OSVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT && OSVersionInfo.dwMajorVersion > 4 )
-            {
-                HHOOK hKeyboardHook = SetWindowsHookEx( WH_KEYBOARD_LL, DXUTLowLevelKeyboardProc,
-                                                        GetModuleHandle( NULL ), 0 );
-                GetDXUTState().SetKeyboardHook( hKeyboardHook );
-            }
+            // Set the low-level hook procedure.
+            HHOOK hKeyboardHook = SetWindowsHookEx( WH_KEYBOARD_LL, DXUTLowLevelKeyboardProc,
+                                                    GetModuleHandle( nullptr ), 0 );
+            GetDXUTState().SetKeyboardHook( hKeyboardHook );
         }
 
-        // Disable StickyKeys/etc shortcuts but if the accessibility feature is on, 
+        // Disable StickyKeys/etc shortcuts but if the accessibility feature is on,
         // then leave the settings alone as its probably being usefully used
 
         STICKYKEYS skOff = GetDXUTState().GetStartupStickyKeys();
@@ -4292,6 +3310,7 @@ void DXUTAllowShortcutKeys( bool bAllowKeys )
 //--------------------------------------------------------------------------------------
 // Pauses time or rendering.  Keeps a ref count so pausing can be layered
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void WINAPI DXUTPause( bool bPauseTime, bool bPauseRendering )
 {
     int nPauseTimeCount = GetDXUTState().GetPauseTimeCount();
@@ -4327,13 +3346,13 @@ void WINAPI DXUTPause( bool bPauseTime, bool bPauseRendering )
 //--------------------------------------------------------------------------------------
 // Starts a user defined timer callback
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT WINAPI DXUTSetTimer( LPDXUTCALLBACKTIMER pCallbackTimer, float fTimeoutInSecs, UINT* pnIDEvent,
                              void* pCallbackUserContext )
 {
-    if( pCallbackTimer == NULL )
+    if( !pCallbackTimer )
         return DXUT_ERR_MSGBOX( L"DXUTSetTimer", E_INVALIDARG );
 
-    HRESULT hr;
     DXUT_TIMER DXUTTimer;
     DXUTTimer.pCallbackTimer = pCallbackTimer;
     DXUTTimer.pCallbackUserContext = pCallbackUserContext;
@@ -4343,17 +3362,16 @@ HRESULT WINAPI DXUTSetTimer( LPDXUTCALLBACKTIMER pCallbackTimer, float fTimeoutI
     DXUTTimer.nID = GetDXUTState().GetTimerLastID() + 1;
     GetDXUTState().SetTimerLastID( DXUTTimer.nID );
 
-    CGrowableArray <DXUT_TIMER>* pTimerList = GetDXUTState().GetTimerList();
-    if( pTimerList == NULL )
+    auto pTimerList = GetDXUTState().GetTimerList();
+    if( !pTimerList )
     {
-        pTimerList = new CGrowableArray <DXUT_TIMER>;
-        if( pTimerList == NULL )
+        pTimerList = new (std::nothrow) std::vector<DXUT_TIMER>;
+        if( !pTimerList )
             return E_OUTOFMEMORY;
         GetDXUTState().SetTimerList( pTimerList );
     }
 
-    if( FAILED( hr = pTimerList->Add( DXUTTimer ) ) )
-        return hr;
+    pTimerList->push_back( DXUTTimer );
 
     if( pnIDEvent )
         *pnIDEvent = DXUTTimer.nID;
@@ -4365,21 +3383,21 @@ HRESULT WINAPI DXUTSetTimer( LPDXUTCALLBACKTIMER pCallbackTimer, float fTimeoutI
 //--------------------------------------------------------------------------------------
 // Stops a user defined timer callback
 //--------------------------------------------------------------------------------------
-HRESULT WINAPI DXUTKillTimer( UINT nIDEvent )
+HRESULT WINAPI DXUTKillTimer( _In_ UINT nIDEvent )
 {
-    CGrowableArray <DXUT_TIMER>* pTimerList = GetDXUTState().GetTimerList();
-    if( pTimerList == NULL )
+    auto pTimerList = GetDXUTState().GetTimerList();
+    if( !pTimerList )
         return S_FALSE;
 
     bool bFound = false;
 
-    for( int i = 0; i < pTimerList->GetSize(); i++ )
+    for( auto it = pTimerList->begin(); it != pTimerList->end(); ++it )
     {
-        DXUT_TIMER DXUTTimer = pTimerList->GetAt( i );
+        DXUT_TIMER DXUTTimer = *it;
         if( DXUTTimer.nID == nIDEvent )
         {
             DXUTTimer.bEnabled = false;
-            pTimerList->SetAt( i, DXUTTimer );
+            *it = DXUTTimer;
             bFound = true;
             break;
         }
@@ -4399,14 +3417,14 @@ void DXUTHandleTimers()
 {
     float fElapsedTime = DXUTGetElapsedTime();
 
-    CGrowableArray <DXUT_TIMER>* pTimerList = GetDXUTState().GetTimerList();
-    if( pTimerList == NULL )
+    auto pTimerList = GetDXUTState().GetTimerList();
+    if( !pTimerList )
         return;
 
     // Walk through the list of timer callbacks
-    for( int i = 0; i < pTimerList->GetSize(); i++ )
+    for( auto it = pTimerList->begin(); it != pTimerList->end(); ++it )
     {
-        DXUT_TIMER DXUTTimer = pTimerList->GetAt( i );
+        DXUT_TIMER DXUTTimer = *it;
         if( DXUTTimer.bEnabled )
         {
             DXUTTimer.fCountdown -= fElapsedTime;
@@ -4416,19 +3434,19 @@ void DXUTHandleTimers()
             {
                 DXUTTimer.pCallbackTimer( DXUTTimer.nID, DXUTTimer.pCallbackUserContext );
                 // The callback my have changed the timer.
-                DXUTTimer = pTimerList->GetAt( i );
+                DXUTTimer = *it;
                 DXUTTimer.fCountdown = DXUTTimer.fTimeoutInSecs;
             }
-            pTimerList->SetAt( i, DXUTTimer );
+            *it = DXUTTimer;
         }
     }
 }
 
 
 //--------------------------------------------------------------------------------------
-// Display an custom error msg box 
+// Display an custom error msg box
 //--------------------------------------------------------------------------------------
-void DXUTDisplayErrorMessage( HRESULT hr )
+void DXUTDisplayErrorMessage( _In_ HRESULT hr )
 {
     WCHAR strBuffer[512];
 
@@ -4439,18 +3457,15 @@ void DXUTDisplayErrorMessage( HRESULT hr )
         case DXUTERR_NODIRECT3D:
         {
             nExitCode = 2;
-            if( DXUTDoesAppSupportD3D11() && !DXUTDoesAppSupportD3D9() )
-                wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"Could not initialize Direct3D 11. " );
-            else
-                wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"Could not initialize Direct3D 9. Check that the latest version of DirectX is correctly installed on your system.  Also make sure that this program was compiled with header files that match the installed DirectX DLLs." );
+            wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"Could not initialize Direct3D 11. " );
             break;
         }
-        case DXUTERR_NOCOMPATIBLEDEVICES:    
-            nExitCode = 3; 
-            if( GetSystemMetrics(0x1000) != 0 ) // SM_REMOTESESSION
-                wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"Direct3D does not work over a remote session." ); 
+        case DXUTERR_NOCOMPATIBLEDEVICES:
+            nExitCode = 3;
+            if( GetSystemMetrics(SM_REMOTESESSION) != 0 )
+                wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"Direct3D does not work over a remote session." );
             else
-                wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"Could not find any compatible Direct3D devices." ); 
+                wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"Could not find any compatible Direct3D devices." );
             break;
         case DXUTERR_MEDIANOTFOUND:          nExitCode = 4; wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"Could not find required media." ); break;
         case DXUTERR_NONZEROREFCOUNT:        nExitCode = 5; wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"The Direct3D device has a non-zero reference count, meaning some objects were not released." ); break;
@@ -4458,11 +3473,11 @@ void DXUTDisplayErrorMessage( HRESULT hr )
         case DXUTERR_RESETTINGDEVICE:        nExitCode = 7; wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"Failed resetting the Direct3D device." ); break;
         case DXUTERR_CREATINGDEVICEOBJECTS:  nExitCode = 8; wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"An error occurred in the device create callback function." ); break;
         case DXUTERR_RESETTINGDEVICEOBJECTS: nExitCode = 9; wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"An error occurred in the device reset callback function." ); break;
-        // nExitCode 10 means the app exited using a REF device 
+        // nExitCode 10 means the app exited using a REF device
         case DXUTERR_DEVICEREMOVED:          nExitCode = 11; wcscpy_s( strBuffer, ARRAYSIZE(strBuffer), L"The Direct3D device was removed."  ); break;
         default: bFound = false; nExitCode = 1; break; // nExitCode 1 means the API was incorrectly called
 
-    }   
+    }
 
     GetDXUTState().SetExitCode(nExitCode);
 
@@ -4480,7 +3495,7 @@ void DXUTDisplayErrorMessage( HRESULT hr )
 //--------------------------------------------------------------------------------------
 // Internal function to map MK_* to an array index
 //--------------------------------------------------------------------------------------
-int DXUTMapButtonToArrayIndex( BYTE vButton )
+int DXUTMapButtonToArrayIndex( _In_ BYTE vButton )
 {
     switch( vButton )
     {
@@ -4503,57 +3518,52 @@ int DXUTMapButtonToArrayIndex( BYTE vButton )
 }
 
 
-
 //--------------------------------------------------------------------------------------
 // Toggle between full screen and windowed
 //--------------------------------------------------------------------------------------
 HRESULT WINAPI DXUTToggleFullScreen()
 {
+    auto deviceSettings = DXUTGetDeviceSettings();
+    if ( deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_WARP )
+    {
+        // WARP driver type doesn't support fullscreen
+        return S_FALSE;
+    }
+
+    auto orginalDeviceSettings = DXUTGetDeviceSettings();
+
+    deviceSettings.d3d11.sd.Windowed = !deviceSettings.d3d11.sd.Windowed;
+
     HRESULT hr;
-    DXUTDeviceSettings deviceSettings = DXUTGetDeviceSettings();
-    DXUTDeviceSettings orginalDeviceSettings = DXUTGetDeviceSettings();
-    
-    if (deviceSettings.ver == DXUT_D3D11_DEVICE) {
-        deviceSettings.d3d11.sd.Windowed = !deviceSettings.d3d11.sd.Windowed; // datut
-        if (!deviceSettings.d3d11.sd.Windowed) {
-            DXGI_MODE_DESC adapterDesktopDisplayMode =
+    if (!deviceSettings.d3d11.sd.Windowed)
+    {
+        DXGI_MODE_DESC adapterDesktopDisplayMode;
+        hr = DXUTGetD3D11AdapterDisplayMode( deviceSettings.d3d11.AdapterOrdinal, 0, &adapterDesktopDisplayMode );
+        if ( FAILED(hr) )
+        {
+            static const DXGI_MODE_DESC s_adapterDesktopDisplayMode =
             {
-                800, 600, { 60, 1 }, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB
+                800, 600, { 0, 0 }, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB
             };
-            DXUTGetD3D11AdapterDisplayMode( deviceSettings.d3d11.AdapterOrdinal, 0, &adapterDesktopDisplayMode );
-            
-            
-            deviceSettings.d3d11.sd.BufferDesc = adapterDesktopDisplayMode;
-        }else {
-            RECT r = DXUTGetWindowClientRectAtModeChange();
-            deviceSettings.d3d11.sd.BufferDesc.Height = r.bottom;
-            deviceSettings.d3d11.sd.BufferDesc.Width = r.right;
-        }
-    }else if (deviceSettings.ver == DXUT_D3D9_DEVICE){
-        deviceSettings.d3d9.pp.Windowed = !deviceSettings.d3d9.pp.Windowed; 
-        if (!deviceSettings.d3d9.pp.Windowed) {
-                D3DDISPLAYMODE adapterDesktopDisplayMode;
-                IDirect3D9* pD3D = DXUTGetD3D9Object();
-                DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-                pD3D->GetAdapterDisplayMode( pDeviceSettings->d3d9.AdapterOrdinal, &adapterDesktopDisplayMode );
-                deviceSettings.d3d9.pp.BackBufferWidth = adapterDesktopDisplayMode.Width;
-                deviceSettings.d3d9.pp.BackBufferHeight = adapterDesktopDisplayMode.Height;
-                deviceSettings.d3d9.pp.BackBufferFormat = adapterDesktopDisplayMode.Format;
-        } else {
-            RECT r = DXUTGetWindowClientRectAtModeChange();
-            deviceSettings.d3d9.pp.BackBufferHeight= r.bottom;
-            deviceSettings.d3d9.pp.FullScreen_RefreshRateInHz = 0;
-            deviceSettings.d3d9.pp.BackBufferWidth = r.right;
+            memcpy(&adapterDesktopDisplayMode, &s_adapterDesktopDisplayMode, sizeof(DXGI_MODE_DESC));
         }
+
+        deviceSettings.d3d11.sd.BufferDesc = adapterDesktopDisplayMode;
+    }
+    else
+    {
+        RECT r = DXUTGetWindowClientRectAtModeChange();
+        deviceSettings.d3d11.sd.BufferDesc.Height = r.bottom;
+        deviceSettings.d3d11.sd.BufferDesc.Width = r.right;
     }
 
-    hr = DXUTChangeDevice( &deviceSettings, NULL, NULL,  false, false );
+    hr = DXUTChangeDevice( &deviceSettings, false );
 
     // If hr == E_ABORT, this means the app rejected the device settings in the ModifySettingsCallback so nothing changed
     if( FAILED( hr ) && ( hr != E_ABORT ) )
     {
         // Failed creating device, try to switch back.
-        HRESULT hr2 = DXUTChangeDevice( &orginalDeviceSettings, NULL,  NULL, false, false );
+        HRESULT hr2 = DXUTChangeDevice( &orginalDeviceSettings, false );
         if( FAILED( hr2 ) )
         {
             // If this failed, then shutdown
@@ -4562,55 +3572,45 @@ HRESULT WINAPI DXUTToggleFullScreen()
     }
 
     return hr;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Toggle between HAL and WARP
-//--------------------------------------------------------------------------------------
-
-HRESULT WINAPI DXUTToggleWARP () {
-    HRESULT hr;
+}
 
-    DXUTDeviceSettings deviceSettings = DXUTGetDeviceSettings();
-    DXUTDeviceSettings orginalDeviceSettings = DXUTGetDeviceSettings();
 
-    // Toggle between REF & HAL
-    if( DXUTIsCurrentDeviceD3D9() )
-    {
+//--------------------------------------------------------------------------------------
+// Toggle between HAL/REF and WARP
+//--------------------------------------------------------------------------------------
+HRESULT WINAPI DXUTToggleWARP ()
+{
+    auto deviceSettings = DXUTGetDeviceSettings();
 
-    }
-    else
+    if ( deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_HARDWARE || deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE )
     {
-        ID3D11SwitchToRef* pD3D11STR = NULL;
-        ID3D11Device* pDev = DXUTGetD3D11Device();
-        assert( pDev != NULL );
-        hr = pDev->QueryInterface( __uuidof( *pD3D11STR ), ( LPVOID* )&pD3D11STR );
-        if( SUCCEEDED( hr ) )
+        if ( !deviceSettings.d3d11.sd.Windowed )
         {
-            pD3D11STR->SetUseRef( pD3D11STR->GetUseRef() ? FALSE : TRUE );
-            SAFE_RELEASE( pD3D11STR );
-            return S_OK;
+            // WARP driver type doesn't support fullscreen
+            return S_FALSE;
         }
 
-        if( deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_HARDWARE || deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE  )
-            deviceSettings.d3d11.DriverType = D3D_DRIVER_TYPE_WARP;
-        else if( deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE || deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_WARP )
-            deviceSettings.d3d11.DriverType = D3D_DRIVER_TYPE_HARDWARE;
+        deviceSettings.d3d11.DriverType = D3D_DRIVER_TYPE_WARP;
+    }
+    else if ( deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_WARP )
+    {
+        deviceSettings.d3d11.DriverType = D3D_DRIVER_TYPE_HARDWARE;
     }
-    
-    hr = DXUTSnapDeviceSettingsToEnumDevice(&deviceSettings, false);
+
+    HRESULT hr = DXUTSnapDeviceSettingsToEnumDevice(&deviceSettings, false);
     if( SUCCEEDED( hr ) )
     {
-        // Create a Direct3D device using the new device settings.  
+        DXUTDeviceSettings orginalDeviceSettings = DXUTGetDeviceSettings();
+
+        // Create a Direct3D device using the new device settings.
         // If there is an existing device, then it will either reset or recreate the scene.
-        hr = DXUTChangeDevice( &deviceSettings, NULL,  NULL, false, false );
+        hr = DXUTChangeDevice( &deviceSettings, false );
 
         // If hr == E_ABORT, this means the app rejected the device settings in the ModifySettingsCallback so nothing changed
         if( FAILED( hr ) && ( hr != E_ABORT ) )
         {
             // Failed creating device, try to switch back.
-            HRESULT hr2 = DXUTChangeDevice( &orginalDeviceSettings, NULL, NULL, false, false );
+            HRESULT hr2 = DXUTChangeDevice( &orginalDeviceSettings, false );
             if( FAILED( hr2 ) )
             {
                 // If this failed, then shutdown
@@ -4621,55 +3621,48 @@ HRESULT WINAPI DXUTToggleWARP () {
 
     return hr;
 }
+
+
 //--------------------------------------------------------------------------------------
-// Toggle between HAL and REF
+// Toggle between HAL/WARP and REF
 //--------------------------------------------------------------------------------------
 HRESULT WINAPI DXUTToggleREF()
 {
-    HRESULT hr;
+    auto deviceSettings = DXUTGetDeviceSettings();
 
-    DXUTDeviceSettings deviceSettings = DXUTGetDeviceSettings();
-    DXUTDeviceSettings orginalDeviceSettings = DXUTGetDeviceSettings();
-
-    // Toggle between REF & HAL
-    if( DXUTIsCurrentDeviceD3D9() )
+    if ( deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_HARDWARE )
     {
-        if( deviceSettings.d3d9.DeviceType == D3DDEVTYPE_HAL )
-            deviceSettings.d3d9.DeviceType = D3DDEVTYPE_REF;
-        else if( deviceSettings.d3d9.DeviceType == D3DDEVTYPE_REF )
-            deviceSettings.d3d9.DeviceType = D3DDEVTYPE_HAL;
+        deviceSettings.d3d11.DriverType = D3D_DRIVER_TYPE_REFERENCE;
     }
-    else
+    else if ( deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE )
     {
-        ID3D11SwitchToRef* pD3D11STR = NULL;
-        ID3D11Device* pDev = DXUTGetD3D11Device();
-        assert( pDev != NULL );
-        hr = pDev->QueryInterface( __uuidof( *pD3D11STR ), ( LPVOID* )&pD3D11STR );
-        if( SUCCEEDED( hr ) )
+        deviceSettings.d3d11.DriverType = D3D_DRIVER_TYPE_HARDWARE;
+    }
+    else if ( deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_WARP )
+    {
+        if ( !deviceSettings.d3d11.sd.Windowed )
         {
-            pD3D11STR->SetUseRef( pD3D11STR->GetUseRef() ? FALSE : TRUE );
-            SAFE_RELEASE( pD3D11STR );
-            return S_OK;
+            // WARP driver type doesn't support fullscreen
+            return S_FALSE;
         }
 
-        if( deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_HARDWARE )
-            deviceSettings.d3d11.DriverType = D3D_DRIVER_TYPE_REFERENCE;
-        else if( deviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE )
-            deviceSettings.d3d11.DriverType = D3D_DRIVER_TYPE_HARDWARE;
+        deviceSettings.d3d11.DriverType = D3D_DRIVER_TYPE_REFERENCE;
     }
-    
-    hr = DXUTSnapDeviceSettingsToEnumDevice(&deviceSettings, false);
+
+    HRESULT hr = DXUTSnapDeviceSettingsToEnumDevice(&deviceSettings, false);
     if( SUCCEEDED( hr ) )
     {
-        // Create a Direct3D device using the new device settings.  
+        auto orginalDeviceSettings = DXUTGetDeviceSettings();
+
+        // Create a Direct3D device using the new device settings.
         // If there is an existing device, then it will either reset or recreate the scene.
-        hr = DXUTChangeDevice( &deviceSettings, NULL,  NULL, false, false );
+        hr = DXUTChangeDevice( &deviceSettings, false );
 
         // If hr == E_ABORT, this means the app rejected the device settings in the ModifySettingsCallback so nothing changed
         if( FAILED( hr ) && ( hr != E_ABORT ) )
         {
             // Failed creating device, try to switch back.
-            HRESULT hr2 = DXUTChangeDevice( &orginalDeviceSettings, NULL, NULL, false, false );
+            HRESULT hr2 = DXUTChangeDevice( &orginalDeviceSettings, false );
             if( FAILED( hr2 ) )
             {
                 // If this failed, then shutdown
@@ -4686,48 +3679,54 @@ HRESULT WINAPI DXUTToggleREF()
 //--------------------------------------------------------------------------------------
 void DXUTCheckForDXGIFullScreenSwitch()
 {
-    DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-    if( !DXUTIsD3D9( pDeviceSettings ) )
-    {
-        IDXGISwapChain* pSwapChain = DXUTGetDXGISwapChain();
-        assert( pSwapChain != NULL );
-        DXGI_SWAP_CHAIN_DESC SCDesc;
-        pSwapChain->GetDesc( &SCDesc );
+    auto pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
+    auto pSwapChain = DXUTGetDXGISwapChain();
+    assert( pSwapChain );
+    _Analysis_assume_( pSwapChain );
+    DXGI_SWAP_CHAIN_DESC SCDesc;
+    if ( FAILED(pSwapChain->GetDesc(&SCDesc)) )
+        memset( &SCDesc, 0, sizeof(SCDesc) );
 
-        BOOL bIsWindowed = ( BOOL )DXUTIsWindowed();
-        if( bIsWindowed != SCDesc.Windowed )
-        {
-            pDeviceSettings->d3d11.sd.Windowed = SCDesc.Windowed;
+    BOOL bIsWindowed = ( BOOL )DXUTIsWindowed();
+    if( bIsWindowed != SCDesc.Windowed )
+    {
+        pDeviceSettings->d3d11.sd.Windowed = SCDesc.Windowed;
 
-            DXUTDeviceSettings deviceSettings = DXUTGetDeviceSettings();
+        auto deviceSettings = DXUTGetDeviceSettings();
 
-            if( bIsWindowed )
-            {
-                GetDXUTState().SetWindowBackBufferWidthAtModeChange( deviceSettings.d3d11.sd.BufferDesc.Width );
-                GetDXUTState().SetWindowBackBufferHeightAtModeChange( deviceSettings.d3d11.sd.BufferDesc.Height );
-            }
-            else
-            {
-                GetDXUTState().SetFullScreenBackBufferWidthAtModeChange( deviceSettings.d3d11.sd.BufferDesc.Width );
-                GetDXUTState().SetFullScreenBackBufferHeightAtModeChange( deviceSettings.d3d11.sd.BufferDesc.Height );
-            }
+        if( bIsWindowed )
+        {
+            GetDXUTState().SetWindowBackBufferWidthAtModeChange( deviceSettings.d3d11.sd.BufferDesc.Width );
+            GetDXUTState().SetWindowBackBufferHeightAtModeChange( deviceSettings.d3d11.sd.BufferDesc.Height );
+        }
+        else
+        {
+            GetDXUTState().SetFullScreenBackBufferWidthAtModeChange( deviceSettings.d3d11.sd.BufferDesc.Width );
+            GetDXUTState().SetFullScreenBackBufferHeightAtModeChange( deviceSettings.d3d11.sd.BufferDesc.Height );
         }
     }
 }
 
+_Use_decl_annotations_
 void DXUTResizeDXGIBuffers( UINT Width, UINT Height, BOOL bFullScreen )
 {
     HRESULT hr = S_OK;
     RECT rcCurrentClient;
     GetClientRect( DXUTGetHWND(), &rcCurrentClient );
 
-    DXUTDeviceSettings* pDevSettings = GetDXUTState().GetCurrentDeviceSettings();
-    assert( pDevSettings != NULL );
+    auto pDevSettings = GetDXUTState().GetCurrentDeviceSettings();
+    assert( pDevSettings );
+    _Analysis_assume_( pDevSettings );
+
+    auto pSwapChain = DXUTGetDXGISwapChain();
 
-    IDXGISwapChain* pSwapChain = DXUTGetDXGISwapChain();
+    auto pd3dDevice = DXUTGetD3D11Device();
+    assert( pd3dDevice );
+    _Analysis_assume_( pd3dDevice );
 
-    ID3D11Device* pd3dDevice = DXUTGetD3D11Device();
-    ID3D11DeviceContext* pd3dImmediateContext = DXUTGetD3D11DeviceContext();
+    auto pd3dImmediateContext = DXUTGetD3D11DeviceContext();
+    assert( pd3dImmediateContext );
+    _Analysis_assume_( pd3dImmediateContext );
 
     // Determine if we're fullscreen
     pDevSettings->d3d11.sd.Windowed = !bFullScreen;
@@ -4736,22 +3735,22 @@ void DXUTResizeDXGIBuffers( UINT Width, UINT Height, BOOL bFullScreen )
     GetDXUTState().SetInsideDeviceCallback( true );
     LPDXUTCALLBACKD3D11SWAPCHAINRELEASING pCallbackSwapChainReleasing = GetDXUTState().GetD3D11SwapChainReleasingFunc
         ();
-    if( pCallbackSwapChainReleasing != NULL )
+    if( pCallbackSwapChainReleasing )
         pCallbackSwapChainReleasing( GetDXUTState().GetD3D11SwapChainResizedFuncUserContext() );
     GetDXUTState().SetInsideDeviceCallback( false );
 
-    // Release our old depth stencil texture and view 
-    ID3D11Texture2D* pDS = GetDXUTState().GetD3D11DepthStencil();
+    // Release our old depth stencil texture and view
+    auto pDS = GetDXUTState().GetD3D11DepthStencil();
     SAFE_RELEASE( pDS );
-    GetDXUTState().SetD3D11DepthStencil( NULL );
-    ID3D11DepthStencilView* pDSV = GetDXUTState().GetD3D11DepthStencilView();
+    GetDXUTState().SetD3D11DepthStencil( nullptr );
+    auto pDSV = GetDXUTState().GetD3D11DepthStencilView();
     SAFE_RELEASE( pDSV );
-    GetDXUTState().SetD3D11DepthStencilView( NULL );
+    GetDXUTState().SetD3D11DepthStencilView( nullptr );
 
     // Release our old render target view
-    ID3D11RenderTargetView* pRTV = GetDXUTState().GetD3D11RenderTargetView();
+    auto pRTV = GetDXUTState().GetD3D11RenderTargetView();
     SAFE_RELEASE( pRTV );
-    GetDXUTState().SetD3D11RenderTargetView( NULL );
+    GetDXUTState().SetD3D11RenderTargetView( nullptr );
 
     // Alternate between 0 and DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH when resizing buffers.
     // When in windowed mode, we want 0 since this allows the app to change to the desktop
@@ -4794,10 +3793,10 @@ void DXUTResizeDXGIBuffers( UINT Width, UINT Height, BOOL bFullScreen )
 
     // Call the app's SwapChain reset callback
     GetDXUTState().SetInsideDeviceCallback( true );
-    const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc = DXUTGetDXGIBackBufferSurfaceDesc();
+    auto pBackBufferSurfaceDesc = DXUTGetDXGIBackBufferSurfaceDesc();
     LPDXUTCALLBACKD3D11SWAPCHAINRESIZED pCallbackSwapChainResized = GetDXUTState().GetD3D11SwapChainResizedFunc();
     hr = S_OK;
-    if( pCallbackSwapChainResized != NULL )
+    if( pCallbackSwapChainResized )
         hr = pCallbackSwapChainResized( pd3dDevice, pSwapChain, pBackBufferSurfaceDesc,
                                         GetDXUTState().GetD3D11SwapChainResizedFuncUserContext() );
     GetDXUTState().SetInsideDeviceCallback( false );
@@ -4809,13 +3808,18 @@ void DXUTResizeDXGIBuffers( UINT Width, UINT Height, BOOL bFullScreen )
             hr = DXUTERR_RESETTINGDEVICEOBJECTS;
 
         GetDXUTState().SetInsideDeviceCallback( true );
-        LPDXUTCALLBACKD3D11SWAPCHAINRELEASING pCallbackSwapChainReleasing =
+        pCallbackSwapChainReleasing =
             GetDXUTState().GetD3D11SwapChainReleasingFunc();
-        if( pCallbackSwapChainReleasing != NULL )
+        if( pCallbackSwapChainReleasing )
             pCallbackSwapChainReleasing( GetDXUTState().GetD3D11SwapChainResizedFuncUserContext() );
         GetDXUTState().SetInsideDeviceCallback( false );
         DXUTPause( false, false );
-        PostQuitMessage( 0 );
+
+        LPDXUTCALLBACKQUIT pQuitCallback = GetDXUTState().GetQuitFunc();
+        if (pQuitCallback)
+        {
+            pQuitCallback(GetDXUTState().GetQuitFuncUserContext());
+        }
     }
     else
     {
@@ -4829,14 +3833,21 @@ void DXUTResizeDXGIBuffers( UINT Width, UINT Height, BOOL bFullScreen )
 //--------------------------------------------------------------------------------------
 void DXUTCheckForDXGIBufferChange()
 {
-    if(DXUTGetDXGISwapChain() != NULL && !GetDXUTState().GetReleasingSwapChain() )
+    if(DXUTGetDXGISwapChain() && !GetDXUTState().GetReleasingSwapChain() )
     {
         //DXUTgetdxgi
-        IDXGISwapChain* pSwapChain = DXUTGetDXGISwapChain();
+        auto pSwapChain = DXUTGetDXGISwapChain();
+        assert(pSwapChain);
+        _Analysis_assume_(pSwapChain);
 
+// workaround for SAL bug in DXGI header
+#pragma warning(push)
+#pragma warning( disable:4616 6309 6387 )
         // Determine if we're fullscreen
         BOOL bFullScreen;
-        pSwapChain->GetFullscreenState( &bFullScreen, NULL );
+        if ( FAILED(pSwapChain->GetFullscreenState(&bFullScreen, nullptr)) )
+            bFullScreen = FALSE;
+#pragma warning(pop)
 
         DXUTResizeDXGIBuffers( 0, 0, bFullScreen );
 
@@ -4850,37 +3861,16 @@ void DXUTCheckForDXGIBufferChange()
 void DXUTCheckForWindowSizeChange()
 {
     // Skip the check for various reasons
-          
-    if( GetDXUTState().GetIgnoreSizeChange() || !GetDXUTState().GetDeviceCreated() ||
-        ( DXUTIsCurrentDeviceD3D9() && !DXUTIsWindowed() )  )
-        return;
-
-    DXUTDeviceSettings deviceSettings = DXUTGetDeviceSettings();
-    if( DXUTIsD3D9( &deviceSettings ) )
-    {
-        RECT rcCurrentClient;
-        GetClientRect( DXUTGetHWND(), &rcCurrentClient );
 
-        if( ( UINT )rcCurrentClient.right != DXUTGetBackBufferWidthFromDS( &deviceSettings ) ||
-            ( UINT )rcCurrentClient.bottom != DXUTGetBackBufferHeightFromDS( &deviceSettings ) )
-        {
-            // A new window size will require a new backbuffer size size
-            // Tell DXUTChangeDevice and D3D to size according to the HWND's client rect
-            if( DXUTIsD3D9( &deviceSettings ) ) deviceSettings.d3d9.pp.BackBufferWidth = 0; else deviceSettings.d3d11.sd.BufferDesc.Width = 0; 
-            if( DXUTIsD3D9( &deviceSettings ) ) deviceSettings.d3d9.pp.BackBufferHeight = 0; else deviceSettings.d3d11.sd.BufferDesc.Height = 0;
+    if( GetDXUTState().GetIgnoreSizeChange() || !GetDXUTState().GetDeviceCreated() )
+        return;
 
-            DXUTChangeDevice( &deviceSettings, NULL, NULL, false, false );
-        }
-    }
-    else
-    {
-        DXUTCheckForDXGIBufferChange();
-    }
+    DXUTCheckForDXGIBufferChange();
 }
 
 
 //--------------------------------------------------------------------------------------
-// Checks to see if the HWND changed monitors, and if it did it creates a device 
+// Checks to see if the HWND changed monitors, and if it did it creates a device
 // from the monitor's adapter and recreates the scene.
 //--------------------------------------------------------------------------------------
 void DXUTCheckForWindowChangingMonitors()
@@ -4899,25 +3889,18 @@ void DXUTCheckForWindowChangingMonitors()
         if( SUCCEEDED( DXUTGetAdapterOrdinalFromMonitor( hWindowMonitor, &newOrdinal ) ) )
         {
             // Find the closest valid device settings with the new ordinal
-            DXUTDeviceSettings deviceSettings = DXUTGetDeviceSettings();
-            if( DXUTIsD3D9( &deviceSettings ) )
-            {
-                deviceSettings.d3d9.AdapterOrdinal = newOrdinal;
-            }
-            else
-            {
-                deviceSettings.d3d11.AdapterOrdinal = newOrdinal;
-                UINT newOutput;
-                if( SUCCEEDED( DXUTGetOutputOrdinalFromMonitor( hWindowMonitor, &newOutput ) ) )
-                    deviceSettings.d3d11.Output = newOutput;
-            }
+            auto deviceSettings = DXUTGetDeviceSettings();
+            deviceSettings.d3d11.AdapterOrdinal = newOrdinal;
+            UINT newOutput;
+            if( SUCCEEDED( DXUTGetOutputOrdinalFromMonitor( hWindowMonitor, &newOutput ) ) )
+                deviceSettings.d3d11.Output = newOutput;
 
             hr = DXUTSnapDeviceSettingsToEnumDevice( &deviceSettings, false );
             if( SUCCEEDED( hr ) )
             {
-                // Create a Direct3D device using the new device settings.  
+                // Create a Direct3D device using the new device settings.
                 // If there is an existing device, then it will either reset or recreate the scene.
-                hr = DXUTChangeDevice( &deviceSettings, NULL, NULL, false, false );
+                hr = DXUTChangeDevice( &deviceSettings, false );
 
                 // If hr == E_ABORT, this means the app rejected the device settings in the ModifySettingsCallback
                 if( hr == E_ABORT )
@@ -4937,113 +3920,61 @@ void DXUTCheckForWindowChangingMonitors()
 }
 
 
-//--------------------------------------------------------------------------------------
-// Renders the scene using either D3D9 or D3D11
-//--------------------------------------------------------------------------------------
-void WINAPI DXUTRender3DEnvironment()
-{
-    if( DXUTIsCurrentDeviceD3D9() )
-        DXUTRender3DEnvironment9();
-    else
-        DXUTRender3DEnvironment11();
-}
-
-
-//--------------------------------------------------------------------------------------
-// Cleans up both the D3D9 and D3D11 3D environment (but only one should be active at a time)
-//--------------------------------------------------------------------------------------
-void DXUTCleanup3DEnvironment( bool bReleaseSettings )
-{
-    if( DXUTGetD3D9Device() )
-        DXUTCleanup3DEnvironment9( bReleaseSettings );
-    if( DXUTGetD3D11Device() )
-        DXUTCleanup3DEnvironment11( bReleaseSettings );
-}
-
-
 //--------------------------------------------------------------------------------------
 // Returns the HMONITOR attached to an adapter/output
 //--------------------------------------------------------------------------------------
-HMONITOR DXUTGetMonitorFromAdapter( DXUTDeviceSettings* pDeviceSettings )
+HMONITOR DXUTGetMonitorFromAdapter( _In_ DXUTDeviceSettings* pDeviceSettings )
 {
-    if( pDeviceSettings->ver == DXUT_D3D9_DEVICE )
-    {
-        IDirect3D9* pD3D = DXUTGetD3D9Object();
-        assert( pD3D != NULL );
-        return pD3D->GetAdapterMonitor( pDeviceSettings->d3d9.AdapterOrdinal );
-    }
-    else if( pDeviceSettings->ver == DXUT_D3D11_DEVICE )
-    {
-        CD3D11Enumeration* pD3DEnum = DXUTGetD3D11Enumeration();
-        assert( pD3DEnum != NULL );
-        CD3D11EnumOutputInfo* pOutputInfo = pD3DEnum->GetOutputInfo( pDeviceSettings->d3d11.AdapterOrdinal,
-                                                                     pDeviceSettings->d3d11.Output );
-        if( !pOutputInfo )
-            return 0;
-        return DXUTMonitorFromRect( &pOutputInfo->Desc.DesktopCoordinates, MONITOR_DEFAULTTONEAREST );
-    }
-
-    return 0;
+    auto pD3DEnum = DXUTGetD3D11Enumeration();
+    assert( pD3DEnum );
+    _Analysis_assume_( pD3DEnum );
+    auto pOutputInfo = pD3DEnum->GetOutputInfo( pDeviceSettings->d3d11.AdapterOrdinal,
+                                                pDeviceSettings->d3d11.Output );
+    if( !pOutputInfo )
+        return 0;
+    return DXUTMonitorFromRect( &pOutputInfo->Desc.DesktopCoordinates, MONITOR_DEFAULTTONEAREST );
 }
 
 
 //--------------------------------------------------------------------------------------
 // Look for an adapter ordinal that is tied to a HMONITOR
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT DXUTGetAdapterOrdinalFromMonitor( HMONITOR hMonitor, UINT* pAdapterOrdinal )
 {
     *pAdapterOrdinal = 0;
 
-    if( DXUTIsCurrentDeviceD3D9() )
-    {
-        CD3D9Enumeration* pd3dEnum = DXUTGetD3D9Enumeration();
-        IDirect3D9* pD3D = DXUTGetD3D9Object();
+    // Get the monitor handle information
+    MONITORINFOEX mi;
+    mi.cbSize = sizeof( MONITORINFOEX );
+    DXUTGetMonitorInfo( hMonitor, &mi );
 
-        CGrowableArray <CD3D9EnumAdapterInfo*>* pAdapterList = pd3dEnum->GetAdapterInfoList();
-        for( int iAdapter = 0; iAdapter < pAdapterList->GetSize(); iAdapter++ )
+    // Search for this monitor in our enumeration hierarchy.
+    auto pd3dEnum = DXUTGetD3D11Enumeration();
+    auto pAdapterList = pd3dEnum->GetAdapterInfoList();
+    for( auto it = pAdapterList->cbegin(); it != pAdapterList->cend(); ++it )
+    {
+        auto pAdapterInfo = *it;
+        for( auto jit = pAdapterInfo->outputInfoList.cbegin(); jit != pAdapterInfo->outputInfoList.cend(); ++jit )
         {
-            CD3D9EnumAdapterInfo* pAdapterInfo = pAdapterList->GetAt( iAdapter );
-            HMONITOR hAdapterMonitor = pD3D->GetAdapterMonitor( pAdapterInfo->AdapterOrdinal );
-            if( hAdapterMonitor == hMonitor )
+            auto pOutputInfo = *jit;
+            // Convert output device name from MBCS to Unicode
+            if( wcsncmp( pOutputInfo->Desc.DeviceName, mi.szDevice, sizeof( mi.szDevice ) / sizeof
+                         ( mi.szDevice[0] ) ) == 0 )
             {
                 *pAdapterOrdinal = pAdapterInfo->AdapterOrdinal;
                 return S_OK;
             }
         }
     }
-    else
-    {
-        // Get the monitor handle information
-        MONITORINFOEX mi;
-        mi.cbSize = sizeof( MONITORINFOEX );
-        DXUTGetMonitorInfo( hMonitor, &mi );
-
-        // Search for this monitor in our enumeration hierarchy.
-        CD3D11Enumeration* pd3dEnum = DXUTGetD3D11Enumeration();
-        CGrowableArray <CD3D11EnumAdapterInfo*>* pAdapterList = pd3dEnum->GetAdapterInfoList();
-        for( int iAdapter = 0; iAdapter < pAdapterList->GetSize(); ++iAdapter )
-        {
-            CD3D11EnumAdapterInfo* pAdapterInfo = pAdapterList->GetAt( iAdapter );
-            for( int o = 0; o < pAdapterInfo->outputInfoList.GetSize(); ++o )
-            {
-                CD3D11EnumOutputInfo* pOutputInfo = pAdapterInfo->outputInfoList.GetAt( o );
-                // Convert output device name from MBCS to Unicode
-                if( wcsncmp( pOutputInfo->Desc.DeviceName, mi.szDevice, sizeof( mi.szDevice ) / sizeof
-                             ( mi.szDevice[0] ) ) == 0 )
-                {
-                    *pAdapterOrdinal = pAdapterInfo->AdapterOrdinal;
-                    return S_OK;
-                }
-            }
-        }
-    }
-
     return E_FAIL;
 }
 
+
 //--------------------------------------------------------------------------------------
 // Look for a monitor ordinal that is tied to a HMONITOR (D3D11-only)
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT DXUTGetOutputOrdinalFromMonitor( HMONITOR hMonitor, UINT* pOutputOrdinal )
 {
     // Get the monitor handle information
@@ -5052,16 +3983,17 @@ HRESULT DXUTGetOutputOrdinalFromMonitor( HMONITOR hMonitor, UINT* pOutputOrdinal
     DXUTGetMonitorInfo( hMonitor, &mi );
 
     // Search for this monitor in our enumeration hierarchy.
-    CD3D11Enumeration* pd3dEnum = DXUTGetD3D11Enumeration();
-    CGrowableArray <CD3D11EnumAdapterInfo*>* pAdapterList = pd3dEnum->GetAdapterInfoList();
-    for( int iAdapter = 0; iAdapter < pAdapterList->GetSize(); ++iAdapter )
+    auto pd3dEnum = DXUTGetD3D11Enumeration();
+    auto pAdapterList = pd3dEnum->GetAdapterInfoList();
+    for( auto it = pAdapterList->cbegin(); it != pAdapterList->cend(); ++it )
     {
-        CD3D11EnumAdapterInfo* pAdapterInfo = pAdapterList->GetAt( iAdapter );
-        for( int o = 0; o < pAdapterInfo->outputInfoList.GetSize(); ++o )
+        auto pAdapterInfo = *it;
+        for( auto jit = pAdapterInfo->outputInfoList.cbegin(); jit != pAdapterInfo->outputInfoList.cend(); ++jit )
         {
-            CD3D11EnumOutputInfo* pOutputInfo = pAdapterInfo->outputInfoList.GetAt( o );
+            auto pOutputInfo = *jit;
             DXGI_OUTPUT_DESC Desc;
-            pOutputInfo->m_pOutput->GetDesc( &Desc );
+            if ( FAILED(pOutputInfo->m_pOutput->GetDesc(&Desc)) )
+                memset( &Desc, 0, sizeof(Desc) );
 
             if( hMonitor == Desc.Monitor )
             {
@@ -5074,6 +4006,7 @@ HRESULT DXUTGetOutputOrdinalFromMonitor( HMONITOR hMonitor, UINT* pOutputOrdinal
     return E_FAIL;
 }
 
+
 //--------------------------------------------------------------------------------------
 // This method is called when D3DERR_DEVICEREMOVED is returned from an API.  DXUT
 // calls the application's DeviceRemoved callback to inform it of the event.  The
@@ -5093,7 +4026,7 @@ HRESULT DXUTHandleDeviceRemoved()
 
     if( bLookForNewDevice )
     {
-        DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
+        auto pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
 
 
         hr = DXUTSnapDeviceSettingsToEnumDevice( pDeviceSettings, false);
@@ -5101,7 +4034,7 @@ HRESULT DXUTHandleDeviceRemoved()
         {
             // Change to a Direct3D device created from the new device settings
             // that is compatible with the removed device.
-            hr = DXUTChangeDevice( pDeviceSettings, NULL, NULL, true, false );
+            hr = DXUTChangeDevice( pDeviceSettings, false );
             if( SUCCEEDED( hr ) )
                 return S_OK;
         }
@@ -5117,38 +4050,23 @@ HRESULT DXUTHandleDeviceRemoved()
 //--------------------------------------------------------------------------------------
 void DXUTUpdateBackBufferDesc()
 {
-    if( DXUTIsCurrentDeviceD3D9() )
-    {
-        HRESULT hr;
-        IDirect3DSurface9* pBackBuffer;
-        hr = GetDXUTState().GetD3D9Device()->GetBackBuffer( 0, 0, D3DBACKBUFFER_TYPE_MONO, &pBackBuffer );
-        D3DSURFACE_DESC* pBBufferSurfaceDesc = GetDXUTState().GetBackBufferSurfaceDesc9();
-        ZeroMemory( pBBufferSurfaceDesc, sizeof( D3DSURFACE_DESC ) );
-        if( SUCCEEDED( hr ) )
-        {
-            pBackBuffer->GetDesc( pBBufferSurfaceDesc );
-            SAFE_RELEASE( pBackBuffer );
-        }
-    }
-    else
+    HRESULT hr;
+    ID3D11Texture2D* pBackBuffer;
+    auto pSwapChain = GetDXUTState().GetDXGISwapChain();
+    assert( pSwapChain );
+    _Analysis_assume_( pSwapChain );
+    hr = pSwapChain->GetBuffer( 0, IID_PPV_ARGS(&pBackBuffer) );
+    auto pBBufferSurfaceDesc = GetDXUTState().GetBackBufferSurfaceDescDXGI();
+    ZeroMemory( pBBufferSurfaceDesc, sizeof( DXGI_SURFACE_DESC ) );
+    if( SUCCEEDED( hr ) )
     {
-        HRESULT hr;
-        ID3D11Texture2D* pBackBuffer;
-        IDXGISwapChain* pSwapChain = GetDXUTState().GetDXGISwapChain();
-        assert( pSwapChain != NULL );
-        hr = pSwapChain->GetBuffer( 0, __uuidof( *pBackBuffer ), ( LPVOID* )&pBackBuffer );
-        DXGI_SURFACE_DESC* pBBufferSurfaceDesc = GetDXUTState().GetBackBufferSurfaceDescDXGI();
-        ZeroMemory( pBBufferSurfaceDesc, sizeof( DXGI_SURFACE_DESC ) );
-        if( SUCCEEDED( hr ) )
-        {
-            D3D11_TEXTURE2D_DESC TexDesc;
-            pBackBuffer->GetDesc( &TexDesc );
-            pBBufferSurfaceDesc->Width = ( UINT )TexDesc.Width;
-            pBBufferSurfaceDesc->Height = ( UINT )TexDesc.Height;
-            pBBufferSurfaceDesc->Format = TexDesc.Format;
-            pBBufferSurfaceDesc->SampleDesc = TexDesc.SampleDesc;
-            SAFE_RELEASE( pBackBuffer );
-        }
+        D3D11_TEXTURE2D_DESC TexDesc;
+        pBackBuffer->GetDesc( &TexDesc );
+        pBBufferSurfaceDesc->Width = ( UINT )TexDesc.Width;
+        pBBufferSurfaceDesc->Height = ( UINT )TexDesc.Height;
+        pBBufferSurfaceDesc->Format = TexDesc.Format;
+        pBBufferSurfaceDesc->SampleDesc = TexDesc.SampleDesc;
+        SAFE_RELEASE( pBackBuffer );
     }
 }
 
@@ -5158,54 +4076,17 @@ void DXUTUpdateBackBufferDesc()
 //--------------------------------------------------------------------------------------
 void DXUTSetupCursor()
 {
-    if( DXUTIsCurrentDeviceD3D9() )
+    // Clip cursor if requested
+    if( !DXUTIsWindowed() && GetDXUTState().GetClipCursorWhenFullScreen() )
     {
-        // Show the cursor again if returning to fullscreen 
-        IDirect3DDevice9* pd3dDevice = DXUTGetD3D9Device();
-        if( !DXUTIsWindowed() && pd3dDevice )
-        {
-            if( GetDXUTState().GetShowCursorWhenFullScreen() )
-            {
-                SetCursor( NULL ); // Turn off Windows cursor in full screen mode
-                HCURSOR hCursor = ( HCURSOR )( ULONG_PTR )GetClassLongPtr( DXUTGetHWNDDeviceFullScreen(),
-                                                                           GCLP_HCURSOR );
-                DXUTSetD3D9DeviceCursor( pd3dDevice, hCursor, false );
-                DXUTGetD3D9Device()->ShowCursor( true );
-            }
-            else
-            {
-                SetCursor( NULL ); // Turn off Windows cursor in full screen mode
-                DXUTGetD3D9Device()->ShowCursor( false );
-            }
-        }
-
-        // Clip cursor if requested
-        if( !DXUTIsWindowed() && GetDXUTState().GetClipCursorWhenFullScreen() )
-        {
-            // Confine cursor to full screen window
-            RECT rcWindow;
-            GetWindowRect( DXUTGetHWNDDeviceFullScreen(), &rcWindow );
-            ClipCursor( &rcWindow );
-        }
-        else
-        {
-            ClipCursor( NULL );
-        }
+        // Confine cursor to full screen window
+        RECT rcWindow;
+        GetWindowRect( DXUTGetHWNDDeviceFullScreen(), &rcWindow );
+        ClipCursor( &rcWindow );
     }
     else
     {
-        // Clip cursor if requested
-        if( !DXUTIsWindowed() && GetDXUTState().GetClipCursorWhenFullScreen() )
-        {
-            // Confine cursor to full screen window
-            RECT rcWindow;
-            GetWindowRect( DXUTGetHWNDDeviceFullScreen(), &rcWindow );
-            ClipCursor( &rcWindow );
-        }
-        else
-        {
-            ClipCursor( NULL );
-        }
+        ClipCursor( nullptr );
     }
 }
 
@@ -5218,92 +4099,32 @@ void DXUTUpdateStaticFrameStats()
     if( GetDXUTState().GetNoStats() )
         return;
 
-    DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-    if( NULL == pDeviceSettings )
+    auto pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
+    if( !pDeviceSettings )
         return;
 
-    if( DXUTIsD3D9( pDeviceSettings ) )
-    {
-        CD3D9Enumeration* pd3dEnum = DXUTGetD3D9Enumeration();
-        if( NULL == pd3dEnum )
-            return;
-
-        CD3D9EnumDeviceSettingsCombo* pDeviceSettingsCombo = pd3dEnum->GetDeviceSettingsCombo(
-            pDeviceSettings->d3d9.AdapterOrdinal, pDeviceSettings->d3d9.DeviceType,
-            pDeviceSettings->d3d9.AdapterFormat, pDeviceSettings->d3d9.pp.BackBufferFormat,
-            pDeviceSettings->d3d9.pp.Windowed );
-        if( NULL == pDeviceSettingsCombo )
-            return;
-
-        WCHAR strFmt[100];
-        D3DPRESENT_PARAMETERS* pPP = &pDeviceSettings->d3d9.pp;
-
-        if( pDeviceSettingsCombo->AdapterFormat == pDeviceSettingsCombo->BackBufferFormat )
-        {
-            wcscpy_s( strFmt, 100, DXUTD3DFormatToString( pDeviceSettingsCombo->AdapterFormat, false ) );
-        }
-        else
-        {
-            swprintf_s( strFmt, 100, L"backbuf %s, adapter %s",
-                             DXUTD3DFormatToString( pDeviceSettingsCombo->BackBufferFormat, false ),
-                             DXUTD3DFormatToString( pDeviceSettingsCombo->AdapterFormat, false ) );
-        }
-
-        WCHAR strDepthFmt[100];
-        if( pPP->EnableAutoDepthStencil )
-        {
-            swprintf_s( strDepthFmt, 100, L" (%s)", DXUTD3DFormatToString( pPP->AutoDepthStencilFormat, false ) );
-        }
-        else
-        {
-            // No depth buffer
-            strDepthFmt[0] = 0;
-        }
-
-        WCHAR strMultiSample[100];
-        switch( pPP->MultiSampleType )
-        {
-            case D3DMULTISAMPLE_NONMASKABLE:
-                wcscpy_s( strMultiSample, 100, L" (Nonmaskable Multisample)" ); break;
-            case D3DMULTISAMPLE_NONE:
-                wcscpy_s( strMultiSample, 100, L"" ); break;
-            default:
-                swprintf_s( strMultiSample, 100, L" (%dx Multisample)", pPP->MultiSampleType ); break;
-        }
-
-        WCHAR* pstrStaticFrameStats = GetDXUTState().GetStaticFrameStats();
-        swprintf_s( pstrStaticFrameStats, 256, L"D3D9 %%sVsync %s (%dx%d), %s%s%s",
-                         ( pPP->PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE ) ? L"off" : L"on",
-                         pPP->BackBufferWidth, pPP->BackBufferHeight,
-                         strFmt, strDepthFmt, strMultiSample );
-    }
-    else
-    {
-        // D3D11
-        CD3D11Enumeration* pd3dEnum = DXUTGetD3D11Enumeration();
-        if( NULL == pd3dEnum )
-            return;
-
-        CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCombo = pd3dEnum->GetDeviceSettingsCombo(
-            pDeviceSettings->d3d11.AdapterOrdinal, pDeviceSettings->d3d11.DriverType, pDeviceSettings->d3d11.Output,
-            pDeviceSettings->d3d11.sd.BufferDesc.Format, pDeviceSettings->d3d11.sd.Windowed );
-        if( NULL == pDeviceSettingsCombo )
-            return;
-
-        WCHAR strFmt[100];
-
-        wcscpy_s( strFmt, 100, DXUTDXGIFormatToString( pDeviceSettingsCombo->BackBufferFormat, false ) );
+    // D3D11
+    auto pd3dEnum = DXUTGetD3D11Enumeration();
+    if( !pd3dEnum )
+        return;
 
-        WCHAR strMultiSample[100];
-        swprintf_s( strMultiSample, 100, L" (MS%u, Q%u)", pDeviceSettings->d3d11.sd.SampleDesc.Count,
-                         pDeviceSettings->d3d11.sd.SampleDesc.Quality );
+    auto pDeviceSettingsCombo = pd3dEnum->GetDeviceSettingsCombo(
+        pDeviceSettings->d3d11.AdapterOrdinal,
+        pDeviceSettings->d3d11.sd.BufferDesc.Format, pDeviceSettings->d3d11.sd.Windowed );
+    if( !pDeviceSettingsCombo )
+        return;
 
-        WCHAR* pstrStaticFrameStats = GetDXUTState().GetStaticFrameStats();
-        swprintf_s( pstrStaticFrameStats, 256, L"D3D11 %%sVsync %s (%dx%d), %s%s",
-                         ( pDeviceSettings->d3d11.SyncInterval == 0 ) ? L"off" : L"on",
-                         pDeviceSettings->d3d11.sd.BufferDesc.Width, pDeviceSettings->d3d11.sd.BufferDesc.Height,
-                         strFmt, strMultiSample );
-    }
+    WCHAR strFmt[100];
+    wcscpy_s( strFmt, 100, DXUTDXGIFormatToString( pDeviceSettingsCombo->BackBufferFormat, false ) );
+
+    WCHAR strMultiSample[100];
+    swprintf_s( strMultiSample, 100, L" (MS%u, Q%u)", pDeviceSettings->d3d11.sd.SampleDesc.Count,
+                        pDeviceSettings->d3d11.sd.SampleDesc.Quality );
+    auto pstrStaticFrameStats = GetDXUTState().GetStaticFrameStats();
+    swprintf_s( pstrStaticFrameStats, 256, L"D3D11 %%ls Vsync %ls (%ux%u), %ls%ls",
+                        ( pDeviceSettings->d3d11.SyncInterval == 0 ) ? L"off" : L"on",
+                        pDeviceSettings->d3d11.sd.BufferDesc.Width, pDeviceSettings->d3d11.sd.BufferDesc.Height,
+                        strFmt, strMultiSample );
 }
 
 
@@ -5330,85 +4151,39 @@ void DXUTUpdateFrameStats()
         GetDXUTState().SetLastStatsUpdateTime( fAbsTime );
         GetDXUTState().SetLastStatsUpdateFrames( 0 );
 
-        WCHAR* pstrFPS = GetDXUTState().GetFPSStats();
+        auto pstrFPS = GetDXUTState().GetFPSStats();
         swprintf_s( pstrFPS, 64, L"%0.2f fps ", fFPS );
     }
 }
 
+
 //--------------------------------------------------------------------------------------
 // Returns a string describing the current device.  If bShowFPS is true, then
-// the string contains the frames/sec.  If "-nostats" was used in 
+// the string contains the frames/sec.  If "-nostats" was used in
 // the command line, the string will be blank
 //--------------------------------------------------------------------------------------
-LPCWSTR WINAPI DXUTGetFrameStats( bool bShowFPS )
+LPCWSTR WINAPI DXUTGetFrameStats( _In_ bool bShowFPS )
 {
-    WCHAR* pstrFrameStats = GetDXUTState().GetFrameStats();
-    WCHAR* pstrFPS = ( bShowFPS ) ? GetDXUTState().GetFPSStats() : L"";
-    swprintf_s( pstrFrameStats, 256, GetDXUTState().GetStaticFrameStats(), pstrFPS );
+    auto pstrFrameStats = GetDXUTState().GetFrameStats();
+    const WCHAR* pstrFPS = ( bShowFPS ) ? GetDXUTState().GetFPSStats() : L"";
+    WCHAR* pstrStats = GetDXUTState().GetStaticFrameStats();
+    swprintf_s( pstrFrameStats, 256, pstrStats, pstrFPS );
     return pstrFrameStats;
 }
 
 
 //--------------------------------------------------------------------------------------
-// Updates the string which describes the device 
-//--------------------------------------------------------------------------------------
-void DXUTUpdateD3D9DeviceStats( D3DDEVTYPE DeviceType, DWORD BehaviorFlags,
-                                D3DADAPTER_IDENTIFIER9* pAdapterIdentifier )
-{
-    if( GetDXUTState().GetNoStats() )
-        return;
-
-    // Store device description
-    WCHAR* pstrDeviceStats = GetDXUTState().GetDeviceStats();
-    if( DeviceType == D3DDEVTYPE_REF )
-        wcscpy_s( pstrDeviceStats, 256, L"REF" );
-    else if( DeviceType == D3DDEVTYPE_HAL )
-        wcscpy_s( pstrDeviceStats, 256, L"HAL" );
-    else if( DeviceType == D3DDEVTYPE_SW )
-        wcscpy_s( pstrDeviceStats, 256, L"SW" );
-
-    if( DeviceType == D3DDEVTYPE_HAL )
-    {
-        // Be sure not to overflow m_strDeviceStats when appending the adapter 
-        // description, since it can be long.  
-        wcscat_s( pstrDeviceStats, 256, L": " );
-
-        // Try to get a unique description from the CD3D9EnumDeviceSettingsCombo
-        DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
-        if( !pDeviceSettings )
-            return;
-
-        CD3D9Enumeration* pd3dEnum = DXUTGetD3D9Enumeration();
-        CD3D9EnumDeviceSettingsCombo* pDeviceSettingsCombo = pd3dEnum->GetDeviceSettingsCombo(
-            pDeviceSettings->d3d9.AdapterOrdinal, pDeviceSettings->d3d9.DeviceType,
-            pDeviceSettings->d3d9.AdapterFormat, pDeviceSettings->d3d9.pp.BackBufferFormat,
-            pDeviceSettings->d3d9.pp.Windowed );
-        if( pDeviceSettingsCombo )
-        {
-            wcscat_s( pstrDeviceStats, 256, pDeviceSettingsCombo->pAdapterInfo->szUniqueDescription );
-        }
-        else
-        {
-            const int cchDesc = sizeof( pAdapterIdentifier->Description );
-            WCHAR szDescription[cchDesc];
-            MultiByteToWideChar( CP_ACP, 0, pAdapterIdentifier->Description, -1, szDescription, cchDesc );
-            szDescription[cchDesc - 1] = 0;
-            wcscat_s( pstrDeviceStats, 256, szDescription );
-        }
-    }
-}
-
-
-//--------------------------------------------------------------------------------------
-// Updates the string which describes the device 
+// Updates the string which describes the device
 //--------------------------------------------------------------------------------------
-void DXUTUpdateD3D11DeviceStats( D3D_DRIVER_TYPE DeviceType, DXGI_ADAPTER_DESC* pAdapterDesc )
+#pragma warning( suppress : 6101 )
+_Use_decl_annotations_
+void DXUTUpdateD3D11DeviceStats( D3D_DRIVER_TYPE DeviceType, D3D_FEATURE_LEVEL featureLevel, DXGI_ADAPTER_DESC* pAdapterDesc )
 {
     if( GetDXUTState().GetNoStats() )
         return;
 
     // Store device description
-    WCHAR* pstrDeviceStats = GetDXUTState().GetDeviceStats();
+    auto pstrDeviceStats = GetDXUTState().GetDeviceStats();
     if( DeviceType == D3D_DRIVER_TYPE_REFERENCE )
         wcscpy_s( pstrDeviceStats, 256, L"REFERENCE" );
     else if( DeviceType == D3D_DRIVER_TYPE_HARDWARE )
@@ -5420,25 +4195,59 @@ void DXUTUpdateD3D11DeviceStats( D3D_DRIVER_TYPE DeviceType, DXGI_ADAPTER_DESC*
 
     if( DeviceType == D3D_DRIVER_TYPE_HARDWARE )
     {
-        // Be sure not to overflow m_strDeviceStats when appending the adapter 
-        // description, since it can be long.  
+        // Be sure not to overflow m_strDeviceStats when appending the adapter
+        // description, since it can be long.
         wcscat_s( pstrDeviceStats, 256, L": " );
 
         // Try to get a unique description from the CD3D11EnumDeviceSettingsCombo
-        DXUTDeviceSettings* pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
+        auto pDeviceSettings = GetDXUTState().GetCurrentDeviceSettings();
         if( !pDeviceSettings )
             return;
 
-        CD3D11Enumeration* pd3dEnum = DXUTGetD3D11Enumeration();
-        assert( pd3dEnum != NULL );
-        CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCombo = pd3dEnum->GetDeviceSettingsCombo(
-            pDeviceSettings->d3d11.AdapterOrdinal, pDeviceSettings->d3d11.DriverType, pDeviceSettings->d3d11.Output,
+        auto pd3dEnum = DXUTGetD3D11Enumeration();
+        assert( pd3dEnum );
+        _Analysis_assume_( pd3dEnum );
+        auto pDeviceSettingsCombo = pd3dEnum->GetDeviceSettingsCombo(
+            pDeviceSettings->d3d11.AdapterOrdinal,
             pDeviceSettings->d3d11.sd.BufferDesc.Format, pDeviceSettings->d3d11.sd.Windowed );
         if( pDeviceSettingsCombo )
             wcscat_s( pstrDeviceStats, 256, pDeviceSettingsCombo->pAdapterInfo->szUniqueDescription );
         else
             wcscat_s( pstrDeviceStats, 256, pAdapterDesc->Description );
     }
+
+    switch( featureLevel )
+    {
+    case D3D_FEATURE_LEVEL_9_1:
+        wcscat_s( pstrDeviceStats, 256, L" (FL 9.1)" );
+        break;
+    case D3D_FEATURE_LEVEL_9_2:
+        wcscat_s( pstrDeviceStats, 256, L" (FL 9.2)" );
+        break;
+    case D3D_FEATURE_LEVEL_9_3:
+        wcscat_s( pstrDeviceStats, 256, L" (FL 9.3)" );
+        break;
+    case D3D_FEATURE_LEVEL_10_0:
+        wcscat_s( pstrDeviceStats, 256, L" (FL 10.0)" );
+        break;
+    case D3D_FEATURE_LEVEL_10_1:
+        wcscat_s( pstrDeviceStats, 256, L" (FL 10.1)" );
+        break;
+    case D3D_FEATURE_LEVEL_11_0:
+        wcscat_s( pstrDeviceStats, 256, L" (FL 11.0)" );
+        break;
+    case D3D_FEATURE_LEVEL_11_1:
+        wcscat_s( pstrDeviceStats, 256, L" (FL 11.1)" );
+        break;
+#if defined(USE_DIRECT3D11_3) || defined(USE_DIRECT3D11_4)
+    case D3D_FEATURE_LEVEL_12_0:
+        wcscat_s(pstrDeviceStats, 256, L" (FL 12.0)");
+        break;
+    case D3D_FEATURE_LEVEL_12_1:
+        wcscat_s(pstrDeviceStats, 256, L" (FL 12.1)");
+        break;
+#endif
+    }
 }
 
 
@@ -5449,7 +4258,7 @@ DXUTDeviceSettings WINAPI DXUTGetDeviceSettings()
 {
     // Return a copy of device settings of the current device.  If no device exists yet, then
     // return a blank device settings struct
-    DXUTDeviceSettings* pDS = GetDXUTState().GetCurrentDeviceSettings();
+    auto pDS = GetDXUTState().GetCurrentDeviceSettings();
     if( pDS )
     {
         return *pDS;
@@ -5462,32 +4271,12 @@ DXUTDeviceSettings WINAPI DXUTGetDeviceSettings()
     }
 }
 
-D3DPRESENT_PARAMETERS WINAPI DXUTGetD3D9PresentParameters()
-{
-    // Return a copy of the present params of the current device.  If no device exists yet, then
-    // return blank present params
-    DXUTDeviceSettings* pDS = GetDXUTState().GetCurrentDeviceSettings();
-    if( pDS )
-    {
-        return pDS->d3d9.pp;
-    }
-    else
-    {
-        D3DPRESENT_PARAMETERS pp;
-        ZeroMemory( &pp, sizeof( D3DPRESENT_PARAMETERS ) );
-        return pp;
-    }
-}
-
 bool WINAPI DXUTIsVsyncEnabled()
 {
-    DXUTDeviceSettings* pDS = GetDXUTState().GetCurrentDeviceSettings();
+    auto pDS = GetDXUTState().GetCurrentDeviceSettings();
     if( pDS )
     {
-        if( DXUTIsD3D9( pDS ) )
-            return ( pDS->d3d9.pp.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE );
-        else
-            return ( pDS->d3d11.SyncInterval == 0 );
+        return ( pDS->d3d11.SyncInterval == 0 );
     }
     else
     {
@@ -5495,15 +4284,7 @@ bool WINAPI DXUTIsVsyncEnabled()
     }
 };
 
-HRESULT WINAPI DXUTGetD3D9DeviceCaps( DXUTDeviceSettings* pDeviceSettings, D3DCAPS9* pCaps )
-{
-    IDirect3D9* pD3D = DXUTGetD3D9Object();
-    assert( pD3D != NULL );
-    return pD3D->GetDeviceCaps( pDeviceSettings->d3d9.AdapterOrdinal, pDeviceSettings->d3d9.DeviceType, pCaps );
-}
-
-
-bool WINAPI DXUTIsKeyDown( BYTE vKey )
+bool WINAPI DXUTIsKeyDown( _In_ BYTE vKey )
 {
     bool* bKeys = GetDXUTState().GetKeys();
     if( vKey >= 0xA0 && vKey <= 0xA5 )  // VK_LSHIFT, VK_RSHIFT, VK_LCONTROL, VK_RCONTROL, VK_LMENU, VK_RMENU
@@ -5514,7 +4295,7 @@ bool WINAPI DXUTIsKeyDown( BYTE vKey )
         return bKeys[vKey];
 }
 
-bool WINAPI DXUTWasKeyPressed( BYTE vKey )
+bool WINAPI DXUTWasKeyPressed( _In_ BYTE vKey )
 {
     bool* bLastKeys = GetDXUTState().GetLastKeys();
     bool* bKeys = GetDXUTState().GetKeys();
@@ -5522,18 +4303,19 @@ bool WINAPI DXUTWasKeyPressed( BYTE vKey )
     return ( !bLastKeys[vKey] && bKeys[vKey] );
 }
 
-bool WINAPI DXUTIsMouseButtonDown( BYTE vButton )
+bool WINAPI DXUTIsMouseButtonDown( _In_ BYTE vButton )
 {
     bool* bMouseButtons = GetDXUTState().GetMouseButtons();
     int nIndex = DXUTMapButtonToArrayIndex( vButton );
     return bMouseButtons[nIndex];
 }
 
-void WINAPI DXUTSetMultimonSettings( bool bAutoChangeAdapter )
+void WINAPI DXUTSetMultimonSettings( _In_ bool bAutoChangeAdapter )
 {
     GetDXUTState().SetAutoChangeAdapter( bAutoChangeAdapter );
 }
 
+_Use_decl_annotations_
 void WINAPI DXUTSetHotkeyHandling( bool bAltEnterToToggleFullscreen, bool bEscapeToQuit, bool bPauseToToggleTimePause )
 {
     GetDXUTState().SetHandleEscape( bEscapeToQuit );
@@ -5541,6 +4323,7 @@ void WINAPI DXUTSetHotkeyHandling( bool bAltEnterToToggleFullscreen, bool bEscap
     GetDXUTState().SetHandlePause( bPauseToToggleTimePause );
 }
 
+_Use_decl_annotations_
 void WINAPI DXUTSetCursorSettings( bool bShowCursorWhenFullScreen, bool bClipCursorWhenFullScreen )
 {
     GetDXUTState().SetClipCursorWhenFullScreen( bClipCursorWhenFullScreen );
@@ -5548,11 +4331,12 @@ void WINAPI DXUTSetCursorSettings( bool bShowCursorWhenFullScreen, bool bClipCur
     DXUTSetupCursor();
 }
 
-void WINAPI DXUTSetWindowSettings( bool bCallDefWindowProc )
+void WINAPI DXUTSetWindowSettings( _In_ bool bCallDefWindowProc )
 {
     GetDXUTState().SetCallDefWindowProc( bCallDefWindowProc );
 }
 
+_Use_decl_annotations_
 void WINAPI DXUTSetConstantFrameTime( bool bEnabled, float fTimePerFrame )
 {
     if( GetDXUTState().GetOverrideConstantFrameTime() )
@@ -5566,7 +4350,7 @@ void WINAPI DXUTSetConstantFrameTime( bool bEnabled, float fTimePerFrame )
 
 
 //--------------------------------------------------------------------------------------
-// Resets the state associated with DXUT 
+// Resets the state associated with DXUT
 //--------------------------------------------------------------------------------------
 void WINAPI DXUTResetFrameworkState()
 {
@@ -5578,10 +4362,10 @@ void WINAPI DXUTResetFrameworkState()
 //--------------------------------------------------------------------------------------
 // Closes down the window.  When the window closes, it will cleanup everything
 //--------------------------------------------------------------------------------------
-void WINAPI DXUTShutdown( int nExitCode )
+void WINAPI DXUTShutdown( _In_ int nExitCode )
 {
     HWND hWnd = DXUTGetHWND();
-    if( hWnd != NULL )
+    if( hWnd )
         SendMessage( hWnd, WM_CLOSE, 0, 0 );
 
     GetDXUTState().SetExitCode( nExitCode );
@@ -5589,48 +4373,41 @@ void WINAPI DXUTShutdown( int nExitCode )
     DXUTCleanup3DEnvironment( true );
 
     // Restore shortcut keys (Windows key, accessibility shortcuts) to original state
-    // This is important to call here if the shortcuts are disabled, 
+    // This is important to call here if the shortcuts are disabled,
     // because accessibility setting changes are permanent.
-    // This means that if this is not done then the accessibility settings 
-    // might not be the same as when the app was started. 
+    // This means that if this is not done then the accessibility settings
+    // might not be the same as when the app was started.
     // If the app crashes without restoring the settings, this is also true so it
-    // would be wise to backup/restore the settings from a file so they can be 
+    // would be wise to backup/restore the settings from a file so they can be
     // restored when the crashed app is run again.
     DXUTAllowShortcutKeys( true );
 
-    // Shutdown D3D9
-    IDirect3D9* pD3D = GetDXUTState().GetD3D9();
-    SAFE_RELEASE( pD3D );
-    GetDXUTState().SetD3D9( NULL );
-
     // Shutdown D3D11
-    IDXGIFactory1* pDXGIFactory = GetDXUTState().GetDXGIFactory();
+    auto pDXGIFactory = GetDXUTState().GetDXGIFactory();
     SAFE_RELEASE( pDXGIFactory );
-    GetDXUTState().SetDXGIFactory( NULL );
-
-    if( GetDXUTState().GetOverrideRelaunchMCE() )
-        DXUTReLaunchMediaCenter();
+    GetDXUTState().SetDXGIFactory( nullptr );
 }
 
+
 //--------------------------------------------------------------------------------------
 // Tells DXUT whether to operate in gamma correct mode
 //--------------------------------------------------------------------------------------
-void WINAPI DXUTSetIsInGammaCorrectMode( bool bGammaCorrect )
+void WINAPI DXUTSetIsInGammaCorrectMode( _In_ bool bGammaCorrect )
 {
     GetDXUTState().SetIsInGammaCorrectMode( bGammaCorrect );
 }
 
 
-void DXUTApplyDefaultDeviceSettings(DXUTDeviceSettings *modifySettings) {
+//--------------------------------------------------------------------------------------
+void DXUTApplyDefaultDeviceSettings(DXUTDeviceSettings *modifySettings)
+{
     ZeroMemory( modifySettings, sizeof( DXUTDeviceSettings ) );
 
-
-    modifySettings->ver = DXUT_D3D11_DEVICE;
     modifySettings->d3d11.AdapterOrdinal = 0;
     modifySettings->d3d11.AutoCreateDepthStencil = true;
     modifySettings->d3d11.AutoDepthStencilFormat = DXGI_FORMAT_D24_UNORM_S8_UINT;
 #if defined(DEBUG) || defined(_DEBUG)
-    modifySettings->d3d11.CreateFlags |= D3D10_CREATE_DEVICE_DEBUG;
+    modifySettings->d3d11.CreateFlags |= D3D11_CREATE_DEVICE_DEBUG;
 #else
     modifySettings->d3d11.CreateFlags = 0;
 #endif
@@ -5639,224 +4416,123 @@ void DXUTApplyDefaultDeviceSettings(DXUTDeviceSettings *modifySettings) {
     modifySettings->d3d11.PresentFlags = 0;
     modifySettings->d3d11.sd.BufferCount = 2;
     modifySettings->d3d11.sd.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
-    modifySettings->d3d11.sd.BufferDesc.Height = 480;
-    modifySettings->d3d11.sd.BufferDesc.RefreshRate.Numerator = 60;
-    modifySettings->d3d11.sd.BufferDesc.RefreshRate.Denominator = 1;
+    modifySettings->d3d11.sd.BufferDesc.Height = 600;
+    modifySettings->d3d11.sd.BufferDesc.RefreshRate.Numerator = 0;
+    modifySettings->d3d11.sd.BufferDesc.RefreshRate.Denominator = 0;
     modifySettings->d3d11.sd.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
     modifySettings->d3d11.sd.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
-    modifySettings->d3d11.sd.BufferDesc.Width = 640;
+    modifySettings->d3d11.sd.BufferDesc.Width = 800;
     modifySettings->d3d11.sd.BufferUsage = 32;
     modifySettings->d3d11.sd.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH ;
     modifySettings->d3d11.sd.OutputWindow = DXUTGetHWND();
     modifySettings->d3d11.sd.SampleDesc.Count = 1;
     modifySettings->d3d11.sd.SampleDesc.Quality = 0;
     modifySettings->d3d11.sd.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
-    modifySettings->d3d11.sd.Windowed = 1;
+    modifySettings->d3d11.sd.Windowed = TRUE;
     modifySettings->d3d11.SyncInterval = 0;
-
-    modifySettings->d3d9.AdapterFormat = D3DFMT_X8R8G8B8;
-    modifySettings->d3d9.AdapterOrdinal = 0;
-    modifySettings->d3d9.BehaviorFlags = D3DCREATE_HARDWARE_VERTEXPROCESSING;
-    modifySettings->d3d9.DeviceType = D3DDEVTYPE_HAL;
-    modifySettings->d3d9.pp.AutoDepthStencilFormat = D3DFMT_D24X8;
-    modifySettings->d3d9.pp.BackBufferCount = 1;
-    modifySettings->d3d9.pp.BackBufferFormat = D3DFMT_X8R8G8B8;
-    modifySettings->d3d9.pp.BackBufferHeight = 480;
-    modifySettings->d3d9.pp.BackBufferWidth = 640; 
-    modifySettings->d3d9.pp.EnableAutoDepthStencil = 1;
-    modifySettings->d3d9.pp.Flags = 2;
-    modifySettings->d3d9.pp.FullScreen_RefreshRateInHz = 0;
-    modifySettings->d3d9.pp.hDeviceWindow = DXUTGetHWND();
-    modifySettings->d3d9.pp.MultiSampleQuality = 0;
-    modifySettings->d3d9.pp.MultiSampleType = D3DMULTISAMPLE_NONE;
-    modifySettings->d3d9.pp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
-    modifySettings->d3d9.pp.SwapEffect = D3DSWAPEFFECT_DISCARD;
-    modifySettings->d3d9.pp.Windowed = 1;
 }
 
 
-
 //--------------------------------------------------------------------------------------
 // Update settings based on what is enumeratabled
 //--------------------------------------------------------------------------------------
-HRESULT DXUTSnapDeviceSettingsToEnumDevice( DXUTDeviceSettings* pDeviceSettings, bool forceEnum,  D3D_FEATURE_LEVEL forceFL ) {
-    bool bAppSupportsD3D9 = DXUTDoesAppSupportD3D9();
-    bool bAppSupportsD3D11 = DXUTDoesAppSupportD3D11();
-
-    if( GetSystemMetrics(0x1000) != 0 ) {// SM_REMOTESESSION
-        pDeviceSettings->d3d11.sd.Windowed = 1;
-        pDeviceSettings->d3d9.pp.Windowed = 1;
-    }   
+_Use_decl_annotations_
+HRESULT DXUTSnapDeviceSettingsToEnumDevice( DXUTDeviceSettings* pDeviceSettings, bool forceEnum,  D3D_FEATURE_LEVEL forceFL )
+{
+    if( GetSystemMetrics(SM_REMOTESESSION) != 0 )
+    {
+        pDeviceSettings->d3d11.sd.Windowed = TRUE;
+    }
     int bestModeIndex=0;
     int bestMSAAIndex=0;
 
-
     //DXUTSetDefaultDeviceSettings
-    if (bAppSupportsD3D11 && pDeviceSettings->ver == DXUT_D3D11_DEVICE ) {
-        CD3D11Enumeration *pEnum = NULL;
-
-
-        pEnum = DXUTGetD3D11Enumeration( forceEnum, false, forceFL);
+    CD3D11Enumeration *pEnum = DXUTGetD3D11Enumeration( forceEnum, true, forceFL);
 
-        CD3D11EnumAdapterInfo* pAdapterInfo = NULL; 
-        CGrowableArray <CD3D11EnumAdapterInfo*>* pAdapterList = pEnum->GetAdapterInfoList();
-        CD3D11EnumAdapterInfo* tempAdapterInfo = pAdapterList->GetAt( 0 );
-        for( int iAdapter = 0; iAdapter < pAdapterList->GetSize(); iAdapter++ )
+    CD3D11EnumAdapterInfo* pAdapterInfo = nullptr;
+    auto pAdapterList = pEnum->GetAdapterInfoList();
+    for( auto it = pAdapterList->cbegin(); it != pAdapterList->cend(); ++it )
+    {
+        auto tempAdapterInfo = *it;
+        if (tempAdapterInfo->AdapterOrdinal == pDeviceSettings->d3d11.AdapterOrdinal) pAdapterInfo = tempAdapterInfo;
+    }
+    if ( !pAdapterInfo )
+    {
+        if ( pAdapterList->empty() || pDeviceSettings->d3d11.AdapterOrdinal > 0 )
         {
-            tempAdapterInfo = pAdapterList->GetAt( iAdapter );
-            if (tempAdapterInfo->AdapterOrdinal == pDeviceSettings->d3d11.AdapterOrdinal) pAdapterInfo = tempAdapterInfo;
+            return E_FAIL; // no adapters found.
         }
-        if (pAdapterInfo == NULL) return E_FAIL; // no adapters found.
-        CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCombo = NULL;
-        float biggestScore = 0;
+        pAdapterInfo = *pAdapterList->cbegin();
+    }
+    CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCombo = nullptr;
+    float biggestScore = 0;
 
-        int combo = 0;
-        for( int iDeviceCombo = 0; iDeviceCombo < pAdapterInfo->deviceSettingsComboList.GetSize(); iDeviceCombo++ )
+    for( size_t iDeviceCombo = 0; iDeviceCombo < pAdapterInfo->deviceSettingsComboList.size(); iDeviceCombo++ )
+    {
+        CD3D11EnumDeviceSettingsCombo* tempDeviceSettingsCombo = pAdapterInfo->deviceSettingsComboList[ iDeviceCombo ];
+
+        int bestMode;
+        int bestMSAA;
+        float score = DXUTRankD3D11DeviceCombo(tempDeviceSettingsCombo, &(pDeviceSettings->d3d11), bestMode, bestMSAA );
+        if (score > biggestScore)
         {
-            CD3D11EnumDeviceSettingsCombo* tempDeviceSettingsCombo = pAdapterInfo->deviceSettingsComboList.GetAt( iDeviceCombo );
-    
-            DXGI_MODE_DESC adapterDisplayMode;
-            DXUTGetD3D11AdapterDisplayMode( pAdapterInfo->AdapterOrdinal, 0, &adapterDisplayMode );
-
-            int bestMode;
-            int bestMSAA;
-            float score = DXUTRankD3D11DeviceCombo(tempDeviceSettingsCombo, &(pDeviceSettings->d3d11), &adapterDisplayMode, bestMode, bestMSAA );
-            if (score > biggestScore) {
-                combo = iDeviceCombo;
-                biggestScore = score;
-                pDeviceSettingsCombo = tempDeviceSettingsCombo;
-                bestModeIndex = bestMode;
-                bestMSAAIndex = bestMSAA;
-            }
-               
-        }
-        if (NULL == pDeviceSettingsCombo ) {
-            return E_FAIL; // no settigns found.
+            biggestScore = score;
+            pDeviceSettingsCombo = tempDeviceSettingsCombo;
+            bestModeIndex = bestMode;
+            bestMSAAIndex = bestMSAA;
         }
+    }
+    if (!pDeviceSettingsCombo )
+    {
+        return E_FAIL; // no settings found.
+    }
 
-        pDeviceSettings->d3d11.AdapterOrdinal = pDeviceSettingsCombo->AdapterOrdinal;
-        pDeviceSettings->d3d11.DriverType = pDeviceSettingsCombo->DeviceType;
-        pDeviceSettings->d3d11.Output = pDeviceSettingsCombo->Output;
-    
-        pDeviceSettings->d3d11.sd.Windowed = pDeviceSettingsCombo->Windowed;
-        if( GetSystemMetrics(0x1000) != 0 ) {// SM_REMOTESESSION
-            pDeviceSettings->d3d11.sd.Windowed = 1;
-        }   
-        if (pDeviceSettingsCombo->pOutputInfo != NULL) {
-            DXGI_MODE_DESC bestDisplayMode;
-            bestDisplayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList.GetAt(bestModeIndex);
-            if (!pDeviceSettingsCombo->Windowed) {
-
-                pDeviceSettings->d3d11.sd.BufferDesc.Height = bestDisplayMode.Height;
-                pDeviceSettings->d3d11.sd.BufferDesc.Width = bestDisplayMode.Width;
-                pDeviceSettings->d3d11.sd.BufferDesc.RefreshRate.Numerator = bestDisplayMode.RefreshRate.Numerator;
-                pDeviceSettings->d3d11.sd.BufferDesc.RefreshRate.Denominator = bestDisplayMode.RefreshRate.Denominator;
-                pDeviceSettings->d3d11.sd.BufferDesc.Scaling = bestDisplayMode.Scaling;
-                pDeviceSettings->d3d11.sd.BufferDesc.ScanlineOrdering = bestDisplayMode.ScanlineOrdering;
-            }
-        }
-        if (pDeviceSettings->d3d11.DeviceFeatureLevel == 0)
-            pDeviceSettings->d3d11.DeviceFeatureLevel = pDeviceSettingsCombo->pDeviceInfo->SelectedLevel;
-        
-
-
-        
-        pDeviceSettings->d3d11.sd.SampleDesc.Count = pDeviceSettingsCombo->multiSampleCountList.GetAt(bestMSAAIndex);
-        if (pDeviceSettings->d3d11.sd.SampleDesc.Quality > pDeviceSettingsCombo->multiSampleQualityList.GetAt(bestMSAAIndex) - 1)
-            pDeviceSettings->d3d11.sd.SampleDesc.Quality = pDeviceSettingsCombo->multiSampleQualityList.GetAt(bestMSAAIndex) - 1;
-        
-        pDeviceSettings->d3d11.sd.BufferDesc.Format = pDeviceSettingsCombo->BackBufferFormat;
-
-        return S_OK;
-    }
-        // didn't find a D3D11 adapter.
-    if (bAppSupportsD3D9) {
-      // Find the best combination of:
-        //      Adapter Ordinal
-        //      Device Type
-        //      Adapter Format
-        //      Back Buffer Format
-        //      Windowed
-        // given what's available on the system and the match options combined with the device settings input.
-        // This combination of settings is encapsulated by the CD3D9EnumDeviceSettingsCombo class.
-        float fBestRanking = -1.0f;
-        CD3D9EnumDeviceSettingsCombo* pBestDeviceSettingsCombo = NULL;
-        D3DDISPLAYMODE adapterDesktopDisplayMode;
-
-        IDirect3D9* pD3D = DXUTGetD3D9Object();
-        CD3D9Enumeration* pd3dEnum = DXUTGetD3D9Enumeration( forceEnum );
-        CGrowableArray <CD3D9EnumAdapterInfo*>* pAdapterList = pd3dEnum->GetAdapterInfoList();
-        for( int iAdapter = 0; iAdapter < pAdapterList->GetSize(); iAdapter++ )
-        {
-            CD3D9EnumAdapterInfo* pAdapterInfo = pAdapterList->GetAt( iAdapter );
+    pDeviceSettings->d3d11.AdapterOrdinal = pDeviceSettingsCombo->AdapterOrdinal;
+    pDeviceSettings->d3d11.DriverType = pDeviceSettingsCombo->DeviceType;
+    pDeviceSettings->d3d11.Output = pDeviceSettingsCombo->Output;
 
-            // Get the desktop display mode of adapter 
-            pD3D->GetAdapterDisplayMode( pAdapterInfo->AdapterOrdinal, &adapterDesktopDisplayMode );
+    pDeviceSettings->d3d11.sd.Windowed = pDeviceSettingsCombo->Windowed;
+    if( GetSystemMetrics(SM_REMOTESESSION) != 0 )
+    {
+        pDeviceSettings->d3d11.sd.Windowed = TRUE;
+    }
+    if (pDeviceSettingsCombo->pOutputInfo)
+    {
+        auto bestDisplayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList[ bestModeIndex ];
+        if (!pDeviceSettingsCombo->Windowed)
+        {
+            pDeviceSettings->d3d11.sd.BufferDesc.Height = bestDisplayMode.Height;
+            pDeviceSettings->d3d11.sd.BufferDesc.Width = bestDisplayMode.Width;
+            pDeviceSettings->d3d11.sd.BufferDesc.RefreshRate.Numerator = bestDisplayMode.RefreshRate.Numerator;
+            pDeviceSettings->d3d11.sd.BufferDesc.RefreshRate.Denominator = bestDisplayMode.RefreshRate.Denominator;
+            pDeviceSettings->d3d11.sd.BufferDesc.Scaling = bestDisplayMode.Scaling;
+            pDeviceSettings->d3d11.sd.BufferDesc.ScanlineOrdering = bestDisplayMode.ScanlineOrdering;
+        }
+    }
+    if (pDeviceSettings->d3d11.DeviceFeatureLevel == 0)
+        pDeviceSettings->d3d11.DeviceFeatureLevel = pDeviceSettingsCombo->pDeviceInfo->SelectedLevel;
 
-            // Enum all the device types supported by this adapter to find the best device settings
-            for( int iDeviceInfo = 0; iDeviceInfo < pAdapterInfo->deviceInfoList.GetSize(); iDeviceInfo++ )
-            {
-                CD3D9EnumDeviceInfo* pDeviceInfo = pAdapterInfo->deviceInfoList.GetAt( iDeviceInfo );
+    if ( pDeviceSettings->d3d11.DriverType == D3D_DRIVER_TYPE_WARP )
+    {
+        D3D_FEATURE_LEVEL maxWarpFL = pEnum->GetWARPFeaturevel();
 
-                // Enum all the device settings combinations.  A device settings combination is 
-                // a unique set of an adapter format, back buffer format, and IsWindowed.
-                for( int iDeviceCombo = 0; iDeviceCombo < pDeviceInfo->deviceSettingsComboList.GetSize(); iDeviceCombo++ )
-                {
-                    CD3D9EnumDeviceSettingsCombo* pDeviceSettingsCombo = pDeviceInfo->deviceSettingsComboList.GetAt(
-                        iDeviceCombo );
+        if ( pDeviceSettings->d3d11.DeviceFeatureLevel > maxWarpFL )
+            pDeviceSettings->d3d11.DeviceFeatureLevel = maxWarpFL;
+    }
 
-                    // If windowed mode the adapter format has to be the same as the desktop 
-                    // display mode format so skip any that don't match
-                    if( pDeviceSettingsCombo->Windowed &&
-                        ( pDeviceSettingsCombo->AdapterFormat != adapterDesktopDisplayMode.Format ) )
-                        continue;
+    if ( pDeviceSettings->d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE )
+    {
+        D3D_FEATURE_LEVEL maxRefFL = pEnum->GetREFFeaturevel();
 
-                    // Skip any combo that doesn't meet the preserve match options
-                    int bestMode;
-                    int bestMSAA;
+        if ( pDeviceSettings->d3d11.DeviceFeatureLevel > maxRefFL )
+            pDeviceSettings->d3d11.DeviceFeatureLevel = maxRefFL;
+    }
 
-                    // Get a ranking number that describes how closely this device combo matches the optimal combo
-                    float fCurRanking = DXUTRankD3D9DeviceCombo( pDeviceSettingsCombo,
-                        &(pDeviceSettings->d3d9), &adapterDesktopDisplayMode, bestMode, bestMSAA );
+    pDeviceSettings->d3d11.sd.SampleDesc.Count = pDeviceSettingsCombo->multiSampleCountList[ bestMSAAIndex ];
+    if (pDeviceSettings->d3d11.sd.SampleDesc.Quality > pDeviceSettingsCombo->multiSampleQualityList[ bestMSAAIndex ] - 1)
+        pDeviceSettings->d3d11.sd.SampleDesc.Quality = pDeviceSettingsCombo->multiSampleQualityList[ bestMSAAIndex ] - 1;
 
-                    // If this combo better matches the input device settings then save it
-                    if( fCurRanking > fBestRanking )
-                    {
-                        pBestDeviceSettingsCombo = pDeviceSettingsCombo;
-                        fBestRanking = fCurRanking;
-                        bestModeIndex = bestMode;
-                        bestMSAAIndex = bestMSAA;
-                    }
-                }
-            }
-        }
+    pDeviceSettings->d3d11.sd.BufferDesc.Format = pDeviceSettingsCombo->BackBufferFormat;
 
-        // If no best device combination was found then fail
-        if( pBestDeviceSettingsCombo == NULL )
-            return DXUTERR_NOCOMPATIBLEDEVICES;
-
-        // Using the best device settings combo found, build valid device settings taking heed of 
-        // the match options and the input device settings
-        pDeviceSettings->d3d9.AdapterFormat = pBestDeviceSettingsCombo->AdapterFormat;//D3DFMT_X8R8G8B8;
-        pDeviceSettings->d3d9.AdapterOrdinal = pBestDeviceSettingsCombo->AdapterOrdinal ;//0;
-        pDeviceSettings->d3d9.DeviceType = pBestDeviceSettingsCombo->DeviceType;
-        pDeviceSettings->d3d9.pp.BackBufferFormat = pBestDeviceSettingsCombo->BackBufferFormat;//D3DFMT_X8R8G8B8;
-        if( GetSystemMetrics(0x1000) != 0 ) {// SM_REMOTESESSION
-            pDeviceSettings->d3d9.pp.Windowed = 1;
-        }          
-        if (!pBestDeviceSettingsCombo->Windowed) {
-            D3DDISPLAYMODE displayMode = pBestDeviceSettingsCombo->pAdapterInfo->displayModeList.GetAt( bestModeIndex );
-            pDeviceSettings->d3d9.pp.BackBufferHeight = displayMode.Height;
-            pDeviceSettings->d3d9.pp.BackBufferWidth = displayMode.Width; 
-            pDeviceSettings->d3d9.pp.FullScreen_RefreshRateInHz = displayMode.RefreshRate;
-        }
-         pDeviceSettings->d3d9.pp.hDeviceWindow = pBestDeviceSettingsCombo->Windowed ? DXUTGetHWNDDeviceWindowed() : DXUTGetHWNDDeviceFullScreen();
-        if (pDeviceSettings->d3d9.pp.MultiSampleQuality > pBestDeviceSettingsCombo->multiSampleQualityList.GetAt(bestMSAAIndex) - 1)
-            pDeviceSettings->d3d9.pp.MultiSampleQuality = pBestDeviceSettingsCombo->multiSampleQualityList.GetAt( bestMSAAIndex )-1;
-        
-        pDeviceSettings->d3d9.pp.MultiSampleType = pBestDeviceSettingsCombo->multiSampleTypeList.GetAt( bestMSAAIndex );;
-        pDeviceSettings->d3d9.pp.Windowed = pBestDeviceSettingsCombo->Windowed;
-        return S_OK;
-    }
-    return E_FAIL;
+    return S_OK;
 }
diff --git a/samples/DX_APIUsage/DXUT/Core/DXUT.h b/samples/DX_APIUsage/DXUT/Core/DXUT.h
index a436262..37129d1 100644
--- a/samples/DX_APIUsage/DXUT/Core/DXUT.h
+++ b/samples/DX_APIUsage/DXUT/Core/DXUT.h
@@ -2,10 +2,11 @@
 // File: DXUT.h
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #pragma once
-#ifndef DXUT_H
-#define DXUT_H
 
 #ifndef UNICODE
 #error "DXUT requires a Unicode build."
@@ -15,55 +16,59 @@
 #define STRICT
 #endif
 
-// If app hasn't choosen, set to work with Windows XP and beyond
+// If app hasn't choosen, set to work with Windows Vista and beyond
 #ifndef WINVER
-#define WINVER         0x0501
+#define WINVER         0x0600
 #endif
 #ifndef _WIN32_WINDOWS
-#define _WIN32_WINDOWS 0x0501
+#define _WIN32_WINDOWS 0x0600
 #endif
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT   0x0600
 #endif
 
+#if defined(USE_DIRECT3D11_4) && !defined(USE_DIRECT3D11_3)
+#define USE_DIRECT3D11_3
+#endif
+
+#if (_WIN32_WINNT >= 0x0A00) && !defined(USE_DIRECT3D11_3)
+#define USE_DIRECT3D11_3
+#endif
+
+#if (_WIN32_WINNT >= 0x0603) && !defined(USE_DIRECT3D11_2)
+#define USE_DIRECT3D11_2
+#endif
+
+#if defined(USE_DIRECT3D11_3) && !defined(USE_DIRECT3D11_2)
+#define USE_DIRECT3D11_2
+#endif
+
 // #define DXUT_AUTOLIB to automatically include the libs needed for DXUT
 #ifdef DXUT_AUTOLIB
-#pragma comment( lib, "dxerr.lib" )
+#pragma comment( lib, "comctl32.lib" )
 #pragma comment( lib, "dxguid.lib" )
-#pragma comment( lib, "d3d9.lib" )
-#if defined(DEBUG) || defined(_DEBUG)
-#pragma comment( lib, "d3dx9d.lib" )
-#pragma comment( lib, "d3dx11d.lib" )
-#else
-#pragma comment( lib, "d3dx9.lib" )
-#pragma comment( lib, "d3dx11.lib" )
-#endif
 #pragma comment( lib, "d3dcompiler.lib" )
-#pragma comment( lib, "winmm.lib" )
-#pragma comment( lib, "comctl32.lib" )
+#pragma comment( lib, "ole32.lib" )
+#pragma comment( lib, "uuid.lib" )
 #endif
 
-#pragma warning( disable : 4100 ) // disable unreference formal parameter warnings for /W4 builds
+#pragma warning( disable : 4481 )
 
-// Enable extra D3D debugging in debug builds if using the debug DirectX runtime.
-// This makes D3D objects work well in the debugger watch window, but slows down
-// performance slightly.
-#if defined(DEBUG) || defined(_DEBUG)
-#ifndef D3D_DEBUG_INFO
-#define D3D_DEBUG_INFO
-#endif
+// Standard Windows includes
+#if !defined(NOMINMAX)
+#define NOMINMAX
 #endif
 
-// Standard Windows includes
 #include <windows.h>
 #include <initguid.h>
 #include <assert.h>
-#include <wchar.h>
-#include <mmsystem.h>
 #include <commctrl.h> // for InitCommonControls()
 #include <shellapi.h> // for ExtractIcon()
 #include <new.h>      // for placement new
+#pragma warning(push, 3)
+#pragma warning(disable : 4091)
 #include <shlobj.h>
+#pragma warning(pop)
 #include <math.h>
 #include <limits.h>
 #include <stdio.h>
@@ -73,24 +78,54 @@
 #include <crtdbg.h>
 #endif
 
-// Direct3D9 includes
-#include <d3d9.h>
-#include <d3dx9.h>
-
 // Direct3D11 includes
 #include <d3dcommon.h>
 #include <dxgi.h>
-#include <d3d11.h>
+#include <d3d11_1.h>
 #include <d3dcompiler.h>
-#include <d3dx11.h>
+
+#ifdef USE_DIRECT3D11_2
+#include <d3d11_2.h>
+#endif
+
+#ifdef USE_DIRECT3D11_3
+#include <d3d11_3.h>
+#endif
+
+#ifdef USE_DIRECT3D11_4
+#include <d3d11_4.h>
+#endif
+
+// DirectXMath includes
+#pragma warning(push, 3)
+#pragma warning(disable : 4838)
+#include <DirectXMath.h>
+#include <DirectXColors.h>
+#pragma warning(pop)
+
+// WIC includes
+#include <wincodec.h>
 
 // XInput includes
 #include <xinput.h>
 
-// HRESULT translation for Direct3D and other APIs
-#include <dxerr.h>
+// dxerr.h is deprecated and gone. Replace usage here
+#if defined(DEBUG) | defined(_DEBUG)
+#define DXTRACE_MSG(str)              DXUTTrace( __FILE__, (DWORD)__LINE__, 0, str, FALSE )
+#define DXTRACE_ERR(str,hr)           DXUTTrace( __FILE__, (DWORD)__LINE__, hr, str, FALSE )
+#define DXTRACE_ERR_MSGBOX(str,hr)    DXUTTrace( __FILE__, (DWORD)__LINE__, hr, str, TRUE )
+#else
+#define DXTRACE_MSG(str)              (0L)
+#define DXTRACE_ERR(str,hr)           (hr)
+#define DXTRACE_ERR_MSGBOX(str,hr)    (hr)
+#endif
 
 
+// STL includes
+#include <algorithm>
+#include <memory>
+#include <vector>
+
 #if defined(DEBUG) || defined(_DEBUG)
 #ifndef V
 #define V(x)           { hr = (x); if( FAILED(hr) ) { DXUTTrace( __FILE__, (DWORD)__LINE__, hr, L#x, true ); } }
@@ -108,29 +143,25 @@
 #endif
 
 #ifndef SAFE_DELETE
-#define SAFE_DELETE(p)       { if (p) { delete (p);     (p)=NULL; } }
+#define SAFE_DELETE(p)       { if (p) { delete (p);     (p) = nullptr; } }
 #endif
 #ifndef SAFE_DELETE_ARRAY
-#define SAFE_DELETE_ARRAY(p) { if (p) { delete[] (p);   (p)=NULL; } }
+#define SAFE_DELETE_ARRAY(p) { if (p) { delete[] (p);   (p) = nullptr; } }
 #endif
 #ifndef SAFE_RELEASE
-#define SAFE_RELEASE(p)      { if (p) { (p)->Release(); (p)=NULL; } }
+#define SAFE_RELEASE(p)      { if (p) { (p)->Release(); (p) = nullptr; } }
 #endif
 
+#ifndef D3DCOLOR_ARGB
+#define D3DCOLOR_ARGB(a,r,g,b) \
+    ((DWORD)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff)))
+#endif
 
+#define DXUT_VERSION 1118
 
 //--------------------------------------------------------------------------------------
 // Structs
 //--------------------------------------------------------------------------------------
-struct DXUTD3D9DeviceSettings
-{
-    UINT AdapterOrdinal;
-    D3DDEVTYPE DeviceType;
-    D3DFORMAT AdapterFormat;
-    DWORD BehaviorFlags;
-    D3DPRESENT_PARAMETERS pp;
-};
-
 struct DXUTD3D11DeviceSettings
 {
     UINT AdapterOrdinal;
@@ -145,18 +176,10 @@ struct DXUTD3D11DeviceSettings
     D3D_FEATURE_LEVEL DeviceFeatureLevel;
 };
 
-enum DXUTDeviceVersion
-{
-    DXUT_D3D9_DEVICE,
-    DXUT_D3D11_DEVICE
-};
-
 struct DXUTDeviceSettings
 {
-    DXUTDeviceVersion ver;
     D3D_FEATURE_LEVEL MinimumFeatureLevel;
-    DXUTD3D9DeviceSettings d3d9; // only valid if ver == DXUT_D3D9_DEVICE
-    DXUTD3D11DeviceSettings d3d11; // only valid if ver == DXUT_D3D11_DEVICE
+    DXUTD3D11DeviceSettings d3d11;
 };
 
 
@@ -172,88 +195,77 @@ struct DXUTDeviceSettings
 #define DXUTERR_CREATINGDEVICEOBJECTS   MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0907)
 #define DXUTERR_RESETTINGDEVICEOBJECTS  MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0908)
 #define DXUTERR_DEVICEREMOVED           MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x090A)
-#define DXUTERR_NODIRECT3D11            MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x090)
+
 
 //--------------------------------------------------------------------------------------
 // Callback registration
 //--------------------------------------------------------------------------------------
 
 // General callbacks
-typedef void    (CALLBACK *LPDXUTCALLBACKFRAMEMOVE)( double fTime, float fElapsedTime, void* pUserContext );
-typedef void    (CALLBACK *LPDXUTCALLBACKKEYBOARD)( UINT nChar, bool bKeyDown, bool bAltDown, void* pUserContext );
-typedef void    (CALLBACK *LPDXUTCALLBACKMOUSE)( bool bLeftButtonDown, bool bRightButtonDown, bool bMiddleButtonDown, bool bSideButton1Down, bool bSideButton2Down, int nMouseWheelDelta, int xPos, int yPos, void* pUserContext );
-typedef LRESULT (CALLBACK *LPDXUTCALLBACKMSGPROC)( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, bool* pbNoFurtherProcessing, void* pUserContext );
-typedef void    (CALLBACK *LPDXUTCALLBACKTIMER)( UINT idEvent, void* pUserContext );
-typedef bool    (CALLBACK *LPDXUTCALLBACKMODIFYDEVICESETTINGS)( DXUTDeviceSettings* pDeviceSettings, void* pUserContext );
-typedef bool    (CALLBACK *LPDXUTCALLBACKDEVICEREMOVED)( void* pUserContext );
-
-// Direct3D 9 callbacks
-typedef bool    (CALLBACK *LPDXUTCALLBACKISD3D9DEVICEACCEPTABLE)( D3DCAPS9* pCaps, D3DFORMAT AdapterFormat, D3DFORMAT BackBufferFormat, bool bWindowed, void* pUserContext );
-typedef HRESULT (CALLBACK *LPDXUTCALLBACKD3D9DEVICECREATED)( IDirect3DDevice9* pd3dDevice, const D3DSURFACE_DESC* pBackBufferSurfaceDesc, void* pUserContext );
-typedef HRESULT (CALLBACK *LPDXUTCALLBACKD3D9DEVICERESET)( IDirect3DDevice9* pd3dDevice, const D3DSURFACE_DESC* pBackBufferSurfaceDesc, void* pUserContext );
-typedef void    (CALLBACK *LPDXUTCALLBACKD3D9FRAMERENDER)( IDirect3DDevice9* pd3dDevice, double fTime, float fElapsedTime, void* pUserContext );
-typedef void    (CALLBACK *LPDXUTCALLBACKD3D9DEVICELOST)( void* pUserContext );
-typedef void    (CALLBACK *LPDXUTCALLBACKD3D9DEVICEDESTROYED)( void* pUserContext );
+typedef void    (CALLBACK *LPDXUTCALLBACKFRAMEMOVE)( _In_ double fTime, _In_ float fElapsedTime, _In_opt_ void* pUserContext );
+typedef void    (CALLBACK *LPDXUTCALLBACKKEYBOARD)( _In_ UINT nChar, _In_ bool bKeyDown, _In_ bool bAltDown, _In_opt_ void* pUserContext );
+typedef void    (CALLBACK *LPDXUTCALLBACKMOUSE)( _In_ bool bLeftButtonDown, _In_ bool bRightButtonDown, _In_ bool bMiddleButtonDown,
+                                                 _In_ bool bSideButton1Down, _In_ bool bSideButton2Down, _In_ int nMouseWheelDelta,
+                                                 _In_ int xPos, _In_ int yPos, _In_opt_ void* pUserContext );
+typedef LRESULT (CALLBACK *LPDXUTCALLBACKMSGPROC)( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam,
+                                                   _Out_ bool* pbNoFurtherProcessing, _In_opt_ void* pUserContext );
+typedef void    (CALLBACK *LPDXUTCALLBACKTIMER)( _In_ UINT idEvent, _In_opt_ void* pUserContext );
+typedef bool    (CALLBACK *LPDXUTCALLBACKMODIFYDEVICESETTINGS)( _In_ DXUTDeviceSettings* pDeviceSettings, _In_opt_ void* pUserContext );
+typedef bool    (CALLBACK *LPDXUTCALLBACKDEVICEREMOVED)( _In_opt_ void* pUserContext );
+typedef void    (CALLBACK *LPDXUTCALLBACKQUIT)( _In_opt_ void* pUserContext );
 
 class CD3D11EnumAdapterInfo;
 class CD3D11EnumDeviceInfo;
+
 // Direct3D 11 callbacks
-typedef bool    (CALLBACK *LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE)( const CD3D11EnumAdapterInfo *AdapterInfo, UINT Output, const CD3D11EnumDeviceInfo *DeviceInfo, DXGI_FORMAT BackBufferFormat, bool bWindowed, void* pUserContext );
-typedef HRESULT (CALLBACK *LPDXUTCALLBACKD3D11DEVICECREATED)( ID3D11Device* pd3dDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc, void* pUserContext );
-typedef HRESULT (CALLBACK *LPDXUTCALLBACKD3D11SWAPCHAINRESIZED)( ID3D11Device* pd3dDevice, IDXGISwapChain *pSwapChain, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc, void* pUserContext );
-typedef void    (CALLBACK *LPDXUTCALLBACKD3D11FRAMERENDER)( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext, double fTime, float fElapsedTime, void* pUserContext );
-typedef void    (CALLBACK *LPDXUTCALLBACKD3D11SWAPCHAINRELEASING)( void* pUserContext );
-typedef void    (CALLBACK *LPDXUTCALLBACKD3D11DEVICEDESTROYED)( void* pUserContext );
+typedef bool    (CALLBACK *LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE)( _In_ const CD3D11EnumAdapterInfo *AdapterInfo, _In_ UINT Output, _In_ const CD3D11EnumDeviceInfo *DeviceInfo,
+                                                                   _In_ DXGI_FORMAT BackBufferFormat, _In_ bool bWindowed, _In_opt_ void* pUserContext );
+typedef HRESULT (CALLBACK *LPDXUTCALLBACKD3D11DEVICECREATED)( _In_ ID3D11Device* pd3dDevice, _In_ const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc, _In_opt_ void* pUserContext );
+typedef HRESULT (CALLBACK *LPDXUTCALLBACKD3D11SWAPCHAINRESIZED)( _In_ ID3D11Device* pd3dDevice, _In_ IDXGISwapChain *pSwapChain, _In_ const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc, _In_opt_ void* pUserContext );
+typedef void    (CALLBACK *LPDXUTCALLBACKD3D11FRAMERENDER)( _In_ ID3D11Device* pd3dDevice, _In_ ID3D11DeviceContext* pd3dImmediateContext, _In_ double fTime, _In_ float fElapsedTime, _In_opt_ void* pUserContext );
+typedef void    (CALLBACK *LPDXUTCALLBACKD3D11SWAPCHAINRELEASING)( _In_opt_ void* pUserContext );
+typedef void    (CALLBACK *LPDXUTCALLBACKD3D11DEVICEDESTROYED)( _In_opt_ void* pUserContext );
 
 // General callbacks
-void WINAPI DXUTSetCallbackFrameMove( LPDXUTCALLBACKFRAMEMOVE pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackKeyboard( LPDXUTCALLBACKKEYBOARD pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackMouse( LPDXUTCALLBACKMOUSE pCallback, bool bIncludeMouseMove = false, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackMsgProc( LPDXUTCALLBACKMSGPROC pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackDeviceChanging( LPDXUTCALLBACKMODIFYDEVICESETTINGS pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackDeviceRemoved( LPDXUTCALLBACKDEVICEREMOVED pCallback, void* pUserContext = NULL );
-
-// Direct3D 9 callbacks
-void WINAPI DXUTSetCallbackD3D9DeviceAcceptable( LPDXUTCALLBACKISD3D9DEVICEACCEPTABLE pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackD3D9DeviceCreated( LPDXUTCALLBACKD3D9DEVICECREATED pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackD3D9DeviceReset( LPDXUTCALLBACKD3D9DEVICERESET pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackD3D9FrameRender( LPDXUTCALLBACKD3D9FRAMERENDER pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackD3D9DeviceLost( LPDXUTCALLBACKD3D9DEVICELOST pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackD3D9DeviceDestroyed( LPDXUTCALLBACKD3D9DEVICEDESTROYED pCallback, void* pUserContext = NULL );
+void WINAPI DXUTSetCallbackFrameMove( _In_ LPDXUTCALLBACKFRAMEMOVE pCallback, _In_opt_ void* pUserContext = nullptr );
+void WINAPI DXUTSetCallbackKeyboard( _In_ LPDXUTCALLBACKKEYBOARD pCallback, _In_opt_ void* pUserContext = nullptr );
+void WINAPI DXUTSetCallbackMouse( _In_ LPDXUTCALLBACKMOUSE pCallback, bool bIncludeMouseMove = false, _In_opt_ void* pUserContext = nullptr );
+void WINAPI DXUTSetCallbackMsgProc( _In_ LPDXUTCALLBACKMSGPROC pCallback, _In_opt_ void* pUserContext = nullptr );
+void WINAPI DXUTSetCallbackDeviceChanging( _In_ LPDXUTCALLBACKMODIFYDEVICESETTINGS pCallback, _In_opt_ void* pUserContext = nullptr );
+void WINAPI DXUTSetCallbackDeviceRemoved( _In_ LPDXUTCALLBACKDEVICEREMOVED pCallback, _In_opt_ void* pUserContext = nullptr );
+void WINAPI DXUTSetCallbackQuit( _In_ LPDXUTCALLBACKQUIT pCallback, _In_opt_ void* pUserContext = nullptr );
 
 // Direct3D 11 callbacks
-void WINAPI DXUTSetCallbackD3D11DeviceAcceptable( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackD3D11DeviceCreated( LPDXUTCALLBACKD3D11DEVICECREATED pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackD3D11SwapChainResized( LPDXUTCALLBACKD3D11SWAPCHAINRESIZED pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackD3D11FrameRender( LPDXUTCALLBACKD3D11FRAMERENDER pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackD3D11SwapChainReleasing( LPDXUTCALLBACKD3D11SWAPCHAINRELEASING pCallback, void* pUserContext = NULL );
-void WINAPI DXUTSetCallbackD3D11DeviceDestroyed( LPDXUTCALLBACKD3D11DEVICEDESTROYED pCallback, void* pUserContext = NULL );
+void WINAPI DXUTSetCallbackD3D11DeviceAcceptable( _In_ LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE pCallback, _In_opt_ void* pUserContext = nullptr );
+void WINAPI DXUTSetCallbackD3D11DeviceCreated( _In_ LPDXUTCALLBACKD3D11DEVICECREATED pCallback, _In_opt_ void* pUserContext = nullptr );
+void WINAPI DXUTSetCallbackD3D11SwapChainResized( _In_ LPDXUTCALLBACKD3D11SWAPCHAINRESIZED pCallback, _In_opt_ void* pUserContext = nullptr );
+void WINAPI DXUTSetCallbackD3D11FrameRender( _In_ LPDXUTCALLBACKD3D11FRAMERENDER pCallback, _In_opt_ void* pUserContext = nullptr );
+void WINAPI DXUTSetCallbackD3D11SwapChainReleasing( _In_ LPDXUTCALLBACKD3D11SWAPCHAINRELEASING pCallback, _In_opt_ void* pUserContext = nullptr );
+void WINAPI DXUTSetCallbackD3D11DeviceDestroyed( _In_ LPDXUTCALLBACKD3D11DEVICEDESTROYED pCallback, _In_opt_ void* pUserContext = nullptr );
 
 
 //--------------------------------------------------------------------------------------
 // Initialization
 //--------------------------------------------------------------------------------------
-HRESULT WINAPI DXUTInit( bool bParseCommandLine = true,
-                         bool bShowMsgBoxOnError = true,
-                         __in_opt WCHAR* strExtraCommandLineParams = NULL,
-                         bool bThreadSafeDXUT = false );
+HRESULT WINAPI DXUTInit( _In_ bool bParseCommandLine = true,
+                         _In_ bool bShowMsgBoxOnError = true,
+                         _In_opt_ WCHAR* strExtraCommandLineParams = nullptr,
+                         _In_ bool bThreadSafeDXUT = false );
 
 // Choose either DXUTCreateWindow or DXUTSetWindow.  If using DXUTSetWindow, consider using DXUTStaticWndProc
-HRESULT WINAPI DXUTCreateWindow( const WCHAR* strWindowTitle = L"Direct3D Window",
-                          HINSTANCE hInstance = NULL, HICON hIcon = NULL, HMENU hMenu = NULL,
-                          int x = CW_USEDEFAULT, int y = CW_USEDEFAULT );
-HRESULT WINAPI DXUTSetWindow( HWND hWndFocus, HWND hWndDeviceFullScreen, HWND hWndDeviceWindowed, bool bHandleMessages = true );
-LRESULT CALLBACK DXUTStaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
+HRESULT WINAPI DXUTCreateWindow( _In_z_ const WCHAR* strWindowTitle = L"Direct3D Window",
+                                 _In_opt_ HINSTANCE hInstance = nullptr, _In_opt_ HICON hIcon = nullptr, _In_opt_ HMENU hMenu = nullptr,
+                                 _In_ int x = CW_USEDEFAULT, _In_ int y = CW_USEDEFAULT );
+HRESULT WINAPI DXUTSetWindow( _In_ HWND hWndFocus, _In_ HWND hWndDeviceFullScreen, _In_ HWND hWndDeviceWindowed, _In_ bool bHandleMessages = true );
+LRESULT CALLBACK DXUTStaticWndProc( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam );
 
-// Choose either DXUTCreateDevice or DXUTSetD3D*Device or DXUTCreateD3DDeviceFromSettings
+// Choose either DXUTCreateDevice or DXUTCreateD3DDeviceFromSettings
 
-HRESULT WINAPI DXUTCreateDevice(D3D_FEATURE_LEVEL reqFL,  bool bWindowed= true, int nSuggestedWidth =0, int nSuggestedHeight =0 );
-HRESULT WINAPI DXUTCreateDeviceFromSettings( DXUTDeviceSettings* pDeviceSettings, bool bPreserveInput = false, bool bClipWindowToSingleAdapter = true );
-HRESULT WINAPI DXUTSetD3D9Device( IDirect3DDevice9* pd3dDevice );
-HRESULT WINAPI DXUTSetD3D11Device( ID3D11Device* pd3dDevice, IDXGISwapChain* pSwapChain );
+HRESULT WINAPI DXUTCreateDevice(_In_ D3D_FEATURE_LEVEL reqFL, _In_ bool bWindowed= true, _In_ int nSuggestedWidth =0,_In_  int nSuggestedHeight =0 );
+HRESULT WINAPI DXUTCreateDeviceFromSettings( _In_ DXUTDeviceSettings* pDeviceSettings, _In_ bool bClipWindowToSingleAdapter = true );
 
 // Choose either DXUTMainLoop or implement your own main loop
-HRESULT WINAPI DXUTMainLoop( HACCEL hAccel = NULL );
+HRESULT WINAPI DXUTMainLoop( _In_opt_ HACCEL hAccel = nullptr );
 
 // If not using DXUTMainLoop consider using DXUTRender3DEnvironment
 void WINAPI DXUTRender3DEnvironment();
@@ -265,50 +277,54 @@ void WINAPI DXUTRender3DEnvironment();
 HRESULT WINAPI DXUTToggleFullScreen();
 HRESULT WINAPI DXUTToggleREF();
 HRESULT WINAPI DXUTToggleWARP();
-void    WINAPI DXUTPause( bool bPauseTime, bool bPauseRendering );
-void    WINAPI DXUTSetConstantFrameTime( bool bConstantFrameTime, float fTimePerFrame = 0.0333f );
-void    WINAPI DXUTSetCursorSettings( bool bShowCursorWhenFullScreen = false, bool bClipCursorWhenFullScreen = false );
-void    WINAPI DXUTSetD3DVersionSupport( bool bAppCanUseD3D9 = true, bool bAppCanUseD3D11 = true );
-void    WINAPI DXUTSetHotkeyHandling( bool bAltEnterToToggleFullscreen = true, bool bEscapeToQuit = true, bool bPauseToToggleTimePause = true );
-void    WINAPI DXUTSetMultimonSettings( bool bAutoChangeAdapter = true );
-void    WINAPI DXUTSetShortcutKeySettings( bool bAllowWhenFullscreen = false, bool bAllowWhenWindowed = true ); // Controls the Windows key, and accessibility shortcut keys
-void    WINAPI DXUTSetWindowSettings( bool bCallDefWindowProc = true );
-HRESULT WINAPI DXUTSetTimer( LPDXUTCALLBACKTIMER pCallbackTimer, float fTimeoutInSecs = 1.0f, UINT* pnIDEvent = NULL, void* pCallbackUserContext = NULL );
-HRESULT WINAPI DXUTKillTimer( UINT nIDEvent );
+void    WINAPI DXUTPause( _In_ bool bPauseTime, _In_ bool bPauseRendering );
+void    WINAPI DXUTSetConstantFrameTime( _In_ bool bConstantFrameTime, _In_ float fTimePerFrame = 0.0333f );
+void    WINAPI DXUTSetCursorSettings( _In_ bool bShowCursorWhenFullScreen = false, _In_ bool bClipCursorWhenFullScreen = false );
+void    WINAPI DXUTSetHotkeyHandling( _In_ bool bAltEnterToToggleFullscreen = true, _In_ bool bEscapeToQuit = true, _In_ bool bPauseToToggleTimePause = true );
+void    WINAPI DXUTSetMultimonSettings( _In_ bool bAutoChangeAdapter = true );
+void    WINAPI DXUTSetShortcutKeySettings( _In_ bool bAllowWhenFullscreen = false, _In_ bool bAllowWhenWindowed = true ); // Controls the Windows key, and accessibility shortcut keys
+void    WINAPI DXUTSetWindowSettings( _In_ bool bCallDefWindowProc = true );
+HRESULT WINAPI DXUTSetTimer( _In_ LPDXUTCALLBACKTIMER pCallbackTimer, _In_ float fTimeoutInSecs = 1.0f, _Out_opt_ UINT* pnIDEvent = nullptr, _In_opt_ void* pCallbackUserContext = nullptr );
+HRESULT WINAPI DXUTKillTimer( _In_ UINT nIDEvent );
 void    WINAPI DXUTResetFrameworkState();
-void    WINAPI DXUTShutdown( int nExitCode = 0 );
-void    WINAPI DXUTSetIsInGammaCorrectMode( bool bGammaCorrect );
-BOOL    WINAPI DXUTGetMSAASwapChainCreated();
+void    WINAPI DXUTShutdown( _In_ int nExitCode = 0 );
+void    WINAPI DXUTSetIsInGammaCorrectMode( _In_ bool bGammaCorrect );
+bool    WINAPI DXUTGetMSAASwapChainCreated();
+
 
 //--------------------------------------------------------------------------------------
 // State Retrieval
 //--------------------------------------------------------------------------------------
 
-// Direct3D 9
-IDirect3D9*              WINAPI DXUTGetD3D9Object(); // Does not addref unlike typical Get* APIs
-IDirect3DDevice9*        WINAPI DXUTGetD3D9Device(); // Does not addref unlike typical Get* APIs
-D3DPRESENT_PARAMETERS    WINAPI DXUTGetD3D9PresentParameters();
-const D3DSURFACE_DESC*   WINAPI DXUTGetD3D9BackBufferSurfaceDesc();
-const D3DCAPS9*          WINAPI DXUTGetD3D9DeviceCaps();
-HRESULT                  WINAPI DXUTGetD3D9DeviceCaps( DXUTDeviceSettings* pDeviceSettings, D3DCAPS9* pCaps );
-bool                     WINAPI DXUTDoesAppSupportD3D9();
-bool                     WINAPI DXUTIsAppRenderingWithD3D9();
+// Direct3D 11.x (These do not addref unlike typical Get* APIs)
+IDXGIFactory1*           WINAPI DXUTGetDXGIFactory();
+IDXGISwapChain*          WINAPI DXUTGetDXGISwapChain();
+const DXGI_SURFACE_DESC* WINAPI DXUTGetDXGIBackBufferSurfaceDesc();
+HRESULT                  WINAPI DXUTSetupD3D11Views( _In_ ID3D11DeviceContext* pd3dDeviceContext ); // Supports immediate or deferred context
+D3D_FEATURE_LEVEL        WINAPI DXUTGetD3D11DeviceFeatureLevel(); // Returns the D3D11 devices current feature level
+ID3D11RenderTargetView*  WINAPI DXUTGetD3D11RenderTargetView();
+ID3D11DepthStencilView*  WINAPI DXUTGetD3D11DepthStencilView();
 
+ID3D11Device*            WINAPI DXUTGetD3D11Device();
+ID3D11DeviceContext*     WINAPI DXUTGetD3D11DeviceContext();
 
-// Direct3D 11
-IDXGIFactory1*            WINAPI DXUTGetDXGIFactory(); // Does not addref unlike typical Get* APIs
-IDXGISwapChain*          WINAPI DXUTGetDXGISwapChain(); // Does not addref unlike typical Get* APIs
-const DXGI_SURFACE_DESC* WINAPI DXUTGetDXGIBackBufferSurfaceDesc();
-bool                     WINAPI DXUTIsD3D11Available(); // If D3D11 APIs are availible
-ID3D11Device*			 WINAPI DXUTGetD3D11Device(); // Does not addref unlike typical Get* APIs
-ID3D11DeviceContext*	 WINAPI DXUTGetD3D11DeviceContext(); // Does not addref unlike typical Get* APIs
-HRESULT                  WINAPI DXUTSetupD3D11Views( ID3D11DeviceContext* pd3dDeviceContext ); // Supports immediate or deferred context
-D3D_FEATURE_LEVEL	     WINAPI DXUTGetD3D11DeviceFeatureLevel(); // Returns the D3D11 devices current feature level
-ID3D11RenderTargetView*  WINAPI DXUTGetD3D11RenderTargetView(); // Does not addref unlike typical Get* APIs
-ID3D11DepthStencilView*  WINAPI DXUTGetD3D11DepthStencilView(); // Does not addref unlike typical Get* APIs
-bool                     WINAPI DXUTDoesAppSupportD3D11();
-bool                     WINAPI DXUTIsAppRenderingWithD3D11();
+ID3D11Device1*           WINAPI DXUTGetD3D11Device1();
+ID3D11DeviceContext1*	 WINAPI DXUTGetD3D11DeviceContext1();
 
+#ifdef USE_DIRECT3D11_2
+ID3D11Device2*           WINAPI DXUTGetD3D11Device2();
+ID3D11DeviceContext2*	 WINAPI DXUTGetD3D11DeviceContext2();
+#endif
+
+#ifdef USE_DIRECT3D11_3
+ID3D11Device3*           WINAPI DXUTGetD3D11Device3();
+ID3D11DeviceContext3*	 WINAPI DXUTGetD3D11DeviceContext3();
+#endif
+
+#ifdef USE_DIRECT3D11_4
+ID3D11Device4*           WINAPI DXUTGetD3D11Device4();
+ID3D11DeviceContext4*	 WINAPI DXUTGetD3D11DeviceContext4();
+#endif
 
 // General
 DXUTDeviceSettings WINAPI DXUTGetDeviceSettings();
@@ -328,7 +344,7 @@ bool      WINAPI DXUTIsWindowed();
 bool	  WINAPI DXUTIsInGammaCorrectMode();
 float     WINAPI DXUTGetFPS();
 LPCWSTR   WINAPI DXUTGetWindowTitle();
-LPCWSTR   WINAPI DXUTGetFrameStats( bool bIncludeFPS = false );
+LPCWSTR   WINAPI DXUTGetFrameStats( _In_ bool bIncludeFPS = false );
 LPCWSTR   WINAPI DXUTGetDeviceStats();
 
 bool      WINAPI DXUTIsVsyncEnabled();
@@ -338,9 +354,9 @@ bool      WINAPI DXUTIsActive();
 int       WINAPI DXUTGetExitCode();
 bool      WINAPI DXUTGetShowMsgBoxOnError();
 bool      WINAPI DXUTGetAutomation();  // Returns true if -automation parameter is used to launch the app
-bool      WINAPI DXUTIsKeyDown( BYTE vKey ); // Pass a virtual-key code, ex. VK_F1, 'A', VK_RETURN, VK_LSHIFT, etc
-bool      WINAPI DXUTWasKeyPressed( BYTE vKey );  // Like DXUTIsKeyDown() but return true only if the key was just pressed
-bool      WINAPI DXUTIsMouseButtonDown( BYTE vButton ); // Pass a virtual-key code: VK_LBUTTON, VK_RBUTTON, VK_MBUTTON, VK_XBUTTON1, VK_XBUTTON2
+bool      WINAPI DXUTIsKeyDown( _In_ BYTE vKey ); // Pass a virtual-key code, ex. VK_F1, 'A', VK_RETURN, VK_LSHIFT, etc
+bool      WINAPI DXUTWasKeyPressed( _In_ BYTE vKey );  // Like DXUTIsKeyDown() but return true only if the key was just pressed
+bool      WINAPI DXUTIsMouseButtonDown( _In_ BYTE vButton ); // Pass a virtual-key code: VK_LBUTTON, VK_RBUTTON, VK_MBUTTON, VK_XBUTTON1, VK_XBUTTON2
 HRESULT   WINAPI DXUTCreateState(); // Optional method to create DXUT's memory.  If its not called by the application it will be automatically called when needed
 void      WINAPI DXUTDestroyState(); // Optional method to destroy DXUT's memory.  If its not called by the application it will be automatically called after the application exits WinMain
 
@@ -348,14 +364,4 @@ void      WINAPI DXUTDestroyState(); // Optional method to destroy DXUT's memory
 // DXUT core layer includes
 //--------------------------------------------------------------------------------------
 #include "DXUTmisc.h"
-#include "DXUTDevice9.h"
 #include "DXUTDevice11.h"
-
-
-
-
-#endif
-
-
-
-
diff --git a/samples/DX_APIUsage/DXUT/Core/DXUTDevice11.cpp b/samples/DX_APIUsage/DXUT/Core/DXUTDevice11.cpp
index 156f48d..eb5f968 100644
--- a/samples/DX_APIUsage/DXUT/Core/DXUTDevice11.cpp
+++ b/samples/DX_APIUsage/DXUT/Core/DXUTDevice11.cpp
@@ -4,10 +4,11 @@
 // Enumerates D3D adapters, devices, modes, etc.
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #include "DXUT.h"
-#undef min // use __min instead
-#undef max // use __max instead
 
 //--------------------------------------------------------------------------------------
 // Forward declarations
@@ -16,17 +17,14 @@ extern void DXUTGetCallbackD3D11DeviceAcceptable( LPDXUTCALLBACKISD3D11DEVICEACC
 
 static int __cdecl SortModesCallback( const void* arg1, const void* arg2 );
 
-CD3D11Enumeration*  g_pDXUTD3D11Enumeration = NULL;
-
-
-
+CD3D11Enumeration*  g_pDXUTD3D11Enumeration = nullptr;
 
 HRESULT WINAPI DXUTCreateD3D11Enumeration()
 {
-    if( g_pDXUTD3D11Enumeration == NULL )
+    if( !g_pDXUTD3D11Enumeration )
     {
-        g_pDXUTD3D11Enumeration = new CD3D11Enumeration();
-        if( NULL == g_pDXUTD3D11Enumeration )
+        g_pDXUTD3D11Enumeration = new (std::nothrow) CD3D11Enumeration();
+        if( !g_pDXUTD3D11Enumeration )
             return E_OUTOFMEMORY;
     }
     return S_OK;
@@ -40,18 +38,13 @@ void WINAPI DXUTDestroyD3D11Enumeration()
 class DXUTMemoryHelperD3D11Enum
 {
 public:
-DXUTMemoryHelperD3D11Enum()
-{
-    DXUTCreateD3D11Enumeration();
-}
-~DXUTMemoryHelperD3D11Enum()
-{
-    DXUTDestroyD3D11Enumeration();
-}
+DXUTMemoryHelperD3D11Enum() { DXUTCreateD3D11Enumeration(); }
+~DXUTMemoryHelperD3D11Enum() { DXUTDestroyD3D11Enumeration(); }
 };
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 CD3D11Enumeration* WINAPI DXUTGetD3D11Enumeration( bool bForceEnumerate, bool bEnumerateAllAdapterFormats, D3D_FEATURE_LEVEL forceFL )
 {
     // Using an static class with accessor function to allow control of the construction order
@@ -72,21 +65,15 @@ CD3D11Enumeration* WINAPI DXUTGetD3D11Enumeration( bool bForceEnumerate, bool bE
 
 
 //--------------------------------------------------------------------------------------
-CD3D11Enumeration::CD3D11Enumeration()
+CD3D11Enumeration::CD3D11Enumeration() :
+    m_bHasEnumerated(false),
+    m_IsD3D11DeviceAcceptableFunc(nullptr),
+    m_pIsD3D11DeviceAcceptableFuncUserContext(nullptr),
+    m_bEnumerateAllAdapterFormats(false),
+    m_forceFL(D3D_FEATURE_LEVEL(0)),
+    m_warpFL(D3D_FEATURE_LEVEL_10_1),
+    m_refFL(D3D_FEATURE_LEVEL_11_0)
 {
-    m_bHasEnumerated = false;
-    m_IsD3D11DeviceAcceptableFunc = NULL;
-    m_pIsD3D11DeviceAcceptableFuncUserContext = NULL;
-
-    m_nMinWidth = 640;
-    m_nMinHeight = 480;
-    m_nMaxWidth = UINT_MAX;
-    m_nMaxHeight = UINT_MAX;
-    m_bEnumerateAllAdapterFormats = false;
-
-    m_nRefreshMin = 0;
-    m_nRefreshMax = UINT_MAX;
-
     ResetPossibleDepthStencilFormats();
 }
 
@@ -110,13 +97,14 @@ CD3D11Enumeration::~CD3D11Enumeration()
 // if supported otherwise it will default to SWVP, however the app can change this 
 // through the ConfirmDevice callback.
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CD3D11Enumeration::Enumerate( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE IsD3D11DeviceAcceptableFunc,
                                       void* pIsD3D11DeviceAcceptableFuncUserContext )
 {
     CDXUTPerfEventGenerator eventGenerator( DXUT_PERFEVENTCOLOR, L"DXUT D3D11 Enumeration" );
     HRESULT hr;
-    IDXGIFactory1* pFactory = DXUTGetDXGIFactory();
-    if( pFactory == NULL )
+    auto pFactory = DXUTGetDXGIFactory();
+    if( !pFactory )
         return E_FAIL;
 
     m_bHasEnumerated = true;
@@ -127,18 +115,33 @@ HRESULT CD3D11Enumeration::Enumerate( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE IsD3
 
     for( int index = 0; ; ++index )
     {
-        IDXGIAdapter* pAdapter = NULL;
+        IDXGIAdapter* pAdapter = nullptr;
         hr = pFactory->EnumAdapters( index, &pAdapter );
         if( FAILED( hr ) ) // DXGIERR_NOT_FOUND is expected when the end of the list is hit
             break;
 
-        CD3D11EnumAdapterInfo* pAdapterInfo = new CD3D11EnumAdapterInfo;
+        IDXGIAdapter2* pAdapter2 = nullptr;
+        if ( SUCCEEDED( pAdapter->QueryInterface( __uuidof(IDXGIAdapter2), ( LPVOID* )&pAdapter2 ) ) )
+        {
+            // Succeeds on DirectX 11.1 Runtime systems
+            DXGI_ADAPTER_DESC2 desc;
+            hr = pAdapter2->GetDesc2( &desc );
+            pAdapter2->Release();
+
+            if ( SUCCEEDED(hr) && ( desc.Flags & DXGI_ADAPTER_FLAG_SOFTWARE ) )
+            {
+                // Skip "always there" Microsoft Basics Display Driver
+                pAdapter->Release();
+                continue;
+            }
+        }
+
+        auto pAdapterInfo = new (std::nothrow) CD3D11EnumAdapterInfo;
         if( !pAdapterInfo )
         {
             SAFE_RELEASE( pAdapter );
             return E_OUTOFMEMORY;
         }
-        ZeroMemory( pAdapterInfo, sizeof( CD3D11EnumAdapterInfo ) );
         pAdapterInfo->AdapterOrdinal = index;
         pAdapter->GetDesc( &pAdapterInfo->AdapterDesc );
         pAdapterInfo->m_pAdapter = pAdapter;
@@ -152,38 +155,30 @@ HRESULT CD3D11Enumeration::Enumerate( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE IsD3
         }
 
         hr = EnumerateOutputs( pAdapterInfo );
-        if( FAILED( hr ) || pAdapterInfo->outputInfoList.GetSize() <= 0 )
+        if( FAILED( hr ) || pAdapterInfo->outputInfoList.empty() )
         {
             delete pAdapterInfo;
             continue;
         }
 
         // Get info for each devicecombo on this device
-        if( FAILED( hr = EnumerateDeviceCombos( pFactory, pAdapterInfo ) ) )
+        if( FAILED( hr = EnumerateDeviceCombos( pAdapterInfo ) ) )
         {
             delete pAdapterInfo;
             continue;
         }
 
-        hr = m_AdapterInfoList.Add( pAdapterInfo );
-        if( FAILED( hr ) )
-        {
-            delete pAdapterInfo;
-            return hr;
-        }
+        m_AdapterInfoList.push_back( pAdapterInfo );
     }
 
-
     //  If we did not get an adapter then we should still enumerate WARP and Ref.
-    if (m_AdapterInfoList.GetSize() == 0) {
-
-
-        CD3D11EnumAdapterInfo* pAdapterInfo = new CD3D11EnumAdapterInfo;
+    if (m_AdapterInfoList.size() == 0)
+    {
+        auto pAdapterInfo = new (std::nothrow) CD3D11EnumAdapterInfo;
         if( !pAdapterInfo )
         {
             return E_OUTOFMEMORY;
         }
-        ZeroMemory( pAdapterInfo, sizeof( CD3D11EnumAdapterInfo ) );
         pAdapterInfo->bAdapterUnavailable = true;
 
         hr = EnumerateDevices( pAdapterInfo );
@@ -194,7 +189,7 @@ HRESULT CD3D11Enumeration::Enumerate( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE IsD3
             delete pAdapterInfo;
         }
 
-        if (!FAILED(hr)) hr = m_AdapterInfoList.Add( pAdapterInfo );
+        if (SUCCEEDED(hr)) m_AdapterInfoList.push_back( pAdapterInfo );
     }
 
     //
@@ -203,14 +198,13 @@ HRESULT CD3D11Enumeration::Enumerate( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE IsD3
     // them.
     //
     bool bUniqueDesc = true;
-    CD3D11EnumAdapterInfo* pAdapterInfo;
-    for( int i = 0; i < m_AdapterInfoList.GetSize(); i++ )
+    for( size_t i = 0; i < m_AdapterInfoList.size(); i++ )
     {
-        CD3D11EnumAdapterInfo* pAdapterInfo1 = m_AdapterInfoList.GetAt( i );
+        auto pAdapterInfo1 = m_AdapterInfoList[ i ];
 
-        for( int j = i + 1; j < m_AdapterInfoList.GetSize(); j++ )
+        for( size_t j = i + 1; j < m_AdapterInfoList.size(); j++ )
         {
-            CD3D11EnumAdapterInfo* pAdapterInfo2 = m_AdapterInfoList.GetAt( j );
+            auto pAdapterInfo2 = m_AdapterInfoList[ j ];
             if( wcsncmp( pAdapterInfo1->AdapterDesc.Description,
                 pAdapterInfo2->AdapterDesc.Description, DXGI_MAX_DEVICE_IDENTIFIER_STRING ) == 0 )
             {
@@ -223,17 +217,77 @@ HRESULT CD3D11Enumeration::Enumerate( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE IsD3
             break;
     }
 
-    for( int i = 0; i < m_AdapterInfoList.GetSize(); i++ )
+    for( auto it = m_AdapterInfoList.begin(); it != m_AdapterInfoList.end(); ++it )
     {
-        pAdapterInfo = m_AdapterInfoList.GetAt( i );
-
-        wcscpy_s( pAdapterInfo->szUniqueDescription, 100, pAdapterInfo->AdapterDesc.Description );
+        wcscpy_s((*it)->szUniqueDescription, DXGI_MAX_DEVICE_IDENTIFIER_STRING, (*it)->AdapterDesc.Description);
         if( !bUniqueDesc )
         {
-            WCHAR sz[100];
-            swprintf_s( sz, 100, L" (#%d)", pAdapterInfo->AdapterOrdinal );
-            wcscat_s( pAdapterInfo->szUniqueDescription, DXGI_MAX_DEVICE_IDENTIFIER_STRING, sz );
+            WCHAR sz[32];
+            swprintf_s( sz, 32, L" (#%u)", (*it)->AdapterOrdinal );
+            wcscat_s( (*it)->szUniqueDescription, DXGI_MAX_DEVICE_IDENTIFIER_STRING, sz );
+        }
+    }
+
+    // Check WARP max feature level
+    {
+        static const D3D_FEATURE_LEVEL fLvlWarp[] =
+        {
+#if defined(USE_DIRECT3D11_3) || defined(USE_DIRECT3D11_4) 
+            D3D_FEATURE_LEVEL_12_1, D3D_FEATURE_LEVEL_12_0,
+#endif
+            D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_1
+        };
+
+        ID3D11Device* pDevice = nullptr;
+        hr = DXUT_Dynamic_D3D11CreateDevice( nullptr, D3D_DRIVER_TYPE_WARP, 0, 0, fLvlWarp, _countof(fLvlWarp),
+                                             D3D11_SDK_VERSION, &pDevice, &m_warpFL, nullptr );
+        if ( hr == E_INVALIDARG )
+        {
+#if defined(USE_DIRECT3D11_3) || defined(USE_DIRECT3D11_4) 
+            // DirectX 11.1 runtime will not recognize FL 12.x, so try without it
+            hr = DXUT_Dynamic_D3D11CreateDevice(nullptr, D3D_DRIVER_TYPE_WARP, 0, 0, &fLvlWarp[2], _countof(fLvlWarp) - 2,
+                                                D3D11_SDK_VERSION, &pDevice, &m_warpFL, nullptr);
+            if (hr == E_INVALIDARG)
+            {
+                // DirectX 11.0 runtime will not recognize FL 11.1+, so try without it
+                hr = DXUT_Dynamic_D3D11CreateDevice(nullptr, D3D_DRIVER_TYPE_WARP, 0, 0, &fLvlWarp[3], _countof(fLvlWarp) - 3,
+                                                    D3D11_SDK_VERSION, &pDevice, &m_warpFL, nullptr);
+            }
+#else
+            // DirectX 11.0 runtime will not recognize FL 11.1, so try without it
+            hr = DXUT_Dynamic_D3D11CreateDevice( nullptr, D3D_DRIVER_TYPE_WARP, 0, 0, &fLvlWarp[1], _countof(fLvlWarp) - 1,
+                                                 D3D11_SDK_VERSION, &pDevice, &m_warpFL, nullptr );
+#endif
+        }
+
+        if ( SUCCEEDED(hr) )
+        {
+            pDevice->Release();
+        }
+        else
+            m_warpFL = D3D_FEATURE_LEVEL_10_1;
+    }
+
+    // Check REF max feature level
+    {
+        static const D3D_FEATURE_LEVEL fLvlRef[] = { D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_1 };
+
+        ID3D11Device* pDevice = nullptr;
+        hr = DXUT_Dynamic_D3D11CreateDevice( nullptr, D3D_DRIVER_TYPE_REFERENCE, 0, 0, fLvlRef, _countof(fLvlRef),
+                                             D3D11_SDK_VERSION, &pDevice, &m_refFL, nullptr );
+        if ( hr == E_INVALIDARG )
+        {
+            // DirectX 11.0 runtime will not recognize FL 11.1, so try without it
+            hr = DXUT_Dynamic_D3D11CreateDevice( nullptr, D3D_DRIVER_TYPE_REFERENCE, 0, 0, &fLvlRef[1], _countof(fLvlRef) - 1,
+                                                 D3D11_SDK_VERSION, &pDevice, &m_refFL, nullptr );
         }
+
+        if ( SUCCEEDED(hr) )
+        {
+            pDevice->Release();
+        }
+        else
+            m_refFL = D3D_FEATURE_LEVEL_11_0;
     }
 
     return S_OK;
@@ -241,14 +295,14 @@ HRESULT CD3D11Enumeration::Enumerate( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE IsD3
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CD3D11Enumeration::EnumerateOutputs( CD3D11EnumAdapterInfo* pAdapterInfo )
+HRESULT CD3D11Enumeration::EnumerateOutputs( _In_ CD3D11EnumAdapterInfo* pAdapterInfo )
 {
     HRESULT hr;
     IDXGIOutput* pOutput;
 
     for( int iOutput = 0; ; ++iOutput )
     {
-        pOutput = NULL;
+        pOutput = nullptr;
         hr = pAdapterInfo->m_pAdapter->EnumOutputs( iOutput, &pOutput );
         if( DXGI_ERROR_NOT_FOUND == hr )
         {
@@ -260,38 +314,32 @@ HRESULT CD3D11Enumeration::EnumerateOutputs( CD3D11EnumAdapterInfo* pAdapterInfo
         }
         else //Success!
         {
-            CD3D11EnumOutputInfo* pOutputInfo = new CD3D11EnumOutputInfo;
+            auto pOutputInfo = new (std::nothrow) CD3D11EnumOutputInfo;
             if( !pOutputInfo )
             {
                 SAFE_RELEASE( pOutput );
                 return E_OUTOFMEMORY;
             }
-            ZeroMemory( pOutputInfo, sizeof( CD3D11EnumOutputInfo ) );
-            pOutput->GetDesc( &pOutputInfo->Desc );
             pOutputInfo->Output = iOutput;
             pOutputInfo->m_pOutput = pOutput;
+            pOutput->GetDesc( &pOutputInfo->Desc );
 
             EnumerateDisplayModes( pOutputInfo );
-            if( pOutputInfo->displayModeList.GetSize() <= 0 )
+            if( pOutputInfo->displayModeList.empty() )
             {
                 // If this output has no valid display mode, do not save it.
                 delete pOutputInfo;
                 continue;
             }
 
-            hr = pAdapterInfo->outputInfoList.Add( pOutputInfo );
-            if( FAILED( hr ) )
-            {
-                delete pOutputInfo;
-                return hr;
-            }
+            pAdapterInfo->outputInfoList.push_back( pOutputInfo );
         }
     }
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CD3D11Enumeration::EnumerateDisplayModes( CD3D11EnumOutputInfo* pOutputInfo )
+HRESULT CD3D11Enumeration::EnumerateDisplayModes( _In_ CD3D11EnumOutputInfo* pOutputInfo )
 {
     HRESULT hr = S_OK;
     DXGI_FORMAT allowedAdapterFormatArray[] =
@@ -323,7 +371,7 @@ HRESULT CD3D11Enumeration::EnumerateDisplayModes( CD3D11EnumOutputInfo* pOutputI
         //			  This is to avoid calling GetDisplayModeList more times than necessary.
         //			  GetDisplayModeList is an expensive call.
         UINT NumModes = 512;
-        DXGI_MODE_DESC* pDesc = new DXGI_MODE_DESC[ NumModes ];
+        auto pDesc = new (std::nothrow) DXGI_MODE_DESC[ NumModes ];
         assert( pDesc );
         if( !pDesc )
             return E_OUTOFMEMORY;
@@ -346,14 +394,14 @@ HRESULT CD3D11Enumeration::EnumerateDisplayModes( CD3D11EnumOutputInfo* pOutputI
             {
                 DEVMODE DevMode;
                 DevMode.dmSize = sizeof( DEVMODE );
-                if( EnumDisplaySettings( NULL, ENUM_CURRENT_SETTINGS, &DevMode ) )
+                if( EnumDisplaySettings( nullptr, ENUM_CURRENT_SETTINGS, &DevMode ) )
                 {
                     NumModes = 1;
                     pDesc[0].Width = DevMode.dmPelsWidth;
                     pDesc[0].Height = DevMode.dmPelsHeight;
                     pDesc[0].Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-                    pDesc[0].RefreshRate.Numerator = 60;
-                    pDesc[0].RefreshRate.Denominator = 1;
+                    pDesc[0].RefreshRate.Numerator = 0;
+                    pDesc[0].RefreshRate.Denominator = 0;
                     pDesc[0].ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE;
                     pDesc[0].Scaling = DXGI_MODE_SCALING_CENTERED;
                     hr = S_OK;
@@ -367,14 +415,14 @@ HRESULT CD3D11Enumeration::EnumerateDisplayModes( CD3D11EnumOutputInfo* pOutputI
             hr = pOutputInfo->m_pOutput->GetDisplayModeList( allowedAdapterFormatArray[f],
                                                              DXGI_ENUM_MODES_SCALING,
                                                              &NumModes,
-                                                             NULL );
+                                                             nullptr );
             if( FAILED( hr ) )
             {
                 NumModes = 0;
                 break;
             }
 
-            pDesc = new DXGI_MODE_DESC[ NumModes ];
+            pDesc = new (std::nothrow) DXGI_MODE_DESC[ NumModes ];
             assert( pDesc );
             if( !pDesc )
                 return E_OUTOFMEMORY;
@@ -406,7 +454,8 @@ HRESULT CD3D11Enumeration::EnumerateDisplayModes( CD3D11EnumOutputInfo* pOutputI
         {
             for( UINT m = 0; m < NumModes; m++ )
             {
-                pOutputInfo->displayModeList.Add( pDesc[m] );
+#pragma warning ( suppress : 6385 )
+                pOutputInfo->displayModeList.push_back( pDesc[m] );
             }
         }
 
@@ -418,10 +467,10 @@ HRESULT CD3D11Enumeration::EnumerateDisplayModes( CD3D11EnumOutputInfo* pOutputI
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CD3D11Enumeration::EnumerateDevices( CD3D11EnumAdapterInfo* pAdapterInfo )
+HRESULT CD3D11Enumeration::EnumerateDevices( _In_ CD3D11EnumAdapterInfo* pAdapterInfo )
 {
     HRESULT hr;
-    DXUTDeviceSettings deviceSettings = DXUTGetDeviceSettings();
+    auto deviceSettings = DXUTGetDeviceSettings();
     const D3D_DRIVER_TYPE devTypeArray[] =
     {
         D3D_DRIVER_TYPE_HARDWARE,
@@ -433,33 +482,35 @@ HRESULT CD3D11Enumeration::EnumerateDevices( CD3D11EnumAdapterInfo* pAdapterInfo
     // Enumerate each Direct3D device type
     for( UINT iDeviceType = 0; iDeviceType < devTypeArrayCount; iDeviceType++ )
     {
-        CD3D11EnumDeviceInfo* pDeviceInfo = new CD3D11EnumDeviceInfo;
-        if( pDeviceInfo == NULL )
+        auto pDeviceInfo = new (std::nothrow) CD3D11EnumDeviceInfo;
+        if( !pDeviceInfo )
             return E_OUTOFMEMORY;
 
         // Fill struct w/ AdapterOrdinal and D3D_DRIVER_TYPE
         pDeviceInfo->AdapterOrdinal = pAdapterInfo->AdapterOrdinal;
         pDeviceInfo->DeviceType = devTypeArray[iDeviceType];
 
-        D3D_FEATURE_LEVEL FeatureLevels[] =
+        static const D3D_FEATURE_LEVEL FeatureLevels[] =
         {
-                    D3D_FEATURE_LEVEL_11_0,
-                    D3D_FEATURE_LEVEL_10_1,
-                    D3D_FEATURE_LEVEL_10_0,
-                    D3D_FEATURE_LEVEL_9_3,
-                    D3D_FEATURE_LEVEL_9_2,
-                    D3D_FEATURE_LEVEL_9_1
+#if defined(USE_DIRECT3D11_3) || defined(USE_DIRECT3D11_4) 
+            D3D_FEATURE_LEVEL_12_1,
+            D3D_FEATURE_LEVEL_12_0,
+#endif
+            D3D_FEATURE_LEVEL_11_1,
+            D3D_FEATURE_LEVEL_11_0,
+            D3D_FEATURE_LEVEL_10_1,
+            D3D_FEATURE_LEVEL_10_0,
+            D3D_FEATURE_LEVEL_9_3,
+            D3D_FEATURE_LEVEL_9_2,
+            D3D_FEATURE_LEVEL_9_1
         };
         UINT NumFeatureLevels = ARRAYSIZE( FeatureLevels );
 
         // Call D3D11CreateDevice to ensure that this is a D3D11 device.
-        ID3D11Device* pd3dDevice = NULL;
-        ID3D11DeviceContext* pd3dDeviceContext = NULL;
-        IDXGIAdapter* pAdapter = NULL;
-        //if( devTypeArray[iDeviceType] == D3D_DRIVER_TYPE_HARDWARE )
-        //    pAdapter = pAdapterInfo->m_pAdapter;
-        hr = DXUT_Dynamic_D3D11CreateDevice( pAdapter,
-                                             devTypeArray[iDeviceType],
+        ID3D11Device* pd3dDevice = nullptr;
+        ID3D11DeviceContext* pd3dDeviceContext = nullptr;
+        hr = DXUT_Dynamic_D3D11CreateDevice( (devTypeArray[iDeviceType] == D3D_DRIVER_TYPE_HARDWARE) ? pAdapterInfo->m_pAdapter : nullptr,
+                                             (devTypeArray[iDeviceType] == D3D_DRIVER_TYPE_HARDWARE) ? D3D_DRIVER_TYPE_UNKNOWN : devTypeArray[iDeviceType],
                                              ( HMODULE )0,
                                              0,
                                              FeatureLevels,
@@ -468,163 +519,195 @@ HRESULT CD3D11Enumeration::EnumerateDevices( CD3D11EnumAdapterInfo* pAdapterInfo
                                              &pd3dDevice,
                                              &pDeviceInfo->MaxLevel,
                                              &pd3dDeviceContext );
-        if( FAILED( hr ) || pDeviceInfo->MaxLevel < deviceSettings.MinimumFeatureLevel)
+
+        if ( hr == E_INVALIDARG )
+        {
+#if defined(USE_DIRECT3D11_3) || defined(USE_DIRECT3D11_4) 
+            // DirectX 11.1 runtime will not recognize FL 12.x, so try without it
+            hr = DXUT_Dynamic_D3D11CreateDevice((devTypeArray[iDeviceType] == D3D_DRIVER_TYPE_HARDWARE) ? pAdapterInfo->m_pAdapter : nullptr,
+                                                (devTypeArray[iDeviceType] == D3D_DRIVER_TYPE_HARDWARE) ? D3D_DRIVER_TYPE_UNKNOWN : devTypeArray[iDeviceType],
+                                                (HMODULE)0, 0,
+                                                &FeatureLevels[2], NumFeatureLevels - 2,
+                                                D3D11_SDK_VERSION, &pd3dDevice, &pDeviceInfo->MaxLevel,
+                                                &pd3dDeviceContext);
+
+            if (hr == E_INVALIDARG)
+            {
+                // DirectX 11.0 runtime will not recognize FL 11.1, so try without it
+                hr = DXUT_Dynamic_D3D11CreateDevice((devTypeArray[iDeviceType] == D3D_DRIVER_TYPE_HARDWARE) ? pAdapterInfo->m_pAdapter : nullptr,
+                                                    (devTypeArray[iDeviceType] == D3D_DRIVER_TYPE_HARDWARE) ? D3D_DRIVER_TYPE_UNKNOWN : devTypeArray[iDeviceType],
+                                                    (HMODULE)0, 0,
+                                                    &FeatureLevels[3], NumFeatureLevels - 3,
+                                                    D3D11_SDK_VERSION, &pd3dDevice, &pDeviceInfo->MaxLevel,
+                                                    &pd3dDeviceContext);
+            }
+#else
+            // DirectX 11.0 runtime will not recognize FL 11.1, so try without it
+            hr = DXUT_Dynamic_D3D11CreateDevice( (devTypeArray[iDeviceType] == D3D_DRIVER_TYPE_HARDWARE) ? pAdapterInfo->m_pAdapter : nullptr,
+                                                 (devTypeArray[iDeviceType] == D3D_DRIVER_TYPE_HARDWARE) ? D3D_DRIVER_TYPE_UNKNOWN : devTypeArray[iDeviceType],
+                                                 ( HMODULE )0, 0,
+                                                 &FeatureLevels[1], NumFeatureLevels - 1,
+                                                 D3D11_SDK_VERSION, &pd3dDevice, &pDeviceInfo->MaxLevel,
+                                                 &pd3dDeviceContext );
+#endif
+        }
+
+        if ( FAILED(hr) )
         {
             delete pDeviceInfo;
             continue;
         }
+        else if ( pDeviceInfo->MaxLevel < deviceSettings.MinimumFeatureLevel )
+        {
+            delete pDeviceInfo;
+            SAFE_RELEASE( pd3dDevice );
+            SAFE_RELEASE( pd3dDeviceContext );        
+            continue;
+        }
         
-        if (g_forceFL == 0 || g_forceFL == pDeviceInfo->MaxLevel) { 
+        if (m_forceFL == 0 || m_forceFL == pDeviceInfo->MaxLevel)
+        { 
             pDeviceInfo->SelectedLevel = pDeviceInfo->MaxLevel;
         }
-        else if (g_forceFL > pDeviceInfo->MaxLevel) {
+        else if (m_forceFL > pDeviceInfo->MaxLevel)
+        {
             delete pDeviceInfo;
             SAFE_RELEASE( pd3dDevice );
             SAFE_RELEASE( pd3dDeviceContext );        
             continue;
-        } else {
+        }
+        else
+        {
             // A device was created with a higher feature level that the user-specified feature level.
             SAFE_RELEASE( pd3dDevice );
             SAFE_RELEASE( pd3dDeviceContext );
             D3D_FEATURE_LEVEL rtFL;
-            hr = DXUT_Dynamic_D3D11CreateDevice( pAdapter,
-                                             devTypeArray[iDeviceType],
-                                             ( HMODULE )0,
-                                             0,
-                                             &g_forceFL,
-                                             1,
-                                             D3D11_SDK_VERSION,
-                                             &pd3dDevice,
-                                             &rtFL,
-                                             &pd3dDeviceContext );
-
-            if( !FAILED( hr ) && rtFL == g_forceFL ) {
-                
-                pDeviceInfo->SelectedLevel = g_forceFL;
-            }else {
+            hr = DXUT_Dynamic_D3D11CreateDevice( (devTypeArray[iDeviceType] == D3D_DRIVER_TYPE_HARDWARE) ? pAdapterInfo->m_pAdapter : nullptr,
+                                                 (devTypeArray[iDeviceType] == D3D_DRIVER_TYPE_HARDWARE) ? D3D_DRIVER_TYPE_UNKNOWN : devTypeArray[iDeviceType],
+                                                 ( HMODULE )0,
+                                                 0,
+                                                 &m_forceFL,
+                                                 1,
+                                                 D3D11_SDK_VERSION,
+                                                 &pd3dDevice,
+                                                 &rtFL,
+                                                 &pd3dDeviceContext );
+
+            if( SUCCEEDED( hr ) && rtFL == m_forceFL )
+            {
+                pDeviceInfo->SelectedLevel = m_forceFL;
+            }
+            else
+            {
                 delete pDeviceInfo;
-                SAFE_RELEASE( pd3dDevice );
-                SAFE_RELEASE( pd3dDeviceContext );        
+                if ( SUCCEEDED(hr) )
+                {
+                    SAFE_RELEASE( pd3dDevice );
+                    SAFE_RELEASE( pd3dDeviceContext );
+                }
                 continue;
             }
         }
 
-        IDXGIDevice1* pDXGIDev = NULL;
-        hr = pd3dDevice->QueryInterface( __uuidof( IDXGIDevice1 ), ( LPVOID* )&pDXGIDev );
-        if( SUCCEEDED( hr ) && pDXGIDev )
-        {
-            SAFE_RELEASE( pAdapterInfo->m_pAdapter );
-            pDXGIDev->GetAdapter( &pAdapterInfo->m_pAdapter );
-        }
-        SAFE_RELEASE( pDXGIDev );
-
-
         D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS ho;
-        pd3dDevice->CheckFeatureSupport(D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &ho, sizeof(ho));
+        hr = pd3dDevice->CheckFeatureSupport(D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &ho, sizeof(ho));
+        if ( FAILED(hr) )
+            memset( &ho, 0, sizeof(ho) );
+
         pDeviceInfo->ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x = ho.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x; 
         SAFE_RELEASE( pd3dDeviceContext );             
         SAFE_RELEASE( pd3dDevice );
-        pAdapterInfo->deviceInfoList.Add( pDeviceInfo );
+        pAdapterInfo->deviceInfoList.push_back( pDeviceInfo );
     }
 
     return S_OK;
 }
 
 
-HRESULT CD3D11Enumeration::EnumerateDeviceCombosNoAdapter(  CD3D11EnumAdapterInfo* pAdapterInfo )
+HRESULT CD3D11Enumeration::EnumerateDeviceCombosNoAdapter( _In_ CD3D11EnumAdapterInfo* pAdapterInfo )
 {
     // Iterate through each combination of device driver type, output,
     // adapter format, and backbuffer format to build the adapter's device combo list.
     //
 
-        for( int device = 0; device < pAdapterInfo->deviceInfoList.GetSize(); ++device )
+    for( auto dit = pAdapterInfo->deviceInfoList.cbegin(); dit != pAdapterInfo->deviceInfoList.cend(); ++dit )
+    {
+        DXGI_FORMAT BufferFormatArray[] =
         {
-            CD3D11EnumDeviceInfo* pDeviceInfo = pAdapterInfo->deviceInfoList.GetAt( device );
+            DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,   //This is DXUT's preferred mode
 
-            DXGI_FORMAT BufferFormatArray[] =
-            {
-                DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,   //This is DXUT's preferred mode
-
-                DXGI_FORMAT_R8G8B8A8_UNORM,		
-                DXGI_FORMAT_R16G16B16A16_FLOAT,
-                DXGI_FORMAT_R10G10B10A2_UNORM
-            };
-            const UINT BufferFormatArrayCount = sizeof( BufferFormatArray ) / sizeof
-                ( BufferFormatArray[0] );
-
-            // Swap perferred modes for apps running in linear space
-            if( !DXUTIsInGammaCorrectMode() )
-            {
-                BufferFormatArray[0] = DXGI_FORMAT_R8G8B8A8_UNORM;
-                BufferFormatArray[1] = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
-            }
+            DXGI_FORMAT_R8G8B8A8_UNORM,		
+            DXGI_FORMAT_R16G16B16A16_FLOAT,
+            DXGI_FORMAT_R10G10B10A2_UNORM
+        };
 
-            for( UINT iBufferFormat = 0; iBufferFormat < BufferFormatArrayCount; iBufferFormat++ )
-            {
-                DXGI_FORMAT BufferFormat = BufferFormatArray[iBufferFormat];
+        // Swap perferred modes for apps running in linear space
+        if( !DXUTIsInGammaCorrectMode() )
+        {
+            BufferFormatArray[0] = DXGI_FORMAT_R8G8B8A8_UNORM;
+            BufferFormatArray[1] = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
+        }
 
+        for( UINT iBufferFormat = 0; iBufferFormat < _countof( BufferFormatArray ); iBufferFormat++ )
+        {
+            DXGI_FORMAT BufferFormat = BufferFormatArray[iBufferFormat];
 
+            // determine if there are any modes for this particular format
 
-                    // determine if there are any modes for this particular format
+            // If an application callback function has been provided, make sure this device
+            // is acceptable to the app.
+            if( m_IsD3D11DeviceAcceptableFunc )
+            {
+                if( !m_IsD3D11DeviceAcceptableFunc( pAdapterInfo, 
+                                                    0,
+                                                    *dit, 
+                                                    BufferFormat,
+                                                    TRUE,
+                                                    m_pIsD3D11DeviceAcceptableFuncUserContext ) )
+                    continue;
+            }
 
+            // At this point, we have an adapter/device/backbufferformat/iswindowed
+            // DeviceCombo that is supported by the system. We still 
+            // need to find one or more suitable depth/stencil buffer format,
+            // multisample type, and present interval.
+            CD3D11EnumDeviceSettingsCombo* pDeviceCombo = new (std::nothrow) CD3D11EnumDeviceSettingsCombo;
+            if( !pDeviceCombo )
+                return E_OUTOFMEMORY;
 
-                    // If an application callback function has been provided, make sure this device
-                    // is acceptable to the app.
-                    if( m_IsD3D11DeviceAcceptableFunc != NULL )
-                    {
-                        if( !m_IsD3D11DeviceAcceptableFunc( pAdapterInfo, 
-                                                            0,
-                                                            pDeviceInfo, 
-                                                            BufferFormat,
-                                                            TRUE,
-                                                            m_pIsD3D11DeviceAcceptableFuncUserContext ) )
-                            continue;
-                    }
+            pDeviceCombo->AdapterOrdinal = (*dit)->AdapterOrdinal;
+            pDeviceCombo->DeviceType = (*dit)->DeviceType;
+            pDeviceCombo->BackBufferFormat = BufferFormat;
+            pDeviceCombo->Windowed = TRUE;
+            pDeviceCombo->Output = 0;
+            pDeviceCombo->pAdapterInfo = pAdapterInfo;
+            pDeviceCombo->pDeviceInfo = (*dit);
+            pDeviceCombo->pOutputInfo = nullptr;
 
-                    // At this point, we have an adapter/device/backbufferformat/iswindowed
-                    // DeviceCombo that is supported by the system. We still 
-                    // need to find one or more suitable depth/stencil buffer format,
-                    // multisample type, and present interval.
-                    CD3D11EnumDeviceSettingsCombo* pDeviceCombo = new CD3D11EnumDeviceSettingsCombo;
-                    if( pDeviceCombo == NULL )
-                        return E_OUTOFMEMORY;
+            BuildMultiSampleQualityList( BufferFormat, pDeviceCombo );
 
-                    pDeviceCombo->AdapterOrdinal = pDeviceInfo->AdapterOrdinal;
-                    pDeviceCombo->DeviceType = pDeviceInfo->DeviceType;
-                    pDeviceCombo->BackBufferFormat = BufferFormat;
-                    pDeviceCombo->Windowed = TRUE;
-                    pDeviceCombo->Output = 0;
-                    pDeviceCombo->pAdapterInfo = pAdapterInfo;
-                    pDeviceCombo->pDeviceInfo = pDeviceInfo;
-                    pDeviceCombo->pOutputInfo = NULL;
-
-                    BuildMultiSampleQualityList( BufferFormat, pDeviceCombo );
-
-                    if( FAILED( pAdapterInfo->deviceSettingsComboList.Add( pDeviceCombo ) ) )
-                        delete pDeviceCombo;
-                }
-                    
+            pAdapterInfo->deviceSettingsComboList.push_back( pDeviceCombo );
         }
-
+    }
 
     return S_OK;
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CD3D11Enumeration::EnumerateDeviceCombos( IDXGIFactory1* pFactory, CD3D11EnumAdapterInfo* pAdapterInfo )
+_Use_decl_annotations_
+HRESULT CD3D11Enumeration::EnumerateDeviceCombos( CD3D11EnumAdapterInfo* pAdapterInfo )
 {
     // Iterate through each combination of device driver type, output,
     // adapter format, and backbuffer format to build the adapter's device combo list.
     //
-
-    for( int output = 0; output < pAdapterInfo->outputInfoList.GetSize(); ++output )
+    for( size_t output = 0; output < pAdapterInfo->outputInfoList.size(); ++output )
     {
-        CD3D11EnumOutputInfo* pOutputInfo = pAdapterInfo->outputInfoList.GetAt( output );
+        auto pOutputInfo = pAdapterInfo->outputInfoList[ output ];
 
-        for( int device = 0; device < pAdapterInfo->deviceInfoList.GetSize(); ++device )
+        for( size_t device = 0; device < pAdapterInfo->deviceInfoList.size(); ++device )
         {
-            CD3D11EnumDeviceInfo* pDeviceInfo = pAdapterInfo->deviceInfoList.GetAt( device );
+            auto pDeviceInfo = pAdapterInfo->deviceInfoList[ device ];
 
             DXGI_FORMAT backBufferFormatArray[] =
             {
@@ -634,8 +717,6 @@ HRESULT CD3D11Enumeration::EnumerateDeviceCombos( IDXGIFactory1* pFactory, CD3D1
                 DXGI_FORMAT_R16G16B16A16_FLOAT,
                 DXGI_FORMAT_R10G10B10A2_UNORM
             };
-            const UINT backBufferFormatArrayCount = sizeof( backBufferFormatArray ) / sizeof
-                ( backBufferFormatArray[0] );
 
             // Swap perferred modes for apps running in linear space
             if( !DXUTIsInGammaCorrectMode() )
@@ -644,30 +725,30 @@ HRESULT CD3D11Enumeration::EnumerateDeviceCombos( IDXGIFactory1* pFactory, CD3D1
                 backBufferFormatArray[1] = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
             }
 
-            for( UINT iBackBufferFormat = 0; iBackBufferFormat < backBufferFormatArrayCount; iBackBufferFormat++ )
+            for( UINT iBackBufferFormat = 0; iBackBufferFormat < _countof( backBufferFormatArray ); iBackBufferFormat++ )
             {
                 DXGI_FORMAT backBufferFormat = backBufferFormatArray[iBackBufferFormat];
 
                 for( int nWindowed = 0; nWindowed < 2; nWindowed++ )
                 {
-                    if( !nWindowed && pOutputInfo->displayModeList.GetSize() == 0 )
+                    if( !nWindowed && pOutputInfo->displayModeList.size() == 0 )
                         continue;
 
                     // determine if there are any modes for this particular format
-                    UINT iModes = 0;
-                    for( int i = 0; i < pOutputInfo->displayModeList.GetSize(); i++ )
+                    size_t iModes = 0;
+                    for( size_t i = 0; i < pOutputInfo->displayModeList.size(); i++ )
                     {
-                        if( backBufferFormat == pOutputInfo->displayModeList.GetAt( i ).Format )
-                            iModes ++;
+                        if( backBufferFormat == pOutputInfo->displayModeList[ i ].Format )
+                            ++iModes;
                     }
-                    if( 0 == iModes )
+                    if( !iModes )
                         continue;
 
                     // If an application callback function has been provided, make sure this device
                     // is acceptable to the app.
-                    if( m_IsD3D11DeviceAcceptableFunc != NULL )
+                    if( m_IsD3D11DeviceAcceptableFunc )
                     {
-                        if( !m_IsD3D11DeviceAcceptableFunc( pAdapterInfo, output,
+                        if( !m_IsD3D11DeviceAcceptableFunc( pAdapterInfo, static_cast<UINT>( output ),
                                                             pDeviceInfo, backBufferFormat,
                                                             FALSE != nWindowed,
                                                             m_pIsD3D11DeviceAcceptableFuncUserContext ) )
@@ -678,8 +759,8 @@ HRESULT CD3D11Enumeration::EnumerateDeviceCombos( IDXGIFactory1* pFactory, CD3D1
                     // DeviceCombo that is supported by the system. We still 
                     // need to find one or more suitable depth/stencil buffer format,
                     // multisample type, and present interval.
-                    CD3D11EnumDeviceSettingsCombo* pDeviceCombo = new CD3D11EnumDeviceSettingsCombo;
-                    if( pDeviceCombo == NULL )
+                    auto pDeviceCombo = new (std::nothrow) CD3D11EnumDeviceSettingsCombo;
+                    if( !pDeviceCombo )
                         return E_OUTOFMEMORY;
 
                     pDeviceCombo->AdapterOrdinal = pDeviceInfo->AdapterOrdinal;
@@ -693,8 +774,7 @@ HRESULT CD3D11Enumeration::EnumerateDeviceCombos( IDXGIFactory1* pFactory, CD3D1
 
                     BuildMultiSampleQualityList( backBufferFormat, pDeviceCombo );
 
-                    if( FAILED( pAdapterInfo->deviceSettingsComboList.Add( pDeviceCombo ) ) )
-                        delete pDeviceCombo;
+                    pAdapterInfo->deviceSettingsComboList.push_back( pDeviceCombo );
                 }
             }
         }
@@ -709,47 +789,41 @@ HRESULT CD3D11Enumeration::EnumerateDeviceCombos( IDXGIFactory1* pFactory, CD3D1
 //--------------------------------------------------------------------------------------
 void CD3D11Enumeration::ClearAdapterInfoList()
 {
-    CD3D11EnumAdapterInfo* pAdapterInfo;
-    for( int i = 0; i < m_AdapterInfoList.GetSize(); i++ )
+    for( auto it = m_AdapterInfoList.begin(); it != m_AdapterInfoList.end(); ++it )
     {
-        pAdapterInfo = m_AdapterInfoList.GetAt( i );
+        auto pAdapterInfo = *it;
         delete pAdapterInfo;
     }
-
-    m_AdapterInfoList.RemoveAll();
+    m_AdapterInfoList.clear();
 }
 
 
 //--------------------------------------------------------------------------------------
 void CD3D11Enumeration::ResetPossibleDepthStencilFormats()
 {
-    m_DepthStencilPossibleList.RemoveAll();
-    m_DepthStencilPossibleList.Add( DXGI_FORMAT_D32_FLOAT_S8X24_UINT );
-    m_DepthStencilPossibleList.Add( DXGI_FORMAT_D32_FLOAT );
-    m_DepthStencilPossibleList.Add( DXGI_FORMAT_D24_UNORM_S8_UINT );
-    m_DepthStencilPossibleList.Add( DXGI_FORMAT_D16_UNORM );
+    m_DepthStencilPossibleList.clear();
+    m_DepthStencilPossibleList.push_back( DXGI_FORMAT_D32_FLOAT_S8X24_UINT );
+    m_DepthStencilPossibleList.push_back( DXGI_FORMAT_D32_FLOAT );
+    m_DepthStencilPossibleList.push_back( DXGI_FORMAT_D24_UNORM_S8_UINT );
+    m_DepthStencilPossibleList.push_back( DXGI_FORMAT_D16_UNORM );
 }
 
+
 //--------------------------------------------------------------------------------------
-void CD3D11Enumeration::SetEnumerateAllAdapterFormats( bool bEnumerateAllAdapterFormats )
+void CD3D11Enumeration::SetEnumerateAllAdapterFormats( _In_ bool bEnumerateAllAdapterFormats )
 {
     m_bEnumerateAllAdapterFormats = bEnumerateAllAdapterFormats;
 }
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CD3D11Enumeration::BuildMultiSampleQualityList( DXGI_FORMAT fmt, CD3D11EnumDeviceSettingsCombo* pDeviceCombo )
 {
-    ID3D11Device* pd3dDevice = NULL;
-    ID3D11DeviceContext* pd3dDeviceContext = NULL;
-    IDXGIAdapter* pAdapter = NULL;
+    ID3D11Device* pd3dDevice = nullptr;
+    ID3D11DeviceContext* pd3dDeviceContext = nullptr;
+    IDXGIAdapter* pAdapter = nullptr;
     
-    //if( pDeviceCombo->DeviceType == D3D_DRIVER_TYPE_HARDWARE )
-    //    DXUTGetDXGIFactory()->EnumAdapters( pDeviceCombo->pAdapterInfo->AdapterOrdinal, &pAdapter );
-
-    //DXGI_ADAPTER_DESC dad;
-    //pAdapter->GetDesc(&dad);
-
     D3D_FEATURE_LEVEL *FeatureLevels = &(pDeviceCombo->pDeviceInfo->SelectedLevel);
     D3D_FEATURE_LEVEL returnedFeatureLevel;
 
@@ -781,8 +855,8 @@ void CD3D11Enumeration::BuildMultiSampleQualityList( DXGI_FORMAT fmt, CD3D11Enum
             //the format and sample count combination is not supported for the installed adapter.
 
             if (Quality != 0) {
-                pDeviceCombo->multiSampleCountList.Add( i );
-                pDeviceCombo->multiSampleQualityList.Add( Quality );
+                pDeviceCombo->multiSampleCountList.push_back( i );
+                pDeviceCombo->multiSampleQualityList.push_back( Quality );
             }
         }
     }
@@ -797,84 +871,83 @@ void CD3D11Enumeration::BuildMultiSampleQualityList( DXGI_FORMAT fmt, CD3D11Enum
 // Call GetAdapterInfoList() after Enumerate() to get a STL vector of 
 //       CD3D11EnumAdapterInfo* 
 //--------------------------------------------------------------------------------------
-CGrowableArray <CD3D11EnumAdapterInfo*>* CD3D11Enumeration::GetAdapterInfoList()
+std::vector <CD3D11EnumAdapterInfo*>* CD3D11Enumeration::GetAdapterInfoList()
 {
     return &m_AdapterInfoList;
 }
 
 
 //--------------------------------------------------------------------------------------
-CD3D11EnumAdapterInfo* CD3D11Enumeration::GetAdapterInfo( UINT AdapterOrdinal )
+CD3D11EnumAdapterInfo* CD3D11Enumeration::GetAdapterInfo( _In_ UINT AdapterOrdinal ) const
 {
-    for( int iAdapter = 0; iAdapter < m_AdapterInfoList.GetSize(); iAdapter++ )
+    for( auto it = m_AdapterInfoList.cbegin(); it != m_AdapterInfoList.cend(); ++it )
     {
-        CD3D11EnumAdapterInfo* pAdapterInfo = m_AdapterInfoList.GetAt( iAdapter );
-        if( pAdapterInfo->AdapterOrdinal == AdapterOrdinal )
-            return pAdapterInfo;
+        if( (*it)->AdapterOrdinal == AdapterOrdinal )
+            return *it;
     }
 
-    return NULL;
+    return nullptr;
 }
 
 
 //--------------------------------------------------------------------------------------
-CD3D11EnumDeviceInfo* CD3D11Enumeration::GetDeviceInfo( UINT AdapterOrdinal, D3D_DRIVER_TYPE DeviceType )
+_Use_decl_annotations_
+CD3D11EnumDeviceInfo* CD3D11Enumeration::GetDeviceInfo( UINT AdapterOrdinal, D3D_DRIVER_TYPE DeviceType ) const
 {
-    CD3D11EnumAdapterInfo* pAdapterInfo = GetAdapterInfo( AdapterOrdinal );
+    auto pAdapterInfo = GetAdapterInfo( AdapterOrdinal );
     if( pAdapterInfo )
     {
-        for( int iDeviceInfo = 0; iDeviceInfo < pAdapterInfo->deviceInfoList.GetSize(); iDeviceInfo++ )
+        for( auto it = pAdapterInfo->deviceInfoList.cbegin(); it != pAdapterInfo->deviceInfoList.cend(); ++it )
         {
-            CD3D11EnumDeviceInfo* pDeviceInfo = pAdapterInfo->deviceInfoList.GetAt( iDeviceInfo );
-            if( pDeviceInfo->DeviceType == DeviceType )
-                return pDeviceInfo;
+            if( (*it)->DeviceType == DeviceType )
+                return *it;
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 
 //--------------------------------------------------------------------------------------
-CD3D11EnumOutputInfo* CD3D11Enumeration::GetOutputInfo( UINT AdapterOrdinal, UINT Output )
+_Use_decl_annotations_
+CD3D11EnumOutputInfo* CD3D11Enumeration::GetOutputInfo( UINT AdapterOrdinal, UINT Output ) const
 {
-    CD3D11EnumAdapterInfo* pAdapterInfo = GetAdapterInfo( AdapterOrdinal );
-    if( pAdapterInfo && pAdapterInfo->outputInfoList.GetSize() > int( Output ) )
+    auto pAdapterInfo = GetAdapterInfo( AdapterOrdinal );
+    if( pAdapterInfo && pAdapterInfo->outputInfoList.size() > size_t( Output ) )
     {
-        return pAdapterInfo->outputInfoList.GetAt( Output );
+        return pAdapterInfo->outputInfoList[ Output ];
     }
 
-    return NULL;
+    return nullptr;
 }
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 CD3D11EnumDeviceSettingsCombo* CD3D11Enumeration::GetDeviceSettingsCombo( UINT AdapterOrdinal,
-                                                                          D3D_DRIVER_TYPE DeviceType, UINT Output,
-                                                                          DXGI_FORMAT BackBufferFormat, BOOL Windowed )
+                                                                          DXGI_FORMAT BackBufferFormat, BOOL Windowed ) const
 {
-    CD3D11EnumAdapterInfo* pAdapterInfo = GetAdapterInfo( AdapterOrdinal );
+    auto pAdapterInfo = GetAdapterInfo( AdapterOrdinal );
     if( pAdapterInfo )
     {
-        for( int iDeviceCombo = 0; iDeviceCombo < pAdapterInfo->deviceSettingsComboList.GetSize(); iDeviceCombo++ )
+        for( size_t iDeviceCombo = 0; iDeviceCombo < pAdapterInfo->deviceSettingsComboList.size(); iDeviceCombo++ )
         {
-            CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCombo = pAdapterInfo->deviceSettingsComboList.GetAt(
-                iDeviceCombo );
+            auto pDeviceSettingsCombo = pAdapterInfo->deviceSettingsComboList[ iDeviceCombo ];
             if( pDeviceSettingsCombo->BackBufferFormat == BackBufferFormat &&
                 pDeviceSettingsCombo->Windowed == Windowed )
                 return pDeviceSettingsCombo;
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 
 //--------------------------------------------------------------------------------------
-CD3D11EnumOutputInfo::~CD3D11EnumOutputInfo( void )
+CD3D11EnumOutputInfo::~CD3D11EnumOutputInfo()
 {
     SAFE_RELEASE( m_pOutput );
-    displayModeList.RemoveAll();
+    displayModeList.clear();
 }
 
 
@@ -885,28 +958,28 @@ CD3D11EnumDeviceInfo::~CD3D11EnumDeviceInfo()
 
 
 //--------------------------------------------------------------------------------------
-CD3D11EnumAdapterInfo::~CD3D11EnumAdapterInfo( void )
+CD3D11EnumAdapterInfo::~CD3D11EnumAdapterInfo()
 {
-    for( int i = 0; i < outputInfoList.GetSize(); i++ )
+    for( size_t j = 0; j < outputInfoList.size(); ++j )
     {
-        CD3D11EnumOutputInfo* pOutputInfo = outputInfoList.GetAt( i );
+        auto pOutputInfo = outputInfoList[ j ];
         delete pOutputInfo;
     }
-    outputInfoList.RemoveAll();
+    outputInfoList.clear();
 
-    for( int i = 0; i < deviceInfoList.GetSize(); ++i )
+    for( size_t j = 0; j < deviceInfoList.size(); ++j )
     {
-        CD3D11EnumDeviceInfo* pDeviceInfo = deviceInfoList.GetAt( i );
+        auto pDeviceInfo = deviceInfoList[ j ];
         delete pDeviceInfo;
     }
-    deviceInfoList.RemoveAll();
+    deviceInfoList.clear();
 
-    for( int i = 0; i < deviceSettingsComboList.GetSize(); ++i )
+    for( size_t j = 0; j < deviceSettingsComboList.size(); ++j )
     {
-        CD3D11EnumDeviceSettingsCombo* pDeviceCombo = deviceSettingsComboList.GetAt( i );
+        auto pDeviceCombo = deviceSettingsComboList[ j ];
         delete pDeviceCombo;
     }
-    deviceSettingsComboList.RemoveAll();
+    deviceSettingsComboList.clear();
 
     SAFE_RELEASE( m_pAdapter );
 }
@@ -939,6 +1012,7 @@ UINT WINAPI DXUTGetDXGIColorChannelBits( DXGI_FORMAT fmt )
         case DXGI_FORMAT_R10G10B10A2_TYPELESS:
         case DXGI_FORMAT_R10G10B10A2_UNORM:
         case DXGI_FORMAT_R10G10B10A2_UINT:
+        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
             return 10;
 
         case DXGI_FORMAT_R8G8B8A8_TYPELESS:
@@ -947,12 +1021,21 @@ UINT WINAPI DXUTGetDXGIColorChannelBits( DXGI_FORMAT fmt )
         case DXGI_FORMAT_R8G8B8A8_UINT:
         case DXGI_FORMAT_R8G8B8A8_SNORM:
         case DXGI_FORMAT_R8G8B8A8_SINT:
+        case DXGI_FORMAT_B8G8R8A8_UNORM:
+        case DXGI_FORMAT_B8G8R8X8_UNORM:
+        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
+        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
+        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
+        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
             return 8;
 
         case DXGI_FORMAT_B5G6R5_UNORM:
         case DXGI_FORMAT_B5G5R5A1_UNORM:
             return 5;
 
+        case DXGI_FORMAT_B4G4R4A4_UNORM:
+            return 4;
+
         default:
             return 0;
     }
@@ -962,9 +1045,9 @@ UINT WINAPI DXUTGetDXGIColorChannelBits( DXGI_FORMAT fmt )
 // Returns a ranking number that describes how closely this device 
 // combo matches the optimal combo based on the match options and the optimal device settings
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 float DXUTRankD3D11DeviceCombo( CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCombo,
                                 DXUTD3D11DeviceSettings* pOptimalDeviceSettings,
-                                DXGI_MODE_DESC* pAdapterDisplayMode,
                                 int &bestModeIndex,
                                 int &bestMSAAIndex
                                 )
@@ -981,7 +1064,6 @@ float DXUTRankD3D11DeviceCombo( CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCo
     const float fResolutionWeight       = 1.0f;
     const float fBackBufferFormatWeight = 1.0f;
     const float fMultiSampleWeight      = 1.0f;
-    const float fRefreshRateWeight      = 1.0f;
 
     //---------------------
     // Adapter ordinal
@@ -1005,7 +1087,7 @@ float DXUTRankD3D11DeviceCombo( CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCo
     }
 
     // Slightly prefer HAL 
-    if( pDeviceSettingsCombo->DeviceType == D3DDEVTYPE_HAL )
+    if( pDeviceSettingsCombo->DeviceType == D3D_DRIVER_TYPE_HARDWARE )
         fCurRanking += 0.1f;
 
     //---------------------
@@ -1015,31 +1097,76 @@ float DXUTRankD3D11DeviceCombo( CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCo
         fCurRanking += fWindowWeight;
 
     //---------------------
-    // Resolution
+    // Resolution/Refresh Rate
     //---------------------
-    bool bResolutionFound = false;
-    unsigned int best = 0xffffffff;
     bestModeIndex=0;
-    for( int idm = 0; pDeviceSettingsCombo->pOutputInfo != NULL && idm < pDeviceSettingsCombo->pOutputInfo->displayModeList.GetSize() && !bResolutionFound; idm++ )
+
+    if( pDeviceSettingsCombo->pOutputInfo )
     {
-        DXGI_MODE_DESC displayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList.GetAt( idm );
-        if( displayMode.Width == pOptimalDeviceSettings->sd.BufferDesc.Width &&
-            displayMode.Height == pOptimalDeviceSettings->sd.BufferDesc.Height )
-            bResolutionFound = true;
+        bool bResolutionFound = false;
+        float best = FLT_MAX;
+
+        if ( !pDeviceSettingsCombo->Windowed
+             && !pOptimalDeviceSettings->sd.Windowed
+             && ( pOptimalDeviceSettings->sd.BufferDesc.RefreshRate.Numerator > 0 || pOptimalDeviceSettings->sd.BufferDesc.RefreshRate.Denominator > 0 ) )
+        {
+            // Match both Resolution & Refresh Rate
+            for( size_t idm = 0; idm < pDeviceSettingsCombo->pOutputInfo->displayModeList.size() && !bResolutionFound; idm++ )
+            {
+                auto displayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList[ idm ];
+
+                float refreshDiff = fabs( ( float( displayMode.RefreshRate.Numerator ) / float( displayMode.RefreshRate.Denominator ) ) -
+                                          ( float( pOptimalDeviceSettings->sd.BufferDesc.RefreshRate.Numerator ) / float( pOptimalDeviceSettings->sd.BufferDesc.RefreshRate.Denominator ) ) );
+
+                if( displayMode.Width == pOptimalDeviceSettings->sd.BufferDesc.Width
+                    && displayMode.Height == pOptimalDeviceSettings->sd.BufferDesc.Height
+                    && ( refreshDiff < 0.1f ) )
+                {
+                    bResolutionFound = true;
+                    bestModeIndex = static_cast<int>( idm );
+                    break;
+                }
+
+                float current = refreshDiff
+                                + fabs( float( displayMode.Width ) - float ( pOptimalDeviceSettings->sd.BufferDesc.Width ) ) 
+                                + fabs( float( displayMode.Height ) - float ( pOptimalDeviceSettings->sd.BufferDesc.Height ) );
 
-        unsigned int current = 
-            (UINT) abs ((int)displayMode.Width  - (int)pOptimalDeviceSettings->sd.BufferDesc.Width) + 
-            (UINT) abs ((int)displayMode.Height - (int)pOptimalDeviceSettings->sd.BufferDesc.Height );
+                if( current < best )
+                {
+                    best = current;
+                    bestModeIndex = static_cast<int>( idm );
+                }
+            }
+        }
+        else
+        {
+            // Match just Resolution
+            for( size_t idm = 0; idm < pDeviceSettingsCombo->pOutputInfo->displayModeList.size() && !bResolutionFound; idm++ )
+            {
+                auto displayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList[ idm ];
 
-        if (current < best) {
-            best = current;
-            bestModeIndex= idm;
+                if( displayMode.Width == pOptimalDeviceSettings->sd.BufferDesc.Width
+                    && displayMode.Height == pOptimalDeviceSettings->sd.BufferDesc.Height )
+                {
+                    bResolutionFound = true;
+                    bestModeIndex = static_cast<int>( idm );
+                    break;
+                }
 
+                float current = fabs( float( displayMode.Width ) - float ( pOptimalDeviceSettings->sd.BufferDesc.Width ) ) 
+                                + fabs( float( displayMode.Height ) - float ( pOptimalDeviceSettings->sd.BufferDesc.Height ) );
+
+                if( current < best )
+                {
+                    best = current;
+                    bestModeIndex = static_cast<int>( idm );
+                }
+            }
         }
 
+        if( bResolutionFound )
+            fCurRanking += fResolutionWeight;
     }
-    if( bResolutionFound )
-        fCurRanking += fResolutionWeight;
 
     //---------------------
     // Back buffer format
@@ -1053,7 +1180,7 @@ float DXUTRankD3D11DeviceCombo( CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCo
         int nBitDepthDelta = abs( ( long )DXUTGetDXGIColorChannelBits( pDeviceSettingsCombo->BackBufferFormat ) -
                                   ( long )DXUTGetDXGIColorChannelBits(
                                   pOptimalDeviceSettings->sd.BufferDesc.Format ) );
-        float fScale = __max( 0.9f - ( float )nBitDepthDelta * 0.2f, 0.0f );
+        float fScale = std::max<float>( 0.9f - ( float )nBitDepthDelta * 0.2f, 0.0f );
         fCurRanking += fScale * fBackBufferFormatWeight;
     }
 
@@ -1067,13 +1194,13 @@ float DXUTRankD3D11DeviceCombo( CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCo
     //---------------------
     bool bMultiSampleFound = false;
     bestMSAAIndex = 0;
-    for( int i = 0; i < pDeviceSettingsCombo->multiSampleCountList.GetSize(); i++ )
+    for( size_t i = 0; i < pDeviceSettingsCombo->multiSampleCountList.size(); i++ )
     {
-        UINT Count = pDeviceSettingsCombo->multiSampleCountList.GetAt( i );
+        UINT Count = pDeviceSettingsCombo->multiSampleCountList[ i ];
 
         if( Count == pOptimalDeviceSettings->sd.SampleDesc.Count  )
         {
-            bestMSAAIndex = i;
+            bestMSAAIndex = static_cast<int>( i );
             bMultiSampleFound = true;
             break;
         }
@@ -1096,21 +1223,6 @@ float DXUTRankD3D11DeviceCombo( CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCo
     //---------------------
     // No caps for the present flags
 
-    //---------------------
-    // Refresh rate
-    //---------------------
-    bool bRefreshFound = false;
-    for( int idm = 0; pDeviceSettingsCombo->pOutputInfo != NULL && idm < pDeviceSettingsCombo->pOutputInfo->displayModeList.GetSize(); idm++ )
-    {
-        DXGI_MODE_DESC displayMode = pDeviceSettingsCombo->pOutputInfo->displayModeList.GetAt( idm );
-        if( fabs( float( displayMode.RefreshRate.Numerator ) / displayMode.RefreshRate.Denominator -
-                  float( pOptimalDeviceSettings->sd.BufferDesc.RefreshRate.Numerator ) /
-                  pOptimalDeviceSettings->sd.BufferDesc.RefreshRate.Denominator ) < 0.1f )
-            bRefreshFound = true;
-    }
-    if( bRefreshFound )
-        fCurRanking += fRefreshRateWeight;
-
     //---------------------
     // Present interval
     //---------------------
@@ -1123,32 +1235,38 @@ float DXUTRankD3D11DeviceCombo( CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCo
 //--------------------------------------------------------------------------------------
 // Returns the DXGI_MODE_DESC struct for a given adapter and output 
 //--------------------------------------------------------------------------------------
+#pragma warning ( suppress : 6101 )
+_Use_decl_annotations_
 HRESULT WINAPI DXUTGetD3D11AdapterDisplayMode( UINT AdapterOrdinal, UINT nOutput, DXGI_MODE_DESC* pModeDesc )
 {
     if( !pModeDesc )
         return E_INVALIDARG;
 
-    CD3D11Enumeration* pD3DEnum = DXUTGetD3D11Enumeration();
-    CD3D11EnumOutputInfo* pOutputInfo = pD3DEnum->GetOutputInfo( AdapterOrdinal, nOutput );
+    auto pD3DEnum = DXUTGetD3D11Enumeration();
+    if ( !pD3DEnum )
+        return E_POINTER;
+
+    auto pOutputInfo = pD3DEnum->GetOutputInfo( AdapterOrdinal, nOutput );
     if( pOutputInfo )
     {
-        pModeDesc->Width = 640;
-        pModeDesc->Height = 480;
-        pModeDesc->RefreshRate.Numerator = 60;
-        pModeDesc->RefreshRate.Denominator = 1;
+        pModeDesc->Width = 800;
+        pModeDesc->Height = 600;
+        pModeDesc->RefreshRate.Numerator = 0;
+        pModeDesc->RefreshRate.Denominator = 0;
         pModeDesc->Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
         pModeDesc->Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
         pModeDesc->ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
 
         DXGI_OUTPUT_DESC Desc;
-        pOutputInfo->m_pOutput->GetDesc( &Desc );
+        if ( FAILED(pOutputInfo->m_pOutput->GetDesc(&Desc)))
+            memset( &Desc, 0, sizeof(Desc) );
         pModeDesc->Width = Desc.DesktopCoordinates.right - Desc.DesktopCoordinates.left;
         pModeDesc->Height = Desc.DesktopCoordinates.bottom - Desc.DesktopCoordinates.top;
-    }
 
-    // This should not be required with DXGI 1.1 support for BGRA...
-    if( pModeDesc->Format == DXGI_FORMAT_B8G8R8A8_UNORM )
-        pModeDesc->Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        // This should not be required with DXGI 1.1 support for BGRA...
+        if( pModeDesc->Format == DXGI_FORMAT_B8G8R8A8_UNORM )
+            pModeDesc->Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+    }
 
     return S_OK;
 }
diff --git a/samples/DX_APIUsage/DXUT/Core/DXUTDevice11.h b/samples/DX_APIUsage/DXUT/Core/DXUTDevice11.h
index a76cc69..386b095 100644
--- a/samples/DX_APIUsage/DXUT/Core/DXUTDevice11.h
+++ b/samples/DX_APIUsage/DXUT/Core/DXUTDevice11.h
@@ -4,17 +4,18 @@
 // Enumerates D3D adapters, devices, modes, etc.
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #pragma once
-#ifndef DXUT_DEVICE11_H
-#define DXUT_DEVICE11_H
 
 void DXUTApplyDefaultDeviceSettings(DXUTDeviceSettings *modifySettings);
 
 //--------------------------------------------------------------------------------------
 // Functions to get bit depth from formats
 //--------------------------------------------------------------------------------------
-HRESULT WINAPI DXUTGetD3D11AdapterDisplayMode( UINT AdapterOrdinal, UINT Output, DXGI_MODE_DESC* pModeDesc ); 
+HRESULT WINAPI DXUTGetD3D11AdapterDisplayMode( _In_ UINT AdapterOrdinal, _In_ UINT Output, _Out_ DXGI_MODE_DESC* pModeDesc ); 
 
 
 
@@ -39,8 +40,7 @@ struct CD3D11EnumDeviceSettingsCombo;
 
 
 //--------------------------------------------------------------------------------------
-// Enumerates available Direct3D10 adapters, devices, modes, etc.
-// Use DXUTGetD3D9Enumeration() to access global instance
+// Enumerates available Direct3D11 adapters, devices, modes, etc.
 //--------------------------------------------------------------------------------------
 class CD3D11Enumeration
 {
@@ -49,28 +49,27 @@ public:
     //
     // Use these calls and the IsDeviceAcceptable to control the contents of 
     // the enumeration object, which affects the device selection and the device settings dialog.
-    void SetResolutionMinMax( UINT nMinWidth, UINT nMinHeight, UINT nMaxWidth, UINT nMaxHeight );  
-    void SetRefreshMinMax( UINT nMin, UINT nMax );
-    void SetForceFeatureLevel( D3D_FEATURE_LEVEL forceFL) {
-        g_forceFL = forceFL;
-    };
-    void SetMultisampleQualityMax( UINT nMax );
-    CGrowableArray<D3DFORMAT>* GetPossibleDepthStencilFormatList();
+    void SetResolutionMinMax( _In_ UINT nMinWidth, _In_ UINT nMinHeight, _In_ UINT nMaxWidth, _In_ UINT nMaxHeight );  
+    void SetRefreshMinMax( _In_ UINT nMin, _In_ UINT nMax );
+    void SetForceFeatureLevel( _In_ D3D_FEATURE_LEVEL forceFL) { m_forceFL = forceFL; }
+    void SetMultisampleQualityMax( _In_ UINT nMax );
     void ResetPossibleDepthStencilFormats();
-    void SetEnumerateAllAdapterFormats( bool bEnumerateAllAdapterFormats );
+    void SetEnumerateAllAdapterFormats( _In_ bool bEnumerateAllAdapterFormats );
     
     // Call Enumerate() to enumerate available D3D11 adapters, devices, modes, etc.
     bool HasEnumerated() { return m_bHasEnumerated; }
-    HRESULT Enumerate( LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE IsD3D11DeviceAcceptableFunc,
-                       void* pIsD3D11DeviceAcceptableFuncUserContext );
+    HRESULT Enumerate( _In_ LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE IsD3D11DeviceAcceptableFunc,
+                       _In_opt_ void* pIsD3D11DeviceAcceptableFuncUserContext );
 
     // These should be called after Enumerate() is called
-    CGrowableArray<CD3D11EnumAdapterInfo*>*  GetAdapterInfoList();
-    CD3D11EnumAdapterInfo*                   GetAdapterInfo( UINT AdapterOrdinal );
-    CD3D11EnumDeviceInfo*                    GetDeviceInfo( UINT AdapterOrdinal, D3D_DRIVER_TYPE DeviceType );
-    CD3D11EnumOutputInfo*                    GetOutputInfo( UINT AdapterOrdinal, UINT Output );
-    CD3D11EnumDeviceSettingsCombo*           GetDeviceSettingsCombo( DXUTD3D11DeviceSettings* pDeviceSettings ) { return GetDeviceSettingsCombo( pDeviceSettings->AdapterOrdinal, pDeviceSettings->DriverType, pDeviceSettings->Output, pDeviceSettings->sd.BufferDesc.Format, pDeviceSettings->sd.Windowed ); }
-    CD3D11EnumDeviceSettingsCombo*           GetDeviceSettingsCombo( UINT AdapterOrdinal, D3D_DRIVER_TYPE DeviceType, UINT Output, DXGI_FORMAT BackBufferFormat, BOOL Windowed );
+    std::vector<CD3D11EnumAdapterInfo*>*     GetAdapterInfoList();
+    CD3D11EnumAdapterInfo*                   GetAdapterInfo( _In_ UINT AdapterOrdinal ) const;
+    CD3D11EnumDeviceInfo*                    GetDeviceInfo( _In_ UINT AdapterOrdinal, _In_ D3D_DRIVER_TYPE DeviceType ) const;
+    CD3D11EnumOutputInfo*                    GetOutputInfo( _In_ UINT AdapterOrdinal, _In_ UINT Output ) const;
+    CD3D11EnumDeviceSettingsCombo*           GetDeviceSettingsCombo( _In_ DXUTD3D11DeviceSettings* pDeviceSettings ) const { return GetDeviceSettingsCombo( pDeviceSettings->AdapterOrdinal, pDeviceSettings->sd.BufferDesc.Format, pDeviceSettings->sd.Windowed ); }
+    CD3D11EnumDeviceSettingsCombo*           GetDeviceSettingsCombo( _In_ UINT AdapterOrdinal, _In_ DXGI_FORMAT BackBufferFormat, _In_ BOOL Windowed ) const;
+    D3D_FEATURE_LEVEL                        GetWARPFeaturevel() const { return m_warpFL; }
+    D3D_FEATURE_LEVEL                        GetREFFeaturevel() const { return m_refFL; }
 
     ~CD3D11Enumeration();
 
@@ -84,32 +83,26 @@ private:
     LPDXUTCALLBACKISD3D11DEVICEACCEPTABLE m_IsD3D11DeviceAcceptableFunc;
     void* m_pIsD3D11DeviceAcceptableFuncUserContext;
 
-    CGrowableArray<DXGI_FORMAT> m_DepthStencilPossibleList;
+    std::vector<DXGI_FORMAT> m_DepthStencilPossibleList;
 
-    UINT m_nMinWidth;
-    UINT m_nMaxWidth;
-    UINT m_nMinHeight;
-    UINT m_nMaxHeight;
-    UINT m_nRefreshMin;
-    UINT m_nRefreshMax;
-    UINT m_nMultisampleQualityMax;
     bool m_bEnumerateAllAdapterFormats;
-    D3D_FEATURE_LEVEL g_forceFL;
+    D3D_FEATURE_LEVEL m_forceFL;
+    D3D_FEATURE_LEVEL m_warpFL;
+    D3D_FEATURE_LEVEL m_refFL;
 
-    // Array of CD3D9EnumAdapterInfo* with unique AdapterOrdinals
-    CGrowableArray<CD3D11EnumAdapterInfo*> m_AdapterInfoList;
+    std::vector<CD3D11EnumAdapterInfo*> m_AdapterInfoList;
 
-    HRESULT EnumerateOutputs( CD3D11EnumAdapterInfo *pAdapterInfo );
-    HRESULT EnumerateDevices( CD3D11EnumAdapterInfo *pAdapterInfo );
-    HRESULT EnumerateDeviceCombos( IDXGIFactory1 *pFactory, CD3D11EnumAdapterInfo* pAdapterInfo );
-    HRESULT EnumerateDeviceCombosNoAdapter( CD3D11EnumAdapterInfo* pAdapterInfo );
+    HRESULT EnumerateOutputs( _In_ CD3D11EnumAdapterInfo *pAdapterInfo );
+    HRESULT EnumerateDevices( _In_ CD3D11EnumAdapterInfo *pAdapterInfo );
+    HRESULT EnumerateDeviceCombos(  _In_ CD3D11EnumAdapterInfo* pAdapterInfo );
+    HRESULT EnumerateDeviceCombosNoAdapter( _In_ CD3D11EnumAdapterInfo* pAdapterInfo );
     
-    HRESULT EnumerateDisplayModes( CD3D11EnumOutputInfo *pOutputInfo );
-    void BuildMultiSampleQualityList( DXGI_FORMAT fmt, CD3D11EnumDeviceSettingsCombo* pDeviceCombo );
+    HRESULT EnumerateDisplayModes( _In_ CD3D11EnumOutputInfo *pOutputInfo );
+    void BuildMultiSampleQualityList( _In_ DXGI_FORMAT fmt, _In_ CD3D11EnumDeviceSettingsCombo* pDeviceCombo );
     void ClearAdapterInfoList();
 };
 
-CD3D11Enumeration* WINAPI DXUTGetD3D11Enumeration(bool bForceEnumerate = false, bool EnumerateAllAdapterFormats = false, D3D_FEATURE_LEVEL forceFL = ((D3D_FEATURE_LEVEL )0)  );
+CD3D11Enumeration* WINAPI DXUTGetD3D11Enumeration(_In_ bool bForceEnumerate = false, _In_ bool EnumerateAllAdapterFormats = true, _In_ D3D_FEATURE_LEVEL forceFL = ((D3D_FEATURE_LEVEL )0)  );
 
 
 #define DXGI_MAX_DEVICE_IDENTIFIER_STRING 128
@@ -123,6 +116,14 @@ class CD3D11EnumAdapterInfo
     const CD3D11EnumAdapterInfo &operator = ( const CD3D11EnumAdapterInfo &rhs );
 
 public:
+    CD3D11EnumAdapterInfo() :
+        AdapterOrdinal( 0 ),
+        m_pAdapter( nullptr ),
+        bAdapterUnavailable(false)
+    {
+       *szUniqueDescription = 0;
+       memset( &AdapterDesc, 0, sizeof(AdapterDesc) );
+    }
     ~CD3D11EnumAdapterInfo();
 
     UINT AdapterOrdinal;
@@ -131,11 +132,11 @@ public:
     IDXGIAdapter *m_pAdapter;
     bool bAdapterUnavailable;
 
-    CGrowableArray<CD3D11EnumOutputInfo*> outputInfoList; // Array of CD3D11EnumOutputInfo*
-    CGrowableArray<CD3D11EnumDeviceInfo*> deviceInfoList; // Array of CD3D11EnumDeviceInfo*
+    std::vector<CD3D11EnumOutputInfo*> outputInfoList; // Array of CD3D11EnumOutputInfo*
+    std::vector<CD3D11EnumDeviceInfo*> deviceInfoList; // Array of CD3D11EnumDeviceInfo*
     // List of CD3D11EnumDeviceSettingsCombo* with a unique set 
     // of BackBufferFormat, and Windowed
-    CGrowableArray<CD3D11EnumDeviceSettingsCombo*> deviceSettingsComboList;
+    std::vector<CD3D11EnumDeviceSettingsCombo*> deviceSettingsComboList;
 };
 
 
@@ -144,6 +145,10 @@ class CD3D11EnumOutputInfo
     const CD3D11EnumOutputInfo &operator = ( const CD3D11EnumOutputInfo &rhs );
 
 public:
+    CD3D11EnumOutputInfo() :
+        AdapterOrdinal( 0 ),
+        Output( 0 ),
+        m_pOutput( nullptr ) {}
     ~CD3D11EnumOutputInfo();
 
     UINT AdapterOrdinal;
@@ -151,13 +156,12 @@ public:
     IDXGIOutput* m_pOutput;
     DXGI_OUTPUT_DESC Desc;
 
-    CGrowableArray <DXGI_MODE_DESC> displayModeList; // Array of supported D3DDISPLAYMODEs
+    std::vector <DXGI_MODE_DESC> displayModeList; // Array of supported D3DDISPLAYMODEs
 };
 
 
 //--------------------------------------------------------------------------------------
-// A class describing a Direct3D10 device that contains a 
-//       unique supported driver type
+// A class describing a Direct3D11 device that contains a unique supported driver type
 //--------------------------------------------------------------------------------------
 class CD3D11EnumDeviceInfo
 {
@@ -187,24 +191,16 @@ struct CD3D11EnumDeviceSettingsCombo
     BOOL Windowed;
     UINT Output;
 
-    CGrowableArray <UINT> multiSampleCountList; // List of valid sampling counts (multisampling)
-    CGrowableArray <UINT> multiSampleQualityList; // List of number of quality levels for each multisample count
+    std::vector <UINT> multiSampleCountList; // List of valid sampling counts (multisampling)
+    std::vector <UINT> multiSampleQualityList; // List of number of quality levels for each multisample count
 
     CD3D11EnumAdapterInfo* pAdapterInfo;
     CD3D11EnumDeviceInfo* pDeviceInfo;
     CD3D11EnumOutputInfo* pOutputInfo;
 };
 
-float   DXUTRankD3D11DeviceCombo( CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCombo, 
-                                 DXUTD3D11DeviceSettings* pOptimalDeviceSettings, 
-                                 DXGI_MODE_DESC* pAdapterDisplayMode, 
-                                 int &bestModeIndex,
-                                 int &bestMSAAIndex
+float   DXUTRankD3D11DeviceCombo( _In_ CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCombo, 
+                                  _In_ DXUTD3D11DeviceSettings* pOptimalDeviceSettings, 
+                                  _Out_ int &bestModeIndex,
+                                  _Out_ int &bestMSAAIndex
                                  );
-
-
-
-
-#endif
-
-
diff --git a/samples/DX_APIUsage/DXUT/Core/DXUTmisc.cpp b/samples/DX_APIUsage/DXUT/Core/DXUTmisc.cpp
index bc05d9d..9db95ea 100644
--- a/samples/DX_APIUsage/DXUT/Core/DXUTmisc.cpp
+++ b/samples/DX_APIUsage/DXUT/Core/DXUTmisc.cpp
@@ -3,13 +3,20 @@
 //
 // Shortcut macros and functions for using DX objects
 //
-// Copyright (c) Microsoft Corporation. All rights reserved
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #include "dxut.h"
 #include <xinput.h>
+
+#include "ScreenGrab.h"
+
+#include <sstream>
+
+
 #define DXUT_GAMEPAD_TRIGGER_THRESHOLD      30
-#undef min // use __min instead
-#undef max // use __max instead
 
 CDXUTTimer* WINAPI DXUTGetGlobalTimer()
 {
@@ -30,7 +37,7 @@ CDXUTTimer::CDXUTTimer()
     m_llBaseTime = 0;
 
     // Use QueryPerformanceFrequency to get the frequency of the counter
-    LARGE_INTEGER qwTicksPerSec = { 0 };
+    LARGE_INTEGER qwTicksPerSec = {};
     QueryPerformanceFrequency( &qwTicksPerSec );
     m_llQPFTicksPerSec = qwTicksPerSec.QuadPart;
 }
@@ -52,7 +59,7 @@ void CDXUTTimer::Reset()
 void CDXUTTimer::Start()
 {
     // Get the current time
-    LARGE_INTEGER qwTime = { 0 };
+    LARGE_INTEGER qwTime = {};
     QueryPerformanceCounter( &qwTime );
 
     if( m_bTimerStopped )
@@ -68,7 +75,7 @@ void CDXUTTimer::Stop()
 {
     if( !m_bTimerStopped )
     {
-        LARGE_INTEGER qwTime = { 0 };
+        LARGE_INTEGER qwTime = {};
         QueryPerformanceCounter( &qwTime );
         m_llStopTime = qwTime.QuadPart;
         m_llLastElapsedTime = qwTime.QuadPart;
@@ -85,9 +92,9 @@ void CDXUTTimer::Advance()
 
 
 //--------------------------------------------------------------------------------------
-double CDXUTTimer::GetAbsoluteTime()
+double CDXUTTimer::GetAbsoluteTime() const
 {
-    LARGE_INTEGER qwTime = { 0 };
+    LARGE_INTEGER qwTime = {};
     QueryPerformanceCounter( &qwTime );
 
     double fTime = qwTime.QuadPart / ( double )m_llQPFTicksPerSec;
@@ -97,7 +104,7 @@ double CDXUTTimer::GetAbsoluteTime()
 
 
 //--------------------------------------------------------------------------------------
-double CDXUTTimer::GetTime()
+double CDXUTTimer::GetTime() const
 {
     LARGE_INTEGER qwTime = GetAdjustedCurrentTime();
 
@@ -108,6 +115,7 @@ double CDXUTTimer::GetTime()
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTTimer::GetTimeValues( double* pfTime, double* pfAbsoluteTime, float* pfElapsedTime )
 {
     assert( pfTime && pfAbsoluteTime && pfElapsedTime );
@@ -118,11 +126,11 @@ void CDXUTTimer::GetTimeValues( double* pfTime, double* pfAbsoluteTime, float* p
     m_llLastElapsedTime = qwTime.QuadPart;
 
     // Clamp the timer to non-negative values to ensure the timer is accurate.
-    // fElapsedTime can be outside this range if processor goes into a 
-    // power save mode or we somehow get shuffled to another processor.  
-    // However, the main thread should call SetThreadAffinityMask to ensure that 
-    // we don't get shuffled to another processor.  Other worker threads should NOT call 
-    // SetThreadAffinityMask, but use a shared copy of the timer data gathered from 
+    // fElapsedTime can be outside this range if processor goes into a
+    // power save mode or we somehow get shuffled to another processor.
+    // However, the main thread should call SetThreadAffinityMask to ensure that
+    // we don't get shuffled to another processor.  Other worker threads should NOT call
+    // SetThreadAffinityMask, but use a shared copy of the timer data gathered from
     // the main thread.
     if( fElapsedTime < 0.0f )
         fElapsedTime = 0.0f;
@@ -152,7 +160,7 @@ float CDXUTTimer::GetElapsedTime()
 //--------------------------------------------------------------------------------------
 // If stopped, returns time when stopped otherwise returns current time
 //--------------------------------------------------------------------------------------
-LARGE_INTEGER CDXUTTimer::GetAdjustedCurrentTime()
+LARGE_INTEGER CDXUTTimer::GetAdjustedCurrentTime() const
 {
     LARGE_INTEGER qwTime;
     if( m_llStopTime != 0 )
@@ -163,13 +171,7 @@ LARGE_INTEGER CDXUTTimer::GetAdjustedCurrentTime()
 }
 
 //--------------------------------------------------------------------------------------
-bool CDXUTTimer::IsStopped()
-{
-    return m_bTimerStopped;
-}
-
-//--------------------------------------------------------------------------------------
-// Limit the current thread to one processor (the current one). This ensures that timing code 
+// Limit the current thread to one processor (the current one). This ensures that timing code
 // runs on only one processor, and will not suffer any ill effects from power management.
 // See "Game Timing and Multicore Processors" for more details
 //--------------------------------------------------------------------------------------
@@ -201,331 +203,138 @@ void CDXUTTimer::LimitThreadAffinityToCurrentProc()
 }
 
 
-//--------------------------------------------------------------------------------------
-// Returns the string for the given D3DFORMAT.
-//--------------------------------------------------------------------------------------
-LPCWSTR WINAPI DXUTD3DFormatToString( D3DFORMAT format, bool bWithPrefix )
-{
-    WCHAR* pstr = NULL;
-    switch( format )
-    {
-        case D3DFMT_UNKNOWN:
-            pstr = L"D3DFMT_UNKNOWN"; break;
-        case D3DFMT_R8G8B8:
-            pstr = L"D3DFMT_R8G8B8"; break;
-        case D3DFMT_A8R8G8B8:
-            pstr = L"D3DFMT_A8R8G8B8"; break;
-        case D3DFMT_X8R8G8B8:
-            pstr = L"D3DFMT_X8R8G8B8"; break;
-        case D3DFMT_R5G6B5:
-            pstr = L"D3DFMT_R5G6B5"; break;
-        case D3DFMT_X1R5G5B5:
-            pstr = L"D3DFMT_X1R5G5B5"; break;
-        case D3DFMT_A1R5G5B5:
-            pstr = L"D3DFMT_A1R5G5B5"; break;
-        case D3DFMT_A4R4G4B4:
-            pstr = L"D3DFMT_A4R4G4B4"; break;
-        case D3DFMT_R3G3B2:
-            pstr = L"D3DFMT_R3G3B2"; break;
-        case D3DFMT_A8:
-            pstr = L"D3DFMT_A8"; break;
-        case D3DFMT_A8R3G3B2:
-            pstr = L"D3DFMT_A8R3G3B2"; break;
-        case D3DFMT_X4R4G4B4:
-            pstr = L"D3DFMT_X4R4G4B4"; break;
-        case D3DFMT_A2B10G10R10:
-            pstr = L"D3DFMT_A2B10G10R10"; break;
-        case D3DFMT_A8B8G8R8:
-            pstr = L"D3DFMT_A8B8G8R8"; break;
-        case D3DFMT_X8B8G8R8:
-            pstr = L"D3DFMT_X8B8G8R8"; break;
-        case D3DFMT_G16R16:
-            pstr = L"D3DFMT_G16R16"; break;
-        case D3DFMT_A2R10G10B10:
-            pstr = L"D3DFMT_A2R10G10B10"; break;
-        case D3DFMT_A16B16G16R16:
-            pstr = L"D3DFMT_A16B16G16R16"; break;
-        case D3DFMT_A8P8:
-            pstr = L"D3DFMT_A8P8"; break;
-        case D3DFMT_P8:
-            pstr = L"D3DFMT_P8"; break;
-        case D3DFMT_L8:
-            pstr = L"D3DFMT_L8"; break;
-        case D3DFMT_A8L8:
-            pstr = L"D3DFMT_A8L8"; break;
-        case D3DFMT_A4L4:
-            pstr = L"D3DFMT_A4L4"; break;
-        case D3DFMT_V8U8:
-            pstr = L"D3DFMT_V8U8"; break;
-        case D3DFMT_L6V5U5:
-            pstr = L"D3DFMT_L6V5U5"; break;
-        case D3DFMT_X8L8V8U8:
-            pstr = L"D3DFMT_X8L8V8U8"; break;
-        case D3DFMT_Q8W8V8U8:
-            pstr = L"D3DFMT_Q8W8V8U8"; break;
-        case D3DFMT_V16U16:
-            pstr = L"D3DFMT_V16U16"; break;
-        case D3DFMT_A2W10V10U10:
-            pstr = L"D3DFMT_A2W10V10U10"; break;
-        case D3DFMT_UYVY:
-            pstr = L"D3DFMT_UYVY"; break;
-        case D3DFMT_YUY2:
-            pstr = L"D3DFMT_YUY2"; break;
-        case D3DFMT_DXT1:
-            pstr = L"D3DFMT_DXT1"; break;
-        case D3DFMT_DXT2:
-            pstr = L"D3DFMT_DXT2"; break;
-        case D3DFMT_DXT3:
-            pstr = L"D3DFMT_DXT3"; break;
-        case D3DFMT_DXT4:
-            pstr = L"D3DFMT_DXT4"; break;
-        case D3DFMT_DXT5:
-            pstr = L"D3DFMT_DXT5"; break;
-        case D3DFMT_D16_LOCKABLE:
-            pstr = L"D3DFMT_D16_LOCKABLE"; break;
-        case D3DFMT_D32:
-            pstr = L"D3DFMT_D32"; break;
-        case D3DFMT_D15S1:
-            pstr = L"D3DFMT_D15S1"; break;
-        case D3DFMT_D24S8:
-            pstr = L"D3DFMT_D24S8"; break;
-        case D3DFMT_D24X8:
-            pstr = L"D3DFMT_D24X8"; break;
-        case D3DFMT_D24X4S4:
-            pstr = L"D3DFMT_D24X4S4"; break;
-        case D3DFMT_D16:
-            pstr = L"D3DFMT_D16"; break;
-        case D3DFMT_L16:
-            pstr = L"D3DFMT_L16"; break;
-        case D3DFMT_VERTEXDATA:
-            pstr = L"D3DFMT_VERTEXDATA"; break;
-        case D3DFMT_INDEX16:
-            pstr = L"D3DFMT_INDEX16"; break;
-        case D3DFMT_INDEX32:
-            pstr = L"D3DFMT_INDEX32"; break;
-        case D3DFMT_Q16W16V16U16:
-            pstr = L"D3DFMT_Q16W16V16U16"; break;
-        case D3DFMT_MULTI2_ARGB8:
-            pstr = L"D3DFMT_MULTI2_ARGB8"; break;
-        case D3DFMT_R16F:
-            pstr = L"D3DFMT_R16F"; break;
-        case D3DFMT_G16R16F:
-            pstr = L"D3DFMT_G16R16F"; break;
-        case D3DFMT_A16B16G16R16F:
-            pstr = L"D3DFMT_A16B16G16R16F"; break;
-        case D3DFMT_R32F:
-            pstr = L"D3DFMT_R32F"; break;
-        case D3DFMT_G32R32F:
-            pstr = L"D3DFMT_G32R32F"; break;
-        case D3DFMT_A32B32G32R32F:
-            pstr = L"D3DFMT_A32B32G32R32F"; break;
-        case D3DFMT_CxV8U8:
-            pstr = L"D3DFMT_CxV8U8"; break;
-        default:
-            pstr = L"Unknown format"; break;
-    }
-    if( bWithPrefix || wcsstr( pstr, L"D3DFMT_" ) == NULL )
-        return pstr;
-    else
-        return pstr + lstrlen( L"D3DFMT_" );
-}
-
-
 //--------------------------------------------------------------------------------------
 // Returns the string for the given DXGI_FORMAT.
 //--------------------------------------------------------------------------------------
+#define DXUTDXGIFMTSTR( a ) case a: pstr = L#a; break;
+
+_Use_decl_annotations_
 LPCWSTR WINAPI DXUTDXGIFormatToString( DXGI_FORMAT format, bool bWithPrefix )
 {
-    WCHAR* pstr = NULL;
+    const WCHAR* pstr = nullptr;
     switch( format )
     {
-        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
-            pstr = L"DXGI_FORMAT_R32G32B32A32_TYPELESS"; break;
-        case DXGI_FORMAT_R32G32B32A32_FLOAT:
-            pstr = L"DXGI_FORMAT_R32G32B32A32_FLOAT"; break;
-        case DXGI_FORMAT_R32G32B32A32_UINT:
-            pstr = L"DXGI_FORMAT_R32G32B32A32_UINT"; break;
-        case DXGI_FORMAT_R32G32B32A32_SINT:
-            pstr = L"DXGI_FORMAT_R32G32B32A32_SINT"; break;
-        case DXGI_FORMAT_R32G32B32_TYPELESS:
-            pstr = L"DXGI_FORMAT_R32G32B32_TYPELESS"; break;
-        case DXGI_FORMAT_R32G32B32_FLOAT:
-            pstr = L"DXGI_FORMAT_R32G32B32_FLOAT"; break;
-        case DXGI_FORMAT_R32G32B32_UINT:
-            pstr = L"DXGI_FORMAT_R32G32B32_UINT"; break;
-        case DXGI_FORMAT_R32G32B32_SINT:
-            pstr = L"DXGI_FORMAT_R32G32B32_SINT"; break;
-        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
-            pstr = L"DXGI_FORMAT_R16G16B16A16_TYPELESS"; break;
-        case DXGI_FORMAT_R16G16B16A16_FLOAT:
-            pstr = L"DXGI_FORMAT_R16G16B16A16_FLOAT"; break;
-        case DXGI_FORMAT_R16G16B16A16_UNORM:
-            pstr = L"DXGI_FORMAT_R16G16B16A16_UNORM"; break;
-        case DXGI_FORMAT_R16G16B16A16_UINT:
-            pstr = L"DXGI_FORMAT_R16G16B16A16_UINT"; break;
-        case DXGI_FORMAT_R16G16B16A16_SNORM:
-            pstr = L"DXGI_FORMAT_R16G16B16A16_SNORM"; break;
-        case DXGI_FORMAT_R16G16B16A16_SINT:
-            pstr = L"DXGI_FORMAT_R16G16B16A16_SINT"; break;
-        case DXGI_FORMAT_R32G32_TYPELESS:
-            pstr = L"DXGI_FORMAT_R32G32_TYPELESS"; break;
-        case DXGI_FORMAT_R32G32_FLOAT:
-            pstr = L"DXGI_FORMAT_R32G32_FLOAT"; break;
-        case DXGI_FORMAT_R32G32_UINT:
-            pstr = L"DXGI_FORMAT_R32G32_UINT"; break;
-        case DXGI_FORMAT_R32G32_SINT:
-            pstr = L"DXGI_FORMAT_R32G32_SINT"; break;
-        case DXGI_FORMAT_R32G8X24_TYPELESS:
-            pstr = L"DXGI_FORMAT_R32G8X24_TYPELESS"; break;
-        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
-            pstr = L"DXGI_FORMAT_D32_FLOAT_S8X24_UINT"; break;
-        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
-            pstr = L"DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS"; break;
-        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
-            pstr = L"DXGI_FORMAT_X32_TYPELESS_G8X24_UINT"; break;
-        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
-            pstr = L"DXGI_FORMAT_R10G10B10A2_TYPELESS"; break;
-        case DXGI_FORMAT_R10G10B10A2_UNORM:
-            pstr = L"DXGI_FORMAT_R10G10B10A2_UNORM"; break;
-        case DXGI_FORMAT_R10G10B10A2_UINT:
-            pstr = L"DXGI_FORMAT_R10G10B10A2_UINT"; break;
-        case DXGI_FORMAT_R11G11B10_FLOAT:
-            pstr = L"DXGI_FORMAT_R11G11B10_FLOAT"; break;
-        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
-            pstr = L"DXGI_FORMAT_R8G8B8A8_TYPELESS"; break;
-        case DXGI_FORMAT_R8G8B8A8_UNORM:
-            pstr = L"DXGI_FORMAT_R8G8B8A8_UNORM"; break;
-        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
-            pstr = L"DXGI_FORMAT_R8G8B8A8_UNORM_SRGB"; break;
-        case DXGI_FORMAT_R8G8B8A8_UINT:
-            pstr = L"DXGI_FORMAT_R8G8B8A8_UINT"; break;
-        case DXGI_FORMAT_R8G8B8A8_SNORM:
-            pstr = L"DXGI_FORMAT_R8G8B8A8_SNORM"; break;
-        case DXGI_FORMAT_R8G8B8A8_SINT:
-            pstr = L"DXGI_FORMAT_R8G8B8A8_SINT"; break;
-        case DXGI_FORMAT_R16G16_TYPELESS:
-            pstr = L"DXGI_FORMAT_R16G16_TYPELESS"; break;
-        case DXGI_FORMAT_R16G16_FLOAT:
-            pstr = L"DXGI_FORMAT_R16G16_FLOAT"; break;
-        case DXGI_FORMAT_R16G16_UNORM:
-            pstr = L"DXGI_FORMAT_R16G16_UNORM"; break;
-        case DXGI_FORMAT_R16G16_UINT:
-            pstr = L"DXGI_FORMAT_R16G16_UINT"; break;
-        case DXGI_FORMAT_R16G16_SNORM:
-            pstr = L"DXGI_FORMAT_R16G16_SNORM"; break;
-        case DXGI_FORMAT_R16G16_SINT:
-            pstr = L"DXGI_FORMAT_R16G16_SINT"; break;
-        case DXGI_FORMAT_R32_TYPELESS:
-            pstr = L"DXGI_FORMAT_R32_TYPELESS"; break;
-        case DXGI_FORMAT_D32_FLOAT:
-            pstr = L"DXGI_FORMAT_D32_FLOAT"; break;
-        case DXGI_FORMAT_R32_FLOAT:
-            pstr = L"DXGI_FORMAT_R32_FLOAT"; break;
-        case DXGI_FORMAT_R32_UINT:
-            pstr = L"DXGI_FORMAT_R32_UINT"; break;
-        case DXGI_FORMAT_R32_SINT:
-            pstr = L"DXGI_FORMAT_R32_SINT"; break;
-        case DXGI_FORMAT_R24G8_TYPELESS:
-            pstr = L"DXGI_FORMAT_R24G8_TYPELESS"; break;
-        case DXGI_FORMAT_D24_UNORM_S8_UINT:
-            pstr = L"DXGI_FORMAT_D24_UNORM_S8_UINT"; break;
-        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
-            pstr = L"DXGI_FORMAT_R24_UNORM_X8_TYPELESS"; break;
-        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
-            pstr = L"DXGI_FORMAT_X24_TYPELESS_G8_UINT"; break;
-        case DXGI_FORMAT_R8G8_TYPELESS:
-            pstr = L"DXGI_FORMAT_R8G8_TYPELESS"; break;
-        case DXGI_FORMAT_R8G8_UNORM:
-            pstr = L"DXGI_FORMAT_R8G8_UNORM"; break;
-        case DXGI_FORMAT_R8G8_UINT:
-            pstr = L"DXGI_FORMAT_R8G8_UINT"; break;
-        case DXGI_FORMAT_R8G8_SNORM:
-            pstr = L"DXGI_FORMAT_R8G8_SNORM"; break;
-        case DXGI_FORMAT_R8G8_SINT:
-            pstr = L"DXGI_FORMAT_R8G8_SINT"; break;
-        case DXGI_FORMAT_R16_TYPELESS:
-            pstr = L"DXGI_FORMAT_R16_TYPELESS"; break;
-        case DXGI_FORMAT_R16_FLOAT:
-            pstr = L"DXGI_FORMAT_R16_FLOAT"; break;
-        case DXGI_FORMAT_D16_UNORM:
-            pstr = L"DXGI_FORMAT_D16_UNORM"; break;
-        case DXGI_FORMAT_R16_UNORM:
-            pstr = L"DXGI_FORMAT_R16_UNORM"; break;
-        case DXGI_FORMAT_R16_UINT:
-            pstr = L"DXGI_FORMAT_R16_UINT"; break;
-        case DXGI_FORMAT_R16_SNORM:
-            pstr = L"DXGI_FORMAT_R16_SNORM"; break;
-        case DXGI_FORMAT_R16_SINT:
-            pstr = L"DXGI_FORMAT_R16_SINT"; break;
-        case DXGI_FORMAT_R8_TYPELESS:
-            pstr = L"DXGI_FORMAT_R8_TYPELESS"; break;
-        case DXGI_FORMAT_R8_UNORM:
-            pstr = L"DXGI_FORMAT_R8_UNORM"; break;
-        case DXGI_FORMAT_R8_UINT:
-            pstr = L"DXGI_FORMAT_R8_UINT"; break;
-        case DXGI_FORMAT_R8_SNORM:
-            pstr = L"DXGI_FORMAT_R8_SNORM"; break;
-        case DXGI_FORMAT_R8_SINT:
-            pstr = L"DXGI_FORMAT_R8_SINT"; break;
-        case DXGI_FORMAT_A8_UNORM:
-            pstr = L"DXGI_FORMAT_A8_UNORM"; break;
-        case DXGI_FORMAT_R1_UNORM:
-            pstr = L"DXGI_FORMAT_R1_UNORM"; break;
-        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
-            pstr = L"DXGI_FORMAT_R9G9B9E5_SHAREDEXP"; break;
-        case DXGI_FORMAT_R8G8_B8G8_UNORM:
-            pstr = L"DXGI_FORMAT_R8G8_B8G8_UNORM"; break;
-        case DXGI_FORMAT_G8R8_G8B8_UNORM:
-            pstr = L"DXGI_FORMAT_G8R8_G8B8_UNORM"; break;
-        case DXGI_FORMAT_BC1_TYPELESS:
-            pstr = L"DXGI_FORMAT_BC1_TYPELESS"; break;
-        case DXGI_FORMAT_BC1_UNORM:
-            pstr = L"DXGI_FORMAT_BC1_UNORM"; break;
-        case DXGI_FORMAT_BC1_UNORM_SRGB:
-            pstr = L"DXGI_FORMAT_BC1_UNORM_SRGB"; break;
-        case DXGI_FORMAT_BC2_TYPELESS:
-            pstr = L"DXGI_FORMAT_BC2_TYPELESS"; break;
-        case DXGI_FORMAT_BC2_UNORM:
-            pstr = L"DXGI_FORMAT_BC2_UNORM"; break;
-        case DXGI_FORMAT_BC2_UNORM_SRGB:
-            pstr = L"DXGI_FORMAT_BC2_UNORM_SRGB"; break;
-        case DXGI_FORMAT_BC3_TYPELESS:
-            pstr = L"DXGI_FORMAT_BC3_TYPELESS"; break;
-        case DXGI_FORMAT_BC3_UNORM:
-            pstr = L"DXGI_FORMAT_BC3_UNORM"; break;
-        case DXGI_FORMAT_BC3_UNORM_SRGB:
-            pstr = L"DXGI_FORMAT_BC3_UNORM_SRGB"; break;
-        case DXGI_FORMAT_BC4_TYPELESS:
-            pstr = L"DXGI_FORMAT_BC4_TYPELESS"; break;
-        case DXGI_FORMAT_BC4_UNORM:
-            pstr = L"DXGI_FORMAT_BC4_UNORM"; break;
-        case DXGI_FORMAT_BC4_SNORM:
-            pstr = L"DXGI_FORMAT_BC4_SNORM"; break;
-        case DXGI_FORMAT_BC5_TYPELESS:
-            pstr = L"DXGI_FORMAT_BC5_TYPELESS"; break;
-        case DXGI_FORMAT_BC5_UNORM:
-            pstr = L"DXGI_FORMAT_BC5_UNORM"; break;
-        case DXGI_FORMAT_BC5_SNORM:
-            pstr = L"DXGI_FORMAT_BC5_SNORM"; break;
-        case DXGI_FORMAT_B5G6R5_UNORM:
-            pstr = L"DXGI_FORMAT_B5G6R5_UNORM"; break;
-        case DXGI_FORMAT_B5G5R5A1_UNORM:
-            pstr = L"DXGI_FORMAT_B5G5R5A1_UNORM"; break;
-        case DXGI_FORMAT_B8G8R8A8_UNORM:
-            pstr = L"DXGI_FORMAT_B8G8R8A8_UNORM"; break;
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32B32A32_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32B32A32_FLOAT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32B32A32_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32B32A32_SINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32B32_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32B32_FLOAT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32B32_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32B32_SINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16B16A16_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16B16A16_FLOAT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16B16A16_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16B16A16_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16B16A16_SNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16B16A16_SINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32_FLOAT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G32_SINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32G8X24_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_D32_FLOAT_S8X24_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_X32_TYPELESS_G8X24_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R10G10B10A2_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R10G10B10A2_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R10G10B10A2_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R11G11B10_FLOAT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8B8A8_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8B8A8_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8B8A8_UNORM_SRGB)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8B8A8_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8B8A8_SNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8B8A8_SINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16_FLOAT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16_SNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16G16_SINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_D32_FLOAT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32_FLOAT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R32_SINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R24G8_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_D24_UNORM_S8_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R24_UNORM_X8_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_X24_TYPELESS_G8_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8_SNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8_SINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16_FLOAT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_D16_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16_SNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R16_SINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8_UINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8_SNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8_SINT)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_A8_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R1_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R9G9B9E5_SHAREDEXP)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R8G8_B8G8_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_G8R8_G8B8_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC1_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC1_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC1_UNORM_SRGB)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC2_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC2_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC2_UNORM_SRGB)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC3_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC3_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC3_UNORM_SRGB)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC4_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC4_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC4_SNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC5_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC5_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC5_SNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_B5G6R5_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_B5G5R5A1_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_B8G8R8A8_UNORM)
+
+        // DXGI 1.1
+        DXUTDXGIFMTSTR(DXGI_FORMAT_B8G8R8X8_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_B8G8R8A8_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_B8G8R8X8_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_B8G8R8X8_UNORM_SRGB)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC6H_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC6H_UF16)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC6H_SF16)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC7_TYPELESS)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC7_UNORM)
+        DXUTDXGIFMTSTR(DXGI_FORMAT_BC7_UNORM_SRGB)
+
+        // DXGI 1.2
+        DXUTDXGIFMTSTR(DXGI_FORMAT_B4G4R4A4_UNORM)
+
         default:
             pstr = L"Unknown format"; break;
     }
-    if( bWithPrefix || wcsstr( pstr, L"DXGI_FORMAT_" ) == NULL )
+    if( bWithPrefix || !wcsstr( pstr, L"DXGI_FORMAT_" ) )
         return pstr;
     else
-        return pstr + lstrlen( L"DXGI_FORMAT_" );
+        return pstr + wcslen( L"DXGI_FORMAT_" );
 }
 
+#undef DXUTDXGIFMTSTR
+
 
 //--------------------------------------------------------------------------------------
 // Outputs to the debug stream a formatted Unicode string with a variable-argument list.
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 VOID WINAPI DXUTOutputDebugStringW( LPCWSTR strMsg, ... )
 {
 #if defined(DEBUG) || defined(_DEBUG)
@@ -547,6 +356,7 @@ VOID WINAPI DXUTOutputDebugStringW( LPCWSTR strMsg, ... )
 //--------------------------------------------------------------------------------------
 // Outputs to the debug stream a formatted MBCS string with a variable-argument list.
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 VOID WINAPI DXUTOutputDebugStringA( LPCSTR strMsg, ... )
 {
 #if defined(DEBUG) || defined(_DEBUG)
@@ -566,203 +376,190 @@ VOID WINAPI DXUTOutputDebugStringA( LPCSTR strMsg, ... )
 
 
 //--------------------------------------------------------------------------------------
-// Direct3D9 dynamic linking support -- calls top-level D3D9 APIs with graceful
+// Direct3D dynamic linking support -- calls top-level D3D APIs with graceful
 // failure if APIs are not present.
 //--------------------------------------------------------------------------------------
 
 // Function prototypes
-typedef IDirect3D9* (WINAPI * LPDIRECT3DCREATE9) (UINT);
-typedef INT         (WINAPI * LPD3DPERF_BEGINEVENT)(D3DCOLOR, LPCWSTR);
+typedef INT         (WINAPI * LPD3DPERF_BEGINEVENT)(DWORD, LPCWSTR);
 typedef INT         (WINAPI * LPD3DPERF_ENDEVENT)(void);
-typedef VOID        (WINAPI * LPD3DPERF_SETMARKER)(D3DCOLOR, LPCWSTR);
-typedef VOID        (WINAPI * LPD3DPERF_SETREGION)(D3DCOLOR, LPCWSTR);
+typedef VOID        (WINAPI * LPD3DPERF_SETMARKER)(DWORD, LPCWSTR);
+typedef VOID        (WINAPI * LPD3DPERF_SETREGION)(DWORD, LPCWSTR);
 typedef BOOL        (WINAPI * LPD3DPERF_QUERYREPEATFRAME)(void);
 typedef VOID        (WINAPI * LPD3DPERF_SETOPTIONS)( DWORD dwOptions );
-typedef DWORD       (WINAPI * LPD3DPERF_GETSTATUS)( void );
+typedef DWORD       (WINAPI * LPD3DPERF_GETSTATUS)();
 typedef HRESULT     (WINAPI * LPCREATEDXGIFACTORY)(REFIID, void ** );
-typedef HRESULT     (WINAPI * LPD3D11CREATEDEVICE)( IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT32, D3D_FEATURE_LEVEL*, UINT, UINT32, ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext** );
+typedef HRESULT     (WINAPI * LPDXGIGETDEBUGINTERFACE)(REFIID, void ** );
 
 // Module and function pointers
-static HMODULE                              s_hModD3D9 = NULL;
-static LPDIRECT3DCREATE9                    s_DynamicDirect3DCreate9 = NULL;
-static LPD3DPERF_BEGINEVENT                 s_DynamicD3DPERF_BeginEvent = NULL;
-static LPD3DPERF_ENDEVENT                   s_DynamicD3DPERF_EndEvent = NULL;
-static LPD3DPERF_SETMARKER                  s_DynamicD3DPERF_SetMarker = NULL;
-static LPD3DPERF_SETREGION                  s_DynamicD3DPERF_SetRegion = NULL;
-static LPD3DPERF_QUERYREPEATFRAME           s_DynamicD3DPERF_QueryRepeatFrame = NULL;
-static LPD3DPERF_SETOPTIONS                 s_DynamicD3DPERF_SetOptions = NULL;
-static LPD3DPERF_GETSTATUS                  s_DynamicD3DPERF_GetStatus = NULL;
-static HMODULE                              s_hModDXGI = NULL;
-static LPCREATEDXGIFACTORY                  s_DynamicCreateDXGIFactory = NULL;
-static HMODULE                              s_hModD3D11 = NULL;
-static LPD3D11CREATEDEVICE                  s_DynamicD3D11CreateDevice = NULL;
+static HMODULE                              s_hModD3D9 = nullptr;
+static LPD3DPERF_BEGINEVENT                 s_DynamicD3DPERF_BeginEvent = nullptr;
+static LPD3DPERF_ENDEVENT                   s_DynamicD3DPERF_EndEvent = nullptr;
+static LPD3DPERF_SETMARKER                  s_DynamicD3DPERF_SetMarker = nullptr;
+static LPD3DPERF_SETREGION                  s_DynamicD3DPERF_SetRegion = nullptr;
+static LPD3DPERF_QUERYREPEATFRAME           s_DynamicD3DPERF_QueryRepeatFrame = nullptr;
+static LPD3DPERF_SETOPTIONS                 s_DynamicD3DPERF_SetOptions = nullptr;
+static LPD3DPERF_GETSTATUS                  s_DynamicD3DPERF_GetStatus = nullptr;
+static HMODULE                              s_hModDXGI = nullptr;
+static HMODULE                              s_hModDXGIDebug = nullptr;
+static LPCREATEDXGIFACTORY                  s_DynamicCreateDXGIFactory = nullptr;
+static LPDXGIGETDEBUGINTERFACE              s_DynamicDXGIGetDebugInterface = nullptr;
+static HMODULE                              s_hModD3D11 = nullptr;
+static PFN_D3D11_CREATE_DEVICE              s_DynamicD3D11CreateDevice = nullptr;
 
 // Ensure function pointers are initialized
-static bool DXUT_EnsureD3D9APIs( void )
+static bool DXUT_EnsureD3D9APIs()
 {
     // If the module is non-NULL, this function has already been called.  Note
     // that this doesn't guarantee that all ProcAddresses were found.
-    if( s_hModD3D9 != NULL )
+    if( s_hModD3D9 )
         return true;
 
-    // This may fail if Direct3D 9 isn't installed
-    s_hModD3D9 = LoadLibrary( L"d3d9.dll" );
-    if( s_hModD3D9 != NULL )
+    // This could fail in theory, but not on any modern version of Windows
+    s_hModD3D9 = LoadLibraryEx( L"d3d9.dll", nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
+    if( s_hModD3D9 )
     {
-        s_DynamicDirect3DCreate9 = (LPDIRECT3DCREATE9)GetProcAddress( s_hModD3D9, "Direct3DCreate9" );
-        s_DynamicD3DPERF_BeginEvent = (LPD3DPERF_BEGINEVENT)GetProcAddress( s_hModD3D9, "D3DPERF_BeginEvent" );
-        s_DynamicD3DPERF_EndEvent = (LPD3DPERF_ENDEVENT)GetProcAddress( s_hModD3D9, "D3DPERF_EndEvent" );
-        s_DynamicD3DPERF_SetMarker = (LPD3DPERF_SETMARKER)GetProcAddress( s_hModD3D9, "D3DPERF_SetMarker" );
-        s_DynamicD3DPERF_SetRegion = (LPD3DPERF_SETREGION)GetProcAddress( s_hModD3D9, "D3DPERF_SetRegion" );
-        s_DynamicD3DPERF_QueryRepeatFrame = (LPD3DPERF_QUERYREPEATFRAME)GetProcAddress( s_hModD3D9, "D3DPERF_QueryRepeatFrame" );
-        s_DynamicD3DPERF_SetOptions = (LPD3DPERF_SETOPTIONS)GetProcAddress( s_hModD3D9, "D3DPERF_SetOptions" );
-        s_DynamicD3DPERF_GetStatus = (LPD3DPERF_GETSTATUS)GetProcAddress( s_hModD3D9, "D3DPERF_GetStatus" );
+        // TODO - Use 11.1 perf APIs instead?
+        s_DynamicD3DPERF_BeginEvent = reinterpret_cast<LPD3DPERF_BEGINEVENT>( reinterpret_cast<void*>( GetProcAddress( s_hModD3D9, "D3DPERF_BeginEvent" ) ) );
+        s_DynamicD3DPERF_EndEvent = reinterpret_cast<LPD3DPERF_ENDEVENT>( reinterpret_cast<void*>( GetProcAddress( s_hModD3D9, "D3DPERF_EndEvent" ) ) );
+        s_DynamicD3DPERF_SetMarker = reinterpret_cast<LPD3DPERF_SETMARKER>( reinterpret_cast<void*>( GetProcAddress( s_hModD3D9, "D3DPERF_SetMarker" ) ) );
+        s_DynamicD3DPERF_SetRegion = reinterpret_cast<LPD3DPERF_SETREGION>( reinterpret_cast<void*>( GetProcAddress( s_hModD3D9, "D3DPERF_SetRegion" ) ) );
+        s_DynamicD3DPERF_QueryRepeatFrame = reinterpret_cast<LPD3DPERF_QUERYREPEATFRAME>( reinterpret_cast<void*>( GetProcAddress( s_hModD3D9, "D3DPERF_QueryRepeatFrame" ) ) );
+        s_DynamicD3DPERF_SetOptions = reinterpret_cast<LPD3DPERF_SETOPTIONS>( reinterpret_cast<void*>( GetProcAddress( s_hModD3D9, "D3DPERF_SetOptions" ) ) );
+        s_DynamicD3DPERF_GetStatus = reinterpret_cast<LPD3DPERF_GETSTATUS>( reinterpret_cast<void*>( GetProcAddress( s_hModD3D9, "D3DPERF_GetStatus" ) ) );
     }
 
-    return s_hModD3D9 != NULL;
+    return s_hModD3D9 != nullptr;
 }
 
-bool DXUT_EnsureD3D11APIs( void )
+bool DXUT_EnsureD3D11APIs()
 {
     // If both modules are non-NULL, this function has already been called.  Note
     // that this doesn't guarantee that all ProcAddresses were found.
-    if( s_hModD3D11 != NULL && s_hModDXGI != NULL )
+    if( s_hModD3D11 && s_hModDXGI )
         return true;
 
     // This may fail if Direct3D 11 isn't installed
-    s_hModD3D11 = LoadLibrary( L"d3d11.dll" );
-    if( s_hModD3D11 != NULL )
+    s_hModD3D11 = LoadLibraryEx( L"d3d11.dll", nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
+    if( s_hModD3D11 )
     {
-        s_DynamicD3D11CreateDevice = ( LPD3D11CREATEDEVICE )GetProcAddress( s_hModD3D11, "D3D11CreateDevice" );
+        s_DynamicD3D11CreateDevice = reinterpret_cast<PFN_D3D11_CREATE_DEVICE>( reinterpret_cast<void*>( GetProcAddress( s_hModD3D11, "D3D11CreateDevice" ) ) );
     }
 
     if( !s_DynamicCreateDXGIFactory )
     {
-        s_hModDXGI = LoadLibrary( L"dxgi.dll" );
+        s_hModDXGI = LoadLibraryEx( L"dxgi.dll", nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
         if( s_hModDXGI )
         {
-            s_DynamicCreateDXGIFactory = ( LPCREATEDXGIFACTORY )GetProcAddress( s_hModDXGI, "CreateDXGIFactory1" );
+            s_DynamicCreateDXGIFactory = reinterpret_cast<LPCREATEDXGIFACTORY>( reinterpret_cast<void*>( GetProcAddress( s_hModDXGI, "CreateDXGIFactory1" ) ) );
         }
 
-        return ( s_hModDXGI != NULL ) && ( s_hModD3D11 != NULL );
-    }
+        if ( !s_DynamicDXGIGetDebugInterface )
+        {
+            s_hModDXGIDebug = LoadLibraryEx( L"dxgidebug.dll", nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
+            if ( s_hModDXGIDebug )
+            {
+                s_DynamicDXGIGetDebugInterface = reinterpret_cast<LPDXGIGETDEBUGINTERFACE>( reinterpret_cast<void*>( GetProcAddress( s_hModDXGIDebug, "DXGIGetDebugInterface" ) ) );
+            }
+        }
 
-    return ( s_hModD3D11 != NULL );
-}
+        return ( s_hModDXGI ) && ( s_hModD3D11 );
+    }
 
-IDirect3D9* WINAPI DXUT_Dynamic_Direct3DCreate9( UINT SDKVersion )
-{
-    if( DXUT_EnsureD3D9APIs() && s_DynamicDirect3DCreate9 != NULL )
-        return s_DynamicDirect3DCreate9( SDKVersion );
-    else
-        return NULL;
+    return s_hModD3D11 != nullptr;
 }
 
-int WINAPI DXUT_Dynamic_D3DPERF_BeginEvent( D3DCOLOR col, LPCWSTR wszName )
+int WINAPI DXUT_Dynamic_D3DPERF_BeginEvent( _In_ DWORD col, _In_z_ LPCWSTR wszName )
 {
-    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_BeginEvent != NULL )
+    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_BeginEvent )
         return s_DynamicD3DPERF_BeginEvent( col, wszName );
     else
         return -1;
 }
 
-int WINAPI DXUT_Dynamic_D3DPERF_EndEvent( void )
+int WINAPI DXUT_Dynamic_D3DPERF_EndEvent()
 {
-    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_EndEvent != NULL )
+    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_EndEvent )
         return s_DynamicD3DPERF_EndEvent();
     else
         return -1;
 }
 
-void WINAPI DXUT_Dynamic_D3DPERF_SetMarker( D3DCOLOR col, LPCWSTR wszName )
+void WINAPI DXUT_Dynamic_D3DPERF_SetMarker( _In_ DWORD col, _In_z_ LPCWSTR wszName )
 {
-    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_SetMarker != NULL )
+    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_SetMarker )
         s_DynamicD3DPERF_SetMarker( col, wszName );
 }
 
-void WINAPI DXUT_Dynamic_D3DPERF_SetRegion( D3DCOLOR col, LPCWSTR wszName )
+void WINAPI DXUT_Dynamic_D3DPERF_SetRegion( _In_ DWORD col, _In_z_ LPCWSTR wszName )
 {
-    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_SetRegion != NULL )
+    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_SetRegion )
         s_DynamicD3DPERF_SetRegion( col, wszName );
 }
 
-BOOL WINAPI DXUT_Dynamic_D3DPERF_QueryRepeatFrame( void )
+BOOL WINAPI DXUT_Dynamic_D3DPERF_QueryRepeatFrame()
 {
-    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_QueryRepeatFrame != NULL )
+    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_QueryRepeatFrame )
         return s_DynamicD3DPERF_QueryRepeatFrame();
     else
         return FALSE;
 }
 
-void WINAPI DXUT_Dynamic_D3DPERF_SetOptions( DWORD dwOptions )
+void WINAPI DXUT_Dynamic_D3DPERF_SetOptions( _In_ DWORD dwOptions )
 {
-    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_SetOptions != NULL )
+    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_SetOptions )
         s_DynamicD3DPERF_SetOptions( dwOptions );
 }
 
-DWORD WINAPI DXUT_Dynamic_D3DPERF_GetStatus( void )
+DWORD WINAPI DXUT_Dynamic_D3DPERF_GetStatus()
 {
-    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_GetStatus != NULL )
+    if( DXUT_EnsureD3D9APIs() && s_DynamicD3DPERF_GetStatus )
         return s_DynamicD3DPERF_GetStatus();
     else
         return 0;
 }
 
+_Use_decl_annotations_
 HRESULT WINAPI DXUT_Dynamic_CreateDXGIFactory1( REFIID rInterface, void** ppOut )
 {
-    if( DXUT_EnsureD3D11APIs() && s_DynamicCreateDXGIFactory != NULL )
+    if( DXUT_EnsureD3D11APIs() && s_DynamicCreateDXGIFactory )
         return s_DynamicCreateDXGIFactory( rInterface, ppOut );
     else
-        return DXUTERR_NODIRECT3D11;
+        return DXUTERR_NODIRECT3D;
 }
 
+_Use_decl_annotations_
+HRESULT WINAPI DXUT_Dynamic_DXGIGetDebugInterface( REFIID rInterface, void** ppOut )
+{
+    if( DXUT_EnsureD3D11APIs() && s_DynamicDXGIGetDebugInterface )
+        return s_DynamicDXGIGetDebugInterface( rInterface, ppOut );
+    else
+        return E_NOTIMPL;
+}
 
-
+_Use_decl_annotations_
 HRESULT WINAPI DXUT_Dynamic_D3D11CreateDevice( IDXGIAdapter* pAdapter,
                                                D3D_DRIVER_TYPE DriverType,
                                                HMODULE Software,
                                                UINT32 Flags,
-                                               D3D_FEATURE_LEVEL* pFeatureLevels,
+                                               const D3D_FEATURE_LEVEL* pFeatureLevels,
                                                UINT FeatureLevels,
                                                UINT32 SDKVersion,
                                                ID3D11Device** ppDevice,
                                                D3D_FEATURE_LEVEL* pFeatureLevel,
                                                ID3D11DeviceContext** ppImmediateContext )
 {
-    if( DXUT_EnsureD3D11APIs() && s_DynamicD3D11CreateDevice != NULL )
+    if( DXUT_EnsureD3D11APIs() && s_DynamicD3D11CreateDevice )
         return s_DynamicD3D11CreateDevice( pAdapter, DriverType, Software, Flags, pFeatureLevels, FeatureLevels,
                                            SDKVersion, ppDevice, pFeatureLevel, ppImmediateContext );
     else
-        return DXUTERR_NODIRECT3D11;
-}
-
-//--------------------------------------------------------------------------------------
-// Trace a string description of a decl 
-//--------------------------------------------------------------------------------------
-void WINAPI DXUTTraceDecl( D3DVERTEXELEMENT9 decl[MAX_FVF_DECL_SIZE] )
-{
-    int iDecl = 0;
-    for( iDecl = 0; iDecl < MAX_FVF_DECL_SIZE; iDecl++ )
-    {
-        if( decl[iDecl].Stream == 0xFF )
-            break;
-
-        DXUTOutputDebugString( L"decl[%d]=Stream:%d, Offset:%d, %s, %s, %s, UsageIndex:%d\n", iDecl,
-                               decl[iDecl].Stream,
-                               decl[iDecl].Offset,
-                               DXUTTraceD3DDECLTYPEtoString( decl[iDecl].Type ),
-                               DXUTTraceD3DDECLMETHODtoString( decl[iDecl].Method ),
-                               DXUTTraceD3DDECLUSAGEtoString( decl[iDecl].Usage ),
-                               decl[iDecl].UsageIndex );
-    }
-
-    DXUTOutputDebugString( L"decl[%d]=D3DDECL_END\n", iDecl );
+        return DXUTERR_NODIRECT3D;
 }
 
 #define TRACE_ID(iD) case iD: return L#iD;
 
 //--------------------------------------------------------------------------------------
-WCHAR* WINAPI DXUTTraceWindowsMessage( UINT uMsg )
+const WCHAR* WINAPI DXUTTraceWindowsMessage( _In_ UINT uMsg )
 {
     switch( uMsg )
     {
@@ -986,113 +783,6 @@ WCHAR* WINAPI DXUTTraceWindowsMessage( UINT uMsg )
 }
 
 
-//--------------------------------------------------------------------------------------
-WCHAR* WINAPI DXUTTraceD3DDECLTYPEtoString( BYTE t )
-{
-    switch( t )
-    {
-        case D3DDECLTYPE_FLOAT1:
-            return L"D3DDECLTYPE_FLOAT1";
-        case D3DDECLTYPE_FLOAT2:
-            return L"D3DDECLTYPE_FLOAT2";
-        case D3DDECLTYPE_FLOAT3:
-            return L"D3DDECLTYPE_FLOAT3";
-        case D3DDECLTYPE_FLOAT4:
-            return L"D3DDECLTYPE_FLOAT4";
-        case D3DDECLTYPE_D3DCOLOR:
-            return L"D3DDECLTYPE_D3DCOLOR";
-        case D3DDECLTYPE_UBYTE4:
-            return L"D3DDECLTYPE_UBYTE4";
-        case D3DDECLTYPE_SHORT2:
-            return L"D3DDECLTYPE_SHORT2";
-        case D3DDECLTYPE_SHORT4:
-            return L"D3DDECLTYPE_SHORT4";
-        case D3DDECLTYPE_UBYTE4N:
-            return L"D3DDECLTYPE_UBYTE4N";
-        case D3DDECLTYPE_SHORT2N:
-            return L"D3DDECLTYPE_SHORT2N";
-        case D3DDECLTYPE_SHORT4N:
-            return L"D3DDECLTYPE_SHORT4N";
-        case D3DDECLTYPE_USHORT2N:
-            return L"D3DDECLTYPE_USHORT2N";
-        case D3DDECLTYPE_USHORT4N:
-            return L"D3DDECLTYPE_USHORT4N";
-        case D3DDECLTYPE_UDEC3:
-            return L"D3DDECLTYPE_UDEC3";
-        case D3DDECLTYPE_DEC3N:
-            return L"D3DDECLTYPE_DEC3N";
-        case D3DDECLTYPE_FLOAT16_2:
-            return L"D3DDECLTYPE_FLOAT16_2";
-        case D3DDECLTYPE_FLOAT16_4:
-            return L"D3DDECLTYPE_FLOAT16_4";
-        case D3DDECLTYPE_UNUSED:
-            return L"D3DDECLTYPE_UNUSED";
-        default:
-            return L"D3DDECLTYPE Unknown";
-    }
-}
-
-WCHAR* WINAPI DXUTTraceD3DDECLMETHODtoString( BYTE m )
-{
-    switch( m )
-    {
-        case D3DDECLMETHOD_DEFAULT:
-            return L"D3DDECLMETHOD_DEFAULT";
-        case D3DDECLMETHOD_PARTIALU:
-            return L"D3DDECLMETHOD_PARTIALU";
-        case D3DDECLMETHOD_PARTIALV:
-            return L"D3DDECLMETHOD_PARTIALV";
-        case D3DDECLMETHOD_CROSSUV:
-            return L"D3DDECLMETHOD_CROSSUV";
-        case D3DDECLMETHOD_UV:
-            return L"D3DDECLMETHOD_UV";
-        case D3DDECLMETHOD_LOOKUP:
-            return L"D3DDECLMETHOD_LOOKUP";
-        case D3DDECLMETHOD_LOOKUPPRESAMPLED:
-            return L"D3DDECLMETHOD_LOOKUPPRESAMPLED";
-        default:
-            return L"D3DDECLMETHOD Unknown";
-    }
-}
-
-WCHAR* WINAPI DXUTTraceD3DDECLUSAGEtoString( BYTE u )
-{
-    switch( u )
-    {
-        case D3DDECLUSAGE_POSITION:
-            return L"D3DDECLUSAGE_POSITION";
-        case D3DDECLUSAGE_BLENDWEIGHT:
-            return L"D3DDECLUSAGE_BLENDWEIGHT";
-        case D3DDECLUSAGE_BLENDINDICES:
-            return L"D3DDECLUSAGE_BLENDINDICES";
-        case D3DDECLUSAGE_NORMAL:
-            return L"D3DDECLUSAGE_NORMAL";
-        case D3DDECLUSAGE_PSIZE:
-            return L"D3DDECLUSAGE_PSIZE";
-        case D3DDECLUSAGE_TEXCOORD:
-            return L"D3DDECLUSAGE_TEXCOORD";
-        case D3DDECLUSAGE_TANGENT:
-            return L"D3DDECLUSAGE_TANGENT";
-        case D3DDECLUSAGE_BINORMAL:
-            return L"D3DDECLUSAGE_BINORMAL";
-        case D3DDECLUSAGE_TESSFACTOR:
-            return L"D3DDECLUSAGE_TESSFACTOR";
-        case D3DDECLUSAGE_POSITIONT:
-            return L"D3DDECLUSAGE_POSITIONT";
-        case D3DDECLUSAGE_COLOR:
-            return L"D3DDECLUSAGE_COLOR";
-        case D3DDECLUSAGE_FOG:
-            return L"D3DDECLUSAGE_FOG";
-        case D3DDECLUSAGE_DEPTH:
-            return L"D3DDECLUSAGE_DEPTH";
-        case D3DDECLUSAGE_SAMPLE:
-            return L"D3DDECLUSAGE_SAMPLE";
-        default:
-            return L"D3DDECLUSAGE Unknown";
-    }
-}
-
-
 //--------------------------------------------------------------------------------------
 // Multimon API handling for OSes with or without multimon API support
 //--------------------------------------------------------------------------------------
@@ -1101,24 +791,19 @@ typedef HMONITOR ( WINAPI* LPMONITORFROMWINDOW )( HWND, DWORD );
 typedef BOOL ( WINAPI* LPGETMONITORINFO )( HMONITOR, LPMONITORINFO );
 typedef HMONITOR ( WINAPI* LPMONITORFROMRECT )( LPCRECT lprcScreenCoords, DWORD dwFlags );
 
+#pragma warning( suppress : 6101 )
+_Use_decl_annotations_
 BOOL WINAPI DXUTGetMonitorInfo( HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo )
 {
     static bool s_bInited = false;
-    static LPGETMONITORINFO s_pFnGetMonitorInfo = NULL;
+    static LPGETMONITORINFO s_pFnGetMonitorInfo = nullptr;
     if( !s_bInited )
     {
         s_bInited = true;
         HMODULE hUser32 = GetModuleHandle( L"USER32" );
         if( hUser32 )
         {
-            OSVERSIONINFOA osvi =
-            {
-                0
-            }; osvi.dwOSVersionInfoSize = sizeof( osvi ); GetVersionExA( ( OSVERSIONINFOA* )&osvi );
-            bool bNT = ( VER_PLATFORM_WIN32_NT == osvi.dwPlatformId );
-            s_pFnGetMonitorInfo = ( LPGETMONITORINFO )( bNT ? GetProcAddress( hUser32,
-                                                                              "GetMonitorInfoW" ) :
-                                                        GetProcAddress( hUser32, "GetMonitorInfoA" ) );
+            s_pFnGetMonitorInfo = reinterpret_cast<LPGETMONITORINFO>( reinterpret_cast<void*>( GetProcAddress( hUser32, "GetMonitorInfoW" ) ) );
         }
     }
 
@@ -1141,16 +826,17 @@ BOOL WINAPI DXUTGetMonitorInfo( HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo )
 }
 
 
+_Use_decl_annotations_
 HMONITOR WINAPI DXUTMonitorFromWindow( HWND hWnd, DWORD dwFlags )
 {
     static bool s_bInited = false;
-    static LPMONITORFROMWINDOW s_pFnGetMonitorFromWindow = NULL;
+    static LPMONITORFROMWINDOW s_pFnGetMonitorFromWindow = nullptr;
     if( !s_bInited )
     {
         s_bInited = true;
         HMODULE hUser32 = GetModuleHandle( L"USER32" );
-        if( hUser32 ) s_pFnGetMonitorFromWindow = ( LPMONITORFROMWINDOW )GetProcAddress( hUser32,
-                                                                                         "MonitorFromWindow" );
+        if( hUser32 ) s_pFnGetMonitorFromWindow = reinterpret_cast<LPMONITORFROMWINDOW>( reinterpret_cast<void*>( GetProcAddress( hUser32,
+                                                                                         "MonitorFromWindow" ) ) );
     }
 
     if( s_pFnGetMonitorFromWindow )
@@ -1160,15 +846,16 @@ HMONITOR WINAPI DXUTMonitorFromWindow( HWND hWnd, DWORD dwFlags )
 }
 
 
+_Use_decl_annotations_
 HMONITOR WINAPI DXUTMonitorFromRect( LPCRECT lprcScreenCoords, DWORD dwFlags )
 {
     static bool s_bInited = false;
-    static LPMONITORFROMRECT s_pFnGetMonitorFromRect = NULL;
+    static LPMONITORFROMRECT s_pFnGetMonitorFromRect = nullptr;
     if( !s_bInited )
     {
         s_bInited = true;
         HMODULE hUser32 = GetModuleHandle( L"USER32" );
-        if( hUser32 ) s_pFnGetMonitorFromRect = ( LPMONITORFROMRECT )GetProcAddress( hUser32, "MonitorFromRect" );
+        if( hUser32 ) s_pFnGetMonitorFromRect = reinterpret_cast<LPMONITORFROMRECT>( reinterpret_cast<void*>( GetProcAddress( hUser32, "MonitorFromRect" ) ) );
     }
 
     if( s_pFnGetMonitorFromRect )
@@ -1179,40 +866,30 @@ HMONITOR WINAPI DXUTMonitorFromRect( LPCRECT lprcScreenCoords, DWORD dwFlags )
 
 
 //--------------------------------------------------------------------------------------
-// Get the desktop resolution of an adapter. This isn't the same as the current resolution 
-// from GetAdapterDisplayMode since the device might be fullscreen 
+// Get the desktop resolution of an adapter. This isn't the same as the current resolution
+// from GetAdapterDisplayMode since the device might be fullscreen
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void WINAPI DXUTGetDesktopResolution( UINT AdapterOrdinal, UINT* pWidth, UINT* pHeight )
 {
-    DXUTDeviceSettings DeviceSettings = DXUTGetDeviceSettings();
+    auto DeviceSettings = DXUTGetDeviceSettings();
 
-    WCHAR strDeviceName[256] = {0};
+    WCHAR strDeviceName[256] = {};
     DEVMODE devMode;
     ZeroMemory( &devMode, sizeof( DEVMODE ) );
     devMode.dmSize = sizeof( DEVMODE );
-    if( DeviceSettings.ver == DXUT_D3D9_DEVICE )
-    {
-        CD3D9Enumeration* pd3dEnum = DXUTGetD3D9Enumeration();
-        assert( pd3dEnum != NULL );
-        CD3D9EnumAdapterInfo* pAdapterInfo = pd3dEnum->GetAdapterInfo( AdapterOrdinal );
-        if( pAdapterInfo )
-        {
-            MultiByteToWideChar( CP_ACP, 0, pAdapterInfo->AdapterIdentifier.DeviceName, -1, strDeviceName, 256 );
-            strDeviceName[255] = 0;
-        }
-    }
-    else
+
+    auto pd3dEnum = DXUTGetD3D11Enumeration();
+    assert( pd3dEnum );
+    _Analysis_assume_( pd3dEnum );
+    auto pOutputInfo = pd3dEnum->GetOutputInfo( AdapterOrdinal, DeviceSettings.d3d11.Output );
+    if( pOutputInfo )
     {
-        CD3D11Enumeration* pd3dEnum = DXUTGetD3D11Enumeration();
-        assert( pd3dEnum != NULL );
-        CD3D11EnumOutputInfo* pOutputInfo = pd3dEnum->GetOutputInfo( AdapterOrdinal, DeviceSettings.d3d11.Output );
-        if( pOutputInfo )
-        {
-            wcscpy_s( strDeviceName, 256, pOutputInfo->Desc.DeviceName );
-        }
+        wcscpy_s( strDeviceName, 256, pOutputInfo->Desc.DeviceName );
     }
 
     EnumDisplaySettings( strDeviceName, ENUM_REGISTRY_SETTINGS, &devMode );
+
     if( pWidth )
         *pWidth = devMode.dmPelsWidth;
     if( pHeight )
@@ -1221,8 +898,9 @@ void WINAPI DXUTGetDesktopResolution( UINT AdapterOrdinal, UINT* pWidth, UINT* p
 
 
 //--------------------------------------------------------------------------------------
-// Display error msg box to help debug 
+// Display error msg box to help debug
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT WINAPI DXUTTrace( const CHAR* strFile, DWORD dwLine, HRESULT hr,
                           const WCHAR* strMsg, bool bPopMsgBox )
 {
@@ -1230,267 +908,17 @@ HRESULT WINAPI DXUTTrace( const CHAR* strFile, DWORD dwLine, HRESULT hr,
     if( bPopMsgBox && bShowMsgBoxOnError == false )
         bPopMsgBox = false;
 
-    return DXTrace( strFile, dwLine, hr, strMsg, bPopMsgBox );
-}
+    std::wstringstream ss;
+    ss << strFile << L" " << dwLine << L" " << hr << L" " << strMsg;
 
+    OutputDebugString(ss.str().c_str());
 
-//--------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------
-void WINAPI DXUTConvertDeviceSettings11to9( DXUTD3D11DeviceSettings* pIn, DXUTD3D9DeviceSettings* pOut )
-{
-    pOut->AdapterOrdinal = pIn->AdapterOrdinal;
-
-    if( pIn->DriverType == D3D_DRIVER_TYPE_HARDWARE )
-        pOut->DeviceType = D3DDEVTYPE_HAL;
-    else if( pIn->DriverType == D3D_DRIVER_TYPE_REFERENCE )
-        pOut->DeviceType = D3DDEVTYPE_REF;
-    else if( pIn->DriverType == D3D_DRIVER_TYPE_NULL )
-        pOut->DeviceType = D3DDEVTYPE_NULLREF;
-
-    pOut->AdapterFormat = ConvertFormatDXGIToD3D9( pIn->sd.BufferDesc.Format );
-    pOut->BehaviorFlags = D3DCREATE_HARDWARE_VERTEXPROCESSING;
-    pOut->pp.BackBufferWidth = pIn->sd.BufferDesc.Width;
-    pOut->pp.BackBufferHeight = pIn->sd.BufferDesc.Height;
-    pOut->pp.BackBufferFormat = ConvertFormatDXGIToD3D9( pIn->sd.BufferDesc.Format );
-    pOut->pp.BackBufferCount = pIn->sd.BufferCount;
-    pOut->pp.MultiSampleType = ( D3DMULTISAMPLE_TYPE )pIn->sd.SampleDesc.Count;
-    pOut->pp.MultiSampleQuality = pIn->sd.SampleDesc.Quality;
-    pOut->pp.SwapEffect = D3DSWAPEFFECT_DISCARD;
-    pOut->pp.hDeviceWindow = pIn->sd.OutputWindow;
-    pOut->pp.Windowed = pIn->sd.Windowed;
-    pOut->pp.EnableAutoDepthStencil = true;
-    pOut->pp.AutoDepthStencilFormat = D3DFMT_D24FS8;
-    pOut->pp.Flags = 0;
-    if( pIn->sd.BufferDesc.RefreshRate.Denominator == 0 )
-        pOut->pp.FullScreen_RefreshRateInHz = 60;
-    else
-        pOut->pp.FullScreen_RefreshRateInHz = pIn->sd.BufferDesc.RefreshRate.Numerator /
-            pIn->sd.BufferDesc.RefreshRate.Denominator;
-
-    switch( pIn->SyncInterval )
-    {
-        case 0:
-            pOut->pp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE; break;
-        case 2:
-            pOut->pp.PresentationInterval = D3DPRESENT_INTERVAL_TWO; break;
-        case 3:
-            pOut->pp.PresentationInterval = D3DPRESENT_INTERVAL_THREE; break;
-        case 4:
-            pOut->pp.PresentationInterval = D3DPRESENT_INTERVAL_FOUR; break;
-
-        case 1:
-        default:
-            pOut->pp.PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT;
-            break;
-    }
-}
-
-
-//--------------------------------------------------------------------------------------
-void WINAPI DXUTConvertDeviceSettings9to11( DXUTD3D9DeviceSettings* pIn, DXUTD3D11DeviceSettings* pOut )
-{
-    pOut->AdapterOrdinal = pIn->AdapterOrdinal;
-
-    if( pIn->DeviceType == D3DDEVTYPE_HAL )
-        pOut->DriverType = D3D_DRIVER_TYPE_HARDWARE;
-    else if( pIn->DeviceType == D3DDEVTYPE_REF )
-        pOut->DriverType = D3D_DRIVER_TYPE_REFERENCE;
-    else if( pIn->DeviceType == D3DDEVTYPE_NULLREF )
-        pOut->DriverType = D3D_DRIVER_TYPE_NULL;
-
-    pOut->Output = 0;
-
-    pOut->sd.BufferDesc.Width = pIn->pp.BackBufferWidth;
-    pOut->sd.BufferDesc.Height = pIn->pp.BackBufferHeight;
-    pOut->sd.BufferDesc.RefreshRate.Numerator = pIn->pp.FullScreen_RefreshRateInHz;
-    pOut->sd.BufferDesc.RefreshRate.Denominator = 1;
-    pOut->sd.BufferDesc.Format = ConvertFormatD3D9ToDXGI( pIn->pp.BackBufferFormat );
-
-    if( pIn->pp.MultiSampleType == D3DMULTISAMPLE_NONMASKABLE )
-    {
-        pOut->sd.SampleDesc.Count = pIn->pp.MultiSampleQuality;
-        pOut->sd.SampleDesc.Quality = 0;
-    }
-    else
-    {
-        pOut->sd.SampleDesc.Count = pIn->pp.MultiSampleType;
-        pOut->sd.SampleDesc.Quality = pIn->pp.MultiSampleQuality;
-    }
-
-    pOut->sd.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
-    pOut->sd.BufferCount = pIn->pp.BackBufferCount;
-    pOut->sd.OutputWindow = pIn->pp.hDeviceWindow;
-    pOut->sd.Windowed = pIn->pp.Windowed;
-
-#if defined(DEBUG) || defined(_DEBUG)
-    pOut->CreateFlags = D3D11_CREATE_DEVICE_DEBUG;
-#else
-    pOut->CreateFlags = 0;
-#endif
-
-    switch( pIn->pp.PresentationInterval )
-    {
-        case D3DPRESENT_INTERVAL_IMMEDIATE:
-            pOut->SyncInterval = 0; break;
-        case D3DPRESENT_INTERVAL_ONE:
-            pOut->SyncInterval = 1; break;
-        case D3DPRESENT_INTERVAL_TWO:
-            pOut->SyncInterval = 2; break;
-        case D3DPRESENT_INTERVAL_THREE:
-            pOut->SyncInterval = 3; break;
-        case D3DPRESENT_INTERVAL_FOUR:
-            pOut->SyncInterval = 4; break;
-
-        case D3DPRESENT_INTERVAL_DEFAULT:
-        default:
-            pOut->SyncInterval = 1;
-            break;
-    }
-
-    pOut->PresentFlags = 0;
-}
-
-
-
-DXGI_FORMAT WINAPI ConvertFormatD3D9ToDXGI( D3DFORMAT fmt )
-{
-    switch( fmt )
+    if (bPopMsgBox)
     {
-        case D3DFMT_UNKNOWN:
-            return DXGI_FORMAT_UNKNOWN;
-        case D3DFMT_R8G8B8:
-        case D3DFMT_A8R8G8B8:
-        case D3DFMT_X8R8G8B8:
-            return DXGI_FORMAT_R8G8B8A8_UNORM;
-        case D3DFMT_R5G6B5:
-            return DXGI_FORMAT_B5G6R5_UNORM;
-        case D3DFMT_X1R5G5B5:
-        case D3DFMT_A1R5G5B5:
-            return DXGI_FORMAT_B5G5R5A1_UNORM;
-        case D3DFMT_A4R4G4B4:
-            return DXGI_FORMAT_R8G8B8A8_UNORM;
-        case D3DFMT_R3G3B2:
-            return DXGI_FORMAT_R8G8B8A8_UNORM;
-        case D3DFMT_A8:
-            return DXGI_FORMAT_A8_UNORM;
-        case D3DFMT_A8R3G3B2:
-            return DXGI_FORMAT_R8G8B8A8_UNORM;
-        case D3DFMT_X4R4G4B4:
-            return DXGI_FORMAT_R8G8B8A8_UNORM;
-        case D3DFMT_A2B10G10R10:
-            return DXGI_FORMAT_R10G10B10A2_UNORM;
-        case D3DFMT_A8B8G8R8:
-        case D3DFMT_X8B8G8R8:
-            return DXGI_FORMAT_B8G8R8A8_UNORM;
-        case D3DFMT_G16R16:
-            return DXGI_FORMAT_R16G16_UNORM;
-        case D3DFMT_A2R10G10B10:
-            return DXGI_FORMAT_R10G10B10A2_UNORM;
-        case D3DFMT_A16B16G16R16:
-            return DXGI_FORMAT_R16G16B16A16_UNORM;
-        case D3DFMT_R16F:
-            return DXGI_FORMAT_R16_FLOAT;
-        case D3DFMT_G16R16F:
-            return DXGI_FORMAT_R16G16_FLOAT;
-        case D3DFMT_A16B16G16R16F:
-            return DXGI_FORMAT_R16G16B16A16_FLOAT;
-        case D3DFMT_R32F:
-            return DXGI_FORMAT_R32_FLOAT;
-        case D3DFMT_G32R32F:
-            return DXGI_FORMAT_R32G32_FLOAT;
-        case D3DFMT_A32B32G32R32F:
-            return DXGI_FORMAT_R32G32B32A32_FLOAT;
+        MessageBox(NULL, ss.str().c_str(), L"Error", MB_OK);
     }
-    return DXGI_FORMAT_UNKNOWN;
-}
-
-
-D3DFORMAT WINAPI ConvertFormatDXGIToD3D9( DXGI_FORMAT fmt )
-{
-    switch( fmt )
-    {
-        case DXGI_FORMAT_UNKNOWN:
-            return D3DFMT_UNKNOWN;
-        case DXGI_FORMAT_R8G8B8A8_UNORM:
-            return D3DFMT_A8R8G8B8;
-        case DXGI_FORMAT_B5G6R5_UNORM:
-            return D3DFMT_R5G6B5;
-        case DXGI_FORMAT_B5G5R5A1_UNORM:
-            return D3DFMT_A1R5G5B5;
-        case DXGI_FORMAT_A8_UNORM:
-            return D3DFMT_A8;
-        case DXGI_FORMAT_R10G10B10A2_UNORM:
-            return D3DFMT_A2B10G10R10;
-        case DXGI_FORMAT_B8G8R8A8_UNORM:
-            return D3DFMT_A8B8G8R8;
-        case DXGI_FORMAT_R16G16_UNORM:
-            return D3DFMT_G16R16;
-        case DXGI_FORMAT_R16G16B16A16_UNORM:
-            return D3DFMT_A16B16G16R16;
-        case DXGI_FORMAT_R16_FLOAT:
-            return D3DFMT_R16F;
-        case DXGI_FORMAT_R16G16_FLOAT:
-            return D3DFMT_G16R16F;
-        case DXGI_FORMAT_R16G16B16A16_FLOAT:
-            return D3DFMT_A16B16G16R16F;
-        case DXGI_FORMAT_R32_FLOAT:
-            return D3DFMT_R32F;
-        case DXGI_FORMAT_R32G32_FLOAT:
-            return D3DFMT_G32R32F;
-        case DXGI_FORMAT_R32G32B32A32_FLOAT:
-            return D3DFMT_A32B32G32R32F;
-    }
-    return D3DFMT_UNKNOWN;
-}
-
-//--------------------------------------------------------------------------------------
-IDirect3DDevice9* WINAPI DXUTCreateRefDevice9( HWND hWnd, bool bNullRef )
-{
-    HRESULT hr;
-    IDirect3D9* pD3D = DXUT_Dynamic_Direct3DCreate9( D3D_SDK_VERSION );
-    if( NULL == pD3D )
-        return NULL;
-
-    D3DDISPLAYMODE Mode;
-    pD3D->GetAdapterDisplayMode( 0, &Mode );
-
-    D3DPRESENT_PARAMETERS pp;
-    ZeroMemory( &pp, sizeof( D3DPRESENT_PARAMETERS ) );
-    pp.BackBufferWidth = 1;
-    pp.BackBufferHeight = 1;
-    pp.BackBufferFormat = Mode.Format;
-    pp.BackBufferCount = 1;
-    pp.SwapEffect = D3DSWAPEFFECT_COPY;
-    pp.Windowed = TRUE;
-    pp.hDeviceWindow = hWnd;
-
-    IDirect3DDevice9* pd3dDevice = NULL;
-    hr = pD3D->CreateDevice( D3DADAPTER_DEFAULT, bNullRef ? D3DDEVTYPE_NULLREF : D3DDEVTYPE_REF,
-                             hWnd, D3DCREATE_HARDWARE_VERTEXPROCESSING, &pp, &pd3dDevice );
-
-    SAFE_RELEASE( pD3D );
-    return pd3dDevice;
-}
 
-
-//--------------------------------------------------------------------------------------
-// Helper function to launch the Media Center UI after the program terminates
-//--------------------------------------------------------------------------------------
-bool DXUTReLaunchMediaCenter()
-{
-    // Get the path to Media Center
-    WCHAR szExpandedPath[MAX_PATH];
-    if( !ExpandEnvironmentStrings( L"%SystemRoot%\\ehome\\ehshell.exe", szExpandedPath, MAX_PATH ) )
-        return false;
-
-    // Skip if ehshell.exe doesn't exist
-    if( GetFileAttributes( szExpandedPath ) == 0xFFFFFFFF )
-        return false;
-
-    // Launch ehshell.exe 
-    INT_PTR result = ( INT_PTR )ShellExecute( NULL, TEXT( "open" ), szExpandedPath, NULL, NULL, SW_SHOWNORMAL );
-    return ( result > 32 );
+    return S_OK;
 }
 
 typedef DWORD ( WINAPI* LPXINPUTGETSTATE )( DWORD dwUserIndex, XINPUT_STATE* pState );
@@ -1502,24 +930,25 @@ typedef void ( WINAPI* LPXINPUTENABLE )( BOOL bEnable );
 //--------------------------------------------------------------------------------------
 // Does extra processing on XInput data to make it slightly more convenient to use
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT DXUTGetGamepadState( DWORD dwPort, DXUT_GAMEPAD* pGamePad, bool bThumbstickDeadZone,
                              bool bSnapThumbstickToCardinals )
 {
-    if( dwPort >= DXUT_MAX_CONTROLLERS || pGamePad == NULL )
+    if( dwPort >= DXUT_MAX_CONTROLLERS || !pGamePad )
         return E_FAIL;
 
-    static LPXINPUTGETSTATE s_pXInputGetState = NULL;
-    static LPXINPUTGETCAPABILITIES s_pXInputGetCapabilities = NULL;
-    if( NULL == s_pXInputGetState || NULL == s_pXInputGetCapabilities )
+    static LPXINPUTGETSTATE s_pXInputGetState = nullptr;
+    static LPXINPUTGETCAPABILITIES s_pXInputGetCapabilities = nullptr;
+    if( !s_pXInputGetState || !s_pXInputGetCapabilities )
     {
-        HINSTANCE hInst = LoadLibrary( XINPUT_DLL );
+        HINSTANCE hInst = LoadLibraryEx( XINPUT_DLL, nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
         if( hInst )
         {
-            s_pXInputGetState = ( LPXINPUTGETSTATE )GetProcAddress( hInst, "XInputGetState" );
-            s_pXInputGetCapabilities = ( LPXINPUTGETCAPABILITIES )GetProcAddress( hInst, "XInputGetCapabilities" );
+            s_pXInputGetState = reinterpret_cast<LPXINPUTGETSTATE>( reinterpret_cast<void*>( GetProcAddress( hInst, "XInputGetState" ) ) );
+            s_pXInputGetCapabilities = reinterpret_cast<LPXINPUTGETCAPABILITIES>( reinterpret_cast<void*>( GetProcAddress( hInst, "XInputGetCapabilities" ) ) );
         }
     }
-    if( s_pXInputGetState == NULL )
+    if( !s_pXInputGetState )
         return E_FAIL;
 
     XINPUT_STATE InputState;
@@ -1591,7 +1020,7 @@ HRESULT DXUTGetGamepadState( DWORD dwPort, DXUT_GAMEPAD* pGamePad, bool bThumbst
     pGamePad->fThumbRX = pGamePad->sThumbRX / 32767.0f;
     pGamePad->fThumbRY = pGamePad->sThumbRY / 32767.0f;
 
-    // Get the boolean buttons that have been pressed since the last call. 
+    // Get the boolean buttons that have been pressed since the last call.
     // Each button is represented by one bit.
     pGamePad->wPressedButtons = ( pGamePad->wLastButtons ^ pGamePad->wButtons ) & pGamePad->wButtons;
     pGamePad->wLastButtons = pGamePad->wButtons;
@@ -1611,17 +1040,17 @@ HRESULT DXUTGetGamepadState( DWORD dwPort, DXUT_GAMEPAD* pGamePad, bool bThumbst
 
 
 //--------------------------------------------------------------------------------------
-// Don't pause the game or deactive the window without first stopping rumble otherwise 
+// Don't pause the game or deactive the window without first stopping rumble otherwise
 // the controller will continue to rumble
 //--------------------------------------------------------------------------------------
-void DXUTEnableXInput( bool bEnable )
+void DXUTEnableXInput( _In_ bool bEnable )
 {
-    static LPXINPUTENABLE s_pXInputEnable = NULL;
-    if( NULL == s_pXInputEnable )
+    static LPXINPUTENABLE s_pXInputEnable = nullptr;
+    if( !s_pXInputEnable )
     {
-        HINSTANCE hInst = LoadLibrary( XINPUT_DLL );
+        HINSTANCE hInst = LoadLibraryEx( XINPUT_DLL, nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
         if( hInst )
-            s_pXInputEnable = ( LPXINPUTENABLE )GetProcAddress( hInst, "XInputEnable" );
+            s_pXInputEnable = reinterpret_cast<LPXINPUTENABLE>( reinterpret_cast<void*>( GetProcAddress( hInst, "XInputEnable" ) ) );
     }
 
     if( s_pXInputEnable )
@@ -1630,19 +1059,19 @@ void DXUTEnableXInput( bool bEnable )
 
 
 //--------------------------------------------------------------------------------------
-// Don't pause the game or deactive the window without first stopping rumble otherwise 
+// Don't pause the game or deactive the window without first stopping rumble otherwise
 // the controller will continue to rumble
 //--------------------------------------------------------------------------------------
 HRESULT DXUTStopRumbleOnAllControllers()
 {
-    static LPXINPUTSETSTATE s_pXInputSetState = NULL;
-    if( NULL == s_pXInputSetState )
+    static LPXINPUTSETSTATE s_pXInputSetState = nullptr;
+    if( !s_pXInputSetState )
     {
-        HINSTANCE hInst = LoadLibrary( XINPUT_DLL );
+        HINSTANCE hInst = LoadLibraryEx( XINPUT_DLL, nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
         if( hInst )
-            s_pXInputSetState = ( LPXINPUTSETSTATE )GetProcAddress( hInst, "XInputSetState" );
+            s_pXInputSetState = reinterpret_cast<LPXINPUTSETSTATE>( reinterpret_cast<void*>( GetProcAddress( hInst, "XInputSetState" ) ) );
     }
-    if( s_pXInputSetState == NULL )
+    if( !s_pXInputSetState )
         return E_FAIL;
 
     XINPUT_VIBRATION vibration;
@@ -1657,7 +1086,7 @@ HRESULT DXUTStopRumbleOnAllControllers()
 //--------------------------------------------------------------------------------------
 // Helper functions to create SRGB formats from typeless formats and vice versa
 //--------------------------------------------------------------------------------------
-DXGI_FORMAT MAKE_SRGB( DXGI_FORMAT format )
+DXGI_FORMAT MAKE_SRGB( _In_ DXGI_FORMAT format )
 {
     if( !DXUTIsInGammaCorrectMode() )
         return format;
@@ -1674,116 +1103,173 @@ DXGI_FORMAT MAKE_SRGB( DXGI_FORMAT format )
         case DXGI_FORMAT_BC1_TYPELESS:
         case DXGI_FORMAT_BC1_UNORM:
             return DXGI_FORMAT_BC1_UNORM_SRGB;
+
         case DXGI_FORMAT_BC2_TYPELESS:
         case DXGI_FORMAT_BC2_UNORM:
             return DXGI_FORMAT_BC2_UNORM_SRGB;
+
         case DXGI_FORMAT_BC3_TYPELESS:
         case DXGI_FORMAT_BC3_UNORM:
             return DXGI_FORMAT_BC3_UNORM_SRGB;
 
+        case DXGI_FORMAT_B8G8R8A8_UNORM:
+        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
+            return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB;
+
+        case DXGI_FORMAT_B8G8R8X8_UNORM:
+        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
+            return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB;
+
+        case DXGI_FORMAT_BC7_TYPELESS:
+        case DXGI_FORMAT_BC7_UNORM:
+            return DXGI_FORMAT_BC7_UNORM_SRGB;
     };
 
     return format;
 }
 
 //--------------------------------------------------------------------------------------
-DXGI_FORMAT MAKE_TYPELESS( DXGI_FORMAT format )
+DXGI_FORMAT MAKE_TYPELESS( _In_ DXGI_FORMAT format )
 {
-    if( !DXUTIsInGammaCorrectMode() )
-        return format;
-
     switch( format )
     {
-        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
-        case DXGI_FORMAT_R8G8B8A8_UNORM:
-        case DXGI_FORMAT_R8G8B8A8_UINT:
-        case DXGI_FORMAT_R8G8B8A8_SNORM:
-        case DXGI_FORMAT_R8G8B8A8_SINT:
-            return DXGI_FORMAT_R8G8B8A8_TYPELESS;
-
-        case DXGI_FORMAT_BC1_UNORM_SRGB:
-        case DXGI_FORMAT_BC1_UNORM:
-            return DXGI_FORMAT_BC1_TYPELESS;
-        case DXGI_FORMAT_BC2_UNORM_SRGB:
-        case DXGI_FORMAT_BC2_UNORM:
-            return DXGI_FORMAT_BC2_TYPELESS;
-        case DXGI_FORMAT_BC3_UNORM_SRGB:
-        case DXGI_FORMAT_BC3_UNORM:
-            return DXGI_FORMAT_BC3_TYPELESS;
-    };
-
-    return format;
+    case DXGI_FORMAT_R32G32B32A32_FLOAT:
+    case DXGI_FORMAT_R32G32B32A32_UINT:
+    case DXGI_FORMAT_R32G32B32A32_SINT:
+        return DXGI_FORMAT_R32G32B32A32_TYPELESS;
+
+    case DXGI_FORMAT_R32G32B32_FLOAT:
+    case DXGI_FORMAT_R32G32B32_UINT:
+    case DXGI_FORMAT_R32G32B32_SINT:
+        return DXGI_FORMAT_R32G32B32_TYPELESS;
+
+    case DXGI_FORMAT_R16G16B16A16_FLOAT:
+    case DXGI_FORMAT_R16G16B16A16_UNORM:
+    case DXGI_FORMAT_R16G16B16A16_UINT:
+    case DXGI_FORMAT_R16G16B16A16_SNORM:
+    case DXGI_FORMAT_R16G16B16A16_SINT:
+        return DXGI_FORMAT_R16G16B16A16_TYPELESS;
+
+    case DXGI_FORMAT_R32G32_FLOAT:
+    case DXGI_FORMAT_R32G32_UINT:
+    case DXGI_FORMAT_R32G32_SINT:
+        return DXGI_FORMAT_R32G32_TYPELESS;
+
+    case DXGI_FORMAT_R10G10B10A2_UNORM:
+    case DXGI_FORMAT_R10G10B10A2_UINT:
+        return DXGI_FORMAT_R10G10B10A2_TYPELESS;
+
+    case DXGI_FORMAT_R8G8B8A8_UNORM:
+    case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
+    case DXGI_FORMAT_R8G8B8A8_UINT:
+    case DXGI_FORMAT_R8G8B8A8_SNORM:
+    case DXGI_FORMAT_R8G8B8A8_SINT:
+        return DXGI_FORMAT_R8G8B8A8_TYPELESS;
+
+    case DXGI_FORMAT_R16G16_FLOAT:
+    case DXGI_FORMAT_R16G16_UNORM:
+    case DXGI_FORMAT_R16G16_UINT:
+    case DXGI_FORMAT_R16G16_SNORM:
+    case DXGI_FORMAT_R16G16_SINT:
+        return DXGI_FORMAT_R16G16_TYPELESS;
+
+    case DXGI_FORMAT_D32_FLOAT:
+    case DXGI_FORMAT_R32_FLOAT:
+    case DXGI_FORMAT_R32_UINT:
+    case DXGI_FORMAT_R32_SINT:
+        return DXGI_FORMAT_R32_TYPELESS;
+
+    case DXGI_FORMAT_R8G8_UNORM:
+    case DXGI_FORMAT_R8G8_UINT:
+    case DXGI_FORMAT_R8G8_SNORM:
+    case DXGI_FORMAT_R8G8_SINT:
+        return DXGI_FORMAT_R8G8_TYPELESS;
+
+    case DXGI_FORMAT_R16_FLOAT:
+    case DXGI_FORMAT_D16_UNORM:
+    case DXGI_FORMAT_R16_UNORM:
+    case DXGI_FORMAT_R16_UINT:
+    case DXGI_FORMAT_R16_SNORM:
+    case DXGI_FORMAT_R16_SINT:
+        return DXGI_FORMAT_R16_TYPELESS;
+
+    case DXGI_FORMAT_R8_UNORM:
+    case DXGI_FORMAT_R8_UINT:
+    case DXGI_FORMAT_R8_SNORM:
+    case DXGI_FORMAT_R8_SINT:
+    case DXGI_FORMAT_A8_UNORM:
+        return DXGI_FORMAT_R8_TYPELESS;
+
+    case DXGI_FORMAT_BC1_UNORM:
+    case DXGI_FORMAT_BC1_UNORM_SRGB:
+        return DXGI_FORMAT_BC1_TYPELESS;
+
+    case DXGI_FORMAT_BC2_UNORM:
+    case DXGI_FORMAT_BC2_UNORM_SRGB:
+        return DXGI_FORMAT_BC2_TYPELESS;
+
+    case DXGI_FORMAT_BC3_UNORM:
+    case DXGI_FORMAT_BC3_UNORM_SRGB:
+        return DXGI_FORMAT_BC3_TYPELESS;
+
+    case DXGI_FORMAT_BC4_UNORM:
+    case DXGI_FORMAT_BC4_SNORM:
+        return DXGI_FORMAT_BC4_TYPELESS;
+
+    case DXGI_FORMAT_BC5_UNORM:
+    case DXGI_FORMAT_BC5_SNORM:
+        return DXGI_FORMAT_BC5_TYPELESS;
+
+    case DXGI_FORMAT_B8G8R8A8_UNORM:
+    case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
+        return DXGI_FORMAT_B8G8R8A8_TYPELESS;
+
+    case DXGI_FORMAT_B8G8R8X8_UNORM:
+    case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
+        return DXGI_FORMAT_B8G8R8X8_TYPELESS;
+
+    case DXGI_FORMAT_BC6H_UF16:
+    case DXGI_FORMAT_BC6H_SF16:
+        return DXGI_FORMAT_BC6H_TYPELESS;
+
+    case DXGI_FORMAT_BC7_UNORM:
+    case DXGI_FORMAT_BC7_UNORM_SRGB:
+        return DXGI_FORMAT_BC7_TYPELESS;
+
+    default:
+        return format;
+    }
 }
 
 //--------------------------------------------------------------------------------------
-HRESULT DXUTSnapD3D9Screenshot( LPCTSTR szFileName )
-{
-    HRESULT hr = S_OK;
-    IDirect3DDevice9* pDev = DXUTGetD3D9Device();
-    if( !pDev )
-        return E_FAIL;
-
-    IDirect3DSurface9* pBackBuffer = NULL;
-    V_RETURN( pDev->GetBackBuffer( 0, 0, D3DBACKBUFFER_TYPE_MONO, &pBackBuffer ) );
-
-    return D3DXSaveSurfaceToFile( szFileName, D3DXIFF_BMP, pBackBuffer, NULL, NULL );
-}
-
-
-
-
-//-------------------------------------------------------------------------------------- 
-HRESULT DXUTSnapD3D11Screenshot( LPCTSTR szFileName, D3DX11_IMAGE_FILE_FORMAT iff )
+HRESULT DXUTSnapD3D11Screenshot( _In_z_ LPCWSTR szFileName, _In_ bool usedds )
 {
     IDXGISwapChain *pSwap = DXUTGetDXGISwapChain();
 
     if (!pSwap)
         return E_FAIL;
-    
+
     ID3D11Texture2D* pBackBuffer;
     HRESULT hr = pSwap->GetBuffer( 0, __uuidof( *pBackBuffer ), ( LPVOID* )&pBackBuffer );
     if (hr != S_OK)
         return hr;
 
-    ID3D11DeviceContext *dc  = DXUTGetD3D11DeviceContext();
-    if (!dc) {
-        SAFE_RELEASE(pBackBuffer);
-        return E_FAIL;
-    }
-    ID3D11Device *pDevice = DXUTGetD3D11Device();
+    auto dc  = DXUTGetD3D11DeviceContext();
     if (!dc) {
         SAFE_RELEASE(pBackBuffer);
         return E_FAIL;
     }
 
-    D3D11_TEXTURE2D_DESC dsc;
-    pBackBuffer->GetDesc(&dsc);
-    D3D11_RESOURCE_DIMENSION dim;
-    pBackBuffer->GetType(&dim);
-    // special case msaa textures
-    ID3D11Texture2D *pCompatableTexture = pBackBuffer;
-    if ( dsc.SampleDesc.Count > 1) {
-        D3D11_TEXTURE2D_DESC dsc_new = dsc;
-        dsc_new.SampleDesc.Count = 1;
-        dsc_new.SampleDesc.Quality = 0;
-        dsc_new.Usage = D3D11_USAGE_DEFAULT;
-        dsc_new.BindFlags = 0;
-        dsc_new.CPUAccessFlags = 0;
-        ID3D11Texture2D *resolveTexture;
-        hr = pDevice->CreateTexture2D(&dsc_new, NULL, &resolveTexture);
-        if ( SUCCEEDED(hr) )
-        {
-            DXUT_SetDebugName(resolveTexture, "DXUT");
-            dc->ResolveSubresource(resolveTexture, 0, pBackBuffer, 0, dsc.Format);
-            pCompatableTexture = resolveTexture;
-        }
-        pCompatableTexture->GetDesc(&dsc);
+    if ( usedds )
+    {
+        hr = DirectX::SaveDDSTextureToFile( dc, pBackBuffer, szFileName );
+    }
+    else
+    {
+        hr = DirectX::SaveWICTextureToFile( dc, pBackBuffer, GUID_ContainerFormatBmp, szFileName );
     }
 
-    hr = D3DX11SaveTextureToFileW(dc, pCompatableTexture, iff, szFileName); 
-        
     SAFE_RELEASE(pBackBuffer);
-    SAFE_RELEASE(pCompatableTexture);
 
     return hr;
 
diff --git a/samples/DX_APIUsage/DXUT/Core/DXUTmisc.h b/samples/DX_APIUsage/DXUT/Core/DXUTmisc.h
index 6060e5e..a090306 100644
--- a/samples/DX_APIUsage/DXUT/Core/DXUTmisc.h
+++ b/samples/DX_APIUsage/DXUT/Core/DXUTmisc.h
@@ -3,15 +3,12 @@
 //
 // Helper functions for Direct3D programming.
 //
-// Copyright (c) Microsoft Corporation. All rights reserved
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #pragma once
-#ifndef DXUT_MISC_H
-#define DXUT_MISC_H
-
-#ifndef MAX_FVF_DECL_SIZE
-#define MAX_FVF_DECL_SIZE MAXD3DDECLLENGTH + 1 // +1 for END
-#endif
 
 //--------------------------------------------------------------------------------------
 // XInput helper state/function
@@ -61,68 +58,17 @@ struct DXUT_GAMEPAD
     bool bLastRightTrigger;
 };
 
-HRESULT DXUTGetGamepadState( DWORD dwPort, DXUT_GAMEPAD* pGamePad, bool bThumbstickDeadZone = true,
-                             bool bSnapThumbstickToCardinals = true );
+HRESULT DXUTGetGamepadState( _In_ DWORD dwPort, _In_ DXUT_GAMEPAD* pGamePad, _In_ bool bThumbstickDeadZone = true,
+                             _In_ bool bSnapThumbstickToCardinals = true );
 HRESULT DXUTStopRumbleOnAllControllers();
-void DXUTEnableXInput( bool bEnable );
+void DXUTEnableXInput( _In_ bool bEnable );
 
 
 //--------------------------------------------------------------------------------------
-// Takes a screen shot of a 32bit D3D9 back buffer and saves the images to a BMP file
+// Takes a screen shot of a 32bit D3D11 back buffer and saves the images to a BMP or DDS file
 //--------------------------------------------------------------------------------------
-HRESULT DXUTSnapD3D9Screenshot( LPCTSTR szFileName );
-
-//--------------------------------------------------------------------------------------
-// Takes a screen shot of a 32bit D3D11 back buffer and saves the images to a BMP file
-//--------------------------------------------------------------------------------------
-
-HRESULT DXUTSnapD3D11Screenshot( LPCTSTR szFileName, D3DX11_IMAGE_FILE_FORMAT iff = D3DX11_IFF_DDS  );
-
-
-//--------------------------------------------------------------------------------------
-// A growable array
-//--------------------------------------------------------------------------------------
-template<typename TYPE> class CGrowableArray
-{
-public:
-    CGrowableArray()  { m_pData = NULL; m_nSize = 0; m_nMaxSize = 0; }
-    CGrowableArray( const CGrowableArray<TYPE>& a ) { for( int i=0; i < a.m_nSize; i++ ) Add( a.m_pData[i] ); }
-    ~CGrowableArray() { RemoveAll(); }
-
-    const TYPE& operator[]( int nIndex ) const { return GetAt( nIndex ); }
-    TYPE& operator[]( int nIndex ) { return GetAt( nIndex ); }
-   
-    CGrowableArray& operator=( const CGrowableArray<TYPE>& a ) { if( this == &a ) return *this; RemoveAll(); for( int i=0; i < a.m_nSize; i++ ) Add( a.m_pData[i] ); return *this; }
-
-    HRESULT SetSize( int nNewMaxSize );
-    HRESULT Add( const TYPE& value );
-    HRESULT Insert( int nIndex, const TYPE& value );
-    HRESULT SetAt( int nIndex, const TYPE& value );
-    TYPE&   GetAt( int nIndex ) const { assert( nIndex >= 0 && nIndex < m_nSize ); return m_pData[nIndex]; }
-    int     GetSize() const { return m_nSize; }
-    TYPE*   GetData() { return m_pData; }
-    bool    Contains( const TYPE& value ){ return ( -1 != IndexOf( value ) ); }
-
-    int     IndexOf( const TYPE& value ) { return ( m_nSize > 0 ) ? IndexOf( value, 0, m_nSize ) : -1; }
-    int     IndexOf( const TYPE& value, int iStart ) { return IndexOf( value, iStart, m_nSize - iStart ); }
-    int     IndexOf( const TYPE& value, int nIndex, int nNumElements );
-
-    int     LastIndexOf( const TYPE& value ) { return ( m_nSize > 0 ) ? LastIndexOf( value, m_nSize-1, m_nSize ) : -1; }
-    int     LastIndexOf( const TYPE& value, int nIndex ) { return LastIndexOf( value, nIndex, nIndex+1 ); }
-    int     LastIndexOf( const TYPE& value, int nIndex, int nNumElements );
-
-    HRESULT Remove( int nIndex );
-    void    RemoveAll() { SetSize(0); }
-    void	Reset() { m_nSize = 0; }
-
-protected:
-    TYPE* m_pData;      // the actual array of data
-    int m_nSize;        // # of elements (upperBound - 1)
-    int m_nMaxSize;     // max allocated
-
-    HRESULT SetSizeInternal( int nNewMaxSize );  // This version doesn't call ctor or dtor.
-};
 
+HRESULT DXUTSnapD3D11Screenshot( _In_z_ LPCWSTR szFileName, _In_ bool usedds = true );
 
 //--------------------------------------------------------------------------------------
 // Performs timer operations
@@ -137,18 +83,18 @@ public:
     void            Start(); // starts the timer
     void            Stop();  // stop (or pause) the timer
     void            Advance(); // advance the timer by 0.1 seconds
-    double          GetAbsoluteTime(); // get the absolute system time
-    double          GetTime(); // get the current time
+    double          GetAbsoluteTime() const; // get the absolute system time
+    double          GetTime() const; // get the current time
     float           GetElapsedTime(); // get the time that elapsed between Get*ElapsedTime() calls
-    void            GetTimeValues( double* pfTime, double* pfAbsoluteTime, float* pfElapsedTime ); // get all time values at once
-    bool            IsStopped(); // returns true if timer stopped
+    void            GetTimeValues( _Out_ double* pfTime, _Out_ double* pfAbsoluteTime, _Out_ float* pfElapsedTime ); // get all time values at once
+    bool            IsStopped() const { return m_bTimerStopped; } // returns true if timer stopped
 
     // Limit the current thread to one processor (the current one). This ensures that timing code runs
     // on only one processor, and will not suffer any ill effects from power management.
     void            LimitThreadAffinityToCurrentProc();
 
 protected:
-    LARGE_INTEGER   GetAdjustedCurrentTime();
+    LARGE_INTEGER   GetAdjustedCurrentTime() const;
 
     bool m_bUsingQPF;
     bool m_bTimerStopped;
@@ -162,42 +108,21 @@ protected:
 CDXUTTimer*                 WINAPI DXUTGetGlobalTimer();
 
 
-//--------------------------------------------------------------------------------------
-// Returns the string for the given D3DFORMAT.
-//       bWithPrefix determines whether the string should include the "D3DFMT_"
-//--------------------------------------------------------------------------------------
-LPCWSTR WINAPI DXUTD3DFormatToString( D3DFORMAT format, bool bWithPrefix );
-
-
 //--------------------------------------------------------------------------------------
 // Returns the string for the given DXGI_FORMAT.
 //       bWithPrefix determines whether the string should include the "DXGI_FORMAT_"
 //--------------------------------------------------------------------------------------
-LPCWSTR WINAPI DXUTDXGIFormatToString( DXGI_FORMAT format, bool bWithPrefix );
-
-
-//--------------------------------------------------------------------------------------
-// Device settings conversion
-//--------------------------------------------------------------------------------------
-void WINAPI DXUTConvertDeviceSettings11to9( DXUTD3D11DeviceSettings* pIn, DXUTD3D9DeviceSettings* pOut );
-void WINAPI DXUTConvertDeviceSettings9to11( DXUTD3D9DeviceSettings* pIn, DXUTD3D11DeviceSettings* pOut );
-
-DXGI_FORMAT WINAPI ConvertFormatD3D9ToDXGI( D3DFORMAT fmt );
-D3DFORMAT WINAPI ConvertFormatDXGIToD3D9( DXGI_FORMAT fmt );
+LPCWSTR WINAPI DXUTDXGIFormatToString( _In_ DXGI_FORMAT format, _In_ bool bWithPrefix );
 
 
 //--------------------------------------------------------------------------------------
 // Debug printing support
 // See dxerr.h for more debug printing support
 //--------------------------------------------------------------------------------------
-void WINAPI DXUTOutputDebugStringW( LPCWSTR strMsg, ... );
-void WINAPI DXUTOutputDebugStringA( LPCSTR strMsg, ... );
-HRESULT WINAPI DXUTTrace( const CHAR* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, bool bPopMsgBox );
-void WINAPI DXUTTraceDecl( D3DVERTEXELEMENT9 decl[MAX_FVF_DECL_SIZE] );
-WCHAR* WINAPI DXUTTraceD3DDECLUSAGEtoString( BYTE u );
-WCHAR* WINAPI DXUTTraceD3DDECLMETHODtoString( BYTE m );
-WCHAR* WINAPI DXUTTraceD3DDECLTYPEtoString( BYTE t );
-WCHAR* WINAPI DXUTTraceWindowsMessage( UINT uMsg );
+void WINAPI DXUTOutputDebugStringW( _In_z_ LPCWSTR strMsg, ... );
+void WINAPI DXUTOutputDebugStringA( _In_z_ LPCSTR strMsg, ... );
+HRESULT WINAPI DXUTTrace( _In_z_ const CHAR* strFile, _In_ DWORD dwLine, _In_ HRESULT hr, _In_z_ const WCHAR* strMsg, _In_ bool bPopMsgBox );
+const WCHAR* WINAPI DXUTTraceWindowsMessage( _In_ UINT uMsg );
 
 #ifdef UNICODE
 #define DXUTOutputDebugString DXUTOutputDebugStringW
@@ -219,32 +144,32 @@ WCHAR* WINAPI DXUTTraceWindowsMessage( UINT uMsg );
 
 
 //--------------------------------------------------------------------------------------
-// Direct3D9 dynamic linking support -- calls top-level D3D9 APIs with graceful
+// Direct3D dynamic linking support -- calls top-level D3D APIs with graceful
 // failure if APIs are not present.
 //--------------------------------------------------------------------------------------
 
-IDirect3D9 * WINAPI DXUT_Dynamic_Direct3DCreate9(UINT SDKVersion);
-int WINAPI DXUT_Dynamic_D3DPERF_BeginEvent( D3DCOLOR col, LPCWSTR wszName );
+int WINAPI DXUT_Dynamic_D3DPERF_BeginEvent( _In_ DWORD col, _In_z_ LPCWSTR wszName );
 int WINAPI DXUT_Dynamic_D3DPERF_EndEvent( void );
-void WINAPI DXUT_Dynamic_D3DPERF_SetMarker( D3DCOLOR col, LPCWSTR wszName );
-void WINAPI DXUT_Dynamic_D3DPERF_SetRegion( D3DCOLOR col, LPCWSTR wszName );
+void WINAPI DXUT_Dynamic_D3DPERF_SetMarker( _In_ DWORD col, _In_z_ LPCWSTR wszName );
+void WINAPI DXUT_Dynamic_D3DPERF_SetRegion( _In_ DWORD col, _In_z_ LPCWSTR wszName );
 BOOL WINAPI DXUT_Dynamic_D3DPERF_QueryRepeatFrame( void );
-void WINAPI DXUT_Dynamic_D3DPERF_SetOptions( DWORD dwOptions );
-DWORD WINAPI DXUT_Dynamic_D3DPERF_GetStatus( void );
-HRESULT WINAPI DXUT_Dynamic_CreateDXGIFactory1( REFIID rInterface, void** ppOut );
+void WINAPI DXUT_Dynamic_D3DPERF_SetOptions( _In_ DWORD dwOptions );
+DWORD WINAPI DXUT_Dynamic_D3DPERF_GetStatus();
+HRESULT WINAPI DXUT_Dynamic_CreateDXGIFactory1( _In_ REFIID rInterface, _Out_ void** ppOut );
+HRESULT WINAPI DXUT_Dynamic_DXGIGetDebugInterface( _In_ REFIID rInterface, _Out_ void** ppOut );
 
-HRESULT WINAPI DXUT_Dynamic_D3D11CreateDevice( IDXGIAdapter* pAdapter,
-                                               D3D_DRIVER_TYPE DriverType,
-                                               HMODULE Software,
-                                               UINT32 Flags,
-                                               D3D_FEATURE_LEVEL* pFeatureLevels,
-                                               UINT FeatureLevels,
-                                               UINT32 SDKVersion,
-                                               ID3D11Device** ppDevice,
-                                               D3D_FEATURE_LEVEL* pFeatureLevel,
-                                               ID3D11DeviceContext** ppImmediateContext );
+HRESULT WINAPI DXUT_Dynamic_D3D11CreateDevice( _In_opt_ IDXGIAdapter* pAdapter,
+                                               _In_ D3D_DRIVER_TYPE DriverType,
+                                               _In_opt_ HMODULE Software,
+                                               _In_ UINT32 Flags,
+                                               _In_reads_(FeatureLevels) const D3D_FEATURE_LEVEL* pFeatureLevels,
+                                               _In_ UINT FeatureLevels,
+                                               _In_ UINT32 SDKVersion,
+                                               _Deref_out_ ID3D11Device** ppDevice,
+                                               _Out_opt_ D3D_FEATURE_LEVEL* pFeatureLevel,
+                                               _Out_opt_ ID3D11DeviceContext** ppImmediateContext );
 
-bool DXUT_EnsureD3D11APIs( void );
+bool DXUT_EnsureD3D11APIs();
 
 
 //--------------------------------------------------------------------------------------
@@ -254,35 +179,20 @@ bool DXUT_EnsureD3D11APIs( void );
 // Use DXUT_SetDebugName() to attach names to D3D objects for use by 
 // SDKDebugLayer, PIX's object table, etc.
 #if defined(PROFILE) || defined(DEBUG)
-inline void DXUT_SetDebugName( IDirect3DResource9* pObj, const CHAR* pstrName )
+inline void DXUT_SetDebugName( _In_ IDXGIObject* pObj, _In_z_ const CHAR* pstrName )
 {
     if ( pObj )
-        pObj->SetPrivateData( WKPDID_D3DDebugObjectName, pstrName, lstrlenA(pstrName), 0 );
+       pObj->SetPrivateData( WKPDID_D3DDebugObjectName, (UINT)strlen(pstrName), pstrName );
 }
-inline void DXUT_SetDebugName( IDXGIObject* pObj, const CHAR* pstrName )
+inline void DXUT_SetDebugName( _In_ ID3D11Device* pObj, _In_z_ const CHAR* pstrName )
 {
     if ( pObj )
-       pObj->SetPrivateData( WKPDID_D3DDebugObjectName, lstrlenA(pstrName), pstrName );
+        pObj->SetPrivateData( WKPDID_D3DDebugObjectName, (UINT)strlen(pstrName), pstrName );
 }
-inline void DXUT_SetDebugName( ID3D10Device* pObj, const CHAR* pstrName )
+inline void DXUT_SetDebugName( _In_ ID3D11DeviceChild* pObj, _In_z_ const CHAR* pstrName )
 {
     if ( pObj )
-        pObj->SetPrivateData( WKPDID_D3DDebugObjectName, lstrlenA(pstrName), pstrName );
-}
-inline void DXUT_SetDebugName( ID3D10DeviceChild* pObj, const CHAR* pstrName )
-{
-    if ( pObj )
-        pObj->SetPrivateData( WKPDID_D3DDebugObjectName, lstrlenA(pstrName), pstrName );
-}
-inline void DXUT_SetDebugName( ID3D11Device* pObj, const CHAR* pstrName )
-{
-    if ( pObj )
-        pObj->SetPrivateData( WKPDID_D3DDebugObjectName, lstrlenA(pstrName), pstrName );
-}
-inline void DXUT_SetDebugName( ID3D11DeviceChild* pObj, const CHAR* pstrName )
-{
-    if ( pObj )
-        pObj->SetPrivateData( WKPDID_D3DDebugObjectName, lstrlenA(pstrName), pstrName );
+        pObj->SetPrivateData( WKPDID_D3DDebugObjectName, (UINT)strlen(pstrName), pstrName );
 }
 #else
 #define DXUT_SetDebugName( pObj, pstrName )
@@ -294,9 +204,9 @@ inline void DXUT_SetDebugName( ID3D11DeviceChild* pObj, const CHAR* pstrName )
 // performance analysis tools.  The following constants are provided for your 
 // convenience, but you can use any colors you like.
 //--------------------------------------------------------------------------------------
-const D3DCOLOR              DXUT_PERFEVENTCOLOR = D3DCOLOR_XRGB( 200, 100, 100 );
-const D3DCOLOR              DXUT_PERFEVENTCOLOR2 = D3DCOLOR_XRGB( 100, 200, 100 );
-const D3DCOLOR              DXUT_PERFEVENTCOLOR3 = D3DCOLOR_XRGB( 100, 100, 200 );
+const DWORD DXUT_PERFEVENTCOLOR = 0xFFC86464;
+const DWORD DXUT_PERFEVENTCOLOR2 = 0xFF64C864;
+const DWORD DXUT_PERFEVENTCOLOR3 = 0xFF6464C8;
 
 //--------------------------------------------------------------------------------------
 // The following macros provide a convenient way for your code to call the D3DPERF 
@@ -330,11 +240,16 @@ const D3DCOLOR              DXUT_PERFEVENTCOLOR3 = D3DCOLOR_XRGB( 100, 100, 200
 class CDXUTPerfEventGenerator
 {
 public:
-CDXUTPerfEventGenerator( D3DCOLOR color, LPCWSTR pstrMessage )
+CDXUTPerfEventGenerator( _In_ DWORD color, _In_z_ LPCWSTR pstrMessage )
 {
+#ifdef PROFILE
     DXUT_BeginPerfEvent( color, pstrMessage );
+#else
+    UNREFERENCED_PARAMETER(color);
+    UNREFERENCED_PARAMETER(pstrMessage);
+#endif
 }
-~CDXUTPerfEventGenerator( void )
+~CDXUTPerfEventGenerator()
 {
     DXUT_EndPerfEvent();
 }
@@ -366,269 +281,14 @@ typedef MONITORINFOEXW      MONITORINFOEX;
 typedef LPMONITORINFOEXW    LPMONITORINFOEX;
 #endif
 
-HMONITOR WINAPI DXUTMonitorFromWindow( HWND hWnd, DWORD dwFlags );
-HMONITOR WINAPI DXUTMonitorFromRect( LPCRECT lprcScreenCoords, DWORD dwFlags );
-BOOL WINAPI DXUTGetMonitorInfo( HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo );
-void WINAPI DXUTGetDesktopResolution( UINT AdapterOrdinal, UINT* pWidth, UINT* pHeight );
-
-
-//--------------------------------------------------------------------------------------
-// Implementation of CGrowableArray
-//--------------------------------------------------------------------------------------
-
-// This version doesn't call ctor or dtor.
-template<typename TYPE> HRESULT CGrowableArray <TYPE>::SetSizeInternal( int nNewMaxSize )
-{
-    if( nNewMaxSize < 0 || ( nNewMaxSize > INT_MAX / sizeof( TYPE ) ) )
-    {
-        assert( false );
-        return E_INVALIDARG;
-    }
-
-    if( nNewMaxSize == 0 )
-    {
-        // Shrink to 0 size & cleanup
-        if( m_pData )
-        {
-            free( m_pData );
-            m_pData = NULL;
-        }
-
-        m_nMaxSize = 0;
-        m_nSize = 0;
-    }
-    else if( m_pData == NULL || nNewMaxSize > m_nMaxSize )
-    {
-        // Grow array
-        int nGrowBy = ( m_nMaxSize == 0 ) ? 16 : m_nMaxSize;
-
-        // Limit nGrowBy to keep m_nMaxSize less than INT_MAX
-        if( ( UINT )m_nMaxSize + ( UINT )nGrowBy > ( UINT )INT_MAX )
-            nGrowBy = INT_MAX - m_nMaxSize;
-
-        nNewMaxSize = __max( nNewMaxSize, m_nMaxSize + nGrowBy );
-
-        // Verify that (nNewMaxSize * sizeof(TYPE)) is not greater than UINT_MAX or the realloc will overrun
-        if( sizeof( TYPE ) > UINT_MAX / ( UINT )nNewMaxSize )
-            return E_INVALIDARG;
-
-        TYPE* pDataNew = ( TYPE* )realloc( m_pData, nNewMaxSize * sizeof( TYPE ) );
-        if( pDataNew == NULL )
-            return E_OUTOFMEMORY;
-
-        m_pData = pDataNew;
-        m_nMaxSize = nNewMaxSize;
-    }
-
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-template<typename TYPE> HRESULT CGrowableArray <TYPE>::SetSize( int nNewMaxSize )
-{
-    int nOldSize = m_nSize;
-
-    if( nOldSize > nNewMaxSize )
-    {
-        assert( m_pData );
-        if( m_pData )
-        {
-            // Removing elements. Call dtor.
-
-            for( int i = nNewMaxSize; i < nOldSize; ++i )
-                m_pData[i].~TYPE();
-        }
-    }
-
-    // Adjust buffer.  Note that there's no need to check for error
-    // since if it happens, nOldSize == nNewMaxSize will be true.)
-    HRESULT hr = SetSizeInternal( nNewMaxSize );
-
-    if( nOldSize < nNewMaxSize )
-    {
-        assert( m_pData );
-        if( m_pData )
-        {
-            // Adding elements. Call ctor.
-
-            for( int i = nOldSize; i < nNewMaxSize; ++i )
-                ::new ( &m_pData[i] ) TYPE;
-        }
-    }
-
-    return hr;
-}
-
-
-//--------------------------------------------------------------------------------------
-template<typename TYPE> HRESULT CGrowableArray <TYPE>::Add( const TYPE& value )
-{
-    HRESULT hr;
-    if( FAILED( hr = SetSizeInternal( m_nSize + 1 ) ) )
-        return hr;
-
-    assert( m_pData != NULL );
-
-    // Construct the new element
-    ::new ( &m_pData[m_nSize] ) TYPE;
-
-    // Assign
-    m_pData[m_nSize] = value;
-    ++m_nSize;
-
-    return S_OK;
-}
+HMONITOR WINAPI DXUTMonitorFromWindow( _In_ HWND hWnd, _In_ DWORD dwFlags );
+HMONITOR WINAPI DXUTMonitorFromRect( _In_ LPCRECT lprcScreenCoords, _In_ DWORD dwFlags );
+BOOL WINAPI DXUTGetMonitorInfo( _In_ HMONITOR hMonitor, _Out_ LPMONITORINFO lpMonitorInfo );
+void WINAPI DXUTGetDesktopResolution( _In_ UINT AdapterOrdinal, _Out_ UINT* pWidth, _Out_ UINT* pHeight );
 
 
-//--------------------------------------------------------------------------------------
-template<typename TYPE> HRESULT CGrowableArray <TYPE>::Insert( int nIndex, const TYPE& value )
-{
-    HRESULT hr;
-
-    // Validate index
-    if( nIndex < 0 ||
-        nIndex > m_nSize )
-    {
-        assert( false );
-        return E_INVALIDARG;
-    }
-
-    // Prepare the buffer
-    if( FAILED( hr = SetSizeInternal( m_nSize + 1 ) ) )
-        return hr;
-
-    // Shift the array
-    MoveMemory( &m_pData[nIndex + 1], &m_pData[nIndex], sizeof( TYPE ) * ( m_nSize - nIndex ) );
-
-    // Construct the new element
-    ::new ( &m_pData[nIndex] ) TYPE;
-
-    // Set the value and increase the size
-    m_pData[nIndex] = value;
-    ++m_nSize;
-
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-template<typename TYPE> HRESULT CGrowableArray <TYPE>::SetAt( int nIndex, const TYPE& value )
-{
-    // Validate arguments
-    if( nIndex < 0 ||
-        nIndex >= m_nSize )
-    {
-        assert( false );
-        return E_INVALIDARG;
-    }
-
-    m_pData[nIndex] = value;
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Searches for the specified value and returns the index of the first occurrence
-// within the section of the data array that extends from iStart and contains the 
-// specified number of elements. Returns -1 if value is not found within the given 
-// section.
-//--------------------------------------------------------------------------------------
-template<typename TYPE> int CGrowableArray <TYPE>::IndexOf( const TYPE& value, int iStart, int nNumElements )
-{
-    // Validate arguments
-    if( iStart < 0 ||
-        iStart >= m_nSize ||
-        nNumElements < 0 ||
-        iStart + nNumElements > m_nSize )
-    {
-        assert( false );
-        return -1;
-    }
-
-    // Search
-    for( int i = iStart; i < ( iStart + nNumElements ); i++ )
-    {
-        if( value == m_pData[i] )
-            return i;
-    }
-
-    // Not found
-    return -1;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Searches for the specified value and returns the index of the last occurrence
-// within the section of the data array that contains the specified number of elements
-// and ends at iEnd. Returns -1 if value is not found within the given section.
-//--------------------------------------------------------------------------------------
-template<typename TYPE> int CGrowableArray <TYPE>::LastIndexOf( const TYPE& value, int iEnd, int nNumElements )
-{
-    // Validate arguments
-    if( iEnd < 0 ||
-        iEnd >= m_nSize ||
-        nNumElements < 0 ||
-        iEnd - nNumElements < 0 )
-    {
-        assert( false );
-        return -1;
-    }
-
-    // Search
-    for( int i = iEnd; i > ( iEnd - nNumElements ); i-- )
-    {
-        if( value == m_pData[i] )
-            return i;
-    }
-
-    // Not found
-    return -1;
-}
-
-
-
-//--------------------------------------------------------------------------------------
-template<typename TYPE> HRESULT CGrowableArray <TYPE>::Remove( int nIndex )
-{
-    if( nIndex < 0 ||
-        nIndex >= m_nSize )
-    {
-        assert( false );
-        return E_INVALIDARG;
-    }
-
-    // Destruct the element to be removed
-    m_pData[nIndex].~TYPE();
-
-    // Compact the array and decrease the size
-    MoveMemory( &m_pData[nIndex], &m_pData[nIndex + 1], sizeof( TYPE ) * ( m_nSize - ( nIndex + 1 ) ) );
-    --m_nSize;
-
-    return S_OK;
-}
-
-//--------------------------------------------------------------------------------------
-// Creates a REF or NULLREF D3D9 device and returns that device.  The caller should call
-// Release() when done with the device.
-//--------------------------------------------------------------------------------------
-IDirect3DDevice9*           WINAPI DXUTCreateRefDevice9( HWND hWnd, bool bNullRef = true );
-
-//--------------------------------------------------------------------------------------
-// Creates a REF or NULLREF D3D10 device and returns the device.  The caller should call
-// Release() when done with the device.
-//--------------------------------------------------------------------------------------
-//test d3d10 version ID3D10Device*               WINAPI DXUTCreateRefDevice10( bool bNullRef = true );
-
-//--------------------------------------------------------------------------------------
-// Helper function to launch the Media Center UI after the program terminates
-//--------------------------------------------------------------------------------------
-bool DXUTReLaunchMediaCenter();
-
 //--------------------------------------------------------------------------------------
 // Helper functions to create SRGB formats from typeless formats and vice versa
 //--------------------------------------------------------------------------------------
-DXGI_FORMAT MAKE_SRGB( DXGI_FORMAT format );
-DXGI_FORMAT MAKE_TYPELESS( DXGI_FORMAT format );
-
-#endif
+DXGI_FORMAT MAKE_SRGB( _In_ DXGI_FORMAT format );
+DXGI_FORMAT MAKE_TYPELESS( _In_ DXGI_FORMAT format );
diff --git a/samples/DX_APIUsage/DXUT/Core/ScreenGrab.cpp b/samples/DX_APIUsage/DXUT/Core/ScreenGrab.cpp
new file mode 100644
index 0000000..deb693c
--- /dev/null
+++ b/samples/DX_APIUsage/DXUT/Core/ScreenGrab.cpp
@@ -0,0 +1,1204 @@
+//--------------------------------------------------------------------------------------
+// File: ScreenGrab.cpp
+//
+// Function for capturing a 2D texture and saving it to a file (aka a 'screenshot'
+// when used on a Direct3D 11 Render Target).
+//
+// Note these functions are useful as a light-weight runtime screen grabber. For
+// full-featured texture capture, DDS writer, and texture processing pipeline,
+// see the 'Texconv' sample and the 'DirectXTex' library.
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248926
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#include "dxut.h"
+
+// Does not capture 1D textures or 3D textures (volume maps)
+
+// Does not capture mipmap chains, only the top-most texture level is saved
+
+// For 2D array textures and cubemaps, it captures only the first image in the array
+
+#include "ScreenGrab.h"
+
+#include <dxgiformat.h>
+#include <assert.h>
+
+#include <wincodec.h>
+
+#include <wrl\client.h>
+
+#include <algorithm>
+#include <memory>
+
+using Microsoft::WRL::ComPtr;
+
+//--------------------------------------------------------------------------------------
+// Macros
+//--------------------------------------------------------------------------------------
+#ifndef MAKEFOURCC
+    #define MAKEFOURCC(ch0, ch1, ch2, ch3)                              \
+                ((uint32_t)(uint8_t)(ch0) | ((uint32_t)(uint8_t)(ch1) << 8) |       \
+                ((uint32_t)(uint8_t)(ch2) << 16) | ((uint32_t)(uint8_t)(ch3) << 24 ))
+#endif /* defined(MAKEFOURCC) */
+
+//--------------------------------------------------------------------------------------
+// DDS file structure definitions
+//
+// See DDS.h in the 'Texconv' sample and the 'DirectXTex' library
+//--------------------------------------------------------------------------------------
+namespace
+{
+    #pragma pack(push,1)
+
+    #define DDS_MAGIC 0x20534444 // "DDS "
+
+    struct DDS_PIXELFORMAT
+    {
+        uint32_t    size;
+        uint32_t    flags;
+        uint32_t    fourCC;
+        uint32_t    RGBBitCount;
+        uint32_t    RBitMask;
+        uint32_t    GBitMask;
+        uint32_t    BBitMask;
+        uint32_t    ABitMask;
+    };
+
+    #define DDS_FOURCC      0x00000004  // DDPF_FOURCC
+    #define DDS_RGB         0x00000040  // DDPF_RGB
+    #define DDS_RGBA        0x00000041  // DDPF_RGB | DDPF_ALPHAPIXELS
+    #define DDS_LUMINANCE   0x00020000  // DDPF_LUMINANCE
+    #define DDS_LUMINANCEA  0x00020001  // DDPF_LUMINANCE | DDPF_ALPHAPIXELS
+    #define DDS_ALPHA       0x00000002  // DDPF_ALPHA
+    #define DDS_BUMPDUDV    0x00080000  // DDPF_BUMPDUDV
+
+    #define DDS_HEADER_FLAGS_TEXTURE        0x00001007  // DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT 
+    #define DDS_HEADER_FLAGS_MIPMAP         0x00020000  // DDSD_MIPMAPCOUNT
+    #define DDS_HEADER_FLAGS_PITCH          0x00000008  // DDSD_PITCH
+    #define DDS_HEADER_FLAGS_LINEARSIZE     0x00080000  // DDSD_LINEARSIZE
+
+    #define DDS_HEIGHT 0x00000002 // DDSD_HEIGHT
+    #define DDS_WIDTH  0x00000004 // DDSD_WIDTH
+
+    #define DDS_SURFACE_FLAGS_TEXTURE 0x00001000 // DDSCAPS_TEXTURE
+
+    typedef struct
+    {
+        uint32_t        size;
+        uint32_t        flags;
+        uint32_t        height;
+        uint32_t        width;
+        uint32_t        pitchOrLinearSize;
+        uint32_t        depth; // only if DDS_HEADER_FLAGS_VOLUME is set in flags
+        uint32_t        mipMapCount;
+        uint32_t        reserved1[11];
+        DDS_PIXELFORMAT ddspf;
+        uint32_t        caps;
+        uint32_t        caps2;
+        uint32_t        caps3;
+        uint32_t        caps4;
+        uint32_t        reserved2;
+    } DDS_HEADER;
+
+    typedef struct
+    {
+        DXGI_FORMAT     dxgiFormat;
+        uint32_t        resourceDimension;
+        uint32_t        miscFlag; // see D3D11_RESOURCE_MISC_FLAG
+        uint32_t        arraySize;
+        uint32_t        reserved;
+    } DDS_HEADER_DXT10;
+
+    #pragma pack(pop)
+
+    const DDS_PIXELFORMAT DDSPF_DXT1 =
+        { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 };
+
+    const DDS_PIXELFORMAT DDSPF_DXT3 =
+        { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D','X','T','3'), 0, 0, 0, 0, 0 };
+
+    const DDS_PIXELFORMAT DDSPF_DXT5 =
+        { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D','X','T','5'), 0, 0, 0, 0, 0 };
+
+    const DDS_PIXELFORMAT DDSPF_BC4_UNORM =
+        { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B','C','4','U'), 0, 0, 0, 0, 0 };
+
+    const DDS_PIXELFORMAT DDSPF_BC4_SNORM =
+        { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B','C','4','S'), 0, 0, 0, 0, 0 };
+
+    const DDS_PIXELFORMAT DDSPF_BC5_UNORM =
+        { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B','C','5','U'), 0, 0, 0, 0, 0 };
+
+    const DDS_PIXELFORMAT DDSPF_BC5_SNORM =
+        { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B','C','5','S'), 0, 0, 0, 0, 0 };
+
+    const DDS_PIXELFORMAT DDSPF_R8G8_B8G8 =
+        { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('R','G','B','G'), 0, 0, 0, 0, 0 };
+
+    const DDS_PIXELFORMAT DDSPF_G8R8_G8B8 =
+        { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('G','R','G','B'), 0, 0, 0, 0, 0 };
+
+    const DDS_PIXELFORMAT DDSPF_YUY2 =
+        { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('Y','U','Y','2'), 0, 0, 0, 0, 0 };
+
+    const DDS_PIXELFORMAT DDSPF_A8R8G8B8 =
+        { sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 };
+
+    const DDS_PIXELFORMAT DDSPF_X8R8G8B8 =
+        { sizeof(DDS_PIXELFORMAT), DDS_RGB,  0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000 };
+
+    const DDS_PIXELFORMAT DDSPF_A8B8G8R8 =
+        { sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000 };
+
+    const DDS_PIXELFORMAT DDSPF_G16R16 =
+        { sizeof(DDS_PIXELFORMAT), DDS_RGB,  0, 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000 };
+
+    const DDS_PIXELFORMAT DDSPF_R5G6B5 =
+        { sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 16, 0x0000f800, 0x000007e0, 0x0000001f, 0x00000000 };
+
+    const DDS_PIXELFORMAT DDSPF_A1R5G5B5 =
+        { sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 16, 0x00007c00, 0x000003e0, 0x0000001f, 0x00008000 };
+
+    const DDS_PIXELFORMAT DDSPF_A4R4G4B4 =
+        { sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 16, 0x00000f00, 0x000000f0, 0x0000000f, 0x0000f000 };
+
+    const DDS_PIXELFORMAT DDSPF_L8 =
+        { sizeof(DDS_PIXELFORMAT), DDS_LUMINANCE, 0,  8, 0xff, 0x00, 0x00, 0x00 };
+
+    const DDS_PIXELFORMAT DDSPF_L16 =
+        { sizeof(DDS_PIXELFORMAT), DDS_LUMINANCE, 0, 16, 0xffff, 0x0000, 0x0000, 0x0000 };
+
+    const DDS_PIXELFORMAT DDSPF_A8L8 =
+        { sizeof(DDS_PIXELFORMAT), DDS_LUMINANCEA, 0, 16, 0x00ff, 0x0000, 0x0000, 0xff00 };
+
+    const DDS_PIXELFORMAT DDSPF_A8 =
+        { sizeof(DDS_PIXELFORMAT), DDS_ALPHA, 0, 8, 0x00, 0x00, 0x00, 0xff };
+
+    const DDS_PIXELFORMAT DDSPF_V8U8 = 
+        { sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 16, 0x00ff, 0xff00, 0x0000, 0x0000 };
+
+    const DDS_PIXELFORMAT DDSPF_Q8W8V8U8 = 
+        { sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000 };
+
+    const DDS_PIXELFORMAT DDSPF_V16U16 = 
+        { sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000 };
+
+    // DXGI_FORMAT_R10G10B10A2_UNORM should be written using DX10 extension to avoid D3DX 10:10:10:2 reversal issue
+
+    // This indicates the DDS_HEADER_DXT10 extension is present (the format is in dxgiFormat)
+    const DDS_PIXELFORMAT DDSPF_DX10 =
+        { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D','X','1','0'), 0, 0, 0, 0, 0 };
+
+    //-----------------------------------------------------------------------------
+    struct handle_closer { void operator()(HANDLE h) { if (h) CloseHandle(h); } };
+
+    typedef public std::unique_ptr<void, handle_closer> ScopedHandle;
+
+    inline HANDLE safe_handle( HANDLE h ) { return (h == INVALID_HANDLE_VALUE) ? 0 : h; }
+
+    class auto_delete_file
+    {
+    public:
+        auto_delete_file(HANDLE hFile) : m_handle(hFile) {}
+        ~auto_delete_file()
+        {
+            if (m_handle)
+            {
+                FILE_DISPOSITION_INFO info = {};
+                info.DeleteFile = TRUE;
+                (void)SetFileInformationByHandle(m_handle, FileDispositionInfo, &info, sizeof(info));
+            }
+        }
+
+        void clear() { m_handle = 0; }
+
+    private:
+        HANDLE m_handle;
+
+        auto_delete_file(const auto_delete_file&) = delete;
+        auto_delete_file& operator=(const auto_delete_file&) = delete;
+    };
+
+    class auto_delete_file_wic
+    {
+    public:
+        auto_delete_file_wic(ComPtr<IWICStream>& hFile, const wchar_t* szFile) : m_handle(hFile), m_filename(szFile) {}
+        ~auto_delete_file_wic()
+        {
+            if (m_filename)
+            {
+                m_handle.Reset();
+                DeleteFileW(m_filename);
+            }
+        }
+
+        void clear() { m_filename = 0; }
+
+    private:
+        const wchar_t* m_filename;
+        ComPtr<IWICStream>& m_handle;
+
+        auto_delete_file_wic(const auto_delete_file_wic&) = delete;
+        auto_delete_file_wic& operator=(const auto_delete_file_wic&) = delete;
+    };
+
+    //--------------------------------------------------------------------------------------
+    // Return the BPP for a particular format
+    //--------------------------------------------------------------------------------------
+    size_t BitsPerPixel( _In_ DXGI_FORMAT fmt )
+    {
+        switch( fmt )
+        {
+        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
+        case DXGI_FORMAT_R32G32B32A32_FLOAT:
+        case DXGI_FORMAT_R32G32B32A32_UINT:
+        case DXGI_FORMAT_R32G32B32A32_SINT:
+            return 128;
+
+        case DXGI_FORMAT_R32G32B32_TYPELESS:
+        case DXGI_FORMAT_R32G32B32_FLOAT:
+        case DXGI_FORMAT_R32G32B32_UINT:
+        case DXGI_FORMAT_R32G32B32_SINT:
+            return 96;
+
+        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
+        case DXGI_FORMAT_R16G16B16A16_FLOAT:
+        case DXGI_FORMAT_R16G16B16A16_UNORM:
+        case DXGI_FORMAT_R16G16B16A16_UINT:
+        case DXGI_FORMAT_R16G16B16A16_SNORM:
+        case DXGI_FORMAT_R16G16B16A16_SINT:
+        case DXGI_FORMAT_R32G32_TYPELESS:
+        case DXGI_FORMAT_R32G32_FLOAT:
+        case DXGI_FORMAT_R32G32_UINT:
+        case DXGI_FORMAT_R32G32_SINT:
+        case DXGI_FORMAT_R32G8X24_TYPELESS:
+        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
+        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
+        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
+        case DXGI_FORMAT_Y416:
+        case DXGI_FORMAT_Y210:
+        case DXGI_FORMAT_Y216:
+            return 64;
+
+        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
+        case DXGI_FORMAT_R10G10B10A2_UNORM:
+        case DXGI_FORMAT_R10G10B10A2_UINT:
+        case DXGI_FORMAT_R11G11B10_FLOAT:
+        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
+        case DXGI_FORMAT_R8G8B8A8_UNORM:
+        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
+        case DXGI_FORMAT_R8G8B8A8_UINT:
+        case DXGI_FORMAT_R8G8B8A8_SNORM:
+        case DXGI_FORMAT_R8G8B8A8_SINT:
+        case DXGI_FORMAT_R16G16_TYPELESS:
+        case DXGI_FORMAT_R16G16_FLOAT:
+        case DXGI_FORMAT_R16G16_UNORM:
+        case DXGI_FORMAT_R16G16_UINT:
+        case DXGI_FORMAT_R16G16_SNORM:
+        case DXGI_FORMAT_R16G16_SINT:
+        case DXGI_FORMAT_R32_TYPELESS:
+        case DXGI_FORMAT_D32_FLOAT:
+        case DXGI_FORMAT_R32_FLOAT:
+        case DXGI_FORMAT_R32_UINT:
+        case DXGI_FORMAT_R32_SINT:
+        case DXGI_FORMAT_R24G8_TYPELESS:
+        case DXGI_FORMAT_D24_UNORM_S8_UINT:
+        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
+        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
+        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
+        case DXGI_FORMAT_R8G8_B8G8_UNORM:
+        case DXGI_FORMAT_G8R8_G8B8_UNORM:
+        case DXGI_FORMAT_B8G8R8A8_UNORM:
+        case DXGI_FORMAT_B8G8R8X8_UNORM:
+        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
+        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
+        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
+        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
+        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
+        case DXGI_FORMAT_AYUV:
+        case DXGI_FORMAT_Y410:
+        case DXGI_FORMAT_YUY2:
+            return 32;
+
+        case DXGI_FORMAT_P010:
+        case DXGI_FORMAT_P016:
+            return 24;
+
+        case DXGI_FORMAT_R8G8_TYPELESS:
+        case DXGI_FORMAT_R8G8_UNORM:
+        case DXGI_FORMAT_R8G8_UINT:
+        case DXGI_FORMAT_R8G8_SNORM:
+        case DXGI_FORMAT_R8G8_SINT:
+        case DXGI_FORMAT_R16_TYPELESS:
+        case DXGI_FORMAT_R16_FLOAT:
+        case DXGI_FORMAT_D16_UNORM:
+        case DXGI_FORMAT_R16_UNORM:
+        case DXGI_FORMAT_R16_UINT:
+        case DXGI_FORMAT_R16_SNORM:
+        case DXGI_FORMAT_R16_SINT:
+        case DXGI_FORMAT_B5G6R5_UNORM:
+        case DXGI_FORMAT_B5G5R5A1_UNORM:
+        case DXGI_FORMAT_A8P8:
+        case DXGI_FORMAT_B4G4R4A4_UNORM:
+            return 16;
+
+        case DXGI_FORMAT_NV12:
+        case DXGI_FORMAT_420_OPAQUE:
+        case DXGI_FORMAT_NV11:
+            return 12;
+
+        case DXGI_FORMAT_R8_TYPELESS:
+        case DXGI_FORMAT_R8_UNORM:
+        case DXGI_FORMAT_R8_UINT:
+        case DXGI_FORMAT_R8_SNORM:
+        case DXGI_FORMAT_R8_SINT:
+        case DXGI_FORMAT_A8_UNORM:
+        case DXGI_FORMAT_AI44:
+        case DXGI_FORMAT_IA44:
+        case DXGI_FORMAT_P8:
+            return 8;
+
+        case DXGI_FORMAT_R1_UNORM:
+            return 1;
+
+        case DXGI_FORMAT_BC1_TYPELESS:
+        case DXGI_FORMAT_BC1_UNORM:
+        case DXGI_FORMAT_BC1_UNORM_SRGB:
+        case DXGI_FORMAT_BC4_TYPELESS:
+        case DXGI_FORMAT_BC4_UNORM:
+        case DXGI_FORMAT_BC4_SNORM:
+            return 4;
+
+        case DXGI_FORMAT_BC2_TYPELESS:
+        case DXGI_FORMAT_BC2_UNORM:
+        case DXGI_FORMAT_BC2_UNORM_SRGB:
+        case DXGI_FORMAT_BC3_TYPELESS:
+        case DXGI_FORMAT_BC3_UNORM:
+        case DXGI_FORMAT_BC3_UNORM_SRGB:
+        case DXGI_FORMAT_BC5_TYPELESS:
+        case DXGI_FORMAT_BC5_UNORM:
+        case DXGI_FORMAT_BC5_SNORM:
+        case DXGI_FORMAT_BC6H_TYPELESS:
+        case DXGI_FORMAT_BC6H_UF16:
+        case DXGI_FORMAT_BC6H_SF16:
+        case DXGI_FORMAT_BC7_TYPELESS:
+        case DXGI_FORMAT_BC7_UNORM:
+        case DXGI_FORMAT_BC7_UNORM_SRGB:
+            return 8;
+
+        default:
+            return 0;
+        }
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    // Determines if the format is block compressed
+    //--------------------------------------------------------------------------------------
+    bool IsCompressed( _In_ DXGI_FORMAT fmt )
+    {
+        switch ( fmt )
+        {
+        case DXGI_FORMAT_BC1_TYPELESS:
+        case DXGI_FORMAT_BC1_UNORM:
+        case DXGI_FORMAT_BC1_UNORM_SRGB:
+        case DXGI_FORMAT_BC2_TYPELESS:
+        case DXGI_FORMAT_BC2_UNORM:
+        case DXGI_FORMAT_BC2_UNORM_SRGB:
+        case DXGI_FORMAT_BC3_TYPELESS:
+        case DXGI_FORMAT_BC3_UNORM:
+        case DXGI_FORMAT_BC3_UNORM_SRGB:
+        case DXGI_FORMAT_BC4_TYPELESS:
+        case DXGI_FORMAT_BC4_UNORM:
+        case DXGI_FORMAT_BC4_SNORM:
+        case DXGI_FORMAT_BC5_TYPELESS:
+        case DXGI_FORMAT_BC5_UNORM:
+        case DXGI_FORMAT_BC5_SNORM:
+        case DXGI_FORMAT_BC6H_TYPELESS:
+        case DXGI_FORMAT_BC6H_UF16:
+        case DXGI_FORMAT_BC6H_SF16:
+        case DXGI_FORMAT_BC7_TYPELESS:
+        case DXGI_FORMAT_BC7_UNORM:
+        case DXGI_FORMAT_BC7_UNORM_SRGB:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    // Get surface information for a particular format
+    //--------------------------------------------------------------------------------------
+    void GetSurfaceInfo(
+        _In_ size_t width,
+        _In_ size_t height,
+        _In_ DXGI_FORMAT fmt,
+        _Out_opt_ size_t* outNumBytes,
+        _Out_opt_ size_t* outRowBytes,
+        _Out_opt_ size_t* outNumRows )
+    {
+        size_t numBytes = 0;
+        size_t rowBytes = 0;
+        size_t numRows = 0;
+
+        bool bc = false;
+        bool packed = false;
+        bool planar = false;
+        size_t bpe = 0;
+        switch (fmt)
+        {
+        case DXGI_FORMAT_BC1_TYPELESS:
+        case DXGI_FORMAT_BC1_UNORM:
+        case DXGI_FORMAT_BC1_UNORM_SRGB:
+        case DXGI_FORMAT_BC4_TYPELESS:
+        case DXGI_FORMAT_BC4_UNORM:
+        case DXGI_FORMAT_BC4_SNORM:
+            bc=true;
+            bpe = 8;
+            break;
+
+        case DXGI_FORMAT_BC2_TYPELESS:
+        case DXGI_FORMAT_BC2_UNORM:
+        case DXGI_FORMAT_BC2_UNORM_SRGB:
+        case DXGI_FORMAT_BC3_TYPELESS:
+        case DXGI_FORMAT_BC3_UNORM:
+        case DXGI_FORMAT_BC3_UNORM_SRGB:
+        case DXGI_FORMAT_BC5_TYPELESS:
+        case DXGI_FORMAT_BC5_UNORM:
+        case DXGI_FORMAT_BC5_SNORM:
+        case DXGI_FORMAT_BC6H_TYPELESS:
+        case DXGI_FORMAT_BC6H_UF16:
+        case DXGI_FORMAT_BC6H_SF16:
+        case DXGI_FORMAT_BC7_TYPELESS:
+        case DXGI_FORMAT_BC7_UNORM:
+        case DXGI_FORMAT_BC7_UNORM_SRGB:
+            bc = true;
+            bpe = 16;
+            break;
+
+        case DXGI_FORMAT_R8G8_B8G8_UNORM:
+        case DXGI_FORMAT_G8R8_G8B8_UNORM:
+        case DXGI_FORMAT_YUY2:
+            packed = true;
+            bpe = 4;
+            break;
+
+        case DXGI_FORMAT_Y210:
+        case DXGI_FORMAT_Y216:
+            packed = true;
+            bpe = 8;
+            break;
+
+        case DXGI_FORMAT_NV12:
+        case DXGI_FORMAT_420_OPAQUE:
+            planar = true;
+            bpe = 2;
+            break;
+
+        case DXGI_FORMAT_P010:
+        case DXGI_FORMAT_P016:
+            planar = true;
+            bpe = 4;
+            break;
+        }
+
+        if (bc)
+        {
+            size_t numBlocksWide = 0;
+            if (width > 0)
+            {
+                numBlocksWide = std::max<size_t>( 1, (width + 3) / 4 );
+            }
+            size_t numBlocksHigh = 0;
+            if (height > 0)
+            {
+                numBlocksHigh = std::max<size_t>( 1, (height + 3) / 4 );
+            }
+            rowBytes = numBlocksWide * bpe;
+            numRows = numBlocksHigh;
+            numBytes = rowBytes * numBlocksHigh;
+        }
+        else if (packed)
+        {
+            rowBytes = ( ( width + 1 ) >> 1 ) * bpe;
+            numRows = height;
+            numBytes = rowBytes * height;
+        }
+        else if ( fmt == DXGI_FORMAT_NV11 )
+        {
+            rowBytes = ( ( width + 3 ) >> 2 ) * 4;
+            numRows = height * 2; // Direct3D makes this simplifying assumption, although it is larger than the 4:1:1 data
+            numBytes = rowBytes * numRows;
+        }
+        else if (planar)
+        {
+            rowBytes = ( ( width + 1 ) >> 1 ) * bpe;
+            numBytes = ( rowBytes * height ) + ( ( rowBytes * height + 1 ) >> 1 );
+            numRows = height + ( ( height + 1 ) >> 1 );
+        }
+        else
+        {
+            size_t bpp = BitsPerPixel( fmt );
+            rowBytes = ( width * bpp + 7 ) / 8; // round up to nearest byte
+            numRows = height;
+            numBytes = rowBytes * height;
+        }
+
+        if (outNumBytes)
+        {
+            *outNumBytes = numBytes;
+        }
+        if (outRowBytes)
+        {
+            *outRowBytes = rowBytes;
+        }
+        if (outNumRows)
+        {
+            *outNumRows = numRows;
+        }
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    DXGI_FORMAT EnsureNotTypeless( DXGI_FORMAT fmt )
+    {
+        // Assumes UNORM or FLOAT; doesn't use UINT or SINT
+        switch( fmt )
+        {
+        case DXGI_FORMAT_R32G32B32A32_TYPELESS: return DXGI_FORMAT_R32G32B32A32_FLOAT;
+        case DXGI_FORMAT_R32G32B32_TYPELESS:    return DXGI_FORMAT_R32G32B32_FLOAT;
+        case DXGI_FORMAT_R16G16B16A16_TYPELESS: return DXGI_FORMAT_R16G16B16A16_UNORM;
+        case DXGI_FORMAT_R32G32_TYPELESS:       return DXGI_FORMAT_R32G32_FLOAT;
+        case DXGI_FORMAT_R10G10B10A2_TYPELESS:  return DXGI_FORMAT_R10G10B10A2_UNORM;
+        case DXGI_FORMAT_R8G8B8A8_TYPELESS:     return DXGI_FORMAT_R8G8B8A8_UNORM;
+        case DXGI_FORMAT_R16G16_TYPELESS:       return DXGI_FORMAT_R16G16_UNORM;
+        case DXGI_FORMAT_R32_TYPELESS:          return DXGI_FORMAT_R32_FLOAT;
+        case DXGI_FORMAT_R8G8_TYPELESS:         return DXGI_FORMAT_R8G8_UNORM;
+        case DXGI_FORMAT_R16_TYPELESS:          return DXGI_FORMAT_R16_UNORM;
+        case DXGI_FORMAT_R8_TYPELESS:           return DXGI_FORMAT_R8_UNORM;
+        case DXGI_FORMAT_BC1_TYPELESS:          return DXGI_FORMAT_BC1_UNORM;
+        case DXGI_FORMAT_BC2_TYPELESS:          return DXGI_FORMAT_BC2_UNORM;
+        case DXGI_FORMAT_BC3_TYPELESS:          return DXGI_FORMAT_BC3_UNORM;
+        case DXGI_FORMAT_BC4_TYPELESS:          return DXGI_FORMAT_BC4_UNORM;
+        case DXGI_FORMAT_BC5_TYPELESS:          return DXGI_FORMAT_BC5_UNORM;
+        case DXGI_FORMAT_B8G8R8A8_TYPELESS:     return DXGI_FORMAT_B8G8R8A8_UNORM;
+        case DXGI_FORMAT_B8G8R8X8_TYPELESS:     return DXGI_FORMAT_B8G8R8X8_UNORM;
+        case DXGI_FORMAT_BC7_TYPELESS:          return DXGI_FORMAT_BC7_UNORM;
+        default:                                return fmt;
+        }
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    HRESULT CaptureTexture(
+        _In_ ID3D11DeviceContext* pContext,
+        _In_ ID3D11Resource* pSource,
+        D3D11_TEXTURE2D_DESC& desc,
+        ComPtr<ID3D11Texture2D>& pStaging )
+    {
+        if ( !pContext || !pSource )
+            return E_INVALIDARG;
+
+        D3D11_RESOURCE_DIMENSION resType = D3D11_RESOURCE_DIMENSION_UNKNOWN;
+        pSource->GetType( &resType );
+
+        if ( resType != D3D11_RESOURCE_DIMENSION_TEXTURE2D )
+            return HRESULT_FROM_WIN32( ERROR_NOT_SUPPORTED );
+
+        ComPtr<ID3D11Texture2D> pTexture;
+        HRESULT hr = pSource->QueryInterface(IID_PPV_ARGS(pTexture.GetAddressOf()));
+        if ( FAILED(hr) )
+            return hr;
+
+        assert( pTexture );
+
+        pTexture->GetDesc( &desc );
+
+        ComPtr<ID3D11Device> d3dDevice;
+        pContext->GetDevice( d3dDevice.GetAddressOf() );
+
+        if ( desc.SampleDesc.Count > 1 )
+        {
+            // MSAA content must be resolved before being copied to a staging texture
+            desc.SampleDesc.Count = 1;
+            desc.SampleDesc.Quality = 0;
+
+            ComPtr<ID3D11Texture2D> pTemp;
+            hr = d3dDevice->CreateTexture2D( &desc, 0, pTemp.GetAddressOf() );
+            if ( FAILED(hr) )
+                return hr;
+
+            assert( pTemp );
+
+            DXGI_FORMAT fmt = EnsureNotTypeless( desc.Format );
+
+            UINT support = 0;
+            hr = d3dDevice->CheckFormatSupport( fmt, &support );
+            if ( FAILED(hr) )
+                return hr;
+
+            if ( !(support & D3D11_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE) )
+                return E_FAIL;
+
+            for( UINT item = 0; item < desc.ArraySize; ++item )
+            {
+                for( UINT level = 0; level < desc.MipLevels; ++level )
+                {
+                    UINT index = D3D11CalcSubresource( level, item, desc.MipLevels );
+                    pContext->ResolveSubresource( pTemp.Get(), index, pSource, index, fmt );
+                }
+            }
+
+            desc.BindFlags = 0;
+            desc.MiscFlags &= D3D11_RESOURCE_MISC_TEXTURECUBE;
+            desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+            desc.Usage = D3D11_USAGE_STAGING;
+
+            hr = d3dDevice->CreateTexture2D(&desc, 0, pStaging.ReleaseAndGetAddressOf());
+            if ( FAILED(hr) )
+                return hr;
+
+            assert( pStaging );
+
+            pContext->CopyResource( pStaging.Get(), pTemp.Get() );
+        }
+        else if ( (desc.Usage == D3D11_USAGE_STAGING) && (desc.CPUAccessFlags & D3D11_CPU_ACCESS_READ) )
+        {
+            // Handle case where the source is already a staging texture we can use directly
+            pStaging = pTexture;
+        }
+        else
+        {
+            // Otherwise, create a staging texture from the non-MSAA source
+            desc.BindFlags = 0;
+            desc.MiscFlags &= D3D11_RESOURCE_MISC_TEXTURECUBE;
+            desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+            desc.Usage = D3D11_USAGE_STAGING;
+
+            hr = d3dDevice->CreateTexture2D(&desc, 0, pStaging.ReleaseAndGetAddressOf());
+            if ( FAILED(hr) )
+                return hr;
+
+            assert( pStaging );
+
+            pContext->CopyResource( pStaging.Get(), pSource );
+        }
+
+        return S_OK;
+    }
+
+    //--------------------------------------------------------------------------------------
+    bool g_WIC2 = false;
+
+    IWICImagingFactory* _GetWIC()
+    {
+        static INIT_ONCE s_initOnce = INIT_ONCE_STATIC_INIT;
+
+        IWICImagingFactory* factory = nullptr;
+        InitOnceExecuteOnce(&s_initOnce,
+            [](PINIT_ONCE, PVOID, LPVOID *factory) -> BOOL
+            {
+            #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
+                HRESULT hr = CoCreateInstance(
+                    CLSID_WICImagingFactory2,
+                    nullptr,
+                    CLSCTX_INPROC_SERVER,
+                    __uuidof(IWICImagingFactory2),
+                    factory
+                    );
+
+                if ( SUCCEEDED(hr) )
+                {
+                    // WIC2 is available on Windows 10, Windows 8.x, and Windows 7 SP1 with KB 2670838 installed
+                    g_WIC2 = true;
+                    return TRUE;
+                }
+                else
+                {
+                    hr = CoCreateInstance(
+                        CLSID_WICImagingFactory1,
+                        nullptr,
+                        CLSCTX_INPROC_SERVER,
+                        __uuidof(IWICImagingFactory),
+                        factory
+                        );
+                    return SUCCEEDED(hr) ? TRUE : FALSE;
+                }
+            #else
+                return SUCCEEDED( CoCreateInstance(
+                    CLSID_WICImagingFactory,
+                    nullptr,
+                    CLSCTX_INPROC_SERVER,
+                    __uuidof(IWICImagingFactory),
+                    factory) ) ? TRUE : FALSE;
+            #endif
+            }, nullptr, reinterpret_cast<LPVOID*>(&factory));
+
+        return factory;
+    }
+} // anonymous namespace
+
+
+//--------------------------------------------------------------------------------------
+HRESULT DirectX::SaveDDSTextureToFile( _In_ ID3D11DeviceContext* pContext,
+                                       _In_ ID3D11Resource* pSource,
+                                       _In_z_ const wchar_t* fileName )
+{
+    if ( !fileName )
+        return E_INVALIDARG;
+
+    D3D11_TEXTURE2D_DESC desc = {};
+    ComPtr<ID3D11Texture2D> pStaging;
+    HRESULT hr = CaptureTexture( pContext, pSource, desc, pStaging );
+    if ( FAILED(hr) )
+        return hr;
+
+    // Create file
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
+    ScopedHandle hFile( safe_handle( CreateFile2( fileName, GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr ) ) );
+#else
+    ScopedHandle hFile( safe_handle( CreateFileW( fileName, GENERIC_WRITE | DELETE, 0, nullptr, CREATE_ALWAYS, 0, nullptr ) ) );
+#endif
+    if ( !hFile )
+        return HRESULT_FROM_WIN32( GetLastError() );
+
+    auto_delete_file delonfail(hFile.get());
+
+    // Setup header
+    const size_t MAX_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10);
+    uint8_t fileHeader[ MAX_HEADER_SIZE ];
+
+    *reinterpret_cast<uint32_t*>(&fileHeader[0]) = DDS_MAGIC;
+
+    auto header = reinterpret_cast<DDS_HEADER*>( &fileHeader[0] + sizeof(uint32_t) );
+    size_t headerSize = sizeof(uint32_t) + sizeof(DDS_HEADER);
+    memset( header, 0, sizeof(DDS_HEADER) );
+    header->size = sizeof( DDS_HEADER );
+    header->flags = DDS_HEADER_FLAGS_TEXTURE | DDS_HEADER_FLAGS_MIPMAP;
+    header->height = desc.Height;
+    header->width = desc.Width;
+    header->mipMapCount = 1;
+    header->caps = DDS_SURFACE_FLAGS_TEXTURE;
+
+    // Try to use a legacy .DDS pixel format for better tools support, otherwise fallback to 'DX10' header extension
+    DDS_HEADER_DXT10* extHeader = nullptr;
+    switch( desc.Format )
+    {
+    case DXGI_FORMAT_R8G8B8A8_UNORM:        memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_A8B8G8R8, sizeof(DDS_PIXELFORMAT) );    break;
+    case DXGI_FORMAT_R16G16_UNORM:          memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_G16R16, sizeof(DDS_PIXELFORMAT) );      break;
+    case DXGI_FORMAT_R8G8_UNORM:            memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_A8L8, sizeof(DDS_PIXELFORMAT) );        break;
+    case DXGI_FORMAT_R16_UNORM:             memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_L16, sizeof(DDS_PIXELFORMAT) );         break;
+    case DXGI_FORMAT_R8_UNORM:              memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_L8, sizeof(DDS_PIXELFORMAT) );          break;
+    case DXGI_FORMAT_A8_UNORM:              memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_A8, sizeof(DDS_PIXELFORMAT) );          break;
+    case DXGI_FORMAT_R8G8_B8G8_UNORM:       memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_R8G8_B8G8, sizeof(DDS_PIXELFORMAT) );   break;
+    case DXGI_FORMAT_G8R8_G8B8_UNORM:       memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_G8R8_G8B8, sizeof(DDS_PIXELFORMAT) );   break;
+    case DXGI_FORMAT_BC1_UNORM:             memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_DXT1, sizeof(DDS_PIXELFORMAT) );        break;
+    case DXGI_FORMAT_BC2_UNORM:             memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_DXT3, sizeof(DDS_PIXELFORMAT) );        break;
+    case DXGI_FORMAT_BC3_UNORM:             memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_DXT5, sizeof(DDS_PIXELFORMAT) );        break;
+    case DXGI_FORMAT_BC4_UNORM:             memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_BC4_UNORM, sizeof(DDS_PIXELFORMAT) );   break;
+    case DXGI_FORMAT_BC4_SNORM:             memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_BC4_SNORM, sizeof(DDS_PIXELFORMAT) );   break;
+    case DXGI_FORMAT_BC5_UNORM:             memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_BC5_UNORM, sizeof(DDS_PIXELFORMAT) );   break;
+    case DXGI_FORMAT_BC5_SNORM:             memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_BC5_SNORM, sizeof(DDS_PIXELFORMAT) );   break;
+    case DXGI_FORMAT_B5G6R5_UNORM:          memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_R5G6B5, sizeof(DDS_PIXELFORMAT) );      break;
+    case DXGI_FORMAT_B5G5R5A1_UNORM:        memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_A1R5G5B5, sizeof(DDS_PIXELFORMAT) );    break;
+    case DXGI_FORMAT_R8G8_SNORM:            memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_V8U8, sizeof(DDS_PIXELFORMAT) );        break;
+    case DXGI_FORMAT_R8G8B8A8_SNORM:        memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_Q8W8V8U8, sizeof(DDS_PIXELFORMAT) );    break;
+    case DXGI_FORMAT_R16G16_SNORM:          memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_V16U16, sizeof(DDS_PIXELFORMAT) );      break;
+    case DXGI_FORMAT_B8G8R8A8_UNORM:        memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_A8R8G8B8, sizeof(DDS_PIXELFORMAT) );    break; // DXGI 1.1
+    case DXGI_FORMAT_B8G8R8X8_UNORM:        memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_X8R8G8B8, sizeof(DDS_PIXELFORMAT) );    break; // DXGI 1.1
+    case DXGI_FORMAT_YUY2:                  memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_YUY2, sizeof(DDS_PIXELFORMAT) );        break; // DXGI 1.2
+    case DXGI_FORMAT_B4G4R4A4_UNORM:        memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_A4R4G4B4, sizeof(DDS_PIXELFORMAT) );    break; // DXGI 1.2
+
+    // Legacy D3DX formats using D3DFMT enum value as FourCC
+    case DXGI_FORMAT_R32G32B32A32_FLOAT:    header->ddspf.size = sizeof(DDS_PIXELFORMAT); header->ddspf.flags = DDS_FOURCC; header->ddspf.fourCC = 116; break; // D3DFMT_A32B32G32R32F
+    case DXGI_FORMAT_R16G16B16A16_FLOAT:    header->ddspf.size = sizeof(DDS_PIXELFORMAT); header->ddspf.flags = DDS_FOURCC; header->ddspf.fourCC = 113; break; // D3DFMT_A16B16G16R16F
+    case DXGI_FORMAT_R16G16B16A16_UNORM:    header->ddspf.size = sizeof(DDS_PIXELFORMAT); header->ddspf.flags = DDS_FOURCC; header->ddspf.fourCC = 36;  break; // D3DFMT_A16B16G16R16
+    case DXGI_FORMAT_R16G16B16A16_SNORM:    header->ddspf.size = sizeof(DDS_PIXELFORMAT); header->ddspf.flags = DDS_FOURCC; header->ddspf.fourCC = 110; break; // D3DFMT_Q16W16V16U16
+    case DXGI_FORMAT_R32G32_FLOAT:          header->ddspf.size = sizeof(DDS_PIXELFORMAT); header->ddspf.flags = DDS_FOURCC; header->ddspf.fourCC = 115; break; // D3DFMT_G32R32F
+    case DXGI_FORMAT_R16G16_FLOAT:          header->ddspf.size = sizeof(DDS_PIXELFORMAT); header->ddspf.flags = DDS_FOURCC; header->ddspf.fourCC = 112; break; // D3DFMT_G16R16F
+    case DXGI_FORMAT_R32_FLOAT:             header->ddspf.size = sizeof(DDS_PIXELFORMAT); header->ddspf.flags = DDS_FOURCC; header->ddspf.fourCC = 114; break; // D3DFMT_R32F
+    case DXGI_FORMAT_R16_FLOAT:             header->ddspf.size = sizeof(DDS_PIXELFORMAT); header->ddspf.flags = DDS_FOURCC; header->ddspf.fourCC = 111; break; // D3DFMT_R16F
+
+    case DXGI_FORMAT_AI44:
+    case DXGI_FORMAT_IA44:
+    case DXGI_FORMAT_P8:
+    case DXGI_FORMAT_A8P8:
+        return HRESULT_FROM_WIN32( ERROR_NOT_SUPPORTED );
+
+    default:
+        memcpy_s( &header->ddspf, sizeof(header->ddspf), &DDSPF_DX10, sizeof(DDS_PIXELFORMAT) );
+
+        headerSize += sizeof(DDS_HEADER_DXT10);
+        extHeader = reinterpret_cast<DDS_HEADER_DXT10*>( reinterpret_cast<uint8_t*>(&fileHeader[0]) + sizeof(uint32_t) + sizeof(DDS_HEADER) );
+        memset( extHeader, 0, sizeof(DDS_HEADER_DXT10) );
+        extHeader->dxgiFormat = desc.Format;
+        extHeader->resourceDimension = D3D11_RESOURCE_DIMENSION_TEXTURE2D;
+        extHeader->arraySize = 1;
+        break;
+    }
+
+    size_t rowPitch, slicePitch, rowCount;
+    GetSurfaceInfo( desc.Width, desc.Height, desc.Format, &slicePitch, &rowPitch, &rowCount );
+
+    if ( IsCompressed( desc.Format ) )
+    {
+        header->flags |= DDS_HEADER_FLAGS_LINEARSIZE;
+        header->pitchOrLinearSize = static_cast<uint32_t>( slicePitch );
+    }
+    else
+    {
+        header->flags |= DDS_HEADER_FLAGS_PITCH;
+        header->pitchOrLinearSize = static_cast<uint32_t>( rowPitch );
+    }
+
+    // Setup pixels
+    std::unique_ptr<uint8_t[]> pixels( new (std::nothrow) uint8_t[ slicePitch ] );
+    if (!pixels)
+        return E_OUTOFMEMORY;
+
+    D3D11_MAPPED_SUBRESOURCE mapped;
+    hr = pContext->Map( pStaging.Get(), 0, D3D11_MAP_READ, 0, &mapped );
+    if ( FAILED(hr) )
+        return hr;
+
+    auto sptr = reinterpret_cast<const uint8_t*>( mapped.pData );
+    if ( !sptr )
+    {
+        pContext->Unmap( pStaging.Get(), 0 );
+        return E_POINTER;
+    }
+
+    uint8_t* dptr = pixels.get();
+
+    size_t msize = std::min<size_t>( rowPitch, mapped.RowPitch );
+    for( size_t h = 0; h < rowCount; ++h )
+    {
+        memcpy_s( dptr, rowPitch, sptr, msize );
+        sptr += mapped.RowPitch;
+        dptr += rowPitch;
+    }
+
+    pContext->Unmap( pStaging.Get(), 0 );
+
+    // Write header & pixels
+    DWORD bytesWritten;
+    if ( !WriteFile( hFile.get(), fileHeader, static_cast<DWORD>( headerSize ), &bytesWritten, nullptr ) )
+        return HRESULT_FROM_WIN32( GetLastError() );
+
+    if ( bytesWritten != headerSize )
+        return E_FAIL;
+
+    if ( !WriteFile( hFile.get(), pixels.get(), static_cast<DWORD>( slicePitch ), &bytesWritten, nullptr ) )
+        return HRESULT_FROM_WIN32( GetLastError() );
+
+    if ( bytesWritten != slicePitch )
+        return E_FAIL;
+
+    delonfail.clear();
+
+    return S_OK;
+}
+
+//--------------------------------------------------------------------------------------
+HRESULT DirectX::SaveWICTextureToFile( _In_ ID3D11DeviceContext* pContext,
+                                       _In_ ID3D11Resource* pSource,
+                                       _In_ REFGUID guidContainerFormat, 
+                                       _In_z_ const wchar_t* fileName,
+                                       _In_opt_ const GUID* targetFormat,
+                                       _In_opt_ std::function<void(IPropertyBag2*)> setCustomProps )
+{
+    if ( !fileName )
+        return E_INVALIDARG;
+
+    D3D11_TEXTURE2D_DESC desc = {};
+    ComPtr<ID3D11Texture2D> pStaging;
+    HRESULT hr = CaptureTexture( pContext, pSource, desc, pStaging );
+    if ( FAILED(hr) )
+        return hr;
+
+    // Determine source format's WIC equivalent
+    WICPixelFormatGUID pfGuid;
+    bool sRGB = false;
+    switch ( desc.Format )
+    {
+    case DXGI_FORMAT_R32G32B32A32_FLOAT:            pfGuid = GUID_WICPixelFormat128bppRGBAFloat; break;
+    case DXGI_FORMAT_R16G16B16A16_FLOAT:            pfGuid = GUID_WICPixelFormat64bppRGBAHalf; break;
+    case DXGI_FORMAT_R16G16B16A16_UNORM:            pfGuid = GUID_WICPixelFormat64bppRGBA; break;
+    case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:    pfGuid = GUID_WICPixelFormat32bppRGBA1010102XR; break; // DXGI 1.1
+    case DXGI_FORMAT_R10G10B10A2_UNORM:             pfGuid = GUID_WICPixelFormat32bppRGBA1010102; break;
+    case DXGI_FORMAT_B5G5R5A1_UNORM:                pfGuid = GUID_WICPixelFormat16bppBGRA5551; break;
+    case DXGI_FORMAT_B5G6R5_UNORM:                  pfGuid = GUID_WICPixelFormat16bppBGR565; break;
+    case DXGI_FORMAT_R32_FLOAT:                     pfGuid = GUID_WICPixelFormat32bppGrayFloat; break;
+    case DXGI_FORMAT_R16_FLOAT:                     pfGuid = GUID_WICPixelFormat16bppGrayHalf; break;
+    case DXGI_FORMAT_R16_UNORM:                     pfGuid = GUID_WICPixelFormat16bppGray; break;
+    case DXGI_FORMAT_R8_UNORM:                      pfGuid = GUID_WICPixelFormat8bppGray; break;
+    case DXGI_FORMAT_A8_UNORM:                      pfGuid = GUID_WICPixelFormat8bppAlpha; break;
+
+    case DXGI_FORMAT_R8G8B8A8_UNORM:
+        pfGuid = GUID_WICPixelFormat32bppRGBA;
+        break;
+
+    case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
+        pfGuid = GUID_WICPixelFormat32bppRGBA;
+        sRGB = true;
+        break;
+
+    case DXGI_FORMAT_B8G8R8A8_UNORM: // DXGI 1.1
+        pfGuid = GUID_WICPixelFormat32bppBGRA;
+        break;
+
+    case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: // DXGI 1.1
+        pfGuid = GUID_WICPixelFormat32bppBGRA;
+        sRGB = true;
+        break;
+
+    case DXGI_FORMAT_B8G8R8X8_UNORM: // DXGI 1.1
+        pfGuid = GUID_WICPixelFormat32bppBGR;
+        break; 
+
+    case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: // DXGI 1.1
+        pfGuid = GUID_WICPixelFormat32bppBGR;
+        sRGB = true;
+        break; 
+
+    default:
+        return HRESULT_FROM_WIN32( ERROR_NOT_SUPPORTED );
+    }
+
+    auto pWIC = _GetWIC();
+    if ( !pWIC )
+        return E_NOINTERFACE;
+
+    ComPtr<IWICStream> stream;
+    hr = pWIC->CreateStream( stream.GetAddressOf() );
+    if ( FAILED(hr) )
+        return hr;
+
+    hr = stream->InitializeFromFilename( fileName, GENERIC_WRITE );
+    if ( FAILED(hr) )
+        return hr;
+
+    auto_delete_file_wic delonfail(stream, fileName);
+
+    ComPtr<IWICBitmapEncoder> encoder;
+    hr = pWIC->CreateEncoder( guidContainerFormat, 0, encoder.GetAddressOf() );
+    if ( FAILED(hr) )
+        return hr;
+
+    hr = encoder->Initialize( stream.Get(), WICBitmapEncoderNoCache );
+    if ( FAILED(hr) )
+        return hr;
+
+    ComPtr<IWICBitmapFrameEncode> frame;
+    ComPtr<IPropertyBag2> props;
+    hr = encoder->CreateNewFrame( frame.GetAddressOf(), props.GetAddressOf() );
+    if ( FAILED(hr) )
+        return hr;
+
+    if ( targetFormat && memcmp( &guidContainerFormat, &GUID_ContainerFormatBmp, sizeof(WICPixelFormatGUID) ) == 0 && g_WIC2 )
+    {
+        // Opt-in to the WIC2 support for writing 32-bit Windows BMP files with an alpha channel
+        PROPBAG2 option = {};
+        option.pstrName = const_cast<wchar_t*>(L"EnableV5Header32bppBGRA");
+
+        VARIANT varValue;    
+        varValue.vt = VT_BOOL;
+        varValue.boolVal = VARIANT_TRUE;      
+        (void)props->Write( 1, &option, &varValue ); 
+    }
+
+    if ( setCustomProps )
+    {
+        setCustomProps( props.Get() );
+    }
+
+    hr = frame->Initialize( props.Get() );
+    if ( FAILED(hr) )
+        return hr;
+
+    hr = frame->SetSize( desc.Width , desc.Height );
+    if ( FAILED(hr) )
+        return hr;
+
+    hr = frame->SetResolution( 72, 72 );
+    if ( FAILED(hr) )
+        return hr;
+
+    // Pick a target format
+    WICPixelFormatGUID targetGuid;
+    if ( targetFormat )
+    {
+        targetGuid = *targetFormat;
+    }
+    else
+    {
+        // Screenshots don’t typically include the alpha channel of the render target
+        switch ( desc.Format )
+        {
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
+        case DXGI_FORMAT_R32G32B32A32_FLOAT:            
+        case DXGI_FORMAT_R16G16B16A16_FLOAT:
+            if ( g_WIC2 )
+            {
+                targetGuid = GUID_WICPixelFormat96bppRGBFloat;
+            }
+            else
+            {
+                targetGuid = GUID_WICPixelFormat24bppBGR;
+            }
+            break;
+#endif
+
+        case DXGI_FORMAT_R16G16B16A16_UNORM: targetGuid = GUID_WICPixelFormat48bppBGR; break;
+        case DXGI_FORMAT_B5G5R5A1_UNORM:     targetGuid = GUID_WICPixelFormat16bppBGR555; break;
+        case DXGI_FORMAT_B5G6R5_UNORM:       targetGuid = GUID_WICPixelFormat16bppBGR565; break;
+
+        case DXGI_FORMAT_R32_FLOAT:
+        case DXGI_FORMAT_R16_FLOAT:
+        case DXGI_FORMAT_R16_UNORM:
+        case DXGI_FORMAT_R8_UNORM:
+        case DXGI_FORMAT_A8_UNORM:
+            targetGuid = GUID_WICPixelFormat8bppGray;
+            break;
+
+        default:
+            targetGuid = GUID_WICPixelFormat24bppBGR;
+            break;
+        }
+    }
+
+    hr = frame->SetPixelFormat( &targetGuid );
+    if ( FAILED(hr) )
+        return hr;
+
+    if ( targetFormat && memcmp( targetFormat, &targetGuid, sizeof(WICPixelFormatGUID) ) != 0 )
+    {
+        // Requested output pixel format is not supported by the WIC codec
+        return E_FAIL;
+    }
+
+    // Encode WIC metadata
+    ComPtr<IWICMetadataQueryWriter> metawriter;
+    if ( SUCCEEDED( frame->GetMetadataQueryWriter( metawriter.GetAddressOf() ) ) )
+    {
+        PROPVARIANT value;
+        PropVariantInit( &value );
+
+        value.vt = VT_LPSTR;
+        value.pszVal = const_cast<char*>("DirectXTK");
+
+        if ( memcmp( &guidContainerFormat, &GUID_ContainerFormatPng, sizeof(GUID) ) == 0 )
+        {
+            // Set Software name
+            (void)metawriter->SetMetadataByName( L"/tEXt/{str=Software}", &value );
+
+            // Set sRGB chunk
+            if (sRGB)
+            {
+                value.vt = VT_UI1;
+                value.bVal = 0;
+                (void)metawriter->SetMetadataByName(L"/sRGB/RenderingIntent", &value);
+            }
+            else
+            {
+                // add gAMA chunk with gamma 1.0
+                value.vt = VT_UI4;
+                value.uintVal = 100000; // gama value * 100,000 -- i.e. gamma 1.0
+                (void)metawriter->SetMetadataByName(L"/gAMA/ImageGamma", &value);
+
+                // remove sRGB chunk which is added by default.
+                (void)metawriter->RemoveMetadataByName(L"/sRGB/RenderingIntent");
+            }
+        }
+        else
+        {
+            // Set Software name
+            (void)metawriter->SetMetadataByName( L"System.ApplicationName", &value );
+
+            if ( sRGB )
+            {
+                // Set EXIF Colorspace of sRGB
+                value.vt = VT_UI2;
+                value.uiVal = 1;
+                (void)metawriter->SetMetadataByName( L"System.Image.ColorSpace", &value );
+            }
+        }
+    }
+
+    D3D11_MAPPED_SUBRESOURCE mapped;
+    hr = pContext->Map( pStaging.Get(), 0, D3D11_MAP_READ, 0, &mapped );
+    if ( FAILED(hr) )
+        return hr;
+
+    if ( memcmp( &targetGuid, &pfGuid, sizeof(WICPixelFormatGUID) ) != 0 )
+    {
+        // Conversion required to write
+        ComPtr<IWICBitmap> source;
+        hr = pWIC->CreateBitmapFromMemory( desc.Width, desc.Height, pfGuid,
+                                           mapped.RowPitch, mapped.RowPitch * desc.Height,
+                                           reinterpret_cast<BYTE*>( mapped.pData ), source.GetAddressOf() );
+        if ( FAILED(hr) )
+        {
+            pContext->Unmap( pStaging.Get(), 0 );
+            return hr;
+        }
+
+        ComPtr<IWICFormatConverter> FC;
+        hr = pWIC->CreateFormatConverter( FC.GetAddressOf() );
+        if ( FAILED(hr) )
+        {
+            pContext->Unmap( pStaging.Get(), 0 );
+            return hr;
+        }
+
+        BOOL canConvert = FALSE;
+        hr = FC->CanConvert( pfGuid, targetGuid, &canConvert );
+        if ( FAILED(hr) || !canConvert )
+        {
+            return E_UNEXPECTED;
+        }
+
+        hr = FC->Initialize( source.Get(), targetGuid, WICBitmapDitherTypeNone, nullptr, 0, WICBitmapPaletteTypeMedianCut );
+        if ( FAILED(hr) )
+        {
+            pContext->Unmap( pStaging.Get(), 0 );
+            return hr;
+        }
+
+        WICRect rect = { 0, 0, static_cast<INT>( desc.Width ), static_cast<INT>( desc.Height ) };
+        hr = frame->WriteSource( FC.Get(), &rect );
+        if ( FAILED(hr) )
+        {
+            pContext->Unmap( pStaging.Get(), 0 );
+            return hr;
+        }
+    }
+    else
+    {
+        // No conversion required
+        hr = frame->WritePixels( desc.Height, mapped.RowPitch, mapped.RowPitch * desc.Height, reinterpret_cast<BYTE*>( mapped.pData ) );
+        if ( FAILED(hr) )
+            return hr;
+    }
+
+    pContext->Unmap( pStaging.Get(), 0 );
+
+    hr = frame->Commit();
+    if ( FAILED(hr) )
+        return hr;
+
+    hr = encoder->Commit();
+    if ( FAILED(hr) )
+        return hr;
+
+    delonfail.clear();
+
+    return S_OK;
+}
diff --git a/samples/DX_APIUsage/DXUT/Core/ScreenGrab.h b/samples/DX_APIUsage/DXUT/Core/ScreenGrab.h
new file mode 100644
index 0000000..1f18539
--- /dev/null
+++ b/samples/DX_APIUsage/DXUT/Core/ScreenGrab.h
@@ -0,0 +1,39 @@
+//--------------------------------------------------------------------------------------
+// File: ScreenGrab.h
+//
+// Function for capturing a 2D texture and saving it to a file (aka a 'screenshot'
+// when used on a Direct3D 11 Render Target).
+//
+// Note these functions are useful as a light-weight runtime screen grabber. For
+// full-featured texture capture, DDS writer, and texture processing pipeline,
+// see the 'Texconv' sample and the 'DirectXTex' library.
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248926
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#include <d3d11_1.h>
+
+#include <ocidl.h>
+#include <stdint.h>
+#include <functional>
+
+
+namespace DirectX
+{
+    HRESULT SaveDDSTextureToFile( _In_ ID3D11DeviceContext* pContext,
+                                  _In_ ID3D11Resource* pSource,
+                                  _In_z_ const wchar_t* fileName );
+
+    HRESULT SaveWICTextureToFile( _In_ ID3D11DeviceContext* pContext,
+                                  _In_ ID3D11Resource* pSource,
+                                  _In_ REFGUID guidContainerFormat, 
+                                  _In_z_ const wchar_t* fileName,
+                                  _In_opt_ const GUID* targetFormat = nullptr,
+                                  _In_opt_ std::function<void(IPropertyBag2*)> setCustomProps = nullptr );
+}
\ No newline at end of file
diff --git a/samples/DX_APIUsage/DXUT/Core/WICTextureLoader.cpp b/samples/DX_APIUsage/DXUT/Core/WICTextureLoader.cpp
new file mode 100644
index 0000000..a5960f2
--- /dev/null
+++ b/samples/DX_APIUsage/DXUT/Core/WICTextureLoader.cpp
@@ -0,0 +1,932 @@
+//--------------------------------------------------------------------------------------
+// File: WICTextureLoader.cpp
+//
+// Function for loading a WIC image and creating a Direct3D runtime texture for it
+// (auto-generating mipmaps if possible)
+//
+// Note: Assumes application has already called CoInitializeEx
+//
+// Warning: CreateWICTexture* functions are not thread-safe if given a d3dContext instance for
+//          auto-gen mipmap support.
+//
+// Note these functions are useful for images created as simple 2D textures. For
+// more complex resources, DDSTextureLoader is an excellent light-weight runtime loader.
+// For a full-featured DDS file reader, writer, and texture processing pipeline see
+// the 'Texconv' sample and the 'DirectXTex' library.
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248926
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#include "dxut.h"
+
+// We could load multi-frame images (TIFF/GIF) into a texture array.
+// For now, we just load the first frame (note: DirectXTex supports multi-frame images)
+
+#include "WICTextureLoader.h"
+
+#include <dxgiformat.h>
+#include <assert.h>
+
+#include <wincodec.h>
+
+#include <wrl\client.h>
+
+#include <algorithm>
+#include <memory>
+
+#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
+#pragma comment(lib,"dxguid.lib")
+#endif
+
+using namespace DirectX;
+using Microsoft::WRL::ComPtr;
+
+namespace
+{
+    //--------------------------------------------------------------------------------------
+    template<UINT TNameLength>
+    inline void SetDebugObjectName(_In_ ID3D11DeviceChild* resource, _In_ const char(&name)[TNameLength])
+    {
+#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
+        resource->SetPrivateData(WKPDID_D3DDebugObjectName, TNameLength - 1, name);
+#else
+        UNREFERENCED_PARAMETER(resource);
+        UNREFERENCED_PARAMETER(name);
+#endif
+    }
+
+    //-------------------------------------------------------------------------------------
+    // WIC Pixel Format Translation Data
+    //-------------------------------------------------------------------------------------
+    struct WICTranslate
+    {
+        GUID                wic;
+        DXGI_FORMAT         format;
+    };
+
+    const WICTranslate g_WICFormats[] =
+    {
+        { GUID_WICPixelFormat128bppRGBAFloat,       DXGI_FORMAT_R32G32B32A32_FLOAT },
+
+        { GUID_WICPixelFormat64bppRGBAHalf,         DXGI_FORMAT_R16G16B16A16_FLOAT },
+        { GUID_WICPixelFormat64bppRGBA,             DXGI_FORMAT_R16G16B16A16_UNORM },
+
+        { GUID_WICPixelFormat32bppRGBA,             DXGI_FORMAT_R8G8B8A8_UNORM },
+        { GUID_WICPixelFormat32bppBGRA,             DXGI_FORMAT_B8G8R8A8_UNORM }, // DXGI 1.1
+        { GUID_WICPixelFormat32bppBGR,              DXGI_FORMAT_B8G8R8X8_UNORM }, // DXGI 1.1
+
+        { GUID_WICPixelFormat32bppRGBA1010102XR,    DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM }, // DXGI 1.1
+        { GUID_WICPixelFormat32bppRGBA1010102,      DXGI_FORMAT_R10G10B10A2_UNORM },
+
+        { GUID_WICPixelFormat16bppBGRA5551,         DXGI_FORMAT_B5G5R5A1_UNORM },
+        { GUID_WICPixelFormat16bppBGR565,           DXGI_FORMAT_B5G6R5_UNORM },
+
+        { GUID_WICPixelFormat32bppGrayFloat,        DXGI_FORMAT_R32_FLOAT },
+        { GUID_WICPixelFormat16bppGrayHalf,         DXGI_FORMAT_R16_FLOAT },
+        { GUID_WICPixelFormat16bppGray,             DXGI_FORMAT_R16_UNORM },
+        { GUID_WICPixelFormat8bppGray,              DXGI_FORMAT_R8_UNORM },
+
+        { GUID_WICPixelFormat8bppAlpha,             DXGI_FORMAT_A8_UNORM },
+    };
+
+    //-------------------------------------------------------------------------------------
+    // WIC Pixel Format nearest conversion table
+    //-------------------------------------------------------------------------------------
+
+    struct WICConvert
+    {
+        GUID        source;
+        GUID        target;
+    };
+
+    const WICConvert g_WICConvert[] =
+    {
+        // Note target GUID in this conversion table must be one of those directly supported formats (above).
+
+        { GUID_WICPixelFormatBlackWhite,            GUID_WICPixelFormat8bppGray }, // DXGI_FORMAT_R8_UNORM
+
+        { GUID_WICPixelFormat1bppIndexed,           GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM 
+        { GUID_WICPixelFormat2bppIndexed,           GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM 
+        { GUID_WICPixelFormat4bppIndexed,           GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM 
+        { GUID_WICPixelFormat8bppIndexed,           GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM 
+
+        { GUID_WICPixelFormat2bppGray,              GUID_WICPixelFormat8bppGray }, // DXGI_FORMAT_R8_UNORM 
+        { GUID_WICPixelFormat4bppGray,              GUID_WICPixelFormat8bppGray }, // DXGI_FORMAT_R8_UNORM 
+
+        { GUID_WICPixelFormat16bppGrayFixedPoint,   GUID_WICPixelFormat16bppGrayHalf }, // DXGI_FORMAT_R16_FLOAT 
+        { GUID_WICPixelFormat32bppGrayFixedPoint,   GUID_WICPixelFormat32bppGrayFloat }, // DXGI_FORMAT_R32_FLOAT 
+
+        { GUID_WICPixelFormat16bppBGR555,           GUID_WICPixelFormat16bppBGRA5551 }, // DXGI_FORMAT_B5G5R5A1_UNORM
+
+        { GUID_WICPixelFormat32bppBGR101010,        GUID_WICPixelFormat32bppRGBA1010102 }, // DXGI_FORMAT_R10G10B10A2_UNORM
+
+        { GUID_WICPixelFormat24bppBGR,              GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM 
+        { GUID_WICPixelFormat24bppRGB,              GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM 
+        { GUID_WICPixelFormat32bppPBGRA,            GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM 
+        { GUID_WICPixelFormat32bppPRGBA,            GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM 
+
+        { GUID_WICPixelFormat48bppRGB,              GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM
+        { GUID_WICPixelFormat48bppBGR,              GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM
+        { GUID_WICPixelFormat64bppBGRA,             GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM
+        { GUID_WICPixelFormat64bppPRGBA,            GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM
+        { GUID_WICPixelFormat64bppPBGRA,            GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM
+
+        { GUID_WICPixelFormat48bppRGBFixedPoint,    GUID_WICPixelFormat64bppRGBAHalf }, // DXGI_FORMAT_R16G16B16A16_FLOAT 
+        { GUID_WICPixelFormat48bppBGRFixedPoint,    GUID_WICPixelFormat64bppRGBAHalf }, // DXGI_FORMAT_R16G16B16A16_FLOAT 
+        { GUID_WICPixelFormat64bppRGBAFixedPoint,   GUID_WICPixelFormat64bppRGBAHalf }, // DXGI_FORMAT_R16G16B16A16_FLOAT 
+        { GUID_WICPixelFormat64bppBGRAFixedPoint,   GUID_WICPixelFormat64bppRGBAHalf }, // DXGI_FORMAT_R16G16B16A16_FLOAT 
+        { GUID_WICPixelFormat64bppRGBFixedPoint,    GUID_WICPixelFormat64bppRGBAHalf }, // DXGI_FORMAT_R16G16B16A16_FLOAT 
+        { GUID_WICPixelFormat64bppRGBHalf,          GUID_WICPixelFormat64bppRGBAHalf }, // DXGI_FORMAT_R16G16B16A16_FLOAT 
+        { GUID_WICPixelFormat48bppRGBHalf,          GUID_WICPixelFormat64bppRGBAHalf }, // DXGI_FORMAT_R16G16B16A16_FLOAT 
+
+        { GUID_WICPixelFormat128bppPRGBAFloat,      GUID_WICPixelFormat128bppRGBAFloat }, // DXGI_FORMAT_R32G32B32A32_FLOAT 
+        { GUID_WICPixelFormat128bppRGBFloat,        GUID_WICPixelFormat128bppRGBAFloat }, // DXGI_FORMAT_R32G32B32A32_FLOAT 
+        { GUID_WICPixelFormat128bppRGBAFixedPoint,  GUID_WICPixelFormat128bppRGBAFloat }, // DXGI_FORMAT_R32G32B32A32_FLOAT 
+        { GUID_WICPixelFormat128bppRGBFixedPoint,   GUID_WICPixelFormat128bppRGBAFloat }, // DXGI_FORMAT_R32G32B32A32_FLOAT 
+        { GUID_WICPixelFormat32bppRGBE,             GUID_WICPixelFormat128bppRGBAFloat }, // DXGI_FORMAT_R32G32B32A32_FLOAT 
+
+        { GUID_WICPixelFormat32bppCMYK,             GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM
+        { GUID_WICPixelFormat64bppCMYK,             GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM
+        { GUID_WICPixelFormat40bppCMYKAlpha,        GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM
+        { GUID_WICPixelFormat80bppCMYKAlpha,        GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM
+
+    #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
+        { GUID_WICPixelFormat32bppRGB,              GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM
+        { GUID_WICPixelFormat64bppRGB,              GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM
+        { GUID_WICPixelFormat64bppPRGBAHalf,        GUID_WICPixelFormat64bppRGBAHalf }, // DXGI_FORMAT_R16G16B16A16_FLOAT 
+    #endif
+
+        // We don't support n-channel formats
+    };
+
+    bool g_WIC2 = false;
+
+    //--------------------------------------------------------------------------------------
+    IWICImagingFactory* _GetWIC()
+    {
+        static INIT_ONCE s_initOnce = INIT_ONCE_STATIC_INIT;
+
+        IWICImagingFactory* factory = nullptr;
+        InitOnceExecuteOnce(&s_initOnce,
+            [](PINIT_ONCE, PVOID, PVOID *factory) -> BOOL
+        {
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
+            HRESULT hr = CoCreateInstance(
+                CLSID_WICImagingFactory2,
+                nullptr,
+                CLSCTX_INPROC_SERVER,
+                __uuidof(IWICImagingFactory2),
+                factory
+            );
+
+            if (SUCCEEDED(hr))
+            {
+                // WIC2 is available on Windows 10, Windows 8.x, and Windows 7 SP1 with KB 2670838 installed
+                g_WIC2 = true;
+                return TRUE;
+            }
+            else
+            {
+                hr = CoCreateInstance(
+                    CLSID_WICImagingFactory1,
+                    nullptr,
+                    CLSCTX_INPROC_SERVER,
+                    __uuidof(IWICImagingFactory),
+                    factory
+                );
+                return SUCCEEDED(hr) ? TRUE : FALSE;
+            }
+#else
+            return SUCCEEDED(CoCreateInstance(
+                CLSID_WICImagingFactory,
+                nullptr,
+                CLSCTX_INPROC_SERVER,
+                __uuidof(IWICImagingFactory),
+                factory)) ? TRUE : FALSE;
+#endif
+        }, nullptr, reinterpret_cast<LPVOID*>(&factory));
+
+        return factory;
+    }
+
+    //---------------------------------------------------------------------------------
+    DXGI_FORMAT _WICToDXGI(const GUID& guid)
+    {
+        for (size_t i = 0; i < _countof(g_WICFormats); ++i)
+        {
+            if (memcmp(&g_WICFormats[i].wic, &guid, sizeof(GUID)) == 0)
+                return g_WICFormats[i].format;
+        }
+
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
+        if (g_WIC2)
+        {
+            if (memcmp(&GUID_WICPixelFormat96bppRGBFloat, &guid, sizeof(GUID)) == 0)
+                return DXGI_FORMAT_R32G32B32_FLOAT;
+        }
+#endif
+
+        return DXGI_FORMAT_UNKNOWN;
+    }
+
+    //---------------------------------------------------------------------------------
+    size_t _WICBitsPerPixel(REFGUID targetGuid)
+    {
+        auto pWIC = _GetWIC();
+        if (!pWIC)
+            return 0;
+
+        ComPtr<IWICComponentInfo> cinfo;
+        if (FAILED(pWIC->CreateComponentInfo(targetGuid, cinfo.GetAddressOf())))
+            return 0;
+
+        WICComponentType type;
+        if (FAILED(cinfo->GetComponentType(&type)))
+            return 0;
+
+        if (type != WICPixelFormat)
+            return 0;
+
+        ComPtr<IWICPixelFormatInfo> pfinfo;
+        if (FAILED(cinfo.As(&pfinfo)))
+            return 0;
+
+        UINT bpp;
+        if (FAILED(pfinfo->GetBitsPerPixel(&bpp)))
+            return 0;
+
+        return bpp;
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    DXGI_FORMAT MakeSRGB(_In_ DXGI_FORMAT format)
+    {
+        switch (format)
+        {
+        case DXGI_FORMAT_R8G8B8A8_UNORM:
+            return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
+
+        case DXGI_FORMAT_BC1_UNORM:
+            return DXGI_FORMAT_BC1_UNORM_SRGB;
+
+        case DXGI_FORMAT_BC2_UNORM:
+            return DXGI_FORMAT_BC2_UNORM_SRGB;
+
+        case DXGI_FORMAT_BC3_UNORM:
+            return DXGI_FORMAT_BC3_UNORM_SRGB;
+
+        case DXGI_FORMAT_B8G8R8A8_UNORM:
+            return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB;
+
+        case DXGI_FORMAT_B8G8R8X8_UNORM:
+            return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB;
+
+        case DXGI_FORMAT_BC7_UNORM:
+            return DXGI_FORMAT_BC7_UNORM_SRGB;
+
+        default:
+            return format;
+        }
+    }
+
+
+    //---------------------------------------------------------------------------------
+    HRESULT CreateTextureFromWIC(_In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+        _In_ IWICBitmapFrameDecode *frame,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ unsigned int loadFlags,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView)
+    {
+        UINT width, height;
+        HRESULT hr = frame->GetSize(&width, &height);
+        if (FAILED(hr))
+            return hr;
+
+        assert(width > 0 && height > 0);
+
+        if (!maxsize)
+        {
+            // This is a bit conservative because the hardware could support larger textures than
+            // the Feature Level defined minimums, but doing it this way is much easier and more
+            // performant for WIC than the 'fail and retry' model used by DDSTextureLoader
+
+            switch (d3dDevice->GetFeatureLevel())
+            {
+            case D3D_FEATURE_LEVEL_9_1:
+            case D3D_FEATURE_LEVEL_9_2:
+                maxsize = 2048 /*D3D_FL9_1_REQ_TEXTURE2D_U_OR_V_DIMENSION*/;
+                break;
+
+            case D3D_FEATURE_LEVEL_9_3:
+                maxsize = 4096 /*D3D_FL9_3_REQ_TEXTURE2D_U_OR_V_DIMENSION*/;
+                break;
+
+            case D3D_FEATURE_LEVEL_10_0:
+            case D3D_FEATURE_LEVEL_10_1:
+                maxsize = 8192 /*D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION*/;
+                break;
+
+            default:
+                maxsize = D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION;
+                break;
+            }
+        }
+
+        assert(maxsize > 0);
+
+        UINT twidth, theight;
+        if (width > maxsize || height > maxsize)
+        {
+            float ar = static_cast<float>(height) / static_cast<float>(width);
+            if (width > height)
+            {
+                twidth = static_cast<UINT>(maxsize);
+                theight = std::max<UINT>(1, static_cast<UINT>(static_cast<float>(maxsize) * ar));
+            }
+            else
+            {
+                theight = static_cast<UINT>(maxsize);
+                twidth = std::max<UINT>(1, static_cast<UINT>(static_cast<float>(maxsize) / ar));
+            }
+            assert(twidth <= maxsize && theight <= maxsize);
+        }
+        else
+        {
+            twidth = width;
+            theight = height;
+        }
+
+        // Determine format
+        WICPixelFormatGUID pixelFormat;
+        hr = frame->GetPixelFormat(&pixelFormat);
+        if (FAILED(hr))
+            return hr;
+
+        WICPixelFormatGUID convertGUID;
+        memcpy(&convertGUID, &pixelFormat, sizeof(WICPixelFormatGUID));
+
+        size_t bpp = 0;
+
+        DXGI_FORMAT format = _WICToDXGI(pixelFormat);
+        if (format == DXGI_FORMAT_UNKNOWN)
+        {
+            if (memcmp(&GUID_WICPixelFormat96bppRGBFixedPoint, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0)
+            {
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
+                if (g_WIC2)
+                {
+                    memcpy(&convertGUID, &GUID_WICPixelFormat96bppRGBFloat, sizeof(WICPixelFormatGUID));
+                    format = DXGI_FORMAT_R32G32B32_FLOAT;
+                    bpp = 96;
+                }
+                else
+#endif
+                {
+                    memcpy(&convertGUID, &GUID_WICPixelFormat128bppRGBAFloat, sizeof(WICPixelFormatGUID));
+                    format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+                    bpp = 128;
+                }
+            }
+            else
+            {
+                for (size_t i = 0; i < _countof(g_WICConvert); ++i)
+                {
+                    if (memcmp(&g_WICConvert[i].source, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0)
+                    {
+                        memcpy(&convertGUID, &g_WICConvert[i].target, sizeof(WICPixelFormatGUID));
+
+                        format = _WICToDXGI(g_WICConvert[i].target);
+                        assert(format != DXGI_FORMAT_UNKNOWN);
+                        bpp = _WICBitsPerPixel(convertGUID);
+                        break;
+                    }
+                }
+            }
+
+            if (format == DXGI_FORMAT_UNKNOWN)
+                return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+        }
+        else
+        {
+            bpp = _WICBitsPerPixel(pixelFormat);
+        }
+
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
+        if ((format == DXGI_FORMAT_R32G32B32_FLOAT) && d3dContext != 0 && textureView != 0)
+        {
+            // Special case test for optional device support for autogen mipchains for R32G32B32_FLOAT 
+            UINT fmtSupport = 0;
+            hr = d3dDevice->CheckFormatSupport(DXGI_FORMAT_R32G32B32_FLOAT, &fmtSupport);
+            if (FAILED(hr) || !(fmtSupport & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN))
+            {
+                // Use R32G32B32A32_FLOAT instead which is required for Feature Level 10.0 and up
+                memcpy(&convertGUID, &GUID_WICPixelFormat128bppRGBAFloat, sizeof(WICPixelFormatGUID));
+                format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+                bpp = 128;
+            }
+        }
+#endif
+
+        if (!bpp)
+            return E_FAIL;
+
+        // Handle sRGB formats
+        if (loadFlags & WIC_LOADER_FORCE_SRGB)
+        {
+            format = MakeSRGB(format);
+        }
+        else if (!(loadFlags & WIC_LOADER_IGNORE_SRGB))
+        {
+            ComPtr<IWICMetadataQueryReader> metareader;
+            if (SUCCEEDED(frame->GetMetadataQueryReader(metareader.GetAddressOf())))
+            {
+                GUID containerFormat;
+                if (SUCCEEDED(metareader->GetContainerFormat(&containerFormat)))
+                {
+                    // Check for sRGB colorspace metadata
+                    bool sRGB = false;
+
+                    PROPVARIANT value;
+                    PropVariantInit(&value);
+
+                    if (memcmp(&containerFormat, &GUID_ContainerFormatPng, sizeof(GUID)) == 0)
+                    {
+                        // Check for sRGB chunk
+                        if (SUCCEEDED(metareader->GetMetadataByName(L"/sRGB/RenderingIntent", &value)) && value.vt == VT_UI1)
+                        {
+                            sRGB = true;
+                        }
+                    }
+                    else if (SUCCEEDED(metareader->GetMetadataByName(L"System.Image.ColorSpace", &value)) && value.vt == VT_UI2 && value.uiVal == 1)
+                    {
+                        sRGB = true;
+                    }
+
+                    (void)PropVariantClear(&value);
+
+                    if (sRGB)
+                        format = MakeSRGB(format);
+                }
+            }
+        }
+
+        // Verify our target format is supported by the current device
+        // (handles WDDM 1.0 or WDDM 1.1 device driver cases as well as DirectX 11.0 Runtime without 16bpp format support)
+        UINT support = 0;
+        hr = d3dDevice->CheckFormatSupport(format, &support);
+        if (FAILED(hr) || !(support & D3D11_FORMAT_SUPPORT_TEXTURE2D))
+        {
+            // Fallback to RGBA 32-bit format which is supported by all devices
+            memcpy(&convertGUID, &GUID_WICPixelFormat32bppRGBA, sizeof(WICPixelFormatGUID));
+            format = DXGI_FORMAT_R8G8B8A8_UNORM;
+            bpp = 32;
+        }
+
+        // Allocate temporary memory for image
+        size_t rowPitch = (twidth * bpp + 7) / 8;
+        size_t imageSize = rowPitch * theight;
+
+        std::unique_ptr<uint8_t[]> temp(new (std::nothrow) uint8_t[imageSize]);
+        if (!temp)
+            return E_OUTOFMEMORY;
+
+        // Load image data
+        if (memcmp(&convertGUID, &pixelFormat, sizeof(GUID)) == 0
+            && twidth == width
+            && theight == height)
+        {
+            // No format conversion or resize needed
+            hr = frame->CopyPixels(0, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), temp.get());
+            if (FAILED(hr))
+                return hr;
+        }
+        else if (twidth != width || theight != height)
+        {
+            // Resize
+            auto pWIC = _GetWIC();
+            if (!pWIC)
+                return E_NOINTERFACE;
+
+            ComPtr<IWICBitmapScaler> scaler;
+            hr = pWIC->CreateBitmapScaler(scaler.GetAddressOf());
+            if (FAILED(hr))
+                return hr;
+
+            hr = scaler->Initialize(frame, twidth, theight, WICBitmapInterpolationModeFant);
+            if (FAILED(hr))
+                return hr;
+
+            WICPixelFormatGUID pfScaler;
+            hr = scaler->GetPixelFormat(&pfScaler);
+            if (FAILED(hr))
+                return hr;
+
+            if (memcmp(&convertGUID, &pfScaler, sizeof(GUID)) == 0)
+            {
+                // No format conversion needed
+                hr = scaler->CopyPixels(0, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), temp.get());
+                if (FAILED(hr))
+                    return hr;
+            }
+            else
+            {
+                ComPtr<IWICFormatConverter> FC;
+                hr = pWIC->CreateFormatConverter(FC.GetAddressOf());
+                if (FAILED(hr))
+                    return hr;
+
+                BOOL canConvert = FALSE;
+                hr = FC->CanConvert(pfScaler, convertGUID, &canConvert);
+                if (FAILED(hr) || !canConvert)
+                {
+                    return E_UNEXPECTED;
+                }
+
+                hr = FC->Initialize(scaler.Get(), convertGUID, WICBitmapDitherTypeErrorDiffusion, nullptr, 0, WICBitmapPaletteTypeMedianCut);
+                if (FAILED(hr))
+                    return hr;
+
+                hr = FC->CopyPixels(0, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), temp.get());
+                if (FAILED(hr))
+                    return hr;
+            }
+        }
+        else
+        {
+            // Format conversion but no resize
+            auto pWIC = _GetWIC();
+            if (!pWIC)
+                return E_NOINTERFACE;
+
+            ComPtr<IWICFormatConverter> FC;
+            hr = pWIC->CreateFormatConverter(FC.GetAddressOf());
+            if (FAILED(hr))
+                return hr;
+
+            BOOL canConvert = FALSE;
+            hr = FC->CanConvert(pixelFormat, convertGUID, &canConvert);
+            if (FAILED(hr) || !canConvert)
+            {
+                return E_UNEXPECTED;
+            }
+
+            hr = FC->Initialize(frame, convertGUID, WICBitmapDitherTypeErrorDiffusion, nullptr, 0, WICBitmapPaletteTypeMedianCut);
+            if (FAILED(hr))
+                return hr;
+
+            hr = FC->CopyPixels(0, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), temp.get());
+            if (FAILED(hr))
+                return hr;
+        }
+
+        // See if format is supported for auto-gen mipmaps (varies by feature level)
+        bool autogen = false;
+        if (d3dContext != 0 && textureView != 0) // Must have context and shader-view to auto generate mipmaps
+        {
+            UINT fmtSupport = 0;
+            hr = d3dDevice->CheckFormatSupport(format, &fmtSupport);
+            if (SUCCEEDED(hr) && (fmtSupport & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN))
+            {
+                autogen = true;
+            }
+        }
+
+        // Create texture
+        D3D11_TEXTURE2D_DESC desc;
+        desc.Width = twidth;
+        desc.Height = theight;
+        desc.MipLevels = (autogen) ? 0 : 1;
+        desc.ArraySize = 1;
+        desc.Format = format;
+        desc.SampleDesc.Count = 1;
+        desc.SampleDesc.Quality = 0;
+        desc.Usage = usage;
+        desc.CPUAccessFlags = cpuAccessFlags;
+
+        if (autogen)
+        {
+            desc.BindFlags = bindFlags | D3D11_BIND_RENDER_TARGET;
+            desc.MiscFlags = miscFlags | D3D11_RESOURCE_MISC_GENERATE_MIPS;
+        }
+        else
+        {
+            desc.BindFlags = bindFlags;
+            desc.MiscFlags = miscFlags;
+        }
+
+        D3D11_SUBRESOURCE_DATA initData;
+        initData.pSysMem = temp.get();
+        initData.SysMemPitch = static_cast<UINT>(rowPitch);
+        initData.SysMemSlicePitch = static_cast<UINT>(imageSize);
+
+        ID3D11Texture2D* tex = nullptr;
+        hr = d3dDevice->CreateTexture2D(&desc, (autogen) ? nullptr : &initData, &tex);
+        if (SUCCEEDED(hr) && tex != 0)
+        {
+            if (textureView != 0)
+            {
+                D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc = {};
+                SRVDesc.Format = desc.Format;
+
+                SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
+                SRVDesc.Texture2D.MipLevels = (autogen) ? -1 : 1;
+
+                hr = d3dDevice->CreateShaderResourceView(tex, &SRVDesc, textureView);
+                if (FAILED(hr))
+                {
+                    tex->Release();
+                    return hr;
+                }
+
+                if (autogen)
+                {
+                    assert(d3dContext != 0);
+                    d3dContext->UpdateSubresource(tex, 0, nullptr, temp.get(), static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize));
+                    d3dContext->GenerateMips(*textureView);
+                }
+            }
+
+            if (texture != 0)
+            {
+                *texture = tex;
+            }
+            else
+            {
+                SetDebugObjectName(tex, "WICTextureLoader");
+                tex->Release();
+            }
+        }
+
+        return hr;
+    }
+} // anonymous namespace
+
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+HRESULT DirectX::CreateWICTextureFromMemory(ID3D11Device* d3dDevice,
+    const uint8_t* wicData,
+    size_t wicDataSize,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    size_t maxsize)
+{
+    return CreateWICTextureFromMemoryEx(d3dDevice, nullptr, wicData, wicDataSize, maxsize,
+        D3D11_USAGE_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0, 0, WIC_LOADER_DEFAULT,
+        texture, textureView);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateWICTextureFromMemory(ID3D11Device* d3dDevice,
+    ID3D11DeviceContext* d3dContext,
+    const uint8_t* wicData,
+    size_t wicDataSize,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    size_t maxsize)
+{
+    return CreateWICTextureFromMemoryEx(d3dDevice, d3dContext, wicData, wicDataSize, maxsize,
+        D3D11_USAGE_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0, 0, WIC_LOADER_DEFAULT,
+        texture, textureView);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateWICTextureFromMemoryEx(ID3D11Device* d3dDevice,
+    const uint8_t* wicData,
+    size_t wicDataSize,
+    size_t maxsize,
+    D3D11_USAGE usage,
+    unsigned int bindFlags,
+    unsigned int cpuAccessFlags,
+    unsigned int miscFlags,
+    unsigned int loadFlags,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView)
+{
+    return CreateWICTextureFromMemoryEx(d3dDevice, nullptr, wicData, wicDataSize, maxsize,
+        usage, bindFlags, cpuAccessFlags, miscFlags, loadFlags,
+        texture, textureView);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateWICTextureFromMemoryEx(ID3D11Device* d3dDevice,
+    ID3D11DeviceContext* d3dContext,
+    const uint8_t* wicData,
+    size_t wicDataSize,
+    size_t maxsize,
+    D3D11_USAGE usage,
+    unsigned int bindFlags,
+    unsigned int cpuAccessFlags,
+    unsigned int miscFlags,
+    unsigned int loadFlags,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView)
+{
+    if (texture)
+    {
+        *texture = nullptr;
+    }
+    if (textureView)
+    {
+        *textureView = nullptr;
+    }
+
+    if (!d3dDevice || !wicData || (!texture && !textureView))
+        return E_INVALIDARG;
+
+    if (!wicDataSize)
+        return E_FAIL;
+
+    if (wicDataSize > UINT32_MAX)
+        return HRESULT_FROM_WIN32(ERROR_FILE_TOO_LARGE);
+
+    auto pWIC = _GetWIC();
+    if (!pWIC)
+        return E_NOINTERFACE;
+
+    // Create input stream for memory
+    ComPtr<IWICStream> stream;
+    HRESULT hr = pWIC->CreateStream(stream.GetAddressOf());
+    if (FAILED(hr))
+        return hr;
+
+    hr = stream->InitializeFromMemory(const_cast<uint8_t*>(wicData), static_cast<DWORD>(wicDataSize));
+    if (FAILED(hr))
+        return hr;
+
+    // Initialize WIC
+    ComPtr<IWICBitmapDecoder> decoder;
+    hr = pWIC->CreateDecoderFromStream(stream.Get(), 0, WICDecodeMetadataCacheOnDemand, decoder.GetAddressOf());
+    if (FAILED(hr))
+        return hr;
+
+    ComPtr<IWICBitmapFrameDecode> frame;
+    hr = decoder->GetFrame(0, frame.GetAddressOf());
+    if (FAILED(hr))
+        return hr;
+
+    hr = CreateTextureFromWIC(d3dDevice, d3dContext, frame.Get(), maxsize,
+        usage, bindFlags, cpuAccessFlags, miscFlags, loadFlags,
+        texture, textureView);
+    if (FAILED(hr))
+        return hr;
+
+    if (texture != 0 && *texture != 0)
+    {
+        SetDebugObjectName(*texture, "WICTextureLoader");
+    }
+
+    if (textureView != 0 && *textureView != 0)
+    {
+        SetDebugObjectName(*textureView, "WICTextureLoader");
+    }
+
+    return hr;
+}
+
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+HRESULT DirectX::CreateWICTextureFromFile(ID3D11Device* d3dDevice,
+    const wchar_t* fileName,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    size_t maxsize)
+{
+    return CreateWICTextureFromFileEx(d3dDevice, nullptr, fileName, maxsize,
+        D3D11_USAGE_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0, 0, WIC_LOADER_DEFAULT,
+        texture, textureView);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateWICTextureFromFile(ID3D11Device* d3dDevice,
+    ID3D11DeviceContext* d3dContext,
+    const wchar_t* fileName,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView,
+    size_t maxsize)
+{
+    return CreateWICTextureFromFileEx(d3dDevice, d3dContext, fileName, maxsize,
+        D3D11_USAGE_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0, 0, WIC_LOADER_DEFAULT,
+        texture, textureView);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateWICTextureFromFileEx(ID3D11Device* d3dDevice,
+    const wchar_t* fileName,
+    size_t maxsize,
+    D3D11_USAGE usage,
+    unsigned int bindFlags,
+    unsigned int cpuAccessFlags,
+    unsigned int miscFlags,
+    unsigned int loadFlags,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView)
+{
+    return CreateWICTextureFromFileEx(d3dDevice, nullptr, fileName, maxsize,
+        usage, bindFlags, cpuAccessFlags, miscFlags, loadFlags,
+        texture, textureView);
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::CreateWICTextureFromFileEx(ID3D11Device* d3dDevice,
+    ID3D11DeviceContext* d3dContext,
+    const wchar_t* fileName,
+    size_t maxsize,
+    D3D11_USAGE usage,
+    unsigned int bindFlags,
+    unsigned int cpuAccessFlags,
+    unsigned int miscFlags,
+    unsigned int loadFlags,
+    ID3D11Resource** texture,
+    ID3D11ShaderResourceView** textureView)
+{
+    if (texture)
+    {
+        *texture = nullptr;
+    }
+    if (textureView)
+    {
+        *textureView = nullptr;
+    }
+
+    if (!d3dDevice || !fileName || (!texture && !textureView))
+        return E_INVALIDARG;
+
+    auto pWIC = _GetWIC();
+    if (!pWIC)
+        return E_NOINTERFACE;
+
+    // Initialize WIC
+    ComPtr<IWICBitmapDecoder> decoder;
+    HRESULT hr = pWIC->CreateDecoderFromFilename(fileName, 0, GENERIC_READ, WICDecodeMetadataCacheOnDemand, decoder.GetAddressOf());
+    if (FAILED(hr))
+        return hr;
+
+    ComPtr<IWICBitmapFrameDecode> frame;
+    hr = decoder->GetFrame(0, frame.GetAddressOf());
+    if (FAILED(hr))
+        return hr;
+
+    hr = CreateTextureFromWIC(d3dDevice, d3dContext, frame.Get(), maxsize,
+        usage, bindFlags, cpuAccessFlags, miscFlags, loadFlags,
+        texture, textureView);
+
+#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
+    if (SUCCEEDED(hr))
+    {
+        if (texture != 0 || textureView != 0)
+        {
+            char strFileA[MAX_PATH];
+            int result = WideCharToMultiByte(CP_ACP,
+                WC_NO_BEST_FIT_CHARS,
+                fileName,
+                -1,
+                strFileA,
+                MAX_PATH,
+                nullptr,
+                FALSE
+            );
+            if (result > 0)
+            {
+                const char* pstrName = strrchr(strFileA, '\\');
+                if (!pstrName)
+                {
+                    pstrName = strFileA;
+                }
+                else
+                {
+                    pstrName++;
+                }
+
+                if (texture != 0 && *texture != 0)
+                {
+                    (*texture)->SetPrivateData(WKPDID_D3DDebugObjectName,
+                        static_cast<UINT>(strnlen_s(pstrName, MAX_PATH)),
+                        pstrName
+                    );
+                }
+
+                if (textureView != 0 && *textureView != 0)
+                {
+                    (*textureView)->SetPrivateData(WKPDID_D3DDebugObjectName,
+                        static_cast<UINT>(strnlen_s(pstrName, MAX_PATH)),
+                        pstrName
+                    );
+                }
+            }
+        }
+    }
+#endif
+
+    return hr;
+}
diff --git a/samples/DX_APIUsage/DXUT/Core/WICTextureLoader.h b/samples/DX_APIUsage/DXUT/Core/WICTextureLoader.h
new file mode 100644
index 0000000..8843c33
--- /dev/null
+++ b/samples/DX_APIUsage/DXUT/Core/WICTextureLoader.h
@@ -0,0 +1,126 @@
+//--------------------------------------------------------------------------------------
+// File: WICTextureLoader.h
+//
+// Function for loading a WIC image and creating a Direct3D runtime texture for it
+// (auto-generating mipmaps if possible)
+//
+// Note: Assumes application has already called CoInitializeEx
+//
+// Warning: CreateWICTexture* functions are not thread-safe if given a d3dContext instance for
+//          auto-gen mipmap support.
+//
+// Note these functions are useful for images created as simple 2D textures. For
+// more complex resources, DDSTextureLoader is an excellent light-weight runtime loader.
+// For a full-featured DDS file reader, writer, and texture processing pipeline see
+// the 'Texconv' sample and the 'DirectXTex' library.
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248926
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#include <d3d11_1.h>
+#include <stdint.h>
+
+
+namespace DirectX
+{
+    enum WIC_LOADER_FLAGS
+    {
+        WIC_LOADER_DEFAULT      = 0,
+        WIC_LOADER_FORCE_SRGB   = 0x1,
+        WIC_LOADER_IGNORE_SRGB  = 0x2,
+    };
+
+    // Standard version
+    HRESULT CreateWICTextureFromMemory(
+        _In_ ID3D11Device* d3dDevice,
+        _In_reads_bytes_(wicDataSize) const uint8_t* wicData,
+        _In_ size_t wicDataSize,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0);
+
+    HRESULT CreateWICTextureFromFile(
+        _In_ ID3D11Device* d3dDevice,
+        _In_z_ const wchar_t* szFileName,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0);
+
+    // Standard version with optional auto-gen mipmap support
+    HRESULT CreateWICTextureFromMemory(
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+        _In_reads_bytes_(wicDataSize) const uint8_t* wicData,
+        _In_ size_t wicDataSize,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0);
+
+    HRESULT CreateWICTextureFromFile(
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+        _In_z_ const wchar_t* szFileName,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0);
+
+    // Extended version
+    HRESULT CreateWICTextureFromMemoryEx(
+        _In_ ID3D11Device* d3dDevice,
+        _In_reads_bytes_(wicDataSize) const uint8_t* wicData,
+        _In_ size_t wicDataSize,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ unsigned int loadFlags,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView);
+
+    HRESULT CreateWICTextureFromFileEx(
+        _In_ ID3D11Device* d3dDevice,
+        _In_z_ const wchar_t* szFileName,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ unsigned int loadFlags,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView);
+
+    // Extended version with optional auto-gen mipmap support
+    HRESULT CreateWICTextureFromMemoryEx(
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+        _In_reads_bytes_(wicDataSize) const uint8_t* wicData,
+        _In_ size_t wicDataSize,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ unsigned int loadFlags,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView);
+
+    HRESULT CreateWICTextureFromFileEx(
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+        _In_z_ const wchar_t* szFileName,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ unsigned int loadFlags,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView);
+}
\ No newline at end of file
diff --git a/samples/DX_APIUsage/DXUT/Optional/DXUTLockFreePipe.h b/samples/DX_APIUsage/DXUT/Optional/DXUTLockFreePipe.h
index 7dfe14d..b41d34a 100644
--- a/samples/DX_APIUsage/DXUT/Optional/DXUTLockFreePipe.h
+++ b/samples/DX_APIUsage/DXUT/Optional/DXUTLockFreePipe.h
@@ -2,40 +2,35 @@
 // DXUTLockFreePipe.h
 //
 // See the "Lockless Programming Considerations for Xbox 360 and Microsoft Windows"
-// article in the DirectX SDK for more details.
+// article for more details.
 //
-// http://msdn2.microsoft.com/en-us/library/bb310595.aspx
+// http://msdn.microsoft.com/en-us/library/ee418650.aspx
 //
-// XNA Developer Connection
-// Copyright (C) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #pragma once
 
 #include <sal.h>
+#include <algorithm>
+
+#pragma pack(push)
+#pragma pack(8)
+#include <windows.h>
+#pragma pack (pop)
+
+extern "C"
+    void _ReadWriteBarrier();
+#pragma intrinsic(_ReadWriteBarrier)
 
-#ifdef _XBOX_VER
-    // Prevent the CPU from rearranging loads
-    // and stores, sufficiently for read-acquire
-    // and write-release.
-    #define DXUTImportBarrier __lwsync
-    #define DXUTExportBarrier __lwsync
-#else
-    #pragma pack(push)
-    #pragma pack(8)
-    #include <windows.h>
-    #pragma pack (pop)
-
-    extern "C"
-        void _ReadWriteBarrier();
-    #pragma intrinsic(_ReadWriteBarrier)
-
-    // Prevent the compiler from rearranging loads
-    // and stores, sufficiently for read-acquire
-    // and write-release. This is sufficient on
-    // x86 and x64.
-    #define DXUTImportBarrier _ReadWriteBarrier
-    #define DXUTExportBarrier _ReadWriteBarrier
-#endif
+// Prevent the compiler from rearranging loads
+// and stores, sufficiently for read-acquire
+// and write-release. This is sufficient on
+// x86 and x64.
+#define DXUTImportBarrier _ReadWriteBarrier
+#define DXUTExportBarrier _ReadWriteBarrier
 
 //
 // Pipe class designed for use by at most two threads: one reader, one writer.
@@ -63,7 +58,7 @@ public:
         return m_writeOffset - m_readOffset;
     }
 
-    bool __forceinline          Read( void* pvDest, unsigned long cbDest )
+    bool __forceinline          Read( _Out_writes_(cbDest) void* pvDest, _In_ unsigned long cbDest )
     {
         // Store the read and write offsets into local variables--this is
         // essentially a snapshot of their values so that they stay constant
@@ -118,7 +113,7 @@ public:
         // then the previous comparison would have failed since that would imply
         // that there were less than cbDest bytes available to read.
         //
-        unsigned long cbTailBytes = min( bytesLeft, c_cbBufferSize - actualReadOffset );
+        unsigned long cbTailBytes = std::min( bytesLeft, c_cbBufferSize - actualReadOffset );
         memcpy( pbDest, m_pbBuffer + actualReadOffset, cbTailBytes );
         bytesLeft -= cbTailBytes;
 
@@ -148,7 +143,7 @@ public:
         return true;
     }
 
-    bool __forceinline          Write( const void* pvSrc, unsigned long cbSrc )
+    bool __forceinline          Write( _In_reads_(cbSrc) const void* pvSrc, _In_ unsigned long cbSrc )
     {
         // Reading the read offset here has the same caveats as reading
         // the write offset had in the Read() function above. 
@@ -179,7 +174,7 @@ public:
 
         // See the explanation in the Read() function as to why we don't 
         // explicitly check against the read offset here.
-        unsigned long cbTailBytes = min( bytesLeft, c_cbBufferSize - actualWriteOffset );
+        unsigned long cbTailBytes = std::min( bytesLeft, c_cbBufferSize - actualWriteOffset );
         memcpy( m_pbBuffer + actualWriteOffset, pbSrc, cbTailBytes );
         bytesLeft -= cbTailBytes;
 
@@ -208,7 +203,7 @@ public:
 private:
     // Values derived from the buffer size template parameter
     //
-    const static BYTE c_cbBufferSizeLog2 = min( cbBufferSizeLog2, 31 );
+    const static BYTE c_cbBufferSizeLog2 = __min( cbBufferSizeLog2, 31 );
     const static DWORD c_cbBufferSize = ( 1 << c_cbBufferSizeLog2 );
     const static DWORD c_sizeMask = c_cbBufferSize - 1;
 
diff --git a/samples/DX_APIUsage/DXUT/Optional/DXUTcamera.cpp b/samples/DX_APIUsage/DXUT/Optional/DXUTcamera.cpp
index 42e8ea4..f6a1ac7 100644
--- a/samples/DX_APIUsage/DXUT/Optional/DXUTcamera.cpp
+++ b/samples/DX_APIUsage/DXUT/Optional/DXUTcamera.cpp
@@ -1,20 +1,28 @@
 //--------------------------------------------------------------------------------------
 // File: DXUTcamera.cpp
 //
-// Copyright (c) Microsoft Corporation. All rights reserved
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #include "DXUT.h"
 #include "DXUTcamera.h"
 #include "DXUTres.h"
-#undef min // use __min instead
-#undef max // use __max instead
+
+using namespace DirectX;
+
+//======================================================================================
+// CD3DArcBall
+//======================================================================================
 
 //--------------------------------------------------------------------------------------
 CD3DArcBall::CD3DArcBall()
 {
     Reset();
-    m_vDownPt = D3DXVECTOR3( 0, 0, 0 );
-    m_vCurrentPt = D3DXVECTOR3( 0, 0, 0 );
+
+    m_vDownPt = XMFLOAT3( 0, 0, 0 );
+    m_vCurrentPt = XMFLOAT3( 0, 0, 0 );
     m_Offset.x = m_Offset.y = 0;
 
     RECT rc;
@@ -23,66 +31,26 @@ CD3DArcBall::CD3DArcBall()
 }
 
 
-
-
-
 //--------------------------------------------------------------------------------------
 void CD3DArcBall::Reset()
 {
-    D3DXQuaternionIdentity( &m_qDown );
-    D3DXQuaternionIdentity( &m_qNow );
-    D3DXMatrixIdentity( &m_mRotation );
-    D3DXMatrixIdentity( &m_mTranslation );
-    D3DXMatrixIdentity( &m_mTranslationDelta );
-    m_bDrag = FALSE;
-    m_fRadiusTranslation = 1.0f;
-    m_fRadius = 1.0f;
-}
-
+    XMVECTOR qid = XMQuaternionIdentity();
+    XMStoreFloat4( &m_qDown, qid );
+    XMStoreFloat4( &m_qNow, qid );
 
+    XMMATRIX id = XMMatrixIdentity();
+    XMStoreFloat4x4( &m_mRotation, id );
+    XMStoreFloat4x4( &m_mTranslation, id );
+    XMStoreFloat4x4( &m_mTranslationDelta, id );
 
-
-//--------------------------------------------------------------------------------------
-D3DXVECTOR3 CD3DArcBall::ScreenToVector( float fScreenPtX, float fScreenPtY )
-{
-    // Scale to screen
-    FLOAT x = -( fScreenPtX - m_Offset.x - m_nWidth / 2 ) / ( m_fRadius * m_nWidth / 2 );
-    FLOAT y = ( fScreenPtY - m_Offset.y - m_nHeight / 2 ) / ( m_fRadius * m_nHeight / 2 );
-
-    FLOAT z = 0.0f;
-    FLOAT mag = x * x + y * y;
-
-    if( mag > 1.0f )
-    {
-        FLOAT scale = 1.0f / sqrtf( mag );
-        x *= scale;
-        y *= scale;
-    }
-    else
-        z = sqrtf( 1.0f - mag );
-
-    // Return vector
-    return D3DXVECTOR3( x, y, z );
-}
-
-
-
-
-//--------------------------------------------------------------------------------------
-D3DXQUATERNION CD3DArcBall::QuatFromBallPoints( const D3DXVECTOR3& vFrom, const D3DXVECTOR3& vTo )
-{
-    D3DXVECTOR3 vPart;
-    float fDot = D3DXVec3Dot( &vFrom, &vTo );
-    D3DXVec3Cross( &vPart, &vFrom, &vTo );
-
-    return D3DXQUATERNION( vPart.x, vPart.y, vPart.z, fDot );
+    m_bDrag = false;
+    m_fRadiusTranslation = 1.0f;
+    m_fRadius = 1.0f;
 }
 
 
-
-
 //--------------------------------------------------------------------------------------
-void CD3DArcBall::OnBegin( int nX, int nY )
+void CD3DArcBall::OnBegin( _In_ int nX, _In_ int nY )
 {
     // Only enter the drag state if the click falls
     // inside the click rectangle.
@@ -93,24 +61,27 @@ void CD3DArcBall::OnBegin( int nX, int nY )
     {
         m_bDrag = true;
         m_qDown = m_qNow;
-        m_vDownPt = ScreenToVector( ( float )nX, ( float )nY );
+        XMVECTOR v = ScreenToVector( float(nX), float(nY) );
+        XMStoreFloat3( &m_vDownPt, v );
     }
 }
 
 
-
-
 //--------------------------------------------------------------------------------------
-void CD3DArcBall::OnMove( int nX, int nY )
+void CD3DArcBall::OnMove( _In_ int nX, _In_ int nY )
 {
     if( m_bDrag )
     {
-        m_vCurrentPt = ScreenToVector( ( float )nX, ( float )nY );
-        m_qNow = m_qDown * QuatFromBallPoints( m_vDownPt, m_vCurrentPt );
-    }
-}
+        XMVECTOR curr = ScreenToVector( ( float )nX, ( float )nY ); 
+        XMStoreFloat3( &m_vCurrentPt, curr );
 
+        XMVECTOR down = XMLoadFloat3( &m_vDownPt );
+        XMVECTOR qdown = XMLoadFloat4( &m_qDown );
 
+        XMVECTOR result = XMQuaternionMultiply( qdown, QuatFromBallPoints( down, curr ) );
+        XMStoreFloat4( &m_qNow, result );
+    }
+}
 
 
 //--------------------------------------------------------------------------------------
@@ -120,11 +91,8 @@ void CD3DArcBall::OnEnd()
 }
 
 
-
-
-//--------------------------------------------------------------------------------------
-// Desc:
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 LRESULT CD3DArcBall::HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
     // Current mouse position
@@ -174,20 +142,25 @@ LRESULT CD3DArcBall::HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
             else if( ( MK_RBUTTON & wParam ) || ( MK_MBUTTON & wParam ) )
             {
                 // Normalize based on size of window and bounding sphere radius
-                FLOAT fDeltaX = ( m_ptLastMouse.x - iMouseX ) * m_fRadiusTranslation / m_nWidth;
-                FLOAT fDeltaY = ( m_ptLastMouse.y - iMouseY ) * m_fRadiusTranslation / m_nHeight;
+                float fDeltaX = ( m_ptLastMouse.x - iMouseX ) * m_fRadiusTranslation / m_nWidth;
+                float fDeltaY = ( m_ptLastMouse.y - iMouseY ) * m_fRadiusTranslation / m_nHeight;
 
+                XMMATRIX mTranslationDelta;
+                XMMATRIX mTranslation = XMLoadFloat4x4( &m_mTranslation );
                 if( wParam & MK_RBUTTON )
                 {
-                    D3DXMatrixTranslation( &m_mTranslationDelta, -2 * fDeltaX, 2 * fDeltaY, 0.0f );
-                    D3DXMatrixMultiply( &m_mTranslation, &m_mTranslation, &m_mTranslationDelta );
+                    mTranslationDelta = XMMatrixTranslation( -2 * fDeltaX, 2 * fDeltaY, 0.0f );
+                    mTranslation = XMMatrixMultiply( mTranslation, mTranslationDelta );
                 }
                 else  // wParam & MK_MBUTTON
                 {
-                    D3DXMatrixTranslation( &m_mTranslationDelta, 0.0f, 0.0f, 5 * fDeltaY );
-                    D3DXMatrixMultiply( &m_mTranslation, &m_mTranslation, &m_mTranslationDelta );
+                    mTranslationDelta = XMMatrixTranslation( 0.0f, 0.0f, 5 * fDeltaY );
+                    mTranslation = XMMatrixMultiply( mTranslation, mTranslationDelta );
                 }
 
+                XMStoreFloat4x4( &m_mTranslationDelta, mTranslationDelta );
+                XMStoreFloat4x4( &m_mTranslation, mTranslation );
+
                 // Store mouse coordinate
                 m_ptLastMouse.x = iMouseX;
                 m_ptLastMouse.y = iMouseY;
@@ -199,99 +172,92 @@ LRESULT CD3DArcBall::HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
 }
 
 
-
+//======================================================================================
+// CBaseCamera
+//======================================================================================
 
 //--------------------------------------------------------------------------------------
 // Constructor
 //--------------------------------------------------------------------------------------
-CBaseCamera::CBaseCamera()
+CBaseCamera::CBaseCamera() :
+    m_cKeysDown(0),
+    m_nCurrentButtonMask(0),
+    m_nMouseWheelDelta(0),
+    m_fFramesToSmoothMouseData(2.0f),
+    m_fCameraYawAngle(0.0f),
+    m_fCameraPitchAngle(0.0f),
+    m_fDragTimer(0.0f),
+    m_fTotalDragTimeToZero(0.25),
+    m_fRotationScaler(0.01f),
+    m_fMoveScaler(5.0f),
+    m_bMouseLButtonDown(false),
+    m_bMouseMButtonDown(false),
+    m_bMouseRButtonDown(false),
+    m_bMovementDrag(false),
+    m_bInvertPitch(false),
+    m_bEnablePositionMovement(true),
+    m_bEnableYAxisMovement(true),
+    m_bClipToBoundary(false),
+    m_bResetCursorAfterMove(false)
 {
-    m_cKeysDown = 0;
     ZeroMemory( m_aKeys, sizeof( BYTE ) * CAM_MAX_KEYS );
     ZeroMemory( m_GamePad, sizeof( DXUT_GAMEPAD ) * DXUT_MAX_CONTROLLERS );
 
-    // Set attributes for the view matrix
-    D3DXVECTOR3 vEyePt = D3DXVECTOR3( 0.0f, 0.0f, 0.0f );
-    D3DXVECTOR3 vLookatPt = D3DXVECTOR3( 0.0f, 0.0f, 1.0f );
-
     // Setup the view matrix
-    SetViewParams( &vEyePt, &vLookatPt );
+    SetViewParams( g_XMZero, g_XMIdentityR2 );
 
     // Setup the projection matrix
-    SetProjParams( D3DX_PI / 4, 1.0f, 1.0f, 1000.0f );
+    SetProjParams( XM_PI / 4, 1.0f, 1.0f, 1000.0f );
 
     GetCursorPos( &m_ptLastMousePosition );
-    m_bMouseLButtonDown = false;
-    m_bMouseMButtonDown = false;
-    m_bMouseRButtonDown = false;
-    m_nCurrentButtonMask = 0;
-    m_nMouseWheelDelta = 0;
-
-    m_fCameraYawAngle = 0.0f;
-    m_fCameraPitchAngle = 0.0f;
-
+    
     SetRect( &m_rcDrag, LONG_MIN, LONG_MIN, LONG_MAX, LONG_MAX );
-    m_vVelocity = D3DXVECTOR3( 0, 0, 0 );
-    m_bMovementDrag = false;
-    m_vVelocityDrag = D3DXVECTOR3( 0, 0, 0 );
-    m_fDragTimer = 0.0f;
-    m_fTotalDragTimeToZero = 0.25;
-    m_vRotVelocity = D3DXVECTOR2( 0, 0 );
-
-    m_fRotationScaler = 0.01f;
-    m_fMoveScaler = 5.0f;
-
-    m_bInvertPitch = false;
-    m_bEnableYAxisMovement = true;
-    m_bEnablePositionMovement = true;
+    m_vVelocity = XMFLOAT3( 0, 0, 0 );
+    m_vVelocityDrag = XMFLOAT3( 0, 0, 0 );
+    m_vRotVelocity = XMFLOAT2( 0, 0 );
 
-    m_vMouseDelta = D3DXVECTOR2( 0, 0 );
-    m_fFramesToSmoothMouseData = 2.0f;
+    m_vMouseDelta = XMFLOAT2( 0, 0 );
 
-    m_bClipToBoundary = false;
-    m_vMinBoundary = D3DXVECTOR3( -1, -1, -1 );
-    m_vMaxBoundary = D3DXVECTOR3( 1, 1, 1 );
-
-    m_bResetCursorAfterMove = false;
+    m_vMinBoundary = XMFLOAT3( -1, -1, -1 );
+    m_vMaxBoundary = XMFLOAT3( 1, 1, 1 );
 }
 
 
 //--------------------------------------------------------------------------------------
 // Client can call this to change the position and direction of camera
 //--------------------------------------------------------------------------------------
-VOID CBaseCamera::SetViewParams( D3DXVECTOR3* pvEyePt, D3DXVECTOR3* pvLookatPt )
+_Use_decl_annotations_
+void CBaseCamera::SetViewParams( FXMVECTOR vEyePt, FXMVECTOR vLookatPt )
 {
-    if( NULL == pvEyePt || NULL == pvLookatPt )
-        return;
+    XMStoreFloat3( &m_vEye, vEyePt );
+    XMStoreFloat3( &m_vDefaultEye, vEyePt );
 
-    m_vDefaultEye = m_vEye = *pvEyePt;
-    m_vDefaultLookAt = m_vLookAt = *pvLookatPt;
+    XMStoreFloat3( &m_vLookAt, vLookatPt );
+    XMStoreFloat3( &m_vDefaultLookAt , vLookatPt );
 
     // Calc the view matrix
-    D3DXVECTOR3 vUp( 0,1,0 );
-    D3DXMatrixLookAtLH( &m_mView, pvEyePt, pvLookatPt, &vUp );
+    XMMATRIX mView = XMMatrixLookAtLH( vEyePt, vLookatPt, g_XMIdentityR1 );
+    XMStoreFloat4x4( &m_mView, mView );
 
-    D3DXMATRIX mInvView;
-    D3DXMatrixInverse( &mInvView, NULL, &m_mView );
+    XMMATRIX mInvView = XMMatrixInverse( nullptr, mView );
 
     // The axis basis vectors and camera position are stored inside the 
     // position matrix in the 4 rows of the camera's world matrix.
     // To figure out the yaw/pitch of the camera, we just need the Z basis vector
-    D3DXVECTOR3* pZBasis = ( D3DXVECTOR3* )&mInvView._31;
+    XMFLOAT3 zBasis;
+    XMStoreFloat3( &zBasis, mInvView.r[2] );
 
-    m_fCameraYawAngle = atan2f( pZBasis->x, pZBasis->z );
-    float fLen = sqrtf( pZBasis->z * pZBasis->z + pZBasis->x * pZBasis->x );
-    m_fCameraPitchAngle = -atan2f( pZBasis->y, fLen );
+    m_fCameraYawAngle = atan2f( zBasis.x, zBasis.z );
+    float fLen = sqrtf( zBasis.z * zBasis.z + zBasis.x * zBasis.x );
+    m_fCameraPitchAngle = -atan2f( zBasis.y, fLen );
 }
 
 
-
-
 //--------------------------------------------------------------------------------------
 // Calculates the projection matrix based on input params
 //--------------------------------------------------------------------------------------
-VOID CBaseCamera::SetProjParams( FLOAT fFOV, FLOAT fAspect, FLOAT fNearPlane,
-                                 FLOAT fFarPlane )
+_Use_decl_annotations_
+void CBaseCamera::SetProjParams( float fFOV, float fAspect, float fNearPlane, float fFarPlane )
 {
     // Set attributes for the projection matrix
     m_fFOV = fFOV;
@@ -299,15 +265,15 @@ VOID CBaseCamera::SetProjParams( FLOAT fFOV, FLOAT fAspect, FLOAT fNearPlane,
     m_fNearPlane = fNearPlane;
     m_fFarPlane = fFarPlane;
 
-    D3DXMatrixPerspectiveFovLH( &m_mProj, fFOV, fAspect, fNearPlane, fFarPlane );
+    XMMATRIX mProj = XMMatrixPerspectiveFovLH( fFOV, fAspect, fNearPlane, fFarPlane );
+    XMStoreFloat4x4( &m_mProj, mProj );
 }
 
 
-
-
 //--------------------------------------------------------------------------------------
 // Call this from your message proc so this class can handle window messages
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 LRESULT CBaseCamera::HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
     UNREFERENCED_PARAMETER( hWnd );
@@ -323,6 +289,7 @@ LRESULT CBaseCamera::HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
             D3DUtil_CameraKeys mappedKey = MapKey( ( UINT )wParam );
             if( mappedKey != CAM_UNKNOWN )
             {
+                _Analysis_assume_( mappedKey < CAM_MAX_KEYS );
                 if( FALSE == IsKeyDown( m_aKeys[mappedKey] ) )
                 {
                     m_aKeys[ mappedKey ] = KEY_WAS_DOWN_MASK | KEY_IS_DOWN_MASK;
@@ -436,13 +403,14 @@ LRESULT CBaseCamera::HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
     return FALSE;
 }
 
+
 //--------------------------------------------------------------------------------------
 // Figure out the velocity based on keyboard input & drag if any
 //--------------------------------------------------------------------------------------
-void CBaseCamera::GetInput( bool bGetKeyboardInput, bool bGetMouseInput, bool bGetGamepadInput,
-                            bool bResetCursorAfterMove )
+_Use_decl_annotations_
+void CBaseCamera::GetInput( bool bGetKeyboardInput, bool bGetMouseInput, bool bGetGamepadInput )
 {
-    m_vKeyboardDirection = D3DXVECTOR3( 0, 0, 0 );
+    m_vKeyboardDirection = XMFLOAT3( 0, 0, 0 );
     if( bGetKeyboardInput )
     {
         // Update acceleration vector based on keyboard state
@@ -470,8 +438,8 @@ void CBaseCamera::GetInput( bool bGetKeyboardInput, bool bGetMouseInput, bool bG
 
     if( bGetGamepadInput )
     {
-        m_vGamePadLeftThumb = D3DXVECTOR3( 0, 0, 0 );
-        m_vGamePadRightThumb = D3DXVECTOR3( 0, 0, 0 );
+        m_vGamePadLeftThumb = XMFLOAT3( 0, 0, 0 );
+        m_vGamePadRightThumb = XMFLOAT3( 0, 0, 0 );
 
         // Get controller state
         for( DWORD iUserIndex = 0; iUserIndex < DXUT_MAX_CONTROLLERS; iUserIndex++ )
@@ -480,7 +448,7 @@ void CBaseCamera::GetInput( bool bGetKeyboardInput, bool bGetMouseInput, bool bG
 
             // Mark time if the controller is in a non-zero state
             if( m_GamePad[iUserIndex].wButtons ||
-                m_GamePad[iUserIndex].sThumbLX || m_GamePad[iUserIndex].sThumbLX ||
+                m_GamePad[iUserIndex].sThumbLX || m_GamePad[iUserIndex].sThumbLY ||
                 m_GamePad[iUserIndex].sThumbRX || m_GamePad[iUserIndex].sThumbRY ||
                 m_GamePad[iUserIndex].bLeftTrigger || m_GamePad[iUserIndex].bRightTrigger )
             {
@@ -520,13 +488,12 @@ void CBaseCamera::GetInput( bool bGetKeyboardInput, bool bGetMouseInput, bool bG
 //--------------------------------------------------------------------------------------
 void CBaseCamera::UpdateMouseDelta()
 {
-    POINT ptCurMouseDelta;
-    POINT ptCurMousePos;
-
     // Get current position of mouse
+    POINT ptCurMousePos;
     GetCursorPos( &ptCurMousePos );
 
     // Calc how far it's moved since last frame
+    POINT ptCurMouseDelta;
     ptCurMouseDelta.x = ptCurMousePos.x - m_ptLastMousePosition.x;
     ptCurMouseDelta.y = ptCurMousePos.y - m_ptLastMousePosition.y;
 
@@ -559,26 +526,30 @@ void CBaseCamera::UpdateMouseDelta()
     m_vMouseDelta.x = m_vMouseDelta.x * fPercentOfOld + ptCurMouseDelta.x * fPercentOfNew;
     m_vMouseDelta.y = m_vMouseDelta.y * fPercentOfOld + ptCurMouseDelta.y * fPercentOfNew;
 
-    m_vRotVelocity = m_vMouseDelta * m_fRotationScaler;
+    m_vRotVelocity.x = m_vMouseDelta.x * m_fRotationScaler;
+    m_vRotVelocity.y = m_vMouseDelta.y * m_fRotationScaler;
 }
 
 
-
-
 //--------------------------------------------------------------------------------------
 // Figure out the velocity based on keyboard input & drag if any
 //--------------------------------------------------------------------------------------
-void CBaseCamera::UpdateVelocity( float fElapsedTime )
+void CBaseCamera::UpdateVelocity( _In_ float fElapsedTime )
 {
-    D3DXMATRIX mRotDelta;
-    D3DXVECTOR2 vGamePadRightThumb = D3DXVECTOR2( m_vGamePadRightThumb.x, -m_vGamePadRightThumb.z );
-    m_vRotVelocity = m_vMouseDelta * m_fRotationScaler + vGamePadRightThumb * 0.02f;
+    XMVECTOR vGamePadRightThumb = XMVectorSet( m_vGamePadRightThumb.x, -m_vGamePadRightThumb.z, 0, 0 );
+
+    XMVECTOR vMouseDelta = XMLoadFloat2( &m_vMouseDelta );
+    XMVECTOR vRotVelocity = vMouseDelta * m_fRotationScaler + vGamePadRightThumb * 0.02f;
 
-    D3DXVECTOR3 vAccel = m_vKeyboardDirection + m_vGamePadLeftThumb;
+    XMStoreFloat2( &m_vRotVelocity, vRotVelocity );
+    
+    XMVECTOR vKeyboardDirection = XMLoadFloat3( &m_vKeyboardDirection );
+    XMVECTOR vGamePadLeftThumb = XMLoadFloat3( &m_vGamePadLeftThumb );
+    XMVECTOR vAccel = vKeyboardDirection + vGamePadLeftThumb;
 
     // Normalize vector so if moving 2 dirs (left & forward), 
     // the camera doesn't move faster than if moving in 1 dir
-    D3DXVec3Normalize( &vAccel, &vAccel );
+    vAccel = XMVector3Normalize( vAccel );
 
     // Scale the acceleration vector
     vAccel *= m_fMoveScaler;
@@ -586,15 +557,17 @@ void CBaseCamera::UpdateVelocity( float fElapsedTime )
     if( m_bMovementDrag )
     {
         // Is there any acceleration this frame?
-        if( D3DXVec3LengthSq( &vAccel ) > 0 )
+        if( XMVectorGetX( XMVector3LengthSq( vAccel ) ) > 0 )
         {
-            // If so, then this means the user has pressed a movement key\
+            // If so, then this means the user has pressed a movement key
             // so change the velocity immediately to acceleration 
             // upon keyboard input.  This isn't normal physics
             // but it will give a quick response to keyboard input
-            m_vVelocity = vAccel;
+            XMStoreFloat3( &m_vVelocity, vAccel );
+
             m_fDragTimer = m_fTotalDragTimeToZero;
-            m_vVelocityDrag = vAccel / m_fDragTimer;
+            
+            XMStoreFloat3( &m_vVelocityDrag, vAccel / m_fDragTimer );
         }
         else
         {
@@ -602,48 +575,34 @@ void CBaseCamera::UpdateVelocity( float fElapsedTime )
             if( m_fDragTimer > 0 )
             {
                 // Drag until timer is <= 0
-                m_vVelocity -= m_vVelocityDrag * fElapsedTime;
+                XMVECTOR vVelocity = XMLoadFloat3( &m_vVelocity );
+                XMVECTOR vVelocityDrag = XMLoadFloat3( &m_vVelocityDrag );
+
+                vVelocity -= vVelocityDrag * fElapsedTime;
+
+                XMStoreFloat3( &m_vVelocity, vVelocity );
+
                 m_fDragTimer -= fElapsedTime;
             }
             else
             {
                 // Zero velocity
-                m_vVelocity = D3DXVECTOR3( 0, 0, 0 );
+                m_vVelocity = XMFLOAT3( 0, 0, 0 );
             }
         }
     }
     else
     {
         // No drag, so immediately change the velocity
-        m_vVelocity = vAccel;
+        XMStoreFloat3( &m_vVelocity, vAccel );
     }
 }
 
 
-
-
-//--------------------------------------------------------------------------------------
-// Clamps pV to lie inside m_vMinBoundary & m_vMaxBoundary
-//--------------------------------------------------------------------------------------
-void CBaseCamera::ConstrainToBoundary( D3DXVECTOR3* pV )
-{
-    // Constrain vector to a bounding box 
-    pV->x = __max( pV->x, m_vMinBoundary.x );
-    pV->y = __max( pV->y, m_vMinBoundary.y );
-    pV->z = __max( pV->z, m_vMinBoundary.z );
-
-    pV->x = __min( pV->x, m_vMaxBoundary.x );
-    pV->y = __min( pV->y, m_vMaxBoundary.y );
-    pV->z = __min( pV->z, m_vMaxBoundary.z );
-}
-
-
-
-
 //--------------------------------------------------------------------------------------
 // Maps a windows virtual key to an enum
 //--------------------------------------------------------------------------------------
-D3DUtil_CameraKeys CBaseCamera::MapKey( UINT nKey )
+D3DUtil_CameraKeys CBaseCamera::MapKey( _In_ UINT nKey )
 {
     // This could be upgraded to a method that's user-definable but for 
     // simplicity, we'll use a hardcoded mapping.
@@ -698,46 +657,49 @@ D3DUtil_CameraKeys CBaseCamera::MapKey( UINT nKey )
 }
 
 
-
-
 //--------------------------------------------------------------------------------------
 // Reset the camera's position back to the default
 //--------------------------------------------------------------------------------------
-VOID CBaseCamera::Reset()
+void CBaseCamera::Reset()
 {
-    SetViewParams( &m_vDefaultEye, &m_vDefaultLookAt );
-}
+    XMVECTOR vDefaultEye = XMLoadFloat3( &m_vDefaultEye );
+    XMVECTOR vDefaultLookAt = XMLoadFloat3( &m_vDefaultLookAt );
 
+    SetViewParams( vDefaultEye, vDefaultLookAt );
+}
 
 
+//======================================================================================
+// CFirstPersonCamera
+//======================================================================================
 
-//--------------------------------------------------------------------------------------
-// Constructor
-//--------------------------------------------------------------------------------------
-CFirstPersonCamera::CFirstPersonCamera() : m_nActiveButtonMask( 0x07 )
+CFirstPersonCamera::CFirstPersonCamera() :
+    m_nActiveButtonMask( 0x07 ),
+    m_bRotateWithoutButtonDown(false)
 {
-    m_bRotateWithoutButtonDown = false;
 }
 
 
-
-
 //--------------------------------------------------------------------------------------
 // Update the view matrix based on user input & elapsed time
 //--------------------------------------------------------------------------------------
-VOID CFirstPersonCamera::FrameMove( FLOAT fElapsedTime )
+void CFirstPersonCamera::FrameMove( _In_ float fElapsedTime )
 {
-    if( DXUTGetGlobalTimer()->IsStopped() ) {
-        if (DXUTGetFPS() == 0.0f) fElapsedTime = 0;
-        else fElapsedTime = 1.0f / DXUTGetFPS();
+    if( DXUTGetGlobalTimer()->IsStopped() )
+    {
+        if (DXUTGetFPS() == 0.0f)
+            fElapsedTime = 0;
+        else
+            fElapsedTime = 1.0f / DXUTGetFPS();
     }
 
     if( IsKeyDown( m_aKeys[CAM_RESET] ) )
+    {
         Reset();
+    }
 
     // Get keyboard/mouse/gamepad input
-    GetInput( m_bEnablePositionMovement, ( m_nActiveButtonMask & m_nCurrentButtonMask ) || m_bRotateWithoutButtonDown,
-              true, m_bResetCursorAfterMove );
+    GetInput( m_bEnablePositionMovement, ( m_nActiveButtonMask & m_nCurrentButtonMask ) || m_bRotateWithoutButtonDown, true );
 
     //// Get the mouse movement (if any) if the mouse button are down
     //if( (m_nActiveButtonMask & m_nCurrentButtonMask) || m_bRotateWithoutButtonDown )
@@ -747,13 +709,14 @@ VOID CFirstPersonCamera::FrameMove( FLOAT fElapsedTime )
     UpdateVelocity( fElapsedTime );
 
     // Simple euler method to calculate position delta
-    D3DXVECTOR3 vPosDelta = m_vVelocity * fElapsedTime;
+    XMVECTOR vVelocity = XMLoadFloat3( &m_vVelocity );
+    XMVECTOR vPosDelta = vVelocity * fElapsedTime;
 
     // If rotating the camera 
-    if( ( m_nActiveButtonMask & m_nCurrentButtonMask ) ||
-        m_bRotateWithoutButtonDown ||
-        m_vGamePadRightThumb.x != 0 ||
-        m_vGamePadRightThumb.z != 0 )
+    if( ( m_nActiveButtonMask & m_nCurrentButtonMask )
+        || m_bRotateWithoutButtonDown
+        || m_vGamePadRightThumb.x != 0
+        || m_vGamePadRightThumb.z != 0 )
     {
         // Update the pitch & yaw angle based on mouse movement
         float fYawDelta = m_vRotVelocity.x;
@@ -767,49 +730,50 @@ VOID CFirstPersonCamera::FrameMove( FLOAT fElapsedTime )
         m_fCameraYawAngle += fYawDelta;
 
         // Limit pitch to straight up or straight down
-        m_fCameraPitchAngle = __max( -D3DX_PI / 2.0f, m_fCameraPitchAngle );
-        m_fCameraPitchAngle = __min( +D3DX_PI / 2.0f, m_fCameraPitchAngle );
+        m_fCameraPitchAngle = std::max( -XM_PI / 2.0f, m_fCameraPitchAngle );
+        m_fCameraPitchAngle = std::min( +XM_PI / 2.0f, m_fCameraPitchAngle );
     }
 
     // Make a rotation matrix based on the camera's yaw & pitch
-    D3DXMATRIX mCameraRot;
-    D3DXMatrixRotationYawPitchRoll( &mCameraRot, m_fCameraYawAngle, m_fCameraPitchAngle, 0 );
+    XMMATRIX mCameraRot = XMMatrixRotationRollPitchYaw( m_fCameraPitchAngle, m_fCameraYawAngle, 0 );
 
     // Transform vectors based on camera's rotation matrix
-    D3DXVECTOR3 vWorldUp, vWorldAhead;
-    D3DXVECTOR3 vLocalUp = D3DXVECTOR3( 0, 1, 0 );
-    D3DXVECTOR3 vLocalAhead = D3DXVECTOR3( 0, 0, 1 );
-    D3DXVec3TransformCoord( &vWorldUp, &vLocalUp, &mCameraRot );
-    D3DXVec3TransformCoord( &vWorldAhead, &vLocalAhead, &mCameraRot );
+    XMVECTOR vWorldUp = XMVector3TransformCoord( g_XMIdentityR1, mCameraRot );
+    XMVECTOR vWorldAhead = XMVector3TransformCoord( g_XMIdentityR2, mCameraRot );
 
     // Transform the position delta by the camera's rotation 
-    D3DXVECTOR3 vPosDeltaWorld;
     if( !m_bEnableYAxisMovement )
     {
         // If restricting Y movement, do not include pitch
         // when transforming position delta vector.
-        D3DXMatrixRotationYawPitchRoll( &mCameraRot, m_fCameraYawAngle, 0.0f, 0.0f );
+        mCameraRot = XMMatrixRotationRollPitchYaw( 0.0f, m_fCameraYawAngle, 0.0f );
     }
-    D3DXVec3TransformCoord( &vPosDeltaWorld, &vPosDelta, &mCameraRot );
+    XMVECTOR vPosDeltaWorld = XMVector3TransformCoord( vPosDelta, mCameraRot );
 
     // Move the eye position 
-    m_vEye += vPosDeltaWorld;
+    XMVECTOR vEye = XMLoadFloat3( &m_vEye );
+    vEye += vPosDeltaWorld;
     if( m_bClipToBoundary )
-        ConstrainToBoundary( &m_vEye );
+        vEye = ConstrainToBoundary( vEye );
+    XMStoreFloat3( &m_vEye, vEye );
 
-    // Update the lookAt position based on the eye position 
-    m_vLookAt = m_vEye + vWorldAhead;
+    // Update the lookAt position based on the eye position
+    XMVECTOR vLookAt = vEye + vWorldAhead;
+    XMStoreFloat3( &m_vLookAt, vLookAt );
 
     // Update the view matrix
-    D3DXMatrixLookAtLH( &m_mView, &m_vEye, &m_vLookAt, &vWorldUp );
+    XMMATRIX mView = XMMatrixLookAtLH( vEye, vLookAt, vWorldUp );
+    XMStoreFloat4x4( &m_mView, mView );
 
-    D3DXMatrixInverse( &m_mCameraWorld, NULL, &m_mView );
+    XMMATRIX mCameraWorld = XMMatrixInverse( nullptr, mView );
+    XMStoreFloat4x4( &m_mCameraWorld, mCameraWorld );
 }
 
 
 //--------------------------------------------------------------------------------------
 // Enable or disable each of the mouse buttons for rotation drag.
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CFirstPersonCamera::SetRotateButtons( bool bLeft, bool bMiddle, bool bRight, bool bRotateWithoutButtonDown )
 {
     m_nActiveButtonMask = ( bLeft ? MOUSE_LEFT_BUTTON : 0 ) |
@@ -819,49 +783,48 @@ void CFirstPersonCamera::SetRotateButtons( bool bLeft, bool bMiddle, bool bRight
 }
 
 
-//--------------------------------------------------------------------------------------
-// Constructor 
-//--------------------------------------------------------------------------------------
-CModelViewerCamera::CModelViewerCamera()
-{
-    D3DXMatrixIdentity( &m_mWorld );
-    D3DXMatrixIdentity( &m_mModelRot );
-    D3DXMatrixIdentity( &m_mModelLastRot );
-    D3DXMatrixIdentity( &m_mCameraRotLast );
-    m_vModelCenter = D3DXVECTOR3( 0, 0, 0 );
-    m_fRadius = 5.0f;
-    m_fDefaultRadius = 5.0f;
-    m_fMinRadius = 1.0f;
-    m_fMaxRadius = FLT_MAX;
-    m_bLimitPitch = false;
-    m_bEnablePositionMovement = false;
-    m_bAttachCameraToModel = false;
 
-    m_nRotateModelButtonMask = MOUSE_LEFT_BUTTON;
-    m_nZoomButtonMask = MOUSE_WHEEL;
-    m_nRotateCameraButtonMask = MOUSE_RIGHT_BUTTON;
-    m_bDragSinceLastUpdate = true;
-}
+//======================================================================================
+// CModelViewerCamera
+//======================================================================================
 
+CModelViewerCamera::CModelViewerCamera() :
+    m_nRotateModelButtonMask(MOUSE_LEFT_BUTTON),
+    m_nZoomButtonMask(MOUSE_WHEEL),
+    m_nRotateCameraButtonMask(MOUSE_RIGHT_BUTTON),
+    m_bAttachCameraToModel(false),
+    m_bLimitPitch(false),
+    m_bDragSinceLastUpdate(true),
+    m_fRadius(5.0f),
+    m_fDefaultRadius(5.0f),
+    m_fMinRadius(1.0f),
+    m_fMaxRadius(FLT_MAX)
+{
+    XMMATRIX id = XMMatrixIdentity();
 
+    XMStoreFloat4x4( &m_mWorld, id );
+    XMStoreFloat4x4( &m_mModelRot, id );
+    XMStoreFloat4x4( &m_mModelLastRot, id );
+    XMStoreFloat4x4( &m_mCameraRotLast, id );
+    m_vModelCenter = XMFLOAT3( 0, 0, 0 );
+
+    m_bEnablePositionMovement = false;
+}
 
 
 //--------------------------------------------------------------------------------------
 // Update the view matrix & the model's world matrix based 
 //       on user input & elapsed time
 //--------------------------------------------------------------------------------------
-VOID CModelViewerCamera::FrameMove( FLOAT fElapsedTime )
+void CModelViewerCamera::FrameMove( _In_ float fElapsedTime )
 {
     if( IsKeyDown( m_aKeys[CAM_RESET] ) )
         Reset();
 
-    if (0 == m_cKeysDown)
-    {
-        // Simulate motion for the video
-        m_WorldArcBall.OnBegin(0, 0);
-        m_WorldArcBall.OnMove(1, 1);
-        m_WorldArcBall.OnEnd();
-    }
+    // If no dragged has happend since last time FrameMove is called,
+    // and no camera key is held down, then no need to handle again.
+    if( !m_bDragSinceLastUpdate && 0 == m_cKeysDown )
+        return;
 
     m_bDragSinceLastUpdate = false;
 
@@ -870,100 +833,101 @@ VOID CModelViewerCamera::FrameMove( FLOAT fElapsedTime )
     //if( m_nCurrentButtonMask != 0 ) 
     //    UpdateMouseDelta( fElapsedTime );
 
-    GetInput( m_bEnablePositionMovement, m_nCurrentButtonMask != 0, true, false );
+    GetInput( m_bEnablePositionMovement, m_nCurrentButtonMask != 0, true );
 
     // Get amount of velocity based on the keyboard input and drag (if any)
     UpdateVelocity( fElapsedTime );
 
     // Simple euler method to calculate position delta
-    D3DXVECTOR3 vPosDelta = m_vVelocity * fElapsedTime;
+    XMVECTOR vPosDelta = XMLoadFloat3( &m_vVelocity ) * fElapsedTime;
 
     // Change the radius from the camera to the model based on wheel scrolling
     if( m_nMouseWheelDelta && m_nZoomButtonMask == MOUSE_WHEEL )
         m_fRadius -= m_nMouseWheelDelta * m_fRadius * 0.1f / 120.0f;
-    m_fRadius = __min( m_fMaxRadius, m_fRadius );
-    m_fRadius = __max( m_fMinRadius, m_fRadius );
+    m_fRadius = std::min( m_fMaxRadius, m_fRadius );
+    m_fRadius = std::max( m_fMinRadius, m_fRadius );
     m_nMouseWheelDelta = 0;
 
     // Get the inverse of the arcball's rotation matrix
-    D3DXMATRIX mCameraRot;
-    D3DXMatrixInverse( &mCameraRot, NULL, m_ViewArcBall.GetRotationMatrix() );
+    XMMATRIX mCameraRot = XMMatrixInverse( nullptr, m_ViewArcBall.GetRotationMatrix() );
 
     // Transform vectors based on camera's rotation matrix
-    D3DXVECTOR3 vWorldUp, vWorldAhead;
-    D3DXVECTOR3 vLocalUp = D3DXVECTOR3( 0, 1, 0 );
-    D3DXVECTOR3 vLocalAhead = D3DXVECTOR3( 0, 0, 1 );
-    D3DXVec3TransformCoord( &vWorldUp, &vLocalUp, &mCameraRot );
-    D3DXVec3TransformCoord( &vWorldAhead, &vLocalAhead, &mCameraRot );
+    XMVECTOR vWorldUp = XMVector3TransformCoord( g_XMIdentityR1, mCameraRot );
+    XMVECTOR vWorldAhead = XMVector3TransformCoord( g_XMIdentityR2, mCameraRot );
 
     // Transform the position delta by the camera's rotation 
-    D3DXVECTOR3 vPosDeltaWorld;
-    D3DXVec3TransformCoord( &vPosDeltaWorld, &vPosDelta, &mCameraRot );
+    XMVECTOR vPosDeltaWorld = XMVector3TransformCoord( vPosDelta, mCameraRot );
 
     // Move the lookAt position 
-    m_vLookAt += vPosDeltaWorld;
+    XMVECTOR vLookAt = XMLoadFloat3( &m_vLookAt );
+    vLookAt += vPosDeltaWorld;
     if( m_bClipToBoundary )
-        ConstrainToBoundary( &m_vLookAt );
+        vLookAt = ConstrainToBoundary( vLookAt );
+    XMStoreFloat3( &m_vLookAt, vLookAt );
 
     // Update the eye point based on a radius away from the lookAt position
-    m_vEye = m_vLookAt - vWorldAhead * m_fRadius;
+    XMVECTOR vEye = vLookAt - vWorldAhead * m_fRadius;
+    XMStoreFloat3( &m_vEye, vEye );
 
     // Update the view matrix
-    D3DXMatrixLookAtLH( &m_mView, &m_vEye, &m_vLookAt, &vWorldUp );
+    XMMATRIX mView = XMMatrixLookAtLH( vEye, vLookAt, vWorldUp );
+    XMStoreFloat4x4( &m_mView, mView );
 
-    D3DXMATRIX mInvView;
-    D3DXMatrixInverse( &mInvView, NULL, &m_mView );
-    mInvView._41 = mInvView._42 = mInvView._43 = 0;
+    XMMATRIX mInvView = XMMatrixInverse( nullptr, mView );
+    mInvView.r[3] = XMVectorSelect( mInvView.r[3], g_XMZero, g_XMSelect1110 );
 
-    D3DXMATRIX mModelLastRotInv;
-    D3DXMatrixInverse( &mModelLastRotInv, NULL, &m_mModelLastRot );
+    XMMATRIX mModelLastRot = XMLoadFloat4x4( &m_mModelLastRot );
+    XMMATRIX mModelLastRotInv = XMMatrixInverse( nullptr, mModelLastRot );
 
     // Accumulate the delta of the arcball's rotation in view space.
     // Note that per-frame delta rotations could be problematic over long periods of time.
-    D3DXMATRIX mModelRot;
-    mModelRot = *m_WorldArcBall.GetRotationMatrix();
-    m_mModelRot *= m_mView * mModelLastRotInv * mModelRot * mInvView;
+    XMMATRIX mModelRot0 = m_WorldArcBall.GetRotationMatrix();
+    XMMATRIX mModelRot = XMLoadFloat4x4( &m_mModelRot );
+    mModelRot *= mView * mModelLastRotInv * mModelRot0 * mInvView;
 
     if( m_ViewArcBall.IsBeingDragged() && m_bAttachCameraToModel && !IsKeyDown( m_aKeys[CAM_CONTROLDOWN] ) )
     {
         // Attach camera to model by inverse of the model rotation
-        D3DXMATRIX mCameraLastRotInv;
-        D3DXMatrixInverse( &mCameraLastRotInv, NULL, &m_mCameraRotLast );
-        D3DXMATRIX mCameraRotDelta = mCameraLastRotInv * mCameraRot; // local to world matrix
-        m_mModelRot *= mCameraRotDelta;
+        XMMATRIX mCameraRotLast = XMLoadFloat4x4( &m_mCameraRotLast );
+        XMMATRIX mCameraLastRotInv = XMMatrixInverse( nullptr, mCameraRotLast );
+        XMMATRIX mCameraRotDelta = mCameraLastRotInv * mCameraRot; // local to world matrix
+        mModelRot *= mCameraRotDelta;
     }
-    m_mCameraRotLast = mCameraRot;
 
-    m_mModelLastRot = mModelRot;
+    XMStoreFloat4x4( &m_mModelLastRot, mModelRot0 );
+    XMStoreFloat4x4( &m_mCameraRotLast, mCameraRot );
 
     // Since we're accumulating delta rotations, we need to orthonormalize 
     // the matrix to prevent eventual matrix skew
-    D3DXVECTOR3* pXBasis = ( D3DXVECTOR3* )&m_mModelRot._11;
-    D3DXVECTOR3* pYBasis = ( D3DXVECTOR3* )&m_mModelRot._21;
-    D3DXVECTOR3* pZBasis = ( D3DXVECTOR3* )&m_mModelRot._31;
-    D3DXVec3Normalize( pXBasis, pXBasis );
-    D3DXVec3Cross( pYBasis, pZBasis, pXBasis );
-    D3DXVec3Normalize( pYBasis, pYBasis );
-    D3DXVec3Cross( pZBasis, pXBasis, pYBasis );
+    XMVECTOR xBasis = XMVector3Normalize( mModelRot.r[0] );
+    XMVECTOR yBasis = XMVector3Cross( mModelRot.r[2], xBasis );
+    yBasis = XMVector3Normalize( yBasis );
+    XMVECTOR zBasis = XMVector3Cross( xBasis, yBasis );
+
+    mModelRot.r[0] = XMVectorSelect( mModelRot.r[0], xBasis, g_XMSelect1110 );
+    mModelRot.r[1] = XMVectorSelect( mModelRot.r[1], yBasis, g_XMSelect1110 );
+    mModelRot.r[2] = XMVectorSelect( mModelRot.r[2], zBasis, g_XMSelect1110 );
 
     // Translate the rotation matrix to the same position as the lookAt position
-    m_mModelRot._41 = m_vLookAt.x;
-    m_mModelRot._42 = m_vLookAt.y;
-    m_mModelRot._43 = m_vLookAt.z;
+    mModelRot.r[3] = XMVectorSelect( mModelRot.r[3], vLookAt, g_XMSelect1110 );
+    
+    XMStoreFloat4x4( &m_mModelRot, mModelRot );
 
     // Translate world matrix so its at the center of the model
-    D3DXMATRIX mTrans;
-    D3DXMatrixTranslation( &mTrans, -m_vModelCenter.x, -m_vModelCenter.y, -m_vModelCenter.z );
-    m_mWorld = mTrans * m_mModelRot;
+    XMMATRIX mTrans = XMMatrixTranslation( -m_vModelCenter.x, -m_vModelCenter.y, -m_vModelCenter.z );
+    XMMATRIX mWorld = mTrans * mModelRot;
+    XMStoreFloat4x4( &m_mWorld, mWorld );
 }
 
 
-void CModelViewerCamera::SetDragRect( RECT& rc )
+//--------------------------------------------------------------------------------------
+void CModelViewerCamera::SetDragRect( _In_ const RECT& rc )
 {
     CBaseCamera::SetDragRect( rc );
 
     m_WorldArcBall.SetOffset( rc.left, rc.top );
     m_ViewArcBall.SetOffset( rc.left, rc.top );
+
     SetWindow( rc.right - rc.left, rc.bottom - rc.top );
 }
 
@@ -971,14 +935,15 @@ void CModelViewerCamera::SetDragRect( RECT& rc )
 //--------------------------------------------------------------------------------------
 // Reset the camera's position back to the default
 //--------------------------------------------------------------------------------------
-VOID CModelViewerCamera::Reset()
+void CModelViewerCamera::Reset()
 {
     CBaseCamera::Reset();
 
-    D3DXMatrixIdentity( &m_mWorld );
-    D3DXMatrixIdentity( &m_mModelRot );
-    D3DXMatrixIdentity( &m_mModelLastRot );
-    D3DXMatrixIdentity( &m_mCameraRotLast );
+    XMMATRIX id = XMMatrixIdentity();
+    XMStoreFloat4x4( &m_mWorld, id );
+    XMStoreFloat4x4( &m_mModelRot, id );
+    XMStoreFloat4x4( &m_mModelLastRot, id );
+    XMStoreFloat4x4( &m_mCameraRotLast, id );
 
     m_fRadius = m_fDefaultRadius;
     m_WorldArcBall.Reset();
@@ -989,32 +954,30 @@ VOID CModelViewerCamera::Reset()
 //--------------------------------------------------------------------------------------
 // Override for setting the view parameters
 //--------------------------------------------------------------------------------------
-void CModelViewerCamera::SetViewParams( D3DXVECTOR3* pvEyePt, D3DXVECTOR3* pvLookatPt )
+_Use_decl_annotations_
+void CModelViewerCamera::SetViewParams( FXMVECTOR vEyePt, FXMVECTOR vLookatPt )
 {
-    CBaseCamera::SetViewParams( pvEyePt, pvLookatPt );
+    CBaseCamera::SetViewParams( vEyePt, vLookatPt );
 
     // Propogate changes to the member arcball
-    D3DXQUATERNION quat;
-    D3DXMATRIXA16 mRotation;
-    D3DXVECTOR3 vUp( 0,1,0 );
-    D3DXMatrixLookAtLH( &mRotation, pvEyePt, pvLookatPt, &vUp );
-    D3DXQuaternionRotationMatrix( &quat, &mRotation );
+    XMMATRIX mRotation = XMMatrixLookAtLH( vEyePt, vLookatPt, g_XMIdentityR1 );
+    XMVECTOR quat = XMQuaternionRotationMatrix( mRotation );
     m_ViewArcBall.SetQuatNow( quat );
 
     // Set the radius according to the distance
-    D3DXVECTOR3 vEyeToPoint;
-    D3DXVec3Subtract( &vEyeToPoint, pvLookatPt, pvEyePt );
-    SetRadius( D3DXVec3Length( &vEyeToPoint ) );
+    XMVECTOR vEyeToPoint = XMVectorSubtract( vLookatPt, vEyePt );
+    float len = XMVectorGetX( XMVector3Length( vEyeToPoint ) );
+    SetRadius( len );
 
     // View information changed. FrameMove should be called.
     m_bDragSinceLastUpdate = true;
 }
 
 
-
 //--------------------------------------------------------------------------------------
 // Call this from your message proc so this class can handle window messages
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 LRESULT CModelViewerCamera::HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
     CBaseCamera::HandleMessages( hWnd, uMsg, wParam, lParam );
@@ -1099,152 +1062,32 @@ LRESULT CModelViewerCamera::HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam,
 }
 
 
+//======================================================================================
+// CDXUTDirectionWidget
+//======================================================================================
 
-//--------------------------------------------------------------------------------------
-// D3D9
-IDirect3DDevice9*           CDXUTDirectionWidget::s_pd3d9Device = NULL;
-ID3DXEffect*                CDXUTDirectionWidget::s_pD3D9Effect = NULL;
-ID3DXMesh*                  CDXUTDirectionWidget::s_pD3D9Mesh = NULL;
-D3DXHANDLE                  CDXUTDirectionWidget::s_hRenderWith1LightNoTexture = NULL;
-D3DXHANDLE                  CDXUTDirectionWidget::s_hMaterialDiffuseColor = NULL;
-D3DXHANDLE                  CDXUTDirectionWidget::s_hLightDir = NULL;
-D3DXHANDLE                  CDXUTDirectionWidget::s_hWorldViewProjection = NULL;
-D3DXHANDLE                  CDXUTDirectionWidget::s_hWorld = NULL;
-
-
-//--------------------------------------------------------------------------------------
-CDXUTDirectionWidget::CDXUTDirectionWidget()
+CDXUTDirectionWidget::CDXUTDirectionWidget() :
+    m_fRadius(1.0f),
+    m_nRotateMask(MOUSE_RIGHT_BUTTON)
 {
-    m_fRadius = 1.0f;
-    m_vDefaultDir = D3DXVECTOR3( 0, 1, 0 );
+    m_vDefaultDir = XMFLOAT3( 0, 1, 0 );
     m_vCurrentDir = m_vDefaultDir;
-    m_nRotateMask = MOUSE_RIGHT_BUTTON;
-
-    D3DXMatrixIdentity( &m_mView );
-    D3DXMatrixIdentity( &m_mRot );
-    D3DXMatrixIdentity( &m_mRotSnapshot );
-}
 
+    XMMATRIX id = XMMatrixIdentity();
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDirectionWidget::StaticOnD3D9CreateDevice( IDirect3DDevice9* pd3dDevice )
-{
-    HRESULT hr;
-
-    s_pd3d9Device = pd3dDevice;
-
-    const char* g_strBuffer =
-        "float4 g_MaterialDiffuseColor;      // Material's diffuse color\r\n"
-        "float3 g_LightDir;                  // Light's direction in world space\r\n"
-        "float4x4 g_mWorld;                  // World matrix for object\r\n"
-        "float4x4 g_mWorldViewProjection;    // World * View * Projection matrix\r\n"
-        "\r\n"
-        "struct VS_OUTPUT\r\n"
-        "{\r\n"
-        "    float4 Position   : POSITION;   // vertex position\r\n"
-        "    float4 Diffuse    : COLOR0;     // vertex diffuse color\r\n"
-        "};\r\n"
-        "\r\n"
-        "VS_OUTPUT RenderWith1LightNoTextureVS( float4 vPos : POSITION,\r\n"
-        "                                       float3 vNormal : NORMAL )\r\n"
-        "{\r\n"
-        "    VS_OUTPUT Output;\r\n"
-        "\r\n"
-        "    // Transform the position from object space to homogeneous projection space\r\n"
-        "    Output.Position = mul(vPos, g_mWorldViewProjection);\r\n"
-        "\r\n"
-        "    // Transform the normal from object space to world space\r\n"
-        "    float3 vNormalWorldSpace;\r\n"
-        "    vNormalWorldSpace = normalize(mul(vNormal, (float3x3)g_mWorld)); // normal (world space)\r\n"
-        "\r\n"
-        "    // Compute simple directional lighting equation\r\n"
-        "    Output.Diffuse.rgb = g_MaterialDiffuseColor * max(0,dot(vNormalWorldSpace, g_LightDir));\r\n"
-        "    Output.Diffuse.a = 1.0f;\r\n"
-        "\r\n"
-        "    return Output;\r\n"
-        "}\r\n"
-        "\r\n"
-        "float4 RenderWith1LightNoTexturePS( float4 Diffuse : COLOR0 ) : COLOR0\r\n"
-        "{\r\n"
-        "    return Diffuse;\r\n"
-        "}\r\n"
-        "\r\n"
-        "technique RenderWith1LightNoTexture\r\n"
-        "{\r\n"
-        "    pass P0\r\n"
-        "    {\r\n"
-        "        VertexShader = compile vs_2_0 RenderWith1LightNoTextureVS();\r\n"
-        "        PixelShader  = compile ps_2_0 RenderWith1LightNoTexturePS();\r\n"
-        "    }\r\n"
-        "}\r\n"
-        "";
-
-    UINT dwBufferSize = ( UINT )strlen( g_strBuffer ) + 1;
-
-    DWORD Flags = D3DXFX_NOT_CLONEABLE;
-#ifdef D3DXFX_LARGEADDRESS_HANDLE
-    Flags |= D3DXFX_LARGEADDRESSAWARE;
-#endif
-
-    V_RETURN( D3DXCreateEffect( s_pd3d9Device, g_strBuffer, dwBufferSize, NULL, NULL, Flags,
-                                NULL, &s_pD3D9Effect, NULL ) );
-
-    // Save technique handles for use when rendering
-    s_hRenderWith1LightNoTexture = s_pD3D9Effect->GetTechniqueByName( "RenderWith1LightNoTexture" );
-    s_hMaterialDiffuseColor = s_pD3D9Effect->GetParameterByName( NULL, "g_MaterialDiffuseColor" );
-    s_hLightDir = s_pD3D9Effect->GetParameterByName( NULL, "g_LightDir" );
-    s_hWorld = s_pD3D9Effect->GetParameterByName( NULL, "g_mWorld" );
-    s_hWorldViewProjection = s_pD3D9Effect->GetParameterByName( NULL, "g_mWorldViewProjection" );
-
-    // Load the mesh with D3DX and get back a ID3DXMesh*.  For this
-    // sample we'll ignore the X file's embedded materials since we know 
-    // exactly the model we're loading.  See the mesh samples such as
-    // "OptimizedMesh" for a more generic mesh loading example.
-    V_RETURN( DXUTCreateArrowMeshFromInternalArray( s_pd3d9Device, &s_pD3D9Mesh ) );
-
-    // Optimize the mesh for this graphics card's vertex cache 
-    // so when rendering the mesh's triangle list the vertices will 
-    // cache hit more often so it won't have to re-execute the vertex shader 
-    // on those vertices so it will improve perf.
-    DWORD* rgdwAdjacency = new DWORD[s_pD3D9Mesh->GetNumFaces() * 3];
-    if( rgdwAdjacency == NULL )
-        return E_OUTOFMEMORY;
-    V( s_pD3D9Mesh->GenerateAdjacency( 1e-6f, rgdwAdjacency ) );
-    V( s_pD3D9Mesh->OptimizeInplace( D3DXMESHOPT_VERTEXCACHE, rgdwAdjacency, NULL, NULL, NULL ) );
-    delete []rgdwAdjacency;
-
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDirectionWidget::OnD3D9ResetDevice( const D3DSURFACE_DESC* pBackBufferSurfaceDesc )
-{
-    m_ArcBall.SetWindow( pBackBufferSurfaceDesc->Width, pBackBufferSurfaceDesc->Height );
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-void CDXUTDirectionWidget::StaticOnD3D9LostDevice()
-{
-    if( s_pD3D9Effect )
-        s_pD3D9Effect->OnLostDevice();
-}
-
-
-//--------------------------------------------------------------------------------------
-void CDXUTDirectionWidget::StaticOnD3D9DestroyDevice()
-{
-    SAFE_RELEASE( s_pD3D9Effect );
-    SAFE_RELEASE( s_pD3D9Mesh );
+    XMStoreFloat4x4( &m_mView, id );
+    XMStoreFloat4x4( &m_mRot, id );
+    XMStoreFloat4x4( &m_mRotSnapshot, id );
 }
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 LRESULT CDXUTDirectionWidget::HandleMessages( HWND hWnd, UINT uMsg,
                                               WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(wParam);
+
     switch( uMsg )
     {
         case WM_LBUTTONDOWN:
@@ -1311,222 +1154,71 @@ LRESULT CDXUTDirectionWidget::HandleMessages( HWND hWnd, UINT uMsg,
 }
 
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDirectionWidget::OnRender9( D3DXCOLOR color, const D3DXMATRIX* pmView,
-                                         const D3DXMATRIX* pmProj, const D3DXVECTOR3* pEyePt )
-{
-    m_mView = *pmView;
-
-    // Render the light spheres so the user can visually see the light dir
-    UINT iPass, cPasses;
-    D3DXMATRIX mRotate;
-    D3DXMATRIX mScale;
-    D3DXMATRIX mTrans;
-    D3DXMATRIXA16 mWorldViewProj;
-    HRESULT hr;
-
-    V( s_pD3D9Effect->SetTechnique( s_hRenderWith1LightNoTexture ) );
-    V( s_pD3D9Effect->SetVector( s_hMaterialDiffuseColor, ( D3DXVECTOR4* )&color ) );
-
-    D3DXVECTOR3 vEyePt;
-    D3DXVec3Normalize( &vEyePt, pEyePt );
-    V( s_pD3D9Effect->SetValue( s_hLightDir, &vEyePt, sizeof( D3DXVECTOR3 ) ) );
-
-    // Rotate arrow model to point towards origin
-    D3DXMATRIX mRotateA, mRotateB;
-    D3DXVECTOR3 vAt = D3DXVECTOR3( 0, 0, 0 );
-    D3DXVECTOR3 vUp = D3DXVECTOR3( 0, 1, 0 );
-    D3DXMatrixRotationX( &mRotateB, D3DX_PI );
-    D3DXMatrixLookAtLH( &mRotateA, &m_vCurrentDir, &vAt, &vUp );
-    D3DXMatrixInverse( &mRotateA, NULL, &mRotateA );
-    mRotate = mRotateB * mRotateA;
-
-    D3DXVECTOR3 vL = m_vCurrentDir * m_fRadius * 1.0f;
-    D3DXMatrixTranslation( &mTrans, vL.x, vL.y, vL.z );
-    D3DXMatrixScaling( &mScale, m_fRadius * 0.2f, m_fRadius * 0.2f, m_fRadius * 0.2f );
-
-    D3DXMATRIX mWorld = mRotate * mScale * mTrans;
-    mWorldViewProj = mWorld * ( m_mView )*( *pmProj );
-
-    V( s_pD3D9Effect->SetMatrix( s_hWorldViewProjection, &mWorldViewProj ) );
-    V( s_pD3D9Effect->SetMatrix( s_hWorld, &mWorld ) );
-
-    for( int iSubset = 0; iSubset < 2; iSubset++ )
-    {
-        V( s_pD3D9Effect->Begin( &cPasses, 0 ) );
-        for( iPass = 0; iPass < cPasses; iPass++ )
-        {
-            V( s_pD3D9Effect->BeginPass( iPass ) );
-            V( s_pD3D9Mesh->DrawSubset( iSubset ) );
-            V( s_pD3D9Effect->EndPass() );
-        }
-        V( s_pD3D9Effect->End() );
-    }
-
-    return S_OK;
-}
-
 //--------------------------------------------------------------------------------------
 HRESULT CDXUTDirectionWidget::UpdateLightDir()
 {
-    D3DXMATRIX mInvView;
-    D3DXMatrixInverse( &mInvView, NULL, &m_mView );
-    mInvView._41 = mInvView._42 = mInvView._43 = 0;
+    XMMATRIX mView = XMLoadFloat4x4( &m_mView );
+
+    XMMATRIX mInvView = XMMatrixInverse( nullptr, mView );
+    mInvView.r[3] = XMVectorSelect( mInvView.r[3], g_XMZero, g_XMSelect1110 );
 
-    D3DXMATRIX mLastRotInv;
-    D3DXMatrixInverse( &mLastRotInv, NULL, &m_mRotSnapshot );
+    XMMATRIX mRotSnapshot = XMLoadFloat4x4( &m_mRotSnapshot );
+    XMMATRIX mLastRotInv = XMMatrixInverse( nullptr, mRotSnapshot );
 
-    D3DXMATRIX mRot = *m_ArcBall.GetRotationMatrix();
-    m_mRotSnapshot = mRot;
+    XMMATRIX mRot0 = m_ArcBall.GetRotationMatrix();
+    XMStoreFloat4x4( &m_mRotSnapshot, mRot0 );
 
     // Accumulate the delta of the arcball's rotation in view space.
     // Note that per-frame delta rotations could be problematic over long periods of time.
-    m_mRot *= m_mView * mLastRotInv * mRot * mInvView;
+    XMMATRIX mRot = XMLoadFloat4x4( &m_mRot );
+    mRot *= mView * mLastRotInv * mRot0 * mInvView;
 
     // Since we're accumulating delta rotations, we need to orthonormalize 
     // the matrix to prevent eventual matrix skew
-    D3DXVECTOR3* pXBasis = ( D3DXVECTOR3* )&m_mRot._11;
-    D3DXVECTOR3* pYBasis = ( D3DXVECTOR3* )&m_mRot._21;
-    D3DXVECTOR3* pZBasis = ( D3DXVECTOR3* )&m_mRot._31;
-    D3DXVec3Normalize( pXBasis, pXBasis );
-    D3DXVec3Cross( pYBasis, pZBasis, pXBasis );
-    D3DXVec3Normalize( pYBasis, pYBasis );
-    D3DXVec3Cross( pZBasis, pXBasis, pYBasis );
+    XMVECTOR xBasis = XMVector3Normalize( mRot.r[0] );
+    XMVECTOR yBasis = XMVector3Cross( mRot.r[2], xBasis );
+    yBasis = XMVector3Normalize( yBasis );
+    XMVECTOR zBasis = XMVector3Cross( xBasis, yBasis );
+    mRot.r[0] = XMVectorSelect( mRot.r[0], xBasis, g_XMSelect1110 );
+    mRot.r[1] = XMVectorSelect( mRot.r[1], yBasis, g_XMSelect1110 );
+    mRot.r[2] = XMVectorSelect( mRot.r[2], zBasis, g_XMSelect1110 );
+    XMStoreFloat4x4( &m_mRot, mRot );
 
     // Transform the default direction vector by the light's rotation matrix
-    D3DXVec3TransformNormal( &m_vCurrentDir, &m_vDefaultDir, &m_mRot );
+    XMVECTOR vDefaultDir = XMLoadFloat3( &m_vDefaultDir );
+    XMVECTOR vCurrentDir = XMVector3TransformNormal( vDefaultDir, mRot );
+    XMStoreFloat3( &m_vCurrentDir, vCurrentDir );
 
     return S_OK;
 }
 
+
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDirectionWidget::StaticOnD3D11CreateDevice( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext )
+_Use_decl_annotations_
+HRESULT CDXUTDirectionWidget::OnRender( FXMVECTOR color, CXMMATRIX mView, CXMMATRIX mProj, FXMVECTOR vEyePt )
 {
-    
-
-    //s_pd3d10Device = pd3dDevice;
-
-    //const char* g_strBuffer =
-    //    "float4 g_MaterialDiffuseColor;      // Material's diffuse color\r\n"
-    //    "float4 g_LightDir;                  // Light's direction in world space\r\n"
-    //    "float4x4 g_mWorld;                  // World matrix for object\r\n"
-    //    "float4x4 g_mWorldViewProjection;    // World * View * Projection matrix\r\n"
-    //    "\r\n"
-    //    "struct VS_OUTPUT\r\n"
-    //    "{\r\n"
-    //    "    float4 Position   : SV_POSITION;   // vertex position\r\n"
-    //    "    float4 Diffuse    : COLOR0;     // vertex diffuse color\r\n"
-    //    "};\r\n"
-    //    "\r\n"
-    //    "VS_OUTPUT RenderWith1LightNoTextureVS( float3 vPos : POSITION,\r\n"
-    //    "                                       float3 vNormal : NORMAL )\r\n"
-    //    "{\r\n"
-    //    "    VS_OUTPUT Output;\r\n"
-    //    "\r\n"
-    //    "    // Transform the position from object space to homogeneous projection space\r\n"
-    //    "    Output.Position = mul( float4(vPos,1), g_mWorldViewProjection);\r\n"
-    //    "\r\n"
-    //    "    // Transform the normal from object space to world space\r\n"
-    //    "    float3 vNormalWorldSpace;\r\n"
-    //    "    vNormalWorldSpace = normalize(mul(vNormal, (float3x3)g_mWorld)); // normal (world space)\r\n"
-    //    "\r\n"
-    //    "    // Compute simple directional lighting equation\r\n"
-    //    "    Output.Diffuse.rgb = g_MaterialDiffuseColor * max(0,dot(vNormalWorldSpace, g_LightDir));\r\n"
-    //    "    Output.Diffuse.a = 1.0f;\r\n"
-    //    "\r\n"
-    //    "    return Output;\r\n"
-    //    "}\r\n"
-    //    "\r\n"
-    //    "float4 RenderWith1LightNoTexturePS( VS_OUTPUT Input ) : SV_TARGET\r\n"
-    //    "{\r\n"
-    //    "    return Input.Diffuse;\r\n"
-    //    "}\r\n"
-    //    "\r\n"
-    //    "technique10 RenderWith1LightNoTexture\r\n"
-    //    "{\r\n"
-    //    "    pass p0\r\n"
-    //    "    {\r\n"
-    //    "       SetVertexShader( CompileShader( vs_4_0, RenderWith1LightNoTextureVS() ) );\r\n"
-    //    "       SetGeometryShader( NULL );\r\n"
-    //    "       SetPixelShader( CompileShader( ps_4_0, RenderWith1LightNoTexturePS() ) );\r\n"
-    //    "    }\r\n"
-    //    "}\r\n"
-    //    "";
-
-    //UINT dwBufferSize = ( UINT )strlen( g_strBuffer ) + 1;
-
-    //HRESULT hr = D3DX10CreateEffectFromMemory( g_strBuffer, dwBufferSize, "None", NULL, NULL, "fx_4_0",
-    //                                           D3D10_SHADER_ENABLE_STRICTNESS, 0, pd3dDevice, NULL,
-    //                                           NULL, &s_pD3D10Effect, NULL, NULL );
-    //if( FAILED( hr ) )
-    //    return hr;
-
-    //s_pRenderTech = s_pD3D10Effect->GetTechniqueByName( "RenderWith1LightNoTexture" );
-    //g_pMaterialDiffuseColor = s_pD3D10Effect->GetVariableByName( "g_MaterialDiffuseColor" )->AsVector();
-    //g_pLightDir = s_pD3D10Effect->GetVariableByName( "g_LightDir" )->AsVector();
-    //g_pmWorld = s_pD3D10Effect->GetVariableByName( "g_mWorld" )->AsMatrix();
-    //g_pmWorldViewProjection = s_pD3D10Effect->GetVariableByName( "g_mWorldViewProjection" )->AsMatrix();
-
-    //const D3D10_INPUT_ELEMENT_DESC layout[] =
-    //{
-    //    { "POSITION",  0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0,  D3D10_INPUT_PER_VERTEX_DATA, 0 },
-    //    { "NORMAL",    0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D10_INPUT_PER_VERTEX_DATA, 0 },
-    //};
-    //D3D10_PASS_DESC PassDesc;
-    //V_RETURN( s_pRenderTech->GetPassByIndex( 0 )->GetDesc( &PassDesc ) );
-    //V_RETURN( pd3dDevice->CreateInputLayout( layout, 2, PassDesc.pIAInputSignature,
-    //                                         PassDesc.IAInputSignatureSize, &s_pVertexLayout ) );
-    
+    UNREFERENCED_PARAMETER(color);
+    UNREFERENCED_PARAMETER(mView);
+    UNREFERENCED_PARAMETER(mProj);
+    UNREFERENCED_PARAMETER(vEyePt);
+    // TODO - 
     return S_OK;
 }
 
+
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDirectionWidget::OnRender11( D3DXCOLOR color, const D3DXMATRIX* pmView, const D3DXMATRIX* pmProj,
-                                          const D3DXVECTOR3* pEyePt )
+_Use_decl_annotations_
+HRESULT CDXUTDirectionWidget::StaticOnD3D11CreateDevice( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext )
 {
-   // NO 11 version of D3DX11Mesh YET
-   // m_mView = *pmView;
-
-   // // Render the light spheres so the user can visually see the light dir
-   // D3DXMATRIX mRotate;
-   // D3DXMATRIX mScale;
-   // D3DXMATRIX mTrans;
-   // D3DXMATRIXA16 mWorldViewProj;
-
-   // g_pMaterialDiffuseColor->SetFloatVector( ( float* )&color );
-   // D3DXVECTOR3 vEyePt;
-   // D3DXVec3Normalize( &vEyePt, pEyePt );
-   // g_pLightDir->SetFloatVector( ( float* )&vEyePt );
-
-   // // Rotate arrow model to point towards origin
-   // D3DXMATRIX mRotateA, mRotateB;
-   // D3DXVECTOR3 vAt = D3DXVECTOR3( 0, 0, 0 );
-   // D3DXVECTOR3 vUp = D3DXVECTOR3( 0, 1, 0 );
-   // D3DXMatrixRotationX( &mRotateB, D3DX_PI );
-   // D3DXMatrixLookAtLH( &mRotateA, &m_vCurrentDir, &vAt, &vUp );
-   // D3DXMatrixInverse( &mRotateA, NULL, &mRotateA );
-   // mRotate = mRotateB * mRotateA;
-
-   // D3DXVECTOR3 vL = m_vCurrentDir * m_fRadius * 1.0f;
-   // D3DXMatrixTranslation( &mTrans, vL.x, vL.y, vL.z );
-   // D3DXMatrixScaling( &mScale, m_fRadius * 0.2f, m_fRadius * 0.2f, m_fRadius * 0.2f );
-
-   // D3DXMATRIX mWorld = mRotate * mScale * mTrans;
-   // mWorldViewProj = mWorld * ( m_mView )*( *pmProj );
-
-   // g_pmWorldViewProjection->SetMatrix( ( float* )&mWorldViewProj );
-   // g_pmWorld->SetMatrix( ( float* )&mWorld );
-
-   // s_pd3d10Device->IASetInputLayout( s_pVertexLayout );
-    
-   // Add rendering code here
-
+    UNREFERENCED_PARAMETER(pd3dDevice);
+    UNREFERENCED_PARAMETER(pd3dImmediateContext);
+    // TODO -
     return S_OK;
 }
 
+
 //--------------------------------------------------------------------------------------
 void CDXUTDirectionWidget::StaticOnD3D11DestroyDevice()
 {
-//    SAFE_RELEASE( s_pVertexLayout );
-//    SAFE_RELEASE( s_pD3D11Effect );
+    // TODO -
 }
diff --git a/samples/DX_APIUsage/DXUT/Optional/DXUTcamera.h b/samples/DX_APIUsage/DXUT/Optional/DXUTcamera.h
index c29b104..468e2f5 100644
--- a/samples/DX_APIUsage/DXUT/Optional/DXUTcamera.h
+++ b/samples/DX_APIUsage/DXUT/Optional/DXUTcamera.h
@@ -3,92 +3,105 @@
 //
 // Helper functions for Direct3D programming.
 //
-// Copyright (c) Microsoft Corporation. All rights reserved
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #pragma once
-#ifndef CAMERA_H
-#define CAMERA_H
 
 //--------------------------------------------------------------------------------------
 class CD3DArcBall
 {
 public:
-                                    CD3DArcBall();
+    CD3DArcBall();
 
     // Functions to change behavior
-    void                            Reset();
-    void                            SetTranslationRadius( FLOAT fRadiusTranslation )
+    void Reset();
+    void SetTranslationRadius( _In_ float fRadiusTranslation )
     {
         m_fRadiusTranslation = fRadiusTranslation;
     }
-    void                            SetWindow( INT nWidth, INT nHeight, FLOAT fRadius = 0.9f )
-    {
-        m_nWidth = nWidth; m_nHeight = nHeight; m_fRadius = fRadius;
-        m_vCenter = D3DXVECTOR2( m_nWidth / 2.0f, m_nHeight / 2.0f );
-    }
-    void                            SetOffset( INT nX, INT nY )
+    void SetWindow( _In_ INT nWidth, _In_ INT nHeight, _In_ float fRadius = 0.9f )
     {
-        m_Offset.x = nX; m_Offset.y = nY;
+        m_nWidth = nWidth;
+        m_nHeight = nHeight;
+        m_fRadius = fRadius;
+        m_vCenter.x = float(m_nWidth) / 2.0f;
+        m_vCenter.y = float(m_nHeight) / 2.0f;
     }
+    void SetOffset( _In_ INT nX, _In_ INT nY ) { m_Offset.x = nX; m_Offset.y = nY; }
 
     // Call these from client and use GetRotationMatrix() to read new rotation matrix
-    void                            OnBegin( int nX, int nY );  // start the rotation (pass current mouse position)
-    void                            OnMove( int nX, int nY );   // continue the rotation (pass current mouse position)
-    void                            OnEnd();                    // end the rotation 
+    void OnBegin( _In_ int nX, _In_ int nY );   // start the rotation (pass current mouse position)
+    void OnMove( _In_ int nX, _In_ int nY );    // continue the rotation (pass current mouse position)
+    void OnEnd();                               // end the rotation 
 
     // Or call this to automatically handle left, middle, right buttons
-    LRESULT                         HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
+    LRESULT HandleMessages( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam );
 
     // Functions to get/set state
-    const D3DXMATRIX* GetRotationMatrix()
-    {
-        return D3DXMatrixRotationQuaternion( &m_mRotation, &m_qNow );
-    };
-    const D3DXMATRIX* GetTranslationMatrix() const
-    {
-        return &m_mTranslation;
-    }
-    const D3DXMATRIX* GetTranslationDeltaMatrix() const
+    DirectX::XMMATRIX GetRotationMatrix() const
     {
-        return &m_mTranslationDelta;
+        using namespace DirectX;
+        XMVECTOR q = XMLoadFloat4( &m_qNow );
+        return DirectX::XMMatrixRotationQuaternion( q );
     }
-    bool                            IsBeingDragged() const
-    {
-        return m_bDrag;
-    }
-    D3DXQUATERNION                  GetQuatNow() const
+    DirectX::XMMATRIX GetTranslationMatrix() const { return DirectX::XMLoadFloat4x4( &m_mTranslation ); }
+    DirectX::XMMATRIX GetTranslationDeltaMatrix() const { return DirectX::XMLoadFloat4x4( &m_mTranslationDelta ); }
+    bool IsBeingDragged() const { return m_bDrag; }
+    DirectX::XMVECTOR GetQuatNow() const { return DirectX::XMLoadFloat4( &m_qNow ); }
+    void SetQuatNow( _In_ DirectX::FXMVECTOR& q ) { DirectX::XMStoreFloat4( &m_qNow, q ); }
+
+    static DirectX::XMVECTOR QuatFromBallPoints( _In_ DirectX::FXMVECTOR vFrom, _In_ DirectX::FXMVECTOR vTo )
     {
-        return m_qNow;
+        using namespace DirectX;
+
+        XMVECTOR dot = XMVector3Dot( vFrom, vTo );
+        XMVECTOR vPart = XMVector3Cross( vFrom, vTo );
+        return XMVectorSelect( dot, vPart, g_XMSelect1110 );
     }
-    void                            SetQuatNow( D3DXQUATERNION q )
+
+protected:
+    DirectX::XMFLOAT4X4 m_mRotation;        // Matrix for arc ball's orientation
+    DirectX::XMFLOAT4X4 m_mTranslation;     // Matrix for arc ball's position
+    DirectX::XMFLOAT4X4 m_mTranslationDelta;// Matrix for arc ball's position
+
+    POINT m_Offset;                         // window offset, or upper-left corner of window
+    INT m_nWidth;                           // arc ball's window width
+    INT m_nHeight;                          // arc ball's window height
+    DirectX::XMFLOAT2 m_vCenter;            // center of arc ball 
+    float m_fRadius;                        // arc ball's radius in screen coords
+    float m_fRadiusTranslation;             // arc ball's radius for translating the target
+
+    DirectX::XMFLOAT4 m_qDown;              // Quaternion before button down
+    DirectX::XMFLOAT4 m_qNow;               // Composite quaternion for current drag
+    bool m_bDrag;                           // Whether user is dragging arc ball
+
+    POINT m_ptLastMouse;                    // position of last mouse point
+    DirectX::XMFLOAT3 m_vDownPt;            // starting point of rotation arc
+    DirectX::XMFLOAT3 m_vCurrentPt;         // current point of rotation arc
+
+    DirectX::XMVECTOR ScreenToVector( _In_ float fScreenPtX, _In_ float fScreenPtY )
     {
-        m_qNow = q;
-    }
+        // Scale to screen
+        float x = -( fScreenPtX - m_Offset.x - m_nWidth / 2 ) / ( m_fRadius * m_nWidth / 2 );
+        float y = ( fScreenPtY - m_Offset.y - m_nHeight / 2 ) / ( m_fRadius * m_nHeight / 2 );
 
-    static D3DXQUATERNION WINAPI    QuatFromBallPoints( const D3DXVECTOR3& vFrom, const D3DXVECTOR3& vTo );
+        float z = 0.0f;
+        float mag = x * x + y * y;
 
+        if( mag > 1.0f )
+        {
+            float scale = 1.0f / sqrtf( mag );
+            x *= scale;
+            y *= scale;
+        }
+        else
+            z = sqrtf( 1.0f - mag );
 
-protected:
-    D3DXMATRIXA16 m_mRotation;         // Matrix for arc ball's orientation
-    D3DXMATRIXA16 m_mTranslation;      // Matrix for arc ball's position
-    D3DXMATRIXA16 m_mTranslationDelta; // Matrix for arc ball's position
-
-    POINT m_Offset;   // window offset, or upper-left corner of window
-    INT m_nWidth;   // arc ball's window width
-    INT m_nHeight;  // arc ball's window height
-    D3DXVECTOR2 m_vCenter;  // center of arc ball 
-    FLOAT m_fRadius;  // arc ball's radius in screen coords
-    FLOAT m_fRadiusTranslation; // arc ball's radius for translating the target
-
-    D3DXQUATERNION m_qDown;             // Quaternion before button down
-    D3DXQUATERNION m_qNow;              // Composite quaternion for current drag
-    bool m_bDrag;             // Whether user is dragging arc ball
-
-    POINT m_ptLastMouse;      // position of last mouse point
-    D3DXVECTOR3 m_vDownPt;           // starting point of rotation arc
-    D3DXVECTOR3 m_vCurrentPt;        // current point of rotation arc
-
-    D3DXVECTOR3                     ScreenToVector( float fScreenPtX, float fScreenPtY );
+        return DirectX::XMVectorSet( x, y, z, 0 );
+    }
 };
 
 
@@ -126,170 +139,126 @@ enum D3DUtil_CameraKeys
 class CBaseCamera
 {
 public:
-                                CBaseCamera();
+    CBaseCamera();
 
     // Call these from client and use Get*Matrix() to read new matrices
-    virtual LRESULT             HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual void                FrameMove( FLOAT fElapsedTime ) = 0;
+    virtual LRESULT HandleMessages( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam );
+    virtual void FrameMove( _In_ float fElapsedTime ) = 0;
 
     // Functions to change camera matrices
-    virtual void                Reset();
-    virtual void                SetViewParams( D3DXVECTOR3* pvEyePt, D3DXVECTOR3* pvLookatPt );
-    virtual void                SetProjParams( FLOAT fFOV, FLOAT fAspect, FLOAT fNearPlane, FLOAT fFarPlane );
+    virtual void Reset();
+    virtual void SetViewParams( _In_ DirectX::FXMVECTOR vEyePt, _In_ DirectX::FXMVECTOR vLookatPt );
+    virtual void SetProjParams( _In_ float fFOV, _In_ float fAspect, _In_ float fNearPlane, _In_ float fFarPlane );
 
     // Functions to change behavior
-    virtual void                SetDragRect( RECT& rc )
-    {
-        m_rcDrag = rc;
-    }
-    void                        SetInvertPitch( bool bInvertPitch )
+    virtual void SetDragRect( _In_ const RECT& rc ) { m_rcDrag = rc; }
+    void SetInvertPitch( _In_ bool bInvertPitch ) { m_bInvertPitch = bInvertPitch; }
+    void SetDrag( _In_ bool bMovementDrag, _In_ float fTotalDragTimeToZero = 0.25f )
     {
-        m_bInvertPitch = bInvertPitch;
+        m_bMovementDrag = bMovementDrag;
+        m_fTotalDragTimeToZero = fTotalDragTimeToZero;
     }
-    void                        SetDrag( bool bMovementDrag, FLOAT fTotalDragTimeToZero = 0.25f )
+    void SetEnableYAxisMovement( _In_ bool bEnableYAxisMovement ) { m_bEnableYAxisMovement = bEnableYAxisMovement; }
+    void SetEnablePositionMovement( _In_ bool bEnablePositionMovement ) { m_bEnablePositionMovement = bEnablePositionMovement; }
+    void SetClipToBoundary( _In_ bool bClipToBoundary, _In_opt_ DirectX::XMFLOAT3* pvMinBoundary, _In_opt_ DirectX::XMFLOAT3* pvMaxBoundary )
     {
-        m_bMovementDrag = bMovementDrag; m_fTotalDragTimeToZero = fTotalDragTimeToZero;
-    }
-    void                        SetEnableYAxisMovement( bool bEnableYAxisMovement )
-    {
-        m_bEnableYAxisMovement = bEnableYAxisMovement;
-    }
-    void                        SetEnablePositionMovement( bool bEnablePositionMovement )
-    {
-        m_bEnablePositionMovement = bEnablePositionMovement;
-    }
-    void                        SetClipToBoundary( bool bClipToBoundary, D3DXVECTOR3* pvMinBoundary,
-                                                   D3DXVECTOR3* pvMaxBoundary )
-    {
-        m_bClipToBoundary = bClipToBoundary; if( pvMinBoundary ) m_vMinBoundary = *pvMinBoundary;
+        m_bClipToBoundary = bClipToBoundary;
+        if( pvMinBoundary ) m_vMinBoundary = *pvMinBoundary;
         if( pvMaxBoundary ) m_vMaxBoundary = *pvMaxBoundary;
     }
-    void                        SetScalers( FLOAT fRotationScaler = 0.01f, FLOAT fMoveScaler = 5.0f )
-    {
-        m_fRotationScaler = fRotationScaler; m_fMoveScaler = fMoveScaler;
-    }
-    void                        SetNumberOfFramesToSmoothMouseData( int nFrames )
-    {
-        if( nFrames > 0 ) m_fFramesToSmoothMouseData = ( float )nFrames;
-    }
-    void                        SetResetCursorAfterMove( bool bResetCursorAfterMove )
+    void SetScalers( _In_ float fRotationScaler = 0.01f, _In_ float fMoveScaler = 5.0f )
     {
-        m_bResetCursorAfterMove = bResetCursorAfterMove;
+        m_fRotationScaler = fRotationScaler;
+        m_fMoveScaler = fMoveScaler;
     }
+    void SetNumberOfFramesToSmoothMouseData( _In_ int nFrames ) { if( nFrames > 0 ) m_fFramesToSmoothMouseData = ( float )nFrames; }
+    void SetResetCursorAfterMove( _In_ bool bResetCursorAfterMove ) { m_bResetCursorAfterMove = bResetCursorAfterMove; }
 
     // Functions to get state
-    const D3DXMATRIX* GetViewMatrix() const
-    {
-        return &m_mView;
-    }
-    const D3DXMATRIX* GetProjMatrix() const
-    {
-        return &m_mProj;
-    }
-    const D3DXVECTOR3* GetEyePt() const
-    {
-        return &m_vEye;
-    }
-    const D3DXVECTOR3* GetLookAtPt() const
-    {
-        return &m_vLookAt;
-    }
-    float                       GetNearClip() const
-    {
-        return m_fNearPlane;
-    }
-    float                       GetFarClip() const
-    {
-        return m_fFarPlane;
-    }
-
-    bool                        IsBeingDragged() const
-    {
-        return ( m_bMouseLButtonDown || m_bMouseMButtonDown || m_bMouseRButtonDown );
-    }
-    bool                        IsMouseLButtonDown() const
-    {
-        return m_bMouseLButtonDown;
-    }
-    bool                        IsMouseMButtonDown() const
-    {
-        return m_bMouseMButtonDown;
-    }
-    bool                        IsMouseRButtonDown() const
-    {
-        return m_bMouseRButtonDown;
-    }
+    DirectX::XMMATRIX GetViewMatrix() const { return DirectX::XMLoadFloat4x4( &m_mView ); }
+    DirectX::XMMATRIX GetProjMatrix() const { return DirectX::XMLoadFloat4x4( &m_mProj ); }
+    DirectX::XMVECTOR GetEyePt() const { return DirectX::XMLoadFloat3( &m_vEye ); }
+    DirectX::XMVECTOR GetLookAtPt() const { return DirectX::XMLoadFloat3( &m_vLookAt ); }
+    float GetNearClip() const { return m_fNearPlane; }
+    float GetFarClip() const { return m_fFarPlane; }
+
+    bool IsBeingDragged() const { return ( m_bMouseLButtonDown || m_bMouseMButtonDown || m_bMouseRButtonDown ); }
+    bool IsMouseLButtonDown() const { return m_bMouseLButtonDown; }
+    bool IsMouseMButtonDown() const { return m_bMouseMButtonDown; }
+    bool sMouseRButtonDown() const { return m_bMouseRButtonDown; }
 
 protected:
     // Functions to map a WM_KEYDOWN key to a D3DUtil_CameraKeys enum
-    virtual D3DUtil_CameraKeys  MapKey( UINT nKey );
-    bool                        IsKeyDown( BYTE key ) const
-    {
-        return( ( key & KEY_IS_DOWN_MASK ) == KEY_IS_DOWN_MASK );
-    }
-    bool                        WasKeyDown( BYTE key ) const
-    {
-        return( ( key & KEY_WAS_DOWN_MASK ) == KEY_WAS_DOWN_MASK );
-    }
-
-    void                        ConstrainToBoundary( D3DXVECTOR3* pV );
-    void                        UpdateMouseDelta();
-    void                        UpdateVelocity( float fElapsedTime );
-    void                        GetInput( bool bGetKeyboardInput, bool bGetMouseInput, bool bGetGamepadInput,
-                                          bool bResetCursorAfterMove );
-
-    D3DXMATRIX m_mView;              // View matrix 
-    D3DXMATRIX m_mProj;              // Projection matrix
-
-    DXUT_GAMEPAD                m_GamePad[DXUT_MAX_CONTROLLERS];  // XInput controller state
-    D3DXVECTOR3 m_vGamePadLeftThumb;
-    D3DXVECTOR3 m_vGamePadRightThumb;
-    double                      m_GamePadLastActive[DXUT_MAX_CONTROLLERS];
-
-    int m_cKeysDown;            // Number of camera keys that are down.
-    BYTE                        m_aKeys[CAM_MAX_KEYS];  // State of input - KEY_WAS_DOWN_MASK|KEY_IS_DOWN_MASK
-    D3DXVECTOR3 m_vKeyboardDirection;   // Direction vector of keyboard input
-    POINT m_ptLastMousePosition;  // Last absolute position of mouse cursor
-    bool m_bMouseLButtonDown;    // True if left button is down 
-    bool m_bMouseMButtonDown;    // True if middle button is down 
-    bool m_bMouseRButtonDown;    // True if right button is down 
-    int m_nCurrentButtonMask;   // mask of which buttons are down
-    int m_nMouseWheelDelta;     // Amount of middle wheel scroll (+/-) 
-    D3DXVECTOR2 m_vMouseDelta;          // Mouse relative delta smoothed over a few frames
-    float m_fFramesToSmoothMouseData; // Number of frames to smooth mouse data over
-
-    D3DXVECTOR3 m_vDefaultEye;          // Default camera eye position
-    D3DXVECTOR3 m_vDefaultLookAt;       // Default LookAt position
-    D3DXVECTOR3 m_vEye;                 // Camera eye position
-    D3DXVECTOR3 m_vLookAt;              // LookAt position
-    float m_fCameraYawAngle;      // Yaw angle of camera
-    float m_fCameraPitchAngle;    // Pitch angle of camera
-
-    RECT m_rcDrag;               // Rectangle within which a drag can be initiated.
-    D3DXVECTOR3 m_vVelocity;            // Velocity of camera
-    bool m_bMovementDrag;        // If true, then camera movement will slow to a stop otherwise movement is instant
-    D3DXVECTOR3 m_vVelocityDrag;        // Velocity drag force
-    FLOAT m_fDragTimer;           // Countdown timer to apply drag
-    FLOAT m_fTotalDragTimeToZero; // Time it takes for velocity to go from full to 0
-    D3DXVECTOR2 m_vRotVelocity;         // Velocity of camera
-
-    float m_fFOV;                 // Field of view
-    float m_fAspect;              // Aspect ratio
-    float m_fNearPlane;           // Near plane
-    float m_fFarPlane;            // Far plane
-
-    float m_fRotationScaler;      // Scaler for rotation
-    float m_fMoveScaler;          // Scaler for movement
-
-    bool m_bInvertPitch;         // Invert the pitch axis
-    bool m_bEnablePositionMovement; // If true, then the user can translate the camera/model 
-    bool m_bEnableYAxisMovement; // If true, then camera can move in the y-axis
-
-    bool m_bClipToBoundary;      // If true, then the camera will be clipped to the boundary
-    D3DXVECTOR3 m_vMinBoundary;         // Min point in clip boundary
-    D3DXVECTOR3 m_vMaxBoundary;         // Max point in clip boundary
-
-    bool m_bResetCursorAfterMove;// If true, the class will reset the cursor position so that the cursor always has space to move 
+    virtual D3DUtil_CameraKeys MapKey( _In_ UINT nKey );
+
+    bool IsKeyDown( _In_ BYTE key ) const { return( ( key & KEY_IS_DOWN_MASK ) == KEY_IS_DOWN_MASK ); }
+    bool WasKeyDown( _In_ BYTE key ) const { return( ( key & KEY_WAS_DOWN_MASK ) == KEY_WAS_DOWN_MASK ); }
+
+    DirectX::XMVECTOR ConstrainToBoundary( _In_ DirectX::FXMVECTOR v )
+    {
+        using namespace DirectX;
+
+        XMVECTOR vMin = XMLoadFloat3( &m_vMinBoundary );
+        XMVECTOR vMax = XMLoadFloat3( &m_vMaxBoundary );
+
+        // Constrain vector to a bounding box 
+        return XMVectorClamp( v, vMin, vMax );
+    }
+
+    void UpdateMouseDelta();
+    void UpdateVelocity( _In_ float fElapsedTime );
+    void GetInput( _In_ bool bGetKeyboardInput, _In_ bool bGetMouseInput, _In_ bool bGetGamepadInput );
+
+    DirectX::XMFLOAT4X4 m_mView;                    // View matrix 
+    DirectX::XMFLOAT4X4 m_mProj;                    // Projection matrix
+
+    DXUT_GAMEPAD m_GamePad[DXUT_MAX_CONTROLLERS];  // XInput controller state
+    DirectX::XMFLOAT3 m_vGamePadLeftThumb;
+    DirectX::XMFLOAT3 m_vGamePadRightThumb;
+    double m_GamePadLastActive[DXUT_MAX_CONTROLLERS];
+
+    int m_cKeysDown;                        // Number of camera keys that are down.
+    BYTE m_aKeys[CAM_MAX_KEYS];             // State of input - KEY_WAS_DOWN_MASK|KEY_IS_DOWN_MASK
+    DirectX::XMFLOAT3 m_vKeyboardDirection; // Direction vector of keyboard input
+    POINT m_ptLastMousePosition;            // Last absolute position of mouse cursor
+    int m_nCurrentButtonMask;               // mask of which buttons are down
+    int m_nMouseWheelDelta;                 // Amount of middle wheel scroll (+/-) 
+    DirectX::XMFLOAT2 m_vMouseDelta;        // Mouse relative delta smoothed over a few frames
+    float m_fFramesToSmoothMouseData;       // Number of frames to smooth mouse data over
+    DirectX::XMFLOAT3 m_vDefaultEye;        // Default camera eye position
+    DirectX::XMFLOAT3 m_vDefaultLookAt;     // Default LookAt position
+    DirectX::XMFLOAT3 m_vEye;               // Camera eye position
+    DirectX::XMFLOAT3 m_vLookAt;            // LookAt position
+    float m_fCameraYawAngle;                // Yaw angle of camera
+    float m_fCameraPitchAngle;              // Pitch angle of camera
+
+    RECT m_rcDrag;                          // Rectangle within which a drag can be initiated.
+    DirectX::XMFLOAT3 m_vVelocity;          // Velocity of camera
+    DirectX::XMFLOAT3 m_vVelocityDrag;      // Velocity drag force
+    float m_fDragTimer;                     // Countdown timer to apply drag
+    float m_fTotalDragTimeToZero;           // Time it takes for velocity to go from full to 0
+    DirectX::XMFLOAT2 m_vRotVelocity;       // Velocity of camera
+
+    float m_fFOV;                           // Field of view
+    float m_fAspect;                        // Aspect ratio
+    float m_fNearPlane;                     // Near plane
+    float m_fFarPlane;                      // Far plane
+
+    float m_fRotationScaler;                // Scaler for rotation
+    float m_fMoveScaler;                    // Scaler for movement
+
+    bool m_bMouseLButtonDown;               // True if left button is down 
+    bool m_bMouseMButtonDown;               // True if middle button is down 
+    bool m_bMouseRButtonDown;               // True if right button is down 
+    bool m_bMovementDrag;                   // If true, then camera movement will slow to a stop otherwise movement is instant
+    bool m_bInvertPitch;                    // Invert the pitch axis
+    bool m_bEnablePositionMovement;         // If true, then the user can translate the camera/model 
+    bool m_bEnableYAxisMovement;            // If true, then camera can move in the y-axis
+    bool m_bClipToBoundary;                 // If true, then the camera will be clipped to the boundary
+    bool m_bResetCursorAfterMove;           // If true, the class will reset the cursor position so that the cursor always has space to move 
+
+    DirectX::XMFLOAT3 m_vMinBoundary;       // Min point in clip boundary
+    DirectX::XMFLOAT3 m_vMaxBoundary;       // Max point in clip boundary
 };
 
 
@@ -302,41 +271,26 @@ protected:
 class CFirstPersonCamera : public CBaseCamera
 {
 public:
-                    CFirstPersonCamera();
+    CFirstPersonCamera();
 
     // Call these from client and use Get*Matrix() to read new matrices
-    virtual void    FrameMove( FLOAT fElapsedTime );
+    virtual void FrameMove( _In_ float fElapsedTime ) override;
 
     // Functions to change behavior
-    void            SetRotateButtons( bool bLeft, bool bMiddle, bool bRight, bool bRotateWithoutButtonDown = false );
+    void SetRotateButtons( _In_ bool bLeft, _In_ bool bMiddle, _In_ bool bRight, _In_ bool bRotateWithoutButtonDown = false );
 
     // Functions to get state
-    D3DXMATRIX* GetWorldMatrix()
-    {
-        return &m_mCameraWorld;
-    }
+    DirectX::XMMATRIX GetWorldMatrix() const { return DirectX::XMLoadFloat4x4( &m_mCameraWorld ); }
 
-    const D3DXVECTOR3* GetWorldRight() const
-    {
-        return ( D3DXVECTOR3* )&m_mCameraWorld._11;
-    }
-    const D3DXVECTOR3* GetWorldUp() const
-    {
-        return ( D3DXVECTOR3* )&m_mCameraWorld._21;
-    }
-    const D3DXVECTOR3* GetWorldAhead() const
-    {
-        return ( D3DXVECTOR3* )&m_mCameraWorld._31;
-    }
-    const D3DXVECTOR3* GetEyePt() const
-    {
-        return ( D3DXVECTOR3* )&m_mCameraWorld._41;
-    }
+    DirectX::XMVECTOR GetWorldRight() const { return DirectX::XMLoadFloat3( reinterpret_cast<const DirectX::XMFLOAT3*>( &m_mCameraWorld._11 ) ); }
+    DirectX::XMVECTOR GetWorldUp() const { return DirectX::XMLoadFloat3( reinterpret_cast<const DirectX::XMFLOAT3*>( &m_mCameraWorld._21 ) ); }
+    DirectX::XMVECTOR GetWorldAhead() const { return DirectX::XMLoadFloat3( reinterpret_cast<const DirectX::XMFLOAT3*>( &m_mCameraWorld._31 ) ); }
+    DirectX::XMVECTOR GetEyePt() const { return DirectX::XMLoadFloat3( reinterpret_cast<const DirectX::XMFLOAT3*>( &m_mCameraWorld._41 ) ); }
 
 protected:
-    D3DXMATRIX m_mCameraWorld;       // World matrix of the camera (inverse of the view matrix)
+    DirectX::XMFLOAT4X4 m_mCameraWorld; // World matrix of the camera (inverse of the view matrix)
 
-    int m_nActiveButtonMask;  // Mask to determine which button to enable for rotation
+    int m_nActiveButtonMask;            // Mask to determine which button to enable for rotation
     bool m_bRotateWithoutButtonDown;
 };
 
@@ -347,71 +301,61 @@ protected:
 class CModelViewerCamera : public CBaseCamera
 {
 public:
-                    CModelViewerCamera();
+    CModelViewerCamera();
 
     // Call these from client and use Get*Matrix() to read new matrices
-    virtual LRESULT HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual void    FrameMove( FLOAT fElapsedTime );
-
+    virtual LRESULT HandleMessages( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual void FrameMove( _In_ float fElapsedTime ) override;
 
     // Functions to change behavior
-    virtual void    SetDragRect( RECT& rc );
-    void            Reset();
-    void            SetViewParams( D3DXVECTOR3* pvEyePt, D3DXVECTOR3* pvLookatPt );
-    void            SetButtonMasks( int nRotateModelButtonMask = MOUSE_LEFT_BUTTON, int nZoomButtonMask = MOUSE_WHEEL,
-                                    int nRotateCameraButtonMask = MOUSE_RIGHT_BUTTON )
+    virtual void SetDragRect( _In_ const RECT& rc ) override;
+    virtual void Reset() override;
+    virtual void SetViewParams( _In_ DirectX::FXMVECTOR pvEyePt, _In_ DirectX::FXMVECTOR pvLookatPt ) override;
+    void SetButtonMasks( _In_ int nRotateModelButtonMask = MOUSE_LEFT_BUTTON, _In_ int nZoomButtonMask = MOUSE_WHEEL,
+                         _In_ int nRotateCameraButtonMask = MOUSE_RIGHT_BUTTON )
     {
         m_nRotateModelButtonMask = nRotateModelButtonMask, m_nZoomButtonMask = nZoomButtonMask;
         m_nRotateCameraButtonMask = nRotateCameraButtonMask;
     }
-    void            SetAttachCameraToModel( bool bEnable = false )
-    {
-        m_bAttachCameraToModel = bEnable;
-    }
-    void            SetWindow( int nWidth, int nHeight, float fArcballRadius=0.9f )
+    void SetAttachCameraToModel( _In_ bool bEnable = false ) { m_bAttachCameraToModel = bEnable; }
+    void SetWindow( _In_ int nWidth, _In_ int nHeight, _In_ float fArcballRadius=0.9f )
     {
         m_WorldArcBall.SetWindow( nWidth, nHeight, fArcballRadius );
         m_ViewArcBall.SetWindow( nWidth, nHeight, fArcballRadius );
     }
-    void            SetRadius( float fDefaultRadius=5.0f, float fMinRadius=1.0f, float fMaxRadius=FLT_MAX )
+    void SetRadius( _In_ float fDefaultRadius=5.0f, _In_ float fMinRadius=1.0f, _In_ float fMaxRadius=FLT_MAX )
     {
         m_fDefaultRadius = m_fRadius = fDefaultRadius; m_fMinRadius = fMinRadius; m_fMaxRadius = fMaxRadius;
         m_bDragSinceLastUpdate = true;
     }
-    void            SetModelCenter( D3DXVECTOR3 vModelCenter )
-    {
-        m_vModelCenter = vModelCenter;
-    }
-    void            SetLimitPitch( bool bLimitPitch )
+    void SetModelCenter( _In_ const DirectX::XMFLOAT3& vModelCenter ) { m_vModelCenter = vModelCenter; }
+    void SetLimitPitch( _In_ bool bLimitPitch ) { m_bLimitPitch = bLimitPitch; }
+    void SetViewQuat( _In_ DirectX::FXMVECTOR q )
     {
-        m_bLimitPitch = bLimitPitch;
-    }
-    void            SetViewQuat( D3DXQUATERNION q )
-    {
-        m_ViewArcBall.SetQuatNow( q ); m_bDragSinceLastUpdate = true;
+        m_ViewArcBall.SetQuatNow( q );
+        m_bDragSinceLastUpdate = true;
     }
-    void            SetWorldQuat( D3DXQUATERNION q )
+    void SetWorldQuat( _In_ DirectX::FXMVECTOR q )
     {
-        m_WorldArcBall.SetQuatNow( q ); m_bDragSinceLastUpdate = true;
+        m_WorldArcBall.SetQuatNow( q );
+        m_bDragSinceLastUpdate = true;
     }
 
     // Functions to get state
-    const D3DXMATRIX* GetWorldMatrix() const
-    {
-        return &m_mWorld;
-    }
-    void            SetWorldMatrix( D3DXMATRIX& mWorld )
+    DirectX::XMMATRIX GetWorldMatrix() const { return DirectX::XMLoadFloat4x4( &m_mWorld ); }
+    void SetWorldMatrix( _In_ DirectX::CXMMATRIX mWorld )
     {
-        m_mWorld = mWorld; m_bDragSinceLastUpdate = true;
+        XMStoreFloat4x4( &m_mWorld, mWorld );
+        m_bDragSinceLastUpdate = true;
     }
 
 protected:
     CD3DArcBall m_WorldArcBall;
     CD3DArcBall m_ViewArcBall;
-    D3DXVECTOR3 m_vModelCenter;
-    D3DXMATRIX m_mModelLastRot;        // Last arcball rotation matrix for model 
-    D3DXMATRIX m_mModelRot;            // Rotation matrix of model
-    D3DXMATRIX m_mWorld;               // World matrix of model
+    DirectX::XMFLOAT3 m_vModelCenter;
+    DirectX::XMFLOAT4X4 m_mModelLastRot;     // Last arcball rotation matrix for model 
+    DirectX::XMFLOAT4X4 m_mModelRot;         // Rotation matrix of model
+    DirectX::XMFLOAT4X4 m_mWorld;            // World matrix of model
 
     int m_nRotateModelButtonMask;
     int m_nZoomButtonMask;
@@ -419,16 +363,16 @@ protected:
 
     bool m_bAttachCameraToModel;
     bool m_bLimitPitch;
-    float m_fRadius;              // Distance from the camera to model 
-    float m_fDefaultRadius;       // Distance from the camera to model 
-    float m_fMinRadius;           // Min radius
-    float m_fMaxRadius;           // Max radius
-    bool m_bDragSinceLastUpdate; // True if mouse drag has happened since last time FrameMove is called.
-
-    D3DXMATRIX m_mCameraRotLast;
+    bool m_bDragSinceLastUpdate;            // True if mouse drag has happened since last time FrameMove is called.
+    float m_fRadius;                        // Distance from the camera to model 
+    float m_fDefaultRadius;                 // Distance from the camera to model 
+    float m_fMinRadius;                     // Min radius
+    float m_fMaxRadius;                     // Max radius
 
+    DirectX::XMFLOAT4X4 m_mCameraRotLast;
 };
 
+
 //--------------------------------------------------------------------------------------
 // Manages the mesh, direction, mouse events of a directional arrow that 
 // rotates around a radius controlled by an arcball 
@@ -436,82 +380,43 @@ protected:
 class CDXUTDirectionWidget
 {
 public:
-                            CDXUTDirectionWidget();
-
-    static HRESULT WINAPI   StaticOnD3D9CreateDevice( IDirect3DDevice9* pd3dDevice );
-    HRESULT                 OnD3D9ResetDevice( const D3DSURFACE_DESC* pBackBufferSurfaceDesc );
-    HRESULT                 OnRender9( D3DXCOLOR color, const D3DXMATRIX* pmView, const D3DXMATRIX* pmProj,
-                                       const D3DXVECTOR3* pEyePt );
-    LRESULT                 HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
-    static void WINAPI      StaticOnD3D9LostDevice();
-    static void WINAPI      StaticOnD3D9DestroyDevice();
-
-    static HRESULT WINAPI   StaticOnD3D11CreateDevice( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext );
-    HRESULT                 OnRender11( D3DXCOLOR color, const D3DXMATRIX* pmView, const D3DXMATRIX* pmProj,
-                                        const D3DXVECTOR3* pEyePt );
-    static void WINAPI      StaticOnD3D11DestroyDevice();
-
-    D3DXVECTOR3             GetLightDirection()
+    CDXUTDirectionWidget();
+
+    LRESULT HandleMessages( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam );
+
+    HRESULT OnRender( _In_ DirectX::FXMVECTOR color, _In_ DirectX::CXMMATRIX pmView, _In_ DirectX::CXMMATRIX pmProj, _In_ DirectX::FXMVECTOR vEyePt );
+
+    DirectX::XMVECTOR GetLightDirection() const { return DirectX::XMLoadFloat3( &m_vCurrentDir ); }
+    void SetLightDirection( _In_ DirectX::FXMVECTOR vDir )
     {
-        return m_vCurrentDir;
-    };
-    void                    SetLightDirection( D3DXVECTOR3 vDir )
+        DirectX::XMStoreFloat3( &m_vCurrentDir, vDir );
+        m_vDefaultDir = m_vCurrentDir;
+    }
+    void SetLightDirection( _In_ DirectX::XMFLOAT3 vDir )
     {
         m_vDefaultDir = m_vCurrentDir = vDir;
-    };
-    void                    SetButtonMask( int nRotate = MOUSE_RIGHT_BUTTON )
-    {
-        m_nRotateMask = nRotate;
     }
+    void SetButtonMask( _In_ int nRotate = MOUSE_RIGHT_BUTTON ) { m_nRotateMask = nRotate; }
 
-    float                   GetRadius()
-    {
-        return m_fRadius;
-    };
-    void                    SetRadius( float fRadius )
-    {
-        m_fRadius = fRadius;
-    };
+    float GetRadius() const { return m_fRadius; }
+    void SetRadius( _In_ float fRadius ) { m_fRadius = fRadius; }
 
-    bool                    IsBeingDragged()
-    {
-        return m_ArcBall.IsBeingDragged();
-    };
+    bool IsBeingDragged() { return m_ArcBall.IsBeingDragged(); }
+
+    static HRESULT WINAPI StaticOnD3D11CreateDevice( _In_ ID3D11Device* pd3dDevice, _In_ ID3D11DeviceContext* pd3dImmediateContext );
+    static void WINAPI StaticOnD3D11DestroyDevice();
 
 protected:
-    HRESULT                 UpdateLightDir();
-
-    // D3D9 objects
-    static IDirect3DDevice9* s_pd3d9Device;
-    static ID3DXEffect* s_pD3D9Effect;
-    static ID3DXMesh* s_pD3D9Mesh;
-    static D3DXHANDLE s_hRenderWith1LightNoTexture;
-    static D3DXHANDLE s_hMaterialDiffuseColor;
-    static D3DXHANDLE s_hLightDir;
-    static D3DXHANDLE s_hWorldViewProjection;
-    static D3DXHANDLE s_hWorld;
-
-    // D3D10 objects 
-    //static ID3D10Device* s_pd3d10Device;
-    //static ID3D10Effect* s_pD3D10Effect;
-    //TODO: add some sort of d3d10 mesh object here
-    //static ID3D10InputLayout* s_pVertexLayout;
-    //static ID3D10EffectTechnique* s_pRenderTech;
-    //static ID3D10EffectVectorVariable* g_pMaterialDiffuseColor;
-    //static ID3D10EffectVectorVariable* g_pLightDir;
-    //static ID3D10EffectMatrixVariable* g_pmWorld;
-    //static ID3D10EffectMatrixVariable* g_pmWorldViewProjection;
-
-    D3DXMATRIXA16 m_mRot;
-    D3DXMATRIXA16 m_mRotSnapshot;
+    HRESULT UpdateLightDir();
+
+    // TODO - need support for Direct3D 11 widget
+
+    DirectX::XMFLOAT4X4 m_mRot;
+    DirectX::XMFLOAT4X4 m_mRotSnapshot;
     float m_fRadius;
     int m_nRotateMask;
     CD3DArcBall m_ArcBall;
-    D3DXVECTOR3 m_vDefaultDir;
-    D3DXVECTOR3 m_vCurrentDir;
-    D3DXMATRIX m_mView;
+    DirectX::XMFLOAT3 m_vDefaultDir;
+    DirectX::XMFLOAT3 m_vCurrentDir;
+    DirectX::XMFLOAT4X4 m_mView;
 };
-
-
-
-#endif
diff --git a/samples/DX_APIUsage/DXUT/Optional/DXUTgui.cpp b/samples/DX_APIUsage/DXUT/Optional/DXUTgui.cpp
index cb83fff..7a7c17c 100644
--- a/samples/DX_APIUsage/DXUT/Optional/DXUTgui.cpp
+++ b/samples/DX_APIUsage/DXUT/Optional/DXUTgui.cpp
@@ -2,6 +2,9 @@
 // File: DXUTgui.cpp
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #include "DXUT.h"
 #include "DXUTgui.h"
@@ -10,8 +13,9 @@
 
 #include "SDKMisc.h"
 
-#undef min // use __min instead
-#undef max // use __max instead
+#include "DDSTextureLoader.h"
+
+using namespace DirectX;
 
 #ifndef WM_XBUTTONDOWN
 #define WM_XBUTTONDOWN 0x020B // (not always defined)
@@ -38,28 +42,14 @@
 
 #define DXUT_MAX_GUI_SPRITES 500
 
-D3DCOLORVALUE D3DCOLOR_TO_D3DCOLORVALUE( D3DCOLOR c )
+inline XMFLOAT4 D3DCOLOR_TO_D3DCOLORVALUE( DWORD c )
 {
-    D3DCOLORVALUE cv =
-    {
-        ( ( c >> 16 ) & 0xFF ) / 255.0f,
-        ( ( c >> 8 ) & 0xFF ) / 255.0f,
-        ( c & 0xFF ) / 255.0f,
-        ( ( c >> 24 ) & 0xFF ) / 255.0f
-    };
-    return cv;
+    return XMFLOAT4 ( ( ( c >> 16 ) & 0xFF ) / 255.0f,
+                      ( ( c >> 8 ) & 0xFF ) / 255.0f,
+                      ( c & 0xFF ) / 255.0f,
+                      ( ( c >> 24 ) & 0xFF ) / 255.0f );
 }
 
-#define UNISCRIBE_DLLNAME L"usp10.dll"
-
-#define GETPROCADDRESS( Module, APIName, Temp ) \
-    Temp = GetProcAddress( Module, #APIName ); \
-    if( Temp ) \
-        *(FARPROC*)&_##APIName = Temp
-
-#define PLACEHOLDERPROC( APIName ) \
-    _##APIName = Dummy_##APIName
-
 #define IMM32_DLLNAME L"imm32.dll"
 #define VER_DLLNAME L"version.dll"
 
@@ -164,44 +154,36 @@ const UINT              g_uUIEffectFileSize = sizeof( g_strUIEffectFile );
 
 
 // DXUT_MAX_EDITBOXLENGTH is the maximum string length allowed in edit boxes,
-// including the NULL terminator.
-// 
+// including the nul terminator.
+//
 // Uniscribe does not support strings having bigger-than-16-bits length.
 // This means that the string must be less than 65536 characters long,
-// including the NULL terminator.
+// including the nul terminator.
 #define DXUT_MAX_EDITBOXLENGTH 0xFFFF
 
 
 double                  CDXUTDialog::s_fTimeRefresh = 0.0f;
-CDXUTControl*           CDXUTDialog::s_pControlFocus = NULL;        // The control which has focus
-CDXUTControl*           CDXUTDialog::s_pControlPressed = NULL;      // The control currently pressed
+CDXUTControl*           CDXUTDialog::s_pControlFocus = nullptr;        // The control which has focus
+CDXUTControl*           CDXUTDialog::s_pControlPressed = nullptr;      // The control currently pressed
 
 
 struct DXUT_SCREEN_VERTEX
 {
     float x, y, z, h;
-    D3DCOLOR color;
+    DWORD color;
     float tu, tv;
-
-    static DWORD FVF;
 };
-DWORD                   DXUT_SCREEN_VERTEX::FVF = D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1;
-
 
 struct DXUT_SCREEN_VERTEX_UNTEX
 {
     float x, y, z, h;
-    D3DCOLOR color;
-
-    static DWORD FVF;
+    DWORD color;
 };
-DWORD                   DXUT_SCREEN_VERTEX_UNTEX::FVF = D3DFVF_XYZRHW | D3DFVF_DIFFUSE;
-
 
 struct DXUT_SCREEN_VERTEX_10
 {
     float x, y, z;
-    D3DCOLORVALUE color;
+    XMFLOAT4 color;
     float tu, tv;
 };
 
@@ -216,72 +198,259 @@ inline int RectHeight( RECT& rc )
 }
 
 
-HRESULT InitFont11( ID3D11Device* pd3d11Device, ID3D11InputLayout* pInputLayout );
-void EndFont11();
+//======================================================================================
+// Font11
+//======================================================================================
+
+ID3D11Buffer* g_pFontBuffer11 = nullptr;
+UINT g_FontBufferBytes11 = 0;
+std::vector<DXUTSpriteVertex> g_FontVertices;
+ID3D11ShaderResourceView* g_pFont11 = nullptr;
+ID3D11InputLayout* g_pInputLayout11 = nullptr;
 
 //--------------------------------------------------------------------------------------
-// CDXUTDialog class
+HRESULT InitFont11( _In_ ID3D11Device* pd3d11Device, _In_ ID3D11InputLayout* pInputLayout )
+{
+    HRESULT hr = S_OK;
+    WCHAR str[MAX_PATH];
+    V_RETURN( DXUTFindDXSDKMediaFileCch( str, MAX_PATH, L"UI\\Font.dds" ) );
+
+    V_RETURN( CreateDDSTextureFromFile( pd3d11Device, str, nullptr, &g_pFont11 ) );
+
+    g_pInputLayout11 = pInputLayout;
+    return hr;
+}
+
+
+//--------------------------------------------------------------------------------------
+void EndFont11()
+{
+    SAFE_RELEASE( g_pFontBuffer11 );
+    g_FontBufferBytes11 = 0;
+    SAFE_RELEASE( g_pFont11 );
+}
+
+
 //--------------------------------------------------------------------------------------
+void BeginText11()
+{
+    g_FontVertices.clear();
+}
+
 
 //--------------------------------------------------------------------------------------
-CDXUTDialog::CDXUTDialog()
+_Use_decl_annotations_
+void DrawText11DXUT( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceContext,
+                 LPCWSTR strText, const RECT& rcScreen, XMFLOAT4 vFontColor,
+                 float fBBWidth, float fBBHeight, bool bCenter )
 {
-    m_x = 0;
-    m_y = 0;
-    m_width = 0;
-    m_height = 0;
+    float fCharTexSizeX = 0.010526315f;
+    //float fGlyphSizeX = 14.0f / fBBWidth;
+    //float fGlyphSizeY = 32.0f / fBBHeight;
+    float fGlyphSizeX = 15.0f / fBBWidth;
+    float fGlyphSizeY = 42.0f / fBBHeight;
 
-    m_pManager = NULL;
-    m_bVisible = true;
-    m_bCaption = false;
-    m_bMinimized = false;
-    m_bDrag = false;
-    m_wszCaption[0] = L'\0';
-    m_nCaptionHeight = 18;
 
-    m_colorTopLeft = 0;
-    m_colorTopRight = 0;
-    m_colorBottomLeft = 0;
-    m_colorBottomRight = 0;
+    float fRectLeft = rcScreen.left / fBBWidth;
+    float fRectTop = 1.0f - rcScreen.top / fBBHeight;
+
+    fRectLeft = fRectLeft * 2.0f - 1.0f;
+    fRectTop = fRectTop * 2.0f - 1.0f;
+
+    int NumChars = (int)wcslen( strText );
+    if (bCenter) {
+        float fRectRight = rcScreen.right / fBBWidth;
+        fRectRight = fRectRight * 2.0f - 1.0f;
+        float fRectBottom = 1.0f - rcScreen.bottom / fBBHeight;
+        fRectBottom = fRectBottom * 2.0f - 1.0f;
+        float fcenterx = ((fRectRight - fRectLeft) - (float)NumChars*fGlyphSizeX) *0.5f;
+        float fcentery = ((fRectTop - fRectBottom) - (float)1*fGlyphSizeY) *0.5f;
+        fRectLeft += fcenterx ;
+        fRectTop -= fcentery;
+    }
+    float fOriginalLeft = fRectLeft;
+    float fTexTop = 0.0f;
+    float fTexBottom = 1.0f;
+
+    float fDepth = 0.5f;
+    for( int i=0; i<NumChars; i++ )
+    {
+        if( strText[i] == '\n' )
+        {
+            fRectLeft = fOriginalLeft;
+            fRectTop -= fGlyphSizeY;
+
+            continue;
+        }
+        else if( strText[i] < 32 || strText[i] > 126 )
+        {
+            continue;
+        }
+
+        // Add 6 sprite vertices
+        DXUTSpriteVertex SpriteVertex = {};
+        float fRectRight = fRectLeft + fGlyphSizeX;
+        float fRectBottom = fRectTop - fGlyphSizeY;
+        float fTexLeft = ( strText[i] - 32 ) * fCharTexSizeX;
+        float fTexRight = fTexLeft + fCharTexSizeX;
+
+        // tri1
+        SpriteVertex.vPos = XMFLOAT3( fRectLeft, fRectTop, fDepth );
+        SpriteVertex.vTex = XMFLOAT2( fTexLeft, fTexTop );
+        SpriteVertex.vColor = vFontColor;
+        g_FontVertices.push_back( SpriteVertex );
+
+        SpriteVertex.vPos = XMFLOAT3( fRectRight, fRectTop, fDepth );
+        SpriteVertex.vTex = XMFLOAT2( fTexRight, fTexTop );
+        SpriteVertex.vColor = vFontColor;
+        g_FontVertices.push_back( SpriteVertex );
+
+        SpriteVertex.vPos = XMFLOAT3( fRectLeft, fRectBottom, fDepth );
+        SpriteVertex.vTex = XMFLOAT2( fTexLeft, fTexBottom );
+        SpriteVertex.vColor = vFontColor;
+        g_FontVertices.push_back( SpriteVertex );
+
+        // tri2
+        SpriteVertex.vPos = XMFLOAT3( fRectRight, fRectTop, fDepth );
+        SpriteVertex.vTex = XMFLOAT2( fTexRight, fTexTop );
+        SpriteVertex.vColor = vFontColor;
+        g_FontVertices.push_back( SpriteVertex );
+
+        SpriteVertex.vPos = XMFLOAT3( fRectRight, fRectBottom, fDepth );
+        SpriteVertex.vTex = XMFLOAT2( fTexRight, fTexBottom );
+        SpriteVertex.vColor = vFontColor;
+        g_FontVertices.push_back( SpriteVertex );
+
+        SpriteVertex.vPos = XMFLOAT3( fRectLeft, fRectBottom, fDepth );
+        SpriteVertex.vTex = XMFLOAT2( fTexLeft, fTexBottom );
+        SpriteVertex.vColor = vFontColor;
+        g_FontVertices.push_back( SpriteVertex );
+
+        fRectLeft += fGlyphSizeX;
+
+    }
+
+    // We have to end text after every line so that rendering order between sprites and fonts is preserved
+    EndText11( pd3dDevice, pd3d11DeviceContext );
+}
+
+_Use_decl_annotations_
+void EndText11( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceContext )
+{
+    if ( g_FontVertices.empty() )
+        return;
+
+    // ensure our buffer size can hold our sprites
+    UINT FontDataBytes = static_cast<UINT>( g_FontVertices.size() * sizeof( DXUTSpriteVertex ) );
+    if( g_FontBufferBytes11 < FontDataBytes )
+    {
+        SAFE_RELEASE( g_pFontBuffer11 );
+        g_FontBufferBytes11 = FontDataBytes;
+
+        D3D11_BUFFER_DESC BufferDesc;
+        BufferDesc.ByteWidth = g_FontBufferBytes11;
+        BufferDesc.Usage = D3D11_USAGE_DYNAMIC;
+        BufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+        BufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+        BufferDesc.MiscFlags = 0;
+
+        if (FAILED(pd3dDevice->CreateBuffer(&BufferDesc, nullptr, &g_pFontBuffer11)))
+        {
+            g_pFontBuffer11 = nullptr;
+            g_FontBufferBytes11 = 0;
+            return;
+        }
+        DXUT_SetDebugName( g_pFontBuffer11, "DXUT Text11" );
+    }
+
+    // Copy the sprites over
+    D3D11_BOX destRegion;
+    destRegion.left = 0;
+    destRegion.right = FontDataBytes;
+    destRegion.top = 0;
+    destRegion.bottom = 1;
+    destRegion.front = 0;
+    destRegion.back = 1;
+    D3D11_MAPPED_SUBRESOURCE MappedResource;
+    if ( S_OK == pd3d11DeviceContext->Map( g_pFontBuffer11, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ) )
+    {
+        memcpy( MappedResource.pData, (void*)&g_FontVertices[0], FontDataBytes );
+        pd3d11DeviceContext->Unmap(g_pFontBuffer11, 0);
+    }
+
+    ID3D11ShaderResourceView* pOldTexture = nullptr;
+    pd3d11DeviceContext->PSGetShaderResources( 0, 1, &pOldTexture );
+    pd3d11DeviceContext->PSSetShaderResources( 0, 1, &g_pFont11 );
+
+    // Draw
+    UINT Stride = sizeof( DXUTSpriteVertex );
+    UINT Offset = 0;
+    pd3d11DeviceContext->IASetVertexBuffers( 0, 1, &g_pFontBuffer11, &Stride, &Offset );
+    pd3d11DeviceContext->IASetInputLayout( g_pInputLayout11 );
+    pd3d11DeviceContext->IASetPrimitiveTopology( D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST );
+    pd3d11DeviceContext->Draw( static_cast<UINT>( g_FontVertices.size() ), 0 );
+
+    pd3d11DeviceContext->PSSetShaderResources( 0, 1, &pOldTexture );
+    SAFE_RELEASE( pOldTexture );
 
-    m_pCallbackEvent = NULL;
-    m_pCallbackEventUserContext = NULL;
+    g_FontVertices.clear();
+}
 
-    m_fTimeLastRefresh = 0;
 
-    m_pControlMouseOver = NULL;
+//======================================================================================
+// CDXUTDialog class
+//======================================================================================
+
+CDXUTDialog::CDXUTDialog() :
+    m_x( 0 ),
+    m_y( 0 ),
+    m_width( 0 ),
+    m_height( 0 ),
+    m_pManager( nullptr ),
+    m_bVisible( true ),
+    m_bCaption( false ),
+    m_bMinimized( false ),
+    m_bDrag( false ),
+    m_nCaptionHeight( 18 ),
+    m_colorTopLeft( 0 ),
+    m_colorTopRight( 0 ),
+    m_colorBottomLeft( 0 ),
+    m_colorBottomRight( 0 ),
+    m_pCallbackEvent( nullptr ),
+    m_pCallbackEventUserContext( nullptr ),
+    m_fTimeLastRefresh( 0 ),
+    m_pControlMouseOver( nullptr ),
+    m_nDefaultControlID( 0xffff ),
+    m_bNonUserEvents( false ),
+    m_bKeyboardInput( false ),
+    m_bMouseInput( true )
+{
+    m_wszCaption[0] = L'\0';
 
     m_pNextDialog = this;
     m_pPrevDialog = this;
-
-    m_nDefaultControlID = 0xffff;
-    m_bNonUserEvents = false;
-    m_bKeyboardInput = false;
-    m_bMouseInput = true;
 }
 
 
 //--------------------------------------------------------------------------------------
 CDXUTDialog::~CDXUTDialog()
 {
-    int i = 0;
-
     RemoveAllControls();
 
-    m_Fonts.RemoveAll();
-    m_Textures.RemoveAll();
+    m_Fonts.clear();
+    m_Textures.clear();
 
-    for( i = 0; i < m_DefaultElements.GetSize(); i++ )
+    for( auto it = m_DefaultElements.begin(); it != m_DefaultElements.end(); ++it )
     {
-        DXUTElementHolder* pElementHolder = m_DefaultElements.GetAt( i );
-        SAFE_DELETE( pElementHolder );
+        SAFE_DELETE( *it );
     }
 
-    m_DefaultElements.RemoveAll();
+    m_DefaultElements.clear();
 }
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTDialog::Init( CDXUTDialogResourceManager* pManager, bool bRegisterDialog )
 {
     m_pManager = pManager;
@@ -294,6 +463,7 @@ void CDXUTDialog::Init( CDXUTDialogResourceManager* pManager, bool bRegisterDial
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTDialog::Init( CDXUTDialogResourceManager* pManager, bool bRegisterDialog, LPCWSTR pszControlTextureFilename )
 {
     m_pManager = pManager;
@@ -305,6 +475,7 @@ void CDXUTDialog::Init( CDXUTDialogResourceManager* pManager, bool bRegisterDial
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTDialog::Init( CDXUTDialogResourceManager* pManager, bool bRegisterDialog,
                         LPCWSTR szControlTextureResourceName, HMODULE hControlTextureResourceModule )
 {
@@ -318,13 +489,14 @@ void CDXUTDialog::Init( CDXUTDialogResourceManager* pManager, bool bRegisterDial
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTDialog::SetCallback( PCALLBACKDXUTGUIEVENT pCallback, void* pUserContext )
 {
     // If this assert triggers, you need to call CDXUTDialog::Init() first.  This change
-    // was made so that the DXUT's GUI could become seperate and optional from DXUT's core.  The 
-    // creation and interfacing with CDXUTDialogResourceManager is now the responsibility 
+    // was made so that the DXUT's GUI could become seperate and optional from DXUT's core.  The
+    // creation and interfacing with CDXUTDialogResourceManager is now the responsibility
     // of the application if it wishes to use DXUT's GUI.
-    assert( m_pManager != NULL && L"To fix call CDXUTDialog::Init() first.  See comments for details." );
+    assert( m_pManager && L"To fix call CDXUTDialog::Init() first.  See comments for details." );
 
     m_pCallbackEvent = pCallback;
     m_pCallbackEventUserContext = pUserContext;
@@ -332,26 +504,25 @@ void CDXUTDialog::SetCallback( PCALLBACKDXUTGUIEVENT pCallback, void* pUserConte
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTDialog::RemoveControl( int ID )
+void CDXUTDialog::RemoveControl( _In_ int ID )
 {
-    for( int i = 0; i < m_Controls.GetSize(); i++ )
+    for( auto it = m_Controls.begin(); it != m_Controls.end(); ++it )
     {
-        CDXUTControl* pControl = m_Controls.GetAt( i );
-        if( pControl->GetID() == ID )
+        if( (*it)->GetID() == ID )
         {
             // Clean focus first
             ClearFocus();
 
             // Clear references to this control
-            if( s_pControlFocus == pControl )
-                s_pControlFocus = NULL;
-            if( s_pControlPressed == pControl )
-                s_pControlPressed = NULL;
-            if( m_pControlMouseOver == pControl )
-                m_pControlMouseOver = NULL;
+            if( s_pControlFocus == (*it) )
+                s_pControlFocus = nullptr;
+            if( s_pControlPressed == (*it) )
+                s_pControlPressed = nullptr;
+            if( m_pControlMouseOver == (*it) )
+                m_pControlMouseOver = nullptr;
 
-            SAFE_DELETE( pControl );
-            m_Controls.Remove( i );
+            SAFE_DELETE( (*it) );
+            m_Controls.erase( it );
 
             return;
         }
@@ -363,1063 +534,274 @@ void CDXUTDialog::RemoveControl( int ID )
 void CDXUTDialog::RemoveAllControls()
 {
     if( s_pControlFocus && s_pControlFocus->m_pDialog == this )
-        s_pControlFocus = NULL;
+        s_pControlFocus = nullptr;
     if( s_pControlPressed && s_pControlPressed->m_pDialog == this )
-        s_pControlPressed = NULL;
-    m_pControlMouseOver = NULL;
+        s_pControlPressed = nullptr;
+    m_pControlMouseOver = nullptr;
 
-    for( int i = 0; i < m_Controls.GetSize(); i++ )
+    for( auto it = m_Controls.begin(); it != m_Controls.end(); ++it )
     {
-        CDXUTControl* pControl = m_Controls.GetAt( i );
-        SAFE_DELETE( pControl );
+        SAFE_DELETE( *it );
     }
 
-    m_Controls.RemoveAll();
+    m_Controls.clear();
 }
 
 
 //--------------------------------------------------------------------------------------
-CDXUTDialogResourceManager::CDXUTDialogResourceManager()
+void CDXUTDialog::Refresh()
 {
-    // Begin D3D9-specific
-    m_pd3d9Device = NULL;
-    m_pStateBlock = NULL;
-    m_pSprite = NULL;
-
-    // Begin D3D11-specific
-    // Shaders
-    m_pVSRenderUI11 = NULL;
-    m_pPSRenderUI11 = NULL;
-    m_pPSRenderUIUntex11 = NULL;
-
-    // States
-    m_pDepthStencilStateUI11 = NULL;
-    m_pRasterizerStateUI11 = NULL;
-    m_pBlendStateUI11 = NULL;
-    m_pSamplerStateUI11 = NULL;
-    m_pDepthStencilStateStored11 = NULL;
-    m_pRasterizerStateStored11 = NULL;
-    m_pBlendStateStored11 = NULL;
-    m_pSamplerStateStored11 = NULL;
-
-    m_pInputLayout11 = NULL;
-    m_pVBScreenQuad11 = NULL;
-    m_pSpriteBuffer11 = NULL;
-}
+    if( s_pControlFocus )
+        s_pControlFocus->OnFocusOut();
 
+    if( m_pControlMouseOver )
+        m_pControlMouseOver->OnMouseLeave();
 
-//--------------------------------------------------------------------------------------
-CDXUTDialogResourceManager::~CDXUTDialogResourceManager()
-{
-    int i;
-    for( i = 0; i < m_FontCache.GetSize(); i++ )
-    {
-        DXUTFontNode* pFontNode = m_FontCache.GetAt( i );
-        SAFE_DELETE( pFontNode );
-    }
-    m_FontCache.RemoveAll();
+    s_pControlFocus = nullptr;
+    s_pControlPressed = nullptr;
+    m_pControlMouseOver = nullptr;
 
-    for( i = 0; i < m_TextureCache.GetSize(); i++ )
+    for( auto it = m_Controls.begin(); it != m_Controls.end(); ++it )
     {
-        DXUTTextureNode* pTextureNode = m_TextureCache.GetAt( i );
-        SAFE_DELETE( pTextureNode );
+        (*it)->Refresh();
     }
-    m_TextureCache.RemoveAll();
 
-    CUniBuffer::Uninitialize();
+    if( m_bKeyboardInput )
+        FocusDefaultControl();
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialogResourceManager::OnD3D9CreateDevice( LPDIRECT3DDEVICE9 pd3dDevice )
+HRESULT CDXUTDialog::OnRender( _In_ float fElapsedTime )
 {
-    HRESULT hr = S_OK;
-    int i = 0;
-
-    m_pd3d9Device = pd3dDevice;
+    // If this assert triggers, you need to call CDXUTDialogResourceManager::On*Device() from inside
+    // the application's device callbacks.  See the SDK samples for an example of how to do this.
+    assert( m_pManager->GetD3D11Device() &&
+            L"To fix hook up CDXUTDialogResourceManager to device callbacks.  See comments for details" );
 
-    for( i = 0; i < m_FontCache.GetSize(); i++ )
+    // See if the dialog needs to be refreshed
+    if( m_fTimeLastRefresh < s_fTimeRefresh )
     {
-        hr = CreateFont9( i );
-        if( FAILED( hr ) )
-            return hr;
+        m_fTimeLastRefresh = DXUTGetTime();
+        Refresh();
     }
 
-    for( i = 0; i < m_TextureCache.GetSize(); i++ )
-    {
-        hr = CreateTexture9( i );
-        if( FAILED( hr ) )
-            return hr;
-    }
+    // For invisible dialog, out now.
+    if( !m_bVisible ||
+        ( m_bMinimized && !m_bCaption ) )
+        return S_OK;
 
-    hr = D3DXCreateSprite( pd3dDevice, &m_pSprite );
-    if( FAILED( hr ) )
-        return DXUT_ERR( L"D3DXCreateSprite", hr );
+    auto pd3dDevice = m_pManager->GetD3D11Device();
+    auto pd3dDeviceContext = m_pManager->GetD3D11DeviceContext();
 
-    return S_OK;
-}
+    // Set up a state block here and restore it when finished drawing all the controls
+    m_pManager->StoreD3D11State( pd3dDeviceContext );
 
+    BOOL bBackgroundIsVisible = ( m_colorTopLeft | m_colorTopRight | m_colorBottomRight | m_colorBottomLeft ) & 0xff000000;
+    if( !m_bMinimized && bBackgroundIsVisible )
+    {
+        // Convert the draw rectangle from screen coordinates to clip space coordinates.
+        float Left, Right, Top, Bottom;
+        Left = m_x * 2.0f / m_pManager->m_nBackBufferWidth - 1.0f;
+        Right = ( m_x + m_width ) * 2.0f / m_pManager->m_nBackBufferWidth - 1.0f;
+        Top = 1.0f - m_y * 2.0f / m_pManager->m_nBackBufferHeight;
+        Bottom = 1.0f - ( m_y + m_height ) * 2.0f / m_pManager->m_nBackBufferHeight;
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialogResourceManager::OnD3D9ResetDevice()
-{
-    HRESULT hr = S_OK;
+        DXUT_SCREEN_VERTEX_10 vertices[4] =
+        {
+            Left,  Top,    0.5f, D3DCOLOR_TO_D3DCOLORVALUE( m_colorTopLeft ), 0.0f, 0.0f,
+            Right, Top,    0.5f, D3DCOLOR_TO_D3DCOLORVALUE( m_colorTopRight ), 1.0f, 0.0f,
+            Left,  Bottom, 0.5f, D3DCOLOR_TO_D3DCOLORVALUE( m_colorBottomLeft ), 0.0f, 1.0f,
+            Right, Bottom, 0.5f, D3DCOLOR_TO_D3DCOLORVALUE( m_colorBottomRight ), 1.0f, 1.0f,
+        };
 
-    for( int i = 0; i < m_FontCache.GetSize(); i++ )
-    {
-        DXUTFontNode* pFontNode = m_FontCache.GetAt( i );
+        //DXUT_SCREEN_VERTEX_10 *pVB;
+        D3D11_MAPPED_SUBRESOURCE MappedData;
+        if( SUCCEEDED( pd3dDeviceContext->Map( m_pManager->m_pVBScreenQuad11, 0, D3D11_MAP_WRITE_DISCARD,
+                                               0, &MappedData ) ) )
+        {
+            memcpy( MappedData.pData, vertices, sizeof( vertices ) );
+            pd3dDeviceContext->Unmap( m_pManager->m_pVBScreenQuad11, 0 );
+        }
+
+        // Set the quad VB as current
+        UINT stride = sizeof( DXUT_SCREEN_VERTEX_10 );
+        UINT offset = 0;
+        pd3dDeviceContext->IASetVertexBuffers( 0, 1, &m_pManager->m_pVBScreenQuad11, &stride, &offset );
+        pd3dDeviceContext->IASetInputLayout( m_pManager->m_pInputLayout11 );
+        pd3dDeviceContext->IASetPrimitiveTopology( D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP );
 
-        if( pFontNode->pFont9 )
-            pFontNode->pFont9->OnResetDevice();
+        // Setup for rendering
+        m_pManager->ApplyRenderUIUntex11( pd3dDeviceContext );
+        pd3dDeviceContext->Draw( 4, 0 );
     }
 
-    if( m_pSprite )
-        m_pSprite->OnResetDevice();
+    auto pTextureNode = GetTexture( 0 );
+    pd3dDeviceContext->PSSetShaderResources( 0, 1, &pTextureNode->pTexResView11 );
 
-    V_RETURN( m_pd3d9Device->CreateStateBlock( D3DSBT_ALL, &m_pStateBlock ) );
+    // Sort depth back to front
+    m_pManager->BeginSprites11();
+    BeginText11();
 
-    return S_OK;
-}
+    m_pManager->ApplyRenderUI11( pd3dDeviceContext );
 
-//--------------------------------------------------------------------------------------
-bool CDXUTDialogResourceManager::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
-{
-    return false;
-}
-
-
-//--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::OnD3D9LostDevice()
-{
-    for( int i = 0; i < m_FontCache.GetSize(); i++ )
+    // Render the caption if it's enabled.
+    if( m_bCaption )
     {
-        DXUTFontNode* pFontNode = m_FontCache.GetAt( i );
-
-        if( pFontNode->pFont9 )
-            pFontNode->pFont9->OnLostDevice();
+        // DrawSprite will offset the rect down by
+        // m_nCaptionHeight, so adjust the rect higher
+        // here to negate the effect.
+        RECT rc = { 0, -m_nCaptionHeight, m_width, 0 };
+        DrawSprite( &m_CapElement, &rc, 0.99f );
+        rc.left += 5; // Make a left margin
+        WCHAR wszOutput[256];
+        wcscpy_s( wszOutput, 256, m_wszCaption );
+        if( m_bMinimized )
+            wcscat_s( wszOutput, 256, L" (Minimized)" );
+        DrawText( wszOutput, &m_CapElement, &rc, true );
     }
 
-    if( m_pSprite )
-        m_pSprite->OnLostDevice();
-
-    SAFE_RELEASE( m_pStateBlock );
-}
-
-
-//--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::OnD3D9DestroyDevice()
-{
-    int i = 0;
+    // If the dialog is minimized, skip rendering
+    // its controls.
+    if( !m_bMinimized )
+    {
+        for( auto it = m_Controls.cbegin(); it != m_Controls.cend(); ++it )
+        {
+            // Focused control is drawn last
+            if( *it == s_pControlFocus )
+                continue;
 
-    m_pd3d9Device = NULL;
+            (*it)->Render( fElapsedTime );
+        }
 
-    // Release the resources but don't clear the cache, as these will need to be
-    // recreated if the device is recreated
-    for( i = 0; i < m_FontCache.GetSize(); i++ )
-    {
-        DXUTFontNode* pFontNode = m_FontCache.GetAt( i );
-        SAFE_RELEASE( pFontNode->pFont9 );
+        if( s_pControlFocus && s_pControlFocus->m_pDialog == this )
+            s_pControlFocus->Render( fElapsedTime );
     }
 
-    for( i = 0; i < m_TextureCache.GetSize(); i++ )
+    // End sprites
+    if( m_bCaption )
     {
-        DXUTTextureNode* pTextureNode = m_TextureCache.GetAt( i );
-        SAFE_RELEASE( pTextureNode->pTexture9 );
+        m_pManager->EndSprites11( pd3dDevice, pd3dDeviceContext );
+        EndText11( pd3dDevice, pd3dDeviceContext );
     }
+    m_pManager->RestoreD3D11State( pd3dDeviceContext );
 
-    SAFE_RELEASE( m_pSprite );
+    return S_OK;
 }
 
 
-
-HRESULT CDXUTDialogResourceManager::OnD3D11CreateDevice( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceContext )
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+VOID CDXUTDialog::SendEvent( UINT nEvent, bool bTriggeredByUser, CDXUTControl* pControl )
 {
-    m_pd3d11Device = pd3dDevice;
-    m_pd3d11DeviceContext = pd3d11DeviceContext;
-
-    HRESULT hr = S_OK;
-
-    // Compile Shaders
-    ID3DBlob* pVSBlob = NULL;
-    ID3DBlob* pPSBlob = NULL;
-    ID3DBlob* pPSUntexBlob = NULL;
-    V_RETURN( D3DCompile( g_strUIEffectFile, g_uUIEffectFileSize, "none", NULL, NULL, "VS", "vs_4_0_level_9_1", 
-         D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY, 0, &pVSBlob, NULL ) );
-    V_RETURN( D3DCompile( g_strUIEffectFile, g_uUIEffectFileSize, "none", NULL, NULL, "PS", "ps_4_0_level_9_1", 
-         D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY, 0, &pPSBlob, NULL ) );
-    V_RETURN( D3DCompile( g_strUIEffectFile, g_uUIEffectFileSize, "none", NULL, NULL, "PSUntex", "ps_4_0_level_9_1", 
-         D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY, 0, &pPSUntexBlob, NULL ) );
-
-    // Create Shaders
-    V_RETURN( pd3dDevice->CreateVertexShader( pVSBlob->GetBufferPointer(), pVSBlob->GetBufferSize(), NULL, &m_pVSRenderUI11 ) );
-    DXUT_SetDebugName( m_pVSRenderUI11, "CDXUTDialogResourceManager" );
-
-    V_RETURN( pd3dDevice->CreatePixelShader( pPSBlob->GetBufferPointer(), pPSBlob->GetBufferSize(), NULL, &m_pPSRenderUI11 ) );
-    DXUT_SetDebugName( m_pPSRenderUI11, "CDXUTDialogResourceManager" );
-
-    V_RETURN( pd3dDevice->CreatePixelShader( pPSUntexBlob->GetBufferPointer(), pPSUntexBlob->GetBufferSize(), NULL, &m_pPSRenderUIUntex11 ) );
-    DXUT_SetDebugName( m_pPSRenderUIUntex11, "CDXUTDialogResourceManager" );
-    
-    // States
-    D3D11_DEPTH_STENCIL_DESC DSDesc;
-    ZeroMemory( &DSDesc, sizeof( D3D11_DEPTH_STENCIL_DESC ) );
-    DSDesc.DepthEnable = FALSE;
-    DSDesc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
-    DSDesc.DepthFunc = D3D11_COMPARISON_LESS;
-    DSDesc.StencilEnable = FALSE;
-    V_RETURN( pd3dDevice->CreateDepthStencilState( &DSDesc, &m_pDepthStencilStateUI11 ) );
-    DXUT_SetDebugName( m_pDepthStencilStateUI11, "CDXUTDialogResourceManager" );
-
-    D3D11_RASTERIZER_DESC RSDesc;
-    RSDesc.AntialiasedLineEnable = FALSE;
-    RSDesc.CullMode = D3D11_CULL_BACK;
-    RSDesc.DepthBias = 0;
-    RSDesc.DepthBiasClamp = 0.0f;
-    RSDesc.DepthClipEnable = TRUE;
-    RSDesc.FillMode = D3D11_FILL_SOLID;
-    RSDesc.FrontCounterClockwise = FALSE;
-    RSDesc.MultisampleEnable = TRUE;
-    RSDesc.ScissorEnable = FALSE;
-    RSDesc.SlopeScaledDepthBias = 0.0f;
-    V_RETURN( pd3dDevice->CreateRasterizerState( &RSDesc, &m_pRasterizerStateUI11 ) );
-    DXUT_SetDebugName( m_pRasterizerStateUI11, "CDXUTDialogResourceManager" );
+    // If no callback has been registered there's nowhere to send the event to
+    if( !m_pCallbackEvent )
+        return;
 
-    D3D11_BLEND_DESC BSDesc;
-    ZeroMemory( &BSDesc, sizeof( D3D11_BLEND_DESC ) );
-    
-    BSDesc.RenderTarget[0].BlendEnable = TRUE;
-    BSDesc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA;
-    BSDesc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA;
-    BSDesc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
-    BSDesc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
-    BSDesc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
-    BSDesc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
-    BSDesc.RenderTarget[0].RenderTargetWriteMask = 0x0F;
+    // Discard events triggered programatically if these types of events haven't been
+    // enabled
+    if( !bTriggeredByUser && !m_bNonUserEvents )
+        return;
 
-    V_RETURN( pd3dDevice->CreateBlendState( &BSDesc, &m_pBlendStateUI11 ) );
-    DXUT_SetDebugName( m_pBlendStateUI11, "CDXUTDialogResourceManager" );
+    m_pCallbackEvent( nEvent, pControl->GetID(), pControl, m_pCallbackEventUserContext );
+}
 
-    D3D11_SAMPLER_DESC SSDesc;
-    ZeroMemory( &SSDesc, sizeof( D3D11_SAMPLER_DESC ) );
-    SSDesc.Filter = D3D11_FILTER_ANISOTROPIC   ;
-    SSDesc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP;
-    SSDesc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP;
-    SSDesc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP;
-    SSDesc.ComparisonFunc = D3D11_COMPARISON_NEVER;
-    SSDesc.MaxAnisotropy = 16;
-    SSDesc.MinLOD = 0;
-    SSDesc.MaxLOD = D3D11_FLOAT32_MAX;
-    if ( pd3dDevice->GetFeatureLevel() < D3D_FEATURE_LEVEL_9_3 ) {
-        SSDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-        SSDesc.MaxAnisotropy = 0;
-    }
-    V_RETURN( pd3dDevice->CreateSamplerState( &SSDesc, &m_pSamplerStateUI11 ) );
-    DXUT_SetDebugName( m_pSamplerStateUI11, "CDXUTDialogResourceManager" );
 
-    // Create the font and texture objects in the cache arrays.
-    int i = 0;
-    for( i = 0; i < m_FontCache.GetSize(); i++ )
-    {
-        hr = CreateFont11( i );
-        if( FAILED( hr ) )
-            return hr;
-    }
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+HRESULT CDXUTDialog::SetFont( UINT index, LPCWSTR strFaceName, LONG height, LONG weight )
+{
+    // If this assert triggers, you need to call CDXUTDialog::Init() first.  This change
+    // was made so that the DXUT's GUI could become seperate and optional from DXUT's core.  The
+    // creation and interfacing with CDXUTDialogResourceManager is now the responsibility
+    // of the application if it wishes to use DXUT's GUI.
+    assert( m_pManager && L"To fix call CDXUTDialog::Init() first.  See comments for details." );
+    _Analysis_assume_( m_pManager );
 
-    for( i = 0; i < m_TextureCache.GetSize(); i++ )
+    // Make sure the list is at least as large as the index being set
+    for( size_t i = m_Fonts.size(); i <= index; i++ )
     {
-        hr = CreateTexture11( i );
-        if( FAILED( hr ) )
-            return hr;
+        m_Fonts.push_back( -1 );
     }
 
-    // Create input layout
-    const D3D11_INPUT_ELEMENT_DESC layout[] =
-        {
-            { "POSITION",  0, DXGI_FORMAT_R32G32B32_FLOAT,    0, 0,  D3D11_INPUT_PER_VERTEX_DATA, 0 },
-            { "COLOR",     0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-            { "TEXCOORD",  0, DXGI_FORMAT_R32G32_FLOAT,       0, 28, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-        };
-
-    V_RETURN( pd3dDevice->CreateInputLayout( layout, ARRAYSIZE( layout ), pVSBlob->GetBufferPointer(), pVSBlob->GetBufferSize(), &m_pInputLayout11 ) );
-    DXUT_SetDebugName( m_pInputLayout11, "CDXUTDialogResourceManager" );
-
-    // Release the blobs
-    SAFE_RELEASE( pVSBlob );
-    SAFE_RELEASE( pPSBlob );
-    SAFE_RELEASE( pPSUntexBlob );
-
-    // Create a vertex buffer quad for rendering later
-    D3D11_BUFFER_DESC BufDesc;
-    BufDesc.ByteWidth = sizeof( DXUT_SCREEN_VERTEX_10 ) * 4;
-    BufDesc.Usage = D3D11_USAGE_DYNAMIC;
-    BufDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-    BufDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-    BufDesc.MiscFlags = 0;
-    V_RETURN( pd3dDevice->CreateBuffer( &BufDesc, NULL, &m_pVBScreenQuad11 ) );
-    DXUT_SetDebugName( m_pVBScreenQuad11, "CDXUTDialogResourceManager" );
-
-    // Init the D3D11 font
-    InitFont11( pd3dDevice, m_pInputLayout11 );
+    int iFont = m_pManager->AddFont( strFaceName, height, weight );
+    m_Fonts[ index ] = iFont;
 
     return S_OK;
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialogResourceManager::OnD3D11ResizedSwapChain( ID3D11Device* pd3dDevice,
-                                                             const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc )
-{
-    HRESULT hr = S_OK;
-
-    m_nBackBufferWidth = pBackBufferSurfaceDesc->Width;
-    m_nBackBufferHeight = pBackBufferSurfaceDesc->Height;
-
-    return hr;
-}
-
-
-//--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::OnD3D11ReleasingSwapChain()
+DXUTFontNode* CDXUTDialog::GetFont( _In_ UINT index ) const
 {
+    if( !m_pManager )
+        return nullptr;
+    return m_pManager->GetFontNode( m_Fonts[ index ] );
 }
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::OnD3D11DestroyDevice()
+_Use_decl_annotations_
+HRESULT CDXUTDialog::SetTexture( UINT index, LPCWSTR strFilename )
 {
-    int i;
-
-    // Release the resources but don't clear the cache, as these will need to be
-    // recreated if the device is recreated
+    // If this assert triggers, you need to call CDXUTDialog::Init() first.  This change
+    // was made so that the DXUT's GUI could become seperate and optional from DXUT's core.  The
+    // creation and interfacing with CDXUTDialogResourceManager is now the responsibility
+    // of the application if it wishes to use DXUT's GUI.
+    assert( m_pManager && L"To fix this, call CDXUTDialog::Init() first.  See comments for details." );
+    _Analysis_assume_( m_pManager );
 
-    for( i = 0; i < m_TextureCache.GetSize(); i++ )
+    // Make sure the list is at least as large as the index being set
+    for( size_t i = m_Textures.size(); i <= index; i++ )
     {
-        DXUTTextureNode* pTextureNode = m_TextureCache.GetAt( i );
-        SAFE_RELEASE( pTextureNode->pTexResView11 );
-        SAFE_RELEASE( pTextureNode->pTexture11 );
+        m_Textures.push_back( -1 );
     }
 
-    // D3D11
-    SAFE_RELEASE( m_pVBScreenQuad11 );
-    SAFE_RELEASE( m_pSpriteBuffer11 );
-    m_SpriteBufferBytes11 = 0;
-    SAFE_RELEASE( m_pInputLayout11 );
-
-    // Shaders
-    SAFE_RELEASE( m_pVSRenderUI11 );
-    SAFE_RELEASE( m_pPSRenderUI11 );
-    SAFE_RELEASE( m_pPSRenderUIUntex11 );
-
-    // States
-    SAFE_RELEASE( m_pDepthStencilStateUI11 );
-    SAFE_RELEASE( m_pRasterizerStateUI11 );
-    SAFE_RELEASE( m_pBlendStateUI11 );
-    SAFE_RELEASE( m_pSamplerStateUI11 );
-
-    SAFE_RELEASE( m_pDepthStencilStateStored11 );
-    SAFE_RELEASE( m_pRasterizerStateStored11 );
-    SAFE_RELEASE( m_pBlendStateStored11 );
-    SAFE_RELEASE( m_pSamplerStateStored11 );
+    int iTexture = m_pManager->AddTexture( strFilename );
 
-    EndFont11();
+    m_Textures[ index] = iTexture;
+    return S_OK;
 }
 
-//--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::StoreD3D11State( ID3D11DeviceContext* pd3dImmediateContext )
-{
-    pd3dImmediateContext->OMGetDepthStencilState( &m_pDepthStencilStateStored11, &m_StencilRefStored11 );
-    pd3dImmediateContext->RSGetState( &m_pRasterizerStateStored11 );
-    pd3dImmediateContext->OMGetBlendState( &m_pBlendStateStored11, m_BlendFactorStored11, &m_SampleMaskStored11 );
-    pd3dImmediateContext->PSGetSamplers( 0, 1, &m_pSamplerStateStored11 );
-}
 
 //--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::RestoreD3D11State( ID3D11DeviceContext* pd3dImmediateContext )
+_Use_decl_annotations_
+HRESULT CDXUTDialog::SetTexture( UINT index, LPCWSTR strResourceName, HMODULE hResourceModule )
 {
-    pd3dImmediateContext->OMSetDepthStencilState( m_pDepthStencilStateStored11, m_StencilRefStored11 );
-    pd3dImmediateContext->RSSetState( m_pRasterizerStateStored11 );
-    pd3dImmediateContext->OMSetBlendState( m_pBlendStateStored11, m_BlendFactorStored11, m_SampleMaskStored11 );
-    pd3dImmediateContext->PSSetSamplers( 0, 1, &m_pSamplerStateStored11 );
+    // If this assert triggers, you need to call CDXUTDialog::Init() first.  This change
+    // was made so that the DXUT's GUI could become seperate and optional from DXUT's core.  The
+    // creation and interfacing with CDXUTDialogResourceManager is now the responsibility
+    // of the application if it wishes to use DXUT's GUI.
+    assert( m_pManager && L"To fix this, call CDXUTDialog::Init() first.  See comments for details." );
+    _Analysis_assume_( m_pManager );
 
-    SAFE_RELEASE( m_pDepthStencilStateStored11 );
-    SAFE_RELEASE( m_pRasterizerStateStored11 );
-    SAFE_RELEASE( m_pBlendStateStored11 );
-    SAFE_RELEASE( m_pSamplerStateStored11 );
-}
+    // Make sure the list is at least as large as the index being set
+    for( size_t i = m_Textures.size(); i <= index; i++ )
+    {
+        m_Textures.push_back( -1 );
+    }
 
-//--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::ApplyRenderUI11( ID3D11DeviceContext* pd3dImmediateContext )
-{
-    // Shaders
-    pd3dImmediateContext->VSSetShader( m_pVSRenderUI11, NULL, 0 );
-    pd3dImmediateContext->HSSetShader( NULL, NULL, 0 );
-    pd3dImmediateContext->DSSetShader( NULL, NULL, 0 );
-    pd3dImmediateContext->GSSetShader( NULL, NULL, 0 );
-    pd3dImmediateContext->PSSetShader( m_pPSRenderUI11, NULL, 0 );
+    int iTexture = m_pManager->AddTexture( strResourceName, hResourceModule );
 
-    // States
-    pd3dImmediateContext->OMSetDepthStencilState( m_pDepthStencilStateUI11, 0 );
-    pd3dImmediateContext->RSSetState( m_pRasterizerStateUI11 );
-    float BlendFactor[4] = { 0, 0, 0, 0 };
-    pd3dImmediateContext->OMSetBlendState( m_pBlendStateUI11, BlendFactor, 0xFFFFFFFF );
-    pd3dImmediateContext->PSSetSamplers( 0, 1, &m_pSamplerStateUI11 );
+    m_Textures[ index ] = iTexture;
+    return S_OK;
 }
 
-//--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::ApplyRenderUIUntex11( ID3D11DeviceContext* pd3dImmediateContext )
-{
-    // Shaders
-    pd3dImmediateContext->VSSetShader( m_pVSRenderUI11, NULL, 0 );
-    pd3dImmediateContext->HSSetShader( NULL, NULL, 0 );
-    pd3dImmediateContext->DSSetShader( NULL, NULL, 0 );
-    pd3dImmediateContext->GSSetShader( NULL, NULL, 0 );
-    pd3dImmediateContext->PSSetShader( m_pPSRenderUIUntex11, NULL, 0 );
-
-    // States
-    pd3dImmediateContext->OMSetDepthStencilState( m_pDepthStencilStateUI11, 0 );
-    pd3dImmediateContext->RSSetState( m_pRasterizerStateUI11 );
-    float BlendFactor[4] = { 0, 0, 0, 0 };
-    pd3dImmediateContext->OMSetBlendState( m_pBlendStateUI11, BlendFactor, 0xFFFFFFFF );
-    pd3dImmediateContext->PSSetSamplers( 0, 1, &m_pSamplerStateUI11 );
-}
 
 //--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::BeginSprites11( )
+DXUTTextureNode* CDXUTDialog::GetTexture( _In_ UINT index ) const
 {
-    m_SpriteVertices.Reset();
+    if( !m_pManager )
+        return nullptr;
+    return m_pManager->GetTextureNode( m_Textures[ index ] );
 }
 
+
 //--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::EndSprites11( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext )
+_Use_decl_annotations_
+bool CDXUTDialog::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
-
-    // ensure our buffer size can hold our sprites
-    UINT SpriteDataBytes = m_SpriteVertices.GetSize() * sizeof( DXUTSpriteVertex );
-    if( m_SpriteBufferBytes11 < SpriteDataBytes )
-    {
-        SAFE_RELEASE( m_pSpriteBuffer11 );
-        m_SpriteBufferBytes11 = SpriteDataBytes;
-
-        D3D11_BUFFER_DESC BufferDesc;
-        BufferDesc.ByteWidth = m_SpriteBufferBytes11;
-        BufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-        BufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-        BufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-        BufferDesc.MiscFlags = 0;
-
-        pd3dDevice->CreateBuffer( &BufferDesc, NULL, &m_pSpriteBuffer11 );
-        DXUT_SetDebugName( m_pSpriteBuffer11, "CDXUTDialogResourceManager" );
-    }
-
-    // Copy the sprites over
-    D3D11_BOX destRegion;
-    destRegion.left = 0;
-    destRegion.right = SpriteDataBytes;
-    destRegion.top = 0;
-    destRegion.bottom = 1;
-    destRegion.front = 0;
-    destRegion.back = 1;
-    D3D11_MAPPED_SUBRESOURCE MappedResource;
-    if ( S_OK == pd3dImmediateContext->Map( m_pSpriteBuffer11, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ) ) { 
-        CopyMemory( MappedResource.pData, (void*)m_SpriteVertices.GetData(), SpriteDataBytes );
-        pd3dImmediateContext->Unmap(m_pSpriteBuffer11, 0);
-    }
-
-    // Draw
-    UINT Stride = sizeof( DXUTSpriteVertex );
-    UINT Offset = 0;
-    pd3dImmediateContext->IASetVertexBuffers( 0, 1, &m_pSpriteBuffer11, &Stride, &Offset );
-    pd3dImmediateContext->IASetInputLayout( m_pInputLayout11 );
-    pd3dImmediateContext->IASetPrimitiveTopology( D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST );
-    pd3dImmediateContext->Draw( m_SpriteVertices.GetSize(), 0 );
-
-    m_SpriteVertices.Reset();
-}
-
-//--------------------------------------------------------------------------------------
-bool CDXUTDialogResourceManager::RegisterDialog( CDXUTDialog* pDialog )
-{
-    // Check that the dialog isn't already registered.
-    for( int i = 0; i < m_Dialogs.GetSize(); ++i )
-        if( m_Dialogs.GetAt( i ) == pDialog )
-            return true;
-
-    // Add to the list.
-    if( FAILED( m_Dialogs.Add( pDialog ) ) )
-        return false;
-
-    // Set up next and prev pointers.
-    if( m_Dialogs.GetSize() > 1 )
-        m_Dialogs[m_Dialogs.GetSize() - 2]->SetNextDialog( pDialog );
-    m_Dialogs[m_Dialogs.GetSize() - 1]->SetNextDialog( m_Dialogs[0] );
-
-    return true;
-}
-
-
-//--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::UnregisterDialog( CDXUTDialog* pDialog )
-{
-    // Search for the dialog in the list.
-    for( int i = 0; i < m_Dialogs.GetSize(); ++i )
-        if( m_Dialogs.GetAt( i ) == pDialog )
-        {
-            m_Dialogs.Remove( i );
-            if( m_Dialogs.GetSize() > 0 )
-            {
-                int l, r;
-
-                if( 0 == i )
-                    l = m_Dialogs.GetSize() - 1;
-                else
-                    l = i - 1;
-
-                if( m_Dialogs.GetSize() == i )
-                    r = 0;
-                else
-                    r = i;
-
-                m_Dialogs[l]->SetNextDialog( m_Dialogs[r] );
-            }
-            return;
-        }
-}
-
-
-//--------------------------------------------------------------------------------------
-void CDXUTDialogResourceManager::EnableKeyboardInputForAllDialogs()
-{
-    // Enable keyboard input for all registered dialogs
-    for( int i = 0; i < m_Dialogs.GetSize(); ++i )
-        m_Dialogs[i]->EnableKeyboardInput( true );
-}
-
-
-//--------------------------------------------------------------------------------------
-void CDXUTDialog::Refresh()
-{
-    if( s_pControlFocus )
-        s_pControlFocus->OnFocusOut();
-
-    if( m_pControlMouseOver )
-        m_pControlMouseOver->OnMouseLeave();
-
-    s_pControlFocus = NULL;
-    s_pControlPressed = NULL;
-    m_pControlMouseOver = NULL;
-
-    for( int i = 0; i < m_Controls.GetSize(); i++ )
-    {
-        CDXUTControl* pControl = m_Controls.GetAt( i );
-        pControl->Refresh();
-    }
-
-    if( m_bKeyboardInput )
-        FocusDefaultControl();
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::OnRender( float fElapsedTime )
-{
-    if( m_pManager->GetD3D9Device() )
-        return OnRender9( fElapsedTime );
-    else
-        return OnRender11( fElapsedTime );
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::OnRender9( float fElapsedTime )
-{
-    // If this assert triggers, you need to call CDXUTDialogResourceManager::On*Device() from inside
-    // the application's device callbacks.  See the SDK samples for an example of how to do this.
-    assert( m_pManager->GetD3D9Device() && m_pManager->m_pStateBlock &&
-            L"To fix hook up CDXUTDialogResourceManager to device callbacks.  See comments for details" );
-
-    // See if the dialog needs to be refreshed
-    if( m_fTimeLastRefresh < s_fTimeRefresh )
-    {
-        m_fTimeLastRefresh = DXUTGetTime();
-        Refresh();
-    }
-
-    // For invisible dialog, out now.
-    if( !m_bVisible ||
-        ( m_bMinimized && !m_bCaption ) )
-        return S_OK;
-
-    IDirect3DDevice9* pd3dDevice = m_pManager->GetD3D9Device();
-
-    // Set up a state block here and restore it when finished drawing all the controls
-    m_pManager->m_pStateBlock->Capture();
-
-    //pd3dDevice->SetSamplerState(0, D3DSAMP_SRGBTEXTURE, TRUE);
-    //pd3dDevice->SetRenderState( D3DRS_SRGBWRITEENABLE, TRUE );
-   
-    pd3dDevice->SetRenderState( D3DRS_ALPHABLENDENABLE, TRUE );
-    pd3dDevice->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );
-    pd3dDevice->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA );
-    pd3dDevice->SetRenderState( D3DRS_ALPHATESTENABLE, FALSE );
-    pd3dDevice->SetRenderState( D3DRS_SEPARATEALPHABLENDENABLE, FALSE );
-    pd3dDevice->SetRenderState( D3DRS_BLENDOP, D3DBLENDOP_ADD );
-    pd3dDevice->SetRenderState( D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA | D3DCOLORWRITEENABLE_BLUE |
-                                D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_RED );
-    pd3dDevice->SetRenderState( D3DRS_SHADEMODE, D3DSHADE_GOURAUD );
-    pd3dDevice->SetRenderState( D3DRS_FOGENABLE, FALSE );
-    pd3dDevice->SetRenderState( D3DRS_ZWRITEENABLE, FALSE );
-    pd3dDevice->SetRenderState( D3DRS_FILLMODE, D3DFILL_SOLID );
-    pd3dDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_CCW );
-
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG2 );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1 );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_RESULTARG, D3DTA_CURRENT );
-    pd3dDevice->SetTextureStageState( 1, D3DTSS_COLOROP, D3DTOP_DISABLE );
-    pd3dDevice->SetTextureStageState( 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE );
-
-    BOOL bBackgroundIsVisible = ( m_colorTopLeft | m_colorTopRight | m_colorBottomRight | m_colorBottomLeft ) &
-        0xff000000;
-    if( !m_bMinimized && bBackgroundIsVisible )
-    {
-        DXUT_SCREEN_VERTEX_UNTEX vertices[4] =
-        {
-            ( float )m_x,           ( float )m_y,            0.5f, 1.0f, m_colorTopLeft,
-            ( float )m_x + m_width, ( float )m_y,            0.5f, 1.0f, m_colorTopRight,
-            ( float )m_x + m_width, ( float )m_y + m_height, 0.5f, 1.0f, m_colorBottomRight,
-            ( float )m_x,           ( float )m_y + m_height, 0.5f, 1.0f, m_colorBottomLeft,
-        };
-
-        pd3dDevice->SetVertexShader( NULL );
-        pd3dDevice->SetPixelShader( NULL );
-
-        pd3dDevice->SetRenderState( D3DRS_ZENABLE, FALSE );
-
-        pd3dDevice->SetFVF( DXUT_SCREEN_VERTEX_UNTEX::FVF );
-        pd3dDevice->DrawPrimitiveUP( D3DPT_TRIANGLEFAN, 2, vertices, sizeof( DXUT_SCREEN_VERTEX_UNTEX ) );
-    }
-
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_MODULATE );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE );
-
-    pd3dDevice->SetSamplerState( 0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR );
-
-    DXUTTextureNode* pTextureNode = GetTexture( 0 );
-    pd3dDevice->SetTexture( 0, pTextureNode->pTexture9 );
-
-    m_pManager->m_pSprite->Begin( D3DXSPRITE_DONOTSAVESTATE );
-
-    // Render the caption if it's enabled.
-    if( m_bCaption )
-    {
-        // DrawSprite will offset the rect down by
-        // m_nCaptionHeight, so adjust the rect higher
-        // here to negate the effect.
-        RECT rc =
-        {
-            0, -m_nCaptionHeight, m_width, 0
-        };
-        DrawSprite9( &m_CapElement, &rc );
-        rc.left += 5; // Make a left margin
-        WCHAR wszOutput[256];
-        wcscpy_s( wszOutput, 256, m_wszCaption );
-        if( m_bMinimized )
-            wcscat_s( wszOutput, 256, L" (Minimized)" );
-        DrawText9( wszOutput, &m_CapElement, &rc, true );
-    }
-
-    // If the dialog is minimized, skip rendering
-    // its controls.
-    if( !m_bMinimized )
-    {
-        for( int i = 0; i < m_Controls.GetSize(); i++ )
-        {
-            CDXUTControl* pControl = m_Controls.GetAt( i );
-
-            // Focused control is drawn last
-            if( pControl == s_pControlFocus )
-                continue;
-
-            pControl->Render( fElapsedTime );
-        }
-
-        if( s_pControlFocus != NULL && s_pControlFocus->m_pDialog == this )
-            s_pControlFocus->Render( fElapsedTime );
-    }
-
-    m_pManager->m_pSprite->End();
-
-    m_pManager->m_pStateBlock->Apply();
-
-    return S_OK;
-}
-
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::OnRender11( float fElapsedTime )
-{
-    // If this assert triggers, you need to call CDXUTDialogResourceManager::On*Device() from inside
-    // the application's device callbacks.  See the SDK samples for an example of how to do this.
-    assert( m_pManager->GetD3D11Device() &&
-            L"To fix hook up CDXUTDialogResourceManager to device callbacks.  See comments for details" );
-
-    // See if the dialog needs to be refreshed
-    if( m_fTimeLastRefresh < s_fTimeRefresh )
-    {
-        m_fTimeLastRefresh = DXUTGetTime();
-        Refresh();
-    }
-
-    // For invisible dialog, out now.
-    if( !m_bVisible ||
-        ( m_bMinimized && !m_bCaption ) )
-        return S_OK;
-
-    ID3D11Device* pd3dDevice = m_pManager->GetD3D11Device();
-    ID3D11DeviceContext* pd3dDeviceContext = m_pManager->GetD3D11DeviceContext();
-
-    // Set up a state block here and restore it when finished drawing all the controls
-    m_pManager->StoreD3D11State( pd3dDeviceContext );
-
-    BOOL bBackgroundIsVisible = ( m_colorTopLeft | m_colorTopRight | m_colorBottomRight | m_colorBottomLeft ) &
-        0xff000000;
-    if( !m_bMinimized && bBackgroundIsVisible )
-    {
-        // Convert the draw rectangle from screen coordinates to clip space coordinates.
-        float Left, Right, Top, Bottom;
-        Left = m_x * 2.0f / m_pManager->m_nBackBufferWidth - 1.0f;
-        Right = ( m_x + m_width ) * 2.0f / m_pManager->m_nBackBufferWidth - 1.0f;
-        Top = 1.0f - m_y * 2.0f / m_pManager->m_nBackBufferHeight;
-        Bottom = 1.0f - ( m_y + m_height ) * 2.0f / m_pManager->m_nBackBufferHeight;
-
-        DXUT_SCREEN_VERTEX_10 vertices[4] =
-        {
-            Left,  Top,    0.5f, D3DCOLOR_TO_D3DCOLORVALUE( m_colorTopLeft ), 0.0f, 0.0f,
-            Right, Top,    0.5f, D3DCOLOR_TO_D3DCOLORVALUE( m_colorTopRight ), 1.0f, 0.0f,
-            Left,  Bottom, 0.5f, D3DCOLOR_TO_D3DCOLORVALUE( m_colorBottomLeft ), 0.0f, 1.0f,
-            Right, Bottom, 0.5f, D3DCOLOR_TO_D3DCOLORVALUE( m_colorBottomRight ), 1.0f, 1.0f,
-        };
-
-        //DXUT_SCREEN_VERTEX_10 *pVB;
-        D3D11_MAPPED_SUBRESOURCE MappedData;
-        if( SUCCEEDED( pd3dDeviceContext->Map( m_pManager->m_pVBScreenQuad11, 0, D3D11_MAP_WRITE_DISCARD,
-                                               0, &MappedData ) ) )
-        {
-            CopyMemory( MappedData.pData, vertices, sizeof( vertices ) );
-            pd3dDeviceContext->Unmap( m_pManager->m_pVBScreenQuad11, 0 );
-        }
-
-        // Set the quad VB as current
-        UINT stride = sizeof( DXUT_SCREEN_VERTEX_10 );
-        UINT offset = 0;
-        pd3dDeviceContext->IASetVertexBuffers( 0, 1, &m_pManager->m_pVBScreenQuad11, &stride, &offset );
-        pd3dDeviceContext->IASetInputLayout( m_pManager->m_pInputLayout11 );
-        pd3dDeviceContext->IASetPrimitiveTopology( D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP );
-
-        // Setup for rendering
-        m_pManager->ApplyRenderUIUntex11( pd3dDeviceContext );
-        pd3dDeviceContext->Draw( 4, 0 );
-    }
-
-    DXUTTextureNode* pTextureNode = GetTexture( 0 );
-    pd3dDeviceContext->PSSetShaderResources( 0, 1, &pTextureNode->pTexResView11 );
-
-    // Sort depth back to front
-    m_pManager->BeginSprites11();
-    BeginText11();
-
-    m_pManager->ApplyRenderUI11( pd3dDeviceContext );
-
-    // Render the caption if it's enabled.
-    if( m_bCaption )
-    {
-        // DrawSprite will offset the rect down by
-        // m_nCaptionHeight, so adjust the rect higher
-        // here to negate the effect.
-        RECT rc = { 0, -m_nCaptionHeight, m_width, 0 };
-        DrawSprite11( &m_CapElement, &rc, 0.99f );
-        rc.left += 5; // Make a left margin
-        WCHAR wszOutput[256];
-        wcscpy_s( wszOutput, 256, m_wszCaption );
-        if( m_bMinimized )
-            wcscat_s( wszOutput, 256, L" (Minimized)" );
-        DrawText11( pd3dDevice, pd3dDeviceContext, wszOutput, &m_CapElement, &rc, true );
-    }
-
-    // If the dialog is minimized, skip rendering
-    // its controls.
-    if( !m_bMinimized )
-    {
-        for( int i = 0; i < m_Controls.GetSize(); i++ )
-        {
-            CDXUTControl* pControl = m_Controls.GetAt( i );
-
-            // Focused control is drawn last
-            if( pControl == s_pControlFocus )
-                continue;
-
-            pControl->Render( fElapsedTime );
-        }
-
-        if( s_pControlFocus != NULL && s_pControlFocus->m_pDialog == this )
-            s_pControlFocus->Render( fElapsedTime );
-    }
-
-    // End sprites
-    if( m_bCaption )
-    {
-        m_pManager->EndSprites11( pd3dDevice, pd3dDeviceContext );
-        EndText11( pd3dDevice, pd3dDeviceContext );
-    }
-    m_pManager->RestoreD3D11State( pd3dDeviceContext );
-
-    return S_OK;
-}
-
-//--------------------------------------------------------------------------------------
-VOID CDXUTDialog::SendEvent( UINT nEvent, bool bTriggeredByUser, CDXUTControl* pControl )
-{
-    // If no callback has been registered there's nowhere to send the event to
-    if( m_pCallbackEvent == NULL )
-        return;
-
-    // Discard events triggered programatically if these types of events haven't been
-    // enabled
-    if( !bTriggeredByUser && !m_bNonUserEvents )
-        return;
-
-    m_pCallbackEvent( nEvent, pControl->GetID(), pControl, m_pCallbackEventUserContext );
-}
-
-
-//--------------------------------------------------------------------------------------
-int CDXUTDialogResourceManager::AddFont( LPCWSTR strFaceName, LONG height, LONG weight ) 
-{
-    // See if this font already exists
-    for( int i = 0; i < m_FontCache.GetSize(); i++ )
-    {
-        DXUTFontNode* pFontNode = m_FontCache.GetAt( i );
-        size_t nLen = 0;
-        nLen = wcsnlen( strFaceName, MAX_PATH);
-        if( 0 == _wcsnicmp( pFontNode->strFace, strFaceName, nLen ) &&
-            pFontNode->nHeight == height &&
-            pFontNode->nWeight == weight )
-        {
-            return i;
-        }
-    }
-
-    // Add a new font and try to create it
-    DXUTFontNode* pNewFontNode = new DXUTFontNode;
-    if( pNewFontNode == NULL )
-        return -1;
-
-    ZeroMemory( pNewFontNode, sizeof( DXUTFontNode ) );
-    wcscpy_s( pNewFontNode->strFace, MAX_PATH, strFaceName );
-    pNewFontNode->nHeight = height;
-    pNewFontNode->nWeight = weight;
-    m_FontCache.Add( pNewFontNode );
-
-    int iFont = m_FontCache.GetSize() - 1;
-
-    // If a device is available, try to create immediately
-    if( m_pd3d9Device )
-        CreateFont9( iFont );
-
-    return iFont;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::SetFont( UINT index, LPCWSTR strFaceName, LONG height, LONG weight )
-{
-    // If this assert triggers, you need to call CDXUTDialog::Init() first.  This change
-    // was made so that the DXUT's GUI could become seperate and optional from DXUT's core.  The 
-    // creation and interfacing with CDXUTDialogResourceManager is now the responsibility 
-    // of the application if it wishes to use DXUT's GUI.
-    assert( m_pManager != NULL && L"To fix call CDXUTDialog::Init() first.  See comments for details." );
-
-    // Make sure the list is at least as large as the index being set
-    UINT i;
-    for( i = m_Fonts.GetSize(); i <= index; i++ )
-    {
-        m_Fonts.Add( -1 );
-    }
-
-    int iFont = m_pManager->AddFont( strFaceName, height, weight );
-    m_Fonts.SetAt( index, iFont );
-
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-DXUTFontNode* CDXUTDialog::GetFont( UINT index )
-{
-    if( NULL == m_pManager )
-        return NULL;
-    return m_pManager->GetFontNode( m_Fonts.GetAt( index ) );
-}
-
-
-//--------------------------------------------------------------------------------------
-int CDXUTDialogResourceManager::AddTexture( LPCWSTR strFilename )
-{
-    // See if this texture already exists
-    for( int i = 0; i < m_TextureCache.GetSize(); i++ )
-    {
-        DXUTTextureNode* pTextureNode = m_TextureCache.GetAt( i );
-        size_t nLen = 0;
-        nLen = wcsnlen( strFilename, MAX_PATH);
-        if( pTextureNode->bFileSource &&  // Sources must match
-            0 == _wcsnicmp( pTextureNode->strFilename, strFilename, nLen ) )
-        {
-            return i;
-        }
-    }
-
-    // Add a new texture and try to create it
-    DXUTTextureNode* pNewTextureNode = new DXUTTextureNode;
-    if( pNewTextureNode == NULL )
-        return -1;
-
-    ZeroMemory( pNewTextureNode, sizeof( DXUTTextureNode ) );
-    pNewTextureNode->bFileSource = true;
-    wcscpy_s( pNewTextureNode->strFilename, MAX_PATH, strFilename );
-
-    m_TextureCache.Add( pNewTextureNode );
-
-    int iTexture = m_TextureCache.GetSize() - 1;
-
-    // If a device is available, try to create immediately
-    if( m_pd3d9Device )
-        CreateTexture9( iTexture );
-
-    return iTexture;
-}
-
-
-//--------------------------------------------------------------------------------------
-int CDXUTDialogResourceManager::AddTexture( LPCWSTR strResourceName, HMODULE hResourceModule )
-{
-    // See if this texture already exists
-    for( int i = 0; i < m_TextureCache.GetSize(); i++ )
-    {
-        DXUTTextureNode* pTextureNode = m_TextureCache.GetAt( i );
-        if( !pTextureNode->bFileSource &&      // Sources must match
-            pTextureNode->hResourceModule == hResourceModule ) // Module handles must match
-        {
-            if( IS_INTRESOURCE( strResourceName ) )
-            {
-                // Integer-based ID
-                if( ( INT_PTR )strResourceName == pTextureNode->nResourceID )
-                    return i;
-            }
-            else
-            {
-                // String-based ID
-                size_t nLen = 0;
-                nLen = wcsnlen ( strResourceName, MAX_PATH );
-                if( 0 == _wcsnicmp( pTextureNode->strFilename, strResourceName, nLen ) )
-                    return i;
-            }
-        }
-    }
-
-    // Add a new texture and try to create it
-    DXUTTextureNode* pNewTextureNode = new DXUTTextureNode;
-    if( pNewTextureNode == NULL )
-        return -1;
-
-    ZeroMemory( pNewTextureNode, sizeof( DXUTTextureNode ) );
-    pNewTextureNode->hResourceModule = hResourceModule;
-    if( IS_INTRESOURCE( strResourceName ) )
-    {
-        pNewTextureNode->nResourceID = ( int )( size_t )strResourceName;
-    }
-    else
-    {
-        pNewTextureNode->nResourceID = 0;
-        wcscpy_s( pNewTextureNode->strFilename, MAX_PATH, strResourceName );
-    }
-
-    m_TextureCache.Add( pNewTextureNode );
-
-    int iTexture = m_TextureCache.GetSize() - 1;
-
-    // If a device is available, try to create immediately
-    if( m_pd3d9Device )
-        CreateTexture9( iTexture );
-
-    return iTexture;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::SetTexture( UINT index, LPCWSTR strFilename )
-{
-    // If this assert triggers, you need to call CDXUTDialog::Init() first.  This change
-    // was made so that the DXUT's GUI could become seperate and optional from DXUT's core.  The 
-    // creation and interfacing with CDXUTDialogResourceManager is now the responsibility 
-    // of the application if it wishes to use DXUT's GUI.
-    assert( m_pManager != NULL && L"To fix this, call CDXUTDialog::Init() first.  See comments for details." );
-
-    // Make sure the list is at least as large as the index being set
-    for( UINT i = m_Textures.GetSize(); i <= index; i++ )
-    {
-        m_Textures.Add( -1 );
-    }
-
-    int iTexture = m_pManager->AddTexture( strFilename );
-
-    m_Textures.SetAt( index, iTexture );
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::SetTexture( UINT index, LPCWSTR strResourceName, HMODULE hResourceModule )
-{
-    // If this assert triggers, you need to call CDXUTDialog::Init() first.  This change
-    // was made so that the DXUT's GUI could become seperate and optional from DXUT's core.  The 
-    // creation and interfacing with CDXUTDialogResourceManager is now the responsibility 
-    // of the application if it wishes to use DXUT's GUI.
-    assert( m_pManager != NULL && L"To fix this, call CDXUTDialog::Init() first.  See comments for details." );
-
-    // Make sure the list is at least as large as the index being set
-    for( UINT i = m_Textures.GetSize(); i <= index; i++ )
-    {
-        m_Textures.Add( -1 );
-    }
-
-    int iTexture = m_pManager->AddTexture( strResourceName, hResourceModule );
-
-    m_Textures.SetAt( index, iTexture );
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-DXUTTextureNode* CDXUTDialog::GetTexture( UINT index )
-{
-    if( NULL == m_pManager )
-        return NULL;
-    return m_pManager->GetTextureNode( m_Textures.GetAt( index ) );
-}
-
-
-
-//--------------------------------------------------------------------------------------
-bool CDXUTDialog::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
-{
-    bool bHandled = false;
+    bool bHandled = false;
 
     // For invisible dialog, do not handle anything.
     if( !m_bVisible )
@@ -1526,6 +908,7 @@ bool CDXUTDialog::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
                 if( s_pControlFocus &&
                     s_pControlFocus->m_pDialog == this &&
                     s_pControlFocus->GetEnabled() )
+    for( auto it = m_Controls.cbegin(); it != m_Controls.cend(); ++it )
                 {
                     if( s_pControlFocus->HandleKeyboard( uMsg, wParam, lParam ) )
                         return true;
@@ -1538,12 +921,11 @@ bool CDXUTDialog::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
                                             ( s_pControlFocus->GetType() != DXUT_CONTROL_EDITBOX
                                               && s_pControlFocus->GetType() != DXUT_CONTROL_IMEEDITBOX ) ) )
                 {
-                    for( int i = 0; i < m_Controls.GetSize(); i++ )
+                    for( auto it = m_Controls.begin(); it != m_Controls.end(); ++it )
                     {
-                        CDXUTControl* pControl = m_Controls.GetAt( i );
-                        if( pControl->GetHotkey() == wParam )
+                        if( (*it)->GetHotkey() == wParam )
                         {
-                            pControl->OnHotkey();
+                            (*it)->OnHotkey();
                             return true;
                         }
                     }
@@ -1560,7 +942,7 @@ bool CDXUTDialog::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
                     {
                         case VK_RIGHT:
                         case VK_DOWN:
-                            if( s_pControlFocus != NULL )
+                            if( s_pControlFocus )
                             {
                                 return OnCycleFocus( true );
                             }
@@ -1568,7 +950,7 @@ bool CDXUTDialog::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 
                         case VK_LEFT:
                         case VK_UP:
-                            if( s_pControlFocus != NULL )
+                            if( s_pControlFocus )
                             {
                                 return OnCycleFocus( false );
                             }
@@ -1602,7 +984,7 @@ bool CDXUTDialog::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
         case WM_XBUTTONDBLCLK:
         case WM_MOUSEWHEEL:
             {
-                // If not accepting mouse input, return false to indicate the message should still 
+                // If not accepting mouse input, return false to indicate the message should still
                 // be handled by the application (usually to move the camera).
                 if( !m_bMouseInput )
                     return false;
@@ -1629,8 +1011,8 @@ bool CDXUTDialog::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
                 }
 
                 // Not yet handled, see if the mouse is over any controls
-                CDXUTControl* pControl = GetControlAtPoint( mousePoint );
-                if( pControl != NULL && pControl->GetEnabled() )
+                auto pControl = GetControlAtPoint( mousePoint );
+                if( pControl && pControl->GetEnabled() )
                 {
                     bHandled = pControl->HandleMouse( uMsg, mousePoint, wParam, lParam );
                     if( bHandled )
@@ -1645,7 +1027,7 @@ bool CDXUTDialog::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
                         s_pControlFocus->m_pDialog == this )
                     {
                         s_pControlFocus->OnFocusOut();
-                        s_pControlFocus = NULL;
+                        s_pControlFocus = nullptr;
                     }
                 }
 
@@ -1676,16 +1058,15 @@ bool CDXUTDialog::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
     return false;
 }
 
+
 //--------------------------------------------------------------------------------------
-CDXUTControl* CDXUTDialog::GetControlAtPoint( POINT pt )
+CDXUTControl* CDXUTDialog::GetControlAtPoint( _In_ const POINT& pt ) const
 {
     // Search through all child controls for the first one which
     // contains the mouse point
-    for( int i = 0; i < m_Controls.GetSize(); i++ )
+    for( auto it = m_Controls.cbegin(); it != m_Controls.cend(); ++it )
     {
-        CDXUTControl* pControl = m_Controls.GetAt( i );
-
-        if( pControl == NULL )
+        if( !*it )
         {
             continue;
         }
@@ -1693,21 +1074,21 @@ CDXUTControl* CDXUTDialog::GetControlAtPoint( POINT pt )
         // We only return the current control if it is visible
         // and enabled.  Because GetControlAtPoint() is used to do mouse
         // hittest, it makes sense to perform this filtering.
-        if( pControl->ContainsPoint( pt ) && pControl->GetEnabled() && pControl->GetVisible() )
+        if( (*it)->ContainsPoint( pt ) && (*it)->GetEnabled() && (*it)->GetVisible() )
         {
-            return pControl;
+            return *it;
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 
 //--------------------------------------------------------------------------------------
-bool CDXUTDialog::GetControlEnabled( int ID )
+bool CDXUTDialog::GetControlEnabled( _In_ int ID ) const
 {
-    CDXUTControl* pControl = GetControl( ID );
-    if( pControl == NULL )
+    auto pControl = GetControl( ID );
+    if( !pControl )
         return false;
 
     return pControl->GetEnabled();
@@ -1716,10 +1097,10 @@ bool CDXUTDialog::GetControlEnabled( int ID )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTDialog::SetControlEnabled( int ID, bool bEnabled )
+void CDXUTDialog::SetControlEnabled( _In_ int ID, _In_ bool bEnabled )
 {
-    CDXUTControl* pControl = GetControl( ID );
-    if( pControl == NULL )
+    auto pControl = GetControl( ID );
+    if( !pControl )
         return;
 
     pControl->SetEnabled( bEnabled );
@@ -1727,18 +1108,19 @@ void CDXUTDialog::SetControlEnabled( int ID, bool bEnabled )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTDialog::OnMouseUp( POINT pt )
+void CDXUTDialog::OnMouseUp( _In_ const POINT& pt )
 {
-    s_pControlPressed = NULL;
-    m_pControlMouseOver = NULL;
+    UNREFERENCED_PARAMETER(pt);
+    s_pControlPressed = nullptr;
+    m_pControlMouseOver = nullptr;
 }
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTDialog::OnMouseMove( POINT pt )
+void CDXUTDialog::OnMouseMove( _In_ const POINT& pt )
 {
     // Figure out which control the mouse is over now
-    CDXUTControl* pControl = GetControlAtPoint( pt );
+    auto pControl = GetControlAtPoint( pt );
 
     // If the mouse is still over the same control, nothing needs to be done
     if( pControl == m_pControlMouseOver )
@@ -1750,77 +1132,72 @@ void CDXUTDialog::OnMouseMove( POINT pt )
 
     // Handle mouse entering the new control
     m_pControlMouseOver = pControl;
-    if( pControl != NULL )
+    if( pControl )
         m_pControlMouseOver->OnMouseEnter();
 }
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTDialog::SetDefaultElement( UINT nControlType, UINT iElement, CDXUTElement* pElement )
 {
     // If this Element type already exist in the list, simply update the stored Element
-    for( int i = 0; i < m_DefaultElements.GetSize(); i++ )
+    for( auto it = m_DefaultElements.begin(); it != m_DefaultElements.end(); ++it )
     {
-        DXUTElementHolder* pElementHolder = m_DefaultElements.GetAt( i );
-
-        if( pElementHolder->nControlType == nControlType &&
-            pElementHolder->iElement == iElement )
+        if( (*it)->nControlType == nControlType &&
+            (*it)->iElement == iElement )
         {
-            pElementHolder->Element = *pElement;
+            (*it)->Element = *pElement;
             return S_OK;
         }
     }
 
     // Otherwise, add a new entry
     DXUTElementHolder* pNewHolder;
-    pNewHolder = new DXUTElementHolder;
-    if( pNewHolder == NULL )
+    pNewHolder = new (std::nothrow) DXUTElementHolder;
+    if( !pNewHolder )
         return E_OUTOFMEMORY;
 
     pNewHolder->nControlType = nControlType;
     pNewHolder->iElement = iElement;
     pNewHolder->Element = *pElement;
 
-    HRESULT hr = m_DefaultElements.Add( pNewHolder );
-    if( FAILED( hr ) )
-    {
-        delete pNewHolder;
-    }
-    return hr;
+    m_DefaultElements.push_back( pNewHolder );
+
+    return S_OK;
 }
 
 
 //--------------------------------------------------------------------------------------
-CDXUTElement* CDXUTDialog::GetDefaultElement( UINT nControlType, UINT iElement )
+_Use_decl_annotations_
+CDXUTElement* CDXUTDialog::GetDefaultElement( UINT nControlType, UINT iElement ) const
 {
-    for( int i = 0; i < m_DefaultElements.GetSize(); i++ )
+    for( auto it = m_DefaultElements.cbegin(); it != m_DefaultElements.cend(); ++it )
     {
-        DXUTElementHolder* pElementHolder = m_DefaultElements.GetAt( i );
-
-        if( pElementHolder->nControlType == nControlType &&
-            pElementHolder->iElement == iElement )
+        if( (*it)->nControlType == nControlType &&
+            (*it)->iElement == iElement )
         {
-            return &pElementHolder->Element;
+            return &(*it)->Element;
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 
-
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTDialog::AddStatic( int ID, LPCWSTR strText, int x, int y, int width, int height, bool bIsDefault,
                                 CDXUTStatic** ppCreated )
 {
     HRESULT hr = S_OK;
 
-    CDXUTStatic* pStatic = new CDXUTStatic( this );
+    auto pStatic = new (std::nothrow) CDXUTStatic( this );
 
-    if( ppCreated != NULL )
+    if( ppCreated )
         *ppCreated = pStatic;
 
-    if( pStatic == NULL )
+    if( !pStatic )
         return E_OUTOFMEMORY;
 
     hr = AddControl( pStatic );
@@ -1839,17 +1216,18 @@ HRESULT CDXUTDialog::AddStatic( int ID, LPCWSTR strText, int x, int y, int width
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTDialog::AddButton( int ID, LPCWSTR strText, int x, int y, int width, int height, UINT nHotkey,
                                 bool bIsDefault, CDXUTButton** ppCreated )
 {
     HRESULT hr = S_OK;
 
-    CDXUTButton* pButton = new CDXUTButton( this );
+    auto pButton = new (std::nothrow) CDXUTButton( this );
 
-    if( ppCreated != NULL )
+    if( ppCreated )
         *ppCreated = pButton;
 
-    if( pButton == NULL )
+    if( !pButton )
         return E_OUTOFMEMORY;
 
     hr = AddControl( pButton );
@@ -1867,17 +1245,19 @@ HRESULT CDXUTDialog::AddButton( int ID, LPCWSTR strText, int x, int y, int width
     return S_OK;
 }
 
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTDialog::AddButtonCallback(std::function<void()> cb, LPCWSTR strText, int x, int y, int width, int height, UINT nHotkey,
-                                       bool bIsDefault, CDXUTButton** ppCreated)
+    bool bIsDefault, CDXUTButton** ppCreated)
 {
     HRESULT hr = S_OK;
 
-    CDXUTButton* pButton = new CDXUTButton(this);
+    auto pButton = new (std::nothrow) CDXUTButton(this);
 
-    if (ppCreated != NULL)
+    if (ppCreated)
         *ppCreated = pButton;
 
-    if (pButton == NULL)
+    if (!pButton)
         return E_OUTOFMEMORY;
 
     hr = AddControl(pButton);
@@ -1896,18 +1276,20 @@ HRESULT CDXUTDialog::AddButtonCallback(std::function<void()> cb, LPCWSTR strText
     return S_OK;
 }
 
+
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTDialog::AddCheckBox( int ID, LPCWSTR strText, int x, int y, int width, int height, bool bChecked,
                                   UINT nHotkey, bool bIsDefault, CDXUTCheckBox** ppCreated )
 {
     HRESULT hr = S_OK;
 
-    CDXUTCheckBox* pCheckBox = new CDXUTCheckBox( this );
+    auto pCheckBox = new (std::nothrow) CDXUTCheckBox( this );
 
-    if( ppCreated != NULL )
+    if( ppCreated )
         *ppCreated = pCheckBox;
 
-    if( pCheckBox == NULL )
+    if( !pCheckBox )
         return E_OUTOFMEMORY;
 
     hr = AddControl( pCheckBox );
@@ -1927,19 +1309,19 @@ HRESULT CDXUTDialog::AddCheckBox( int ID, LPCWSTR strText, int x, int y, int wid
 }
 
 
-
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTDialog::AddRadioButton( int ID, UINT nButtonGroup, LPCWSTR strText, int x, int y, int width, int height,
                                      bool bChecked, UINT nHotkey, bool bIsDefault, CDXUTRadioButton** ppCreated )
 {
     HRESULT hr = S_OK;
 
-    CDXUTRadioButton* pRadioButton = new CDXUTRadioButton( this );
+    auto pRadioButton = new (std::nothrow) CDXUTRadioButton( this );
 
-    if( ppCreated != NULL )
+    if( ppCreated )
         *ppCreated = pRadioButton;
 
-    if( pRadioButton == NULL )
+    if( !pRadioButton )
         return E_OUTOFMEMORY;
 
     hr = AddControl( pRadioButton );
@@ -1961,20 +1343,19 @@ HRESULT CDXUTDialog::AddRadioButton( int ID, UINT nButtonGroup, LPCWSTR strText,
 }
 
 
-
-
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTDialog::AddComboBox( int ID, int x, int y, int width, int height, UINT nHotkey, bool bIsDefault,
                                   CDXUTComboBox** ppCreated )
 {
     HRESULT hr = S_OK;
 
-    CDXUTComboBox* pComboBox = new CDXUTComboBox( this );
+    auto pComboBox = new (std::nothrow) CDXUTComboBox( this );
 
-    if( ppCreated != NULL )
+    if( ppCreated )
         *ppCreated = pComboBox;
 
-    if( pComboBox == NULL )
+    if( !pComboBox )
         return E_OUTOFMEMORY;
 
     hr = AddControl( pComboBox );
@@ -1992,19 +1373,19 @@ HRESULT CDXUTDialog::AddComboBox( int ID, int x, int y, int width, int height, U
 }
 
 
-
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTDialog::AddSlider( int ID, int x, int y, int width, int height, int min, int max, int value,
                                 bool bIsDefault, CDXUTSlider** ppCreated )
 {
     HRESULT hr = S_OK;
 
-    CDXUTSlider* pSlider = new CDXUTSlider( this );
+    auto pSlider = new (std::nothrow) CDXUTSlider( this );
 
-    if( ppCreated != NULL )
+    if( ppCreated )
         *ppCreated = pSlider;
 
-    if( pSlider == NULL )
+    if( !pSlider )
         return E_OUTOFMEMORY;
 
     hr = AddControl( pSlider );
@@ -2024,19 +1405,19 @@ HRESULT CDXUTDialog::AddSlider( int ID, int x, int y, int width, int height, int
 }
 
 
-
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTDialog::AddEditBox( int ID, LPCWSTR strText, int x, int y, int width, int height, bool bIsDefault,
                                  CDXUTEditBox** ppCreated )
 {
     HRESULT hr = S_OK;
 
-    CDXUTEditBox* pEditBox = new CDXUTEditBox( this );
+    auto pEditBox = new (std::nothrow) CDXUTEditBox( this );
 
-    if( ppCreated != NULL )
+    if( ppCreated )
         *ppCreated = pEditBox;
 
-    if( pEditBox == NULL )
+    if( !pEditBox )
         return E_OUTOFMEMORY;
 
     hr = AddControl( pEditBox );
@@ -2057,15 +1438,16 @@ HRESULT CDXUTDialog::AddEditBox( int ID, LPCWSTR strText, int x, int y, int widt
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTDialog::AddListBox( int ID, int x, int y, int width, int height, DWORD dwStyle, CDXUTListBox** ppCreated )
 {
     HRESULT hr = S_OK;
-    CDXUTListBox* pListBox = new CDXUTListBox( this );
+    auto pListBox = new (std::nothrow) CDXUTListBox( this );
 
-    if( ppCreated != NULL )
+    if( ppCreated )
         *ppCreated = pListBox;
 
-    if( pListBox == NULL )
+    if( !pListBox )
         return E_OUTOFMEMORY;
 
     hr = AddControl( pListBox );
@@ -2082,23 +1464,21 @@ HRESULT CDXUTDialog::AddListBox( int ID, int x, int y, int width, int height, DW
 }
 
 
-
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::InitControl( CDXUTControl* pControl )
+HRESULT CDXUTDialog::InitControl( _In_ CDXUTControl* pControl )
 {
     HRESULT hr;
 
-    if( pControl == NULL )
+    if( !pControl )
         return E_INVALIDARG;
 
-    pControl->m_Index = m_Controls.GetSize();
+    pControl->m_Index = static_cast<UINT>( m_Controls.size() );
 
     // Look for a default Element entries
-    for( int i = 0; i < m_DefaultElements.GetSize(); i++ )
+    for( auto it = m_DefaultElements.begin(); it != m_DefaultElements.end(); ++it )
     {
-        DXUTElementHolder* pElementHolder = m_DefaultElements.GetAt( i );
-        if( pElementHolder->nControlType == pControl->GetType() )
-            pControl->SetElement( pElementHolder->iElement, &pElementHolder->Element );
+        if( (*it)->nControlType == pControl->GetType() )
+            pControl->SetElement( (*it)->iElement, &(*it)->Element );
     }
 
     V_RETURN( pControl->OnInit() );
@@ -2107,9 +1487,8 @@ HRESULT CDXUTDialog::InitControl( CDXUTControl* pControl )
 }
 
 
-
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::AddControl( CDXUTControl* pControl )
+HRESULT CDXUTDialog::AddControl( _In_ CDXUTControl* pControl )
 {
     HRESULT hr = S_OK;
 
@@ -2118,299 +1497,151 @@ HRESULT CDXUTDialog::AddControl( CDXUTControl* pControl )
         return DXTRACE_ERR( L"CDXUTDialog::InitControl", hr );
 
     // Add to the list
-    hr = m_Controls.Add( pControl );
-    if( FAILED( hr ) )
-    {
-        return DXTRACE_ERR( L"CGrowableArray::Add", hr );
-    }
+    m_Controls.push_back( pControl );
 
     return S_OK;
 }
 
 
 //--------------------------------------------------------------------------------------
-CDXUTControl* CDXUTDialog::GetControl( int ID )
+CDXUTControl* CDXUTDialog::GetControl( _In_ int ID ) const
 {
     // Try to find the control with the given ID
-    for( int i = 0; i < m_Controls.GetSize(); i++ )
+    for( auto it = m_Controls.cbegin(); it != m_Controls.cend(); ++it )
     {
-        CDXUTControl* pControl = m_Controls.GetAt( i );
-
-        if( pControl->GetID() == ID )
+        if( (*it)->GetID() == ID )
         {
-            return pControl;
+            return *it;
         }
     }
 
     // Not found
-    return NULL;
+    return nullptr;
 }
 
 
-
 //--------------------------------------------------------------------------------------
-CDXUTControl* CDXUTDialog::GetControl( int ID, UINT nControlType )
+CDXUTControl* CDXUTDialog::GetControl( _In_  int ID, _In_  UINT nControlType ) const
 {
     // Try to find the control with the given ID
-    for( int i = 0; i < m_Controls.GetSize(); i++ )
-    {
-        CDXUTControl* pControl = m_Controls.GetAt( i );
-
-        if( pControl->GetID() == ID && pControl->GetType() == nControlType )
-        {
-            return pControl;
-        }
-    }
-
-    // Not found
-    return NULL;
-}
-
-
-
-//--------------------------------------------------------------------------------------
-CDXUTControl* CDXUTDialog::GetNextControl( CDXUTControl* pControl )
-{
-    int index = pControl->m_Index + 1;
-
-    CDXUTDialog* pDialog = pControl->m_pDialog;
-
-    // Cycle through dialogs in the loop to find the next control. Note
-    // that if only one control exists in all looped dialogs it will
-    // be the returned 'next' control.
-    while( index >= ( int )pDialog->m_Controls.GetSize() )
-    {
-        pDialog = pDialog->m_pNextDialog;
-        index = 0;
-    }
-
-    return pDialog->m_Controls.GetAt( index );
-}
-
-//--------------------------------------------------------------------------------------
-CDXUTControl* CDXUTDialog::GetPrevControl( CDXUTControl* pControl )
-{
-    int index = pControl->m_Index - 1;
-
-    CDXUTDialog* pDialog = pControl->m_pDialog;
-
-    // Cycle through dialogs in the loop to find the next control. Note
-    // that if only one control exists in all looped dialogs it will
-    // be the returned 'previous' control.
-    while( index < 0 )
-    {
-        pDialog = pDialog->m_pPrevDialog;
-        if( pDialog == NULL )
-            pDialog = pControl->m_pDialog;
-
-        index = pDialog->m_Controls.GetSize() - 1;
-    }
-
-    return pDialog->m_Controls.GetAt( index );
-}
-
-
-//--------------------------------------------------------------------------------------
-void CDXUTDialog::ClearRadioButtonGroup( UINT nButtonGroup )
-{
-    // Find all radio buttons with the given group number
-    for( int i = 0; i < m_Controls.GetSize(); i++ )
-    {
-        CDXUTControl* pControl = m_Controls.GetAt( i );
-
-        if( pControl->GetType() == DXUT_CONTROL_RADIOBUTTON )
-        {
-            CDXUTRadioButton* pRadioButton = ( CDXUTRadioButton* )pControl;
-
-            if( pRadioButton->GetButtonGroup() == nButtonGroup )
-                pRadioButton->SetChecked( false, false );
-        }
-    }
-}
-
-
-
-//--------------------------------------------------------------------------------------
-void CDXUTDialog::ClearComboBox( int ID )
-{
-    CDXUTComboBox* pComboBox = GetComboBox( ID );
-    if( pComboBox == NULL )
-        return;
-
-    pComboBox->RemoveAllItems();
-}
-
-
-
-
-//--------------------------------------------------------------------------------------
-void CDXUTDialog::RequestFocus( CDXUTControl* pControl )
-{
-    if( s_pControlFocus == pControl )
-        return;
-
-    if( !pControl->CanHaveFocus() )
-        return;
-
-    if( s_pControlFocus )
-        s_pControlFocus->OnFocusOut();
-
-    pControl->OnFocusIn();
-    s_pControlFocus = pControl;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::DrawRect( RECT* pRect, D3DCOLOR color )
-{
-    if( m_pManager->GetD3D9Device() )
-        return DrawRect9( pRect, color );
-    return E_FAIL;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::DrawRect9( RECT* pRect, D3DCOLOR color )
-{
-    RECT rcScreen = *pRect;
-    OffsetRect( &rcScreen, m_x, m_y );
-
-    // If caption is enabled, offset the Y position by its height.
-    if( m_bCaption )
-        OffsetRect( &rcScreen, 0, m_nCaptionHeight );
-
-    DXUT_SCREEN_VERTEX vertices[4] =
-    {
-        ( float )rcScreen.left - 0.5f,  ( float )rcScreen.top - 0.5f,    0.5f, 1.0f, color, 0, 0,
-        ( float )rcScreen.right - 0.5f, ( float )rcScreen.top - 0.5f,    0.5f, 1.0f, color, 0, 0,
-        ( float )rcScreen.right - 0.5f, ( float )rcScreen.bottom - 0.5f, 0.5f, 1.0f, color, 0, 0,
-        ( float )rcScreen.left - 0.5f,  ( float )rcScreen.bottom - 0.5f, 0.5f, 1.0f, color, 0, 0,
-    };
-
-    IDirect3DDevice9* pd3dDevice = m_pManager->GetD3D9Device();
-
-    // Since we're doing our own drawing here we need to flush the sprites
-    m_pManager->m_pSprite->Flush();
-    IDirect3DVertexDeclaration9* pDecl = NULL;
-    pd3dDevice->GetVertexDeclaration( &pDecl );  // Preserve the sprite's current vertex decl
-    pd3dDevice->SetFVF( DXUT_SCREEN_VERTEX::FVF );
-
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG2 );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG2 );
-
-    pd3dDevice->DrawPrimitiveUP( D3DPT_TRIANGLEFAN, 2, vertices, sizeof( DXUT_SCREEN_VERTEX ) );
-
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_MODULATE );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE );
-
-    // Restore the vertex decl
-    pd3dDevice->SetVertexDeclaration( pDecl );
-    pDecl->Release();
+    for( auto it = m_Controls.cbegin(); it != m_Controls.cend(); ++it )
+    {
+        if( (*it)->GetID() == ID && (*it)->GetType() == nControlType )
+        {
+            return *it;
+        }
+    }
 
-    return S_OK;
+    // Not found
+    return nullptr;
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::DrawPolyLine( POINT* apPoints, UINT nNumPoints, D3DCOLOR color )
+CDXUTControl* CDXUTDialog::GetNextControl( _In_ CDXUTControl* pControl )
 {
-    DXUT_SCREEN_VERTEX* vertices = new DXUT_SCREEN_VERTEX[ nNumPoints ];
-    if( vertices == NULL )
-        return E_OUTOFMEMORY;
+    int index = pControl->m_Index + 1;
 
-    DXUT_SCREEN_VERTEX* pVertex = vertices;
-    POINT* pt = apPoints;
-    for( UINT i = 0; i < nNumPoints; i++ )
-    {
-        pVertex->x = m_x + ( float )pt->x;
-        pVertex->y = m_y + ( float )pt->y;
-        pVertex->z = 0.5f;
-        pVertex->h = 1.0f;
-        pVertex->color = color;
-        pVertex->tu = 0.0f;
-        pVertex->tv = 0.0f;
+    auto pDialog = pControl->m_pDialog;
 
-        pVertex++;
-        pt++;
+    // Cycle through dialogs in the loop to find the next control. Note
+    // that if only one control exists in all looped dialogs it will
+    // be the returned 'next' control.
+    while( index >= ( int )pDialog->m_Controls.size() )
+    {
+        pDialog = pDialog->m_pNextDialog;
+        index = 0;
     }
 
-    IDirect3DDevice9* pd3dDevice = m_pManager->GetD3D9Device();
+    return pDialog->m_Controls[ index ];
+}
 
-    // Since we're doing our own drawing here we need to flush the sprites
-    m_pManager->m_pSprite->Flush();
-    IDirect3DVertexDeclaration9* pDecl = NULL;
-    pd3dDevice->GetVertexDeclaration( &pDecl );  // Preserve the sprite's current vertex decl
-    pd3dDevice->SetFVF( DXUT_SCREEN_VERTEX::FVF );
 
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG2 );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG2 );
+//--------------------------------------------------------------------------------------
+CDXUTControl* CDXUTDialog::GetPrevControl( _In_ CDXUTControl* pControl )
+{
+    int index = pControl->m_Index - 1;
 
-    pd3dDevice->DrawPrimitiveUP( D3DPT_LINESTRIP, nNumPoints - 1, vertices, sizeof( DXUT_SCREEN_VERTEX ) );
+    auto pDialog = pControl->m_pDialog;
 
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_MODULATE );
-    pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE );
+    // Cycle through dialogs in the loop to find the next control. Note
+    // that if only one control exists in all looped dialogs it will
+    // be the returned 'previous' control.
+    while( index < 0 )
+    {
+        pDialog = pDialog->m_pPrevDialog;
+        if( !pDialog )
+            pDialog = pControl->m_pDialog;
 
-    // Restore the vertex decl
-    pd3dDevice->SetVertexDeclaration( pDecl );
-    pDecl->Release();
+        index = int( pDialog->m_Controls.size() ) - 1;
+    }
 
-    SAFE_DELETE_ARRAY( vertices );
-    return S_OK;
+    return pDialog->m_Controls[ index ];
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::DrawSprite( CDXUTElement* pElement, RECT* prcDest, float fDepth )
+void CDXUTDialog::ClearRadioButtonGroup( _In_ UINT nButtonGroup )
 {
-    if( m_pManager->GetD3D9Device() )
-        return DrawSprite9( pElement, prcDest );
-    else
-        return DrawSprite11( pElement, prcDest, fDepth );
+    // Find all radio buttons with the given group number
+    for( auto it = m_Controls.cbegin(); it != m_Controls.cend(); ++it )
+    {
+        if( (*it)->GetType() == DXUT_CONTROL_RADIOBUTTON )
+        {
+            auto pRadioButton = ( CDXUTRadioButton* )*it;
+
+            if( pRadioButton->GetButtonGroup() == nButtonGroup )
+                pRadioButton->SetChecked( false, false );
+        }
+    }
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::DrawSprite9( CDXUTElement* pElement, RECT* prcDest )
+void CDXUTDialog::ClearComboBox( _In_ int ID )
 {
-    // No need to draw fully transparent layers
-    if( pElement->TextureColor.Current.a == 0 )
-        return S_OK;
-
-    RECT rcTexture = pElement->rcTexture;
-
-    RECT rcScreen = *prcDest;
-    OffsetRect( &rcScreen, m_x, m_y );
+    auto pComboBox = GetComboBox( ID );
+    if( !pComboBox )
+        return;
 
-    // If caption is enabled, offset the Y position by its height.
-    if( m_bCaption )
-        OffsetRect( &rcScreen, 0, m_nCaptionHeight );
+    pComboBox->RemoveAllItems();
+}
 
-    DXUTTextureNode* pTextureNode = GetTexture( pElement->iTexture );
-    if( pTextureNode == NULL )
-        return E_FAIL;
 
-    float fScaleX = ( float )RectWidth( rcScreen ) / RectWidth( rcTexture );
-    float fScaleY = ( float )RectHeight( rcScreen ) / RectHeight( rcTexture );
+//--------------------------------------------------------------------------------------
+void CDXUTDialog::RequestFocus( _In_ CDXUTControl* pControl )
+{
+    if( s_pControlFocus == pControl )
+        return;
 
-    D3DXMATRIXA16 matTransform;
-    D3DXMatrixScaling( &matTransform, fScaleX, fScaleY, 1.0f );
+    if( !pControl->CanHaveFocus() )
+        return;
 
-    m_pManager->m_pSprite->SetTransform( &matTransform );
+    if( s_pControlFocus )
+        s_pControlFocus->OnFocusOut();
 
-    D3DXVECTOR3 vPos( ( float )rcScreen.left, ( float )rcScreen.top, 0.0f );
+    pControl->OnFocusIn();
+    s_pControlFocus = pControl;
+}
 
-    vPos.x /= fScaleX;
-    vPos.y /= fScaleY;
 
-    return m_pManager->m_pSprite->Draw( pTextureNode->pTexture9, &rcTexture, NULL, &vPos,
-                                        pElement->TextureColor.Current );
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+HRESULT CDXUTDialog::DrawRect( const RECT* pRect, DWORD color )
+{
+    UNREFERENCED_PARAMETER(pRect);
+    UNREFERENCED_PARAMETER(color);
+    // TODO -
+    return E_FAIL;
 }
 
+
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::DrawSprite11( CDXUTElement* pElement, RECT* prcDest, float fDepth )
+_Use_decl_annotations_
+HRESULT CDXUTDialog::DrawSprite( CDXUTElement* pElement, const RECT* prcDest, float fDepth )
 {
     // No need to draw fully transparent layers
-    if( pElement->TextureColor.Current.a == 0 )
+    if( pElement->TextureColor.Current.w == 0 )
         return S_OK;
 
     RECT rcTexture = pElement->rcTexture;
@@ -2422,8 +1653,8 @@ HRESULT CDXUTDialog::DrawSprite11( CDXUTElement* pElement, RECT* prcDest, float
     if( m_bCaption )
         OffsetRect( &rcScreen, 0, m_nCaptionHeight );
 
-    DXUTTextureNode* pTextureNode = GetTexture( pElement->iTexture );
-    if( pTextureNode == NULL )
+    auto pTextureNode = GetTexture( pElement->iTexture );
+    if( !pTextureNode )
         return E_FAIL;
 
     float fBBWidth = ( float )m_pManager->m_nBackBufferWidth;
@@ -2440,46 +1671,46 @@ HRESULT CDXUTDialog::DrawSprite11( CDXUTElement* pElement, RECT* prcDest, float
     fRectTop = fRectTop * 2.0f - 1.0f;
     fRectRight = fRectRight * 2.0f - 1.0f;
     fRectBottom = fRectBottom * 2.0f - 1.0f;
-    
+
     float fTexLeft = rcTexture.left / fTexWidth;
     float fTexTop = rcTexture.top / fTexHeight;
     float fTexRight = rcTexture.right / fTexWidth;
     float fTexBottom = rcTexture.bottom / fTexHeight;
 
     // Add 6 sprite vertices
-    DXUTSpriteVertex SpriteVertex;
+    DXUTSpriteVertex SpriteVertex = {};
 
     // tri1
-    SpriteVertex.vPos = D3DXVECTOR3( fRectLeft, fRectTop, fDepth );
-    SpriteVertex.vTex = D3DXVECTOR2( fTexLeft, fTexTop );
+    SpriteVertex.vPos = XMFLOAT3( fRectLeft, fRectTop, fDepth );
+    SpriteVertex.vTex = XMFLOAT2( fTexLeft, fTexTop );
     SpriteVertex.vColor = pElement->TextureColor.Current;
-    m_pManager->m_SpriteVertices.Add( SpriteVertex );
+    m_pManager->m_SpriteVertices.push_back( SpriteVertex );
 
-    SpriteVertex.vPos = D3DXVECTOR3( fRectRight, fRectTop, fDepth );
-    SpriteVertex.vTex = D3DXVECTOR2( fTexRight, fTexTop );
+    SpriteVertex.vPos = XMFLOAT3( fRectRight, fRectTop, fDepth );
+    SpriteVertex.vTex = XMFLOAT2( fTexRight, fTexTop );
     SpriteVertex.vColor = pElement->TextureColor.Current;
-    m_pManager->m_SpriteVertices.Add( SpriteVertex );
+    m_pManager->m_SpriteVertices.push_back( SpriteVertex );
 
-    SpriteVertex.vPos = D3DXVECTOR3( fRectLeft, fRectBottom, fDepth );
-    SpriteVertex.vTex = D3DXVECTOR2( fTexLeft, fTexBottom );
+    SpriteVertex.vPos = XMFLOAT3( fRectLeft, fRectBottom, fDepth );
+    SpriteVertex.vTex = XMFLOAT2( fTexLeft, fTexBottom );
     SpriteVertex.vColor = pElement->TextureColor.Current;
-    m_pManager->m_SpriteVertices.Add( SpriteVertex );
+    m_pManager->m_SpriteVertices.push_back( SpriteVertex );
 
     // tri2
-    SpriteVertex.vPos = D3DXVECTOR3( fRectRight, fRectTop, fDepth );
-    SpriteVertex.vTex = D3DXVECTOR2( fTexRight, fTexTop );
+    SpriteVertex.vPos = XMFLOAT3( fRectRight, fRectTop, fDepth );
+    SpriteVertex.vTex = XMFLOAT2( fTexRight, fTexTop );
     SpriteVertex.vColor = pElement->TextureColor.Current;
-    m_pManager->m_SpriteVertices.Add( SpriteVertex );
+    m_pManager->m_SpriteVertices.push_back( SpriteVertex );
 
-    SpriteVertex.vPos = D3DXVECTOR3( fRectRight, fRectBottom, fDepth );
-    SpriteVertex.vTex = D3DXVECTOR2( fTexRight, fTexBottom );
+    SpriteVertex.vPos = XMFLOAT3( fRectRight, fRectBottom, fDepth );
+    SpriteVertex.vTex = XMFLOAT2( fTexRight, fTexBottom );
     SpriteVertex.vColor = pElement->TextureColor.Current;
-    m_pManager->m_SpriteVertices.Add( SpriteVertex );
+    m_pManager->m_SpriteVertices.push_back( SpriteVertex );
 
-    SpriteVertex.vPos = D3DXVECTOR3( fRectLeft, fRectBottom, fDepth );
-    SpriteVertex.vTex = D3DXVECTOR2( fTexLeft, fTexBottom );
+    SpriteVertex.vPos = XMFLOAT3( fRectLeft, fRectBottom, fDepth );
+    SpriteVertex.vTex = XMFLOAT2( fTexLeft, fTexBottom );
     SpriteVertex.vColor = pElement->TextureColor.Current;
-    m_pManager->m_SpriteVertices.Add( SpriteVertex );
+    m_pManager->m_SpriteVertices.push_back( SpriteVertex );
 
     // Why are we drawing the sprite every time?  This is very inefficient, but the sprite workaround doesn't have support for sorting now, so we have to
     // draw a sprite every time to keep the order correct between sprites and text.
@@ -2490,1003 +1721,1155 @@ HRESULT CDXUTDialog::DrawSprite11( CDXUTElement* pElement, RECT* prcDest, float
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::CalcTextRect( LPCWSTR strText, CDXUTElement* pElement, RECT* prcDest, int nCount )
+_Use_decl_annotations_
+HRESULT CDXUTDialog::CalcTextRect( LPCWSTR strText, CDXUTElement* pElement, const RECT* prcDest, int nCount )
 {
-    HRESULT hr = S_OK;
-
-    DXUTFontNode* pFontNode = GetFont( pElement->iFont );
-    if( pFontNode == NULL )
+    auto pFontNode = GetFont( pElement->iFont );
+    if( !pFontNode )
         return E_FAIL;
 
-    DWORD dwTextFormat = pElement->dwTextFormat | DT_CALCRECT;
-    // Since we are only computing the rectangle, we don't need a sprite.
-    if( pFontNode->pFont9 )
+    UNREFERENCED_PARAMETER(strText);
+    UNREFERENCED_PARAMETER(prcDest);
+    UNREFERENCED_PARAMETER(nCount);
+    // TODO -
+
+    return S_OK;
+}
+
+
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+HRESULT CDXUTDialog::DrawText( LPCWSTR strText, CDXUTElement* pElement, const RECT* prcDest, bool bShadow, bool bCenter   )
+{
+    // No need to draw fully transparent layers
+    if( pElement->FontColor.Current.w == 0 )
+        return S_OK;
+
+    RECT rcScreen = *prcDest;
+    OffsetRect( &rcScreen, m_x, m_y);
+
+    // If caption is enabled, offset the Y position by its height.
+    if( m_bCaption )
+        OffsetRect( &rcScreen, 0, m_nCaptionHeight );
+
+    float fBBWidth = ( float )m_pManager->m_nBackBufferWidth;
+    float fBBHeight = ( float )m_pManager->m_nBackBufferHeight;
+
+    auto pd3dDevice = m_pManager->GetD3D11Device();
+    auto pd3d11DeviceContext =  m_pManager->GetD3D11DeviceContext();
+
+    if( bShadow )
     {
-        hr = pFontNode->pFont9->DrawText( NULL, strText, nCount, prcDest, dwTextFormat, pElement->FontColor.Current );
-        if( FAILED( hr ) )
-            return hr;
+        RECT rcShadow = rcScreen;
+        OffsetRect( &rcShadow, 1, 1 );
+
+        XMFLOAT4 vShadowColor( 0,0,0, 1.0f );
+        DrawText11DXUT( pd3dDevice, pd3d11DeviceContext,
+                 strText, rcShadow, vShadowColor,
+                 fBBWidth, fBBHeight, bCenter );
+
     }
 
+    XMFLOAT4 vFontColor( pElement->FontColor.Current.x, pElement->FontColor.Current.y, pElement->FontColor.Current.z, 1.0f );
+    DrawText11DXUT( pd3dDevice, pd3d11DeviceContext,
+             strText, rcScreen, vFontColor,
+             fBBWidth, fBBHeight, bCenter );
+
     return S_OK;
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::DrawText( LPCWSTR strText, CDXUTElement* pElement, RECT* prcDest, bool bShadow, int nCount, bool bCenter   )
+_Use_decl_annotations_
+void CDXUTDialog::SetBackgroundColors( DWORD colorTopLeft, DWORD colorTopRight, DWORD colorBottomLeft,
+                                       DWORD colorBottomRight )
+{
+    m_colorTopLeft = colorTopLeft;
+    m_colorTopRight = colorTopRight;
+    m_colorBottomLeft = colorBottomLeft;
+    m_colorBottomRight = colorBottomRight;
+}
+
+
+//--------------------------------------------------------------------------------------
+void CDXUTDialog::SetNextDialog( _In_ CDXUTDialog* pNextDialog )
+{
+    if( !pNextDialog )
+        pNextDialog = this;
+
+    m_pNextDialog = pNextDialog;
+    if( pNextDialog )
+        m_pNextDialog->m_pPrevDialog = this;
+}
+
+
+//--------------------------------------------------------------------------------------
+void CDXUTDialog::ClearFocus()
+{
+    if( s_pControlFocus )
+    {
+        s_pControlFocus->OnFocusOut();
+        s_pControlFocus = nullptr;
+    }
+
+    ReleaseCapture();
+}
+
+
+//--------------------------------------------------------------------------------------
+void CDXUTDialog::FocusDefaultControl()
+{
+    // Check for default control in this dialog
+    for( auto it = m_Controls.cbegin(); it != m_Controls.cend(); ++it )
+    {
+        if( (*it)->m_bIsDefault )
+        {
+            // Remove focus from the current control
+            ClearFocus();
+
+            // Give focus to the default control
+            s_pControlFocus = *it;
+            s_pControlFocus->OnFocusIn();
+            return;
+        }
+    }
+}
+
+
+//--------------------------------------------------------------------------------------
+bool CDXUTDialog::OnCycleFocus( _In_ bool bForward )
 {
-    if( m_pManager->GetD3D9Device() )
-        return DrawText9( strText, pElement, prcDest, bShadow, nCount );
+    CDXUTControl* pControl = nullptr;
+    CDXUTDialog* pDialog = nullptr; // pDialog and pLastDialog are used to track wrapping of
+    CDXUTDialog* pLastDialog;    // focus from first control to last or vice versa.
+
+    if( !s_pControlFocus )
+    {
+        // If s_pControlFocus is nullptr, we focus the first control of first dialog in
+        // the case that bForward is true, and focus the last control of last dialog when
+        // bForward is false.
+        //
+        if( bForward )
+        {
+            // Search for the first control from the start of the dialog
+            // array.
+            for( auto it = m_pManager->m_Dialogs.cbegin(); it != m_pManager->m_Dialogs.cend(); ++it )
+            {
+                pDialog = pLastDialog = *it;
+                if( pDialog && !pDialog->m_Controls.empty() )
+                {
+                    pControl = pDialog->m_Controls[ 0 ];
+                    break;
+                }
+            }
+
+            if( !pDialog || !pControl )
+            {
+                // No dialog has been registered yet or no controls have been
+                // added to the dialogs. Cannot proceed.
+                return true;
+            }
+        }
+        else
+        {
+            // Search for the first control from the end of the dialog
+            // array.
+            for( auto it = m_pManager->m_Dialogs.crbegin(); it != m_pManager->m_Dialogs.crend(); ++it )
+            {
+                pDialog = pLastDialog = *it;
+                if( pDialog && !pDialog->m_Controls.empty() )
+                {
+                    pControl = pDialog->m_Controls[ pDialog->m_Controls.size() - 1 ];
+                    break;
+                }
+            }
+
+            if( !pDialog || !pControl )
+            {
+                // No dialog has been registered yet or no controls have been
+                // added to the dialogs. Cannot proceed.
+                return true;
+            }
+        }
+    }
+    else if( s_pControlFocus->m_pDialog != this )
+    {
+        // If a control belonging to another dialog has focus, let that other
+        // dialog handle this event by returning false.
+        //
+        return false;
+    }
     else
-        return DrawText11( m_pManager->GetD3D11Device(), m_pManager->GetD3D11DeviceContext(), strText, pElement, prcDest, bShadow, nCount, bCenter );
+    {
+        // Focused control belongs to this dialog. Cycle to the
+        // next/previous control.
+        assert( pControl != 0 );
+        _Analysis_assume_( pControl != 0 );
+        pLastDialog = s_pControlFocus->m_pDialog;
+        pControl = ( bForward ) ? GetNextControl( s_pControlFocus ) : GetPrevControl( s_pControlFocus );
+        pDialog = pControl->m_pDialog;
+    }
+
+    assert( pControl != 0 );
+    _Analysis_assume_( pControl != 0 );
+
+    for( int i = 0; i < 0xffff; i++ )
+    {
+        // If we just wrapped from last control to first or vice versa,
+        // set the focused control to nullptr. This state, where no control
+        // has focus, allows the camera to work.
+        int nLastDialogIndex = -1;
+        auto fit = std::find( m_pManager->m_Dialogs.cbegin(), m_pManager->m_Dialogs.cend(), pLastDialog );
+        if ( fit != m_pManager->m_Dialogs.cend() )
+        {
+            nLastDialogIndex = int( fit - m_pManager->m_Dialogs.begin() );
+        }
+
+        int nDialogIndex = -1;
+        fit = std::find( m_pManager->m_Dialogs.cbegin(), m_pManager->m_Dialogs.cend(), pDialog );
+        if ( fit != m_pManager->m_Dialogs.cend() )
+        {
+            nDialogIndex = int( fit - m_pManager->m_Dialogs.begin() );
+        }
+
+        if( ( !bForward && nLastDialogIndex < nDialogIndex ) ||
+            ( bForward && nDialogIndex < nLastDialogIndex ) )
+        {
+            if( s_pControlFocus )
+                s_pControlFocus->OnFocusOut();
+            s_pControlFocus = nullptr;
+            return true;
+        }
+
+        // If we've gone in a full circle then focus doesn't change
+        if( pControl == s_pControlFocus )
+            return true;
+
+        // If the dialog accepts keybord input and the control can have focus then
+        // move focus
+        if( pControl->m_pDialog->m_bKeyboardInput && pControl->CanHaveFocus() )
+        {
+            if( s_pControlFocus )
+                s_pControlFocus->OnFocusOut();
+            s_pControlFocus = pControl;
+            if( s_pControlFocus )
+            s_pControlFocus->OnFocusIn();
+            return true;
+        }
+
+        pLastDialog = pDialog;
+        pControl = ( bForward ) ? GetNextControl( pControl ) : GetPrevControl( pControl );
+        pDialog = pControl->m_pDialog;
+    }
+
+    // If we reached this point, the chain of dialogs didn't form a complete loop
+    DXTRACE_ERR( L"CDXUTDialog: Multiple dialogs are improperly chained together", E_FAIL );
+    return false;
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::DrawText9( LPCWSTR strText, CDXUTElement* pElement, RECT* prcDest, bool bShadow, int nCount )
+void CDXUTDialog::InitDefaultElements()
 {
-    HRESULT hr = S_OK;
+    SetFont( 0, L"Arial", 14, FW_NORMAL );
+
+    CDXUTElement Element;
+    RECT rcTexture;
 
-    // No need to draw fully transparent layers
-    if( pElement->FontColor.Current.a == 0 )
-        return S_OK;
+    //-------------------------------------
+    // Element for the caption
+    //-------------------------------------
+    m_CapElement.SetFont( 0 );
+    SetRect( &rcTexture, 17, 269, 241, 287 );
+    m_CapElement.SetTexture( 0, &rcTexture );
+    m_CapElement.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 255, 255, 255, 255 );
+    m_CapElement.FontColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 255, 255, 255, 255 );
+    m_CapElement.SetFont( 0, D3DCOLOR_ARGB( 255, 255, 255, 255 ), DT_LEFT | DT_VCENTER );
+    // Pre-blend as we don't need to transition the state
+    m_CapElement.TextureColor.Blend( DXUT_STATE_NORMAL, 10.0f );
+    m_CapElement.FontColor.Blend( DXUT_STATE_NORMAL, 10.0f );
 
-    RECT rcScreen = *prcDest;
-    OffsetRect( &rcScreen, m_x, m_y );
+    //-------------------------------------
+    // CDXUTStatic
+    //-------------------------------------
+    Element.SetFont( 0 );
+    Element.FontColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 200, 200, 200, 200 );
 
-    // If caption is enabled, offset the Y position by its height.
-    if( m_bCaption )
-        OffsetRect( &rcScreen, 0, m_nCaptionHeight );
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_STATIC, 0, &Element );
 
-    D3DXMATRIX matTransform;
-    D3DXMatrixIdentity( &matTransform );
-    m_pManager->m_pSprite->SetTransform( &matTransform );
 
-    DXUTFontNode* pFontNode = GetFont( pElement->iFont );
+    //-------------------------------------
+    // CDXUTButton - Button
+    //-------------------------------------
+    SetRect( &rcTexture, 0, 0, 136, 54 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.SetFont( 0 );
+    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 255, 255, 255 );
+    Element.TextureColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 200, 255, 255, 255 );
+    Element.FontColor.States[ DXUT_STATE_MOUSEOVER ] = D3DCOLOR_ARGB( 255, 0, 0, 0 );
 
-    if( bShadow )
-    {
-        RECT rcShadow = rcScreen;
-        OffsetRect( &rcShadow, 1, 1 );
-        hr = pFontNode->pFont9->DrawText( m_pManager->m_pSprite, strText, nCount, &rcShadow, pElement->dwTextFormat,
-                                          D3DCOLOR_ARGB( DWORD( pElement->FontColor.Current.a * 255 ), 0, 0, 0 ) );
-        if( FAILED( hr ) )
-            return hr;
-    }
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_BUTTON, 0, &Element );
 
-    hr = pFontNode->pFont9->DrawText( m_pManager->m_pSprite, strText, nCount, &rcScreen, pElement->dwTextFormat,
-                                      pElement->FontColor.Current );
-    if( FAILED( hr ) )
-        return hr;
 
-    return S_OK;
-}
+    //-------------------------------------
+    // CDXUTButton - Fill layer
+    //-------------------------------------
+    SetRect( &rcTexture, 136, 0, 252, 54 );
+    Element.SetTexture( 0, &rcTexture, D3DCOLOR_ARGB( 0, 255, 255, 255 ) );
+    Element.TextureColor.States[ DXUT_STATE_MOUSEOVER ] = D3DCOLOR_ARGB( 160, 255, 255, 255 );
+    Element.TextureColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 60, 0, 0, 0 );
+    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 30, 255, 255, 255 );
 
-ID3D11Buffer* g_pFontBuffer11 = NULL;
-UINT g_FontBufferBytes11 = 0;
-CGrowableArray<DXUTSpriteVertex> g_FontVertices;
-ID3D11ShaderResourceView* g_pFont11 = NULL;
-ID3D11InputLayout* g_pInputLayout11 = NULL;
-HRESULT InitFont11( ID3D11Device* pd3d11Device, ID3D11InputLayout* pInputLayout )
-{
-    HRESULT hr = S_OK;
-    WCHAR str[MAX_PATH];
-    V_RETURN( DXUTFindDXSDKMediaFileCch( str, MAX_PATH, L"UI\\Font.dds" ) );
-    
-    if (pd3d11Device->GetFeatureLevel() < D3D_FEATURE_LEVEL_10_0 ) {
-
-        D3DX11_IMAGE_INFO dii;
-        D3DX11GetImageInfoFromFile( str, NULL, &dii, NULL );
-
-        D3DX11_IMAGE_LOAD_INFO dili;
-        dili.BindFlags = D3DX11_DEFAULT;
-        dili.CpuAccessFlags = D3DX11_DEFAULT;
-        dili.Depth = D3DX11_DEFAULT;
-        dili.Filter = D3DX11_DEFAULT;
-        dili.FirstMipLevel = 0;
-        dili.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-        dili.Height = D3DX11_DEFAULT;
-        dili.MipFilter = D3DX11_DEFAULT;
-        dili.MipLevels = 1;
-        dili.MiscFlags = D3DX11_DEFAULT;
-        dili.pSrcInfo = &dii;
-        dili.Usage = D3D11_USAGE_DEFAULT ;
-        dili.Width = D3DX11_DEFAULT;
-
-        V_RETURN( D3DX11CreateShaderResourceViewFromFile( pd3d11Device, str, &dili, NULL, &g_pFont11, &hr) );
-    }
-    else
-    {
-        V_RETURN( D3DX11CreateShaderResourceViewFromFile( pd3d11Device, str, NULL, NULL, &g_pFont11, &hr) );
-    }
 
-#if defined(PROFILE) || defined(DEBUG)
-    if (g_pFont11)
-    {
-        ID3D11Resource *pRes = NULL;
-        g_pFont11->GetResource( &pRes );
-        DXUT_SetDebugName( pRes, "DXUT Text11" );
-        SAFE_RELEASE( pRes );
-    }    
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_BUTTON, 1, &Element );
 
-    DXUT_SetDebugName( g_pFont11, "DXUT Text11" );
-#endif
 
-    g_pInputLayout11 = pInputLayout;
-    return hr;
-}
+    //-------------------------------------
+    // CDXUTCheckBox - Box
+    //-------------------------------------
+    SetRect( &rcTexture, 0, 54, 27, 81 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 255, 255, 255 ), DT_LEFT | DT_VCENTER );
+    Element.FontColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 200, 200, 200, 200 );
+    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 255, 255, 255 );
+    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 200, 255, 255, 255 );
+    Element.TextureColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 255, 255, 255, 255 );
 
-void EndFont11()
-{
-    SAFE_RELEASE( g_pFontBuffer11 );
-    g_FontBufferBytes11 = 0;
-    SAFE_RELEASE( g_pFont11 );
-}
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_CHECKBOX, 0, &Element );
 
-void BeginText11()
-{
-    g_FontVertices.Reset();
-}
 
-void DrawText11DXUT( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceContext,
-                 LPCWSTR strText, RECT rcScreen, D3DXCOLOR vFontColor,
-                 float fBBWidth, float fBBHeight, bool bCenter )
-{
-    float fCharTexSizeX = 0.010526315f;
-    //float fGlyphSizeX = 14.0f / fBBWidth;
-    //float fGlyphSizeY = 32.0f / fBBHeight;
-    float fGlyphSizeX = 15.0f / fBBWidth;
-    float fGlyphSizeY = 42.0f / fBBHeight;
+    //-------------------------------------
+    // CDXUTCheckBox - Check
+    //-------------------------------------
+    SetRect( &rcTexture, 27, 54, 54, 81 );
+    Element.SetTexture( 0, &rcTexture );
 
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_CHECKBOX, 1, &Element );
 
-    float fRectLeft = rcScreen.left / fBBWidth;
-    float fRectTop = 1.0f - rcScreen.top / fBBHeight;
 
-    fRectLeft = fRectLeft * 2.0f - 1.0f;
-    fRectTop = fRectTop * 2.0f - 1.0f;
+    //-------------------------------------
+    // CDXUTRadioButton - Box
+    //-------------------------------------
+    SetRect( &rcTexture, 54, 54, 81, 81 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 255, 255, 255 ), DT_LEFT | DT_VCENTER );
+    Element.FontColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 200, 200, 200, 200 );
+    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 255, 255, 255 );
+    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 200, 255, 255, 255 );
+    Element.TextureColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 255, 255, 255, 255 );
 
-    int NumChars = (int)wcslen( strText );
-    if (bCenter) {
-        float fRectRight = rcScreen.right / fBBWidth;
-        fRectRight = fRectRight * 2.0f - 1.0f;
-        float fRectBottom = 1.0f - rcScreen.bottom / fBBHeight;
-        fRectBottom = fRectBottom * 2.0f - 1.0f;
-        float fcenterx = ((fRectRight - fRectLeft) - (float)NumChars*fGlyphSizeX) *0.5f;
-        float fcentery = ((fRectTop - fRectBottom) - (float)1*fGlyphSizeY) *0.5f;
-        fRectLeft += fcenterx ;    
-        fRectTop -= fcentery;
-    }
-    float fOriginalLeft = fRectLeft;
-    float fTexTop = 0.0f;
-    float fTexBottom = 1.0f;
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_RADIOBUTTON, 0, &Element );
 
-    float fDepth = 0.5f;
-    for( int i=0; i<NumChars; i++ )
-    {
-        if( strText[i] == '\n' )
-        {
-            fRectLeft = fOriginalLeft;
-            fRectTop -= fGlyphSizeY;
 
-            continue;
-        }
-        else if( strText[i] < 32 || strText[i] > 126 )
-        {
-            continue;
-        }
+    //-------------------------------------
+    // CDXUTRadioButton - Check
+    //-------------------------------------
+    SetRect( &rcTexture, 81, 54, 108, 81 );
+    Element.SetTexture( 0, &rcTexture );
 
-        // Add 6 sprite vertices
-        DXUTSpriteVertex SpriteVertex;
-        float fRectRight = fRectLeft + fGlyphSizeX;
-        float fRectBottom = fRectTop - fGlyphSizeY;
-        float fTexLeft = ( strText[i] - 32 ) * fCharTexSizeX;
-        float fTexRight = fTexLeft + fCharTexSizeX;
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_RADIOBUTTON, 1, &Element );
 
-        // tri1
-        SpriteVertex.vPos = D3DXVECTOR3( fRectLeft, fRectTop, fDepth );
-        SpriteVertex.vTex = D3DXVECTOR2( fTexLeft, fTexTop );
-        SpriteVertex.vColor = vFontColor;
-        g_FontVertices.Add( SpriteVertex );
 
-        SpriteVertex.vPos = D3DXVECTOR3( fRectRight, fRectTop, fDepth );
-        SpriteVertex.vTex = D3DXVECTOR2( fTexRight, fTexTop );
-        SpriteVertex.vColor = vFontColor;
-        g_FontVertices.Add( SpriteVertex );
+    //-------------------------------------
+    // CDXUTComboBox - Main
+    //-------------------------------------
+    SetRect( &rcTexture, 7, 81, 247, 123 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.SetFont( 0 );
+    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 200, 200, 200 );
+    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 170, 230, 230, 230 );
+    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 70, 200, 200, 200 );
+    Element.FontColor.States[ DXUT_STATE_MOUSEOVER ] = D3DCOLOR_ARGB( 255, 0, 0, 0 );
+    Element.FontColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 255, 0, 0, 0 );
+    Element.FontColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 200, 200, 200, 200 );
 
-        SpriteVertex.vPos = D3DXVECTOR3( fRectLeft, fRectBottom, fDepth );
-        SpriteVertex.vTex = D3DXVECTOR2( fTexLeft, fTexBottom );
-        SpriteVertex.vColor = vFontColor;
-        g_FontVertices.Add( SpriteVertex );
 
-        // tri2
-        SpriteVertex.vPos = D3DXVECTOR3( fRectRight, fRectTop, fDepth );
-        SpriteVertex.vTex = D3DXVECTOR2( fTexRight, fTexTop );
-        SpriteVertex.vColor = vFontColor;
-        g_FontVertices.Add( SpriteVertex );
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_COMBOBOX, 0, &Element );
 
-        SpriteVertex.vPos = D3DXVECTOR3( fRectRight, fRectBottom, fDepth );
-        SpriteVertex.vTex = D3DXVECTOR2( fTexRight, fTexBottom );
-        SpriteVertex.vColor = vFontColor;
-        g_FontVertices.Add( SpriteVertex );
 
-        SpriteVertex.vPos = D3DXVECTOR3( fRectLeft, fRectBottom, fDepth );
-        SpriteVertex.vTex = D3DXVECTOR2( fTexLeft, fTexBottom );
-        SpriteVertex.vColor = vFontColor;
-        g_FontVertices.Add( SpriteVertex );
+    //-------------------------------------
+    // CDXUTComboBox - Button
+    //-------------------------------------
+    SetRect( &rcTexture, 98, 189, 151, 238 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 255, 255, 255 );
+    Element.TextureColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 255, 150, 150, 150 );
+    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 200, 255, 255, 255 );
+    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 70, 255, 255, 255 );
 
-        fRectLeft += fGlyphSizeX;
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_COMBOBOX, 1, &Element );
 
-    }
 
-    // We have to end text after every line so that rendering order between sprites and fonts is preserved
-    EndText11( pd3dDevice, pd3d11DeviceContext );
-}
+    //-------------------------------------
+    // CDXUTComboBox - Dropdown
+    //-------------------------------------
+    SetRect( &rcTexture, 13, 123, 241, 160 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 0, 0, 0 ), DT_LEFT | DT_TOP );
 
-void EndText11( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceContext )
-{
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_COMBOBOX, 2, &Element );
 
-    // ensure our buffer size can hold our sprites
-    UINT FontDataBytes = g_FontVertices.GetSize() * sizeof( DXUTSpriteVertex );
-    if( g_FontBufferBytes11 < FontDataBytes )
-    {
-        SAFE_RELEASE( g_pFontBuffer11 );
-        g_FontBufferBytes11 = FontDataBytes;
 
-        D3D11_BUFFER_DESC BufferDesc;
-        BufferDesc.ByteWidth = g_FontBufferBytes11;
-        BufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-        BufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-        BufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-        BufferDesc.MiscFlags = 0;
+    //-------------------------------------
+    // CDXUTComboBox - Selection
+    //-------------------------------------
+    SetRect( &rcTexture, 12, 163, 239, 183 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 255, 255, 255 ), DT_LEFT | DT_TOP );
 
-        pd3dDevice->CreateBuffer( &BufferDesc, NULL, &g_pFontBuffer11 );
-        DXUT_SetDebugName( g_pFontBuffer11, "DXUT Text11" );
-    }
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_COMBOBOX, 3, &Element );
 
-    // Copy the sprites over
-    D3D11_BOX destRegion;
-    destRegion.left = 0;
-    destRegion.right = FontDataBytes;
-    destRegion.top = 0;
-    destRegion.bottom = 1;
-    destRegion.front = 0;
-    destRegion.back = 1;
-    D3D11_MAPPED_SUBRESOURCE MappedResource;
-    if ( S_OK == pd3d11DeviceContext->Map( g_pFontBuffer11, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ) ) { 
-        CopyMemory( MappedResource.pData, (void*)g_FontVertices.GetData(), FontDataBytes );
-        pd3d11DeviceContext->Unmap(g_pFontBuffer11, 0);
-    }
 
-    ID3D11ShaderResourceView* pOldTexture = NULL;
-    pd3d11DeviceContext->PSGetShaderResources( 0, 1, &pOldTexture );
-    pd3d11DeviceContext->PSSetShaderResources( 0, 1, &g_pFont11 );
+    //-------------------------------------
+    // CDXUTSlider - Track
+    //-------------------------------------
+    SetRect( &rcTexture, 1, 187, 93, 228 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 255, 255, 255 );
+    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 200, 255, 255, 255 );
+    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 70, 255, 255, 255 );
+
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_SLIDER, 0, &Element );
 
-    // Draw
-    UINT Stride = sizeof( DXUTSpriteVertex );
-    UINT Offset = 0;
-    pd3d11DeviceContext->IASetVertexBuffers( 0, 1, &g_pFontBuffer11, &Stride, &Offset );
-    pd3d11DeviceContext->IASetInputLayout( g_pInputLayout11 );
-    pd3d11DeviceContext->IASetPrimitiveTopology( D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST );
-    pd3d11DeviceContext->Draw( g_FontVertices.GetSize(), 0 );
+    //-------------------------------------
+    // CDXUTSlider - Button
+    //-------------------------------------
+    SetRect( &rcTexture, 151, 193, 192, 234 );
+    Element.SetTexture( 0, &rcTexture );
 
-    pd3d11DeviceContext->PSSetShaderResources( 0, 1, &pOldTexture );
-    SAFE_RELEASE( pOldTexture );
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_SLIDER, 1, &Element );
 
-    g_FontVertices.Reset();
-}
+    //-------------------------------------
+    // CDXUTScrollBar - Track
+    //-------------------------------------
+    int nScrollBarStartX = 196;
+    int nScrollBarStartY = 191;
+    SetRect( &rcTexture, nScrollBarStartX + 0, nScrollBarStartY + 21, nScrollBarStartX + 22, nScrollBarStartY + 32 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 255, 200, 200, 200 );
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialog::DrawText11( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceContext,
-                                 LPCWSTR strText, CDXUTElement* pElement, RECT* prcDest, bool bShadow, int nCount, bool bCenter  )
-{
-    //HRESULT hr = S_OK;
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_SCROLLBAR, 0, &Element );
 
-    // No need to draw fully transparent layers
-    if( pElement->FontColor.Current.a == 0 )
-        return S_OK;
+    //-------------------------------------
+    // CDXUTScrollBar - Up Arrow
+    //-------------------------------------
+    SetRect( &rcTexture, nScrollBarStartX + 0, nScrollBarStartY + 1, nScrollBarStartX + 22, nScrollBarStartY + 21 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 255, 200, 200, 200 );
 
-    RECT rcScreen = *prcDest;
-    OffsetRect( &rcScreen, m_x, m_y);
 
-    // If caption is enabled, offset the Y position by its height.
-    if( m_bCaption )
-        OffsetRect( &rcScreen, 0, m_nCaptionHeight );
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_SCROLLBAR, 1, &Element );
 
-    float fBBWidth = ( float )m_pManager->m_nBackBufferWidth;
-    float fBBHeight = ( float )m_pManager->m_nBackBufferHeight;
+    //-------------------------------------
+    // CDXUTScrollBar - Down Arrow
+    //-------------------------------------
+    SetRect( &rcTexture, nScrollBarStartX + 0, nScrollBarStartY + 32, nScrollBarStartX + 22, nScrollBarStartY + 53 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 255, 200, 200, 200 );
 
-    if( bShadow )
-    {
-        RECT rcShadow = rcScreen;
-        OffsetRect( &rcShadow, 1, 1 );
 
-        D3DXCOLOR vShadowColor( 0,0,0, 1.0f );
-        DrawText11DXUT( pd3dDevice, pd3d11DeviceContext,
-                 strText, rcShadow, vShadowColor,
-                 fBBWidth, fBBHeight, bCenter );
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_SCROLLBAR, 2, &Element );
 
-    }
+    //-------------------------------------
+    // CDXUTScrollBar - Button
+    //-------------------------------------
+    SetRect( &rcTexture, 220, 192, 238, 234 );
+    Element.SetTexture( 0, &rcTexture );
 
-    D3DXCOLOR vFontColor( pElement->FontColor.Current.r, pElement->FontColor.Current.g, pElement->FontColor.Current.b, 1.0f );
-    DrawText11DXUT( pd3dDevice, pd3d11DeviceContext,
-             strText, rcScreen, vFontColor,
-             fBBWidth, fBBHeight, bCenter );
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_SCROLLBAR, 3, &Element );
 
-    return S_OK;
-}
 
+    //-------------------------------------
+    // CDXUTEditBox
+    //-------------------------------------
+    // Element assignment:
+    //   0 - text area
+    //   1 - top left border
+    //   2 - top border
+    //   3 - top right border
+    //   4 - left border
+    //   5 - right border
+    //   6 - lower left border
+    //   7 - lower border
+    //   8 - lower right border
 
-//--------------------------------------------------------------------------------------
-void CDXUTDialog::SetBackgroundColors( D3DCOLOR colorTopLeft, D3DCOLOR colorTopRight, D3DCOLOR colorBottomLeft,
-                                       D3DCOLOR colorBottomRight )
-{
-    m_colorTopLeft = colorTopLeft;
-    m_colorTopRight = colorTopRight;
-    m_colorBottomLeft = colorBottomLeft;
-    m_colorBottomRight = colorBottomRight;
-}
+    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 0, 0, 0 ), DT_LEFT | DT_TOP );
 
+    // Assign the style
+    SetRect( &rcTexture, 14, 90, 241, 113 );
+    Element.SetTexture( 0, &rcTexture );
+    SetDefaultElement( DXUT_CONTROL_EDITBOX, 0, &Element );
+    SetRect( &rcTexture, 8, 82, 14, 90 );
+    Element.SetTexture( 0, &rcTexture );
+    SetDefaultElement( DXUT_CONTROL_EDITBOX, 1, &Element );
+    SetRect( &rcTexture, 14, 82, 241, 90 );
+    Element.SetTexture( 0, &rcTexture );
+    SetDefaultElement( DXUT_CONTROL_EDITBOX, 2, &Element );
+    SetRect( &rcTexture, 241, 82, 246, 90 );
+    Element.SetTexture( 0, &rcTexture );
+    SetDefaultElement( DXUT_CONTROL_EDITBOX, 3, &Element );
+    SetRect( &rcTexture, 8, 90, 14, 113 );
+    Element.SetTexture( 0, &rcTexture );
+    SetDefaultElement( DXUT_CONTROL_EDITBOX, 4, &Element );
+    SetRect( &rcTexture, 241, 90, 246, 113 );
+    Element.SetTexture( 0, &rcTexture );
+    SetDefaultElement( DXUT_CONTROL_EDITBOX, 5, &Element );
+    SetRect( &rcTexture, 8, 113, 14, 121 );
+    Element.SetTexture( 0, &rcTexture );
+    SetDefaultElement( DXUT_CONTROL_EDITBOX, 6, &Element );
+    SetRect( &rcTexture, 14, 113, 241, 121 );
+    Element.SetTexture( 0, &rcTexture );
+    SetDefaultElement( DXUT_CONTROL_EDITBOX, 7, &Element );
+    SetRect( &rcTexture, 241, 113, 246, 121 );
+    Element.SetTexture( 0, &rcTexture );
+    SetDefaultElement( DXUT_CONTROL_EDITBOX, 8, &Element );
 
-//--------------------------------------------------------------------------------------
-void CDXUTDialog::SetNextDialog( CDXUTDialog* pNextDialog )
-{
-    if( pNextDialog == NULL )
-        pNextDialog = this;
+    //-------------------------------------
+    // CDXUTListBox - Main
+    //-------------------------------------
+    SetRect( &rcTexture, 13, 123, 241, 160 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 0, 0, 0 ), DT_LEFT | DT_TOP );
 
-    m_pNextDialog = pNextDialog;
-    if( pNextDialog )
-        m_pNextDialog->m_pPrevDialog = this;
-}
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_LISTBOX, 0, &Element );
 
+    //-------------------------------------
+    // CDXUTListBox - Selection
+    //-------------------------------------
 
-//--------------------------------------------------------------------------------------
-void CDXUTDialog::ClearFocus()
-{
-    if( s_pControlFocus )
-    {
-        s_pControlFocus->OnFocusOut();
-        s_pControlFocus = NULL;
-    }
+    SetRect( &rcTexture, 16, 166, 240, 183 );
+    Element.SetTexture( 0, &rcTexture );
+    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 255, 255, 255 ), DT_LEFT | DT_TOP );
 
-    ReleaseCapture();
+    // Assign the Element
+    SetDefaultElement( DXUT_CONTROL_LISTBOX, 1, &Element );
 }
 
 
+//======================================================================================
+// CDXUTDialogResourceManager
+//======================================================================================
+
 //--------------------------------------------------------------------------------------
-void CDXUTDialog::FocusDefaultControl()
+CDXUTDialogResourceManager::CDXUTDialogResourceManager() :
+    m_pVSRenderUI11(nullptr),
+    m_pPSRenderUI11(nullptr),
+    m_pPSRenderUIUntex11(nullptr),
+    m_pDepthStencilStateUI11(nullptr),
+    m_pRasterizerStateUI11(nullptr),
+    m_pBlendStateUI11(nullptr),
+    m_pSamplerStateUI11(nullptr),
+    m_pDepthStencilStateStored11(nullptr),
+    m_pRasterizerStateStored11(nullptr),
+    m_pBlendStateStored11(nullptr),
+    m_pSamplerStateStored11(nullptr),
+    m_pInputLayout11(nullptr),
+    m_pVBScreenQuad11(nullptr),
+    m_pSpriteBuffer11(nullptr),
+    m_SpriteBufferBytes11(0)
 {
-    // Check for default control in this dialog
-    for( int i = 0; i < m_Controls.GetSize(); i++ )
-    {
-        CDXUTControl* pControl = m_Controls.GetAt( i );
-        if( pControl->m_bIsDefault )
-        {
-            // Remove focus from the current control
-            ClearFocus();
-
-            // Give focus to the default control
-            s_pControlFocus = pControl;
-            s_pControlFocus->OnFocusIn();
-            return;
-        }
-    }
 }
 
 
 //--------------------------------------------------------------------------------------
-bool CDXUTDialog::OnCycleFocus( bool bForward )
+CDXUTDialogResourceManager::~CDXUTDialogResourceManager()
 {
-    CDXUTControl* pControl = NULL;
-    CDXUTDialog* pDialog = NULL; // pDialog and pLastDialog are used to track wrapping of
-    CDXUTDialog* pLastDialog;    // focus from first control to last or vice versa.
-
-    if( s_pControlFocus == NULL )
-    {
-        // If s_pControlFocus is NULL, we focus the first control of first dialog in
-        // the case that bForward is true, and focus the last control of last dialog when
-        // bForward is false.
-        //
-        if( bForward )
-        {
-            // Search for the first control from the start of the dialog
-            // array.
-            for( int d = 0; d < m_pManager->m_Dialogs.GetSize(); ++d )
-            {
-                pDialog = pLastDialog = m_pManager->m_Dialogs.GetAt( d );
-                if( pDialog && pDialog->m_Controls.GetSize() > 0 )
-                {
-                    pControl = pDialog->m_Controls.GetAt( 0 );
-                    break;
-                }
-            }
-
-            if( !pDialog || !pControl )
-            {
-                // No dialog has been registered yet or no controls have been
-                // added to the dialogs. Cannot proceed.
-                return true;
-            }
-        }
-        else
-        {
-            // Search for the first control from the end of the dialog
-            // array.
-            for( int d = m_pManager->m_Dialogs.GetSize() - 1; d >= 0; --d )
-            {
-                pDialog = pLastDialog = m_pManager->m_Dialogs.GetAt( d );
-                if( pDialog && pDialog->m_Controls.GetSize() > 0 )
-                {
-                    pControl = pDialog->m_Controls.GetAt( pDialog->m_Controls.GetSize() - 1 );
-                    break;
-                }
-            }
-
-            if( !pDialog || !pControl )
-            {
-                // No dialog has been registered yet or no controls have been
-                // added to the dialogs. Cannot proceed.
-                return true;
-            }
-        }
-    }
-    else if( s_pControlFocus->m_pDialog != this )
-    {
-        // If a control belonging to another dialog has focus, let that other
-        // dialog handle this event by returning false.
-        //
-        return false;
-    }
-    else
+    for( auto it = m_FontCache.begin(); it != m_FontCache.end(); ++it )
     {
-        // Focused control belongs to this dialog. Cycle to the
-        // next/previous control.
-        pLastDialog = s_pControlFocus->m_pDialog;
-        pControl = ( bForward ) ? GetNextControl( s_pControlFocus ) : GetPrevControl( s_pControlFocus );
-        pDialog = pControl->m_pDialog;
+        SAFE_DELETE( *it );
     }
+    m_FontCache.clear();
 
-    for( int i = 0; i < 0xffff; i++ )
+    for( auto it = m_TextureCache.begin(); it != m_TextureCache.end(); ++it )
     {
-        // If we just wrapped from last control to first or vice versa,
-        // set the focused control to NULL. This state, where no control
-        // has focus, allows the camera to work.
-        int nLastDialogIndex = m_pManager->m_Dialogs.IndexOf( pLastDialog );
-        int nDialogIndex = m_pManager->m_Dialogs.IndexOf( pDialog );
-        if( ( !bForward && nLastDialogIndex < nDialogIndex ) ||
-            ( bForward && nDialogIndex < nLastDialogIndex ) )
-        {
-            if( s_pControlFocus )
-                s_pControlFocus->OnFocusOut();
-            s_pControlFocus = NULL;
-            return true;
-        }
-
-        // If we've gone in a full circle then focus doesn't change
-        if( pControl == s_pControlFocus )
-            return true;
-
-        // If the dialog accepts keybord input and the control can have focus then
-        // move focus
-        if( pControl->m_pDialog->m_bKeyboardInput && pControl->CanHaveFocus() )
-        {
-            if( s_pControlFocus )
-                s_pControlFocus->OnFocusOut();
-            s_pControlFocus = pControl;
-            s_pControlFocus->OnFocusIn();
-            return true;
-        }
-
-        pLastDialog = pDialog;
-        pControl = ( bForward ) ? GetNextControl( pControl ) : GetPrevControl( pControl );
-        pDialog = pControl->m_pDialog;
-    }
-
-    // If we reached this point, the chain of dialogs didn't form a complete loop
-    DXTRACE_ERR( L"CDXUTDialog: Multiple dialogs are improperly chained together", E_FAIL );
-    return false;
+        SAFE_DELETE( *it );
+    }
+    m_TextureCache.clear();
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialogResourceManager::CreateFont9( UINT iFont )
+_Use_decl_annotations_
+bool CDXUTDialogResourceManager::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
-    HRESULT hr = S_OK;
+    UNREFERENCED_PARAMETER(hWnd);
+    UNREFERENCED_PARAMETER(uMsg);
+    UNREFERENCED_PARAMETER(wParam);
+    UNREFERENCED_PARAMETER(lParam);
+    return false;
+}
 
-    DXUTFontNode* pFontNode = m_FontCache.GetAt( iFont );
 
-    SAFE_RELEASE( pFontNode->pFont9 );
+_Use_decl_annotations_
+HRESULT CDXUTDialogResourceManager::OnD3D11CreateDevice( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceContext )
+{
+    m_pd3d11Device = pd3dDevice;
+    m_pd3d11DeviceContext = pd3d11DeviceContext;
 
-    V_RETURN( D3DXCreateFont( m_pd3d9Device, pFontNode->nHeight, 0, pFontNode->nWeight, 1, FALSE, DEFAULT_CHARSET,
-                              OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE,
-                              pFontNode->strFace, &pFontNode->pFont9 ) );
+    HRESULT hr = S_OK;
 
-    return S_OK;
-}
+    // Compile Shaders
+    ID3DBlob* pVSBlob = nullptr;
+    ID3DBlob* pPSBlob = nullptr;
+    ID3DBlob* pPSUntexBlob = nullptr;
+    V_RETURN( D3DCompile( g_strUIEffectFile, g_uUIEffectFileSize, "none", nullptr, nullptr, "VS", "vs_4_0_level_9_1",
+         D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY, 0, &pVSBlob, nullptr ) );
+    V_RETURN( D3DCompile( g_strUIEffectFile, g_uUIEffectFileSize, "none", nullptr, nullptr, "PS", "ps_4_0_level_9_1",
+         D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY, 0, &pPSBlob, nullptr ) );
+    V_RETURN( D3DCompile( g_strUIEffectFile, g_uUIEffectFileSize, "none", nullptr, nullptr, "PSUntex", "ps_4_0_level_9_1",
+         D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY, 0, &pPSUntexBlob, nullptr ) );
 
+    // Create Shaders
+    V_RETURN( pd3dDevice->CreateVertexShader( pVSBlob->GetBufferPointer(), pVSBlob->GetBufferSize(), nullptr, &m_pVSRenderUI11 ) );
+    DXUT_SetDebugName( m_pVSRenderUI11, "CDXUTDialogResourceManager" );
 
+    V_RETURN( pd3dDevice->CreatePixelShader( pPSBlob->GetBufferPointer(), pPSBlob->GetBufferSize(), nullptr, &m_pPSRenderUI11 ) );
+    DXUT_SetDebugName( m_pPSRenderUI11, "CDXUTDialogResourceManager" );
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialogResourceManager::CreateFont11( UINT iFont )
-{
-    return S_OK;
-}
+    V_RETURN( pd3dDevice->CreatePixelShader( pPSUntexBlob->GetBufferPointer(), pPSUntexBlob->GetBufferSize(), nullptr, &m_pPSRenderUIUntex11 ) );
+    DXUT_SetDebugName( m_pPSRenderUIUntex11, "CDXUTDialogResourceManager" );
 
+    // States
+    D3D11_DEPTH_STENCIL_DESC DSDesc;
+    ZeroMemory( &DSDesc, sizeof( D3D11_DEPTH_STENCIL_DESC ) );
+    DSDesc.DepthEnable = FALSE;
+    DSDesc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
+    DSDesc.DepthFunc = D3D11_COMPARISON_LESS;
+    DSDesc.StencilEnable = FALSE;
+    V_RETURN( pd3dDevice->CreateDepthStencilState( &DSDesc, &m_pDepthStencilStateUI11 ) );
+    DXUT_SetDebugName( m_pDepthStencilStateUI11, "CDXUTDialogResourceManager" );
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTDialogResourceManager::CreateTexture9( UINT iTexture )
-{
-    HRESULT hr = S_OK;
+    D3D11_RASTERIZER_DESC RSDesc;
+    RSDesc.AntialiasedLineEnable = FALSE;
+    RSDesc.CullMode = D3D11_CULL_BACK;
+    RSDesc.DepthBias = 0;
+    RSDesc.DepthBiasClamp = 0.0f;
+    RSDesc.DepthClipEnable = TRUE;
+    RSDesc.FillMode = D3D11_FILL_SOLID;
+    RSDesc.FrontCounterClockwise = FALSE;
+    RSDesc.MultisampleEnable = TRUE;
+    RSDesc.ScissorEnable = FALSE;
+    RSDesc.SlopeScaledDepthBias = 0.0f;
+    V_RETURN( pd3dDevice->CreateRasterizerState( &RSDesc, &m_pRasterizerStateUI11 ) );
+    DXUT_SetDebugName( m_pRasterizerStateUI11, "CDXUTDialogResourceManager" );
 
-    DXUTTextureNode* pTextureNode = m_TextureCache.GetAt( iTexture );
+    D3D11_BLEND_DESC BSDesc;
+    ZeroMemory( &BSDesc, sizeof( D3D11_BLEND_DESC ) );
 
+    BSDesc.RenderTarget[0].BlendEnable = TRUE;
+    BSDesc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA;
+    BSDesc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA;
+    BSDesc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
+    BSDesc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
+    BSDesc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
+    BSDesc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
+    BSDesc.RenderTarget[0].RenderTargetWriteMask = 0x0F;
 
-    D3DXIMAGE_INFO info;
+    V_RETURN( pd3dDevice->CreateBlendState( &BSDesc, &m_pBlendStateUI11 ) );
+    DXUT_SetDebugName( m_pBlendStateUI11, "CDXUTDialogResourceManager" );
 
-    if( !pTextureNode->bFileSource )
+    D3D11_SAMPLER_DESC SSDesc;
+    ZeroMemory( &SSDesc, sizeof( D3D11_SAMPLER_DESC ) );
+    SSDesc.Filter = D3D11_FILTER_ANISOTROPIC   ;
+    SSDesc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP;
+    SSDesc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP;
+    SSDesc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP;
+    SSDesc.ComparisonFunc = D3D11_COMPARISON_NEVER;
+    SSDesc.MaxAnisotropy = 16;
+    SSDesc.MinLOD = 0;
+    SSDesc.MaxLOD = D3D11_FLOAT32_MAX;
+    if ( pd3dDevice->GetFeatureLevel() < D3D_FEATURE_LEVEL_9_3 )
     {
-        if( pTextureNode->nResourceID == 0xFFFF && pTextureNode->hResourceModule == ( HMODULE )0xFFFF )
-        {
-            hr = DXUTCreateGUITextureFromInternalArray9( m_pd3d9Device, &pTextureNode->pTexture9, &info );
-            if( FAILED( hr ) )
-                return DXTRACE_ERR( L"D3DXCreateTextureFromFileInMemoryEx", hr );
-            DXUT_SetDebugName( pTextureNode->pTexture9, "DXUT GUI Texture" );
-        }
-        else
-        {
-            LPCWSTR pID = pTextureNode->nResourceID ? ( LPCWSTR )( size_t )pTextureNode->nResourceID :
-                pTextureNode->strFilename;
-
-            // Create texture from resource
-            hr = D3DXCreateTextureFromResourceEx( m_pd3d9Device, pTextureNode->hResourceModule, pID, D3DX_DEFAULT,
-                                                  D3DX_DEFAULT,
-                                                  1, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED,
-                                                  D3DX_DEFAULT, D3DX_DEFAULT, 0,
-                                                  &info, NULL, &pTextureNode->pTexture9 );
-            if( FAILED( hr ) )
-                return DXTRACE_ERR( L"D3DXCreateTextureFromResourceEx", hr );
-        }
+        SSDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+        SSDesc.MaxAnisotropy = 0;
     }
-    else
-    {
-        // Make sure there's a texture to create
-        if( pTextureNode->strFilename[0] == 0 )
-            return S_OK;
+    V_RETURN( pd3dDevice->CreateSamplerState( &SSDesc, &m_pSamplerStateUI11 ) );
+    DXUT_SetDebugName( m_pSamplerStateUI11, "CDXUTDialogResourceManager" );
 
-        // Create texture from file
-        hr = D3DXCreateTextureFromFileEx( m_pd3d9Device, pTextureNode->strFilename, D3DX_DEFAULT, D3DX_DEFAULT,
-                                          1, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED,
-                                          D3DX_DEFAULT, D3DX_DEFAULT, 0,
-                                          &info, NULL, &pTextureNode->pTexture9 );
+    // Create the texture objects in the cache arrays.
+    for( size_t i = 0; i < m_TextureCache.size(); i++ )
+    {
+        hr = CreateTexture11( static_cast<UINT>( i ) );
         if( FAILED( hr ) )
-        {
-            return DXTRACE_ERR( L"D3DXCreateTextureFromFileEx", hr );
-        }
+            return hr;
     }
 
-    // Store dimensions
-    pTextureNode->dwWidth = info.Width;
-    pTextureNode->dwHeight = info.Height;
+    // Create input layout
+    const D3D11_INPUT_ELEMENT_DESC layout[] =
+        {
+            { "POSITION",  0, DXGI_FORMAT_R32G32B32_FLOAT,    0, 0,  D3D11_INPUT_PER_VERTEX_DATA, 0 },
+            { "COLOR",     0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+            { "TEXCOORD",  0, DXGI_FORMAT_R32G32_FLOAT,       0, 28, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+        };
+
+    V_RETURN( pd3dDevice->CreateInputLayout( layout, ARRAYSIZE( layout ), pVSBlob->GetBufferPointer(), pVSBlob->GetBufferSize(), &m_pInputLayout11 ) );
+    DXUT_SetDebugName( m_pInputLayout11, "CDXUTDialogResourceManager" );
+
+    // Release the blobs
+    SAFE_RELEASE( pVSBlob );
+    SAFE_RELEASE( pPSBlob );
+    SAFE_RELEASE( pPSUntexBlob );
+
+    // Create a vertex buffer quad for rendering later
+    D3D11_BUFFER_DESC BufDesc;
+    BufDesc.ByteWidth = sizeof( DXUT_SCREEN_VERTEX_10 ) * 4;
+    BufDesc.Usage = D3D11_USAGE_DYNAMIC;
+    BufDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+    BufDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+    BufDesc.MiscFlags = 0;
+    V_RETURN( pd3dDevice->CreateBuffer( &BufDesc, nullptr, &m_pVBScreenQuad11 ) );
+    DXUT_SetDebugName( m_pVBScreenQuad11, "CDXUTDialogResourceManager" );
+
+    // Init the D3D11 font
+    InitFont11( pd3dDevice, m_pInputLayout11 );
 
     return S_OK;
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTDialogResourceManager::CreateTexture11( UINT iTexture )
+_Use_decl_annotations_
+HRESULT CDXUTDialogResourceManager::OnD3D11ResizedSwapChain( ID3D11Device* pd3dDevice,
+                                                             const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc )
 {
+    UNREFERENCED_PARAMETER(pd3dDevice);
+
     HRESULT hr = S_OK;
 
-    DXUTTextureNode* pTextureNode = m_TextureCache.GetAt( iTexture );
+    m_nBackBufferWidth = pBackBufferSurfaceDesc->Width;
+    m_nBackBufferHeight = pBackBufferSurfaceDesc->Height;
 
-    if( !pTextureNode->bFileSource )
-    {
-        if( pTextureNode->nResourceID == 0xFFFF && pTextureNode->hResourceModule == ( HMODULE )0xFFFF )
-        {
-            hr = DXUTCreateGUITextureFromInternalArray11( m_pd3d11Device, &pTextureNode->pTexture11, NULL );
-            if( FAILED( hr ) )
-                return DXTRACE_ERR( L"D3DX11CreateResourceFromFileInMemory", hr );
-            DXUT_SetDebugName( pTextureNode->pTexture11, "DXUT GUI Texture" );
-        }
-        //else
-        //{
-        //    LPCWSTR pID = pTextureNode->nResourceID ? ( LPCWSTR )( size_t )pTextureNode->nResourceID :
-        //        pTextureNode->strFilename;
-
-        //    D3DX10_IMAGE_INFO SrcInfo;
-        //    D3DX10GetImageInfoFromResource( NULL, pID, NULL, &SrcInfo, NULL );
-
-        //    // Create texture from resource
-        //    ID3D10Resource* pRes;
-        //    D3DX10_IMAGE_LOAD_INFO loadInfo;
-        //    loadInfo.Width = D3DX10_DEFAULT;
-        //    loadInfo.Height = D3DX10_DEFAULT;
-        //    loadInfo.Depth = D3DX10_DEFAULT;
-        //    loadInfo.FirstMipLevel = 0;
-        //    loadInfo.MipLevels = 1;
-        //    loadInfo.Usage = D3D10_USAGE_DEFAULT;
-        //    loadInfo.BindFlags = D3D10_BIND_SHADER_RESOURCE;
-        //    loadInfo.CpuAccessFlags = 0;
-        //    loadInfo.MiscFlags = 0;
-        //    loadInfo.Format = MAKE_TYPELESS( SrcInfo.Format );
-        //    loadInfo.Filter = D3DX10_FILTER_NONE;
-        //    loadInfo.MipFilter = D3DX10_FILTER_NONE;
-        //    loadInfo.pSrcInfo = &SrcInfo;
-
-        //    hr = D3DX10CreateTextureFromResource( m_pd3d10Device, pTextureNode->hResourceModule, pID, &loadInfo,
-        //                                          NULL, &pRes, NULL );
-        //    if( FAILED( hr ) )
-        //        return DXTRACE_ERR( L"D3DX10CreateResourceFromResource", hr );
-        //    hr = pRes->QueryInterface( __uuidof( ID3D10Texture2D ), ( LPVOID* )&pTextureNode->pTexture10 );
-        //    SAFE_RELEASE( pRes );
-        //    if( FAILED( hr ) )
-        //        return hr;
-        //}
-    }
-    else
+    return hr;
+}
+
+
+//--------------------------------------------------------------------------------------
+void CDXUTDialogResourceManager::OnD3D11ReleasingSwapChain()
+{
+}
+
+
+//--------------------------------------------------------------------------------------
+void CDXUTDialogResourceManager::OnD3D11DestroyDevice()
+{
+    // Release the resources but don't clear the cache, as these will need to be
+    // recreated if the device is recreated
+
+    for( auto it = m_TextureCache.begin(); it != m_TextureCache.end(); ++it )
     {
-        //
-        //// Make sure there's a texture to create
-        //if( pTextureNode->strFilename[0] == 0 )
-        //    return S_OK;
-
-        //D3DX10_IMAGE_INFO SrcInfo;
-        //D3DX10GetImageInfoFromFile( pTextureNode->strFilename, NULL, &SrcInfo, NULL );
-
-        //// Create texture from file
-        //ID3D10Resource* pRes;
-        //D3DX10_IMAGE_LOAD_INFO loadInfo;
-        //loadInfo.Width = D3DX10_DEFAULT;
-        //loadInfo.Height = D3DX10_DEFAULT;
-        //loadInfo.Depth = D3DX10_DEFAULT;
-        //loadInfo.FirstMipLevel = 0;
-        //loadInfo.MipLevels = 1;
-        //loadInfo.Usage = D3D10_USAGE_DEFAULT;
-        //loadInfo.BindFlags = D3D10_BIND_SHADER_RESOURCE;
-        //loadInfo.CpuAccessFlags = 0;
-        //loadInfo.MiscFlags = 0;
-        //loadInfo.Format = MAKE_TYPELESS( SrcInfo.Format );
-        //loadInfo.Filter = D3DX10_FILTER_NONE;
-        //loadInfo.MipFilter = D3DX10_FILTER_NONE;
-        //loadInfo.pSrcInfo = &SrcInfo;
-        //hr = D3DX10CreateTextureFromFile( m_pd3d10Device, pTextureNode->strFilename, &loadInfo, NULL, &pRes, NULL );
-        //if( FAILED( hr ) )
-        //{
-        //    return DXTRACE_ERR( L"D3DX10CreateResourceFromFileEx", hr );
-        //}
-        //hr = pRes->QueryInterface( __uuidof( ID3D10Texture2D ), ( LPVOID* )&pTextureNode->pTexture10 );
-        //SAFE_RELEASE( pRes );
-        //if( FAILED( hr ) )
-        //    return hr;
-        //
+        SAFE_RELEASE( (*it)->pTexResView11 );
+        SAFE_RELEASE( (*it)->pTexture11 );
     }
 
-    // Store dimensions
-    D3D11_TEXTURE2D_DESC desc;
-    pTextureNode->pTexture11->GetDesc( &desc );
-    pTextureNode->dwWidth = desc.Width;
-    pTextureNode->dwHeight = desc.Height;
+    // D3D11
+    SAFE_RELEASE( m_pVBScreenQuad11 );
+    SAFE_RELEASE( m_pSpriteBuffer11 );
+    m_SpriteBufferBytes11 = 0;
+    SAFE_RELEASE( m_pInputLayout11 );
 
-    // Create resource view
-    D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc;
-    SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-    SRVDesc.Format = MAKE_SRGB( desc.Format );
-    SRVDesc.Texture2D.MipLevels = 1;
-    SRVDesc.Texture2D.MostDetailedMip = 0;
-    hr = m_pd3d11Device->CreateShaderResourceView( pTextureNode->pTexture11, &SRVDesc, &pTextureNode->pTexResView11 );
-    DXUT_SetDebugName( pTextureNode->pTexResView11, "DXUT GUI Texture" );
+    // Shaders
+    SAFE_RELEASE( m_pVSRenderUI11 );
+    SAFE_RELEASE( m_pPSRenderUI11 );
+    SAFE_RELEASE( m_pPSRenderUIUntex11 );
 
-    return hr;
+    // States
+    SAFE_RELEASE( m_pDepthStencilStateUI11 );
+    SAFE_RELEASE( m_pRasterizerStateUI11 );
+    SAFE_RELEASE( m_pBlendStateUI11 );
+    SAFE_RELEASE( m_pSamplerStateUI11 );
+
+    SAFE_RELEASE( m_pDepthStencilStateStored11 );
+    SAFE_RELEASE( m_pRasterizerStateStored11 );
+    SAFE_RELEASE( m_pBlendStateStored11 );
+    SAFE_RELEASE( m_pSamplerStateStored11 );
+
+    EndFont11();
 }
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTDialog::InitDefaultElements()
+void CDXUTDialogResourceManager::StoreD3D11State( _In_ ID3D11DeviceContext* pd3dImmediateContext )
 {
-    SetFont( 0, L"Arial", 14, FW_NORMAL );
+    pd3dImmediateContext->OMGetDepthStencilState( &m_pDepthStencilStateStored11, &m_StencilRefStored11 );
+    pd3dImmediateContext->RSGetState( &m_pRasterizerStateStored11 );
+    pd3dImmediateContext->OMGetBlendState( &m_pBlendStateStored11, m_BlendFactorStored11, &m_SampleMaskStored11 );
+    pd3dImmediateContext->PSGetSamplers( 0, 1, &m_pSamplerStateStored11 );
+}
 
-    CDXUTElement Element;
-    RECT rcTexture;
 
-    //-------------------------------------
-    // Element for the caption
-    //-------------------------------------
-    m_CapElement.SetFont( 0 );
-    SetRect( &rcTexture, 17, 269, 241, 287 );
-    m_CapElement.SetTexture( 0, &rcTexture );
-    m_CapElement.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 255, 255, 255, 255 );
-    m_CapElement.FontColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 255, 255, 255, 255 );
-    m_CapElement.SetFont( 0, D3DCOLOR_ARGB( 255, 255, 255, 255 ), DT_LEFT | DT_VCENTER );
-    // Pre-blend as we don't need to transition the state
-    m_CapElement.TextureColor.Blend( DXUT_STATE_NORMAL, 10.0f );
-    m_CapElement.FontColor.Blend( DXUT_STATE_NORMAL, 10.0f );
+//--------------------------------------------------------------------------------------
+void CDXUTDialogResourceManager::RestoreD3D11State( _In_ ID3D11DeviceContext* pd3dImmediateContext )
+{
+    pd3dImmediateContext->OMSetDepthStencilState( m_pDepthStencilStateStored11, m_StencilRefStored11 );
+    pd3dImmediateContext->RSSetState( m_pRasterizerStateStored11 );
+    pd3dImmediateContext->OMSetBlendState( m_pBlendStateStored11, m_BlendFactorStored11, m_SampleMaskStored11 );
+    pd3dImmediateContext->PSSetSamplers( 0, 1, &m_pSamplerStateStored11 );
 
-    //-------------------------------------
-    // CDXUTStatic
-    //-------------------------------------
-    Element.SetFont( 0 );
-    Element.FontColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 200, 200, 200, 200 );
+    SAFE_RELEASE( m_pDepthStencilStateStored11 );
+    SAFE_RELEASE( m_pRasterizerStateStored11 );
+    SAFE_RELEASE( m_pBlendStateStored11 );
+    SAFE_RELEASE( m_pSamplerStateStored11 );
+}
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_STATIC, 0, &Element );
 
+//--------------------------------------------------------------------------------------
+void CDXUTDialogResourceManager::ApplyRenderUI11( _In_ ID3D11DeviceContext* pd3dImmediateContext )
+{
+    // Shaders
+    pd3dImmediateContext->VSSetShader( m_pVSRenderUI11, nullptr, 0 );
+    pd3dImmediateContext->HSSetShader( nullptr, nullptr, 0 );
+    pd3dImmediateContext->DSSetShader( nullptr, nullptr, 0 );
+    pd3dImmediateContext->GSSetShader( nullptr, nullptr, 0 );
+    pd3dImmediateContext->PSSetShader( m_pPSRenderUI11, nullptr, 0 );
 
-    //-------------------------------------
-    // CDXUTButton - Button
-    //-------------------------------------
-    SetRect( &rcTexture, 0, 0, 136, 54 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.SetFont( 0 );
-    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 255, 255, 255 );
-    Element.TextureColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 200, 255, 255, 255 );
-    Element.FontColor.States[ DXUT_STATE_MOUSEOVER ] = D3DCOLOR_ARGB( 255, 0, 0, 0 );
+    // States
+    pd3dImmediateContext->OMSetDepthStencilState( m_pDepthStencilStateUI11, 0 );
+    pd3dImmediateContext->RSSetState( m_pRasterizerStateUI11 );
+    float BlendFactor[4] = { 0, 0, 0, 0 };
+    pd3dImmediateContext->OMSetBlendState( m_pBlendStateUI11, BlendFactor, 0xFFFFFFFF );
+    pd3dImmediateContext->PSSetSamplers( 0, 1, &m_pSamplerStateUI11 );
+}
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_BUTTON, 0, &Element );
 
+//--------------------------------------------------------------------------------------
+void CDXUTDialogResourceManager::ApplyRenderUIUntex11( _In_ ID3D11DeviceContext* pd3dImmediateContext )
+{
+    // Shaders
+    pd3dImmediateContext->VSSetShader( m_pVSRenderUI11, nullptr, 0 );
+    pd3dImmediateContext->HSSetShader( nullptr, nullptr, 0 );
+    pd3dImmediateContext->DSSetShader( nullptr, nullptr, 0 );
+    pd3dImmediateContext->GSSetShader( nullptr, nullptr, 0 );
+    pd3dImmediateContext->PSSetShader( m_pPSRenderUIUntex11, nullptr, 0 );
 
-    //-------------------------------------
-    // CDXUTButton - Fill layer
-    //-------------------------------------
-    SetRect( &rcTexture, 136, 0, 252, 54 );
-    Element.SetTexture( 0, &rcTexture, D3DCOLOR_ARGB( 0, 255, 255, 255 ) );
-    Element.TextureColor.States[ DXUT_STATE_MOUSEOVER ] = D3DCOLOR_ARGB( 160, 255, 255, 255 );
-    Element.TextureColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 60, 0, 0, 0 );
-    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 30, 255, 255, 255 );
+    // States
+    pd3dImmediateContext->OMSetDepthStencilState( m_pDepthStencilStateUI11, 0 );
+    pd3dImmediateContext->RSSetState( m_pRasterizerStateUI11 );
+    float BlendFactor[4] = { 0, 0, 0, 0 };
+    pd3dImmediateContext->OMSetBlendState( m_pBlendStateUI11, BlendFactor, 0xFFFFFFFF );
+    pd3dImmediateContext->PSSetSamplers( 0, 1, &m_pSamplerStateUI11 );
+}
 
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_BUTTON, 1, &Element );
+//--------------------------------------------------------------------------------------
+void CDXUTDialogResourceManager::BeginSprites11( )
+{
+    m_SpriteVertices.clear();
+}
 
 
-    //-------------------------------------
-    // CDXUTCheckBox - Box
-    //-------------------------------------
-    SetRect( &rcTexture, 0, 54, 27, 81 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 255, 255, 255 ), DT_LEFT | DT_VCENTER );
-    Element.FontColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 200, 200, 200, 200 );
-    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 255, 255, 255 );
-    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 200, 255, 255, 255 );
-    Element.TextureColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 255, 255, 255, 255 );
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+void CDXUTDialogResourceManager::EndSprites11( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext )
+{
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_CHECKBOX, 0, &Element );
+    // ensure our buffer size can hold our sprites
+    UINT SpriteDataBytes = static_cast<UINT>( m_SpriteVertices.size() * sizeof( DXUTSpriteVertex ) );
+    if( m_SpriteBufferBytes11 < SpriteDataBytes )
+    {
+        SAFE_RELEASE( m_pSpriteBuffer11 );
+        m_SpriteBufferBytes11 = SpriteDataBytes;
 
+        D3D11_BUFFER_DESC BufferDesc;
+        BufferDesc.ByteWidth = m_SpriteBufferBytes11;
+        BufferDesc.Usage = D3D11_USAGE_DYNAMIC;
+        BufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+        BufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+        BufferDesc.MiscFlags = 0;
 
-    //-------------------------------------
-    // CDXUTCheckBox - Check
-    //-------------------------------------
-    SetRect( &rcTexture, 27, 54, 54, 81 );
-    Element.SetTexture( 0, &rcTexture );
+        if ( FAILED(pd3dDevice->CreateBuffer(&BufferDesc, nullptr, &m_pSpriteBuffer11)) )
+        {
+            m_pSpriteBuffer11 = nullptr;
+            m_SpriteBufferBytes11 = 0;
+            return;
+        }
+        DXUT_SetDebugName( m_pSpriteBuffer11, "CDXUTDialogResourceManager" );
+    }
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_CHECKBOX, 1, &Element );
+    // Copy the sprites over
+    D3D11_BOX destRegion;
+    destRegion.left = 0;
+    destRegion.right = SpriteDataBytes;
+    destRegion.top = 0;
+    destRegion.bottom = 1;
+    destRegion.front = 0;
+    destRegion.back = 1;
+    D3D11_MAPPED_SUBRESOURCE MappedResource;
+    if ( S_OK == pd3dImmediateContext->Map( m_pSpriteBuffer11, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ) )
+    {
+        memcpy( MappedResource.pData, (const void*)&m_SpriteVertices[0], SpriteDataBytes );
+        pd3dImmediateContext->Unmap(m_pSpriteBuffer11, 0);
+    }
 
+    // Draw
+    UINT Stride = sizeof( DXUTSpriteVertex );
+    UINT Offset = 0;
+    pd3dImmediateContext->IASetVertexBuffers( 0, 1, &m_pSpriteBuffer11, &Stride, &Offset );
+    pd3dImmediateContext->IASetInputLayout( m_pInputLayout11 );
+    pd3dImmediateContext->IASetPrimitiveTopology( D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST );
+    pd3dImmediateContext->Draw( static_cast<UINT>( m_SpriteVertices.size() ), 0 );
 
-    //-------------------------------------
-    // CDXUTRadioButton - Box
-    //-------------------------------------
-    SetRect( &rcTexture, 54, 54, 81, 81 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 255, 255, 255 ), DT_LEFT | DT_VCENTER );
-    Element.FontColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 200, 200, 200, 200 );
-    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 255, 255, 255 );
-    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 200, 255, 255, 255 );
-    Element.TextureColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 255, 255, 255, 255 );
+    m_SpriteVertices.clear();
+}
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_RADIOBUTTON, 0, &Element );
 
+//--------------------------------------------------------------------------------------
+bool CDXUTDialogResourceManager::RegisterDialog( _In_ CDXUTDialog* pDialog )
+{
+    // Check that the dialog isn't already registered.
+    for( auto it = m_Dialogs.cbegin(); it != m_Dialogs.cend(); ++it )
+    {
+        if( *it == pDialog )
+            return true;
+    }
 
-    //-------------------------------------
-    // CDXUTRadioButton - Check
-    //-------------------------------------
-    SetRect( &rcTexture, 81, 54, 108, 81 );
-    Element.SetTexture( 0, &rcTexture );
+    // Add to the list.
+    m_Dialogs.push_back( pDialog );
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_RADIOBUTTON, 1, &Element );
+    // Set up next and prev pointers.
+    if( m_Dialogs.size() > 1 )
+        m_Dialogs[m_Dialogs.size() - 2]->SetNextDialog( pDialog );
+    m_Dialogs[m_Dialogs.size() - 1]->SetNextDialog( m_Dialogs[0] );
 
+    return true;
+}
 
-    //-------------------------------------
-    // CDXUTComboBox - Main
-    //-------------------------------------
-    SetRect( &rcTexture, 7, 81, 247, 123 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.SetFont( 0 );
-    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 200, 200, 200 );
-    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 170, 230, 230, 230 );
-    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 70, 200, 200, 200 );
-    Element.FontColor.States[ DXUT_STATE_MOUSEOVER ] = D3DCOLOR_ARGB( 255, 0, 0, 0 );
-    Element.FontColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 255, 0, 0, 0 );
-    Element.FontColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 200, 200, 200, 200 );
 
+//--------------------------------------------------------------------------------------
+void CDXUTDialogResourceManager::UnregisterDialog( _In_ CDXUTDialog* pDialog )
+{
+    // Search for the dialog in the list.
+    for( size_t i = 0; i < m_Dialogs.size(); ++i )
+    {
+        if( m_Dialogs[ i ] == pDialog )
+        {
+            m_Dialogs.erase( m_Dialogs.begin() + i );
+            if( !m_Dialogs.empty() )
+            {
+                int l, r;
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_COMBOBOX, 0, &Element );
+                if( 0 == i )
+                    l = int( m_Dialogs.size() - 1 );
+                else
+                    l = int(i) - 1;
 
+                if( m_Dialogs.size() == i )
+                    r = 0;
+                else
+                    r = int( i );
 
-    //-------------------------------------
-    // CDXUTComboBox - Button
-    //-------------------------------------
-    SetRect( &rcTexture, 98, 189, 151, 238 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 255, 255, 255 );
-    Element.TextureColor.States[ DXUT_STATE_PRESSED ] = D3DCOLOR_ARGB( 255, 150, 150, 150 );
-    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 200, 255, 255, 255 );
-    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 70, 255, 255, 255 );
+                m_Dialogs[l]->SetNextDialog( m_Dialogs[r] );
+            }
+            return;
+        }
+    }
+}
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_COMBOBOX, 1, &Element );
 
+//--------------------------------------------------------------------------------------
+void CDXUTDialogResourceManager::EnableKeyboardInputForAllDialogs()
+{
+    // Enable keyboard input for all registered dialogs
+    for( auto it = m_Dialogs.begin(); it != m_Dialogs.end(); ++it )
+        (*it)->EnableKeyboardInput( true );
+}
 
-    //-------------------------------------
-    // CDXUTComboBox - Dropdown
-    //-------------------------------------
-    SetRect( &rcTexture, 13, 123, 241, 160 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 0, 0, 0 ), DT_LEFT | DT_TOP );
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_COMBOBOX, 2, &Element );
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+int CDXUTDialogResourceManager::AddFont( LPCWSTR strFaceName, LONG height, LONG weight )
+{
+    // See if this font already exists
+    for( size_t i = 0; i < m_FontCache.size(); ++i )
+    {
+        auto pFontNode = m_FontCache[ i ];
+        size_t nLen = 0;
+        nLen = wcsnlen( strFaceName, MAX_PATH);
+        if( 0 == _wcsnicmp( pFontNode->strFace, strFaceName, nLen ) &&
+            pFontNode->nHeight == height &&
+            pFontNode->nWeight == weight )
+        {
+            return static_cast<int>( i );
+        }
+    }
 
+    // Add a new font and try to create it
+    auto pNewFontNode = new (std::nothrow) DXUTFontNode;
+    if( !pNewFontNode )
+        return -1;
 
-    //-------------------------------------
-    // CDXUTComboBox - Selection
-    //-------------------------------------
-    SetRect( &rcTexture, 12, 163, 239, 183 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 255, 255, 255 ), DT_LEFT | DT_TOP );
+    ZeroMemory( pNewFontNode, sizeof( DXUTFontNode ) );
+    wcscpy_s( pNewFontNode->strFace, MAX_PATH, strFaceName );
+    pNewFontNode->nHeight = height;
+    pNewFontNode->nWeight = weight;
+    m_FontCache.push_back( pNewFontNode );
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_COMBOBOX, 3, &Element );
+    int iFont = (int)m_FontCache.size() - 1;
 
+    // If a device is available, try to create immediately
+    return iFont;
+}
 
-    //-------------------------------------
-    // CDXUTSlider - Track
-    //-------------------------------------
-    SetRect( &rcTexture, 1, 187, 93, 228 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.TextureColor.States[ DXUT_STATE_NORMAL ] = D3DCOLOR_ARGB( 150, 255, 255, 255 );
-    Element.TextureColor.States[ DXUT_STATE_FOCUS ] = D3DCOLOR_ARGB( 200, 255, 255, 255 );
-    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 70, 255, 255, 255 );
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_SLIDER, 0, &Element );
+//--------------------------------------------------------------------------------------
+int CDXUTDialogResourceManager::AddTexture( _In_z_ LPCWSTR strFilename )
+{
+    // See if this texture already exists
+    for( size_t i = 0; i < m_TextureCache.size(); ++i )
+    {
+        auto pTextureNode = m_TextureCache[ i ];
+        size_t nLen = 0;
+        nLen = wcsnlen( strFilename, MAX_PATH);
+        if( pTextureNode->bFileSource &&  // Sources must match
+            0 == _wcsnicmp( pTextureNode->strFilename, strFilename, nLen ) )
+        {
+            return static_cast<int>( i );
+        }
+    }
 
-    //-------------------------------------
-    // CDXUTSlider - Button
-    //-------------------------------------
-    SetRect( &rcTexture, 151, 193, 192, 234 );
-    Element.SetTexture( 0, &rcTexture );
+    // Add a new texture and try to create it
+    auto pNewTextureNode = new (std::nothrow) DXUTTextureNode;
+    if( !pNewTextureNode )
+        return -1;
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_SLIDER, 1, &Element );
+    ZeroMemory( pNewTextureNode, sizeof( DXUTTextureNode ) );
+    pNewTextureNode->bFileSource = true;
+    wcscpy_s( pNewTextureNode->strFilename, MAX_PATH, strFilename );
 
-    //-------------------------------------
-    // CDXUTScrollBar - Track
-    //-------------------------------------
-    int nScrollBarStartX = 196;
-    int nScrollBarStartY = 191;
-    SetRect( &rcTexture, nScrollBarStartX + 0, nScrollBarStartY + 21, nScrollBarStartX + 22, nScrollBarStartY + 32 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 255, 200, 200, 200 );
+    m_TextureCache.push_back( pNewTextureNode );
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_SCROLLBAR, 0, &Element );
+    int iTexture = int( m_TextureCache.size() ) - 1;
 
-    //-------------------------------------
-    // CDXUTScrollBar - Up Arrow
-    //-------------------------------------
-    SetRect( &rcTexture, nScrollBarStartX + 0, nScrollBarStartY + 1, nScrollBarStartX + 22, nScrollBarStartY + 21 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 255, 200, 200, 200 );
+    // If a device is available, try to create immediately
+
+    return iTexture;
+}
 
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_SCROLLBAR, 1, &Element );
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+int CDXUTDialogResourceManager::AddTexture( LPCWSTR strResourceName, HMODULE hResourceModule )
+{
+    // See if this texture already exists
+    for( size_t i = 0; i < m_TextureCache.size(); i++ )
+    {
+        auto pTextureNode = m_TextureCache[ i ];
+        if( !pTextureNode->bFileSource &&      // Sources must match
+            pTextureNode->hResourceModule == hResourceModule ) // Module handles must match
+        {
+            if( IS_INTRESOURCE( strResourceName ) )
+            {
+                // Integer-based ID
+                if( ( INT_PTR )strResourceName == pTextureNode->nResourceID )
+                    return static_cast<int>( i );
+            }
+            else
+            {
+                // String-based ID
+                size_t nLen = 0;
+                nLen = wcsnlen ( strResourceName, MAX_PATH );
+                if( 0 == _wcsnicmp( pTextureNode->strFilename, strResourceName, nLen ) )
+                    return static_cast<int>( i );
+            }
+        }
+    }
 
-    //-------------------------------------
-    // CDXUTScrollBar - Down Arrow
-    //-------------------------------------
-    SetRect( &rcTexture, nScrollBarStartX + 0, nScrollBarStartY + 32, nScrollBarStartX + 22, nScrollBarStartY + 53 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.TextureColor.States[ DXUT_STATE_DISABLED ] = D3DCOLOR_ARGB( 255, 200, 200, 200 );
+    // Add a new texture and try to create it
+    auto pNewTextureNode = new (std::nothrow) DXUTTextureNode;
+    if( !pNewTextureNode )
+        return -1;
 
+    ZeroMemory( pNewTextureNode, sizeof( DXUTTextureNode ) );
+    pNewTextureNode->hResourceModule = hResourceModule;
+    if( IS_INTRESOURCE( strResourceName ) )
+    {
+        pNewTextureNode->nResourceID = ( int )( size_t )strResourceName;
+    }
+    else
+    {
+        pNewTextureNode->nResourceID = 0;
+        wcscpy_s( pNewTextureNode->strFilename, MAX_PATH, strResourceName );
+    }
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_SCROLLBAR, 2, &Element );
+    m_TextureCache.push_back( pNewTextureNode );
 
-    //-------------------------------------
-    // CDXUTScrollBar - Button
-    //-------------------------------------
-    SetRect( &rcTexture, 220, 192, 238, 234 );
-    Element.SetTexture( 0, &rcTexture );
+    int iTexture = int( m_TextureCache.size() ) - 1;
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_SCROLLBAR, 3, &Element );
+    // If a device is available, try to create immediately
 
+    return iTexture;
+}
 
-    //-------------------------------------
-    // CDXUTEditBox
-    //-------------------------------------
-    // Element assignment:
-    //   0 - text area
-    //   1 - top left border
-    //   2 - top border
-    //   3 - top right border
-    //   4 - left border
-    //   5 - right border
-    //   6 - lower left border
-    //   7 - lower border
-    //   8 - lower right border
 
-    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 0, 0, 0 ), DT_LEFT | DT_TOP );
+//--------------------------------------------------------------------------------------
+HRESULT CDXUTDialogResourceManager::CreateTexture11( _In_ UINT iTexture )
+{
+    HRESULT hr = S_OK;
 
-    // Assign the style
-    SetRect( &rcTexture, 14, 90, 241, 113 );
-    Element.SetTexture( 0, &rcTexture );
-    SetDefaultElement( DXUT_CONTROL_EDITBOX, 0, &Element );
-    SetRect( &rcTexture, 8, 82, 14, 90 );
-    Element.SetTexture( 0, &rcTexture );
-    SetDefaultElement( DXUT_CONTROL_EDITBOX, 1, &Element );
-    SetRect( &rcTexture, 14, 82, 241, 90 );
-    Element.SetTexture( 0, &rcTexture );
-    SetDefaultElement( DXUT_CONTROL_EDITBOX, 2, &Element );
-    SetRect( &rcTexture, 241, 82, 246, 90 );
-    Element.SetTexture( 0, &rcTexture );
-    SetDefaultElement( DXUT_CONTROL_EDITBOX, 3, &Element );
-    SetRect( &rcTexture, 8, 90, 14, 113 );
-    Element.SetTexture( 0, &rcTexture );
-    SetDefaultElement( DXUT_CONTROL_EDITBOX, 4, &Element );
-    SetRect( &rcTexture, 241, 90, 246, 113 );
-    Element.SetTexture( 0, &rcTexture );
-    SetDefaultElement( DXUT_CONTROL_EDITBOX, 5, &Element );
-    SetRect( &rcTexture, 8, 113, 14, 121 );
-    Element.SetTexture( 0, &rcTexture );
-    SetDefaultElement( DXUT_CONTROL_EDITBOX, 6, &Element );
-    SetRect( &rcTexture, 14, 113, 241, 121 );
-    Element.SetTexture( 0, &rcTexture );
-    SetDefaultElement( DXUT_CONTROL_EDITBOX, 7, &Element );
-    SetRect( &rcTexture, 241, 113, 246, 121 );
-    Element.SetTexture( 0, &rcTexture );
-    SetDefaultElement( DXUT_CONTROL_EDITBOX, 8, &Element );
+    auto pTextureNode = m_TextureCache[ iTexture ];
 
-    //-------------------------------------
-    // CDXUTListBox - Main
-    //-------------------------------------
-    SetRect( &rcTexture, 13, 123, 241, 160 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 0, 0, 0 ), DT_LEFT | DT_TOP );
+    if( !pTextureNode->bFileSource )
+    {
+        if( pTextureNode->nResourceID == 0xFFFF && pTextureNode->hResourceModule == ( HMODULE )0xFFFF )
+        {
+            hr = DXUTCreateGUITextureFromInternalArray( m_pd3d11Device, &pTextureNode->pTexture11 );
+            if( FAILED( hr ) )
+                return DXTRACE_ERR( L"DXUTCreateGUITextureFromInternalArray", hr );
+            DXUT_SetDebugName( pTextureNode->pTexture11, "DXUT GUI Texture" );
+        }
+    }
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_LISTBOX, 0, &Element );
+    // Store dimensions
+    D3D11_TEXTURE2D_DESC desc;
+    pTextureNode->pTexture11->GetDesc( &desc );
+    pTextureNode->dwWidth = desc.Width;
+    pTextureNode->dwHeight = desc.Height;
 
-    //-------------------------------------
-    // CDXUTListBox - Selection
-    //-------------------------------------
+    // Create resource view
+    D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc;
+    SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
+    SRVDesc.Format = desc.Format;
+    SRVDesc.Texture2D.MipLevels = 1;
+    SRVDesc.Texture2D.MostDetailedMip = 0;
+    hr = m_pd3d11Device->CreateShaderResourceView( pTextureNode->pTexture11, &SRVDesc, &pTextureNode->pTexResView11 );
+    if ( FAILED(hr) )
+        return hr;
 
-    SetRect( &rcTexture, 16, 166, 240, 183 );
-    Element.SetTexture( 0, &rcTexture );
-    Element.SetFont( 0, D3DCOLOR_ARGB( 255, 255, 255, 255 ), DT_LEFT | DT_TOP );
+    DXUT_SetDebugName( pTextureNode->pTexResView11, "DXUT GUI Texture" );
 
-    // Assign the Element
-    SetDefaultElement( DXUT_CONTROL_LISTBOX, 1, &Element );
+    return hr;
 }
 
 
-
-//--------------------------------------------------------------------------------------
+//======================================================================================
 // CDXUTControl class
-//--------------------------------------------------------------------------------------
+//======================================================================================
 
-//--------------------------------------------------------------------------------------
-CDXUTControl::CDXUTControl( CDXUTDialog* pDialog )
+CDXUTControl::CDXUTControl( _In_opt_ CDXUTDialog* pDialog )
 {
     m_Type = DXUT_CONTROL_BUTTON;
     m_pDialog = pDialog;
     m_ID = 0;
+    m_nHotkey = 0;
     m_Index = 0;
-    m_pUserData = NULL;
+    m_pUserData = nullptr;
 
     m_bEnabled = true;
     m_bVisible = true;
@@ -3494,7 +2877,7 @@ CDXUTControl::CDXUTControl( CDXUTDialog* pDialog )
     m_bHasFocus = false;
     m_bIsDefault = false;
 
-    m_pDialog = NULL;
+    m_pDialog = nullptr;
 
     m_x = 0;
     m_y = 0;
@@ -3505,20 +2888,22 @@ CDXUTControl::CDXUTControl( CDXUTDialog* pDialog )
 }
 
 
+//--------------------------------------------------------------------------------------
 CDXUTControl::~CDXUTControl()
 {
-    for( int i = 0; i < m_Elements.GetSize(); ++i )
+    for( auto it = m_Elements.begin(); it != m_Elements.end(); ++it )
     {
-        delete m_Elements[i];
+        auto pElement = *it;
+        delete pElement;
     }
-    m_Elements.RemoveAll();
+    m_Elements.clear();
 }
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTControl::SetTextColor( D3DCOLOR Color )
+void CDXUTControl::SetTextColor( _In_ DWORD Color )
 {
-    CDXUTElement* pElement = m_Elements.GetAt( 0 );
+    auto pElement = m_Elements[ 0 ];
 
     if( pElement )
         pElement->FontColor.States[DXUT_STATE_NORMAL] = Color;
@@ -3526,30 +2911,23 @@ void CDXUTControl::SetTextColor( D3DCOLOR Color )
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTControl::SetElement( UINT iElement, CDXUTElement* pElement )
+HRESULT CDXUTControl::SetElement( _In_ UINT iElement, _In_ CDXUTElement* pElement )
 {
-    HRESULT hr = S_OK;
-
-    if( pElement == NULL )
+    if( !pElement )
         return E_INVALIDARG;
 
     // Make certain the array is this large
-    for( UINT i = m_Elements.GetSize(); i <= iElement; i++ )
+    for( size_t i = m_Elements.size(); i <= iElement; i++ )
     {
-        CDXUTElement* pNewElement = new CDXUTElement();
-        if( pNewElement == NULL )
+        auto pNewElement = new (std::nothrow) CDXUTElement();
+        if( !pNewElement )
             return E_OUTOFMEMORY;
 
-        hr = m_Elements.Add( pNewElement );
-        if( FAILED( hr ) )
-        {
-            SAFE_DELETE( pNewElement );
-            return hr;
-        }
+        m_Elements.push_back( pNewElement );
     }
 
     // Update the data
-    CDXUTElement* pCurElement = m_Elements.GetAt( iElement );
+    auto pCurElement = m_Elements[ iElement ];
     *pCurElement = *pElement;
 
     return S_OK;
@@ -3562,10 +2940,9 @@ void CDXUTControl::Refresh()
     m_bMouseOver = false;
     m_bHasFocus = false;
 
-    for( int i = 0; i < m_Elements.GetSize(); i++ )
+    for( auto it = m_Elements.begin(); it != m_Elements.end(); ++it )
     {
-        CDXUTElement* pElement = m_Elements.GetAt( i );
-        pElement->Refresh();
+        (*it)->Refresh();
     }
 }
 
@@ -3577,30 +2954,30 @@ void CDXUTControl::UpdateRects()
 }
 
 
-//--------------------------------------------------------------------------------------
+//======================================================================================
 // CDXUTStatic class
-//--------------------------------------------------------------------------------------
+//======================================================================================
 
 //--------------------------------------------------------------------------------------
-CDXUTStatic::CDXUTStatic( CDXUTDialog* pDialog )
+CDXUTStatic::CDXUTStatic( _In_opt_ CDXUTDialog* pDialog )
 {
     m_Type = DXUT_CONTROL_STATIC;
     m_pDialog = pDialog;
 
     ZeroMemory( &m_strText, sizeof( m_strText ) );
 
-    for( int i = 0; i < m_Elements.GetSize(); i++ )
+    for( auto it = m_Elements.begin(); it != m_Elements.end(); ++it )
     {
-        CDXUTElement* pElement = m_Elements.GetAt( i );
+        auto pElement = *it;
         SAFE_DELETE( pElement );
     }
 
-    m_Elements.RemoveAll();
+    m_Elements.clear();
 }
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTStatic::Render( float fElapsedTime )
+void CDXUTStatic::Render( _In_ float fElapsedTime )
 {
     if( m_bVisible == false )
         return;
@@ -3610,20 +2987,20 @@ void CDXUTStatic::Render( float fElapsedTime )
     if( m_bEnabled == false )
         iState = DXUT_STATE_DISABLED;
 
-    CDXUTElement* pElement = m_Elements.GetAt( 0 );
+    auto pElement = m_Elements[ 0 ];
 
     pElement->FontColor.Blend( iState, fElapsedTime );
 
-    m_pDialog->DrawText( m_strText, pElement, &m_rcBoundingBox, false, -1, false);
+    m_pDialog->DrawText( m_strText, pElement, &m_rcBoundingBox, false, false);
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTStatic::GetTextCopy( __out_ecount(bufferCount) LPWSTR strDest, 
-                                  UINT bufferCount )
+_Use_decl_annotations_
+HRESULT CDXUTStatic::GetTextCopy( LPWSTR strDest, UINT bufferCount ) const
 {
     // Validate incoming parameters
-    if( strDest == NULL || bufferCount == 0 )
+    if( !strDest || bufferCount == 0 )
     {
         return E_INVALIDARG;
     }
@@ -3636,9 +3013,9 @@ HRESULT CDXUTStatic::GetTextCopy( __out_ecount(bufferCount) LPWSTR strDest,
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTStatic::SetText( LPCWSTR strText )
+HRESULT CDXUTStatic::SetText( _In_z_ LPCWSTR strText )
 {
-    if( strText == NULL )
+    if( !strText )
     {
         m_strText[0] = 0;
         return S_OK;
@@ -3649,12 +3026,11 @@ HRESULT CDXUTStatic::SetText( LPCWSTR strText )
 }
 
 
-//--------------------------------------------------------------------------------------
+//======================================================================================
 // CDXUTButton class
-//--------------------------------------------------------------------------------------
+//======================================================================================
 
-//--------------------------------------------------------------------------------------
-CDXUTButton::CDXUTButton( CDXUTDialog* pDialog )
+CDXUTButton::CDXUTButton( _In_opt_ CDXUTDialog* pDialog )
 {
     m_Type = DXUT_CONTROL_BUTTON;
     m_pDialog = pDialog;
@@ -3664,8 +3040,12 @@ CDXUTButton::CDXUTButton( CDXUTDialog* pDialog )
 }
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTButton::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
+
 {
+    UNREFERENCED_PARAMETER(lParam);
+
     if( !m_bEnabled || !m_bVisible )
         return false;
 
@@ -3700,8 +3080,12 @@ bool CDXUTButton::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
 //--------------------------------------------------------------------------------------
-bool CDXUTButton::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam )
+_Use_decl_annotations_
+bool CDXUTButton::HandleMouse( UINT uMsg, const POINT& pt, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(wParam);
+    UNREFERENCED_PARAMETER(lParam);
+
     if( !m_bEnabled || !m_bVisible )
         return false;
 
@@ -3750,7 +3134,7 @@ bool CDXUTButton::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam
 }
 
 //--------------------------------------------------------------------------------------
-void CDXUTButton::Render( float fElapsedTime )
+void CDXUTButton::Render( _In_ float fElapsedTime )
 {
     if( m_bVisible == false )
         return;
@@ -3788,7 +3172,7 @@ void CDXUTButton::Render( float fElapsedTime )
     }
 
     // Background fill layer
-    CDXUTElement* pElement = m_Elements.GetAt( 0 );
+    auto pElement = m_Elements[ 0 ];
 
     float fBlendRate = ( iState == DXUT_STATE_PRESSED ) ? 0.0f : 0.8f;
 
@@ -3801,27 +3185,26 @@ void CDXUTButton::Render( float fElapsedTime )
     pElement->FontColor.Blend( iState, fElapsedTime, fBlendRate );
 
     m_pDialog->DrawSprite( pElement, &rcWindow, DXUT_FAR_BUTTON_DEPTH );
-    m_pDialog->DrawText( m_strText, pElement, &rcWindow, false, -1, true );
+    m_pDialog->DrawText( m_strText, pElement, &rcWindow, false, true );
 
     // Main button
-    pElement = m_Elements.GetAt( 1 );
+    pElement = m_Elements[ 1 ];
 
     // Blend current color
     pElement->TextureColor.Blend( iState, fElapsedTime, fBlendRate );
     pElement->FontColor.Blend( iState, fElapsedTime, fBlendRate );
 
     m_pDialog->DrawSprite( pElement, &rcWindow, DXUT_NEAR_BUTTON_DEPTH );
-    m_pDialog->DrawText( m_strText, pElement, &rcWindow, false, -1, true );
+    m_pDialog->DrawText( m_strText, pElement, &rcWindow, false, true );
 }
 
 
 
-//--------------------------------------------------------------------------------------
+//======================================================================================
 // CDXUTCheckBox class
-//--------------------------------------------------------------------------------------
+//======================================================================================
 
-//--------------------------------------------------------------------------------------
-CDXUTCheckBox::CDXUTCheckBox( CDXUTDialog* pDialog )
+CDXUTCheckBox::CDXUTCheckBox( _In_opt_ CDXUTDialog* pDialog )
 {
     m_Type = DXUT_CONTROL_CHECKBOX;
     m_pDialog = pDialog;
@@ -3831,8 +3214,11 @@ CDXUTCheckBox::CDXUTCheckBox( CDXUTDialog* pDialog )
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTCheckBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(lParam);
+
     if( !m_bEnabled || !m_bVisible )
         return false;
 
@@ -3867,8 +3253,12 @@ bool CDXUTCheckBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
 //--------------------------------------------------------------------------------------
-bool CDXUTCheckBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam )
+_Use_decl_annotations_
+bool CDXUTCheckBox::HandleMouse( UINT uMsg, const POINT& pt, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(wParam);
+    UNREFERENCED_PARAMETER(lParam);
+
     if( !m_bEnabled || !m_bVisible )
         return false;
 
@@ -3915,6 +3305,7 @@ bool CDXUTCheckBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPar
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTCheckBox::SetCheckedInternal( bool bChecked, bool bFromInput )
 {
     m_bChecked = bChecked;
@@ -3924,14 +3315,13 @@ void CDXUTCheckBox::SetCheckedInternal( bool bChecked, bool bFromInput )
 
 
 //--------------------------------------------------------------------------------------
-BOOL CDXUTCheckBox::ContainsPoint( POINT pt )
+bool CDXUTCheckBox::ContainsPoint( _In_ const POINT& pt )
 {
     return ( PtInRect( &m_rcBoundingBox, pt ) ||
              PtInRect( &m_rcButton, pt ) );
 }
 
 
-
 //--------------------------------------------------------------------------------------
 void CDXUTCheckBox::UpdateRects()
 {
@@ -3945,9 +3335,8 @@ void CDXUTCheckBox::UpdateRects()
 }
 
 
-
 //--------------------------------------------------------------------------------------
-void CDXUTCheckBox::Render( float fElapsedTime )
+void CDXUTCheckBox::Render( _In_ float fElapsedTime )
 {
     if( m_bVisible == false )
         return;
@@ -3964,7 +3353,7 @@ void CDXUTCheckBox::Render( float fElapsedTime )
     else if( m_bHasFocus )
         iState = DXUT_STATE_FOCUS;
 
-    CDXUTElement* pElement = m_Elements.GetAt( 0 );
+    auto pElement = m_Elements[ 0 ];
 
     float fBlendRate = ( iState == DXUT_STATE_PRESSED ) ? 0.0f : 0.8f;
 
@@ -3972,26 +3361,23 @@ void CDXUTCheckBox::Render( float fElapsedTime )
     pElement->FontColor.Blend( iState, fElapsedTime, fBlendRate );
 
     m_pDialog->DrawSprite( pElement, &m_rcButton, DXUT_NEAR_BUTTON_DEPTH );
-    m_pDialog->DrawText( m_strText, pElement, &m_rcText, false, -1, false );
+    m_pDialog->DrawText( m_strText, pElement, &m_rcText, false, false );
 
     if( !m_bChecked )
         iState = DXUT_STATE_HIDDEN;
 
-    pElement = m_Elements.GetAt( 1 );
+    pElement = m_Elements[ 1 ];
 
     pElement->TextureColor.Blend( iState, fElapsedTime, fBlendRate );
     m_pDialog->DrawSprite( pElement, &m_rcButton, DXUT_FAR_BUTTON_DEPTH );
 }
 
 
-
-
-//--------------------------------------------------------------------------------------
+//======================================================================================
 // CDXUTRadioButton class
-//--------------------------------------------------------------------------------------
+//======================================================================================
 
-//--------------------------------------------------------------------------------------
-CDXUTRadioButton::CDXUTRadioButton( CDXUTDialog* pDialog )
+CDXUTRadioButton::CDXUTRadioButton( _In_opt_ CDXUTDialog* pDialog )
 {
     m_Type = DXUT_CONTROL_RADIOBUTTON;
     m_pDialog = pDialog;
@@ -4000,8 +3386,11 @@ CDXUTRadioButton::CDXUTRadioButton( CDXUTDialog* pDialog )
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTRadioButton::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(lParam);
+
     if( !m_bEnabled || !m_bVisible )
         return false;
 
@@ -4040,8 +3429,12 @@ bool CDXUTRadioButton::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
 //--------------------------------------------------------------------------------------
-bool CDXUTRadioButton::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam )
+_Use_decl_annotations_
+bool CDXUTRadioButton::HandleMouse( UINT uMsg, const POINT& pt, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(wParam);
+    UNREFERENCED_PARAMETER(lParam);
+
     if( !m_bEnabled || !m_bVisible )
         return false;
 
@@ -4092,6 +3485,7 @@ bool CDXUTRadioButton::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM l
 }
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTRadioButton::SetCheckedInternal( bool bChecked, bool bClearGroup, bool bFromInput )
 {
     if( bChecked && bClearGroup )
@@ -4102,14 +3496,11 @@ void CDXUTRadioButton::SetCheckedInternal( bool bChecked, bool bClearGroup, bool
 }
 
 
-
-
-//--------------------------------------------------------------------------------------
+//======================================================================================
 // CDXUTComboBox class
-//--------------------------------------------------------------------------------------
+//======================================================================================
 
-//--------------------------------------------------------------------------------------
-CDXUTComboBox::CDXUTComboBox( CDXUTDialog* pDialog ) : m_ScrollBar( pDialog )
+CDXUTComboBox::CDXUTComboBox( _In_opt_ CDXUTDialog* pDialog ) : m_ScrollBar( pDialog )
 {
     m_Type = DXUT_CONTROL_COMBOBOX;
     m_pDialog = pDialog;
@@ -4131,14 +3522,14 @@ CDXUTComboBox::~CDXUTComboBox()
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTComboBox::SetTextColor( D3DCOLOR Color )
+void CDXUTComboBox::SetTextColor( _In_ DWORD Color )
 {
-    CDXUTElement* pElement = m_Elements.GetAt( 0 );
+    auto pElement = m_Elements[ 0 ];
 
     if( pElement )
         pElement->FontColor.States[DXUT_STATE_NORMAL] = Color;
 
-    pElement = m_Elements.GetAt( 2 );
+    pElement = m_Elements[ 2 ];
 
     if( pElement )
         pElement->FontColor.States[DXUT_STATE_NORMAL] = Color;
@@ -4158,20 +3549,20 @@ void CDXUTComboBox::UpdateRects()
     m_rcText.right = m_rcButton.left;
 
     m_rcDropdown = m_rcText;
-    OffsetRect( &m_rcDropdown, 0, ( int )( 0.90f * RectHeight( m_rcText ) ) );
+    OffsetRect( &m_rcDropdown, 0, static_cast<int>( 0.90f * RectHeight( m_rcText ) ) );
     m_rcDropdown.bottom += m_nDropHeight;
     m_rcDropdown.right -= m_nSBWidth;
 
     m_rcDropdownText = m_rcDropdown;
-    m_rcDropdownText.left += ( int )( 0.1f * RectWidth( m_rcDropdown ) );
-    m_rcDropdownText.right -= ( int )( 0.1f * RectWidth( m_rcDropdown ) );
-    m_rcDropdownText.top += ( int )( 0.1f * RectHeight( m_rcDropdown ) );
-    m_rcDropdownText.bottom -= ( int )( 0.1f * RectHeight( m_rcDropdown ) );
+    m_rcDropdownText.left += static_cast<int>(0.1f * RectWidth(m_rcDropdown));
+    m_rcDropdownText.right -= static_cast<int>(0.1f * RectWidth(m_rcDropdown));
+    m_rcDropdownText.top += static_cast<int>(0.1f * RectHeight(m_rcDropdown));
+    m_rcDropdownText.bottom -= static_cast<int>(0.1f * RectHeight(m_rcDropdown));
 
     // Update the scrollbar's rects
     m_ScrollBar.SetLocation( m_rcDropdown.right, m_rcDropdown.top + 2 );
     m_ScrollBar.SetSize( m_nSBWidth, RectHeight( m_rcDropdown ) - 2 );
-    DXUTFontNode* pFontNode = m_pDialog->GetManager()->GetFontNode( m_Elements.GetAt( 2 )->iFont );
+    auto pFontNode = m_pDialog->GetManager()->GetFontNode( m_Elements[ 2 ]->iFont );
     if( pFontNode && pFontNode->nHeight )
     {
         m_ScrollBar.SetPageSize( RectHeight( m_rcDropdownText ) / pFontNode->nHeight );
@@ -4193,6 +3584,7 @@ void CDXUTComboBox::OnFocusOut()
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTComboBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
     const DWORD REPEAT_MASK = ( 0x40000000 );
@@ -4279,7 +3671,8 @@ bool CDXUTComboBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
 //--------------------------------------------------------------------------------------
-bool CDXUTComboBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam )
+_Use_decl_annotations_
+bool CDXUTComboBox::HandleMouse( UINT uMsg, const POINT& pt, WPARAM wParam, LPARAM lParam )
 {
     if( !m_bEnabled || !m_bVisible )
         return false;
@@ -4295,13 +3688,13 @@ bool CDXUTComboBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPar
             if( m_bOpened && PtInRect( &m_rcDropdown, pt ) )
             {
                 // Determine which item has been selected
-                for( int i = 0; i < m_Items.GetSize(); i++ )
+                for( size_t i = 0; i < m_Items.size(); i++ )
                 {
-                    DXUTComboBoxItem* pItem = m_Items.GetAt( i );
+                    auto pItem = m_Items[ i ];
                     if( pItem->bVisible &&
                         PtInRect( &pItem->rcActive, pt ) )
                     {
-                        m_iFocused = i;
+                        m_iFocused = static_cast<int>( i );
                     }
                 }
                 return true;
@@ -4340,13 +3733,13 @@ bool CDXUTComboBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPar
                 if( m_bOpened && PtInRect( &m_rcDropdown, pt ) )
                 {
                     // Determine which item has been selected
-                    for( int i = m_ScrollBar.GetTrackPos(); i < m_Items.GetSize(); i++ )
+                    for( size_t i = m_ScrollBar.GetTrackPos(); i < m_Items.size(); i++ )
                     {
-                        DXUTComboBoxItem* pItem = m_Items.GetAt( i );
+                        auto pItem = m_Items[ i ];
                         if( pItem->bVisible &&
                             PtInRect( &pItem->rcActive, pt ) )
                         {
-                            m_iFocused = m_iSelected = i;
+                            m_iFocused = m_iSelected = static_cast<int>( i );
                             m_pDialog->SendEvent( EVENT_COMBOBOX_SELECTION_CHANGED, true, this );
                             m_bOpened = false;
 
@@ -4399,8 +3792,9 @@ bool CDXUTComboBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPar
             int zDelta = ( short )HIWORD( wParam ) / WHEEL_DELTA;
             if( m_bOpened )
             {
-                UINT uLines;
-                SystemParametersInfo( SPI_GETWHEELSCROLLLINES, 0, &uLines, 0 );
+                UINT uLines = 0;
+                if ( !SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &uLines, 0) )
+                    uLines = 0;
                 m_ScrollBar.Scroll( -zDelta * uLines );
             }
             else
@@ -4450,7 +3844,7 @@ void CDXUTComboBox::OnHotkey()
 
     m_iSelected++;
 
-    if( m_iSelected >= ( int )m_Items.GetSize() )
+    if( m_iSelected >= ( int )m_Items.size() )
         m_iSelected = 0;
 
     m_iFocused = m_iSelected;
@@ -4459,17 +3853,18 @@ void CDXUTComboBox::OnHotkey()
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTComboBox::Render( float fElapsedTime )
+void CDXUTComboBox::Render( _In_ float fElapsedTime )
 {
     if( m_bVisible == false )
         return;
+
     DXUT_CONTROL_STATE iState = DXUT_STATE_NORMAL;
 
     if( !m_bOpened )
         iState = DXUT_STATE_HIDDEN;
 
     // Dropdown box
-    CDXUTElement* pElement = m_Elements.GetAt( 2 );
+    auto pElement = m_Elements[ 2 ];
 
     // If we have not initialized the scroll bar page size,
     // do that now.
@@ -4496,20 +3891,19 @@ void CDXUTComboBox::Render( float fElapsedTime )
     m_pDialog->DrawSprite( pElement, &m_rcDropdown, DXUT_NEAR_BUTTON_DEPTH );
 
     // Selection outline
-    CDXUTElement* pSelectionElement = m_Elements.GetAt( 3 );
+    auto pSelectionElement = m_Elements[ 3 ];
     pSelectionElement->TextureColor.Current = pElement->TextureColor.Current;
-    pSelectionElement->FontColor.Current = pSelectionElement->FontColor.States[ DXUT_STATE_NORMAL ];
+    pSelectionElement->FontColor.SetCurrent( pSelectionElement->FontColor.States[ DXUT_STATE_NORMAL ] );
 
-    DXUTFontNode* pFont = m_pDialog->GetFont( pElement->iFont );
+    auto pFont = m_pDialog->GetFont( pElement->iFont );
     if( pFont )
     {
         int curY = m_rcDropdownText.top;
         int nRemainingHeight = RectHeight( m_rcDropdownText );
-        //WCHAR strDropdown[4096] = {0};
 
-        for( int i = m_ScrollBar.GetTrackPos(); i < m_Items.GetSize(); i++ )
+        for( size_t i = m_ScrollBar.GetTrackPos(); i < m_Items.size(); i++ )
         {
-            DXUTComboBoxItem* pItem = m_Items.GetAt( i );
+            auto pItem = m_Items[ i ];
 
             // Make sure there's room left in the dropdown
             nRemainingHeight -= pFont->nHeight;
@@ -4522,10 +3916,6 @@ void CDXUTComboBox::Render( float fElapsedTime )
             SetRect( &pItem->rcActive, m_rcDropdownText.left, curY, m_rcDropdownText.right, curY + pFont->nHeight );
             curY += pFont->nHeight;
 
-            //debug
-            //int blue = 50 * i;
-            //m_pDialog->DrawRect( &pItem->rcActive, 0xFFFF0000 | blue );
-
             pItem->bVisible = true;
 
             if( m_bOpened )
@@ -4533,7 +3923,7 @@ void CDXUTComboBox::Render( float fElapsedTime )
                 if( ( int )i == m_iFocused )
                 {
                     RECT rc;
-                    SetRect( &rc, m_rcDropdown.left, pItem->rcActive.top - 2, m_rcDropdown.right,
+                    SetRect( &rc, m_rcDropdown.left, pItem->rcActive.top, m_rcDropdown.right,
                              pItem->rcActive.bottom + 2 );
                     m_pDialog->DrawSprite( pSelectionElement, &rc, DXUT_NEAR_BUTTON_DEPTH );
                     m_pDialog->DrawText( pItem->strText, pSelectionElement, &pItem->rcActive );
@@ -4575,7 +3965,7 @@ void CDXUTComboBox::Render( float fElapsedTime )
     float fBlendRate = ( iState == DXUT_STATE_PRESSED ) ? 0.0f : 0.8f;
 
     // Button
-    pElement = m_Elements.GetAt( 1 );
+    pElement = m_Elements[ 1 ];
 
     // Blend current color
     pElement->TextureColor.Blend( iState, fElapsedTime, fBlendRate );
@@ -4588,7 +3978,7 @@ void CDXUTComboBox::Render( float fElapsedTime )
         iState = DXUT_STATE_PRESSED;
 
     // Main text box
-    pElement = m_Elements.GetAt( 0 );
+    pElement = m_Elements[ 0 ];
 
     // Blend current color
     pElement->TextureColor.Blend( iState, fElapsedTime, fBlendRate );
@@ -4596,12 +3986,12 @@ void CDXUTComboBox::Render( float fElapsedTime )
 
     m_pDialog->DrawSprite( pElement, &m_rcText, DXUT_NEAR_BUTTON_DEPTH );
 
-    if( m_iSelected >= 0 && m_iSelected < ( int )m_Items.GetSize() )
+    if( m_iSelected >= 0 && m_iSelected < ( int )m_Items.size() )
     {
-        DXUTComboBoxItem* pItem = m_Items.GetAt( m_iSelected );
-        if( pItem != NULL )
+        auto pItem = m_Items[ m_iSelected ];
+        if( pItem )
         {
-            m_pDialog->DrawText( pItem->strText, pElement, &m_rcText, false, -1, true );
+            m_pDialog->DrawText( pItem->strText, pElement, &m_rcText, false, true );
 
         }
     }
@@ -4609,17 +3999,18 @@ void CDXUTComboBox::Render( float fElapsedTime )
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTComboBox::AddItem( const WCHAR* strText, void* pData )
 {
     // Validate parameters
-    if( strText == NULL )
+    if( !strText )
     {
         return E_INVALIDARG;
     }
 
     // Create a new item and set the data
-    DXUTComboBoxItem* pItem = new DXUTComboBoxItem;
-    if( pItem == NULL )
+    auto pItem = new (std::nothrow) DXUTComboBoxItem;
+    if( !pItem )
     {
         return DXTRACE_ERR_MSGBOX( L"new", E_OUTOFMEMORY );
     }
@@ -4628,10 +4019,10 @@ HRESULT CDXUTComboBox::AddItem( const WCHAR* strText, void* pData )
     wcscpy_s( pItem->strText, 256, strText );
     pItem->pData = pData;
 
-    m_Items.Add( pItem );
+    m_Items.push_back( pItem );
 
     // Update the scroll bar with new range
-    m_ScrollBar.SetTrackRange( 0, m_Items.GetSize() );
+    m_ScrollBar.SetTrackRange( 0, (int)m_Items.size() );
 
     // If this is the only item in the list, it's selected
     if( GetNumItems() == 1 )
@@ -4646,53 +4037,53 @@ HRESULT CDXUTComboBox::AddItem( const WCHAR* strText, void* pData )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTComboBox::RemoveItem( UINT index )
+void CDXUTComboBox::RemoveItem( _In_ UINT index )
 {
-    DXUTComboBoxItem* pItem = m_Items.GetAt( index );
+    auto it = m_Items.begin() + index;
+    auto pItem = *it;
     SAFE_DELETE( pItem );
-    m_Items.Remove( index );
-    m_ScrollBar.SetTrackRange( 0, m_Items.GetSize() );
-    if( m_iSelected >= m_Items.GetSize() )
-        m_iSelected = m_Items.GetSize() - 1;
+    m_Items.erase( it );
+    m_ScrollBar.SetTrackRange( 0, (int)m_Items.size() );
+    if( m_iSelected >= (int)m_Items.size() )
+        m_iSelected = (int)m_Items.size() - 1;
 }
 
 
 //--------------------------------------------------------------------------------------
 void CDXUTComboBox::RemoveAllItems()
 {
-    for( int i = 0; i < m_Items.GetSize(); i++ )
+    for( auto it = m_Items.begin(); it != m_Items.end(); ++it )
     {
-        DXUTComboBoxItem* pItem = m_Items.GetAt( i );
+        auto pItem = *it;
         SAFE_DELETE( pItem );
     }
 
-    m_Items.RemoveAll();
+    m_Items.clear();
     m_ScrollBar.SetTrackRange( 0, 1 );
     m_iFocused = m_iSelected = -1;
 }
 
 
-
 //--------------------------------------------------------------------------------------
-bool CDXUTComboBox::ContainsItem( const WCHAR* strText, UINT iStart )
+bool CDXUTComboBox::ContainsItem( _In_z_ const WCHAR* strText, _In_ UINT iStart )
 {
     return ( -1 != FindItem( strText, iStart ) );
 }
 
 
 //--------------------------------------------------------------------------------------
-int CDXUTComboBox::FindItem( const WCHAR* strText, UINT iStart )
+int CDXUTComboBox::FindItem( _In_z_ const WCHAR* strText, _In_ UINT iStart ) const
 {
-    if( strText == NULL )
+    if( !strText )
         return -1;
 
-    for( int i = iStart; i < m_Items.GetSize(); i++ )
+    for( size_t i = iStart; i < m_Items.size(); i++ )
     {
-        DXUTComboBoxItem* pItem = m_Items.GetAt( i );
+        auto pItem = m_Items[ i ];
 
         if( 0 == wcscmp( pItem->strText, strText ) )
         {
-            return i;
+            return static_cast<int>( i );
         }
     }
 
@@ -4701,40 +4092,40 @@ int CDXUTComboBox::FindItem( const WCHAR* strText, UINT iStart )
 
 
 //--------------------------------------------------------------------------------------
-void* CDXUTComboBox::GetSelectedData()
+void* CDXUTComboBox::GetSelectedData() const
 {
     if( m_iSelected < 0 )
-        return NULL;
+        return nullptr;
 
-    DXUTComboBoxItem* pItem = m_Items.GetAt( m_iSelected );
+    auto pItem = m_Items[ m_iSelected ];
     return pItem->pData;
 }
 
 
 //--------------------------------------------------------------------------------------
-DXUTComboBoxItem* CDXUTComboBox::GetSelectedItem()
+DXUTComboBoxItem* CDXUTComboBox::GetSelectedItem() const
 {
     if( m_iSelected < 0 )
-        return NULL;
+        return nullptr;
 
-    return m_Items.GetAt( m_iSelected );
+    return m_Items[ m_iSelected ];
 }
 
 
 //--------------------------------------------------------------------------------------
-void* CDXUTComboBox::GetItemData( const WCHAR* strText )
+void* CDXUTComboBox::GetItemData( _In_z_ const WCHAR* strText ) const
 {
     int index = FindItem( strText );
     if( index == -1 )
     {
-        return NULL;
+        return nullptr;
     }
 
-    DXUTComboBoxItem* pItem = m_Items.GetAt( index );
-    if( pItem == NULL )
+    auto pItem = m_Items[ index ];
+    if( !pItem )
     {
-        DXTRACE_ERR( L"CGrowableArray::GetAt", E_FAIL );
-        return NULL;
+        DXTRACE_ERR( L"CDXUTComboBox::GetItemData", E_FAIL );
+        return nullptr;
     }
 
     return pItem->pData;
@@ -4742,17 +4133,17 @@ void* CDXUTComboBox::GetItemData( const WCHAR* strText )
 
 
 //--------------------------------------------------------------------------------------
-void* CDXUTComboBox::GetItemData( int nIndex )
+void* CDXUTComboBox::GetItemData( _In_ int nIndex ) const
 {
-    if( nIndex < 0 || nIndex >= m_Items.GetSize() )
-        return NULL;
+    if( nIndex < 0 || nIndex >= (int)m_Items.size() )
+        return nullptr;
 
-    return m_Items.GetAt( nIndex )->pData;
+    return m_Items[ nIndex ]->pData;
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTComboBox::SetSelectedByIndex( UINT index )
+HRESULT CDXUTComboBox::SetSelectedByIndex( _In_ UINT index )
 {
     if( index >= GetNumItems() )
         return E_INVALIDARG;
@@ -4766,9 +4157,9 @@ HRESULT CDXUTComboBox::SetSelectedByIndex( UINT index )
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTComboBox::SetSelectedByText( const WCHAR* strText )
+HRESULT CDXUTComboBox::SetSelectedByText( _In_z_  const WCHAR* strText )
 {
-    if( strText == NULL )
+    if( !strText )
         return E_INVALIDARG;
 
     int index = FindItem( strText );
@@ -4784,15 +4175,15 @@ HRESULT CDXUTComboBox::SetSelectedByText( const WCHAR* strText )
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTComboBox::SetSelectedByData( void* pData )
+HRESULT CDXUTComboBox::SetSelectedByData( _In_ void* pData )
 {
-    for( int i = 0; i < m_Items.GetSize(); i++ )
+    for( size_t i = 0; i < m_Items.size(); i++ )
     {
-        DXUTComboBoxItem* pItem = m_Items.GetAt( i );
+        auto pItem = m_Items[ i ];
 
         if( pItem->pData == pData )
         {
-            m_iFocused = m_iSelected = i;
+            m_iFocused = m_iSelected = static_cast<int>( i );
             m_pDialog->SendEvent( EVENT_COMBOBOX_SELECTION_CHANGED, false, this );
             return S_OK;
         }
@@ -4802,9 +4193,11 @@ HRESULT CDXUTComboBox::SetSelectedByData( void* pData )
 }
 
 
+//======================================================================================
+// CDXUTSlider class
+//======================================================================================
 
-//--------------------------------------------------------------------------------------
-CDXUTSlider::CDXUTSlider( CDXUTDialog* pDialog )
+CDXUTSlider::CDXUTSlider( _In_opt_ CDXUTDialog* pDialog )
 {
     m_Type = DXUT_CONTROL_SLIDER;
     m_pDialog = pDialog;
@@ -4818,7 +4211,7 @@ CDXUTSlider::CDXUTSlider( CDXUTDialog* pDialog )
 
 
 //--------------------------------------------------------------------------------------
-BOOL CDXUTSlider::ContainsPoint( POINT pt )
+bool CDXUTSlider::ContainsPoint( _In_ const POINT& pt )
 {
     return ( PtInRect( &m_rcBoundingBox, pt ) ||
              PtInRect( &m_rcButton, pt ) );
@@ -4838,15 +4231,21 @@ void CDXUTSlider::UpdateRects()
     OffsetRect( &m_rcButton, m_nButtonX, 0 );
 }
 
-int CDXUTSlider::ValueFromPos( int x )
+
+//--------------------------------------------------------------------------------------
+int CDXUTSlider::ValueFromPos( _In_ int x )
 {
     float fValuePerPixel = ( float )( m_nMax - m_nMin ) / RectWidth( m_rcBoundingBox );
     return ( int )( 0.5f + m_nMin + fValuePerPixel * ( x - m_rcBoundingBox.left ) );
 }
 
+
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTSlider::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(lParam);
+
     if( !m_bEnabled || !m_bVisible )
         return false;
 
@@ -4894,8 +4293,11 @@ bool CDXUTSlider::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
 //--------------------------------------------------------------------------------------
-bool CDXUTSlider::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam )
+_Use_decl_annotations_
+bool CDXUTSlider::HandleMouse( UINT uMsg, const POINT& pt, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(lParam);
+
     if( !m_bEnabled || !m_bVisible )
         return false;
 
@@ -4985,7 +4387,7 @@ bool CDXUTSlider::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTSlider::SetRange( int nMin, int nMax )
+void CDXUTSlider::SetRange( _In_ int nMin, _In_ int nMax )
 {
     m_nMin = nMin;
     m_nMax = nMax;
@@ -4995,11 +4397,11 @@ void CDXUTSlider::SetRange( int nMin, int nMax )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTSlider::SetValueInternal( int nValue, bool bFromInput )
+void CDXUTSlider::SetValueInternal( _In_ int nValue, _In_ bool bFromInput )
 {
     // Clamp to range
-    nValue = __max( m_nMin, nValue );
-    nValue = __min( m_nMax, nValue );
+    nValue = std::max( m_nMin, nValue );
+    nValue = std::min( m_nMax, nValue );
 
     if( nValue == m_nValue )
         return;
@@ -5012,7 +4414,7 @@ void CDXUTSlider::SetValueInternal( int nValue, bool bFromInput )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTSlider::Render( float fElapsedTime )
+void CDXUTSlider::Render( _In_ float fElapsedTime )
 {
     if( m_bVisible == false )
         return;
@@ -5051,13 +4453,13 @@ void CDXUTSlider::Render( float fElapsedTime )
 
     float fBlendRate = ( iState == DXUT_STATE_PRESSED ) ? 0.0f : 0.8f;
 
-    CDXUTElement* pElement = m_Elements.GetAt( 0 );
+    auto pElement = m_Elements[ 0 ];
 
     // Blend current color
     pElement->TextureColor.Blend( iState, fElapsedTime, fBlendRate );
     m_pDialog->DrawSprite( pElement, &m_rcBoundingBox, DXUT_FAR_BUTTON_DEPTH );
 
-    pElement = m_Elements.GetAt( 1 );
+    pElement = m_Elements[ 1 ];
 
     // Blend current color
     pElement->TextureColor.Blend( iState, fElapsedTime, fBlendRate );
@@ -5065,12 +4467,11 @@ void CDXUTSlider::Render( float fElapsedTime )
 }
 
 
-//--------------------------------------------------------------------------------------
+//======================================================================================
 // CDXUTScrollBar class
-//--------------------------------------------------------------------------------------
+//======================================================================================
 
-//--------------------------------------------------------------------------------------
-CDXUTScrollBar::CDXUTScrollBar( CDXUTDialog* pDialog )
+CDXUTScrollBar::CDXUTScrollBar( _In_opt_ CDXUTDialog* pDialog )
 {
     m_Type = DXUT_CONTROL_SCROLLBAR;
     m_pDialog = pDialog;
@@ -5123,7 +4524,7 @@ void CDXUTScrollBar::UpdateThumbRect()
 {
     if( m_nEnd - m_nStart > m_nPageSize )
     {
-        int nThumbHeight = __max( RectHeight( m_rcTrack ) * m_nPageSize / ( m_nEnd - m_nStart ),
+        int nThumbHeight = std::max( RectHeight( m_rcTrack ) * m_nPageSize / ( m_nEnd - m_nStart ),
                                   SCROLLBAR_MINTHUMBSIZE );
         int nMaxPosition = m_nEnd - m_nStart - m_nPageSize;
         m_rcThumb.top = m_rcTrack.top + ( m_nPosition - m_nStart ) * ( RectHeight( m_rcTrack ) - nThumbHeight )
@@ -5144,7 +4545,7 @@ void CDXUTScrollBar::UpdateThumbRect()
 //--------------------------------------------------------------------------------------
 // Scroll() scrolls by nDelta items.  A positive value scrolls down, while a negative
 // value scrolls up.
-void CDXUTScrollBar::Scroll( int nDelta )
+void CDXUTScrollBar::Scroll( _In_ int nDelta )
 {
     // Perform scroll
     m_nPosition += nDelta;
@@ -5158,7 +4559,7 @@ void CDXUTScrollBar::Scroll( int nDelta )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTScrollBar::ShowItem( int nIndex )
+void CDXUTScrollBar::ShowItem( _In_ int nIndex )
 {
     // Cap the index
 
@@ -5180,15 +4581,23 @@ void CDXUTScrollBar::ShowItem( int nIndex )
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTScrollBar::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(uMsg);
+    UNREFERENCED_PARAMETER(wParam);
+    UNREFERENCED_PARAMETER(lParam);
     return false;
 }
 
 
 //--------------------------------------------------------------------------------------
-bool CDXUTScrollBar::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam )
+_Use_decl_annotations_
+bool CDXUTScrollBar::HandleMouse( UINT uMsg, const POINT& pt, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(wParam);
+    UNREFERENCED_PARAMETER(lParam);
+
     static int ThumbOffsetY;
 
     m_LastMouse = pt;
@@ -5298,8 +4707,11 @@ bool CDXUTScrollBar::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPa
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTScrollBar::MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(wParam);
+
     if( WM_CAPTURECHANGED == uMsg )
     {
         // The application just lost mouse capture. We may not have gotten
@@ -5313,7 +4725,7 @@ bool CDXUTScrollBar::MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTScrollBar::Render( float fElapsedTime )
+void CDXUTScrollBar::Render( _In_ float fElapsedTime )
 {
     if( m_bVisible == false )
         return;
@@ -5383,28 +4795,28 @@ void CDXUTScrollBar::Render( float fElapsedTime )
     float fBlendRate = ( iState == DXUT_STATE_PRESSED ) ? 0.0f : 0.8f;
 
     // Background track layer
-    CDXUTElement* pElement = m_Elements.GetAt( 0 );
+    auto pElement = m_Elements[ 0 ];
 
     // Blend current color
     pElement->TextureColor.Blend( iState, fElapsedTime, fBlendRate );
     m_pDialog->DrawSprite( pElement, &m_rcTrack, DXUT_FAR_BUTTON_DEPTH );
 
     // Up Arrow
-    pElement = m_Elements.GetAt( 1 );
+    pElement = m_Elements[ 1 ];
 
     // Blend current color
     pElement->TextureColor.Blend( iState, fElapsedTime, fBlendRate );
     m_pDialog->DrawSprite( pElement, &m_rcUpButton, DXUT_NEAR_BUTTON_DEPTH );
 
     // Down Arrow
-    pElement = m_Elements.GetAt( 2 );
+    pElement = m_Elements[ 2 ];
 
     // Blend current color
     pElement->TextureColor.Blend( iState, fElapsedTime, fBlendRate );
     m_pDialog->DrawSprite( pElement, &m_rcDownButton, DXUT_NEAR_BUTTON_DEPTH );
 
     // Thumb button
-    pElement = m_Elements.GetAt( 3 );
+    pElement = m_Elements[ 3 ];
 
     // Blend current color
     pElement->TextureColor.Blend( iState, fElapsedTime, fBlendRate );
@@ -5414,7 +4826,7 @@ void CDXUTScrollBar::Render( float fElapsedTime )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTScrollBar::SetTrackRange( int nStart, int nEnd )
+void CDXUTScrollBar::SetTrackRange( _In_ int nStart, _In_ int nEnd )
 {
     m_nStart = nStart; m_nEnd = nEnd;
     Cap();
@@ -5434,12 +4846,12 @@ void CDXUTScrollBar::Cap()  // Clips position at boundaries. Ensures it stays wi
         m_nPosition = m_nEnd - m_nPageSize + 1;
 }
 
-//--------------------------------------------------------------------------------------
+
+//======================================================================================
 // CDXUTListBox class
-//--------------------------------------------------------------------------------------
+//======================================================================================
 
-//--------------------------------------------------------------------------------------
-CDXUTListBox::CDXUTListBox( CDXUTDialog* pDialog ) : m_ScrollBar( pDialog )
+CDXUTListBox::CDXUTListBox( _In_opt_ CDXUTDialog* pDialog ) : m_ScrollBar( pDialog )
 {
     m_Type = DXUT_CONTROL_LISTBOX;
     m_pDialog = pDialog;
@@ -5476,7 +4888,7 @@ void CDXUTListBox::UpdateRects()
     // Update the scrollbar's rects
     m_ScrollBar.SetLocation( m_rcBoundingBox.right - m_nSBWidth, m_rcBoundingBox.top );
     m_ScrollBar.SetSize( m_nSBWidth, m_height );
-    DXUTFontNode* pFontNode = m_pDialog->GetManager()->GetFontNode( m_Elements.GetAt( 0 )->iFont );
+    auto pFontNode = m_pDialog->GetManager()->GetFontNode( m_Elements[ 0 ]->iFont );
     if( pFontNode && pFontNode->nHeight )
     {
         m_ScrollBar.SetPageSize( RectHeight( m_rcText ) / pFontNode->nHeight );
@@ -5489,9 +4901,10 @@ void CDXUTListBox::UpdateRects()
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTListBox::AddItem( const WCHAR* wszText, void* pData )
 {
-    DXUTListBoxItem* pNewItem = new DXUTListBoxItem;
+    auto pNewItem = new (std::nothrow) DXUTListBoxItem;
     if( !pNewItem )
         return E_OUTOFMEMORY;
 
@@ -5500,24 +4913,18 @@ HRESULT CDXUTListBox::AddItem( const WCHAR* wszText, void* pData )
     SetRect( &pNewItem->rcActive, 0, 0, 0, 0 );
     pNewItem->bSelected = false;
 
-    HRESULT hr = m_Items.Add( pNewItem );
-    if( FAILED( hr ) )
-    {
-        SAFE_DELETE( pNewItem );
-    }
-    else
-    {
-        m_ScrollBar.SetTrackRange( 0, m_Items.GetSize() );
-    }
+    m_Items.push_back( pNewItem );
+    m_ScrollBar.SetTrackRange( 0, (int)m_Items.size() );
 
-    return hr;
+    return S_OK;
 }
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTListBox::InsertItem( int nIndex, const WCHAR* wszText, void* pData )
 {
-    DXUTListBoxItem* pNewItem = new DXUTListBoxItem;
+    auto pNewItem = new (std::nothrow) DXUTListBoxItem;
     if( !pNewItem )
         return E_OUTOFMEMORY;
 
@@ -5526,56 +4933,50 @@ HRESULT CDXUTListBox::InsertItem( int nIndex, const WCHAR* wszText, void* pData
     SetRect( &pNewItem->rcActive, 0, 0, 0, 0 );
     pNewItem->bSelected = false;
 
-    HRESULT hr = m_Items.Insert( nIndex, pNewItem );
-    if( SUCCEEDED( hr ) )
-        m_ScrollBar.SetTrackRange( 0, m_Items.GetSize() );
-    else
-        SAFE_DELETE( pNewItem );
+    m_Items[ nIndex ] = pNewItem;
+    m_ScrollBar.SetTrackRange( 0, (int)m_Items.size() );
 
-    return hr;
+    return S_OK;
 }
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTListBox::RemoveItem( int nIndex )
+void CDXUTListBox::RemoveItem( _In_ int nIndex )
 {
-    if( nIndex < 0 || nIndex >= ( int )m_Items.GetSize() )
+    if( nIndex < 0 || nIndex >= ( int )m_Items.size() )
         return;
 
-    DXUTListBoxItem* pItem = m_Items.GetAt( nIndex );
-
+    auto it = m_Items.begin() + nIndex;
+    auto pItem = *it;
     delete pItem;
-    m_Items.Remove( nIndex );
-    m_ScrollBar.SetTrackRange( 0, m_Items.GetSize() );
-    if( m_nSelected >= ( int )m_Items.GetSize() )
-        m_nSelected = m_Items.GetSize() - 1;
+    m_Items.erase(it);
+    m_ScrollBar.SetTrackRange( 0, (int)m_Items.size() );
+    if( m_nSelected >= ( int )m_Items.size() )
+        m_nSelected = int( m_Items.size() ) - 1;
 
     m_pDialog->SendEvent( EVENT_LISTBOX_SELECTION, true, this );
 }
 
 
-
-
-
 //--------------------------------------------------------------------------------------
 void CDXUTListBox::RemoveAllItems()
 {
-    for( int i = 0; i < m_Items.GetSize(); ++i )
+    for( auto it = m_Items.begin(); it != m_Items.end(); ++it )
     {
-        DXUTListBoxItem* pItem = m_Items.GetAt( i );
+        auto pItem = *it;
         delete pItem;
     }
 
-    m_Items.RemoveAll();
+    m_Items.clear();
     m_ScrollBar.SetTrackRange( 0, 1 );
 }
 
 
 //--------------------------------------------------------------------------------------
-DXUTListBoxItem* CDXUTListBox::GetItem( int nIndex )
+DXUTListBoxItem* CDXUTListBox::GetItem( _In_ int nIndex ) const
 {
-    if( nIndex < 0 || nIndex >= ( int )m_Items.GetSize() )
-        return NULL;
+    if( nIndex < 0 || nIndex >= ( int )m_Items.size() )
+        return nullptr;
 
     return m_Items[nIndex];
 }
@@ -5588,7 +4989,7 @@ DXUTListBoxItem* CDXUTListBox::GetItem( int nIndex )
 // subsequent searches, the app passes the returned index back to GetSelectedIndex as.
 // nPreviousSelected.
 // Returns -1 on error or if no item is selected.
-int CDXUTListBox::GetSelectedIndex( int nPreviousSelected )
+int CDXUTListBox::GetSelectedIndex( _In_ int nPreviousSelected ) const
 {
     if( nPreviousSelected < -1 )
         return -1;
@@ -5596,9 +4997,9 @@ int CDXUTListBox::GetSelectedIndex( int nPreviousSelected )
     if( m_dwStyle & MULTISELECTION )
     {
         // Multiple selection enabled. Search for the next item with the selected flag.
-        for( int i = nPreviousSelected + 1; i < ( int )m_Items.GetSize(); ++i )
+        for( int i = nPreviousSelected + 1; i < ( int )m_Items.size(); ++i )
         {
-            DXUTListBoxItem* pItem = m_Items.GetAt( i );
+            auto pItem = m_Items[ i ];
 
             if( pItem->bSelected )
                 return i;
@@ -5615,10 +5016,10 @@ int CDXUTListBox::GetSelectedIndex( int nPreviousSelected )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTListBox::SelectItem( int nNewIndex )
+void CDXUTListBox::SelectItem( _In_ int nNewIndex )
 {
     // If no item exists, do nothing.
-    if( m_Items.GetSize() == 0 )
+    if( m_Items.size() == 0 )
         return;
 
     int nOldSelected = m_nSelected;
@@ -5629,8 +5030,8 @@ void CDXUTListBox::SelectItem( int nNewIndex )
     // Perform capping
     if( m_nSelected < 0 )
         m_nSelected = 0;
-    if( m_nSelected >= ( int )m_Items.GetSize() )
-        m_nSelected = m_Items.GetSize() - 1;
+    if( m_nSelected >= ( int )m_Items.size() )
+        m_nSelected = int( m_Items.size() ) - 1;
 
     if( nOldSelected != m_nSelected )
     {
@@ -5651,6 +5052,7 @@ void CDXUTListBox::SelectItem( int nNewIndex )
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTListBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
     if( !m_bEnabled || !m_bVisible )
@@ -5673,7 +5075,7 @@ bool CDXUTListBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
                 case VK_END:
                     {
                         // If no item exists, do nothing.
-                        if( m_Items.GetSize() == 0 )
+                        if( m_Items.size() == 0 )
                             return true;
 
                         int nOldSelected = m_nSelected;
@@ -5692,14 +5094,14 @@ bool CDXUTListBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
                             case VK_HOME:
                                 m_nSelected = 0; break;
                             case VK_END:
-                                m_nSelected = m_Items.GetSize() - 1; break;
+                                m_nSelected = int( m_Items.size() ) - 1; break;
                         }
 
                         // Perform capping
                         if( m_nSelected < 0 )
                             m_nSelected = 0;
-                        if( m_nSelected >= ( int )m_Items.GetSize() )
-                            m_nSelected = m_Items.GetSize() - 1;
+                        if( m_nSelected >= ( int )m_Items.size() )
+                            m_nSelected = int( m_Items.size() ) - 1;
 
                         if( nOldSelected != m_nSelected )
                         {
@@ -5708,9 +5110,9 @@ bool CDXUTListBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
                                 // Multiple selection
 
                                 // Clear all selection
-                                for( int i = 0; i < ( int )m_Items.GetSize(); ++i )
+                                for( int i = 0; i < ( int )m_Items.size(); ++i )
                                 {
-                                    DXUTListBoxItem* pItem = m_Items[i];
+                                    auto pItem = m_Items[i];
                                     pItem->bSelected = false;
                                 }
 
@@ -5718,9 +5120,9 @@ bool CDXUTListBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
                                 {
                                     // Select all items from m_nSelStart to
                                     // m_nSelected
-                                    int nEnd = __max( m_nSelStart, m_nSelected );
+                                    int nEnd = std::max( m_nSelStart, m_nSelected );
 
-                                    for( int n = __min( m_nSelStart, m_nSelected ); n <= nEnd; ++n )
+                                    for( int n = std::min( m_nSelStart, m_nSelected ); n <= nEnd; ++n )
                                         m_Items[n]->bSelected = true;
                                 }
                                 else
@@ -5759,7 +5161,8 @@ bool CDXUTListBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
 //--------------------------------------------------------------------------------------
-bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam )
+_Use_decl_annotations_
+bool CDXUTListBox::HandleMouse( UINT uMsg, const POINT& pt, WPARAM wParam, LPARAM lParam )
 {
     if( !m_bEnabled || !m_bVisible )
         return false;
@@ -5778,7 +5181,7 @@ bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
         case WM_LBUTTONDOWN:
         case WM_LBUTTONDBLCLK:
             // Check for clicks in the text area
-            if( m_Items.GetSize() > 0 && PtInRect( &m_rcSelection, pt ) )
+            if( !m_Items.empty() && PtInRect( &m_rcSelection, pt ) )
             {
                 // Compute the index of the clicked item
 
@@ -5791,7 +5194,7 @@ bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
                 // Only proceed if the click falls on top of an item.
 
                 if( nClicked >= m_ScrollBar.GetTrackPos() &&
-                    nClicked < ( int )m_Items.GetSize() &&
+                    nClicked < ( int )m_Items.size() &&
                     nClicked < m_ScrollBar.GetTrackPos() + m_ScrollBar.GetPageSize() )
                 {
                     SetCapture( DXUTGetHWND() );
@@ -5817,7 +5220,7 @@ bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
                     {
                         // Determine behavior based on the state of Shift and Ctrl
 
-                        DXUTListBoxItem* pSelItem = m_Items.GetAt( m_nSelected );
+                        auto pSelItem = m_Items[ m_nSelected ];
                         if( ( wParam & ( MK_SHIFT | MK_CONTROL ) ) == MK_CONTROL )
                         {
                             // Control click. Reverse the selection of this item.
@@ -5830,24 +5233,24 @@ bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
                             // from last selected item to the current item.
                             // Clear everything else.
 
-                            int nBegin = __min( m_nSelStart, m_nSelected );
-                            int nEnd = __max( m_nSelStart, m_nSelected );
+                            int nBegin = std::min( m_nSelStart, m_nSelected );
+                            int nEnd = std::max( m_nSelStart, m_nSelected );
 
                             for( int i = 0; i < nBegin; ++i )
                             {
-                                DXUTListBoxItem* pItem = m_Items.GetAt( i );
+                                auto pItem = m_Items[ i ];
                                 pItem->bSelected = false;
                             }
 
-                            for( int i = nEnd + 1; i < ( int )m_Items.GetSize(); ++i )
+                            for( int i = nEnd + 1; i < ( int )m_Items.size(); ++i )
                             {
-                                DXUTListBoxItem* pItem = m_Items.GetAt( i );
+                                auto pItem = m_Items[ i ];
                                 pItem->bSelected = false;
                             }
 
                             for( int i = nBegin; i <= nEnd; ++i )
                             {
-                                DXUTListBoxItem* pItem = m_Items.GetAt( i );
+                                auto pItem = m_Items[ i ];
                                 pItem->bSelected = true;
                             }
                         }
@@ -5860,15 +5263,15 @@ bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
                             //     the same state as m_nSelStart, not including m_nSelected.
                             //   Set m_nSelected to selected.
 
-                            int nBegin = __min( m_nSelStart, m_nSelected );
-                            int nEnd = __max( m_nSelStart, m_nSelected );
+                            int nBegin = std::min( m_nSelStart, m_nSelected );
+                            int nEnd = std::max( m_nSelStart, m_nSelected );
 
                             // The two ends do not need to be set here.
 
-                            bool bLastSelected = m_Items.GetAt( m_nSelStart )->bSelected;
+                            bool bLastSelected = m_Items[ m_nSelStart ]->bSelected;
                             for( int i = nBegin + 1; i < nEnd; ++i )
                             {
-                                DXUTListBoxItem* pItem = m_Items.GetAt( i );
+                                auto pItem = m_Items[ i ];
                                 pItem->bSelected = bLastSelected;
                             }
 
@@ -5885,9 +5288,9 @@ bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
                             // item.
 
 
-                            for( int i = 0; i < ( int )m_Items.GetSize(); ++i )
+                            for( int i = 0; i < ( int )m_Items.size(); ++i )
                             {
-                                DXUTListBoxItem* pItem = m_Items.GetAt( i );
+                                auto pItem = m_Items[ i ];
                                 pItem->bSelected = false;
                             }
 
@@ -5911,9 +5314,9 @@ bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
             {
                 // Set all items between m_nSelStart and m_nSelected to
                 // the same state as m_nSelStart
-                int nEnd = __max( m_nSelStart, m_nSelected );
+                int nEnd = std::max( m_nSelStart, m_nSelected );
 
-                for( int n = __min( m_nSelStart, m_nSelected ) + 1; n < nEnd; ++n )
+                for( int n = std::min( m_nSelStart, m_nSelected ) + 1; n < nEnd; ++n )
                     m_Items[n]->bSelected = m_Items[m_nSelStart]->bSelected;
                 m_Items[m_nSelected]->bSelected = m_Items[m_nSelStart]->bSelected;
 
@@ -5942,7 +5345,7 @@ bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
                 // Only proceed if the cursor is on top of an item.
 
                 if( nItem >= ( int )m_ScrollBar.GetTrackPos() &&
-                    nItem < ( int )m_Items.GetSize() &&
+                    nItem < ( int )m_Items.size() &&
                     nItem < m_ScrollBar.GetTrackPos() + m_ScrollBar.GetPageSize() )
                 {
                     m_nSelected = nItem;
@@ -5959,7 +5362,7 @@ bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
                 {
                     // User drags the mouse below window bottom
                     m_ScrollBar.Scroll( 1 );
-                    m_nSelected = __min( ( int )m_Items.GetSize(), m_ScrollBar.GetTrackPos() +
+                    m_nSelected = std::min( ( int )m_Items.size(), m_ScrollBar.GetTrackPos() +
                                          m_ScrollBar.GetPageSize() ) - 1;
                     m_pDialog->SendEvent( EVENT_LISTBOX_SELECTION, true, this );
                 }
@@ -5968,8 +5371,9 @@ bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
 
         case WM_MOUSEWHEEL:
         {
-            UINT uLines;
-            SystemParametersInfo( SPI_GETWHEELSCROLLLINES, 0, &uLines, 0 );
+            UINT uLines = 0;
+            if ( !SystemParametersInfo( SPI_GETWHEELSCROLLLINES, 0, &uLines, 0 ) )
+                uLines = 0;
             int nScrollAmount = int( ( short )HIWORD( wParam ) ) / WHEEL_DELTA * uLines;
             m_ScrollBar.Scroll( -nScrollAmount );
             return true;
@@ -5981,8 +5385,11 @@ bool CDXUTListBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTListBox::MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(wParam);
+
     if( WM_CAPTURECHANGED == uMsg )
     {
         // The application just lost mouse capture. We may not have gotten
@@ -5996,23 +5403,23 @@ bool CDXUTListBox::MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTListBox::Render( float fElapsedTime )
+void CDXUTListBox::Render( _In_ float fElapsedTime )
 {
     if( m_bVisible == false )
         return;
 
-    CDXUTElement* pElement = m_Elements.GetAt( 0 );
+    auto pElement = m_Elements[ 0 ];
     pElement->TextureColor.Blend( DXUT_STATE_NORMAL, fElapsedTime );
     pElement->FontColor.Blend( DXUT_STATE_NORMAL, fElapsedTime );
 
-    CDXUTElement* pSelElement = m_Elements.GetAt( 1 );
+    auto pSelElement = m_Elements[ 1 ];
     pSelElement->TextureColor.Blend( DXUT_STATE_NORMAL, fElapsedTime );
     pSelElement->FontColor.Blend( DXUT_STATE_NORMAL, fElapsedTime );
 
     m_pDialog->DrawSprite( pElement, &m_rcBoundingBox, DXUT_FAR_BUTTON_DEPTH );
 
     // Render the text
-    if( m_Items.GetSize() > 0 )
+    if( !m_Items.empty() )
     {
         // Find out the height of a single line of text
         RECT rc = m_rcText;
@@ -6034,12 +5441,12 @@ void CDXUTListBox::Render( float fElapsedTime )
         }
 
         rc.right = m_rcText.right;
-        for( int i = m_ScrollBar.GetTrackPos(); i < ( int )m_Items.GetSize(); ++i )
+        for( int i = m_ScrollBar.GetTrackPos(); i < ( int )m_Items.size(); ++i )
         {
             if( rc.bottom > m_rcText.bottom )
                 break;
 
-            DXUTListBoxItem* pItem = m_Items.GetAt( i );
+            auto pItem = m_Items[ i ];
 
             // Determine if we need to render this item with the
             // selected element.
@@ -6076,34 +5483,19 @@ void CDXUTListBox::Render( float fElapsedTime )
 }
 
 
-// Static member initialization
-HINSTANCE               CUniBuffer::s_hDll = NULL;
-HRESULT ( WINAPI*CUniBuffer::_ScriptApplyDigitSubstitution )( const SCRIPT_DIGITSUBSTITUTE*, SCRIPT_CONTROL*,
-                                                              SCRIPT_STATE* ) = Dummy_ScriptApplyDigitSubstitution;
-HRESULT ( WINAPI*CUniBuffer::_ScriptStringAnalyse )( HDC, const void*, int, int, int, DWORD, int, SCRIPT_CONTROL*,
-                                                     SCRIPT_STATE*, const int*, SCRIPT_TABDEF*, const BYTE*,
-                                                     SCRIPT_STRING_ANALYSIS* ) = Dummy_ScriptStringAnalyse;
-HRESULT ( WINAPI*CUniBuffer::_ScriptStringCPtoX )( SCRIPT_STRING_ANALYSIS, int, BOOL, int* ) = Dummy_ScriptStringCPtoX;
-HRESULT ( WINAPI*CUniBuffer::_ScriptStringXtoCP )( SCRIPT_STRING_ANALYSIS, int, int*, int* ) = Dummy_ScriptStringXtoCP;
-HRESULT ( WINAPI*CUniBuffer::_ScriptStringFree )( SCRIPT_STRING_ANALYSIS* ) = Dummy_ScriptStringFree;
-const SCRIPT_LOGATTR*   ( WINAPI*CUniBuffer::_ScriptString_pLogAttr )( SCRIPT_STRING_ANALYSIS ) =
-    Dummy_ScriptString_pLogAttr;
-const int*              ( WINAPI*CUniBuffer::_ScriptString_pcOutChars )( SCRIPT_STRING_ANALYSIS ) =
-    Dummy_ScriptString_pcOutChars;
-bool                    CDXUTEditBox::s_bHideCaret;   // If true, we don't render the caret.
-
-
-
-//--------------------------------------------------------------------------------------
+//======================================================================================
 // CDXUTEditBox class
-//--------------------------------------------------------------------------------------
+//======================================================================================
+
+// Static member initialization
+bool CDXUTEditBox::s_bHideCaret;   // If true, we don't render the caret.
 
 // When scrolling, EDITBOX_SCROLLEXTENT is reciprocal of the amount to scroll.
 // If EDITBOX_SCROLLEXTENT = 4, then we scroll 1/4 of the control each time.
 #define EDITBOX_SCROLLEXTENT 4
 
 //--------------------------------------------------------------------------------------
-CDXUTEditBox::CDXUTEditBox( CDXUTDialog* pDialog )
+CDXUTEditBox::CDXUTEditBox( _In_opt_ CDXUTDialog* pDialog )
 {
     m_Type = DXUT_CONTROL_EDITBOX;
     m_pDialog = pDialog;
@@ -6137,7 +5529,7 @@ CDXUTEditBox::~CDXUTEditBox()
 // PlaceCaret: Set the caret to a character position, and adjust the scrolling if
 //             necessary.
 //--------------------------------------------------------------------------------------
-void CDXUTEditBox::PlaceCaret( int nCP )
+void CDXUTEditBox::PlaceCaret( _In_ int nCP )
 {
     assert( nCP >= 0 && nCP <= m_Buffer.GetTextSize() );
     m_nCaret = nCP;
@@ -6146,7 +5538,7 @@ void CDXUTEditBox::PlaceCaret( int nCP )
     int nX1st, nX, nX2;
     m_Buffer.CPtoX( m_nFirstVisible, FALSE, &nX1st );  // 1st visible char
     m_Buffer.CPtoX( nCP, FALSE, &nX );  // LEAD
-    // If nCP is the NULL terminator, get the leading edge instead of trailing.
+    // If nCP is the nul terminator, get the leading edge instead of trailing.
     if( nCP == m_Buffer.GetTextSize() )
         nX2 = nX;
     else
@@ -6194,9 +5586,9 @@ void CDXUTEditBox::ClearText()
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTEditBox::SetText( LPCWSTR wszText, bool bSelected )
+void CDXUTEditBox::SetText( _In_z_ LPCWSTR wszText, _In_ bool bSelected )
 {
-    assert( wszText != NULL );
+    assert( wszText );
 
     m_Buffer.SetText( wszText );
     m_nFirstVisible = 0;
@@ -6207,8 +5599,8 @@ void CDXUTEditBox::SetText( LPCWSTR wszText, bool bSelected )
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTEditBox::GetTextCopy( __out_ecount(bufferCount) LPWSTR strDest, 
-                                   UINT bufferCount  )
+_Use_decl_annotations_
+HRESULT CDXUTEditBox::GetTextCopy( LPWSTR strDest,  UINT bufferCount  ) const
 {
     assert( strDest );
 
@@ -6221,8 +5613,8 @@ HRESULT CDXUTEditBox::GetTextCopy( __out_ecount(bufferCount) LPWSTR strDest,
 //--------------------------------------------------------------------------------------
 void CDXUTEditBox::DeleteSelectionText()
 {
-    int nFirst = __min( m_nCaret, m_nSelStart );
-    int nLast = __max( m_nCaret, m_nSelStart );
+    int nFirst = std::min( m_nCaret, m_nSelStart );
+    int nLast = std::max( m_nCaret, m_nSelStart );
     // Update caret and selection
     PlaceCaret( nFirst );
     m_nSelStart = m_nCaret;
@@ -6258,23 +5650,27 @@ void CDXUTEditBox::UpdateRects()
 }
 
 
+#pragma warning(push)
+#pragma warning( disable : 4616 6386 )
 void CDXUTEditBox::CopyToClipboard()
 {
     // Copy the selection text to the clipboard
-    if( m_nCaret != m_nSelStart && OpenClipboard( NULL ) )
+    if( m_nCaret != m_nSelStart && OpenClipboard( nullptr ) )
     {
         EmptyClipboard();
 
         HGLOBAL hBlock = GlobalAlloc( GMEM_MOVEABLE, sizeof( WCHAR ) * ( m_Buffer.GetTextSize() + 1 ) );
         if( hBlock )
         {
-            WCHAR* pwszText = ( WCHAR* )GlobalLock( hBlock );
+            auto pwszText = reinterpret_cast<WCHAR*>( GlobalLock( hBlock ) );
             if( pwszText )
             {
-                int nFirst = __min( m_nCaret, m_nSelStart );
-                int nLast = __max( m_nCaret, m_nSelStart );
+                int nFirst = std::min( m_nCaret, m_nSelStart );
+                int nLast = std::max( m_nCaret, m_nSelStart );
                 if( nLast - nFirst > 0 )
-                    CopyMemory( pwszText, m_Buffer.GetBuffer() + nFirst, ( nLast - nFirst ) * sizeof( WCHAR ) );
+                {
+                    memcpy( pwszText, m_Buffer.GetBuffer() + nFirst, ( nLast - nFirst ) * sizeof( WCHAR ) );
+                }
                 pwszText[nLast - nFirst] = L'\0';  // Terminate it
                 GlobalUnlock( hBlock );
             }
@@ -6292,19 +5688,19 @@ void CDXUTEditBox::PasteFromClipboard()
 {
     DeleteSelectionText();
 
-    if( OpenClipboard( NULL ) )
+    if( OpenClipboard( nullptr ) )
     {
         HANDLE handle = GetClipboardData( CF_UNICODETEXT );
         if( handle )
         {
             // Convert the ANSI string to Unicode, then
             // insert to our buffer.
-            WCHAR* pwszText = ( WCHAR* )GlobalLock( handle );
+            auto pwszText = reinterpret_cast<WCHAR*>( GlobalLock( handle ) );
             if( pwszText )
             {
                 // Copy all characters up to null.
                 if( m_Buffer.InsertString( m_nCaret, pwszText ) )
-                    PlaceCaret( m_nCaret + lstrlenW( pwszText ) );
+                    PlaceCaret( m_nCaret + (int)wcslen( pwszText ) );
                 m_nSelStart = m_nCaret;
                 GlobalUnlock( handle );
             }
@@ -6312,11 +5708,15 @@ void CDXUTEditBox::PasteFromClipboard()
         CloseClipboard();
     }
 }
+#pragma warning(pop)
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTEditBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(lParam);
+
     if( !m_bEnabled || !m_bVisible )
         return false;
 
@@ -6441,8 +5841,12 @@ bool CDXUTEditBox::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
 //--------------------------------------------------------------------------------------
-bool CDXUTEditBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam )
+_Use_decl_annotations_
+bool CDXUTEditBox::HandleMouse( UINT uMsg, const POINT& pt, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(wParam);
+    UNREFERENCED_PARAMETER(lParam);
+
     if( !m_bEnabled || !m_bVisible )
         return false;
 
@@ -6462,9 +5866,9 @@ bool CDXUTEditBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
                 // Determine the character corresponding to the coordinates.
                 int nCP, nTrail, nX1st;
                 m_Buffer.CPtoX( m_nFirstVisible, FALSE, &nX1st );  // X offset of the 1st visible char
-                if( SUCCEEDED( m_Buffer.XtoCP( pt.x - m_rcText.left + nX1st, &nCP, &nTrail ) ) )
+                if( m_Buffer.XtoCP( pt.x - m_rcText.left + nX1st, &nCP, &nTrail ) )
                 {
-                    // Cap at the NULL character.
+                    // Cap at the nul character.
                     if( nTrail && nCP < m_Buffer.GetTextSize() )
                         PlaceCaret( nCP + 1 );
                     else
@@ -6486,9 +5890,9 @@ bool CDXUTEditBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lPara
                 // Determine the character corresponding to the coordinates.
                 int nCP, nTrail, nX1st;
                 m_Buffer.CPtoX( m_nFirstVisible, FALSE, &nX1st );  // X offset of the 1st visible char
-                if( SUCCEEDED( m_Buffer.XtoCP( pt.x - m_rcText.left + nX1st, &nCP, &nTrail ) ) )
+                if( m_Buffer.XtoCP( pt.x - m_rcText.left + nX1st, &nCP, &nTrail ) )
                 {
-                    // Cap at the NULL character.
+                    // Cap at the nul character.
                     if( nTrail && nCP < m_Buffer.GetTextSize() )
                         PlaceCaret( nCP + 1 );
                     else
@@ -6512,14 +5916,17 @@ void CDXUTEditBox::OnFocusIn()
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTEditBox::MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(lParam);
+
     if( !m_bEnabled || !m_bVisible )
         return false;
 
     switch( uMsg )
     {
-            // Make sure that while editing, the keyup and keydown messages associated with 
+            // Make sure that while editing, the keyup and keydown messages associated with
             // WM_CHAR messages don't go to any non-focused controls or cameras
         case WM_KEYUP:
         case WM_KEYDOWN:
@@ -6611,7 +6018,7 @@ bool CDXUTEditBox::MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam )
                 case 16:  // Ctrl P
                 case 27:  // Ctrl [
                 case 29:  // Ctrl ]
-                case 28:  // Ctrl \ 
+                case 28:  // Ctrl backslash
                     break;
 
                 default:
@@ -6652,15 +6059,14 @@ bool CDXUTEditBox::MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTEditBox::Render( float fElapsedTime )
+void CDXUTEditBox::Render( _In_ float fElapsedTime )
 {
     if( m_bVisible == false )
         return;
 
-    HRESULT hr;
     int nSelStartX = 0, nCaretX = 0;  // Left and right X cordinates of the selection region
 
-    CDXUTElement* pElement = GetElement( 0 );
+    auto pElement = GetElement( 0 );
     if( pElement )
     {
         m_Buffer.SetFontNode( m_pDialog->GetFont( pElement->iFont ) );
@@ -6671,7 +6077,7 @@ void CDXUTEditBox::Render( float fElapsedTime )
     // Render the control graphics
     for( int e = 0; e < 9; ++e )
     {
-        pElement = m_Elements.GetAt( e );
+        pElement = m_Elements[ e ];
         pElement->TextureColor.Blend( DXUT_STATE_NORMAL, fElapsedTime );
 
         m_pDialog->DrawSprite( pElement, &m_rcRender[e], DXUT_FAR_BUTTON_DEPTH );
@@ -6686,9 +6092,9 @@ void CDXUTEditBox::Render( float fElapsedTime )
     //
     // Compute the X coordinates of the selection rectangle
     //
-    hr = m_Buffer.CPtoX( m_nCaret, FALSE, &nCaretX );
+    m_Buffer.CPtoX( m_nCaret, FALSE, &nCaretX );
     if( m_nCaret != m_nSelStart )
-        hr = m_Buffer.CPtoX( m_nSelStart, FALSE, &nSelStartX );
+        m_Buffer.CPtoX( m_nSelStart, FALSE, &nSelStartX );
     else
         nSelStartX = nCaretX;
 
@@ -6709,29 +6115,23 @@ void CDXUTEditBox::Render( float fElapsedTime )
         OffsetRect( &rcSelection, m_rcText.left - nXFirst, 0 );
         IntersectRect( &rcSelection, &m_rcText, &rcSelection );
 
-        IDirect3DDevice9* pd3dDevice = m_pDialog->GetManager()->GetD3D9Device();
-        if( pd3dDevice )
-            pd3dDevice->SetRenderState( D3DRS_ZENABLE, FALSE );
         m_pDialog->DrawRect( &rcSelection, m_SelBkColor );
-        if( pd3dDevice )
-            pd3dDevice->SetRenderState( D3DRS_ZENABLE, TRUE );
     }
 
     //
     // Render the text
     //
     // Element 0 for text
-    m_Elements.GetAt( 0 )->FontColor.Current = m_TextColor;
-    m_pDialog->DrawText( m_Buffer.GetBuffer() + m_nFirstVisible, m_Elements.GetAt( 0 ), &m_rcText );
+    m_Elements[ 0 ]->FontColor.SetCurrent( m_TextColor );
+    m_pDialog->DrawText( m_Buffer.GetBuffer() + m_nFirstVisible, m_Elements[ 0 ], &m_rcText );
 
     // Render the selected text
     if( m_nCaret != m_nSelStart )
     {
-        int nFirstToRender = __max( m_nFirstVisible, __min( m_nSelStart, m_nCaret ) );
-        int nNumChatToRender = __max( m_nSelStart, m_nCaret ) - nFirstToRender;
-        m_Elements.GetAt( 0 )->FontColor.Current = m_SelTextColor;
+        int nFirstToRender = std::max( m_nFirstVisible, std::min( m_nSelStart, m_nCaret ) );
+        m_Elements[ 0 ]->FontColor.SetCurrent( m_SelTextColor );
         m_pDialog->DrawText( m_Buffer.GetBuffer() + nFirstToRender,
-                             m_Elements.GetAt( 0 ), &rcSelection, false, nNumChatToRender );
+                             m_Elements[ 0 ], &rcSelection, false );
     }
 
     //
@@ -6773,6 +6173,7 @@ void CDXUTEditBox::Render( float fElapsedTime )
 #define IN_FLOAT_CHARSET( c ) \
     ( (c) == L'-' || (c) == L'.' || ( (c) >= L'0' && (c) <= L'9' ) )
 
+_Use_decl_annotations_
 void CDXUTEditBox::ParseFloatArray( float* pNumbers, int nCount )
 {
     int nWritten = 0;  // Number of floats written
@@ -6795,9 +6196,9 @@ void CDXUTEditBox::ParseFloatArray( float* pNumbers, int nCount )
             ++pEnd;
 
         // Copy the token to our buffer
-        int nTokenLen = __min( sizeof( wszToken ) / sizeof( wszToken[0] ) - 1, int( pEnd - pToken ) );
+        int nTokenLen = std::min<int>( sizeof( wszToken ) / sizeof( wszToken[0] ) - 1, int( pEnd - pToken ) );
         wcscpy_s( wszToken, nTokenLen, pToken );
-        *pNumbers = ( float )wcstod( wszToken, NULL );
+        *pNumbers = ( float )wcstod( wszToken, nullptr );
         ++nWritten;
         ++pNumbers;
         pToken = pEnd;
@@ -6805,6 +6206,8 @@ void CDXUTEditBox::ParseFloatArray( float* pNumbers, int nCount )
 }
 
 
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTEditBox::SetTextFloatArray( const float* pNumbers, int nCount )
 {
     WCHAR wszBuffer[512] =
@@ -6813,7 +6216,7 @@ void CDXUTEditBox::SetTextFloatArray( const float* pNumbers, int nCount )
     };
     WCHAR wszTmp[64];
 
-    if( pNumbers == NULL )
+    if( !pNumbers )
         return;
 
     for( int i = 0; i < nCount; ++i )
@@ -6830,54 +6233,24 @@ void CDXUTEditBox::SetTextFloatArray( const float* pNumbers, int nCount )
 }
 
 
-
-
 //--------------------------------------------------------------------------------------
-void CUniBuffer::Initialize()
+void CDXUTEditBox::ResetCaretBlink()
 {
-    if( s_hDll ) // Only need to do once
-        return;
-
-    s_hDll = LoadLibrary( UNISCRIBE_DLLNAME );
-    if( s_hDll )
-    {
-        FARPROC Temp;
-        GETPROCADDRESS( s_hDll, ScriptApplyDigitSubstitution, Temp );
-        GETPROCADDRESS( s_hDll, ScriptStringAnalyse, Temp );
-        GETPROCADDRESS( s_hDll, ScriptStringCPtoX, Temp );
-        GETPROCADDRESS( s_hDll, ScriptStringXtoCP, Temp );
-        GETPROCADDRESS( s_hDll, ScriptStringFree, Temp );
-        GETPROCADDRESS( s_hDll, ScriptString_pLogAttr, Temp );
-        GETPROCADDRESS( s_hDll, ScriptString_pcOutChars, Temp );
-    }
+    m_bCaretOn = true;
+    m_dfLastBlink = DXUTGetGlobalTimer()->GetAbsoluteTime();
 }
 
 
-//--------------------------------------------------------------------------------------
-void CUniBuffer::Uninitialize()
-{
-    if( s_hDll )
-    {
-        PLACEHOLDERPROC( ScriptApplyDigitSubstitution );
-        PLACEHOLDERPROC( ScriptStringAnalyse );
-        PLACEHOLDERPROC( ScriptStringCPtoX );
-        PLACEHOLDERPROC( ScriptStringXtoCP );
-        PLACEHOLDERPROC( ScriptStringFree );
-        PLACEHOLDERPROC( ScriptString_pLogAttr );
-        PLACEHOLDERPROC( ScriptString_pcOutChars );
-
-        FreeLibrary( s_hDll );
-        s_hDll = NULL;
-    }
-}
-
+//======================================================================================
+// CUniBuffer
+//======================================================================================
 
 //--------------------------------------------------------------------------------------
-bool CUniBuffer::SetBufferSize( int nNewSize )
+bool CUniBuffer::SetBufferSize( _In_ int nNewSize )
 {
     // If the current size is already the maximum allowed,
     // we can't possibly allocate more.
-    if( m_nBufferSize == DXUT_MAX_EDITBOXLENGTH )
+    if( m_nBufferSize >= DXUT_MAX_EDITBOXLENGTH )
         return false;
 
     int nAllocateSize = ( nNewSize == -1 || nNewSize < m_nBufferSize * 2 ) ? ( m_nBufferSize ? m_nBufferSize *
@@ -6887,7 +6260,7 @@ bool CUniBuffer::SetBufferSize( int nNewSize )
     if( nAllocateSize > DXUT_MAX_EDITBOXLENGTH )
         nAllocateSize = DXUT_MAX_EDITBOXLENGTH;
 
-    WCHAR* pTempBuffer = new WCHAR[nAllocateSize];
+    auto pTempBuffer = new (std::nothrow) WCHAR[nAllocateSize];
     if( !pTempBuffer )
         return false;
 
@@ -6895,7 +6268,7 @@ bool CUniBuffer::SetBufferSize( int nNewSize )
 
     if( m_pwszBuffer )
     {
-        CopyMemory( pTempBuffer, m_pwszBuffer, m_nBufferSize * sizeof( WCHAR ) );
+        memcpy( pTempBuffer, m_pwszBuffer, m_nBufferSize * sizeof( WCHAR ) );
         delete[] m_pwszBuffer;
     }
 
@@ -6911,32 +6284,37 @@ bool CUniBuffer::SetBufferSize( int nNewSize )
 HRESULT CUniBuffer::Analyse()
 {
     if( m_Analysis )
-        _ScriptStringFree( &m_Analysis );
+        (void)ScriptStringFree( &m_Analysis );
 
     SCRIPT_CONTROL ScriptControl; // For uniscribe
     SCRIPT_STATE ScriptState;   // For uniscribe
     ZeroMemory( &ScriptControl, sizeof( ScriptControl ) );
     ZeroMemory( &ScriptState, sizeof( ScriptState ) );
-    _ScriptApplyDigitSubstitution( NULL, &ScriptControl, &ScriptState );
+
+#pragma warning(push)
+#pragma warning(disable : 4616 6309 6387 )
+    HRESULT hr = ScriptApplyDigitSubstitution( nullptr, &ScriptControl, &ScriptState );
+    if ( FAILED(hr)  )
+        return hr;
+#pragma warning(pop)
 
     if( !m_pFontNode )
         return E_FAIL;
 
-    HDC hDC = 
-        ( m_pFontNode->pFont9 ? m_pFontNode->pFont9->GetDC() : NULL );
-    HRESULT hr = _ScriptStringAnalyse( hDC,
-                                       m_pwszBuffer,
-                                       lstrlenW( m_pwszBuffer ) + 1,  // NULL is also analyzed.
-                                       lstrlenW( m_pwszBuffer ) * 3 / 2 + 16,
-                                       -1,
-                                       SSA_BREAK | SSA_GLYPHS | SSA_FALLBACK | SSA_LINK,
-                                       0,
-                                       &ScriptControl,
-                                       &ScriptState,
-                                       NULL,
-                                       NULL,
-                                       NULL,
-                                       &m_Analysis );
+    HDC hDC = nullptr;
+    hr = ScriptStringAnalyse( hDC,
+                                m_pwszBuffer,
+                                (int)wcslen( m_pwszBuffer ) + 1,  // nul is also analyzed.
+                                (int)wcslen( m_pwszBuffer ) * 3 / 2 + 16,
+                                -1,
+                                SSA_BREAK | SSA_GLYPHS | SSA_FALLBACK | SSA_LINK,
+                                0,
+                                &ScriptControl,
+                                &ScriptState,
+                                nullptr,
+                                nullptr,
+                                nullptr,
+                                &m_Analysis );
     if( SUCCEEDED( hr ) )
         m_bAnalyseRequired = false;  // Analysis is up-to-date
     return hr;
@@ -6944,15 +6322,13 @@ HRESULT CUniBuffer::Analyse()
 
 
 //--------------------------------------------------------------------------------------
-CUniBuffer::CUniBuffer( int nInitialSize )
+CUniBuffer::CUniBuffer( _In_ int nInitialSize )
 {
-    CUniBuffer::Initialize();  // ensure static vars are properly init'ed first
-
     m_nBufferSize = 0;
-    m_pwszBuffer = NULL;
+    m_pwszBuffer = nullptr;
     m_bAnalyseRequired = true;
-    m_Analysis = NULL;
-    m_pFontNode = NULL;
+    m_Analysis = nullptr;
+    m_pFontNode = nullptr;
 
     if( nInitialSize > 0 )
         SetBufferSize( nInitialSize );
@@ -6964,12 +6340,12 @@ CUniBuffer::~CUniBuffer()
 {
     delete[] m_pwszBuffer;
     if( m_Analysis )
-        _ScriptStringFree( &m_Analysis );
+        (void)ScriptStringFree( &m_Analysis );
 }
 
 
 //--------------------------------------------------------------------------------------
-WCHAR& CUniBuffer::operator[]( int n )  // No param checking
+WCHAR& CUniBuffer::operator[]( _In_ int n )  // No param checking
 {
     // This version of operator[] is called only
     // if we are asking for write access, so
@@ -6991,18 +6367,18 @@ void CUniBuffer::Clear()
 // Inserts the char at specified index.
 // If nIndex == -1, insert to the end.
 //--------------------------------------------------------------------------------------
-bool CUniBuffer::InsertChar( int nIndex, WCHAR wChar )
+bool CUniBuffer::InsertChar( _In_ int nIndex, _In_ WCHAR wChar )
 {
     assert( nIndex >= 0 );
 
-    if( nIndex < 0 || nIndex > lstrlenW( m_pwszBuffer ) )
+    if( nIndex < 0 || nIndex > (int)wcslen( m_pwszBuffer ) )
         return false;  // invalid index
 
     // Check for maximum length allowed
     if( GetTextSize() + 1 >= DXUT_MAX_EDITBOXLENGTH )
         return false;
 
-    if( lstrlenW( m_pwszBuffer ) + 1 >= m_nBufferSize )
+    if( (int)wcslen( m_pwszBuffer ) + 1 >= m_nBufferSize )
     {
         if( !SetBufferSize( -1 ) )
             return false;  // out of memory
@@ -7011,7 +6387,7 @@ bool CUniBuffer::InsertChar( int nIndex, WCHAR wChar )
     assert( m_nBufferSize >= 2 );
 
     // Shift the characters after the index, start by copying the null terminator
-    WCHAR* dest = m_pwszBuffer + lstrlenW( m_pwszBuffer ) + 1;
+    WCHAR* dest = m_pwszBuffer + wcslen( m_pwszBuffer ) + 1;
     WCHAR* stop = m_pwszBuffer + nIndex;
     WCHAR* src = dest - 1;
 
@@ -7032,13 +6408,13 @@ bool CUniBuffer::InsertChar( int nIndex, WCHAR wChar )
 // Removes the char at specified index.
 // If nIndex == -1, remove the last char.
 //--------------------------------------------------------------------------------------
-bool CUniBuffer::RemoveChar( int nIndex )
+bool CUniBuffer::RemoveChar( _In_ int nIndex )
 {
-    if( !lstrlenW( m_pwszBuffer ) || nIndex < 0 || nIndex >= lstrlenW( m_pwszBuffer ) )
+    if( !wcslen( m_pwszBuffer ) || nIndex < 0 || nIndex >= (int)wcslen( m_pwszBuffer ) )
         return false;  // Invalid index
 
     MoveMemory( m_pwszBuffer + nIndex, m_pwszBuffer + nIndex + 1, sizeof( WCHAR ) *
-                ( lstrlenW( m_pwszBuffer ) - nIndex ) );
+                ( wcslen( m_pwszBuffer ) - nIndex ) );
     m_bAnalyseRequired = true;
     return true;
 }
@@ -7049,31 +6425,32 @@ bool CUniBuffer::RemoveChar( int nIndex )
 // If nCount == -1, the entire string is inserted.
 // If nIndex == -1, insert to the end.
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CUniBuffer::InsertString( int nIndex, const WCHAR* pStr, int nCount )
 {
     assert( nIndex >= 0 );
     if( nIndex < 0 )
         return false;
 
-    if( nIndex > lstrlenW( m_pwszBuffer ) )
+    if( nIndex > (int)wcslen( m_pwszBuffer ) )
         return false;  // invalid index
 
     if( -1 == nCount )
-        nCount = lstrlenW( pStr );
+        nCount = (int)wcslen( pStr );
 
     // Check for maximum length allowed
     if( GetTextSize() + nCount >= DXUT_MAX_EDITBOXLENGTH )
         return false;
 
-    if( lstrlenW( m_pwszBuffer ) + nCount >= m_nBufferSize )
+    if( (int)wcslen( m_pwszBuffer ) + nCount >= m_nBufferSize )
     {
-        if( !SetBufferSize( lstrlenW( m_pwszBuffer ) + nCount + 1 ) )
+        if( !SetBufferSize( (int)wcslen( m_pwszBuffer ) + nCount + 1 ) )
             return false;  // out of memory
     }
 
     MoveMemory( m_pwszBuffer + nIndex + nCount, m_pwszBuffer + nIndex, sizeof( WCHAR ) *
-                ( lstrlenW( m_pwszBuffer ) - nIndex + 1 ) );
-    CopyMemory( m_pwszBuffer + nIndex, pStr, nCount * sizeof( WCHAR ) );
+                ( wcslen( m_pwszBuffer ) - nIndex + 1 ) );
+    memcpy( m_pwszBuffer + nIndex, pStr, nCount * sizeof( WCHAR ) );
     m_bAnalyseRequired = true;
 
     return true;
@@ -7081,11 +6458,11 @@ bool CUniBuffer::InsertString( int nIndex, const WCHAR* pStr, int nCount )
 
 
 //--------------------------------------------------------------------------------------
-bool CUniBuffer::SetText( LPCWSTR wszText )
+bool CUniBuffer::SetText( _In_z_ LPCWSTR wszText )
 {
-    assert( wszText != NULL );
+    assert( wszText );
 
-    int nRequired = int( wcslen( wszText ) + 1 );
+    size_t nRequired = wcslen( wszText ) + 1;
 
     // Check for maximum length allowed
     if( nRequired >= DXUT_MAX_EDITBOXLENGTH )
@@ -7107,7 +6484,8 @@ bool CUniBuffer::SetText( LPCWSTR wszText )
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CUniBuffer::CPtoX( int nCP, BOOL bTrail, int* pX )
+_Use_decl_annotations_
+bool CUniBuffer::CPtoX( int nCP, bool bTrail, int* pX )
 {
     assert( pX );
     *pX = 0;  // Default
@@ -7117,14 +6495,21 @@ HRESULT CUniBuffer::CPtoX( int nCP, BOOL bTrail, int* pX )
         hr = Analyse();
 
     if( SUCCEEDED( hr ) )
-        hr = _ScriptStringCPtoX( m_Analysis, nCP, bTrail, pX );
+        hr = ScriptStringCPtoX( m_Analysis, nCP, bTrail, pX );
 
-    return hr;
+    if ( FAILED(hr) )
+    {
+        *pX = 0;
+        return false;
+    }
+
+    return true;
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CUniBuffer::XtoCP( int nX, int* pCP, int* pnTrail )
+_Use_decl_annotations_
+bool CUniBuffer::XtoCP( int nX, int* pCP, int* pnTrail )
 {
     assert( pCP && pnTrail );
     *pCP = 0; *pnTrail = FALSE;  // Default
@@ -7133,8 +6518,15 @@ HRESULT CUniBuffer::XtoCP( int nX, int* pCP, int* pnTrail )
     if( m_bAnalyseRequired )
         hr = Analyse();
 
-    if( SUCCEEDED( hr ) )
-        hr = _ScriptStringXtoCP( m_Analysis, nX, pCP, pnTrail );
+    if (SUCCEEDED(hr))
+    {
+        hr = ScriptStringXtoCP( m_Analysis, nX, pCP, pnTrail );
+        if (FAILED(hr))
+        {
+            *pCP = 0; *pnTrail = FALSE;
+            return false;
+        }
+    }
 
     // If the coordinate falls outside the text region, we
     // can get character positions that don't exist.  We must
@@ -7143,16 +6535,22 @@ HRESULT CUniBuffer::XtoCP( int nX, int* pCP, int* pnTrail )
     {
         *pCP = 0; *pnTrail = FALSE;
     }
-    else if( *pCP > lstrlenW( m_pwszBuffer ) && *pnTrail == FALSE )
+    else if( *pCP > (int)wcslen( m_pwszBuffer ) && *pnTrail == FALSE )
     {
-        *pCP = lstrlenW( m_pwszBuffer ); *pnTrail = TRUE;
+        *pCP = (int)wcslen( m_pwszBuffer ); *pnTrail = TRUE;
     }
 
-    return hr;
+    if (FAILED(hr))
+    {
+        *pCP = 0; *pnTrail = FALSE;
+        return false;
+    }
+    return true;
 }
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CUniBuffer::GetPriorItemPos( int nCP, int* pPrior )
 {
     *pPrior = nCP;  // Default is the char itself
@@ -7161,13 +6559,13 @@ void CUniBuffer::GetPriorItemPos( int nCP, int* pPrior )
         if( FAILED( Analyse() ) )
             return;
 
-    const SCRIPT_LOGATTR* pLogAttr = _ScriptString_pLogAttr( m_Analysis );
+    const SCRIPT_LOGATTR* pLogAttr = ScriptString_pLogAttr( m_Analysis );
     if( !pLogAttr )
         return;
 
-    if( !_ScriptString_pcOutChars( m_Analysis ) )
+    if( !ScriptString_pcOutChars( m_Analysis ) )
         return;
-    int nInitial = *_ScriptString_pcOutChars( m_Analysis );
+    int nInitial = *ScriptString_pcOutChars( m_Analysis );
     if( nCP - 1 < nInitial )
         nInitial = nCP - 1;
     for( int i = nInitial; i > 0; --i )
@@ -7184,6 +6582,7 @@ void CUniBuffer::GetPriorItemPos( int nCP, int* pPrior )
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CUniBuffer::GetNextItemPos( int nCP, int* pPrior )
 {
     *pPrior = nCP;  // Default is the char itself
@@ -7194,18 +6593,18 @@ void CUniBuffer::GetNextItemPos( int nCP, int* pPrior )
     if( FAILED( hr ) )
         return;
 
-    const SCRIPT_LOGATTR* pLogAttr = _ScriptString_pLogAttr( m_Analysis );
+    const SCRIPT_LOGATTR* pLogAttr = ScriptString_pLogAttr( m_Analysis );
     if( !pLogAttr )
         return;
 
-    if( !_ScriptString_pcOutChars( m_Analysis ) )
+    if( !ScriptString_pcOutChars( m_Analysis ) )
         return;
-    int nInitial = *_ScriptString_pcOutChars( m_Analysis );
+    int nInitial = *ScriptString_pcOutChars( m_Analysis );
     if( nCP + 1 < nInitial )
         nInitial = nCP + 1;
 
     int i = nInitial;
-    int limit = *_ScriptString_pcOutChars( m_Analysis );
+    int limit = *ScriptString_pcOutChars( m_Analysis );
     while( limit > 0 && i < limit - 1 )
     {
         if( pLogAttr[i].fWordStop )      // Either the fWordStop flag is set
@@ -7221,23 +6620,20 @@ void CUniBuffer::GetNextItemPos( int nCP, int* pPrior )
         }
 
         ++i;
-        limit = *_ScriptString_pcOutChars( m_Analysis );
+        limit = *ScriptString_pcOutChars( m_Analysis );
     }
     // We have reached the end. It's always a word stop, so simply return it.
-    *pPrior = *_ScriptString_pcOutChars( m_Analysis ) - 1;
+    *pPrior = *ScriptString_pcOutChars( m_Analysis ) - 1;
 }
 
 
-//--------------------------------------------------------------------------------------
-void CDXUTEditBox::ResetCaretBlink()
-{
-    m_bCaretOn = true;
-    m_dfLastBlink = DXUTGetGlobalTimer()->GetAbsoluteTime();
-}
-
+//======================================================================================
+// DXUTBlendColor
+//======================================================================================
 
 //--------------------------------------------------------------------------------------
-void DXUTBlendColor::Init( D3DCOLOR defaultColor, D3DCOLOR disabledColor, D3DCOLOR hiddenColor )
+_Use_decl_annotations_
+void DXUTBlendColor::Init( DWORD defaultColor, DWORD disabledColor, DWORD hiddenColor )
 {
     for( int i = 0; i < MAX_CONTROL_STATES; i++ )
     {
@@ -7246,23 +6642,38 @@ void DXUTBlendColor::Init( D3DCOLOR defaultColor, D3DCOLOR disabledColor, D3DCOL
 
     States[ DXUT_STATE_DISABLED ] = disabledColor;
     States[ DXUT_STATE_HIDDEN ] = hiddenColor;
-    Current = hiddenColor;
+    SetCurrent( hiddenColor );
 }
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void DXUTBlendColor::Blend( UINT iState, float fElapsedTime, float fRate )
 {
-    D3DXCOLOR destColor = States[ iState ];
-    D3DXColorLerp( &Current, &Current, &destColor, 1.0f - powf( fRate, 30 * fElapsedTime ) );
+    XMFLOAT4 destColor = D3DCOLOR_TO_D3DCOLORVALUE( States[ iState ] );
+    XMVECTOR clr1 = XMLoadFloat4( &destColor );
+    XMVECTOR clr = XMLoadFloat4( &Current );
+    clr = XMVectorLerp( clr, clr1, 1.0f - powf( fRate, 30 * fElapsedTime ) );
+    XMStoreFloat4( &Current, clr );
+}
+
+
+//--------------------------------------------------------------------------------------
+void DXUTBlendColor::SetCurrent( DWORD color )
+{
+    Current = D3DCOLOR_TO_D3DCOLORVALUE( color );
 }
 
 
+//======================================================================================
+// CDXUTElement
+//======================================================================================
 
 //--------------------------------------------------------------------------------------
-void CDXUTElement::SetTexture( UINT iTexture, RECT* prcTexture, D3DCOLOR defaultTextureColor )
+_Use_decl_annotations_
+void CDXUTElement::SetTexture( UINT texture, RECT* prcTexture, DWORD defaultTextureColor )
 {
-    this->iTexture = iTexture;
+    iTexture = texture;
 
     if( prcTexture )
         rcTexture = *prcTexture;
@@ -7274,10 +6685,11 @@ void CDXUTElement::SetTexture( UINT iTexture, RECT* prcTexture, D3DCOLOR default
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTElement::SetFont( UINT iFont, D3DCOLOR defaultFontColor, DWORD dwTextFormat )
+_Use_decl_annotations_
+void CDXUTElement::SetFont( UINT font, DWORD defaultFontColor, DWORD textFormat )
 {
-    this->iFont = iFont;
-    this->dwTextFormat = dwTextFormat;
+    iFont = font;
+    dwTextFormat = textFormat;
 
     FontColor.Init( defaultFontColor );
 }
@@ -7286,8 +6698,6 @@ void CDXUTElement::SetFont( UINT iFont, D3DCOLOR defaultFontColor, DWORD dwTextF
 //--------------------------------------------------------------------------------------
 void CDXUTElement::Refresh()
 {
-    TextureColor.Current = TextureColor.States[ DXUT_STATE_HIDDEN ];
-    FontColor.Current = FontColor.States[ DXUT_STATE_HIDDEN ];
+    TextureColor.SetCurrent( TextureColor.States[ DXUT_STATE_HIDDEN ] );
+    FontColor.SetCurrent( FontColor.States[ DXUT_STATE_HIDDEN ] );
 }
-
-
diff --git a/samples/DX_APIUsage/DXUT/Optional/DXUTgui.h b/samples/DX_APIUsage/DXUT/Optional/DXUTgui.h
index cae713c..71fcfb4 100644
--- a/samples/DX_APIUsage/DXUT/Optional/DXUTgui.h
+++ b/samples/DX_APIUsage/DXUT/Optional/DXUTgui.h
@@ -2,17 +2,22 @@
 // File: DXUTgui.h
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #pragma once
-#ifndef DXUT_GUI_H
-#define DXUT_GUI_H
 
 #include <usp10.h>
 #include <dimm.h>
 #include <functional>
 
+#ifdef DXUT_AUTOLIB
+#pragma comment( lib, "usp10.lib" )
+#endif
+
 //--------------------------------------------------------------------------------------
-// Defines and macros 
+// Defines and macros
 //--------------------------------------------------------------------------------------
 #define EVENT_BUTTON_CLICKED                0x0101
 #define EVENT_COMBOBOX_SELECTION_CHANGED    0x0201
@@ -50,8 +55,8 @@ class CDXUTElement;
 struct DXUTElementHolder;
 struct DXUTTextureNode;
 struct DXUTFontNode;
-typedef VOID ( CALLBACK*PCALLBACKDXUTGUIEVENT )( UINT nEvent, int nControlID, CDXUTControl* pControl,
-                                                 void* pUserContext );
+typedef void ( CALLBACK*PCALLBACKDXUTGUIEVENT )( _In_ UINT nEvent, _In_ int nControlID, _In_ CDXUTControl* pControl,
+                                                 _In_opt_ void* pUserContext );
 
 
 //--------------------------------------------------------------------------------------
@@ -85,12 +90,13 @@ enum DXUT_CONTROL_STATE
 
 struct DXUTBlendColor
 {
-    void        Init( D3DCOLOR defaultColor, D3DCOLOR disabledColor = D3DCOLOR_ARGB( 200, 128, 128, 128 ),
-                      D3DCOLOR hiddenColor = 0 );
-    void        Blend( UINT iState, float fElapsedTime, float fRate = 0.7f );
+    void Init( _In_ DWORD defaultColor, _In_ DWORD disabledColor = D3DCOLOR_ARGB( 200, 128, 128, 128 ), _In_ DWORD hiddenColor = 0 );
+    void Blend( _In_ UINT iState, _In_ float fElapsedTime, _In_ float fRate = 0.7f );
+
+    DWORD States[ MAX_CONTROL_STATES ]; // Modulate colors for all possible control states
+    DirectX::XMFLOAT4 Current;
 
-    D3DCOLOR    States[ MAX_CONTROL_STATES ]; // Modulate colors for all possible control states
-    D3DXCOLOR Current;
+    void SetCurrent( DWORD color );
 };
 
 
@@ -100,17 +106,14 @@ struct DXUTBlendColor
 class CDXUTElement
 {
 public:
-    void    SetTexture( UINT iTexture, RECT* prcTexture, D3DCOLOR defaultTextureColor = D3DCOLOR_ARGB( 255, 255, 255,
-                                                                                                       255 ) );
-    void    SetFont( UINT iFont, D3DCOLOR defaultFontColor = D3DCOLOR_ARGB( 255, 255, 255,
-                                                                            255 ), DWORD dwTextFormat = DT_CENTER |
-                     DT_VCENTER );
+    void SetTexture( _In_ UINT texture, _In_ RECT* prcTexture, _In_ DWORD defaultTextureColor = D3DCOLOR_ARGB( 255, 255, 255, 255 ) );
+    void SetFont( _In_ UINT font, _In_ DWORD defaultFontColor = D3DCOLOR_ARGB( 255, 255, 255, 255 ), DWORD textFormat = DT_CENTER | DT_VCENTER );
 
-    void    Refresh();
+    void Refresh();
 
-    UINT iTexture;          // Index of the texture for this Element 
+    UINT iTexture;          // Index of the texture for this Element
     UINT iFont;             // Index of the font for this Element
-    DWORD dwTextFormat;     // The format argument to DrawText 
+    DWORD dwTextFormat;     // The format argument to DrawText
 
     RECT rcTexture;         // Bounding rect of this element on the composite texture
 
@@ -128,221 +131,164 @@ class CDXUTDialog
     friend class CDXUTDialogResourceManager;
 
 public:
-                        CDXUTDialog();
-                        ~CDXUTDialog();
+    CDXUTDialog();
+    ~CDXUTDialog();
 
     // Need to call this now
-    void                Init( CDXUTDialogResourceManager* pManager, bool bRegisterDialog = true );
-    void                Init( CDXUTDialogResourceManager* pManager, bool bRegisterDialog,
-                              LPCWSTR pszControlTextureFilename );
-    void                Init( CDXUTDialogResourceManager* pManager, bool bRegisterDialog,
-                              LPCWSTR szControlTextureResourceName, HMODULE hControlTextureResourceModule );
+    void Init( _In_ CDXUTDialogResourceManager* pManager, _In_ bool bRegisterDialog = true );
+    void Init( _In_ CDXUTDialogResourceManager* pManager, _In_ bool bRegisterDialog,
+               _In_z_ LPCWSTR pszControlTextureFilename );
+    void Init( _In_ CDXUTDialogResourceManager* pManager, _In_ bool bRegisterDialog,
+               _In_z_ LPCWSTR szControlTextureResourceName, _In_ HMODULE hControlTextureResourceModule );
 
     // Windows message handler
-    bool                MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
+    bool MsgProc( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam );
 
     // Control creation
-    HRESULT             AddStatic( int ID, LPCWSTR strText, int x, int y, int width, int height, bool bIsDefault=false,
-                                   CDXUTStatic** ppCreated=NULL );
-    HRESULT             AddButton(int ID, LPCWSTR strText, int x, int y, int width, int height, UINT nHotkey = 0,
-        bool bIsDefault = false, CDXUTButton** ppCreated = NULL);
-    HRESULT             AddButtonCallback(std::function<void()> cb, LPCWSTR strText, int x, int y, int width, int height, UINT nHotkey = 0,
-        bool bIsDefault = false, CDXUTButton** ppCreated = NULL);
-    HRESULT             AddCheckBox( int ID, LPCWSTR strText, int x, int y, int width, int height, bool bChecked=false,
-                                     UINT nHotkey=0, bool bIsDefault=false, CDXUTCheckBox** ppCreated=NULL );
-    HRESULT             AddRadioButton( int ID, UINT nButtonGroup, LPCWSTR strText, int x, int y, int width,
-                                        int height, bool bChecked=false, UINT nHotkey=0, bool bIsDefault=false,
-                                        CDXUTRadioButton** ppCreated=NULL );
-    HRESULT             AddComboBox( int ID, int x, int y, int width, int height, UINT nHotKey=0, bool bIsDefault=
-                                     false, CDXUTComboBox** ppCreated=NULL );
-    HRESULT             AddSlider( int ID, int x, int y, int width, int height, int min=0, int max=100, int value=50,
-                                   bool bIsDefault=false, CDXUTSlider** ppCreated=NULL );
+    HRESULT AddStatic( _In_ int ID, _In_z_ LPCWSTR strText, _In_ int x, _In_ int y, _In_ int width, _In_ int height, _In_ bool bIsDefault=false,
+                       _Out_opt_ CDXUTStatic** ppCreated = nullptr );
+    HRESULT AddButton( _In_ int ID, _In_z_ LPCWSTR strText, _In_ int x, _In_ int y, _In_ int width, _In_ int height, _In_ UINT nHotkey=0,
+                       _In_ bool bIsDefault=false, _Out_opt_ CDXUTButton** ppCreated = nullptr );
+    HRESULT AddButtonCallback(_In_ std::function<void()> cb, _In_ LPCWSTR strText, _In_ int x, _In_ int y, _In_ int width, _In_ int height, _In_ UINT nHotkey = 0,
+                        _In_ bool bIsDefault = false, _Out_opt_ CDXUTButton** ppCreated = NULL);
+    HRESULT AddCheckBox( _In_ int ID, _In_z_ LPCWSTR strText, _In_ int x, _In_ int y, _In_ int width, _In_ int height, _In_ bool bChecked=false,
+                         _In_ UINT nHotkey=0, _In_ bool bIsDefault=false, _Out_opt_ CDXUTCheckBox** ppCreated = nullptr );
+    HRESULT AddRadioButton( _In_ int ID, _In_ UINT nButtonGroup, _In_z_ LPCWSTR strText, _In_ int x, _In_ int y, _In_ int width,
+                            _In_ int height, _In_ bool bChecked=false, _In_ UINT nHotkey=0, _In_ bool bIsDefault=false,
+                            _Out_opt_ CDXUTRadioButton** ppCreated = nullptr );
+    HRESULT AddComboBox( _In_ int ID, _In_ int x, _In_ int y, _In_ int width, _In_ int height, _In_ UINT nHotKey=0, _In_ bool bIsDefault=false,
+                         _Out_opt_ CDXUTComboBox** ppCreated = nullptr );
+    HRESULT AddSlider( _In_ int ID, _In_ int x, _In_ int y, _In_ int width, _In_ int height, _In_ int min=0, _In_ int max=100, _In_ int value=50,
+                       _In_ bool bIsDefault=false, _Out_opt_ CDXUTSlider** ppCreated = nullptr );
     //      AddIMEEditBox has been renamed into DXUTguiIME.cpp as CDXUTIMEEditBox::CreateIMEEditBox
-    HRESULT             AddEditBox( int ID, LPCWSTR strText, int x, int y, int width, int height, bool bIsDefault=
-                                    false, CDXUTEditBox** ppCreated=NULL );
-    HRESULT             AddListBox( int ID, int x, int y, int width, int height, DWORD dwStyle=0,
-                                    CDXUTListBox** ppCreated=NULL );
-    HRESULT             AddControl( CDXUTControl* pControl );
-    HRESULT             InitControl( CDXUTControl* pControl );
+    HRESULT AddEditBox( _In_ int ID, _In_z_ LPCWSTR strText, _In_ int x, _In_ int y, _In_ int width, _In_ int height, _In_ bool bIsDefault=false,
+                        _Out_opt_ CDXUTEditBox** ppCreated = nullptr );
+    HRESULT AddListBox( _In_ int ID, _In_ int x, _In_ int y, _In_ int width, _In_ int height, _In_ DWORD dwStyle=0,
+                        _Out_opt_ CDXUTListBox** ppCreated = nullptr );
+    HRESULT AddControl( _In_ CDXUTControl* pControl );
+    HRESULT InitControl( _In_ CDXUTControl* pControl );
 
     // Control retrieval
-    CDXUTStatic* GetStatic( int ID )
+    CDXUTStatic* GetStatic( _In_ int ID ) const
     {
-        return ( CDXUTStatic* )GetControl( ID, DXUT_CONTROL_STATIC );
+        return reinterpret_cast<CDXUTStatic*>( GetControl( ID, DXUT_CONTROL_STATIC ) );
     }
-    CDXUTButton* GetButton( int ID )
+    CDXUTButton* GetButton( _In_ int ID ) const
     {
-        return ( CDXUTButton* )GetControl( ID, DXUT_CONTROL_BUTTON );
+        return reinterpret_cast<CDXUTButton*>( GetControl(ID, DXUT_CONTROL_BUTTON) );
     }
-    CDXUTCheckBox* GetCheckBox( int ID )
+    CDXUTCheckBox* GetCheckBox( _In_ int ID ) const
     {
-        return ( CDXUTCheckBox* )GetControl( ID, DXUT_CONTROL_CHECKBOX );
+        return reinterpret_cast<CDXUTCheckBox*>( GetControl(ID, DXUT_CONTROL_CHECKBOX) );
     }
-    CDXUTRadioButton* GetRadioButton( int ID )
+    CDXUTRadioButton* GetRadioButton( _In_ int ID ) const
     {
-        return ( CDXUTRadioButton* )GetControl( ID, DXUT_CONTROL_RADIOBUTTON );
+        return reinterpret_cast<CDXUTRadioButton*>( GetControl(ID, DXUT_CONTROL_RADIOBUTTON) );
     }
-    CDXUTComboBox* GetComboBox( int ID )
+    CDXUTComboBox* GetComboBox( _In_ int ID ) const
     {
-        return ( CDXUTComboBox* )GetControl( ID, DXUT_CONTROL_COMBOBOX );
+        return reinterpret_cast<CDXUTComboBox*>( GetControl(ID, DXUT_CONTROL_COMBOBOX) );
     }
-    CDXUTSlider* GetSlider( int ID )
+    CDXUTSlider* GetSlider( _In_ int ID ) const
     {
-        return ( CDXUTSlider* )GetControl( ID, DXUT_CONTROL_SLIDER );
+        return reinterpret_cast<CDXUTSlider*>( GetControl(ID, DXUT_CONTROL_SLIDER) );
     }
-    CDXUTEditBox* GetEditBox( int ID )
+    CDXUTEditBox* GetEditBox( _In_ int ID ) const
     {
-        return ( CDXUTEditBox* )GetControl( ID, DXUT_CONTROL_EDITBOX );
+        return reinterpret_cast<CDXUTEditBox*>( GetControl(ID, DXUT_CONTROL_EDITBOX) );
     }
-    CDXUTListBox* GetListBox( int ID )
+    CDXUTListBox* GetListBox( _In_ int ID ) const
     {
-        return ( CDXUTListBox* )GetControl( ID, DXUT_CONTROL_LISTBOX );
+        return reinterpret_cast<CDXUTListBox*>( GetControl(ID, DXUT_CONTROL_LISTBOX) );
     }
 
-    CDXUTControl* GetControl( int ID );
-    CDXUTControl* GetControl( int ID, UINT nControlType );
-    CDXUTControl* GetControlAtPoint( POINT pt );
+    CDXUTControl* GetControl( _In_ int ID ) const;
+    CDXUTControl* GetControl( _In_ int ID, _In_ UINT nControlType ) const;
+    CDXUTControl* GetControlAtPoint( _In_ const POINT& pt ) const;
 
-    bool                GetControlEnabled( int ID );
-    void                SetControlEnabled( int ID, bool bEnabled );
+    bool GetControlEnabled( _In_ int ID ) const;
+    void SetControlEnabled( _In_ int ID, _In_ bool bEnabled );
 
-    void                ClearRadioButtonGroup( UINT nGroup );
-    void                ClearComboBox( int ID );
+    void ClearRadioButtonGroup( _In_ UINT nGroup );
+    void ClearComboBox( _In_ int ID );
 
     // Access the default display Elements used when adding new controls
-    HRESULT             SetDefaultElement( UINT nControlType, UINT iElement, CDXUTElement* pElement );
-    CDXUTElement* GetDefaultElement( UINT nControlType, UINT iElement );
+    HRESULT SetDefaultElement( _In_ UINT nControlType, _In_ UINT iElement, _In_ CDXUTElement* pElement );
+    CDXUTElement* GetDefaultElement( _In_ UINT nControlType, _In_ UINT iElement ) const;
 
     // Methods called by controls
-    void                SendEvent( UINT nEvent, bool bTriggeredByUser, CDXUTControl* pControl );
-    void                RequestFocus( CDXUTControl* pControl );
+    void SendEvent( _In_ UINT nEvent, _In_ bool bTriggeredByUser, _In_ CDXUTControl* pControl );
+    void RequestFocus( _In_ CDXUTControl* pControl );
 
     // Render helpers
-    HRESULT             DrawRect( RECT* pRect, D3DCOLOR color );
-    HRESULT             DrawRect9( RECT* pRect, D3DCOLOR color );
-    HRESULT             DrawPolyLine( POINT* apPoints, UINT nNumPoints, D3DCOLOR color );
-    HRESULT             DrawSprite( CDXUTElement* pElement, RECT* prcDest, float fDepth );
-    HRESULT             DrawSprite9( CDXUTElement* pElement, RECT* prcDest );
-    HRESULT             DrawSprite11( CDXUTElement* pElement, RECT* prcDest, float fDepth );
-    HRESULT             CalcTextRect( LPCWSTR strText, CDXUTElement* pElement, RECT* prcDest, int nCount = -1 );
-    HRESULT             DrawText( LPCWSTR strText, CDXUTElement* pElement, RECT* prcDest, bool bShadow = false,
-                                  int nCount = -1, bool bCenter = false  );
-    HRESULT             DrawText9( LPCWSTR strText, CDXUTElement* pElement, RECT* prcDest, bool bShadow = false,
-                                   int nCount = -1 );
-    HRESULT             DrawText11( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceContext,
-                                    LPCWSTR strText, CDXUTElement* pElement, RECT* prcDest, bool bShadow = false,
-                                    int nCount = -1, bool bCenter = false );
+    HRESULT DrawRect( _In_ const RECT* pRect, _In_ DWORD color );
+    HRESULT DrawSprite( _In_ CDXUTElement* pElement, _In_ const RECT* prcDest, _In_ float fDepth );
+    HRESULT DrawSprite11( _In_ CDXUTElement* pElement, _In_ const RECT* prcDest, _In_ float fDepth );
+    HRESULT CalcTextRect( _In_z_ LPCWSTR strText, _In_ CDXUTElement* pElement, _In_ const RECT* prcDest, _In_ int nCount = -1 );
+    HRESULT DrawText( _In_z_ LPCWSTR strText, _In_ CDXUTElement* pElement, _In_ const RECT* prcDest, _In_ bool bShadow = false,
+                      _In_ bool bCenter = false  );
 
     // Attributes
-    bool                GetVisible()
-    {
-        return m_bVisible;
-    }
-    void                SetVisible( bool bVisible )
-    {
-        m_bVisible = bVisible;
-    }
-    bool                GetMinimized()
-    {
-        return m_bMinimized;
-    }
-    void                SetMinimized( bool bMinimized )
-    {
-        m_bMinimized = bMinimized;
-    }
-    void                SetBackgroundColors( D3DCOLOR colorAllCorners )
-    {
-        SetBackgroundColors( colorAllCorners, colorAllCorners, colorAllCorners, colorAllCorners );
-    }
-    void                SetBackgroundColors( D3DCOLOR colorTopLeft, D3DCOLOR colorTopRight, D3DCOLOR colorBottomLeft,
-                                             D3DCOLOR colorBottomRight );
-    void                EnableCaption( bool bEnable )
-    {
-        m_bCaption = bEnable;
-    }
-    int                 GetCaptionHeight() const
-    {
-        return m_nCaptionHeight;
-    }
-    void                SetCaptionHeight( int nHeight )
-    {
-        m_nCaptionHeight = nHeight;
-    }
-    void                SetCaptionText( const WCHAR* pwszText )
-    {
-        wcscpy_s( m_wszCaption, sizeof( m_wszCaption ) / sizeof( m_wszCaption[0] ), pwszText );
-    }
-    void                GetLocation( POINT& Pt ) const
+    bool GetVisible() const { return m_bVisible; }
+    void SetVisible( _In_ bool bVisible ) { m_bVisible = bVisible; }
+    bool GetMinimized() const { return m_bMinimized; }
+    void SetMinimized( _In_ bool bMinimized ) {m_bMinimized = bMinimized; }
+    void SetBackgroundColors( _In_ DWORD colorAllCorners ) { SetBackgroundColors( colorAllCorners, colorAllCorners, colorAllCorners, colorAllCorners ); }
+    void SetBackgroundColors( _In_ DWORD colorTopLeft, _In_ DWORD colorTopRight, _In_ DWORD colorBottomLeft, _In_ DWORD colorBottomRight );
+    void EnableCaption( _In_ bool bEnable ) { m_bCaption = bEnable; }
+    int GetCaptionHeight() const { return m_nCaptionHeight; }
+    void SetCaptionHeight( _In_ int nHeight ) { m_nCaptionHeight = nHeight; }
+    void SetCaptionText( _In_ const WCHAR* pwszText ) { wcscpy_s( m_wszCaption, sizeof( m_wszCaption ) / sizeof( m_wszCaption[0] ), pwszText ); }
+    void GetLocation( _Out_ POINT& Pt ) const
     {
-        Pt.x = m_x; Pt.y = m_y;
+        Pt.x = m_x;
+        Pt.y = m_y;
     }
-    void                SetLocation( int x, int y )
+    void SetLocation( _In_ int x, _In_ int y )
     {
-        m_x = x; m_y = y;
+        m_x = x;
+        m_y = y;
     }
-    void                SetSize( int width, int height )
+    void SetSize( _In_ int width, _In_ int height )
     {
-        m_width = width; m_height = height;
-    }
-    int                 GetWidth()
-    {
-        return m_width;
-    }
-    int                 GetHeight()
-    {
-        return m_height;
+        m_width = width;
+        m_height = height;
     }
+    int GetWidth() const { return m_width; }
+    int GetHeight() const { return m_height; }
 
-    static void WINAPI  SetRefreshTime( float fTime )
-    {
-        s_fTimeRefresh = fTime;
-    }
+    static void WINAPI SetRefreshTime( _In_ float fTime ) { s_fTimeRefresh = fTime; }
 
-    static CDXUTControl* WINAPI GetNextControl( CDXUTControl* pControl );
-    static CDXUTControl* WINAPI GetPrevControl( CDXUTControl* pControl );
+    static CDXUTControl* WINAPI GetNextControl( _In_ CDXUTControl* pControl );
+    static CDXUTControl* WINAPI GetPrevControl( _In_ CDXUTControl* pControl );
 
-    void                RemoveControl( int ID );
-    void                RemoveAllControls();
+    void RemoveControl( _In_ int ID );
+    void RemoveAllControls();
 
     // Sets the callback used to notify the app of control events
-    void                SetCallback( PCALLBACKDXUTGUIEVENT pCallback, void* pUserContext = NULL );
-    void                EnableNonUserEvents( bool bEnable )
-    {
-        m_bNonUserEvents = bEnable;
-    }
-    void                EnableKeyboardInput( bool bEnable )
-    {
-        m_bKeyboardInput = bEnable;
-    }
-    void                EnableMouseInput( bool bEnable )
-    {
-        m_bMouseInput = bEnable;
-    }
-    bool                IsKeyboardInputEnabled() const
-    {
-        return m_bKeyboardInput;
-    }
+    void SetCallback( _In_ PCALLBACKDXUTGUIEVENT pCallback, _In_opt_ void* pUserContext = nullptr );
+    void EnableNonUserEvents( _In_ bool bEnable ) { m_bNonUserEvents = bEnable; }
+    void EnableKeyboardInput( _In_ bool bEnable ) { m_bKeyboardInput = bEnable; }
+    void EnableMouseInput( _In_ bool bEnable ) { m_bMouseInput = bEnable; }
+    bool IsKeyboardInputEnabled() const { return m_bKeyboardInput; }
 
     // Device state notification
-    void                Refresh();
-    HRESULT             OnRender( float fElapsedTime );
+    void Refresh();
+    HRESULT OnRender( _In_ float fElapsedTime );
 
     // Shared resource access. Indexed fonts and textures are shared among
     // all the controls.
-    HRESULT             SetFont( UINT index, LPCWSTR strFaceName, LONG height, LONG weight );
-    DXUTFontNode* GetFont( UINT index );
+    HRESULT SetFont( _In_ UINT index, _In_z_ LPCWSTR strFaceName, _In_ LONG height, _In_ LONG weight );
+    DXUTFontNode* GetFont( _In_ UINT index ) const;
 
-    HRESULT             SetTexture( UINT index, LPCWSTR strFilename );
-    HRESULT             SetTexture( UINT index, LPCWSTR strResourceName, HMODULE hResourceModule );
-    DXUTTextureNode* GetTexture( UINT index );
+    HRESULT SetTexture( _In_ UINT index, _In_z_ LPCWSTR strFilename );
+    HRESULT SetTexture( _In_ UINT index, _In_z_ LPCWSTR strResourceName, _In_ HMODULE hResourceModule );
+    DXUTTextureNode* GetTexture( _In_ UINT index ) const;
 
-    CDXUTDialogResourceManager* GetManager()
-    {
-        return m_pManager;
-    }
+    CDXUTDialogResourceManager* GetManager() const { return m_pManager; }
 
     static void WINAPI  ClearFocus();
-    void                FocusDefaultControl();
+    void FocusDefaultControl();
 
     bool m_bNonUserEvents;
     bool m_bKeyboardInput;
@@ -351,24 +297,20 @@ public:
 private:
     int m_nDefaultControlID;
 
-    HRESULT             OnRender9( float fElapsedTime );
-    HRESULT             OnRender10( float fElapsedTime );
-    HRESULT             OnRender11( float fElapsedTime );
-
     static double s_fTimeRefresh;
     double m_fTimeLastRefresh;
 
     // Initialize default Elements
-    void                InitDefaultElements();
+    void InitDefaultElements();
 
     // Windows message handlers
-    void                OnMouseMove( POINT pt );
-    void                OnMouseUp( POINT pt );
+    void OnMouseMove( _In_ const POINT& pt );
+    void OnMouseUp( _In_ const POINT& pt );
 
-    void                SetNextDialog( CDXUTDialog* pNextDialog );
+    void SetNextDialog( _In_ CDXUTDialog* pNextDialog );
 
     // Control events
-    bool                OnCycleFocus( bool bForward );
+    bool OnCycleFocus( _In_ bool bForward );
 
     static CDXUTControl* s_pControlFocus;        // The control which has focus
     static CDXUTControl* s_pControlPressed;      // The control currently pressed
@@ -379,7 +321,7 @@ private:
     bool m_bCaption;
     bool m_bMinimized;
     bool m_bDrag;
-    WCHAR               m_wszCaption[256];
+    WCHAR m_wszCaption[256];
 
     int m_x;
     int m_y;
@@ -387,20 +329,20 @@ private:
     int m_height;
     int m_nCaptionHeight;
 
-    D3DCOLOR m_colorTopLeft;
-    D3DCOLOR m_colorTopRight;
-    D3DCOLOR m_colorBottomLeft;
-    D3DCOLOR m_colorBottomRight;
+    DWORD m_colorTopLeft;
+    DWORD m_colorTopRight;
+    DWORD m_colorBottomLeft;
+    DWORD m_colorBottomRight;
 
     CDXUTDialogResourceManager* m_pManager;
     PCALLBACKDXUTGUIEVENT m_pCallbackEvent;
     void* m_pCallbackEventUserContext;
 
-    CGrowableArray <int> m_Textures;   // Index into m_TextureCache;
-    CGrowableArray <int> m_Fonts;      // Index into m_FontCache;
+    std::vector<int> m_Textures;   // Index into m_TextureCache;
+    std::vector<int> m_Fonts;      // Index into m_FontCache;
 
-    CGrowableArray <CDXUTControl*> m_Controls;
-    CGrowableArray <DXUTElementHolder*> m_DefaultElements;
+    std::vector<CDXUTControl*> m_Controls;
+    std::vector<DXUTElementHolder*> m_DefaultElements;
 
     CDXUTElement m_CapElement;  // Element for the caption
 
@@ -420,7 +362,6 @@ struct DXUTTextureNode
     WCHAR strFilename[MAX_PATH];
     DWORD dwWidth;
     DWORD dwHeight;
-    IDirect3DTexture9* pTexture9;
     ID3D11Texture2D* pTexture11;
     ID3D11ShaderResourceView* pTexResView11;
 };
@@ -430,80 +371,55 @@ struct DXUTFontNode
     WCHAR strFace[MAX_PATH];
     LONG nHeight;
     LONG nWeight;
-    ID3DXFont* pFont9;
 };
 
 struct DXUTSpriteVertex
 {
-    D3DXVECTOR3 vPos;
-    D3DXCOLOR vColor;
-    D3DXVECTOR2 vTex;
+    DirectX::XMFLOAT3 vPos;
+    DirectX::XMFLOAT4 vColor;
+    DirectX::XMFLOAT2 vTex;
 };
 
+
 //-----------------------------------------------------------------------------
 // Manages shared resources of dialogs
 //-----------------------------------------------------------------------------
 class CDXUTDialogResourceManager
 {
 public:
-            CDXUTDialogResourceManager();
-            ~CDXUTDialogResourceManager();
+    CDXUTDialogResourceManager();
+    ~CDXUTDialogResourceManager();
 
-    bool    MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
-
-    // D3D9 specific
-    HRESULT OnD3D9CreateDevice( LPDIRECT3DDEVICE9 pd3dDevice );
-    HRESULT OnD3D9ResetDevice();
-    void    OnD3D9LostDevice();
-    void    OnD3D9DestroyDevice();
-    IDirect3DDevice9* GetD3D9Device()
-    {
-        return m_pd3d9Device;
-    }
+    bool MsgProc( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam );
 
     // D3D11 specific
-    HRESULT OnD3D11CreateDevice( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceContext );
-    HRESULT OnD3D11ResizedSwapChain( ID3D11Device* pd3dDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc );
-    void    OnD3D11ReleasingSwapChain();
-    void    OnD3D11DestroyDevice();
-    void    StoreD3D11State( ID3D11DeviceContext* pd3dImmediateContext );
-    void    RestoreD3D11State( ID3D11DeviceContext* pd3dImmediateContext );
-    void    ApplyRenderUI11( ID3D11DeviceContext* pd3dImmediateContext );
-    void	ApplyRenderUIUntex11( ID3D11DeviceContext* pd3dImmediateContext );
-    void	BeginSprites11( );
-    void	EndSprites11( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext );
-    ID3D11Device* GetD3D11Device()
-    {
-        return m_pd3d11Device;
-    }
-    ID3D11DeviceContext* GetD3D11DeviceContext()
-    {
-        return m_pd3d11DeviceContext;
-    }
-
-    DXUTFontNode* GetFontNode( int iIndex )
-    {
-        return m_FontCache.GetAt( iIndex );
-    };
-    DXUTTextureNode* GetTextureNode( int iIndex )
-    {
-        return m_TextureCache.GetAt( iIndex );
-    };
-
-    int     AddFont( LPCWSTR strFaceName, LONG height, LONG weight );
-    int     AddTexture( LPCWSTR strFilename );
-    int     AddTexture( LPCWSTR strResourceName, HMODULE hResourceModule );
-
-    bool    RegisterDialog( CDXUTDialog* pDialog );
-    void    UnregisterDialog( CDXUTDialog* pDialog );
-    void    EnableKeyboardInputForAllDialogs();
+    HRESULT OnD3D11CreateDevice( _In_ ID3D11Device* pd3dDevice, _In_ ID3D11DeviceContext* pd3d11DeviceContext );
+    HRESULT OnD3D11ResizedSwapChain( _In_ ID3D11Device* pd3dDevice, _In_ const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc );
+    void OnD3D11ReleasingSwapChain();
+    void OnD3D11DestroyDevice();
+    void StoreD3D11State( _In_ ID3D11DeviceContext* pd3dImmediateContext );
+    void RestoreD3D11State( _In_ ID3D11DeviceContext* pd3dImmediateContext );
+    void ApplyRenderUI11( _In_ ID3D11DeviceContext* pd3dImmediateContext );
+    void ApplyRenderUIUntex11( _In_ ID3D11DeviceContext* pd3dImmediateContext );
+    void BeginSprites11( );
+    void EndSprites11( _In_ ID3D11Device* pd3dDevice, _In_ ID3D11DeviceContext* pd3dImmediateContext );
+
+    ID3D11Device* GetD3D11Device() const { return m_pd3d11Device; }
+    ID3D11DeviceContext* GetD3D11DeviceContext() const { return m_pd3d11DeviceContext; }
+
+    DXUTFontNode* GetFontNode( _In_ size_t iIndex ) const { return m_FontCache[ iIndex ]; }
+    DXUTTextureNode* GetTextureNode( _In_ size_t iIndex ) const { return m_TextureCache[ iIndex ]; }
+
+    int AddFont( _In_z_ LPCWSTR strFaceName, _In_ LONG height, _In_ LONG weight );
+    int AddTexture( _In_z_ LPCWSTR strFilename );
+    int AddTexture( _In_z_ LPCWSTR strResourceName, _In_ HMODULE hResourceModule );
+
+    bool RegisterDialog( _In_ CDXUTDialog* pDialog );
+    void UnregisterDialog( _In_ CDXUTDialog* pDialog );
+    void EnableKeyboardInputForAllDialogs();
 
     // Shared between all dialogs
 
-    // D3D9
-    IDirect3DStateBlock9* m_pStateBlock;
-    ID3DXSprite* m_pSprite;          // Sprite used for drawing
-
     // D3D11
     // Shaders
     ID3D11VertexShader* m_pVSRenderUI11;
@@ -531,34 +447,23 @@ public:
     // Sprite workaround
     ID3D11Buffer* m_pSpriteBuffer11;
     UINT m_SpriteBufferBytes11;
-    CGrowableArray<DXUTSpriteVertex> m_SpriteVertices;
+    std::vector<DXUTSpriteVertex> m_SpriteVertices;
 
     UINT m_nBackBufferWidth;
     UINT m_nBackBufferHeight;
 
-    CGrowableArray <CDXUTDialog*> m_Dialogs;            // Dialogs registered
+    std::vector<CDXUTDialog*> m_Dialogs;            // Dialogs registered
 
 protected:
-    // D3D9 specific
-    IDirect3DDevice9* m_pd3d9Device;
-    HRESULT CreateFont9( UINT index );
-    HRESULT CreateTexture9( UINT index );
-
     // D3D11 specific
     ID3D11Device* m_pd3d11Device;
     ID3D11DeviceContext* m_pd3d11DeviceContext;
-    HRESULT CreateFont11( UINT index );
-    HRESULT CreateTexture11( UINT index );
+    HRESULT CreateTexture11( _In_ UINT index );
 
-    CGrowableArray <DXUTTextureNode*> m_TextureCache;   // Shared textures
-    CGrowableArray <DXUTFontNode*> m_FontCache;         // Shared fonts
+    std::vector<DXUTTextureNode*> m_TextureCache;   // Shared textures
+    std::vector<DXUTFontNode*> m_FontCache;         // Shared fonts
 };
 
-void BeginText11();
-void DrawText11DXUT( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceContext,
-                 LPCWSTR strText, RECT rcScreen, D3DXCOLOR vFontColor,
-                 float fBBWidth, float fBBHeight, bool bCenter );
-void EndText11( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceContext );
 
 //-----------------------------------------------------------------------------
 // Base class for controls
@@ -566,126 +471,79 @@ void EndText11( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3d11DeviceConte
 class CDXUTControl
 {
 public:
-                    CDXUTControl( CDXUTDialog* pDialog = NULL );
-    virtual         ~CDXUTControl();
+    CDXUTControl( _In_opt_ CDXUTDialog* pDialog = nullptr );
+    virtual ~CDXUTControl();
 
-    virtual HRESULT OnInit()
-    {
-        return S_OK;
-    }
-    virtual void    Refresh();
-    virtual void    Render( float fElapsedTime )
-    {
-    };
+    virtual HRESULT OnInit() { return S_OK; }
+    virtual void Refresh();
+    virtual void Render( _In_ float fElapsedTime ) { UNREFERENCED_PARAMETER(fElapsedTime); }
 
     // Windows message handler
-    virtual bool    MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam )
+    virtual bool MsgProc( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam )
     {
+        UNREFERENCED_PARAMETER(uMsg);
+        UNREFERENCED_PARAMETER(wParam);
+        UNREFERENCED_PARAMETER(lParam);
         return false;
     }
 
-    virtual bool    HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
+    virtual bool HandleKeyboard( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam )
     {
+        UNREFERENCED_PARAMETER(uMsg);
+        UNREFERENCED_PARAMETER(wParam);
+        UNREFERENCED_PARAMETER(lParam);
         return false;
     }
-    virtual bool    HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam )
+    virtual bool HandleMouse( _In_ UINT uMsg, _In_ const POINT& pt, _In_ WPARAM wParam, _In_ LPARAM lParam )
     {
+        UNREFERENCED_PARAMETER(uMsg);
+        UNREFERENCED_PARAMETER(pt);
+        UNREFERENCED_PARAMETER(wParam);
+        UNREFERENCED_PARAMETER(lParam);
         return false;
     }
 
-    virtual bool    CanHaveFocus()
-    {
-        return false;
-    }
-    virtual void    OnFocusIn()
-    {
-        m_bHasFocus = true;
-    }
-    virtual void    OnFocusOut()
-    {
-        m_bHasFocus = false;
-    }
-    virtual void    OnMouseEnter()
-    {
-        m_bMouseOver = true;
-    }
-    virtual void    OnMouseLeave()
-    {
-        m_bMouseOver = false;
-    }
-    virtual void    OnHotkey()
-    {
-    }
+    virtual bool CanHaveFocus() { return false; }
+    virtual void OnFocusIn() { m_bHasFocus = true; }
+    virtual void OnFocusOut() { m_bHasFocus = false; }
+    virtual void OnMouseEnter() { m_bMouseOver = true; }
+    virtual void OnMouseLeave() { m_bMouseOver = false; }
+    virtual void OnHotkey() { }
 
-    virtual BOOL    ContainsPoint( POINT pt )
-    {
-        return PtInRect( &m_rcBoundingBox, pt );
-    }
+    virtual bool ContainsPoint( _In_ const POINT& pt ) { return PtInRect( &m_rcBoundingBox, pt ) != 0; }
 
-    virtual void    SetEnabled( bool bEnabled )
-    {
-        m_bEnabled = bEnabled;
-    }
-    virtual bool    GetEnabled()
-    {
-        return m_bEnabled;
-    }
-    virtual void    SetVisible( bool bVisible )
-    {
-        m_bVisible = bVisible;
-    }
-    virtual bool    GetVisible()
-    {
-        return m_bVisible;
-    }
+    virtual void SetEnabled( _In_ bool bEnabled ) { m_bEnabled = bEnabled; }
+    virtual bool GetEnabled() const { return m_bEnabled; }
+    virtual void SetVisible( _In_ bool bVisible ) { m_bVisible = bVisible; }
+    virtual bool GetVisible() const { return m_bVisible; }
 
-    UINT            GetType() const
-    {
-        return m_Type;
-    }
+    UINT GetType() const { return m_Type; }
 
-    int             GetID() const
-    {
-        return m_ID;
-    }
-    void            SetID( int ID )
-    {
-        m_ID = ID;
-    }
+    int GetID() const { return m_ID; }
+    void SetID( _In_ int ID ) { m_ID = ID; }
 
-    void            SetLocation( int x, int y )
+    void SetLocation( _In_ int x, _In_ int y )
     {
-        m_x = x; m_y = y; UpdateRects();
+        m_x = x;
+        m_y = y;
+        UpdateRects();
     }
-    void            SetSize( int width, int height )
+    void SetSize( int width, int height )
     {
-        m_width = width; m_height = height; UpdateRects();
+        m_width = width;
+        m_height = height;
+        UpdateRects();
     }
 
-    void            SetHotkey( UINT nHotkey )
-    {
-        m_nHotkey = nHotkey;
-    }
-    UINT            GetHotkey()
-    {
-        return m_nHotkey;
-    }
+    void SetHotkey( _In_ UINT nHotkey ) { m_nHotkey = nHotkey; }
+    UINT GetHotkey() const { return m_nHotkey; }
 
-    void            SetUserData( void* pUserData )
-    {
-        m_pUserData = pUserData;
-    }
-    void* GetUserData() const
-    {
-        return m_pUserData;
-    }
+    void SetUserData( _In_opt_ void* pUserData ) { m_pUserData = pUserData; }
+    void* GetUserData() const { return m_pUserData; }
 
-    virtual void    SetTextColor( D3DCOLOR Color );
-    CDXUTElement* GetElement( UINT iElement )
-    {
-        return m_Elements.GetAt( iElement );
-    }
-    HRESULT         SetElement( UINT iElement, CDXUTElement* pElement );
+    virtual void SetTextColor( _In_ DWORD Color );
+    CDXUTElement* GetElement( _In_ UINT iElement ) const { return m_Elements[ iElement ]; }
+    HRESULT SetElement( _In_ UINT iElement, _In_ CDXUTElement* pElement );
 
     bool m_bVisible;                // Shown/hidden flag
     bool m_bMouseOver;              // Mouse pointer is above control
@@ -700,13 +558,13 @@ public:
     CDXUTDialog* m_pDialog;    // Parent container
     UINT m_Index;              // Index within the control list
 
-    CGrowableArray <CDXUTElement*> m_Elements;  // All display elements
+    std::vector<CDXUTElement*> m_Elements;  // All display elements
 
 protected:
-    virtual void    UpdateRects();
+    virtual void UpdateRects();
 
     int m_ID;                 // ID number
-    DXUT_CONTROL_TYPE m_Type;  // Control type, set once in constructor  
+    DXUT_CONTROL_TYPE m_Type;  // Control type, set once in constructor
     UINT m_nHotkey;            // Virtual key code for this control's hotkey
     void* m_pUserData;         // Data associated with this control that is set by user.
 
@@ -734,25 +592,21 @@ struct DXUTElementHolder
 class CDXUTStatic : public CDXUTControl
 {
 public:
-                    CDXUTStatic( CDXUTDialog* pDialog = NULL );
+    CDXUTStatic( _In_opt_ CDXUTDialog* pDialog = nullptr );
 
-    virtual void    Render( float fElapsedTime );
-    virtual BOOL    ContainsPoint( POINT pt )
+    virtual void Render( _In_ float fElapsedTime ) override;
+    virtual bool ContainsPoint( _In_ const POINT& pt ) override
     {
+        UNREFERENCED_PARAMETER( pt );
         return false;
     }
 
-    HRESULT         GetTextCopy( __out_ecount(bufferCount) LPWSTR strDest, 
-                                 UINT bufferCount );
-    LPCWSTR         GetText()
-    {
-        return m_strText;
-    }
-    HRESULT         SetText( LPCWSTR strText );
-
+    HRESULT GetTextCopy( _Out_writes_(bufferCount) LPWSTR strDest, _In_ UINT bufferCount ) const;
+    LPCWSTR GetText() const { return m_strText; }
+    HRESULT SetText( _In_z_ LPCWSTR strText );
 
 protected:
-    WCHAR           m_strText[MAX_PATH];      // Window text  
+    WCHAR m_strText[MAX_PATH];      // Window text
 };
 
 
@@ -762,26 +616,26 @@ protected:
 class CDXUTButton : public CDXUTStatic
 {
 public:
-                    CDXUTButton( CDXUTDialog* pDialog = NULL );
+    CDXUTButton( _In_opt_ CDXUTDialog* pDialog = nullptr );
 
-    virtual bool    HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual bool    HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam );
-    virtual void    OnHotkey()
+    virtual bool HandleKeyboard( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual bool HandleMouse( _In_ UINT uMsg, _In_ const POINT& pt, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual void OnHotkey() override
     {
         if( m_pDialog->IsKeyboardInputEnabled() ) m_pDialog->RequestFocus( this );
         m_pDialog->SendEvent( EVENT_BUTTON_CLICKED, true, this );
     }
 
-    virtual BOOL    ContainsPoint( POINT pt )
+    virtual bool ContainsPoint( _In_ const POINT& pt ) override
     {
-        return PtInRect( &m_rcBoundingBox, pt );
+        return PtInRect( &m_rcBoundingBox, pt ) != 0;
     }
-    virtual bool    CanHaveFocus()
+    virtual bool CanHaveFocus() override
     {
         return ( m_bVisible && m_bEnabled );
     }
 
-    virtual void    Render( float fElapsedTime );
+    virtual void Render( _In_ float fElapsedTime ) override;
 
 protected:
     bool m_bPressed;
@@ -794,32 +648,26 @@ protected:
 class CDXUTCheckBox : public CDXUTButton
 {
 public:
-                    CDXUTCheckBox( CDXUTDialog* pDialog = NULL );
+    CDXUTCheckBox( _In_opt_ CDXUTDialog* pDialog = nullptr );
 
-    virtual bool    HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual bool    HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam );
-    virtual void    OnHotkey()
+    virtual bool HandleKeyboard( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual bool HandleMouse( _In_ UINT uMsg, _In_ const POINT& pt, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual void OnHotkey() override
     {
         if( m_pDialog->IsKeyboardInputEnabled() ) m_pDialog->RequestFocus( this );
         SetCheckedInternal( !m_bChecked, true );
     }
 
-    virtual BOOL    ContainsPoint( POINT pt );
-    virtual void    UpdateRects();
+    virtual bool ContainsPoint( _In_ const POINT& pt ) override;
+    virtual void UpdateRects() override;
 
-    virtual void    Render( float fElapsedTime );
+    virtual void Render( _In_ float fElapsedTime ) override;
 
-    bool            GetChecked()
-    {
-        return m_bChecked;
-    }
-    void            SetChecked( bool bChecked )
-    {
-        SetCheckedInternal( bChecked, false );
-    }
+    bool GetChecked() const { return m_bChecked; }
+    void SetChecked( _In_ bool bChecked ) { SetCheckedInternal( bChecked, false ); }
 
 protected:
-    virtual void    SetCheckedInternal( bool bChecked, bool bFromInput );
+    virtual void SetCheckedInternal( _In_ bool bChecked, _In_ bool bFromInput );
 
     bool m_bChecked;
     RECT m_rcButton;
@@ -833,31 +681,22 @@ protected:
 class CDXUTRadioButton : public CDXUTCheckBox
 {
 public:
-                    CDXUTRadioButton( CDXUTDialog* pDialog = NULL );
+    CDXUTRadioButton( _In_opt_ CDXUTDialog* pDialog = nullptr );
 
-    virtual bool    HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual bool    HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam );
-    virtual void    OnHotkey()
+    virtual bool HandleKeyboard( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual bool HandleMouse( _In_ UINT uMsg, _In_ const POINT& pt, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual void OnHotkey() override
     {
         if( m_pDialog->IsKeyboardInputEnabled() ) m_pDialog->RequestFocus( this );
         SetCheckedInternal( true, true, true );
     }
 
-    void            SetChecked( bool bChecked, bool bClearGroup=true )
-    {
-        SetCheckedInternal( bChecked, bClearGroup, false );
-    }
-    void            SetButtonGroup( UINT nButtonGroup )
-    {
-        m_nButtonGroup = nButtonGroup;
-    }
-    UINT            GetButtonGroup()
-    {
-        return m_nButtonGroup;
-    }
+    void SetChecked( _In_ bool bChecked, _In_ bool bClearGroup=true ) { SetCheckedInternal( bChecked, bClearGroup, false ); }
+    void SetButtonGroup( _In_ UINT nButtonGroup ) { m_nButtonGroup = nButtonGroup; }
+    UINT GetButtonGroup() const { return m_nButtonGroup; }
 
 protected:
-    virtual void    SetCheckedInternal( bool bChecked, bool bClearGroup, bool bFromInput );
+    virtual void SetCheckedInternal( _In_ bool bChecked, _In_ bool bClearGroup, _In_ bool bFromInput );
     UINT m_nButtonGroup;
 };
 
@@ -868,36 +707,34 @@ protected:
 class CDXUTScrollBar : public CDXUTControl
 {
 public:
-                    CDXUTScrollBar( CDXUTDialog* pDialog = NULL );
-    virtual         ~CDXUTScrollBar();
+    CDXUTScrollBar( _In_opt_ CDXUTDialog* pDialog = nullptr );
+    virtual ~CDXUTScrollBar();
 
-    virtual bool    HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual bool    HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam );
-    virtual bool    MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam );
+    virtual bool HandleKeyboard( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual bool HandleMouse( _In_ UINT uMsg, _In_ const POINT& pt, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual bool MsgProc( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
 
-    virtual void    Render( float fElapsedTime );
-    virtual void    UpdateRects();
+    virtual void Render( _In_ float fElapsedTime ) override;
+    virtual void UpdateRects() override;
 
-    void            SetTrackRange( int nStart, int nEnd );
-    int             GetTrackPos()
-    {
-        return m_nPosition;
-    }
-    void            SetTrackPos( int nPosition )
-    {
-        m_nPosition = nPosition; Cap(); UpdateThumbRect();
-    }
-    int             GetPageSize()
+    void SetTrackRange( _In_ int nStart, _In_ int nEnd );
+    int GetTrackPos() const { return m_nPosition; }
+    void SetTrackPos( _In_ int nPosition )
     {
-        return m_nPageSize;
+        m_nPosition = nPosition;
+        Cap();
+        UpdateThumbRect();
     }
-    void            SetPageSize( int nPageSize )
+    int GetPageSize() const { return m_nPageSize; }
+    void SetPageSize( _In_ int nPageSize )
     {
-        m_nPageSize = nPageSize; Cap(); UpdateThumbRect();
+        m_nPageSize = nPageSize;
+        Cap();
+        UpdateThumbRect();
     }
 
-    void            Scroll( int nDelta );    // Scroll by nDelta items (plus or minus)
-    void            ShowItem( int nIndex );  // Ensure that item nIndex is displayed, scroll if necessary
+    void Scroll( _In_ int nDelta );    // Scroll by nDelta items (plus or minus)
+    void ShowItem( _In_ int nIndex );  // Ensure that item nIndex is displayed, scroll if necessary
 
 protected:
     // ARROWSTATE indicates the state of the arrow buttons.
@@ -949,60 +786,50 @@ struct DXUTListBoxItem
 class CDXUTListBox : public CDXUTControl
 {
 public:
-                    CDXUTListBox( CDXUTDialog* pDialog = NULL );
-    virtual         ~CDXUTListBox();
+    CDXUTListBox( _In_opt_ CDXUTDialog* pDialog = nullptr );
+    virtual ~CDXUTListBox();
 
-    virtual HRESULT OnInit()
+    virtual HRESULT OnInit() override
     {
         return m_pDialog->InitControl( &m_ScrollBar );
     }
-    virtual bool    CanHaveFocus()
+    virtual bool CanHaveFocus() override
     {
         return ( m_bVisible && m_bEnabled );
     }
-    virtual bool    HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual bool    HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam );
-    virtual bool    MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam );
+    virtual bool HandleKeyboard( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam )  override;
+    virtual bool HandleMouse( _In_ UINT uMsg, _In_ const POINT& pt, _In_ WPARAM wParam, _In_ LPARAM lParam )  override;
+    virtual bool MsgProc( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam )  override;
 
-    virtual void    Render( float fElapsedTime );
-    virtual void    UpdateRects();
+    virtual void Render( _In_ float fElapsedTime ) override;
+    virtual void UpdateRects() override;
 
-    DWORD           GetStyle() const
+    DWORD GetStyle() const { return m_dwStyle; }
+    size_t GetSize() const { return m_Items.size(); }
+    void SetStyle( _In_ DWORD dwStyle ) { m_dwStyle = dwStyle; }
+    int GetScrollBarWidth() const{ return m_nSBWidth; }
+    void SetScrollBarWidth( _In_ int nWidth )
     {
-        return m_dwStyle;
+        m_nSBWidth = nWidth;
+        UpdateRects();
     }
-    int             GetSize() const
+    void SetBorder( _In_ int nBorder, _In_ int nMargin )
     {
-        return m_Items.GetSize();
+        m_nBorder = nBorder;
+        m_nMargin = nMargin;
     }
-    void            SetStyle( DWORD dwStyle )
-    {
-        m_dwStyle = dwStyle;
-    }
-    int             GetScrollBarWidth() const
-    {
-        return m_nSBWidth;
-    }
-    void            SetScrollBarWidth( int nWidth )
-    {
-        m_nSBWidth = nWidth; UpdateRects();
-    }
-    void            SetBorder( int nBorder, int nMargin )
-    {
-        m_nBorder = nBorder; m_nMargin = nMargin;
-    }
-    HRESULT         AddItem( const WCHAR* wszText, void* pData );
-    HRESULT         InsertItem( int nIndex, const WCHAR* wszText, void* pData );
-    void            RemoveItem( int nIndex );
-    void            RemoveAllItems();
-
-    DXUTListBoxItem* GetItem( int nIndex );
-    int             GetSelectedIndex( int nPreviousSelected = -1 );
-    DXUTListBoxItem* GetSelectedItem( int nPreviousSelected = -1 )
+    HRESULT AddItem( _In_z_ const WCHAR* wszText, _In_opt_ void* pData );
+    HRESULT InsertItem( _In_ int nIndex, _In_z_ const WCHAR* wszText, _In_opt_ void* pData );
+    void    RemoveItem( _In_ int nIndex );
+    void    RemoveAllItems();
+
+    DXUTListBoxItem* GetItem( _In_ int nIndex ) const;
+    int              GetSelectedIndex( _In_ int nPreviousSelected = -1 ) const;
+    DXUTListBoxItem* GetSelectedItem( _In_ int nPreviousSelected = -1 ) const
     {
         return GetItem( GetSelectedIndex( nPreviousSelected ) );
     }
-    void            SelectItem( int nNewIndex );
+    void             SelectItem( _In_ int nNewIndex );
 
     enum STYLE
     {
@@ -1022,7 +849,7 @@ protected:
     int m_nSelStart;    // Index of the item where selection starts (for handling multi-selection)
     bool m_bDrag;       // Whether the user is dragging the mouse to select
 
-    CGrowableArray <DXUTListBoxItem*> m_Items;
+    std::vector<DXUTListBoxItem*> m_Items;
 };
 
 
@@ -1038,71 +865,60 @@ struct DXUTComboBoxItem
     bool bVisible;
 };
 
-
 class CDXUTComboBox : public CDXUTButton
 {
 public:
-                    CDXUTComboBox( CDXUTDialog* pDialog = NULL );
-    virtual         ~CDXUTComboBox();
+    CDXUTComboBox( _In_opt_ CDXUTDialog* pDialog = nullptr );
+    virtual ~CDXUTComboBox();
 
-    virtual void    SetTextColor( D3DCOLOR Color );
-    virtual HRESULT OnInit()
+    virtual void SetTextColor( _In_ DWORD Color ) override;
+    virtual HRESULT OnInit() override
     {
         return m_pDialog->InitControl( &m_ScrollBar );
     }
 
-    virtual bool    HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual bool    HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam );
-    virtual void    OnHotkey();
+    virtual bool HandleKeyboard( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual bool HandleMouse( _In_ UINT uMsg, _In_ const POINT& pt, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual void OnHotkey() override;
 
-    virtual bool    CanHaveFocus()
+    virtual bool CanHaveFocus() override
     {
         return ( m_bVisible && m_bEnabled );
     }
-    virtual void    OnFocusOut();
-    virtual void    Render( float fElapsedTime );
-
-    virtual void    UpdateRects();
-
-    HRESULT         AddItem( const WCHAR* strText, void* pData );
-    void            RemoveAllItems();
-    void            RemoveItem( UINT index );
-    bool            ContainsItem( const WCHAR* strText, UINT iStart=0 );
-    int             FindItem( const WCHAR* strText, UINT iStart=0 );
-    void* GetItemData( const WCHAR* strText );
-    void* GetItemData( int nIndex );
-    void            SetDropHeight( UINT nHeight )
-    {
-        m_nDropHeight = nHeight; UpdateRects();
-    }
-    int             GetScrollBarWidth() const
-    {
-        return m_nSBWidth;
-    }
-    void            SetScrollBarWidth( int nWidth )
-    {
-        m_nSBWidth = nWidth; UpdateRects();
-    }
+    virtual void OnFocusOut() override;
+    virtual void Render( _In_ float fElapsedTime ) override;
 
-    int             GetSelectedIndex() const
-    {
-        return m_iSelected;
-    }
-    void* GetSelectedData();
-    DXUTComboBoxItem* GetSelectedItem();
+    virtual void UpdateRects() override;
 
-    UINT            GetNumItems()
+    HRESULT AddItem( _In_z_ const WCHAR* strText, _In_opt_ void* pData );
+    void    RemoveAllItems();
+    void    RemoveItem( _In_ UINT index );
+    bool    ContainsItem( _In_z_ const WCHAR* strText, _In_ UINT iStart=0 );
+    int     FindItem( _In_z_ const WCHAR* strText, _In_ UINT iStart=0 ) const;
+    void*   GetItemData( _In_z_ const WCHAR* strText ) const;
+    void*   GetItemData( _In_ int nIndex ) const;
+    void    SetDropHeight( _In_ UINT nHeight )
     {
-        return m_Items.GetSize();
+        m_nDropHeight = nHeight;
+        UpdateRects();
     }
-    DXUTComboBoxItem* GetItem( UINT index )
+    int     GetScrollBarWidth() const { return m_nSBWidth; }
+    void    SetScrollBarWidth( _In_ int nWidth )
     {
-        return m_Items.GetAt( index );
+        m_nSBWidth = nWidth;
+        UpdateRects();
     }
 
-    HRESULT         SetSelectedByIndex( UINT index );
-    HRESULT         SetSelectedByText( const WCHAR* strText );
-    HRESULT         SetSelectedByData( void* pData );
+    int GetSelectedIndex() const { return m_iSelected; }
+    void* GetSelectedData() const;
+    DXUTComboBoxItem* GetSelectedItem() const;
+
+    UINT GetNumItems() { return static_cast<UINT>( m_Items.size() ); }
+    DXUTComboBoxItem* GetItem( _In_ UINT index ) { return m_Items[ index ]; }
+
+    HRESULT SetSelectedByIndex( _In_ UINT index );
+    HRESULT SetSelectedByText( _In_z_ const WCHAR* strText );
+    HRESULT SetSelectedByData( _In_ void* pData );
 
 protected:
     int m_iSelected;
@@ -1118,8 +934,7 @@ protected:
     RECT m_rcDropdown;
     RECT m_rcDropdownText;
 
-
-    CGrowableArray <DXUTComboBoxItem*> m_Items;
+    std::vector<DXUTComboBoxItem*> m_Items;
 };
 
 
@@ -1129,38 +944,33 @@ protected:
 class CDXUTSlider : public CDXUTControl
 {
 public:
-                    CDXUTSlider( CDXUTDialog* pDialog = NULL );
+    CDXUTSlider( _In_opt_ CDXUTDialog* pDialog = nullptr );
 
-    virtual BOOL    ContainsPoint( POINT pt );
-    virtual bool    CanHaveFocus()
+    virtual bool ContainsPoint( _In_ const POINT& pt ) override;
+    virtual bool CanHaveFocus() override
     {
         return ( m_bVisible && m_bEnabled );
     }
-    virtual bool    HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual bool    HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam );
+    virtual bool HandleKeyboard( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual bool HandleMouse( _In_ UINT uMsg, _In_ const POINT& pt, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
 
-    virtual void    UpdateRects();
+    virtual void UpdateRects() override;
 
-    virtual void    Render( float fElapsedTime );
+    virtual void Render( _In_ float fElapsedTime ) override;
 
-    void            SetValue( int nValue )
-    {
-        SetValueInternal( nValue, false );
-    }
-    int             GetValue() const
-    {
-        return m_nValue;
-    };
+    void SetValue( int nValue ) { SetValueInternal( nValue, false ); }
+    int GetValue() const { return m_nValue; }
 
-    void            GetRange( int& nMin, int& nMax ) const
+    void GetRange( _Out_ int& nMin, _Out_ int& nMax ) const
     {
-        nMin = m_nMin; nMax = m_nMax;
+        nMin = m_nMin;
+        nMax = m_nMax;
     }
-    void            SetRange( int nMin, int nMax );
+    void SetRange( _In_ int nMin, _In_ int nMax );
 
 protected:
-    void            SetValueInternal( int nValue, bool bFromInput );
-    int             ValueFromPos( int x );
+    void SetValueInternal( _In_ int nValue, _In_ bool bFromInput );
+    int ValueFromPos( _In_ int x );
 
     int m_nValue;
 
@@ -1182,53 +992,44 @@ protected:
 class CUniBuffer
 {
 public:
-                            CUniBuffer( int nInitialSize = 1 );
-                            ~CUniBuffer();
-
-    static void WINAPI      Initialize();
-    static void WINAPI      Uninitialize();
+    CUniBuffer( _In_ int nInitialSize = 1 );
+    ~CUniBuffer();
 
-    int                     GetBufferSize()
-    {
-        return m_nBufferSize;
-    }
-    bool                    SetBufferSize( int nSize );
-    int                     GetTextSize()
-    {
-        return lstrlenW( m_pwszBuffer );
-    }
-    const WCHAR* GetBuffer()
+    size_t GetBufferSize() const { return m_nBufferSize; }
+    bool SetBufferSize( _In_ int nSize );
+    int GetTextSize() const { return (int)wcslen( m_pwszBuffer ); }
+    const WCHAR* GetBuffer() const
     {
         return m_pwszBuffer;
     }
-    const WCHAR& operator[]( int n ) const
+    const WCHAR& operator[]( _In_ int n ) const
     {
         return m_pwszBuffer[n];
     }
-    WCHAR& operator[]( int n );
-    DXUTFontNode* GetFontNode()
-    {
-        return m_pFontNode;
-    }
-    void                    SetFontNode( DXUTFontNode* pFontNode )
-    {
-        m_pFontNode = pFontNode;
-    }
-    void                    Clear();
+    WCHAR& operator[]( _In_ int n );
+    DXUTFontNode* GetFontNode() const { return m_pFontNode; }
+    void SetFontNode( _In_opt_ DXUTFontNode* pFontNode ) { m_pFontNode = pFontNode; }
+    void Clear();
+
+    bool InsertChar( _In_ int nIndex, _In_ WCHAR wChar );
+        // Inserts the char at specified index. If nIndex == -1, insert to the end.
 
-    bool                    InsertChar( int nIndex, WCHAR wChar ); // Inserts the char at specified index. If nIndex == -1, insert to the end.
-    bool                    RemoveChar( int nIndex );  // Removes the char at specified index. If nIndex == -1, remove the last char.
-    bool                    InsertString( int nIndex, const WCHAR* pStr, int nCount = -1 );  // Inserts the first nCount characters of the string pStr at specified index.  If nCount == -1, the entire string is inserted. If nIndex == -1, insert to the end.
-    bool                    SetText( LPCWSTR wszText );
+    bool RemoveChar( _In_ int nIndex );
+        // Removes the char at specified index. If nIndex == -1, remove the last char.
+
+    bool InsertString( _In_ int nIndex, _In_z_ const WCHAR* pStr, _In_ int nCount = -1 );
+        // Inserts the first nCount characters of the string pStr at specified index.  If nCount == -1, the entire string is inserted. If nIndex == -1, insert to the end.
+
+    bool SetText( _In_z_ LPCWSTR wszText );
 
     // Uniscribe
-    HRESULT                 CPtoX( int nCP, BOOL bTrail, int* pX );
-    HRESULT                 XtoCP( int nX, int* pCP, int* pnTrail );
-    void                    GetPriorItemPos( int nCP, int* pPrior );
-    void                    GetNextItemPos( int nCP, int* pPrior );
+    bool CPtoX( _In_ int nCP, _In_ bool bTrail, _Out_ int* pX );
+    bool XtoCP( _In_ int nX, _Out_ int* pCP, _Out_ int* pnTrail );
+    void GetPriorItemPos( _In_ int nCP, _Out_ int* pPrior );
+    void GetNextItemPos( _In_ int nCP, _Out_ int* pPrior );
 
 private:
-    HRESULT                 Analyse();      // Uniscribe -- Analyse() analyses the string in the buffer
+    HRESULT Analyse();      // Uniscribe -- Analyse() analyses the string in the buffer
 
     WCHAR* m_pwszBuffer;    // Buffer to hold text
     int m_nBufferSize;   // Size of the buffer allocated, in characters
@@ -1237,123 +1038,58 @@ private:
     DXUTFontNode* m_pFontNode;          // Font node for the font that this buffer uses
     bool m_bAnalyseRequired;            // True if the string has changed since last analysis.
     SCRIPT_STRING_ANALYSIS m_Analysis;  // Analysis for the current string
-
-private:
-    // Empty implementation of the Uniscribe API
-    static HRESULT WINAPI   Dummy_ScriptApplyDigitSubstitution( const SCRIPT_DIGITSUBSTITUTE*, SCRIPT_CONTROL*,
-                                                                SCRIPT_STATE* )
-    {
-        return E_NOTIMPL;
-    }
-    static HRESULT WINAPI   Dummy_ScriptStringAnalyse( HDC, const void*, int, int, int, DWORD, int, SCRIPT_CONTROL*,
-                                                       SCRIPT_STATE*, const int*, SCRIPT_TABDEF*, const BYTE*,
-                                                       SCRIPT_STRING_ANALYSIS* )
-    {
-        return E_NOTIMPL;
-    }
-    static HRESULT WINAPI   Dummy_ScriptStringCPtoX( SCRIPT_STRING_ANALYSIS, int, BOOL, int* )
-    {
-        return E_NOTIMPL;
-    }
-    static HRESULT WINAPI   Dummy_ScriptStringXtoCP( SCRIPT_STRING_ANALYSIS, int, int*, int* )
-    {
-        return E_NOTIMPL;
-    }
-    static HRESULT WINAPI   Dummy_ScriptStringFree( SCRIPT_STRING_ANALYSIS* )
-    {
-        return E_NOTIMPL;
-    }
-    static const SCRIPT_LOGATTR* WINAPI Dummy_ScriptString_pLogAttr( SCRIPT_STRING_ANALYSIS )
-    {
-        return NULL;
-    }
-    static const int* WINAPI Dummy_ScriptString_pcOutChars( SCRIPT_STRING_ANALYSIS )
-    {
-        return NULL;
-    }
-
-    // Function pointers
-    static                  HRESULT( WINAPI* _ScriptApplyDigitSubstitution )( const SCRIPT_DIGITSUBSTITUTE*,
-                                                                              SCRIPT_CONTROL*, SCRIPT_STATE* );
-    static                  HRESULT( WINAPI* _ScriptStringAnalyse )( HDC, const void*, int, int, int, DWORD, int,
-                                                                     SCRIPT_CONTROL*, SCRIPT_STATE*, const int*,
-                                                                     SCRIPT_TABDEF*, const BYTE*,
-                                                                     SCRIPT_STRING_ANALYSIS* );
-    static                  HRESULT( WINAPI* _ScriptStringCPtoX )( SCRIPT_STRING_ANALYSIS, int, BOOL, int* );
-    static                  HRESULT( WINAPI* _ScriptStringXtoCP )( SCRIPT_STRING_ANALYSIS, int, int*, int* );
-    static                  HRESULT( WINAPI* _ScriptStringFree )( SCRIPT_STRING_ANALYSIS* );
-    static const SCRIPT_LOGATTR* ( WINAPI*_ScriptString_pLogAttr )( SCRIPT_STRING_ANALYSIS );
-    static const int* ( WINAPI*_ScriptString_pcOutChars )( SCRIPT_STRING_ANALYSIS );
-
-    static HINSTANCE s_hDll;  // Uniscribe DLL handle
-
 };
 
+
 //-----------------------------------------------------------------------------
 // EditBox control
 //-----------------------------------------------------------------------------
 class CDXUTEditBox : public CDXUTControl
 {
 public:
-                    CDXUTEditBox( CDXUTDialog* pDialog = NULL );
-    virtual         ~CDXUTEditBox();
-
-    virtual bool    HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual bool    HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam );
-    virtual bool    MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual void    UpdateRects();
-    virtual bool    CanHaveFocus()
+    CDXUTEditBox( _In_opt_ CDXUTDialog* pDialog = nullptr );
+    virtual ~CDXUTEditBox();
+
+    virtual bool HandleKeyboard( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual bool HandleMouse( _In_ UINT uMsg, _In_ const POINT& pt, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual bool MsgProc( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual void UpdateRects() override;
+    virtual bool CanHaveFocus() override
     {
         return ( m_bVisible && m_bEnabled );
     }
-    virtual void    Render( float fElapsedTime );
-    virtual void    OnFocusIn();
+    virtual void Render( _In_ float fElapsedTime ) override;
+    virtual void OnFocusIn() override;
 
-    void            SetText( LPCWSTR wszText, bool bSelected = false );
-    LPCWSTR         GetText()
-    {
-        return m_Buffer.GetBuffer();
-    }
-    int             GetTextLength()
-    {
-        return m_Buffer.GetTextSize();
-    }  // Returns text length in chars excluding NULL.
-    HRESULT         GetTextCopy(  __out_ecount(bufferCount) LPWSTR strDest, 
-                    UINT bufferCount );
-    void            ClearText();
-    virtual void    SetTextColor( D3DCOLOR Color )
-    {
-        m_TextColor = Color;
-    }  // Text color
-    void            SetSelectedTextColor( D3DCOLOR Color )
-    {
-        m_SelTextColor = Color;
-    }  // Selected text color
-    void            SetSelectedBackColor( D3DCOLOR Color )
-    {
-        m_SelBkColor = Color;
-    }  // Selected background color
-    void            SetCaretColor( D3DCOLOR Color )
-    {
-        m_CaretColor = Color;
-    }  // Caret color
-    void            SetBorderWidth( int nBorder )
+    void    SetText( _In_z_ LPCWSTR wszText, _In_ bool bSelected = false );
+    LPCWSTR GetText() const { return m_Buffer.GetBuffer(); }
+    size_t  GetTextLength() const { return m_Buffer.GetTextSize(); }  // Returns text length in chars excluding nul.
+    HRESULT GetTextCopy(  _Out_writes_(bufferCount) LPWSTR strDest, _In_ UINT bufferCount ) const;
+    void    ClearText();
+
+    virtual void SetTextColor( _In_ DWORD Color ) override { m_TextColor = Color; }  // Text color
+    void SetSelectedTextColor( _In_ DWORD Color ) { m_SelTextColor = Color; }  // Selected text color
+    void SetSelectedBackColor( _In_ DWORD Color ) { m_SelBkColor = Color; }  // Selected background color
+    void SetCaretColor( _In_ DWORD Color ) { m_CaretColor = Color; }  // Caret color
+    void SetBorderWidth( _In_ int nBorder )
     {
-        m_nBorder = nBorder; UpdateRects();
+        m_nBorder = nBorder;
+        UpdateRects();
     }  // Border of the window
-    void            SetSpacing( int nSpacing )
+    void SetSpacing( _In_ int nSpacing )
     {
-        m_nSpacing = nSpacing; UpdateRects();
+        m_nSpacing = nSpacing;
+        UpdateRects();
     }
-    void            ParseFloatArray( float* pNumbers, int nCount );
-    void            SetTextFloatArray( const float* pNumbers, int nCount );
+    void ParseFloatArray( _In_reads_(nCount) float* pNumbers, _In_ int nCount );
+    void SetTextFloatArray( _In_reads_(nCount) const float* pNumbers, _In_ int nCount );
 
 protected:
-    void            PlaceCaret( int nCP );
-    void            DeleteSelectionText();
-    void            ResetCaretBlink();
-    void            CopyToClipboard();
-    void            PasteFromClipboard();
+    void PlaceCaret( _In_ int nCP );
+    void DeleteSelectionText();
+    void ResetCaretBlink();
+    void CopyToClipboard();
+    void PasteFromClipboard();
 
     CUniBuffer m_Buffer;     // Buffer to hold text
     int m_nBorder;      // Border of the window
@@ -1367,10 +1103,10 @@ protected:
     bool m_bInsertMode;  // If true, control is in insert mode. Else, overwrite mode.
     int m_nSelStart;    // Starting position of the selection. The caret marks the end.
     int m_nFirstVisible;// First visible character in the edit control
-    D3DCOLOR m_TextColor;    // Text color
-    D3DCOLOR m_SelTextColor; // Selected text color
-    D3DCOLOR m_SelBkColor;   // Selected background color
-    D3DCOLOR m_CaretColor;   // Caret color
+    DWORD m_TextColor;    // Text color
+    DWORD m_SelTextColor; // Selected text color
+    DWORD m_SelBkColor;   // Selected background color
+    DWORD m_CaretColor;   // Caret color
 
     // Mouse-specific
     bool m_bMouseDrag;       // True to indicate drag in progress
@@ -1380,6 +1116,9 @@ protected:
 };
 
 
-
-
-#endif // DXUT_GUI_H
+//-----------------------------------------------------------------------------
+void BeginText11();
+void DrawText11DXUT( _In_ ID3D11Device* pd3dDevice, _In_ ID3D11DeviceContext* pd3d11DeviceContext,
+                     _In_z_ LPCWSTR strText, _In_ const RECT& rcScreen, _In_ DirectX::XMFLOAT4 vFontColor,
+                     _In_ float fBBWidth, _In_ float fBBHeight, _In_ bool bCenter );
+void EndText11( _In_ ID3D11Device* pd3dDevice, _In_ ID3D11DeviceContext* pd3d11DeviceContext );
diff --git a/samples/DX_APIUsage/DXUT/Optional/DXUTguiIME.cpp b/samples/DX_APIUsage/DXUT/Optional/DXUTguiIME.cpp
index 4bb0596..8ef717f 100644
--- a/samples/DX_APIUsage/DXUT/Optional/DXUTguiIME.cpp
+++ b/samples/DX_APIUsage/DXUT/Optional/DXUTguiIME.cpp
@@ -2,6 +2,9 @@
 // File: DXUTguiIME.cpp
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #include "DXUT.h"
 #include "DXUTgui.h"
@@ -10,8 +13,6 @@
 #include "DXUTgui.h"
 #include "DXUTguiIME.h"
 
-#undef min // use __min instead
-#undef max // use __max instead
 #define DXUT_NEAR_BUTTON_DEPTH 0.6f
 
 
@@ -35,15 +36,16 @@ bool      CDXUTIMEEditBox::m_bIMEStaticMsgProcCalled = false;
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTIMEEditBox::CreateIMEEditBox( CDXUTDialog* pDialog, int ID, LPCWSTR strText, int x, int y, int width,
                                            int height, bool bIsDefault, CDXUTIMEEditBox** ppCreated )
 {
-    CDXUTIMEEditBox* pEditBox = new CDXUTIMEEditBox( pDialog );
+    auto pEditBox = new (std::nothrow) CDXUTIMEEditBox( pDialog );
 
-    if( ppCreated != NULL )
+    if( ppCreated )
         *ppCreated = pEditBox;
 
-    if( pEditBox == NULL )
+    if( !pEditBox )
         return E_OUTOFMEMORY;
 
     // Set the ID and position
@@ -60,7 +62,7 @@ HRESULT CDXUTIMEEditBox::CreateIMEEditBox( CDXUTDialog* pDialog, int ID, LPCWSTR
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTIMEEditBox::InitDefaultElements( CDXUTDialog* pDialog )
+void CDXUTIMEEditBox::InitDefaultElements( _In_ CDXUTDialog* pDialog )
 {
     //-------------------------------------
     // CDXUTIMEEditBox
@@ -108,7 +110,7 @@ void CDXUTIMEEditBox::InitDefaultElements( CDXUTDialog* pDialog )
 
 
 //--------------------------------------------------------------------------------------
-CDXUTIMEEditBox::CDXUTIMEEditBox( CDXUTDialog* pDialog )
+CDXUTIMEEditBox::CDXUTIMEEditBox( _In_opt_ CDXUTDialog* pDialog )
 {
     m_Type = DXUT_CONTROL_IMEEDITBOX;
     m_pDialog = pDialog;
@@ -142,7 +144,7 @@ CDXUTIMEEditBox::~CDXUTIMEEditBox()
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTIMEEditBox::SendKey( BYTE nVirtKey )
+void CDXUTIMEEditBox::SendKey( _In_ BYTE nVirtKey )
 {
     keybd_event( nVirtKey, 0, 0, 0 );
     keybd_event( nVirtKey, 0, KEYEVENTF_KEYUP, 0 );
@@ -193,7 +195,7 @@ void CDXUTIMEEditBox::UpdateRects()
 //--------------------------------------------------------------------------------------
 // Enable/disable the entire IME system.  When disabled, the default IME handling
 // kicks in.
-void CDXUTIMEEditBox::EnableImeSystem( bool bEnable )
+void CDXUTIMEEditBox::EnableImeSystem( _In_ bool bEnable )
 {
     ImeUi_EnableIme( bEnable );
 }
@@ -214,9 +216,9 @@ void CDXUTIMEEditBox::PumpMessage()
 {
     MSG msg;
 
-    while( PeekMessageW( &msg, NULL, 0, 0, PM_NOREMOVE ) )
+    while( PeekMessageW( &msg, nullptr, 0, 0, PM_NOREMOVE ) )
     {
-        if( !GetMessageW( &msg, NULL, 0, 0 ) )
+        if( !GetMessageW( &msg, nullptr, 0, 0 ) )
         {
             PostQuitMessage( ( int )msg.wParam );
             return;
@@ -245,8 +247,11 @@ void CDXUTIMEEditBox::OnFocusOut()
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTIMEEditBox::StaticMsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
+    UNREFERENCED_PARAMETER(hWnd);
+    UNREFERENCED_PARAMETER(wParam);
 
     if( !ImeUi_IsEnabled() )
         return false;
@@ -295,7 +300,8 @@ bool CDXUTIMEEditBox::StaticMsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
 
 
 //--------------------------------------------------------------------------------------
-bool CDXUTIMEEditBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam )
+_Use_decl_annotations_
+bool CDXUTIMEEditBox::HandleMouse( UINT uMsg, const POINT& pt, WPARAM wParam, LPARAM lParam )
 {
     if( !m_bEnabled || !m_bVisible )
         return false;
@@ -305,7 +311,7 @@ bool CDXUTIMEEditBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lP
         case WM_LBUTTONDOWN:
         case WM_LBUTTONDBLCLK:
             {
-                DXUTFontNode* pFont = m_pDialog->GetFont( m_Elements.GetAt( 9 )->iFont );
+                auto pFont = m_pDialog->GetFont( m_Elements[ 9 ]->iFont );
 
                 // Check if this click is on top of the composition string
                 int nCompStrWidth;
@@ -430,7 +436,7 @@ bool CDXUTIMEEditBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lP
                             if( nCharHit >= nEntryStart )
                             {
                                 // Haven't found it.
-                                nEntryStart += lstrlenW( ImeUi_GetCandidate( i ) ) + 1;  // plus space separator
+                                nEntryStart += (int)wcslen( ImeUi_GetCandidate( i ) ) + 1;  // plus space separator
                             }
                             else
                             {
@@ -463,6 +469,7 @@ bool CDXUTIMEEditBox::HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lP
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool CDXUTIMEEditBox::MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
     if( !m_bEnabled || !m_bVisible )
@@ -497,15 +504,16 @@ bool CDXUTIMEEditBox::MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTIMEEditBox::RenderCandidateReadingWindow( float fElapsedTime, bool bReading )
+_Use_decl_annotations_
+void CDXUTIMEEditBox::RenderCandidateReadingWindow( bool bReading )
 {
     RECT rc;
     UINT nNumEntries = bReading ? 4 : MAX_CANDLIST;
-    D3DCOLOR TextColor, TextBkColor, SelTextColor, SelBkColor;
     int nX, nXFirst, nXComp;
     m_Buffer.CPtoX( m_nCaret, FALSE, &nX );
     m_Buffer.CPtoX( m_nFirstVisible, FALSE, &nXFirst );
 
+    DWORD TextColor, TextBkColor, SelTextColor, SelBkColor;
     if( bReading )
     {
         TextColor = m_ReadingColor;
@@ -545,9 +553,9 @@ void CDXUTIMEEditBox::RenderCandidateReadingWindow( float fElapsedTime, bool bRe
             if( *( ImeUi_GetCandidate( i ) ) == L'\0' )
                 break;
             SetRect( &rc, 0, 0, 0, 0 );
-            m_pDialog->CalcTextRect( ImeUi_GetCandidate( i ), m_Elements.GetAt( 1 ), &rc );
-            nWidthRequired = __max( nWidthRequired, rc.right - rc.left );
-            nSingleLineHeight = __max( nSingleLineHeight, rc.bottom - rc.top );
+            m_pDialog->CalcTextRect( ImeUi_GetCandidate( i ), m_Elements[ 1 ], &rc );
+            nWidthRequired = std::max<int>( nWidthRequired, rc.right - rc.left );
+            nSingleLineHeight = std::max<int>( nSingleLineHeight, rc.bottom - rc.top );
         }
         nHeightRequired = nSingleLineHeight * nNumEntries;
     }
@@ -556,7 +564,7 @@ void CDXUTIMEEditBox::RenderCandidateReadingWindow( float fElapsedTime, bool bRe
         // Horizontal window
         SetRect( &rc, 0, 0, 0, 0 );
         if( bReading )
-            m_pDialog->CalcTextRect( s_wszReadingString, m_Elements.GetAt( 1 ), &rc );
+            m_pDialog->CalcTextRect( s_wszReadingString, m_Elements[ 1 ], &rc );
         else
         {
 
@@ -570,19 +578,19 @@ void CDXUTIMEEditBox::RenderCandidateReadingWindow( float fElapsedTime, bool bRe
                     break;
 
                 WCHAR wszEntry[32];
-                swprintf_s( wszEntry, 32, L"%s ", ImeUi_GetCandidate( i ) );
+                swprintf_s( wszEntry, 32, L"%ls ", ImeUi_GetCandidate( i ) );
                 // If this is the selected entry, mark its char position.
                 if( ImeUi_GetCandidateSelection() == i )
                 {
-                    s_CandList.nFirstSelected = lstrlen( wszCand );
-                    s_CandList.nHoriSelectedLen = lstrlen( wszEntry ) - 1;  // Minus space
+                    s_CandList.nFirstSelected = (int)wcslen( wszCand );
+                    s_CandList.nHoriSelectedLen = (int)wcslen( wszEntry ) - 1;  // Minus space
                 }
                 wcscat_s( wszCand, 256, wszEntry );
             }
-            wszCand[lstrlen( wszCand ) - 1] = L'\0';  // Remove the last space
+            wszCand[wcslen( wszCand ) - 1] = L'\0';  // Remove the last space
             s_CandList.HoriCand.SetText( wszCand );
 			
-            m_pDialog->CalcTextRect( s_CandList.HoriCand.GetBuffer(), m_Elements.GetAt( 1 ), &rc );
+            m_pDialog->CalcTextRect( s_CandList.HoriCand.GetBuffer(), m_Elements[ 1 ], &rc );
         }
         nWidthRequired = rc.right - rc.left;
         nSingleLineHeight = nHeightRequired = rc.bottom - rc.top;
@@ -670,12 +678,12 @@ void CDXUTIMEEditBox::RenderCandidateReadingWindow( float fElapsedTime, bool bRe
             if( ImeUi_GetCandidateSelection() == i )
             {
                 m_pDialog->DrawRect( &rc, SelBkColor );
-                m_Elements.GetAt( 1 )->FontColor.Current = SelTextColor;
+                m_Elements[ 1 ]->FontColor.SetCurrent( SelTextColor );
             }
             else
-                m_Elements.GetAt( 1 )->FontColor.Current = TextColor;
+                m_Elements[ 1 ]->FontColor.SetCurrent( TextColor );
 
-            m_pDialog->DrawText( ImeUi_GetCandidate( i ), m_Elements.GetAt( 1 ), &rc );
+            m_pDialog->DrawText( ImeUi_GetCandidate( i ), m_Elements[ 1 ], &rc );
 
             rc.top += nSingleLineHeight;
         }
@@ -683,11 +691,11 @@ void CDXUTIMEEditBox::RenderCandidateReadingWindow( float fElapsedTime, bool bRe
     else
     {
         // Horizontal candidate window
-        m_Elements.GetAt( 1 )->FontColor.Current = TextColor;
+        m_Elements[ 1 ]->FontColor.SetCurrent( TextColor );
         if( bReading )
-            m_pDialog->DrawText( s_wszReadingString, m_Elements.GetAt( 1 ), &rc );
+            m_pDialog->DrawText( s_wszReadingString, m_Elements[ 1 ], &rc );
         else
-            m_pDialog->DrawText( s_CandList.HoriCand.GetBuffer(), m_Elements.GetAt( 1 ), &rc );
+            m_pDialog->DrawText( s_CandList.HoriCand.GetBuffer(), m_Elements[ 1 ], &rc );
 
         // Render the selected entry differently
         if( !bReading )
@@ -699,16 +707,16 @@ void CDXUTIMEEditBox::RenderCandidateReadingWindow( float fElapsedTime, bool bRe
             rc.right = rc.left + nXRight;
             rc.left += nXLeft;
             m_pDialog->DrawRect( &rc, SelBkColor );
-            m_Elements.GetAt( 1 )->FontColor.Current = SelTextColor;
+            m_Elements[ 1 ]->FontColor.SetCurrent( SelTextColor );
             m_pDialog->DrawText( s_CandList.HoriCand.GetBuffer() + s_CandList.nFirstSelected,
-                                 m_Elements.GetAt( 1 ), &rc, false, s_CandList.nHoriSelectedLen );
+                                 m_Elements[ 1 ], &rc, false );
         }
     }
 }
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTIMEEditBox::RenderComposition( float fElapsedTime )
+void CDXUTIMEEditBox::RenderComposition()
 {
 	
     s_CompString.SetText( ImeUi_GetCompositionString() );
@@ -720,7 +728,7 @@ void CDXUTIMEEditBox::RenderComposition( float fElapsedTime )
     int nX, nXFirst;
     m_Buffer.CPtoX( m_nCaret, FALSE, &nX );
     m_Buffer.CPtoX( m_nFirstVisible, FALSE, &nXFirst );
-    CDXUTElement* pElement = m_Elements.GetAt( 1 );
+    auto pElement = m_Elements[ 1 ];
 
     // Get the required width
     RECT rc =
@@ -743,10 +751,10 @@ void CDXUTIMEEditBox::RenderComposition( float fElapsedTime )
     s_ptCompString.x = rc.left; s_ptCompString.y = rc.top;
 
 
-    D3DCOLOR TextColor = m_CompColor;
+    DWORD TextColor = m_CompColor;
     // Render the window and string.
     // If the string is too long, we must wrap the line.
-    pElement->FontColor.Current = TextColor;
+    pElement->FontColor.SetCurrent( TextColor );
     const WCHAR* pwszComp = s_CompString.GetBuffer();
     int nCharLeft = s_CompString.GetTextSize();
     for(; ; )
@@ -755,7 +763,7 @@ void CDXUTIMEEditBox::RenderComposition( float fElapsedTime )
         int nLastInLine;
         int bTrail;
         s_CompString.XtoCP( m_rcText.right - rc.left, &nLastInLine, &bTrail );
-        int nNumCharToDraw = __min( nCharLeft, nLastInLine );
+        int nNumCharToDraw = std::min( nCharLeft, nLastInLine );
         m_pDialog->CalcTextRect( pwszComp, pElement, &rc, nNumCharToDraw );
 
         // Draw the background
@@ -772,7 +780,7 @@ void CDXUTIMEEditBox::RenderComposition( float fElapsedTime )
                 // Not drawing composition string background. We
                 // use the editbox's text color for composition
                 // string text.
-                TextColor = m_Elements.GetAt( 0 )->FontColor.States[DXUT_STATE_NORMAL];
+                TextColor = m_Elements[ 0 ]->FontColor.States[DXUT_STATE_NORMAL];
             }
         }
         else
@@ -782,8 +790,8 @@ void CDXUTIMEEditBox::RenderComposition( float fElapsedTime )
         }
 
         // Draw the text
-        pElement->FontColor.Current = TextColor;
-        m_pDialog->DrawText( pwszComp, pElement, &rc, false, nNumCharToDraw );
+        pElement->FontColor.SetCurrent( TextColor );
+        m_pDialog->DrawText( pwszComp, pElement, &rc, false );
 
         // Advance pointer and counter
         nCharLeft -= nNumCharToDraw;
@@ -809,7 +817,7 @@ void CDXUTIMEEditBox::RenderComposition( float fElapsedTime )
     for( pcComp = s_CompString.GetBuffer(), pAttr = ImeUi_GetCompStringAttr();
          *pcComp != L'\0'; ++pcComp, ++pAttr )
     {
-        D3DCOLOR bkColor;
+        DWORD bkColor;
 
         // Render a different background for this character
         int nXLeft, nXRight;
@@ -840,12 +848,12 @@ void CDXUTIMEEditBox::RenderComposition( float fElapsedTime )
         // Set up color based on the character attribute
         if( *pAttr == ATTR_TARGET_CONVERTED )
         {
-            pElement->FontColor.Current = m_CompTargetColor;
+            pElement->FontColor.SetCurrent( m_CompTargetColor );
             bkColor = m_CompTargetBkColor;
         }
         else if( *pAttr == ATTR_TARGET_NOTCONVERTED )
         {
-            pElement->FontColor.Current = m_CompTargetNonColor;
+            pElement->FontColor.SetCurrent( m_CompTargetNonColor );
             bkColor = m_CompTargetNonBkColor;
         }
         else
@@ -884,22 +892,22 @@ void CDXUTIMEEditBox::RenderComposition( float fElapsedTime )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTIMEEditBox::RenderIndicator( float fElapsedTime )
+void CDXUTIMEEditBox::RenderIndicator( _In_ float fElapsedTime )
 {
-    CDXUTElement* pElement = m_Elements.GetAt( 9 );
+    auto pElement = m_Elements[ 9 ];
     pElement->TextureColor.Blend( DXUT_STATE_NORMAL, fElapsedTime );
 
     m_pDialog->DrawSprite( pElement, &m_rcIndicator, DXUT_NEAR_BUTTON_DEPTH );
     RECT rc = m_rcIndicator;
     InflateRect( &rc, -m_nSpacing, -m_nSpacing );
 
-    pElement->FontColor.Current = m_IndicatorImeColor;
+    pElement->FontColor.SetCurrent( m_IndicatorImeColor );
     RECT rcCalc =
     {
         0, 0, 0, 0
     };
     // If IME system is off, draw English indicator.
-    WCHAR* pwszIndicator = ImeUi_IsEnabled() ? ImeUi_GetIndicatior() : L"En";
+    const WCHAR* pwszIndicator = ImeUi_IsEnabled() ? ImeUi_GetIndicatior() : L"En";
 
     m_pDialog->CalcTextRect( pwszIndicator, pElement, &rcCalc );
     m_pDialog->DrawText( pwszIndicator, pElement, &rc );
@@ -907,7 +915,7 @@ void CDXUTIMEEditBox::RenderIndicator( float fElapsedTime )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTIMEEditBox::Render( float fElapsedTime )
+void CDXUTIMEEditBox::Render( _In_ float fElapsedTime )
 {
     if( m_bVisible == false )
         return;
@@ -920,7 +928,7 @@ void CDXUTIMEEditBox::Render( float fElapsedTime )
         {
             0, 0, 0, 0
         };
-        m_pDialog->CalcTextRect( L"En", m_Elements.GetAt( 9 ), &rc );
+        m_pDialog->CalcTextRect( L"En", m_Elements[ 9 ], &rc );
         m_nIndicatorWidth = rc.right - rc.left;
 
         // Update the rectangles now that we have the indicator's width
@@ -930,7 +938,7 @@ void CDXUTIMEEditBox::Render( float fElapsedTime )
     // Let the parent render first (edit control)
     CDXUTEditBox::Render( fElapsedTime );
 
-    CDXUTElement* pElement = GetElement( 1 );
+    auto pElement = GetElement( 1 );
     if( pElement )
     {
         s_CompString.SetFontNode( m_pDialog->GetFont( pElement->iFont ) );
@@ -951,35 +959,35 @@ void CDXUTIMEEditBox::Render( float fElapsedTime )
         // Display the composition string.
         // This method should also update s_ptCompString
         // for RenderCandidateReadingWindow.
-        RenderComposition( fElapsedTime );
+        RenderComposition();
 
         // Display the reading/candidate window. RenderCandidateReadingWindow()
         // uses s_ptCompString to position itself.  s_ptCompString must have
         // been filled in by RenderComposition().
         if( ImeUi_IsShowReadingWindow() )
             // Reading window
-            RenderCandidateReadingWindow( fElapsedTime, true );
+            RenderCandidateReadingWindow( true );
         else if( ImeUi_IsShowCandListWindow() )
             // Candidate list window
-            RenderCandidateReadingWindow( fElapsedTime, false );
+            RenderCandidateReadingWindow( false );
     }
 }
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTIMEEditBox::SetImeEnableFlag( bool bFlag )
+void CDXUTIMEEditBox::SetImeEnableFlag( _In_ bool bFlag )
 {
     s_bImeFlag = bFlag;
 }
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTIMEEditBox::Initialize( HWND hWnd )
+void CDXUTIMEEditBox::Initialize( _In_ HWND hWnd )
 {
-    ImeUiCallback_DrawRect = NULL;
+    ImeUiCallback_DrawRect = nullptr;
     ImeUiCallback_Malloc = malloc;
     ImeUiCallback_Free = free;
-    ImeUiCallback_DrawFans = NULL;
+    ImeUiCallback_DrawFans = nullptr;
 
     ImeUi_Initialize( hWnd );
 	
diff --git a/samples/DX_APIUsage/DXUT/Optional/DXUTguiIME.h b/samples/DX_APIUsage/DXUT/Optional/DXUTguiIME.h
index 0fd177a..4190feb 100644
--- a/samples/DX_APIUsage/DXUT/Optional/DXUTguiIME.h
+++ b/samples/DX_APIUsage/DXUT/Optional/DXUTguiIME.h
@@ -2,16 +2,16 @@
 // File: DXUTguiIME.h
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #pragma once
-#ifndef DXUT_IME_H
-#define DXUT_IME_H
 
 #include <usp10.h>
 #include <dimm.h>
 #include "ImeUi.h"
 
-
 //--------------------------------------------------------------------------------------
 // Forward declarations
 //--------------------------------------------------------------------------------------
@@ -28,37 +28,37 @@ class CDXUTIMEEditBox : public CDXUTEditBox
 {
 public:
 
-    static HRESULT          CreateIMEEditBox( CDXUTDialog* pDialog, int ID, LPCWSTR strText, int x, int y, int width,
-                                              int height, bool bIsDefault=false, CDXUTIMEEditBox** ppCreated=NULL );
+    static HRESULT CreateIMEEditBox( _In_ CDXUTDialog* pDialog, _In_ int ID, _In_z_ LPCWSTR strText, _In_ int x, _In_ int y, _In_ int width,
+                                     _In_ int height, _In_ bool bIsDefault=false, _Outptr_opt_ CDXUTIMEEditBox** ppCreated=nullptr );
 
-                            CDXUTIMEEditBox( CDXUTDialog* pDialog = NULL );
-    virtual                 ~CDXUTIMEEditBox();
+    CDXUTIMEEditBox( _In_opt_ CDXUTDialog* pDialog = nullptr );
+    virtual ~CDXUTIMEEditBox();
 
-    static void             InitDefaultElements( CDXUTDialog* pDialog );
+    static void InitDefaultElements( _In_ CDXUTDialog* pDialog );
 
-    static void WINAPI      Initialize( HWND hWnd );
-    static void WINAPI      Uninitialize();
+    static void WINAPI Initialize( _In_ HWND hWnd );
+    static void WINAPI Uninitialize();
 
     static  HRESULT WINAPI  StaticOnCreateDevice();
-    static  bool WINAPI     StaticMsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
+    static  bool WINAPI     StaticMsgProc( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam );
 
-    static  void WINAPI     SetImeEnableFlag( bool bFlag );
+    static  void WINAPI     SetImeEnableFlag( _In_ bool bFlag );
 
-    virtual void            Render( float fElapsedTime );
-    virtual bool            MsgProc( UINT uMsg, WPARAM wParam, LPARAM lParam );
-    virtual bool            HandleMouse( UINT uMsg, POINT pt, WPARAM wParam, LPARAM lParam );
-    virtual void            UpdateRects();
-    virtual void            OnFocusIn();
-    virtual void            OnFocusOut();
+    virtual void Render( _In_ float fElapsedTime ) override;
+    virtual bool MsgProc( _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual bool HandleMouse( _In_ UINT uMsg, _In_ const POINT& pt, _In_ WPARAM wParam, _In_ LPARAM lParam ) override;
+    virtual void UpdateRects() override;
+    virtual void OnFocusIn() override;
+    virtual void OnFocusOut() override;
 
-    void                    PumpMessage();
+    void PumpMessage();
 
-    virtual void            RenderCandidateReadingWindow( float fElapsedTime, bool bReading );
-    virtual void            RenderComposition( float fElapsedTime );
-    virtual void            RenderIndicator( float fElapsedTime );
+    virtual void RenderCandidateReadingWindow( _In_ bool bReading );
+    virtual void RenderComposition();
+    virtual void RenderIndicator( _In_ float fElapsedTime );
 
 protected:
-    static void WINAPI      EnableImeSystem( bool bEnable );
+    static void WINAPI      EnableImeSystem( _In_ bool bEnable );
 
     static WORD WINAPI      GetLanguage()
     {
@@ -68,8 +68,8 @@ protected:
     {
         return ImeUi_GetPrimaryLanguage();
     }
-    static void WINAPI      SendKey( BYTE nVirtKey );
-    static DWORD WINAPI     GetImeId( UINT uIndex = 0 )
+    static void WINAPI      SendKey( _In_ BYTE nVirtKey );
+    static DWORD WINAPI     GetImeId( _In_ UINT uIndex = 0 )
     {
         return ImeUi_GetImeId( uIndex );
     };
@@ -108,24 +108,24 @@ protected:
     static bool s_bImeFlag;			  // Is ime enabled 
 	
     // Color of various IME elements
-    D3DCOLOR m_ReadingColor;        // Reading string color
-    D3DCOLOR m_ReadingWinColor;     // Reading window color
-    D3DCOLOR m_ReadingSelColor;     // Selected character in reading string
-    D3DCOLOR m_ReadingSelBkColor;   // Background color for selected char in reading str
-    D3DCOLOR m_CandidateColor;      // Candidate string color
-    D3DCOLOR m_CandidateWinColor;   // Candidate window color
-    D3DCOLOR m_CandidateSelColor;   // Selected candidate string color
-    D3DCOLOR m_CandidateSelBkColor; // Selected candidate background color
-    D3DCOLOR m_CompColor;           // Composition string color
-    D3DCOLOR m_CompWinColor;        // Composition string window color
-    D3DCOLOR m_CompCaretColor;      // Composition string caret color
-    D3DCOLOR m_CompTargetColor;     // Composition string target converted color
-    D3DCOLOR m_CompTargetBkColor;   // Composition string target converted background
-    D3DCOLOR m_CompTargetNonColor;  // Composition string target non-converted color
-    D3DCOLOR m_CompTargetNonBkColor;// Composition string target non-converted background
-    D3DCOLOR m_IndicatorImeColor;   // Indicator text color for IME
-    D3DCOLOR m_IndicatorEngColor;   // Indicator text color for English
-    D3DCOLOR m_IndicatorBkColor;    // Indicator text background color
+    DWORD m_ReadingColor;        // Reading string color
+    DWORD m_ReadingWinColor;     // Reading window color
+    DWORD m_ReadingSelColor;     // Selected character in reading string
+    DWORD m_ReadingSelBkColor;   // Background color for selected char in reading str
+    DWORD m_CandidateColor;      // Candidate string color
+    DWORD m_CandidateWinColor;   // Candidate window color
+    DWORD m_CandidateSelColor;   // Selected candidate string color
+    DWORD m_CandidateSelBkColor; // Selected candidate background color
+    DWORD m_CompColor;           // Composition string color
+    DWORD m_CompWinColor;        // Composition string window color
+    DWORD m_CompCaretColor;      // Composition string caret color
+    DWORD m_CompTargetColor;     // Composition string target converted color
+    DWORD m_CompTargetBkColor;   // Composition string target converted background
+    DWORD m_CompTargetNonColor;  // Composition string target non-converted color
+    DWORD m_CompTargetNonBkColor;// Composition string target non-converted background
+    DWORD m_IndicatorImeColor;   // Indicator text color for IME
+    DWORD m_IndicatorEngColor;   // Indicator text color for English
+    DWORD m_IndicatorBkColor;    // Indicator text background color
 
     // Edit-control-specific data
     int m_nIndicatorWidth;     // Width of the indicator symbol
@@ -135,7 +135,3 @@ protected:
     static bool    m_bIMEStaticMsgProcCalled;
 #endif
 };
-
-
-
-#endif // DXUT_IME_H
diff --git a/samples/DX_APIUsage/DXUT/Optional/DXUTres.cpp b/samples/DX_APIUsage/DXUT/Optional/DXUTres.cpp
index 080091b..5fb5440 100644
--- a/samples/DX_APIUsage/DXUT/Optional/DXUTres.cpp
+++ b/samples/DX_APIUsage/DXUT/Optional/DXUTres.cpp
@@ -1,11 +1,16 @@
 //----------------------------------------------------------------------------
 // File: DXUTRes.cpp
 //
-// Copyright (c) Microsoft Corp. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //-----------------------------------------------------------------------------
 #include "DXUT.h"
 #include "DXUTres.h"
 
+#include "DDSTextureLoader.h"
+
 static const DWORD g_DXUTGUITextureSrcData[] =
 {
     0x20534444, 0x0000007c, 0x00001007, 0x00000100, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 
@@ -8283,57 +8288,24 @@ static const DWORD g_DXUTArrowMeshSrcData[] =
 
 static const UINT g_DXUTArrowMeshSrcDataSizeInBytes = 2193;
 
-//-----------------------------------------------------------------------------
-HRESULT WINAPI DXUTCreateGUITextureFromInternalArray9( LPDIRECT3DDEVICE9 pd3dDevice, IDirect3DTexture9** ppTexture, D3DXIMAGE_INFO* pInfo )
-{
-    return D3DXCreateTextureFromFileInMemoryEx( pd3dDevice, g_DXUTGUITextureSrcData, g_DXUTGUITextureSrcDataSizeInBytes, 
-                                                D3DX_DEFAULT, D3DX_DEFAULT, 1, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, 
-                                                D3DX_DEFAULT, D3DX_DEFAULT, 0, pInfo, NULL, ppTexture );
-}
-
 //--------------------------------------------------------------------------------------
-HRESULT WINAPI DXUTCreateGUITextureFromInternalArray11(ID3D11Device* pd3dDevice, ID3D11Texture2D** ppTexture, D3DX11_IMAGE_INFO* pInfo)
+_Use_decl_annotations_
+HRESULT WINAPI DXUTCreateGUITextureFromInternalArray(ID3D11Device* pd3dDevice, ID3D11Texture2D** ppTexture)
 {
-    HRESULT hr;
-
-    D3DX11_IMAGE_INFO SrcInfo;
-    if( !pInfo )
-    {
-        D3DX11GetImageInfoFromMemory( g_DXUTGUITextureSrcData, g_DXUTGUITextureSrcDataSizeInBytes, NULL, &SrcInfo, NULL );
-        pInfo = &SrcInfo;
-    }
-
-    ID3D11Resource *pRes;
-    D3DX11_IMAGE_LOAD_INFO loadInfo;
-    loadInfo.Width = D3DX11_DEFAULT;
-    loadInfo.Height  = D3DX11_DEFAULT;
-    loadInfo.Depth  = D3DX11_DEFAULT;
-    loadInfo.FirstMipLevel = 0;
-    loadInfo.MipLevels = 1;
-    loadInfo.Usage = D3D11_USAGE_DEFAULT;
-    loadInfo.BindFlags = D3D11_BIND_SHADER_RESOURCE;
-    loadInfo.CpuAccessFlags = 0;
-    loadInfo.MiscFlags = 0;
-    //loadInfo.Format = MAKE_TYPELESS( pInfo->Format );
-    loadInfo.Format = MAKE_SRGB( pInfo->Format );
-    loadInfo.Filter = D3DX11_FILTER_NONE;
-    loadInfo.MipFilter = D3DX11_FILTER_NONE;
-    loadInfo.pSrcInfo = pInfo;
+    if ( !ppTexture )
+        return E_INVALIDARG;
 
-    hr = D3DX11CreateTextureFromMemory( pd3dDevice, g_DXUTGUITextureSrcData, g_DXUTGUITextureSrcDataSizeInBytes, &loadInfo, NULL, &pRes, NULL );
-    if( FAILED( hr ) )
+    ID3D11Resource *pRes = nullptr;
+    HRESULT hr = DirectX::CreateDDSTextureFromMemory( pd3dDevice,
+                                    reinterpret_cast<const uint8_t*>(g_DXUTGUITextureSrcData), g_DXUTGUITextureSrcDataSizeInBytes,
+                                    &pRes, nullptr ); 
+    if ( FAILED(hr) )
         return hr;
+
     DXUT_SetDebugName( pRes, "DXUT" );
+
     hr = pRes->QueryInterface( __uuidof( ID3D11Texture2D ), (LPVOID*)ppTexture );
     SAFE_RELEASE( pRes );
 
-    return S_OK;
+    return hr;
 }
-
-//-----------------------------------------------------------------------------
-HRESULT WINAPI DXUTCreateArrowMeshFromInternalArray( LPDIRECT3DDEVICE9 pd3dDevice, ID3DXMesh** ppMesh )
-{
-    return D3DXLoadMeshFromXInMemory( g_DXUTArrowMeshSrcData, g_DXUTArrowMeshSrcDataSizeInBytes, 
-                                      D3DXMESH_MANAGED, pd3dDevice, NULL, NULL, NULL, NULL, ppMesh );
-}
-
diff --git a/samples/DX_APIUsage/DXUT/Optional/DXUTres.h b/samples/DX_APIUsage/DXUT/Optional/DXUTres.h
index a3e851f..0216b5c 100644
--- a/samples/DX_APIUsage/DXUT/Optional/DXUTres.h
+++ b/samples/DX_APIUsage/DXUT/Optional/DXUTres.h
@@ -3,16 +3,11 @@
 //
 // Functions to create DXUT media from arrays in memory 
 //
-// Copyright (c) Microsoft Corp. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //-----------------------------------------------------------------------------
 #pragma once
-#ifndef DXUT_RES_H
-#define DXUT_RES_H
-
-HRESULT WINAPI DXUTCreateGUITextureFromInternalArray9( LPDIRECT3DDEVICE9 pd3dDevice, IDirect3DTexture9** ppTexture,
-                                                       D3DXIMAGE_INFO* pInfo );
-HRESULT WINAPI DXUTCreateGUITextureFromInternalArray11( ID3D11Device* pd3dDevice, ID3D11Texture2D** ppTexture,
-                                                        D3DX11_IMAGE_INFO* pInfo );
-HRESULT WINAPI DXUTCreateArrowMeshFromInternalArray( LPDIRECT3DDEVICE9 pd3dDevice, ID3DXMesh** ppMesh );
 
-#endif
+HRESULT WINAPI DXUTCreateGUITextureFromInternalArray( _In_ ID3D11Device* pd3dDevice, _Outptr_ ID3D11Texture2D** ppTexture );
diff --git a/samples/DX_APIUsage/DXUT/Optional/DXUTsettingsdlg.cpp b/samples/DX_APIUsage/DXUT/Optional/DXUTsettingsdlg.cpp
index 6cf495b..483217d 100644
--- a/samples/DX_APIUsage/DXUT/Optional/DXUTsettingsdlg.cpp
+++ b/samples/DX_APIUsage/DXUT/Optional/DXUTsettingsdlg.cpp
@@ -3,24 +3,21 @@
 //
 // Dialog for selection of device settings 
 //
-// Copyright (c) Microsoft Corporation. All rights reserved
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #include "DXUT.h"
 #include "DXUTgui.h"
 #include "DXUTsettingsDlg.h"
-#undef min // use __min instead
-#undef max // use __max instead
-
 
 //--------------------------------------------------------------------------------------
 // Internal functions forward declarations
 //--------------------------------------------------------------------------------------
-WCHAR*              DXUTAPIVersionToString( DXUTDeviceVersion version );
-WCHAR*              DXUTPresentIntervalToString( UINT pi );
-WCHAR*              DXUTMultisampleTypeToString( D3DMULTISAMPLE_TYPE MultiSampleType );
-WCHAR*              DXUTD3DDeviceTypeToString( D3DDEVTYPE devType );
-WCHAR*              DXUTD3DX11DeviceTypeToString( D3D_DRIVER_TYPE devType );
-WCHAR*              DXUTVertexProcessingTypeToString( DWORD vpt );
+const WCHAR*        DXUTPresentIntervalToString( _In_ UINT pi );
+const WCHAR*        DXUTDeviceTypeToString( _In_ D3D_DRIVER_TYPE devType );
+const WCHAR*        DXUTVertexProcessingTypeToString( _In_ DWORD vpt );
 
 
 HRESULT DXUTSnapDeviceSettingsToEnumDevice( DXUTDeviceSettings* pDeviceSettings, bool forceEnum, D3D_FEATURE_LEVEL forceFL = D3D_FEATURE_LEVEL(0)  );
@@ -39,19 +36,24 @@ CD3DSettingsDlg* WINAPI DXUTGetD3DSettingsDialog()
 
 
 //--------------------------------------------------------------------------------------
-CD3DSettingsDlg::CD3DSettingsDlg()
+CD3DSettingsDlg::CD3DSettingsDlg() :
+    m_bActive( false ),
+    m_pActiveDialog( nullptr )
 {
-    m_pStateBlock = NULL;
-    m_bActive = false;
-    m_pActiveDialog = NULL;
-    
     m_Levels[0] = D3D_FEATURE_LEVEL_9_1;
     m_Levels[1] = D3D_FEATURE_LEVEL_9_2;
     m_Levels[2] = D3D_FEATURE_LEVEL_9_3;
     m_Levels[3] = D3D_FEATURE_LEVEL_10_0;
     m_Levels[4] = D3D_FEATURE_LEVEL_10_1;
     m_Levels[5] = D3D_FEATURE_LEVEL_11_0;
-    
+    m_Levels[6] = D3D_FEATURE_LEVEL_11_1;
+#if defined(USE_DIRECT3D11_3) || defined(USE_DIRECT3D11_4) 
+    m_Levels[7] = D3D_FEATURE_LEVEL_12_0;
+    m_Levels[8] = D3D_FEATURE_LEVEL_12_1;
+#else
+    m_Levels[7] = static_cast<D3D_FEATURE_LEVEL>(0xc000);
+    m_Levels[8] = static_cast<D3D_FEATURE_LEVEL>(0xc100);
+#endif
 }
 
 
@@ -59,18 +61,18 @@ CD3DSettingsDlg::CD3DSettingsDlg()
 CD3DSettingsDlg::~CD3DSettingsDlg()
 {
     // Release the memory used to hold the D3D11 refresh data in the combo box
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE );
     if( pComboBox )
         for( UINT i = 0; i < pComboBox->GetNumItems(); ++i )
         {
-            DXGI_RATIONAL* pRate = reinterpret_cast<DXGI_RATIONAL*>( pComboBox->GetItemData( i ) );
+            auto pRate = reinterpret_cast<DXGI_RATIONAL*>( pComboBox->GetItemData( i ) );
             delete pRate;
         }
 }
 
 
 //--------------------------------------------------------------------------------------
-void CD3DSettingsDlg::Init( CDXUTDialogResourceManager* pManager )
+void CD3DSettingsDlg::Init( _In_ CDXUTDialogResourceManager* pManager )
 {
     assert( pManager );
     m_Dialog.Init( pManager, false );  // Don't register this dialog.
@@ -80,6 +82,7 @@ void CD3DSettingsDlg::Init( CDXUTDialogResourceManager* pManager )
 }
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CD3DSettingsDlg::Init( CDXUTDialogResourceManager* pManager, LPCWSTR szControlTextureFileName )
 {
     assert( pManager );
@@ -91,6 +94,7 @@ void CD3DSettingsDlg::Init( CDXUTDialogResourceManager* pManager, LPCWSTR szCont
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CD3DSettingsDlg::Init( CDXUTDialogResourceManager* pManager, LPCWSTR pszControlTextureResourcename,
                             HMODULE hModule )
 {
@@ -111,89 +115,44 @@ void CD3DSettingsDlg::CreateControls()
     m_Dialog.SetFont( 1, L"Arial", 28, FW_BOLD );
 
     // Right-justify static controls
-    CDXUTElement* pElement = m_Dialog.GetDefaultElement( DXUT_CONTROL_STATIC, 0 );
+    auto pElement = m_Dialog.GetDefaultElement( DXUT_CONTROL_STATIC, 0 );
     if( pElement )
     {
         pElement->dwTextFormat = DT_VCENTER | DT_RIGHT;
 
         // Title
-        CDXUTStatic* pStatic = NULL;
+        CDXUTStatic* pStatic = nullptr;
         m_Dialog.AddStatic( DXUTSETTINGSDLG_STATIC, L"Direct3D Settings", 10, 5, 400, 50, false, &pStatic );
         pElement = pStatic->GetElement( 0 );
         pElement->iFont = 1;
         pElement->dwTextFormat = DT_TOP | DT_LEFT;
     }
 
-    // DXUTSETTINGSDLG_API_VERSION
-    m_Dialog.AddStatic( DXUTSETTINGSDLG_STATIC, L"API Version", 10, 35, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_API_VERSION, 200, 35, 300, 23 );
-
-
     //DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL
     m_Dialog.AddStatic( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL_LABEL, L"Feature Level", 10, 60, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL, 200, 60, 300, 23 );
+    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL, 200, 60, 400, 23 );
     m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL )->SetDropHeight( 106 );
 
-
     // DXUTSETTINGSDLG_ADAPTER
     m_Dialog.AddStatic( DXUTSETTINGSDLG_STATIC, L"Display Adapter", 10, 85, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_ADAPTER, 200, 85, 300, 23 );
+    m_Dialog.AddComboBox( DXUTSETTINGSDLG_ADAPTER, 200, 85, 400, 23 );
 
     // DXUTSETTINGSDLG_DEVICE_TYPE
     m_Dialog.AddStatic( DXUTSETTINGSDLG_STATIC, L"Render Device", 10, 110, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_DEVICE_TYPE, 200, 110, 300, 23 );
+    m_Dialog.AddComboBox( DXUTSETTINGSDLG_DEVICE_TYPE, 200, 110, 400, 23 );
 
     // DXUTSETTINGSDLG_WINDOWED, DXUTSETTINGSDLG_FULLSCREEN
-    m_Dialog.AddCheckBox( DXUTSETTINGSDLG_DEVICECLIP, L"Clip to device when window spans across multiple monitors",
-                          250, 136, 500, 16 );
     m_Dialog.AddRadioButton( DXUTSETTINGSDLG_WINDOWED, DXUTSETTINGSDLG_WINDOWED_GROUP, L"Windowed", 
                           360, 157, 100, 16 );
     m_Dialog.AddRadioButton( DXUTSETTINGSDLG_FULLSCREEN, DXUTSETTINGSDLG_WINDOWED_GROUP, L"Full Screen",
                           220, 157, 100, 16 );
 
-    // DXUTSETTINGSDLG_ADAPTER_FORMAT
-    m_Dialog.AddStatic( DXUTSETTINGSDLG_ADAPTER_FORMAT_LABEL, L"Adapter Format", 10, 175, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_ADAPTER_FORMAT, 200, 175, 300, 23 );
-
-    // DXUTSETTINGSDLG_RESOLUTION
-    m_Dialog.AddStatic( DXUTSETTINGSDLG_RESOLUTION_LABEL, L"Resolution", 10, 200, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_RESOLUTION, 200, 200, 200, 23 );
-    m_Dialog.GetComboBox( DXUTSETTINGSDLG_RESOLUTION )->SetDropHeight( 106 );
-
     // DXUTSETTINGSDLG_RES_SHOW_ALL
     m_Dialog.AddCheckBox( DXUTSETTINGSDLG_RESOLUTION_SHOW_ALL, L"Show All Aspect Ratios", 420, 200, 200, 23, false );
 
-    // DXUTSETTINGSDLG_REFRESH_RATE
-    m_Dialog.AddStatic( DXUTSETTINGSDLG_REFRESH_RATE_LABEL, L"Refresh Rate", 10, 225, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_REFRESH_RATE, 200, 225, 300, 23 );
-
-    // DXUTSETTINGSDLG_BACK_BUFFER_FORMAT
-    m_Dialog.AddStatic( DXUTSETTINGSDLG_BACK_BUFFER_FORMAT_LABEL, L"Back Buffer Format", 10, 260, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_BACK_BUFFER_FORMAT, 200, 260, 300, 23 );
-
-    // DXUTSETTINGSDLG_DEPTH_STENCIL
-    m_Dialog.AddStatic( DXUTSETTINGSDLG_DEPTH_STENCIL_LABEL, L"Depth/Stencil Format", 10, 285, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_DEPTH_STENCIL, 200, 285, 300, 23 );
-
-    // DXUTSETTINGSDLG_MULTISAMPLE_TYPE
-    m_Dialog.AddStatic( DXUTSETTINGSDLG_MULTISAMPLE_TYPE_LABEL, L"Multisample Type", 10, 310, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_MULTISAMPLE_TYPE, 200, 310, 300, 23 );
-
-    // DXUTSETTINGSDLG_MULTISAMPLE_QUALITY
-    m_Dialog.AddStatic( DXUTSETTINGSDLG_MULTISAMPLE_QUALITY_LABEL, L"Multisample Quality", 10, 335, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_MULTISAMPLE_QUALITY, 200, 335, 300, 23 );
-
-    // DXUTSETTINGSDLG_VERTEX_PROCESSING
-    m_Dialog.AddStatic( DXUTSETTINGSDLG_VERTEX_PROCESSING_LABEL, L"Vertex Processing", 10, 360, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_VERTEX_PROCESSING, 200, 360, 300, 23 );
-
-    // DXUTSETTINGSDLG_PRESENT_INTERVAL
-    m_Dialog.AddStatic( DXUTSETTINGSDLG_PRESENT_INTERVAL_LABEL, L"Vertical Sync", 10, 385, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_PRESENT_INTERVAL, 200, 385, 300, 23 );
-
     // DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT
     m_Dialog.AddStatic( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT_LABEL, L"Adapter Output", 10, 175, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT, 200, 175, 300, 23 );
+    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT, 200, 175, 400, 23 );
 
     // DXUTSETTINGSDLG_D3D11_RESOLUTION
     m_Dialog.AddStatic( DXUTSETTINGSDLG_D3D11_RESOLUTION_LABEL, L"Resolution", 10, 200, 180, 23 );
@@ -202,23 +161,30 @@ void CD3DSettingsDlg::CreateControls()
 
     // DXUTSETTINGSDLG_D3D11_REFRESH_RATE
     m_Dialog.AddStatic( DXUTSETTINGSDLG_D3D11_REFRESH_RATE_LABEL, L"Refresh Rate", 10, 225, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE, 200, 225, 300, 23 );
+    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE, 200, 225, 400, 23 );
 
     // DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT
     m_Dialog.AddStatic( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT_LABEL, L"Back Buffer Format", 10, 260, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT, 200, 260, 300, 23 );
+    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT, 200, 260, 400, 23 );
 
     // DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT
     m_Dialog.AddStatic( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT_LABEL, L"Multisample Count", 10, 285, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT, 200, 285, 300, 23 );
+    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT, 200, 285, 400, 23 );
 
     // DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY
     m_Dialog.AddStatic( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY_LABEL, L"Multisample Quality", 10, 310, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY, 200, 310, 300, 23 );
+    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY, 200, 310, 400, 23 );
 
     // DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL
     m_Dialog.AddStatic( DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL_LABEL, L"Vertical Sync", 10, 335, 180, 23 );
-    m_Dialog.AddComboBox( DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL, 200, 335, 300, 23 );
+    m_Dialog.AddComboBox(DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL, 200, 335, 400, 23);
+
+    auto pPresentIntervalComboBox = m_Dialog.GetComboBox(DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL);
+    if (pPresentIntervalComboBox)
+    {
+        pPresentIntervalComboBox->AddItem(L"On", ULongToPtr(1));
+        pPresentIntervalComboBox->AddItem(L"Off", ULongToPtr(0));
+    }
 
     // DXUTSETTINGSDLG_D3D11_DEBUG_DEVICE
     m_Dialog.AddCheckBox( DXUTSETTINGSDLG_D3D11_DEBUG_DEVICE, L"Create Debug Device", 200, 365, 180, 23 );
@@ -239,17 +205,17 @@ void CD3DSettingsDlg::CreateControls()
         pElement->dwTextFormat = DT_VCENTER | DT_RIGHT;
 
         // Title
-        CDXUTStatic* pStatic = NULL;
-        m_RevertModeDialog.AddStatic( DXUTSETTINGSDLG_STATIC, L"Do you want to keep these display settings?", 10, 5,
-                                      640, 50, false, &pStatic );
-        pElement = pStatic->GetElement( 0 );
+        CDXUTStatic* pStatic = nullptr;
+        if ( SUCCEEDED(m_RevertModeDialog.AddStatic( DXUTSETTINGSDLG_STATIC, L"Do you want to keep these display settings?", 10, 5,
+                                      640, 50, false, &pStatic ) ) )
+            pElement = pStatic->GetElement( 0 );
         pElement->iFont = 1;
         pElement->dwTextFormat = DT_TOP | DT_LEFT;
 
         // Timeout static text control
-        m_RevertModeDialog.AddStatic( DXUTSETTINGSDLG_STATIC_MODE_CHANGE_TIMEOUT, L"", 10, 90, 640, 30,
-                                      false, &pStatic );
-        pElement = pStatic->GetElement( 0 );
+        if ( SUCCEEDED(m_RevertModeDialog.AddStatic( DXUTSETTINGSDLG_STATIC_MODE_CHANGE_TIMEOUT, L"", 10, 90, 640, 30,
+                                      false, &pStatic ) ) )
+            pElement = pStatic->GetElement( 0 );
         pElement->iFont = 0;
         pElement->dwTextFormat = DT_TOP | DT_LEFT;
     }
@@ -261,224 +227,180 @@ void CD3DSettingsDlg::CreateControls()
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnD3D9CreateDevice( IDirect3DDevice9* pd3dDevice )
+// Changes the UI defaults to the current device settings
+//--------------------------------------------------------------------------------------
+HRESULT CD3DSettingsDlg::Refresh()
 {
-    if( pd3dDevice == NULL )
-        return DXUT_ERR_MSGBOX( L"CD3DSettingsDlg::OnCreatedDevice", E_INVALIDARG );
+    g_DeviceSettings = DXUTGetDeviceSettings();
 
-    // Create the fonts/textures 
-    m_Dialog.SetCallback( StaticOnEvent, ( void* )this );
-    m_RevertModeDialog.SetCallback( StaticOnEvent, ( void* )this );
+    auto pD3DEnum = DXUTGetD3D11Enumeration();
 
-    return S_OK;
-}
+    // Fill the UI with the current settings
+    AddD3D11DeviceType( g_DeviceSettings.d3d11.DriverType );
 
+    m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_WINDOWED, true );
+    m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_FULLSCREEN, (g_DeviceSettings.d3d11.DriverType != D3D_DRIVER_TYPE_WARP) );
 
-//--------------------------------------------------------------------------------------
-// Changes the UI defaults to the current device settings
-//--------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::Refresh()
-{
-    HRESULT hr = S_OK;
+    SetWindowed( FALSE != g_DeviceSettings.d3d11.sd.Windowed );
+    auto pOutputInfo = GetCurrentD3D11OutputInfo();
+    AddD3D11AdapterOutput( pOutputInfo->Desc.DeviceName, g_DeviceSettings.d3d11.Output );
+            
+    AddD3D11Resolution( g_DeviceSettings.d3d11.sd.BufferDesc.Width,
+                        g_DeviceSettings.d3d11.sd.BufferDesc.Height );
+    AddD3D11RefreshRate( g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate );
+    AddD3D11BackBufferFormat( g_DeviceSettings.d3d11.sd.BufferDesc.Format );
+    AddD3D11MultisampleCount( g_DeviceSettings.d3d11.sd.SampleDesc.Count );
+    AddD3D11MultisampleQuality( g_DeviceSettings.d3d11.sd.SampleDesc.Quality );
+
+    auto pBestDeviceSettingsCombo = pD3DEnum->GetDeviceSettingsCombo(
+                g_DeviceSettings.d3d11.AdapterOrdinal, g_DeviceSettings.d3d11.sd.BufferDesc.Format,
+                ( g_DeviceSettings.d3d11.sd.Windowed != 0 ) );
 
-    g_DeviceSettings = DXUTGetDeviceSettings();
+    if( !pBestDeviceSettingsCombo )
+        return DXUT_ERR_MSGBOX( L"GetDeviceSettingsCombo", E_INVALIDARG );
 
-    CDXUTComboBox* pAPIComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_API_VERSION );
-    pAPIComboBox->RemoveAllItems();
-    if( DXUTDoesAppSupportD3D9() )
-    {
-        // Ensure that at least one adapter got enumerated.
-        CD3D9Enumeration* pD3DEnum = DXUTGetD3D9Enumeration();
-        if( pD3DEnum->GetAdapterInfoList()->GetSize() > 0 )
-            AddAPIVersion( DXUT_D3D9_DEVICE );
-    }
-    if( DXUTDoesAppSupportD3D11() && DXUTIsD3D11Available() )
-    {
-        // Ensure that at least one adapter got enumerated.
-        CD3D11Enumeration* pD3DEnum = DXUTGetD3D11Enumeration();
-        if( pD3DEnum->GetAdapterInfoList()->GetSize() > 0 )
-            AddAPIVersion( DXUT_D3D11_DEVICE );
-    }
+    CDXUTComboBox *pFeatureLevelBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL );
+    pFeatureLevelBox->RemoveAllItems();
 
-    // If no API has been added, something has gone wrong.  Exit the dialog.
-    if( pAPIComboBox->GetNumItems() == 0 )
+    D3D_FEATURE_LEVEL clampFL;
+    if ( g_DeviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_WARP )
+        clampFL = DXUTGetD3D11Enumeration()->GetWARPFeaturevel();
+    else if ( g_DeviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE )
+        clampFL = DXUTGetD3D11Enumeration()->GetREFFeaturevel();
+    else
+        clampFL = pBestDeviceSettingsCombo->pDeviceInfo->MaxLevel;
+
+    for (int fli = 0; fli < TOTAL_FEATURE_LEVELS; fli++)
     {
-        SetActive( false );
-        return S_OK;
-    }
+        if (m_Levels[fli] >= g_DeviceSettings.MinimumFeatureLevel 
+            && m_Levels[fli] <= clampFL)
+        {
+            AddD3D11FeatureLevel( m_Levels[fli] );
+        }
+    } 
+    pFeatureLevelBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.DeviceFeatureLevel ) );
+          
+    // Get the adapters list from CD3D11Enumeration object
+    auto pAdapterInfoList = pD3DEnum->GetAdapterInfoList();
+
+    if( pAdapterInfoList->empty() )
+        return DXUT_ERR_MSGBOX( L"CD3DSettingsDlg::OnCreatedDevice", DXUTERR_NOCOMPATIBLEDEVICES );
 
-    pAPIComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.ver ) );
+    auto pAdapterCombo = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER );
+    pAdapterCombo->RemoveAllItems();
 
-    switch( g_DeviceSettings.ver )
+    // Add adapters
+    for( auto it = pAdapterInfoList->cbegin(); it != pAdapterInfoList->cend(); ++it )
     {
-        case DXUT_D3D9_DEVICE:
-        {
-            // Show all D3D9-specific controls and hide controls for all other D3D versions.
-            ShowControlSet( DXUT_D3D9_DEVICE );
-
-            CD3D9Enumeration* pD3DEnum = DXUTGetD3D9Enumeration();
-
-            // Fill the UI with the current settings
-            AddDeviceType( g_DeviceSettings.d3d9.DeviceType );
-            SetWindowed( FALSE != g_DeviceSettings.d3d9.pp.Windowed );
-            SetDeviceClip( 0 != ( g_DeviceSettings.d3d9.pp.Flags & D3DPRESENTFLAG_DEVICECLIP ) );
-            AddAdapterFormat( g_DeviceSettings.d3d9.AdapterFormat );
-            AddResolution( g_DeviceSettings.d3d9.pp.BackBufferWidth, g_DeviceSettings.d3d9.pp.BackBufferHeight );
-            AddRefreshRate( g_DeviceSettings.d3d9.pp.FullScreen_RefreshRateInHz );
-            AddBackBufferFormat( g_DeviceSettings.d3d9.pp.BackBufferFormat );
-            AddDepthStencilBufferFormat( g_DeviceSettings.d3d9.pp.AutoDepthStencilFormat );
-            AddMultisampleType( g_DeviceSettings.d3d9.pp.MultiSampleType );
-            AddMultisampleQuality( g_DeviceSettings.d3d9.pp.MultiSampleQuality );
-
-            if( g_DeviceSettings.d3d9.BehaviorFlags & D3DCREATE_PUREDEVICE )
-                AddVertexProcessingType( D3DCREATE_PUREDEVICE );
-            else if( g_DeviceSettings.d3d9.BehaviorFlags & D3DCREATE_HARDWARE_VERTEXPROCESSING )
-                AddVertexProcessingType( D3DCREATE_HARDWARE_VERTEXPROCESSING );
-            else if( g_DeviceSettings.d3d9.BehaviorFlags & D3DCREATE_SOFTWARE_VERTEXPROCESSING )
-                AddVertexProcessingType( D3DCREATE_SOFTWARE_VERTEXPROCESSING );
-            else if( g_DeviceSettings.d3d9.BehaviorFlags & D3DCREATE_MIXED_VERTEXPROCESSING )
-                AddVertexProcessingType( D3DCREATE_MIXED_VERTEXPROCESSING );
-
-            CD3D9EnumDeviceSettingsCombo* pBestDeviceSettingsCombo = pD3DEnum->GetDeviceSettingsCombo(
-                g_DeviceSettings.d3d9.AdapterOrdinal, g_DeviceSettings.d3d9.DeviceType,
-                g_DeviceSettings.d3d9.AdapterFormat, g_DeviceSettings.d3d9.pp.BackBufferFormat,
-                ( g_DeviceSettings.d3d9.pp.Windowed != 0 ) );
-            if( NULL == pBestDeviceSettingsCombo )
-                return DXUT_ERR_MSGBOX( L"GetDeviceSettingsCombo", E_INVALIDARG );
-
-            // Get the adapters list from CD3D9Enumeration object
-            CGrowableArray <CD3D9EnumAdapterInfo*>* pAdapterInfoList = pD3DEnum->GetAdapterInfoList();
-
-            if( pAdapterInfoList->GetSize() == 0 )
-                return DXUT_ERR_MSGBOX( L"CD3DSettingsDlg::OnCreatedDevice", DXUTERR_NOCOMPATIBLEDEVICES );
-
-            CDXUTComboBox* pAdapterCombo = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER );
-            pAdapterCombo->RemoveAllItems();
-
-            // Add adapters
-            for( int iAdapter = 0; iAdapter < pAdapterInfoList->GetSize(); iAdapter++ )
-            {
-                CD3D9EnumAdapterInfo* pAdapterInfo = pAdapterInfoList->GetAt( iAdapter );
-                AddAdapter( pAdapterInfo->szUniqueDescription, pAdapterInfo->AdapterOrdinal );
-            }
+        AddAdapter( (*it)->szUniqueDescription, (*it)->AdapterOrdinal );
+    }
 
-            pAdapterCombo->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d9.AdapterOrdinal ) );
+    pAdapterCombo->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.AdapterOrdinal ) );
 
-            hr = OnAPIVersionChanged( true );
-            if( FAILED( hr ) )
-                return hr;
+    // DXUTSETTINGSDLG_D3D11_RESOLUTION
+    HRESULT hr = UpdateD3D11Resolutions();
+    if ( FAILED(hr) )
+        return hr;
 
-            //m_Dialog.Refresh();
-            CDXUTDialog::SetRefreshTime( ( float )DXUTGetTime() );
-            break;
-        }
-        case DXUT_D3D11_DEVICE:
-        {
-            // Show all D3D11-specific controls and hide controls for all other D3D versions.
-            ShowControlSet( DXUT_D3D11_DEVICE );
+    // DXUTSETTINGSDLG_D3D11_REFRESH_RATE
+    hr = UpdateD3D11RefreshRates();
+    if ( FAILED(hr) )
+        return hr;
 
-            CD3D11Enumeration* pD3DEnum = DXUTGetD3D11Enumeration();
+    // Windowed mode
+    bool bWindowed = IsWindowed();
 
-            // Fill the UI with the current settings
-            AddD3D11DeviceType( g_DeviceSettings.d3d11.DriverType );
-            SetWindowed( FALSE != g_DeviceSettings.d3d11.sd.Windowed );
-            CD3D11EnumOutputInfo* pOutputInfo = GetCurrentD3D11OutputInfo();
-            AddD3D11AdapterOutput( pOutputInfo->Desc.DeviceName, g_DeviceSettings.d3d11.Output );
-            
+    // Backbuffer Format/Driver Type
+    auto pAdapterInfo = GetCurrentD3D11AdapterInfo();
+    if (pAdapterInfo)
+    {
+        auto pBackBufferFormatComboBox = m_Dialog.GetComboBox(DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT);
+        pBackBufferFormatComboBox->RemoveAllItems();
 
+        for (size_t idc = 0; idc < pAdapterInfo->deviceSettingsComboList.size(); idc++)
+        {
+            auto pDeviceCombo = pAdapterInfo->deviceSettingsComboList[idc];
+            if ((pDeviceCombo->Windowed == TRUE) == bWindowed)
+            {
+                AddD3D11BackBufferFormat(pDeviceCombo->BackBufferFormat);
+            }
+        }
 
-            AddD3D11Resolution( g_DeviceSettings.d3d11.sd.BufferDesc.Width,
-                                g_DeviceSettings.d3d11.sd.BufferDesc.Height );
-            AddD3D11RefreshRate( g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate );
-            AddD3D11BackBufferFormat( g_DeviceSettings.d3d11.sd.BufferDesc.Format );
-            AddD3D11MultisampleCount( g_DeviceSettings.d3d11.sd.SampleDesc.Count );
-            AddD3D11MultisampleQuality( g_DeviceSettings.d3d11.sd.SampleDesc.Quality );
+        pBackBufferFormatComboBox->SetSelectedByData( ULongToPtr(g_DeviceSettings.d3d11.sd.BufferDesc.Format) );
 
-            CD3D11EnumDeviceSettingsCombo* pBestDeviceSettingsCombo = pD3DEnum->GetDeviceSettingsCombo(
-                g_DeviceSettings.d3d11.AdapterOrdinal, g_DeviceSettings.d3d11.DriverType,
-                g_DeviceSettings.d3d11.Output, g_DeviceSettings.d3d11.sd.BufferDesc.Format,
-                ( g_DeviceSettings.d3d11.sd.Windowed != 0 ) );
+        auto pDeviceTypeComboBox = m_Dialog.GetComboBox(DXUTSETTINGSDLG_DEVICE_TYPE);
+        pDeviceTypeComboBox->RemoveAllItems();
 
-            if( NULL == pBestDeviceSettingsCombo )
-                return DXUT_ERR_MSGBOX( L"GetDeviceSettingsCombo", E_INVALIDARG );
+        for (size_t iDeviceInfo = 0; iDeviceInfo < pAdapterInfo->deviceInfoList.size(); iDeviceInfo++)
+        {
+            auto pDeviceInfo = pAdapterInfo->deviceInfoList[iDeviceInfo];
+            AddD3D11DeviceType(pDeviceInfo->DeviceType);
+        }
 
-            CDXUTComboBox *pFeatureLevelBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL );
-            pFeatureLevelBox->RemoveAllItems();
-            for (int fli = 0; fli < TOTAL_FEATURE_LEVLES; fli++) {
-                if (m_Levels[fli] >= g_DeviceSettings.MinimumFeatureLevel 
-                    && m_Levels[fli] <=pBestDeviceSettingsCombo->pDeviceInfo->MaxLevel) {
-                     AddD3D11FeatureLevel( m_Levels[fli] );
-                }
-            } 
-            pFeatureLevelBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.DeviceFeatureLevel ) );
+        pDeviceTypeComboBox->SetSelectedByData( ULongToPtr(g_DeviceSettings.d3d11.DriverType) );
+    }
 
-            
-            // Get the adapters list from CD3D11Enumeration object
-            CGrowableArray <CD3D11EnumAdapterInfo*>* pAdapterInfoList = pD3DEnum->GetAdapterInfoList();
+    // MSAA settings
+    auto pDeviceSettingsCombo = GetCurrentD3D11DeviceSettingsCombo();
+    if ( pDeviceSettingsCombo )
+    {
+        auto pMultisampleCountCombo = m_Dialog.GetComboBox(DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT);
+        pMultisampleCountCombo->RemoveAllItems();
 
-            if( pAdapterInfoList->GetSize() == 0 )
-                return DXUT_ERR_MSGBOX( L"CD3DSettingsDlg::OnCreatedDevice", DXUTERR_NOCOMPATIBLEDEVICES );
+        for (auto it = pDeviceSettingsCombo->multiSampleCountList.cbegin(); it != pDeviceSettingsCombo->multiSampleCountList.cend(); ++it)
+            AddD3D11MultisampleCount(*it);
 
-            CDXUTComboBox* pAdapterCombo = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER );
-            pAdapterCombo->RemoveAllItems();
+        pMultisampleCountCombo->SetSelectedByData( ULongToPtr(g_DeviceSettings.d3d11.sd.SampleDesc.Count) );
 
-            // Add adapters
-            for( int iAdapter = 0; iAdapter < pAdapterInfoList->GetSize(); iAdapter++ )
+        UINT MaxQuality = 0;
+        for (size_t iCount = 0; iCount < pDeviceSettingsCombo->multiSampleCountList.size(); iCount++)
+        {
+            UINT Count = pDeviceSettingsCombo->multiSampleCountList[iCount];
+            if ( Count == g_DeviceSettings.d3d11.sd.SampleDesc.Count )
             {
-                CD3D11EnumAdapterInfo* pAdapterInfo = pAdapterInfoList->GetAt( iAdapter );
-                AddAdapter( pAdapterInfo->szUniqueDescription, pAdapterInfo->AdapterOrdinal );
+                MaxQuality = pDeviceSettingsCombo->multiSampleQualityList[iCount];
+                break;
             }
+        }
 
-            pAdapterCombo->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.AdapterOrdinal ) );
-
-            hr = OnAPIVersionChanged( true );
-            if( FAILED( hr ) )
-                return hr;
+        auto pMultisampleQualityCombo = m_Dialog.GetComboBox(DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY);
+        pMultisampleQualityCombo->RemoveAllItems();
 
-            //m_Dialog.Refresh();
-            CDXUTDialog::SetRefreshTime( ( float )DXUTGetTime() );
-            break;
+        for (UINT iQuality = 0; iQuality < MaxQuality; iQuality++)
+        {
+            AddD3D11MultisampleQuality(iQuality);
         }
-    }
-
-    return S_OK;
-}
 
+        pMultisampleQualityCombo->SetSelectedByData(ULongToPtr(g_DeviceSettings.d3d11.sd.SampleDesc.Quality));
+    }
 
-//--------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnD3D9ResetDevice()
-{
-    const D3DSURFACE_DESC* pDesc = DXUTGetD3D9BackBufferSurfaceDesc();
-    m_Dialog.SetLocation( 0, 0 );
-    m_Dialog.SetSize( pDesc->Width, pDesc->Height );
-    m_Dialog.SetBackgroundColors( D3DCOLOR_ARGB( 255, 98, 138, 206 ),
-                                  D3DCOLOR_ARGB( 255, 54, 105, 192 ),
-                                  D3DCOLOR_ARGB( 255, 54, 105, 192 ),
-                                  D3DCOLOR_ARGB( 255, 10, 73, 179 ) );
+    // Misc settings
+    auto pDebugCheckBox = m_Dialog.GetCheckBox(DXUTSETTINGSDLG_D3D11_DEBUG_DEVICE);
+    if ( pDebugCheckBox )
+    {
+        pDebugCheckBox->SetChecked(0 != (g_DeviceSettings.d3d11.CreateFlags & D3D11_CREATE_DEVICE_DEBUG));
+    }
 
-    m_RevertModeDialog.SetLocation( 0, 0 );
-    m_RevertModeDialog.SetSize( pDesc->Width, pDesc->Height );
-    m_RevertModeDialog.SetBackgroundColors( D3DCOLOR_ARGB( 255, 98, 138, 206 ),
-                                            D3DCOLOR_ARGB( 255, 54, 105, 192 ),
-                                            D3DCOLOR_ARGB( 255, 54, 105, 192 ),
-                                            D3DCOLOR_ARGB( 255, 10, 73, 179 ) );
+    auto pPresentIntervalComboBox = m_Dialog.GetComboBox(DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL);
+    if ( pPresentIntervalComboBox )
+    {
+        pPresentIntervalComboBox->SetSelectedByData(ULongToPtr(g_DeviceSettings.d3d11.SyncInterval) );
+    }
 
-    IDirect3DDevice9* pd3dDevice = DXUTGetD3D9Device();
-    pd3dDevice->BeginStateBlock();
-    pd3dDevice->SetRenderState( D3DRS_FILLMODE, D3DFILL_SOLID );
-    pd3dDevice->EndStateBlock( &m_pStateBlock );
+    CDXUTDialog::SetRefreshTime( ( float )DXUTGetTime() );
 
     return S_OK;
 }
 
+
 //--------------------------------------------------------------------------------------
-void CD3DSettingsDlg::SetSelectedD3D11RefreshRate( DXGI_RATIONAL RefreshRate )
+void CD3DSettingsDlg::SetSelectedD3D11RefreshRate( _In_ DXGI_RATIONAL RefreshRate )
 {
-    CDXUTComboBox* pRefreshRateComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE );
+    auto pRefreshRateComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE );
 
     for( UINT i = 0; i < pRefreshRateComboBox->GetNumItems(); ++i )
     {
-        DXGI_RATIONAL* pRate = ( DXGI_RATIONAL* )pRefreshRateComboBox->GetItemData( i );
+        auto pRate = reinterpret_cast<DXGI_RATIONAL*>( pRefreshRateComboBox->GetItemData( i ) );
 
         if( pRate && pRate->Numerator == RefreshRate.Numerator && pRate->Denominator == RefreshRate.Denominator )
         {
@@ -489,38 +411,7 @@ void CD3DSettingsDlg::SetSelectedD3D11RefreshRate( DXGI_RATIONAL RefreshRate )
 }
 
 //--------------------------------------------------------------------------------------
-void CD3DSettingsDlg::OnRender( float fElapsedTime )
-{
-    if( DXUTGetD3D11Device() )
-        OnRender11( fElapsedTime );
-    else
-        OnRender9( fElapsedTime );
-}
-
-
-//--------------------------------------------------------------------------------------
-void CD3DSettingsDlg::OnRender9( float fElapsedTime )
-{
-    IDirect3DDevice9* pd3dDevice = DXUTGetD3D9Device();
-
-    // Clear the render target and the zbuffer 
-    pd3dDevice->Clear( 0, NULL, D3DCLEAR_TARGET, 0x00003F3F, 1.0f, 0 );
-
-    // Render the scene
-    if( SUCCEEDED( pd3dDevice->BeginScene() ) )
-    {
-        m_pStateBlock->Capture();
-        pd3dDevice->SetRenderState( D3DRS_FILLMODE, D3DFILL_SOLID );
-        m_pActiveDialog->OnRender( fElapsedTime );
-        m_pStateBlock->Apply();
-        pd3dDevice->EndScene();
-    }
-}
-
-
-
-//--------------------------------------------------------------------------------------
-void CD3DSettingsDlg::OnRender11( float fElapsedTime )
+void CD3DSettingsDlg::OnRender( _In_ float fElapsedTime )
 {
     // Render the scene
     m_pActiveDialog->OnRender( fElapsedTime );
@@ -528,6 +419,7 @@ void CD3DSettingsDlg::OnRender11( float fElapsedTime )
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 LRESULT CD3DSettingsDlg::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
     m_pActiveDialog->MsgProc( hWnd, uMsg, wParam, lParam );
@@ -536,27 +428,10 @@ LRESULT CD3DSettingsDlg::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
     return 0;
 }
 
-
-//--------------------------------------------------------------------------------------
-void CD3DSettingsDlg::OnD3D9LostDevice()
-{
-    SAFE_RELEASE( m_pStateBlock );
-}
-
-
-//--------------------------------------------------------------------------------------
-void CD3DSettingsDlg::OnD3D9DestroyDevice()
-{
-}
-
-
-
 //--------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnD3D11CreateDevice( ID3D11Device* pd3dDevice )
+HRESULT CD3DSettingsDlg::OnD3D11CreateDevice( _In_ ID3D11Device* pd3dDevice )
 {
-    //HRESULT hr;
-
-    if( pd3dDevice == NULL )
+    if( !pd3dDevice )
         return DXUT_ERR_MSGBOX( L"CD3DSettingsDlg::OnCreatedDevice", E_INVALIDARG );
 
     // Create the fonts/textures 
@@ -568,9 +443,11 @@ HRESULT CD3DSettingsDlg::OnD3D11CreateDevice( ID3D11Device* pd3dDevice )
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnD3D11ResizedSwapChain( ID3D11Device* pd3dDevice,
-                                                  const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc )
+_Use_decl_annotations_
+HRESULT CD3DSettingsDlg::OnD3D11ResizedSwapChain( ID3D11Device* pd3dDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc )
 {
+    UNREFERENCED_PARAMETER(pd3dDevice);
+
     m_Dialog.SetLocation( 0, 0 );
     m_Dialog.SetSize( pBackBufferSurfaceDesc->Width, pBackBufferSurfaceDesc->Height );
     m_Dialog.SetBackgroundColors( D3DCOLOR_ARGB( 255, 98, 138, 206 ),
@@ -596,101 +473,13 @@ void CD3DSettingsDlg::OnD3D11DestroyDevice()
 
 }
 
-//--------------------------------------------------------------------------------------
-void CD3DSettingsDlg::ShowControlSet( DXUTDeviceVersion ver )
-{
-    switch( ver )
-    {
-        case DXUT_D3D9_DEVICE:
-            
-            m_Dialog.GetControl( DXUTSETTINGSDLG_ADAPTER_FORMAT )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_ADAPTER_FORMAT_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_RESOLUTION )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_RESOLUTION_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_REFRESH_RATE )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_REFRESH_RATE_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_BACK_BUFFER_FORMAT )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_BACK_BUFFER_FORMAT_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_DEPTH_STENCIL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_DEPTH_STENCIL_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_MULTISAMPLE_TYPE )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_MULTISAMPLE_TYPE_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_MULTISAMPLE_QUALITY )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_MULTISAMPLE_QUALITY_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_VERTEX_PROCESSING )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_VERTEX_PROCESSING_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_PRESENT_INTERVAL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_PRESENT_INTERVAL_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_DEVICECLIP )->SetVisible( true );
-            
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_RESOLUTION )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_RESOLUTION_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_REFRESH_RATE )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_REFRESH_RATE_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_DEBUG_DEVICE )->SetVisible( false );
-
-            break;
-
-        case DXUT_D3D11_DEVICE:
-            m_Dialog.GetControl( DXUTSETTINGSDLG_ADAPTER_FORMAT )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_ADAPTER_FORMAT_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_RESOLUTION )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_RESOLUTION_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_REFRESH_RATE )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_REFRESH_RATE_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_BACK_BUFFER_FORMAT )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_BACK_BUFFER_FORMAT_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_DEPTH_STENCIL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_DEPTH_STENCIL_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_MULTISAMPLE_TYPE )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_MULTISAMPLE_TYPE_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_MULTISAMPLE_QUALITY )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_MULTISAMPLE_QUALITY_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_VERTEX_PROCESSING )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_VERTEX_PROCESSING_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_PRESENT_INTERVAL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_PRESENT_INTERVAL_LABEL )->SetVisible( false );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_DEVICECLIP )->SetVisible( false );
-
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_RESOLUTION )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_RESOLUTION_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_REFRESH_RATE )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_REFRESH_RATE_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL_LABEL )->SetVisible( true );
-            m_Dialog.GetControl( DXUTSETTINGSDLG_D3D11_DEBUG_DEVICE )->SetVisible( true );
-            break;
-    }
-}
-
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void WINAPI CD3DSettingsDlg::StaticOnEvent( UINT nEvent, int nControlID,
                                             CDXUTControl* pControl, void* pUserData )
 {
-    CD3DSettingsDlg* pD3DSettings = ( CD3DSettingsDlg* )pUserData;
+    auto pD3DSettings = reinterpret_cast<CD3DSettingsDlg*>( pUserData );
     if( pD3DSettings )
         pD3DSettings->OnEvent( nEvent, nControlID, pControl );
 }
@@ -700,26 +489,34 @@ void WINAPI CD3DSettingsDlg::StaticOnEvent( UINT nEvent, int nControlID,
 // Desc: Timer callback registered by a call to DXUTSetTimer.  It is called each second
 //       until mode change timeout limit.
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void WINAPI CD3DSettingsDlg::StaticOnModeChangeTimer( UINT nIDEvent, void* pUserContext )
 {
-    CD3DSettingsDlg* pD3DSettings = ( CD3DSettingsDlg* )pUserContext;
+    UNREFERENCED_PARAMETER(nIDEvent);
+
+    auto pD3DSettings = reinterpret_cast<CD3DSettingsDlg*>( pUserContext );
     assert( pD3DSettings );
+    _Analysis_assume_( pD3DSettings );
     assert( pD3DSettings->m_pActiveDialog == &pD3DSettings->m_RevertModeDialog );
     assert( pD3DSettings->m_nIDEvent == nIDEvent );
 
     if( 0 == --pD3DSettings->m_nRevertModeTimeout )
     {
-        CDXUTControl* pControl = pD3DSettings->m_RevertModeDialog.GetControl( DXUTSETTINGSDLG_MODE_CHANGE_REVERT );
+        auto pControl = pD3DSettings->m_RevertModeDialog.GetControl( DXUTSETTINGSDLG_MODE_CHANGE_REVERT );
         assert( pControl );
+        _Analysis_assume_( pControl );
         pD3DSettings->m_RevertModeDialog.SendEvent( EVENT_BUTTON_CLICKED, false, pControl );
     }
     pD3DSettings->UpdateModeChangeTimeoutText( pD3DSettings->m_nRevertModeTimeout );
 }
 
 //--------------------------------------------------------------------------------------
-void CD3DSettingsDlg::OnEvent( UINT nEvent, int nControlID,
-                               CDXUTControl* pControl )
+_Use_decl_annotations_
+void CD3DSettingsDlg::OnEvent( UINT nEvent, int nControlID, CDXUTControl* pControl )
 {
+    UNREFERENCED_PARAMETER(nEvent);
+    UNREFERENCED_PARAMETER(pControl);
+
     switch( nControlID )
     {
         case DXUTSETTINGSDLG_ADAPTER:
@@ -730,42 +527,10 @@ void CD3DSettingsDlg::OnEvent( UINT nEvent, int nControlID,
             OnWindowedFullScreenChanged(); break;
         case DXUTSETTINGSDLG_FULLSCREEN:
             OnWindowedFullScreenChanged(); break;
-        case DXUTSETTINGSDLG_ADAPTER_FORMAT:
-            OnAdapterFormatChanged(); break;
         case DXUTSETTINGSDLG_RESOLUTION_SHOW_ALL:
-        {
-            if( g_DeviceSettings.ver == DXUT_D3D9_DEVICE )
-            {
-                OnAdapterFormatChanged();
-            }
-            else
-            {
-                OnBackBufferFormatChanged();
-            }
-            break;
-        }
+            OnBackBufferFormatChanged();   break;
         case DXUTSETTINGSDLG_D3D11_RESOLUTION:
             OnD3D11ResolutionChanged(); break;
-        case DXUTSETTINGSDLG_RESOLUTION:
-            OnResolutionChanged(); break;
-        case DXUTSETTINGSDLG_REFRESH_RATE:
-            OnRefreshRateChanged(); break;
-        case DXUTSETTINGSDLG_BACK_BUFFER_FORMAT:
-            OnBackBufferFormatChanged(); break;
-        case DXUTSETTINGSDLG_DEPTH_STENCIL:
-            OnDepthStencilBufferFormatChanged(); break;
-        case DXUTSETTINGSDLG_MULTISAMPLE_TYPE:
-            OnMultisampleTypeChanged(); break;
-        case DXUTSETTINGSDLG_MULTISAMPLE_QUALITY:
-            OnMultisampleQualityChanged(); break;
-        case DXUTSETTINGSDLG_VERTEX_PROCESSING:
-            OnVertexProcessingChanged(); break;
-        case DXUTSETTINGSDLG_PRESENT_INTERVAL:
-            OnPresentIntervalChanged(); break;
-        case DXUTSETTINGSDLG_DEVICECLIP:
-            OnDeviceClipChanged(); break;
-        case DXUTSETTINGSDLG_API_VERSION:
-            OnAPIVersionChanged(); break;
         case DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL:
             OnFeatureLevelChanged(); break;
         case DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT:
@@ -786,69 +551,34 @@ void CD3DSettingsDlg::OnEvent( UINT nEvent, int nControlID,
         case DXUTSETTINGSDLG_OK:
         {
             bool bFullScreenModeChange = false;
-            DXUTDeviceSettings currentSettings = DXUTGetDeviceSettings();
+            auto currentSettings = DXUTGetDeviceSettings();
             g_DeviceSettings.MinimumFeatureLevel = currentSettings.MinimumFeatureLevel;
-            if( g_DeviceSettings.ver == DXUT_D3D9_DEVICE )
+            if( g_DeviceSettings.d3d11.sd.Windowed )
             {
-                if( g_DeviceSettings.d3d9.pp.Windowed )
-                {
-                    g_DeviceSettings.d3d9.pp.FullScreen_RefreshRateInHz = 0;
-
-                    RECT rcClient;
-                    if( DXUTIsWindowed() )
-                        GetClientRect( DXUTGetHWND(), &rcClient );
-                    else
-                        rcClient = DXUTGetWindowClientRectAtModeChange();
-                    DWORD dwWindowWidth = rcClient.right - rcClient.left;
-                    DWORD dwWindowHeight = rcClient.bottom - rcClient.top;
-
-                    g_DeviceSettings.d3d9.pp.BackBufferWidth = dwWindowWidth;
-                    g_DeviceSettings.d3d9.pp.BackBufferHeight = dwWindowHeight;
-                }
+                g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate.Denominator =
+                g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate.Numerator = 0;
+
+                RECT rcClient;
+                if( DXUTIsWindowed() )
+                    GetClientRect( DXUTGetHWND(), &rcClient );
                 else
-                {
-                    // Check for fullscreen mode change
-                    bFullScreenModeChange = g_DeviceSettings.d3d9.pp.BackBufferWidth !=
-                        currentSettings.d3d9.pp.BackBufferWidth ||
-                        g_DeviceSettings.d3d9.pp.BackBufferHeight != currentSettings.d3d9.pp.BackBufferHeight ||
-                        g_DeviceSettings.d3d9.pp.FullScreen_RefreshRateInHz !=
-                        currentSettings.d3d9.pp.FullScreen_RefreshRateInHz;
-                }
+                    rcClient = DXUTGetWindowClientRectAtModeChange();
+                DWORD dwWindowWidth = rcClient.right - rcClient.left;
+                DWORD dwWindowHeight = rcClient.bottom - rcClient.top;
 
-                if( g_DeviceSettings.d3d9.pp.MultiSampleType != D3DMULTISAMPLE_NONE )
-                {
-                    g_DeviceSettings.d3d9.pp.Flags &= ~D3DPRESENTFLAG_LOCKABLE_BACKBUFFER;
-                }
+                g_DeviceSettings.d3d11.sd.BufferDesc.Width = dwWindowWidth;
+                g_DeviceSettings.d3d11.sd.BufferDesc.Height = dwWindowHeight;
             }
-            else // D3D11
+            else
             {
-                if( g_DeviceSettings.d3d11.sd.Windowed )
-                {
-                    g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate.Denominator =
-                        g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate.Numerator = 0;
-
-                    RECT rcClient;
-                    if( DXUTIsWindowed() )
-                        GetClientRect( DXUTGetHWND(), &rcClient );
-                    else
-                        rcClient = DXUTGetWindowClientRectAtModeChange();
-                    DWORD dwWindowWidth = rcClient.right - rcClient.left;
-                    DWORD dwWindowHeight = rcClient.bottom - rcClient.top;
-
-                    g_DeviceSettings.d3d11.sd.BufferDesc.Width = dwWindowWidth;
-                    g_DeviceSettings.d3d11.sd.BufferDesc.Height = dwWindowHeight;
-                }
-                else
-                {
-                    // Check for fullscreen mode change
-                    bFullScreenModeChange = g_DeviceSettings.d3d11.sd.BufferDesc.Width !=
-                        currentSettings.d3d11.sd.BufferDesc.Width ||
-                        g_DeviceSettings.d3d11.sd.BufferDesc.Height != currentSettings.d3d11.sd.BufferDesc.Height ||
-                        g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate.Denominator !=
-                        currentSettings.d3d11.sd.BufferDesc.RefreshRate.Denominator ||
-                        g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate.Numerator !=
-                        currentSettings.d3d11.sd.BufferDesc.RefreshRate.Numerator;
-                }
+                // Check for fullscreen mode change
+                bFullScreenModeChange = g_DeviceSettings.d3d11.sd.BufferDesc.Width !=
+                    currentSettings.d3d11.sd.BufferDesc.Width ||
+                    g_DeviceSettings.d3d11.sd.BufferDesc.Height != currentSettings.d3d11.sd.BufferDesc.Height ||
+                    g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate.Denominator !=
+                    currentSettings.d3d11.sd.BufferDesc.RefreshRate.Denominator ||
+                    g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate.Numerator !=
+                    currentSettings.d3d11.sd.BufferDesc.RefreshRate.Numerator;
             }
 
             if( bFullScreenModeChange )
@@ -857,20 +587,6 @@ void CD3DSettingsDlg::OnEvent( UINT nEvent, int nControlID,
                 // settings.  These will get set to the user-defined settings once the
                 // user accepts the mode change
                 DXUTDeviceSettings tSettings = g_DeviceSettings;
-                if( g_DeviceSettings.ver == DXUT_D3D9_DEVICE )
-                {
-                    g_DeviceSettings.d3d9.pp.BackBufferWidth = 
-                        currentSettings.d3d9.pp.BackBufferWidth;
-                    g_DeviceSettings.d3d9.pp.BackBufferHeight = 
-                        currentSettings.d3d9.pp.BackBufferHeight;
-                    g_DeviceSettings.d3d9.pp.FullScreen_RefreshRateInHz =
-                        currentSettings.d3d9.pp.FullScreen_RefreshRateInHz;
-                    g_DeviceSettings.d3d9.pp.Windowed = 
-                        currentSettings.d3d9.pp.Windowed;
-                }
-                else
-                {
-                    
                     g_DeviceSettings.d3d11.sd.BufferDesc.Width = 
                         currentSettings.d3d11.sd.BufferDesc.Width;
                     g_DeviceSettings.d3d11.sd.BufferDesc.Height = 
@@ -880,8 +596,6 @@ void CD3DSettingsDlg::OnEvent( UINT nEvent, int nControlID,
                     g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate.Numerator =
                         currentSettings.d3d11.sd.BufferDesc.RefreshRate.Numerator;
                     g_DeviceSettings.d3d11.sd.Windowed = currentSettings.d3d11.sd.Windowed;
-                
-                }
 
                 // apply the user-defined settings
                 DXUTCreateDeviceFromSettings( &tSettings );
@@ -930,324 +644,154 @@ void CD3DSettingsDlg::OnEvent( UINT nEvent, int nControlID,
 
 
 //-------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::SetDeviceSettingsFromUI()
-{
-    CDXUTComboBox* pComboBox;
-    CDXUTRadioButton* pRadioButton;
-
-    // DXUTSETTINGSDLG_DEVICE_TYPE
-    pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEVICE_TYPE );
-    g_DeviceSettings.d3d9.DeviceType = ( D3DDEVTYPE )PtrToUlong( pComboBox->GetSelectedData() );
-
-    // DXUTSETTINGSDLG_WINDOWED
-    pRadioButton = m_Dialog.GetRadioButton( DXUTSETTINGSDLG_WINDOWED );
-    g_DeviceSettings.d3d9.pp.Windowed = pRadioButton->GetChecked();
-
-    // DXUTSETTINGSDLG_ADAPTER_FORMAT
-    pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER_FORMAT );
-    g_DeviceSettings.d3d9.AdapterFormat = ( D3DFORMAT )PtrToUlong( pComboBox->GetSelectedData() );
-
-    if( g_DeviceSettings.d3d9.pp.Windowed )
-    {
-        g_DeviceSettings.d3d9.pp.BackBufferFormat = D3DFMT_UNKNOWN;
-        g_DeviceSettings.d3d9.pp.FullScreen_RefreshRateInHz = 0;
-    }
-    else
-    {
-        // DXUTSETTINGSDLG_BACK_BUFFER_FORMAT
-        pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_BACK_BUFFER_FORMAT );
-        g_DeviceSettings.d3d9.pp.BackBufferFormat = ( D3DFORMAT )PtrToUlong( pComboBox->GetSelectedData() );
-
-        // DXUTSETTINGSDLG_RESOLUTION
-        pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_RESOLUTION );
-        DWORD dwResolution = PtrToUlong( pComboBox->GetSelectedData() );
-        g_DeviceSettings.d3d9.pp.BackBufferWidth = HIWORD( dwResolution );
-        g_DeviceSettings.d3d9.pp.BackBufferHeight = LOWORD( dwResolution );
-
-        // DXUTSETTINGSDLG_REFRESH_RATE
-        pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_REFRESH_RATE );
-        g_DeviceSettings.d3d9.pp.FullScreen_RefreshRateInHz = PtrToUlong( pComboBox->GetSelectedData() );
-    }
-
-    // DXUTSETTINGSDLG_DEPTH_STENCIL
-    pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEPTH_STENCIL );
-    g_DeviceSettings.d3d9.pp.AutoDepthStencilFormat = ( D3DFORMAT )PtrToUlong( pComboBox->GetSelectedData() );
-
-    return S_OK;
-}
-
-
-//-------------------------------------------------------------------------------------
-CD3D9EnumAdapterInfo* CD3DSettingsDlg::GetCurrentAdapterInfo()
-{
-    CD3D9Enumeration* pD3DEnum = DXUTGetD3D9Enumeration();
-    return pD3DEnum->GetAdapterInfo( g_DeviceSettings.d3d9.AdapterOrdinal );
-}
-
-
-//-------------------------------------------------------------------------------------
-CD3D9EnumDeviceInfo* CD3DSettingsDlg::GetCurrentDeviceInfo()
-{
-    CD3D9Enumeration* pD3DEnum = DXUTGetD3D9Enumeration();
-    return pD3DEnum->GetDeviceInfo( g_DeviceSettings.d3d9.AdapterOrdinal,
-                                    g_DeviceSettings.d3d9.DeviceType );
-}
-
-//-------------------------------------------------------------------------------------
-CD3D11EnumAdapterInfo* CD3DSettingsDlg::GetCurrentD3D11AdapterInfo()
+CD3D11EnumAdapterInfo* CD3DSettingsDlg::GetCurrentD3D11AdapterInfo() const
 {
-    CD3D11Enumeration* pD3DEnum = DXUTGetD3D11Enumeration();
+    auto pD3DEnum = DXUTGetD3D11Enumeration();
     return pD3DEnum->GetAdapterInfo( g_DeviceSettings.d3d11.AdapterOrdinal );
 }
 
 
 //-------------------------------------------------------------------------------------
-CD3D11EnumDeviceInfo* CD3DSettingsDlg::GetCurrentD3D11DeviceInfo()
+CD3D11EnumDeviceInfo* CD3DSettingsDlg::GetCurrentD3D11DeviceInfo() const
 {
-    CD3D11Enumeration* pD3DEnum = DXUTGetD3D11Enumeration();
+    auto pD3DEnum = DXUTGetD3D11Enumeration();
     return pD3DEnum->GetDeviceInfo( g_DeviceSettings.d3d11.AdapterOrdinal,
                                     g_DeviceSettings.d3d11.DriverType );
 }
 
 
 //-------------------------------------------------------------------------------------
-CD3D11EnumOutputInfo* CD3DSettingsDlg::GetCurrentD3D11OutputInfo()
+CD3D11EnumOutputInfo* CD3DSettingsDlg::GetCurrentD3D11OutputInfo() const
 {
-    CD3D11Enumeration* pD3DEnum = DXUTGetD3D11Enumeration();
+    auto pD3DEnum = DXUTGetD3D11Enumeration();
     return pD3DEnum->GetOutputInfo( g_DeviceSettings.d3d11.AdapterOrdinal,
                                     g_DeviceSettings.d3d11.Output );
 }
 
-
-//-------------------------------------------------------------------------------------
-CD3D9EnumDeviceSettingsCombo* CD3DSettingsDlg::GetCurrentDeviceSettingsCombo()
-{
-    CD3D9Enumeration* pD3DEnum = DXUTGetD3D9Enumeration();
-    return pD3DEnum->GetDeviceSettingsCombo( g_DeviceSettings.d3d9.AdapterOrdinal,
-                                             g_DeviceSettings.d3d9.DeviceType,
-                                             g_DeviceSettings.d3d9.AdapterFormat,
-                                             g_DeviceSettings.d3d9.pp.BackBufferFormat,
-                                             ( g_DeviceSettings.d3d9.pp.Windowed == TRUE ) );
-}
-
 //-------------------------------------------------------------------------------------
-CD3D11EnumDeviceSettingsCombo* CD3DSettingsDlg::GetCurrentD3D11DeviceSettingsCombo()
+CD3D11EnumDeviceSettingsCombo* CD3DSettingsDlg::GetCurrentD3D11DeviceSettingsCombo() const
 {
-    CD3D11Enumeration* pD3DEnum = DXUTGetD3D11Enumeration();
+    auto pD3DEnum = DXUTGetD3D11Enumeration();
     return pD3DEnum->GetDeviceSettingsCombo( g_DeviceSettings.d3d11.AdapterOrdinal,
-                                             g_DeviceSettings.d3d11.DriverType,
-                                             g_DeviceSettings.d3d11.Output,
                                              g_DeviceSettings.d3d11.sd.BufferDesc.Format,
                                              ( g_DeviceSettings.d3d11.sd.Windowed == TRUE ) );
 }
 
-HRESULT CD3DSettingsDlg::OnD3D11ResolutionChanged () {
+HRESULT CD3DSettingsDlg::OnD3D11ResolutionChanged ()
+{
+    if ( g_DeviceSettings.d3d11.sd.Windowed )
+        return S_OK;
+
     DWORD dwWidth, dwHeight;
     GetSelectedD3D11Resolution( &dwWidth, &dwHeight );
-    g_DeviceSettings.d3d11.sd.BufferDesc.Width= dwWidth;
+    g_DeviceSettings.d3d11.sd.BufferDesc.Width = dwWidth;
     g_DeviceSettings.d3d11.sd.BufferDesc.Height = dwHeight;
-    
+
+    // DXUTSETTINGSDLG_D3D11_REFRESH_RATE
+    HRESULT hr = UpdateD3D11RefreshRates();
+    if ( FAILED(hr) )
+        return hr;
+
     return S_OK;
 }
 
-HRESULT CD3DSettingsDlg::OnFeatureLevelChanged () {
+HRESULT CD3DSettingsDlg::OnFeatureLevelChanged ()
+{
     HRESULT hr = E_FAIL;
-    if (g_DeviceSettings.ver == DXUT_D3D11_DEVICE) {
-        if (g_DeviceSettings.d3d11.DeviceFeatureLevel == GetSelectedFeatureLevel()) return S_OK;
-        //if( !bRefresh )
-        //{
-            // Obtain a set of valid D3D10 device settings.
-            UINT CreateFlags = g_DeviceSettings.d3d11.CreateFlags;
-            ZeroMemory( &g_DeviceSettings, sizeof( g_DeviceSettings ) );
-            
-            DXUTApplyDefaultDeviceSettings(&g_DeviceSettings);
-            g_DeviceSettings.d3d11.CreateFlags = CreateFlags;
-            g_DeviceSettings.ver = DXUT_D3D11_DEVICE;
-            //g_DeviceSettings.d3d11.fl = GetSelectedFeatureLevel();
-            hr = DXUTSnapDeviceSettingsToEnumDevice(&g_DeviceSettings, true, GetSelectedFeatureLevel());
-            
-        //}
 
-        CD3D11Enumeration* pD3DEnum = DXUTGetD3D11Enumeration();
-        CGrowableArray <CD3D11EnumAdapterInfo*>* pAdapterInfoList = pD3DEnum->GetAdapterInfoList();
+    if (g_DeviceSettings.d3d11.DeviceFeatureLevel == GetSelectedFeatureLevel()) return S_OK;
 
-        CDXUTComboBox* pAdapterComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER );
-        pAdapterComboBox->RemoveAllItems();
+    // Obtain a set of valid D3D11 device settings.
+    UINT CreateFlags = g_DeviceSettings.d3d11.CreateFlags;
+    DXGI_FORMAT BackBufferFormat = g_DeviceSettings.d3d11.sd.BufferDesc.Format;
+    UINT Count = g_DeviceSettings.d3d11.sd.SampleDesc.Count;
+    UINT Quality = g_DeviceSettings.d3d11.sd.SampleDesc.Quality;
+    DXGI_RATIONAL RefreshRate = g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate;
+    ZeroMemory(&g_DeviceSettings, sizeof(g_DeviceSettings));
 
-        for( int iAdapter = 0; iAdapter < pAdapterInfoList->GetSize(); ++iAdapter )
-        {
-            CD3D11EnumAdapterInfo* pAdapterInfo = pAdapterInfoList->GetAt( iAdapter );
-            AddAdapter( pAdapterInfo->szUniqueDescription, pAdapterInfo->AdapterOrdinal );
-        }
+    DXUTApplyDefaultDeviceSettings(&g_DeviceSettings);
+    g_DeviceSettings.d3d11.CreateFlags = CreateFlags;
+    hr = DXUTSnapDeviceSettingsToEnumDevice(&g_DeviceSettings, true, GetSelectedFeatureLevel());
+    g_DeviceSettings.d3d11.sd.BufferDesc.Format = BackBufferFormat;
+    g_DeviceSettings.d3d11.sd.SampleDesc.Count = Count;
+    g_DeviceSettings.d3d11.sd.SampleDesc.Quality = Quality;
+    g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate = RefreshRate;
 
-        pAdapterComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.AdapterOrdinal ) );
+    auto pD3DEnum = DXUTGetD3D11Enumeration();
+    auto pAdapterInfoList = pD3DEnum->GetAdapterInfoList();
 
-        CDXUTCheckBox* pCheckBox = m_Dialog.GetCheckBox( DXUTSETTINGSDLG_D3D11_DEBUG_DEVICE );
-        pCheckBox->SetChecked( 0 != ( g_DeviceSettings.d3d11.CreateFlags & D3D11_CREATE_DEVICE_DEBUG ) );
+    // DXUTSETTINGSDLG_ADAPTER
+    auto pAdapterComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER );
+    pAdapterComboBox->RemoveAllItems();
 
-        hr = OnAdapterChanged();
-        if( FAILED( hr ) )
-            return hr;
+    for( auto it = pAdapterInfoList->cbegin(); it != pAdapterInfoList->cend(); ++it )
+    {
+        AddAdapter( (*it)->szUniqueDescription, (*it)->AdapterOrdinal );
     }
-    
-    return hr;
-}
 
-//-------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnAPIVersionChanged( bool bRefresh )
-{
-    HRESULT hr;
+    pAdapterComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.AdapterOrdinal ) );
 
-    // Store the API version
-    g_DeviceSettings.ver = GetSelectedAPIVersion();
+    // DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT
+    auto pBackBufferFormatComboBox = m_Dialog.GetComboBox(DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT);
+    pBackBufferFormatComboBox->RemoveAllItems();
+
+    auto pAdapterInfo = GetCurrentD3D11AdapterInfo();
+    if (!pAdapterInfo)
+        return E_FAIL;
 
-    // Show/hide appropriate dialog controls based on version.
-    ShowControlSet( g_DeviceSettings.ver );
+    bool bWindowed = IsWindowed();
 
-    switch( g_DeviceSettings.ver )
+    for (size_t idc = 0; idc < pAdapterInfo->deviceSettingsComboList.size(); idc++)
     {
-        case DXUT_D3D9_DEVICE:
+        auto pDeviceCombo = pAdapterInfo->deviceSettingsComboList[idc];
+        if ((pDeviceCombo->Windowed == TRUE) == bWindowed)
         {
-            if( !bRefresh )
-            {
-                // Obtain a set of valid D3D9 device settings.
-                UINT CreateFlags = g_DeviceSettings.d3d11.CreateFlags;
-                ZeroMemory( &g_DeviceSettings, sizeof( g_DeviceSettings ) );
-                // We want a specific API version, so set up match option to preserve it.
-                DXUTApplyDefaultDeviceSettings(&g_DeviceSettings);
-                g_DeviceSettings.d3d11.CreateFlags = CreateFlags;
-                g_DeviceSettings.ver = DXUT_D3D9_DEVICE;
-                DXUTSnapDeviceSettingsToEnumDevice ( &g_DeviceSettings, true);
-            }
-
-            CD3D9Enumeration* pD3DEnum = DXUTGetD3D9Enumeration();
-            CGrowableArray <CD3D9EnumAdapterInfo*>* pAdapterInfoList = pD3DEnum->GetAdapterInfoList();
+            AddD3D11BackBufferFormat(pDeviceCombo->BackBufferFormat);
+        }
+    }
 
-            CDXUTComboBox* pAdapterComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER );
-            pAdapterComboBox->RemoveAllItems();
+    pBackBufferFormatComboBox->SetSelectedByData( ULongToPtr(g_DeviceSettings.d3d11.sd.BufferDesc.Format) );
 
-            for( int iAdapter = 0; iAdapter < pAdapterInfoList->GetSize(); ++iAdapter )
-            {
-                CD3D9EnumAdapterInfo* pAdapterInfo = pAdapterInfoList->GetAt( iAdapter );
-                AddAdapter( pAdapterInfo->szUniqueDescription, pAdapterInfo->AdapterOrdinal );
-            }
+    hr = OnBackBufferFormatChanged();
+    if (FAILED(hr))
+        return hr;
 
-            pAdapterComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d9.AdapterOrdinal ) );
+    auto pCheckBox = m_Dialog.GetCheckBox( DXUTSETTINGSDLG_D3D11_DEBUG_DEVICE );
+    pCheckBox->SetChecked( 0 != ( g_DeviceSettings.d3d11.CreateFlags & D3D11_CREATE_DEVICE_DEBUG ) );
 
-            hr = OnAdapterChanged();
-            if( FAILED( hr ) )
-                return hr;
-
-            break;
-        }
-
-        case DXUT_D3D11_DEVICE:
-        {
-            if( !bRefresh )
-            {
-                // Obtain a set of valid D3D10 device settings.
-                UINT CreateFlags = g_DeviceSettings.d3d11.CreateFlags;
-                ZeroMemory( &g_DeviceSettings, sizeof( g_DeviceSettings ) );
-                // We want a specific API version, so set up match option to preserve it.
-                DXUTApplyDefaultDeviceSettings(&g_DeviceSettings);
-                g_DeviceSettings.d3d11.CreateFlags = CreateFlags;
-                g_DeviceSettings.ver = DXUT_D3D11_DEVICE;
-                DXUTSnapDeviceSettingsToEnumDevice(&g_DeviceSettings, true);
-                
-            }
-
-            CD3D11Enumeration* pD3DEnum = DXUTGetD3D11Enumeration();
-            CGrowableArray <CD3D11EnumAdapterInfo*>* pAdapterInfoList = pD3DEnum->GetAdapterInfoList();
-
-            CDXUTComboBox* pAdapterComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER );
-            pAdapterComboBox->RemoveAllItems();
-
-            for( int iAdapter = 0; iAdapter < pAdapterInfoList->GetSize(); ++iAdapter )
-            {
-                CD3D11EnumAdapterInfo* pAdapterInfo = pAdapterInfoList->GetAt( iAdapter );
-                AddAdapter( pAdapterInfo->szUniqueDescription, pAdapterInfo->AdapterOrdinal );
-            }
-
-            pAdapterComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.AdapterOrdinal ) );
-
-            CDXUTCheckBox* pCheckBox = m_Dialog.GetCheckBox( DXUTSETTINGSDLG_D3D11_DEBUG_DEVICE );
-            pCheckBox->SetChecked( 0 != ( g_DeviceSettings.d3d11.CreateFlags & D3D11_CREATE_DEVICE_DEBUG ) );
-
-            hr = OnAdapterChanged();
-            if( FAILED( hr ) )
-                return hr;
-
-            break;
-        }
-    }
-
-    return S_OK;
+    hr = OnAdapterChanged();
+    if( FAILED( hr ) )
+        return hr;
+    
+    return hr;
 }
 
 
 //-------------------------------------------------------------------------------------
 HRESULT CD3DSettingsDlg::OnAdapterChanged()
 {
-    HRESULT hr = S_OK;
-
-    switch( g_DeviceSettings.ver )
-    {
-        case DXUT_D3D9_DEVICE:
-        {
-            // Store the adapter index
-            g_DeviceSettings.d3d9.AdapterOrdinal = GetSelectedAdapter();
-
-            // DXUTSETTINGSDLG_DEVICE_TYPE
-            CDXUTComboBox* pDeviceTypeComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEVICE_TYPE );
-            pDeviceTypeComboBox->RemoveAllItems();
-
-            CD3D9EnumAdapterInfo* pAdapterInfo = GetCurrentAdapterInfo();
-            if( pAdapterInfo == NULL )
-                return E_FAIL;
-
-            for( int iDeviceInfo = 0; iDeviceInfo < pAdapterInfo->deviceInfoList.GetSize(); iDeviceInfo++ )
-            {
-                CD3D9EnumDeviceInfo* pDeviceInfo = pAdapterInfo->deviceInfoList.GetAt( iDeviceInfo );
-                AddDeviceType( pDeviceInfo->DeviceType );
-            }
+    // Store the adapter index
+    g_DeviceSettings.d3d11.AdapterOrdinal = GetSelectedAdapter();
 
-            pDeviceTypeComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d9.DeviceType ) );
-
-            hr = OnDeviceTypeChanged();
-            if( FAILED( hr ) )
-                return hr;
-
-            break;
-        }
-
-        case DXUT_D3D11_DEVICE:
-        {
-            // Store the adapter index
-            g_DeviceSettings.d3d11.AdapterOrdinal = GetSelectedAdapter();
-
-            // DXUTSETTINGSDLG_DEVICE_TYPE
-            CDXUTComboBox* pDeviceTypeComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEVICE_TYPE );
-            pDeviceTypeComboBox->RemoveAllItems();
-
-            CD3D11EnumAdapterInfo* pAdapterInfo = GetCurrentD3D11AdapterInfo();
-            if( pAdapterInfo == NULL )
-                return E_FAIL;
+    // DXUTSETTINGSDLG_DEVICE_TYPE
+    auto pDeviceTypeComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEVICE_TYPE );
+    pDeviceTypeComboBox->RemoveAllItems();
 
-            for( int iDeviceInfo = 0; iDeviceInfo < pAdapterInfo->deviceInfoList.GetSize(); iDeviceInfo++ )
-            {
-                CD3D11EnumDeviceInfo* pDeviceInfo = pAdapterInfo->deviceInfoList.GetAt( iDeviceInfo );
-                AddD3D11DeviceType( pDeviceInfo->DeviceType );
-            }
+    auto pAdapterInfo = GetCurrentD3D11AdapterInfo();
+    if( !pAdapterInfo )
+        return E_FAIL;
 
-            pDeviceTypeComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.DriverType ) );
+    for( size_t iDeviceInfo = 0; iDeviceInfo < pAdapterInfo->deviceInfoList.size(); iDeviceInfo++ )
+    {
+        auto pDeviceInfo = pAdapterInfo->deviceInfoList[ iDeviceInfo ];
+        AddD3D11DeviceType( pDeviceInfo->DeviceType );
+    }
 
-            hr = OnDeviceTypeChanged();
-            if( FAILED( hr ) )
-                return hr;
+    pDeviceTypeComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.DriverType ) );
 
-            break;
-        }
-    }
+    HRESULT hr = OnDeviceTypeChanged();
+    if( FAILED( hr ) )
+        return hr;
 
     return S_OK;
 }
@@ -1259,60 +803,64 @@ HRESULT CD3DSettingsDlg::OnDeviceTypeChanged()
 {
     HRESULT hr = S_OK;
 
-    switch( g_DeviceSettings.ver )
-    {
-        case DXUT_D3D9_DEVICE:
-        {
-            g_DeviceSettings.d3d9.DeviceType = GetSelectedDeviceType();
-
-            // Update windowed/full screen radio buttons
-            bool bHasWindowedDeviceCombo = false;
-            bool bHasFullScreenDeviceCombo = false;
+    g_DeviceSettings.d3d11.DriverType = GetSelectedD3D11DeviceType();
 
-            CD3D9EnumDeviceInfo* pDeviceInfo = GetCurrentDeviceInfo();
-            if( pDeviceInfo == NULL )
-                return E_FAIL;
-
-            for( int idc = 0; idc < pDeviceInfo->deviceSettingsComboList.GetSize(); idc++ )
-            {
-                CD3D9EnumDeviceSettingsCombo* pDeviceSettingsCombo = pDeviceInfo->deviceSettingsComboList.GetAt( idc );
+    // DXUTSETTINGSDLG_WINDOWED, DXUTSETTINGSDLG_FULLSCREEN
+    m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_WINDOWED, true );
+    if (g_DeviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_WARP )
+    {
+        m_Dialog.SetControlEnabled(DXUTSETTINGSDLG_FULLSCREEN, false );
+        g_DeviceSettings.d3d11.sd.Windowed = TRUE;
+    }
+    else
+    {
+        m_Dialog.SetControlEnabled(DXUTSETTINGSDLG_FULLSCREEN, true );
+    }
 
-                if( pDeviceSettingsCombo->Windowed )
-                    bHasWindowedDeviceCombo = true;
-                else
-                    bHasFullScreenDeviceCombo = true;
-            }
+    SetWindowed( g_DeviceSettings.d3d11.sd.Windowed != 0 );
 
-            // DXUTSETTINGSDLG_WINDOWED, DXUTSETTINGSDLG_FULLSCREEN
-            m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_WINDOWED, bHasWindowedDeviceCombo );
-            m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_FULLSCREEN, bHasFullScreenDeviceCombo );
+    auto pBestDeviceSettingsCombo = DXUTGetD3D11Enumeration()->GetDeviceSettingsCombo(
+        g_DeviceSettings.d3d11.AdapterOrdinal, g_DeviceSettings.d3d11.sd.BufferDesc.Format,
+        ( g_DeviceSettings.d3d11.sd.Windowed != 0 ) );
 
-            SetWindowed( g_DeviceSettings.d3d9.pp.Windowed && bHasWindowedDeviceCombo );
+    if( !pBestDeviceSettingsCombo )
+        return DXUT_ERR_MSGBOX( L"GetDeviceSettingsCombo", E_INVALIDARG );
 
-            hr = OnWindowedFullScreenChanged();
-            if( FAILED( hr ) )
-                return hr;
+    D3D_FEATURE_LEVEL clampFL;
+    if ( g_DeviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_WARP )
+        clampFL = DXUTGetD3D11Enumeration()->GetWARPFeaturevel();
+    else if ( g_DeviceSettings.d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE )
+        clampFL = DXUTGetD3D11Enumeration()->GetREFFeaturevel();
+    else
+        clampFL = pBestDeviceSettingsCombo->pDeviceInfo->MaxLevel;
 
-            break;
-        }
-        case DXUT_D3D11_DEVICE:
+    if ( g_DeviceSettings.d3d11.DeviceFeatureLevel > clampFL
+         || clampFL > pBestDeviceSettingsCombo->pDeviceInfo->MaxLevel )
+    {
+        g_DeviceSettings.d3d11.DeviceFeatureLevel = std::min<D3D_FEATURE_LEVEL>( g_DeviceSettings.d3d11.DeviceFeatureLevel,
+                                                                                 clampFL );
+                
+        CDXUTComboBox *pFeatureLevelBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL );
+        pFeatureLevelBox->RemoveAllItems();
+        for (int fli = 0; fli < TOTAL_FEATURE_LEVELS; fli++)
         {
-            g_DeviceSettings.d3d11.DriverType = GetSelectedD3D11DeviceType();
-
-            // DXUTSETTINGSDLG_WINDOWED, DXUTSETTINGSDLG_FULLSCREEN
-            m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_WINDOWED, true );
-            m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_FULLSCREEN, true );
-
-            SetWindowed( g_DeviceSettings.d3d11.sd.Windowed != 0 );
-
-            hr = OnWindowedFullScreenChanged();
-            if( FAILED( hr ) )
-                return hr;
+            if (m_Levels[fli] >= g_DeviceSettings.MinimumFeatureLevel 
+                && m_Levels[fli] <= clampFL)
+            {
+                AddD3D11FeatureLevel( m_Levels[fli] );
+            }
+        } 
+        pFeatureLevelBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.DeviceFeatureLevel ) );
 
-            break;
-        }
+        hr = OnFeatureLevelChanged();
+        if( FAILED( hr ) )
+            return hr;
     }
 
+    hr = OnWindowedFullScreenChanged();
+    if( FAILED( hr ) )
+        return hr;
+
     return S_OK;
 }
 
@@ -1324,157 +872,43 @@ HRESULT CD3DSettingsDlg::OnWindowedFullScreenChanged()
     HRESULT hr = S_OK;
     bool bWindowed = IsWindowed();
 
-    m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_ADAPTER_FORMAT_LABEL, !bWindowed );
-    m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_RESOLUTION_LABEL, !bWindowed );
-    m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_REFRESH_RATE_LABEL, !bWindowed );
     m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT_LABEL, !bWindowed );
     m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_D3D11_RESOLUTION_LABEL, !bWindowed );
     m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_D3D11_REFRESH_RATE_LABEL, !bWindowed );
 
-    m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_ADAPTER_FORMAT, !bWindowed );
-    m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_RESOLUTION, !bWindowed );
     m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_RESOLUTION_SHOW_ALL, !bWindowed );
-    m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_REFRESH_RATE, !bWindowed );
-    m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_DEVICECLIP, bWindowed );
     m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT, !bWindowed );
     m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_D3D11_RESOLUTION, !bWindowed );
     m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_D3D11_REFRESH_RATE, !bWindowed );
 
-    switch( g_DeviceSettings.ver )
-    {
-        case DXUT_D3D9_DEVICE:
-        {
-            g_DeviceSettings.d3d9.pp.Windowed = bWindowed;
-            bool bDeviceClip = ( 0x0 != ( g_DeviceSettings.d3d9.pp.Flags & D3DPRESENTFLAG_DEVICECLIP ) );
+    g_DeviceSettings.d3d11.sd.Windowed = bWindowed;
 
-            // If windowed, get the appropriate adapter format from Direct3D
-            if( g_DeviceSettings.d3d9.pp.Windowed )
-            {
-                IDirect3D9* pD3D = DXUTGetD3D9Object();
-                if( pD3D == NULL )
-                    return DXTRACE_ERR( L"DXUTGetD3DObject", E_FAIL );
-
-                D3DDISPLAYMODE mode;
-                hr = pD3D->GetAdapterDisplayMode( g_DeviceSettings.d3d9.AdapterOrdinal, &mode );
-                if( FAILED( hr ) )
-                    return DXTRACE_ERR( L"GetAdapterDisplayMode", hr );
-
-                // Default resolution to the fullscreen res that was last used
-                RECT rc = DXUTGetFullsceenClientRectAtModeChange();
-                if( rc.right == 0 || rc.bottom == 0 )
-                {
-                    // If nothing last used, then default to the adapter desktop res
-                    g_DeviceSettings.d3d9.pp.BackBufferWidth = mode.Width;
-                    g_DeviceSettings.d3d9.pp.BackBufferHeight = mode.Height;
-                }
-                else
-                {
-                    g_DeviceSettings.d3d9.pp.BackBufferWidth = rc.right;
-                    g_DeviceSettings.d3d9.pp.BackBufferHeight = rc.bottom;
-                }
+    // Get available adapter output
+    auto pD3DEnum = DXUTGetD3D11Enumeration();
 
-                g_DeviceSettings.d3d9.AdapterFormat = mode.Format;
-                g_DeviceSettings.d3d9.pp.FullScreen_RefreshRateInHz = mode.RefreshRate;
-            }
-
-            const D3DFORMAT adapterFormat = g_DeviceSettings.d3d9.AdapterFormat;
-            const DWORD dwWidth = g_DeviceSettings.d3d9.pp.BackBufferWidth;
-            const DWORD dwHeight = g_DeviceSettings.d3d9.pp.BackBufferHeight;
-            const DWORD dwRefreshRate = g_DeviceSettings.d3d9.pp.FullScreen_RefreshRateInHz;
-
-            // DXUTSETTINGSDLG_DEVICECLIP
-            SetDeviceClip( bDeviceClip );
-
-            // DXUTSETTINGSDLG_ADAPTER_FORMAT
-            CDXUTComboBox* pAdapterFormatComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER_FORMAT );
-            if( pAdapterFormatComboBox == NULL )
-                return E_FAIL;
-            pAdapterFormatComboBox->RemoveAllItems();
-
-            CD3D9EnumDeviceInfo* pDeviceInfo = GetCurrentDeviceInfo();
-            if( pDeviceInfo == NULL )
-                return E_FAIL;
-
-            if( bWindowed )
-            {
-                AddAdapterFormat( adapterFormat );
-            }
-            else
-            {
-                for( int iSettingsCombo = 0; iSettingsCombo < pDeviceInfo->deviceSettingsComboList.GetSize();
-                     iSettingsCombo++ )
-                {
-                    CD3D9EnumDeviceSettingsCombo* pSettingsCombo = pDeviceInfo->deviceSettingsComboList.GetAt(
-                        iSettingsCombo );
-                    AddAdapterFormat( pSettingsCombo->AdapterFormat );
-                }
-            }
-
-            pAdapterFormatComboBox->SetSelectedByData( ULongToPtr( adapterFormat ) );
-
-            hr = OnAdapterFormatChanged();
-            if( FAILED( hr ) )
-                return hr;
-
-            // DXUTSETTINGSDLG_RESOLUTION
-            CDXUTComboBox* pResolutionComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_RESOLUTION );
-
-            if( bWindowed )
-            {
-                pResolutionComboBox->RemoveAllItems();
-                AddResolution( dwWidth, dwHeight );
-            }
-
-            pResolutionComboBox->SetSelectedByData( ULongToPtr( MAKELONG( dwWidth, dwHeight ) ) );
-
-            hr = OnResolutionChanged();
-            if( FAILED( hr ) )
-                return hr;
-
-            // DXUTSETTINGSDLG_REFRESH_RATE
-            CDXUTComboBox* pRefreshRateComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_REFRESH_RATE );
+    auto pOutputComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT );
+    pOutputComboBox->RemoveAllItems();
 
-            if( bWindowed )
-            {
-                pRefreshRateComboBox->RemoveAllItems();
-                AddRefreshRate( dwRefreshRate );
-            }
-
-            pRefreshRateComboBox->SetSelectedByData( ULongToPtr( dwRefreshRate ) );
-
-            hr = OnRefreshRateChanged();
-            if( FAILED( hr ) )
-                return hr;
-
-            break;
-        }
-
-        case DXUT_D3D11_DEVICE:
-        {
-            g_DeviceSettings.d3d11.sd.Windowed = bWindowed;
-
-            // Get available adapter output
-            CD3D11Enumeration* pD3DEnum = DXUTGetD3D11Enumeration();
-
-            CDXUTComboBox* pOutputComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT );
-            pOutputComboBox->RemoveAllItems();
+    auto pAdapterInfo = pD3DEnum->GetAdapterInfo( g_DeviceSettings.d3d11.AdapterOrdinal );
+    for( size_t ioutput = 0; ioutput < pAdapterInfo->outputInfoList.size(); ++ioutput )
+    {
+        auto pOutputInfo = pAdapterInfo->outputInfoList[ ioutput ];
+        AddD3D11AdapterOutput( pOutputInfo->Desc.DeviceName, pOutputInfo->Output );
+    }
 
-            CD3D11EnumAdapterInfo* pAdapterInfo = pD3DEnum->GetAdapterInfo( g_DeviceSettings.d3d11.AdapterOrdinal );
-            for( int ioutput = 0; ioutput < pAdapterInfo->outputInfoList.GetSize(); ++ioutput )
-            {
-                CD3D11EnumOutputInfo* pOutputInfo = pAdapterInfo->outputInfoList.GetAt( ioutput );
-                AddD3D11AdapterOutput( pOutputInfo->Desc.DeviceName, pOutputInfo->Output );
-            }
+    pOutputComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.Output ) );
 
-            pOutputComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.Output ) );
+    hr = OnAdapterOutputChanged();
+    if( FAILED( hr ) )
+        return hr;
 
-            hr = OnAdapterOutputChanged();
-            if( FAILED( hr ) )
-                return hr;
+    hr = UpdateD3D11Resolutions();
+    if (FAILED(hr))
+        return hr;
 
-            break;
-        }
-    }
+    hr = UpdateD3D11RefreshRates();
+    if ( FAILED(hr) )
+        return hr;
 
     return S_OK;
 }
@@ -1485,235 +919,68 @@ HRESULT CD3DSettingsDlg::OnAdapterOutputChanged()
 {
     HRESULT hr;
 
-    switch( g_DeviceSettings.ver )
-    {
-        case DXUT_D3D11_DEVICE:
-        {
-            bool bWindowed = IsWindowed();
-            g_DeviceSettings.d3d11.sd.Windowed = bWindowed;
-
-            // If windowed, get the appropriate adapter format from Direct3D
-            if( g_DeviceSettings.d3d11.sd.Windowed )
-            {
-                DXGI_MODE_DESC mode;
-                hr = DXUTGetD3D11AdapterDisplayMode( g_DeviceSettings.d3d11.AdapterOrdinal,
-                                                     g_DeviceSettings.d3d11.Output, &mode );
-                if( FAILED( hr ) )
-                    return DXTRACE_ERR( L"GetD3D11AdapterDisplayMode", hr );
-
-                // Default resolution to the fullscreen res that was last used
-                RECT rc = DXUTGetFullsceenClientRectAtModeChange();
-                if( rc.right == 0 || rc.bottom == 0 )
-                {
-                    // If nothing last used, then default to the adapter desktop res
-                    g_DeviceSettings.d3d11.sd.BufferDesc.Width = mode.Width;
-                    g_DeviceSettings.d3d11.sd.BufferDesc.Height = mode.Height;
-                }
-                else
-                {
-                    g_DeviceSettings.d3d11.sd.BufferDesc.Width = rc.right;
-                    g_DeviceSettings.d3d11.sd.BufferDesc.Height = rc.bottom;
-                }
-
-                g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate = mode.RefreshRate;
-            }
-
-            const DXGI_RATIONAL RefreshRate = g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate;
-
-            CD3D11EnumAdapterInfo* pAdapterInfo = GetCurrentD3D11AdapterInfo();
-            if( pAdapterInfo == NULL )
-                return E_FAIL;
-
-            // DXUTSETTINGSDLG_D3D11_RESOLUTION
-            hr = UpdateD3D11Resolutions();
-            if( FAILED( hr ) )
-                return hr;
-
-            // DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT
-            CDXUTComboBox* pBackBufferFormatComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT
-                                                                              );
-            pBackBufferFormatComboBox->RemoveAllItems();
-
-            for( int idc = 0; idc < pAdapterInfo->deviceSettingsComboList.GetSize(); idc++ )
-            {
-                CD3D11EnumDeviceSettingsCombo* pDeviceCombo = pAdapterInfo->deviceSettingsComboList.GetAt( idc );
-                if( ( pDeviceCombo->Windowed == TRUE ) == bWindowed )
-                {
-                    AddD3D11BackBufferFormat( pDeviceCombo->BackBufferFormat );
-                }
-            }
-
-            pBackBufferFormatComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.sd.BufferDesc.Format ) );
-
-            hr = OnBackBufferFormatChanged();
-            if( FAILED( hr ) )
-                return hr;
+    bool bWindowed = IsWindowed();
+    g_DeviceSettings.d3d11.sd.Windowed = bWindowed;
 
-            // DXUTSETTINGSDLG_D3D11_REFRESH_RATE
-            if( bWindowed )
-            {
-                CDXUTComboBox* pRefreshRateComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE );
-                for( UINT i = 0; i < pRefreshRateComboBox->GetNumItems(); ++i )
-                {
-                    DXGI_RATIONAL* pRefreshRate = reinterpret_cast<DXGI_RATIONAL*>(
-                        pRefreshRateComboBox->GetItemData( i ) );
-                    delete pRefreshRate;
-                }
-                pRefreshRateComboBox->RemoveAllItems();
-                AddD3D11RefreshRate( RefreshRate );
-            }
+    // If windowed, get the appropriate adapter format from Direct3D
+    if( g_DeviceSettings.d3d11.sd.Windowed )
+    {
+        DXGI_MODE_DESC mode;
+        hr = DXUTGetD3D11AdapterDisplayMode( g_DeviceSettings.d3d11.AdapterOrdinal,
+                                                g_DeviceSettings.d3d11.Output, &mode );
+        if( FAILED( hr ) )
+            return DXTRACE_ERR( L"GetD3D11AdapterDisplayMode", hr );
 
-            SetSelectedD3D11RefreshRate( RefreshRate );
-            break;
+        // Default resolution to the fullscreen res that was last used
+        RECT rc = DXUTGetFullsceenClientRectAtModeChange();
+        if( rc.right == 0 || rc.bottom == 0 )
+        {
+            // If nothing last used, then default to the adapter desktop res
+            g_DeviceSettings.d3d11.sd.BufferDesc.Width = mode.Width;
+            g_DeviceSettings.d3d11.sd.BufferDesc.Height = mode.Height;
         }
-    };
-
-    hr = OnRefreshRateChanged();
-    if( FAILED( hr ) )
-        return hr;
-
-    return S_OK;
-}
-
-
-//-------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnAdapterFormatChanged()
-{
-    HRESULT hr = S_OK;
-
-    switch( g_DeviceSettings.ver )
-    {
-        case DXUT_D3D9_DEVICE:
+        else
         {
-            // DXUTSETTINGSDLG_ADAPTER_FORMAT
-            D3DFORMAT adapterFormat = GetSelectedAdapterFormat();
-            g_DeviceSettings.d3d9.AdapterFormat = adapterFormat;
-
-            // DXUTSETTINGSDLG_RESOLUTION
-            CDXUTComboBox* pResolutionComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_RESOLUTION );
-            pResolutionComboBox->RemoveAllItems();
-
-            CD3D9EnumAdapterInfo* pAdapterInfo = GetCurrentAdapterInfo();
-            if( pAdapterInfo == NULL )
-                return E_FAIL;
-
-            bool bShowAll = m_Dialog.GetCheckBox( DXUTSETTINGSDLG_RESOLUTION_SHOW_ALL )->GetChecked();
-
-            // Get the desktop aspect ratio
-            D3DDISPLAYMODE dmDesktop;
-            DXUTGetDesktopResolution( g_DeviceSettings.d3d9.AdapterOrdinal, &dmDesktop.Width, &dmDesktop.Height );
-            float fDesktopAspectRatio = dmDesktop.Width / ( float )dmDesktop.Height;
-
-            for( int idm = 0; idm < pAdapterInfo->displayModeList.GetSize(); idm++ )
-            {
-                D3DDISPLAYMODE DisplayMode = pAdapterInfo->displayModeList.GetAt( idm );
-                float fAspect = ( float )DisplayMode.Width / ( float )DisplayMode.Height;
-
-                if( DisplayMode.Format == g_DeviceSettings.d3d9.AdapterFormat )
-                {
-                    // If "Show All" is not checked, then hide all resolutions
-                    // that don't match the aspect ratio of the desktop resolution
-                    if( bShowAll || ( !bShowAll && fabsf( fDesktopAspectRatio - fAspect ) < 0.05f ) )
-                    {
-                        AddResolution( DisplayMode.Width, DisplayMode.Height );
-                    }
-                }
-            }
-
-            const DWORD dwCurResolution = MAKELONG( g_DeviceSettings.d3d9.pp.BackBufferWidth,
-                                                    g_DeviceSettings.d3d9.pp.BackBufferHeight );
-
-            pResolutionComboBox->SetSelectedByData( ULongToPtr( dwCurResolution ) );
-
-            hr = OnResolutionChanged();
-            if( FAILED( hr ) )
-                return hr;
-
-            // DXUTSETTINGSDLG_BACK_BUFFER_FORMAT
-            CDXUTComboBox* pBackBufferFormatComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_BACK_BUFFER_FORMAT );
-            pBackBufferFormatComboBox->RemoveAllItems();
-
-            CD3D9EnumDeviceInfo* pDeviceInfo = GetCurrentDeviceInfo();
-            if( pDeviceInfo == NULL )
-                return E_FAIL;
-
-            const BOOL bWindowed = IsWindowed();
-            bool bHasWindowedBackBuffer = false;
-
-            for( int idc = 0; idc < pDeviceInfo->deviceSettingsComboList.GetSize(); idc++ )
-            {
-                CD3D9EnumDeviceSettingsCombo* pDeviceCombo = pDeviceInfo->deviceSettingsComboList.GetAt( idc );
-                if( pDeviceCombo->Windowed == bWindowed &&
-                    pDeviceCombo->AdapterFormat == g_DeviceSettings.d3d9.AdapterFormat )
-                {
-                    AddBackBufferFormat( pDeviceCombo->BackBufferFormat );
-                    bHasWindowedBackBuffer = true;
-                }
-            }
-
-            pBackBufferFormatComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d9.pp.BackBufferFormat ) );
-
-            hr = OnBackBufferFormatChanged();
-            if( FAILED( hr ) )
-                return hr;
-
-            if( !bHasWindowedBackBuffer )
-            {
-                m_Dialog.SetControlEnabled( DXUTSETTINGSDLG_WINDOWED, false );
-
-                if( g_DeviceSettings.d3d9.pp.Windowed )
-                {
-                    SetWindowed( false );
-
-                    hr = OnWindowedFullScreenChanged();
-                    if( FAILED( hr ) )
-                        return hr;
-                }
-            }
-
-            break;
+            g_DeviceSettings.d3d11.sd.BufferDesc.Width = rc.right;
+            g_DeviceSettings.d3d11.sd.BufferDesc.Height = rc.bottom;
         }
-    }
-
-    return S_OK;
-}
-
 
-//-------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnResolutionChanged()
-{
-    HRESULT hr = S_OK;
+        g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate.Numerator =
+        g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate.Denominator = 0;
+    }
 
-    CD3D9EnumAdapterInfo* pAdapterInfo = GetCurrentAdapterInfo();
-    if( pAdapterInfo == NULL )
+    auto pAdapterInfo = GetCurrentD3D11AdapterInfo();
+    if( !pAdapterInfo )
         return E_FAIL;
 
-    // Set resolution
-    DWORD dwWidth, dwHeight;
-    GetSelectedResolution( &dwWidth, &dwHeight );
-    g_DeviceSettings.d3d9.pp.BackBufferWidth = dwWidth;
-    g_DeviceSettings.d3d9.pp.BackBufferHeight = dwHeight;
+    // DXUTSETTINGSDLG_D3D11_RESOLUTION
+    hr = UpdateD3D11Resolutions();
+    if( FAILED( hr ) )
+        return hr;
 
-    DWORD dwRefreshRate = g_DeviceSettings.d3d9.pp.FullScreen_RefreshRateInHz;
+    // DXUTSETTINGSDLG_D3D11_REFRESH_RATE
+    hr = UpdateD3D11RefreshRates();
+    if ( FAILED(hr) )
+        return hr;
 
-    // Update the refresh rate list
-    CDXUTComboBox* pRefreshRateComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_REFRESH_RATE );
-    pRefreshRateComboBox->RemoveAllItems();
+    // DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT
+    auto pBackBufferFormatComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT );
+    pBackBufferFormatComboBox->RemoveAllItems();
 
-    D3DFORMAT adapterFormat = g_DeviceSettings.d3d9.AdapterFormat;
-    for( int idm = 0; idm < pAdapterInfo->displayModeList.GetSize(); idm++ )
+    for( size_t idc = 0; idc < pAdapterInfo->deviceSettingsComboList.size(); idc++ )
     {
-        D3DDISPLAYMODE displayMode = pAdapterInfo->displayModeList.GetAt( idm );
-
-        if( displayMode.Format == adapterFormat &&
-            displayMode.Width == dwWidth &&
-            displayMode.Height == dwHeight )
+        auto pDeviceCombo = pAdapterInfo->deviceSettingsComboList[ idc ];
+        if( ( pDeviceCombo->Windowed == TRUE ) == bWindowed )
         {
-            AddRefreshRate( displayMode.RefreshRate );
+            AddD3D11BackBufferFormat( pDeviceCombo->BackBufferFormat );
         }
     }
 
-    pRefreshRateComboBox->SetSelectedByData( ULongToPtr( dwRefreshRate ) );
+    pBackBufferFormatComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.sd.BufferDesc.Format ) );
+
+    hr = OnBackBufferFormatChanged();
+    if( FAILED( hr ) )
+        return hr;
 
     hr = OnRefreshRateChanged();
     if( FAILED( hr ) )
@@ -1723,21 +990,11 @@ HRESULT CD3DSettingsDlg::OnResolutionChanged()
 }
 
 
-
 //-------------------------------------------------------------------------------------
 HRESULT CD3DSettingsDlg::OnRefreshRateChanged()
 {
     // Set refresh rate
-    switch( g_DeviceSettings.ver )
-    {
-        case DXUT_D3D9_DEVICE:
-            g_DeviceSettings.d3d9.pp.FullScreen_RefreshRateInHz = GetSelectedRefreshRate();
-            break;
-
-        case DXUT_D3D11_DEVICE:
-            g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate = GetSelectedD3D11RefreshRate();
-            break;
-    }
+    g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate = GetSelectedD3D11RefreshRate();
 
     return S_OK;
 }
@@ -1748,310 +1005,50 @@ HRESULT CD3DSettingsDlg::OnBackBufferFormatChanged()
 {
     HRESULT hr = S_OK;
 
-    switch( g_DeviceSettings.ver )
-    {
-        case DXUT_D3D9_DEVICE:
-        {
-            g_DeviceSettings.d3d9.pp.BackBufferFormat = GetSelectedBackBufferFormat();
-
-            D3DFORMAT adapterFormat = g_DeviceSettings.d3d9.AdapterFormat;
-            D3DFORMAT backBufferFormat = g_DeviceSettings.d3d9.pp.BackBufferFormat;
-
-            CD3D9EnumDeviceInfo* pDeviceInfo = GetCurrentDeviceInfo();
-            if( pDeviceInfo == NULL )
-                return E_FAIL;
+    g_DeviceSettings.d3d11.sd.BufferDesc.Format = GetSelectedD3D11BackBufferFormat();
 
-            bool bAllowSoftwareVP, bAllowHardwareVP, bAllowPureHardwareVP, bAllowMixedVP;
-            DXUTGetD3D9Enumeration()->GetPossibleVertexProcessingList( &bAllowSoftwareVP, &bAllowHardwareVP,
-                                                                       &bAllowPureHardwareVP, &bAllowMixedVP );
-
-            for( int idc = 0; idc < pDeviceInfo->deviceSettingsComboList.GetSize(); idc++ )
-            {
-                CD3D9EnumDeviceSettingsCombo* pDeviceCombo = pDeviceInfo->deviceSettingsComboList.GetAt( idc );
-
-                if( pDeviceCombo->Windowed == ( g_DeviceSettings.d3d9.pp.Windowed == TRUE ) &&
-                    pDeviceCombo->AdapterFormat == adapterFormat &&
-                    pDeviceCombo->BackBufferFormat == backBufferFormat )
-                {
-                    CDXUTComboBox* pDepthStencilComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEPTH_STENCIL );
-                    pDepthStencilComboBox->RemoveAllItems();
-                    pDepthStencilComboBox->SetEnabled( ( g_DeviceSettings.d3d9.pp.EnableAutoDepthStencil == TRUE ) );
-
-                    if( g_DeviceSettings.d3d9.pp.EnableAutoDepthStencil )
-                    {
-                        for( int ifmt = 0; ifmt < pDeviceCombo->depthStencilFormatList.GetSize(); ifmt++ )
-                        {
-                            D3DFORMAT fmt = pDeviceCombo->depthStencilFormatList.GetAt( ifmt );
-
-                            AddDepthStencilBufferFormat( fmt );
-                        }
-
-                        pDepthStencilComboBox->SetSelectedByData( ULongToPtr(
-                                                                  g_DeviceSettings.d3d9.pp.AutoDepthStencilFormat ) );
-                    }
-                    else
-                    {
-                        if( !pDepthStencilComboBox->ContainsItem( L"(not used)" ) )
-                            pDepthStencilComboBox->AddItem( L"(not used)", NULL );
-                    }
-
-                    hr = OnDepthStencilBufferFormatChanged();
-                    if( FAILED( hr ) )
-                        return hr;
-
-                    CDXUTComboBox* pVertexProcessingComboBox =
-                        m_Dialog.GetComboBox( DXUTSETTINGSDLG_VERTEX_PROCESSING );
-                    pVertexProcessingComboBox->RemoveAllItems();
-
-                    // Add valid vertex processing types
-                    if( bAllowSoftwareVP )
-                        AddVertexProcessingType( D3DCREATE_SOFTWARE_VERTEXPROCESSING );
-
-                    if( bAllowHardwareVP && pDeviceInfo->Caps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT )
-                        AddVertexProcessingType( D3DCREATE_HARDWARE_VERTEXPROCESSING );
-
-                    if( bAllowPureHardwareVP && pDeviceInfo->Caps.DevCaps & D3DDEVCAPS_PUREDEVICE )
-                        AddVertexProcessingType( D3DCREATE_PUREDEVICE );
-
-                    if( bAllowMixedVP && pDeviceInfo->Caps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT )
-                        AddVertexProcessingType( D3DCREATE_MIXED_VERTEXPROCESSING );
-
-                    if( g_DeviceSettings.d3d9.BehaviorFlags & D3DCREATE_PUREDEVICE )
-                        pVertexProcessingComboBox->SetSelectedByData( ULongToPtr( D3DCREATE_PUREDEVICE ) );
-                    else if( g_DeviceSettings.d3d9.BehaviorFlags & D3DCREATE_SOFTWARE_VERTEXPROCESSING )
-                        pVertexProcessingComboBox->SetSelectedByData( ULongToPtr(
-                                                                      D3DCREATE_SOFTWARE_VERTEXPROCESSING ) );
-                    else if( g_DeviceSettings.d3d9.BehaviorFlags & D3DCREATE_HARDWARE_VERTEXPROCESSING )
-                        pVertexProcessingComboBox->SetSelectedByData( ULongToPtr(
-                                                                      D3DCREATE_HARDWARE_VERTEXPROCESSING ) );
-                    else if( g_DeviceSettings.d3d9.BehaviorFlags & D3DCREATE_MIXED_VERTEXPROCESSING )
-                        pVertexProcessingComboBox->SetSelectedByData( ULongToPtr( D3DCREATE_MIXED_VERTEXPROCESSING ) );
-
-                    hr = OnVertexProcessingChanged();
-                    if( FAILED( hr ) )
-                        return hr;
-
-                    CDXUTComboBox* pPresentIntervalComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_PRESENT_INTERVAL );
-                    pPresentIntervalComboBox->RemoveAllItems();
-                    pPresentIntervalComboBox->AddItem( L"On", ULongToPtr( D3DPRESENT_INTERVAL_DEFAULT ) );
-                    pPresentIntervalComboBox->AddItem( L"Off", ULongToPtr( D3DPRESENT_INTERVAL_IMMEDIATE ) );
-
-                    pPresentIntervalComboBox->SetSelectedByData( ULongToPtr(
-                                                                 g_DeviceSettings.d3d9.pp.PresentationInterval ) );
-
-                    hr = OnPresentIntervalChanged();
-                    if( FAILED( hr ) )
-                        return hr;
-                }
-            }
-
-            break;
-        }
-
-        case DXUT_D3D11_DEVICE:
-        {
-            g_DeviceSettings.d3d11.sd.BufferDesc.Format = GetSelectedD3D11BackBufferFormat();
+    DXGI_FORMAT backBufferFormat = g_DeviceSettings.d3d11.sd.BufferDesc.Format;
 
-            DXGI_FORMAT backBufferFormat = g_DeviceSettings.d3d11.sd.BufferDesc.Format;
-
-            CD3D11EnumAdapterInfo* pAdapterInfo = GetCurrentD3D11AdapterInfo();
-            if( pAdapterInfo == NULL )
-                return E_FAIL;
-
-            for( int idc = 0; idc < pAdapterInfo->deviceSettingsComboList.GetSize(); idc++ )
-            {
-                CD3D11EnumDeviceSettingsCombo* pDeviceCombo = pAdapterInfo->deviceSettingsComboList.GetAt( idc );
-
-                if( pDeviceCombo->Windowed == ( g_DeviceSettings.d3d11.sd.Windowed == TRUE ) &&
-                    pDeviceCombo->BackBufferFormat == backBufferFormat &&
-                    pDeviceCombo->DeviceType == g_DeviceSettings.d3d11.DriverType )
-                {
-                    CDXUTComboBox* pMultisampleCountCombo = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT
-                                                                                   );
-                    pMultisampleCountCombo->RemoveAllItems();
-                    for( int i = 0; i < pDeviceCombo->multiSampleCountList.GetSize(); ++i )
-                        AddD3D11MultisampleCount( pDeviceCombo->multiSampleCountList.GetAt( i ) );
-                    pMultisampleCountCombo->SetSelectedByData( ULongToPtr(
-                                                               g_DeviceSettings.d3d11.sd.SampleDesc.Count ) );
-
-                    hr = OnMultisampleTypeChanged();
-                    if( FAILED( hr ) )
-                        return hr;
-
-                    CDXUTComboBox* pPresentIntervalComboBox =
-                        m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL );
-                    pPresentIntervalComboBox->RemoveAllItems();
-                    pPresentIntervalComboBox->AddItem( L"On", ULongToPtr( 1 ) );
-                    pPresentIntervalComboBox->AddItem( L"Off", ULongToPtr( 0 ) );
-
-                    pPresentIntervalComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.SyncInterval ) );
-
-                    hr = OnPresentIntervalChanged();
-                    if( FAILED( hr ) )
-                        return hr;
-
-                    hr = UpdateD3D11Resolutions();
-                    if( FAILED( hr ) )
-                        return hr;
-                }
-            }
-
-            break;
-        }
-    }
-
-    return S_OK;
-}
-
-
-//-------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnDepthStencilBufferFormatChanged()
-{
-    HRESULT hr = S_OK;
-
-    D3DFORMAT depthStencilBufferFormat = GetSelectedDepthStencilBufferFormat();
-
-    if( g_DeviceSettings.d3d9.pp.EnableAutoDepthStencil )
-        g_DeviceSettings.d3d9.pp.AutoDepthStencilFormat = depthStencilBufferFormat;
-
-    CD3D9EnumDeviceSettingsCombo* pDeviceSettingsCombo = GetCurrentDeviceSettingsCombo();
-    if( pDeviceSettingsCombo == NULL )
+    auto pAdapterInfo = GetCurrentD3D11AdapterInfo();
+    if( !pAdapterInfo )
         return E_FAIL;
 
-    CDXUTComboBox* pMultisampleTypeCombo = m_Dialog.GetComboBox( DXUTSETTINGSDLG_MULTISAMPLE_TYPE );
-    pMultisampleTypeCombo->RemoveAllItems();
-
-    for( int ims = 0; ims < pDeviceSettingsCombo->multiSampleTypeList.GetSize(); ims++ )
+    for( size_t idc = 0; idc < pAdapterInfo->deviceSettingsComboList.size(); idc++ )
     {
-        D3DMULTISAMPLE_TYPE msType = pDeviceSettingsCombo->multiSampleTypeList.GetAt( ims );
-
-        bool bConflictFound = false;
-        for( int iConf = 0; iConf < pDeviceSettingsCombo->DSMSConflictList.GetSize(); iConf++ )
-        {
-            CD3D9EnumDSMSConflict DSMSConf = pDeviceSettingsCombo->DSMSConflictList.GetAt( iConf );
-            if( DSMSConf.DSFormat == depthStencilBufferFormat &&
-                DSMSConf.MSType == msType )
-            {
-                bConflictFound = true;
-                break;
-            }
-        }
-
-        if( !bConflictFound )
-            AddMultisampleType( msType );
-    }
-
-    CDXUTComboBox* pMultisampleQualityCombo = m_Dialog.GetComboBox( DXUTSETTINGSDLG_MULTISAMPLE_TYPE );
-    pMultisampleQualityCombo->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d9.pp.MultiSampleType ) );
-
-    hr = OnMultisampleTypeChanged();
-    if( FAILED( hr ) )
-        return hr;
-
-    return S_OK;
-}
+        auto pDeviceCombo = pAdapterInfo->deviceSettingsComboList[ idc ];
 
-
-//-------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnMultisampleTypeChanged()
-{
-    HRESULT hr = S_OK;
-
-    switch( g_DeviceSettings.ver )
-    {
-        case DXUT_D3D9_DEVICE:
+        if( pDeviceCombo->Windowed == ( g_DeviceSettings.d3d11.sd.Windowed == TRUE ) &&
+            pDeviceCombo->BackBufferFormat == backBufferFormat &&
+            pDeviceCombo->DeviceType == g_DeviceSettings.d3d11.DriverType )
         {
-            D3DMULTISAMPLE_TYPE multisampleType = GetSelectedMultisampleType();
-            g_DeviceSettings.d3d9.pp.MultiSampleType = multisampleType;
-
-            CD3D9EnumDeviceSettingsCombo* pDeviceSettingsCombo = GetCurrentDeviceSettingsCombo();
-            if( pDeviceSettingsCombo == NULL )
-                return E_FAIL;
-
-            DWORD dwMaxQuality = 0;
-            for( int iType = 0; iType < pDeviceSettingsCombo->multiSampleTypeList.GetSize(); iType++ )
-            {
-                D3DMULTISAMPLE_TYPE msType = pDeviceSettingsCombo->multiSampleTypeList.GetAt( iType );
-                if( msType == multisampleType )
-                {
-                    dwMaxQuality = pDeviceSettingsCombo->multiSampleQualityList.GetAt( iType );
-                    break;
-                }
-            }
+            auto pMultisampleCountCombo = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT );
+            pMultisampleCountCombo->RemoveAllItems();
 
-            // DXUTSETTINGSDLG_MULTISAMPLE_QUALITY
-            CDXUTComboBox* pMultisampleQualityCombo = m_Dialog.GetComboBox( DXUTSETTINGSDLG_MULTISAMPLE_QUALITY );
-            pMultisampleQualityCombo->RemoveAllItems();
+            for( auto it = pDeviceCombo->multiSampleCountList.cbegin(); it != pDeviceCombo->multiSampleCountList.cend(); ++it )
+                AddD3D11MultisampleCount( *it );
+            pMultisampleCountCombo->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.sd.SampleDesc.Count ) );
 
-            for( UINT iQuality = 0; iQuality < dwMaxQuality; iQuality++ )
-            {
-                AddMultisampleQuality( iQuality );
-            }
-
-            pMultisampleQualityCombo->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d9.pp.MultiSampleQuality ) );
-
-            hr = OnMultisampleQualityChanged();
+            hr = OnMultisampleTypeChanged();
             if( FAILED( hr ) )
                 return hr;
 
-            break;
-        }
-        case DXUT_D3D11_DEVICE:
-        {
-            UINT multisampleCount = GetSelectedD3D11MultisampleCount();
-            g_DeviceSettings.d3d11.sd.SampleDesc.Count = multisampleCount;
-
-            CD3D11EnumDeviceSettingsCombo* pDeviceSettingsCombo = GetCurrentD3D11DeviceSettingsCombo();
-            if( pDeviceSettingsCombo == NULL )
-                return E_FAIL;
-
-            UINT MaxQuality = 0;
-            for( int iCount = 0; iCount < pDeviceSettingsCombo->multiSampleCountList.GetSize(); iCount++ )
-            {
-                UINT Count = pDeviceSettingsCombo->multiSampleCountList.GetAt( iCount );
-                if( Count == multisampleCount )
-                {
-                    MaxQuality = pDeviceSettingsCombo->multiSampleQualityList.GetAt( iCount );
-                    break;
-                }
-            }
-
-            // DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY
-            CDXUTComboBox* pMultisampleQualityCombo = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY
-                                                                             );
-            pMultisampleQualityCombo->RemoveAllItems();
-
-            for( UINT iQuality = 0; iQuality < MaxQuality; iQuality++ )
-            {
-                AddD3D11MultisampleQuality( iQuality );
-            }
+            auto pPresentIntervalComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL );
+            pPresentIntervalComboBox->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.SyncInterval ) );
 
-            pMultisampleQualityCombo->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.sd.SampleDesc.Quality ) );
-
-            hr = OnMultisampleQualityChanged();
+            hr = OnPresentIntervalChanged();
             if( FAILED( hr ) )
                 return hr;
 
-            break;
-        }
-    }
-
-    return S_OK;
-}
-
+            hr = UpdateD3D11Resolutions();
+            if( FAILED( hr ) )
+                return hr;
 
-//-------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnMultisampleQualityChanged()
-{
-    switch( g_DeviceSettings.ver )
-    {
-        case DXUT_D3D9_DEVICE:
-            g_DeviceSettings.d3d9.pp.MultiSampleQuality = GetSelectedMultisampleQuality();
-            break;
+            hr = UpdateD3D11RefreshRates();
+            if ( FAILED(hr) )
+                return hr;
 
-        case DXUT_D3D11_DEVICE:
-            g_DeviceSettings.d3d11.sd.SampleDesc.Quality = GetSelectedD3D11MultisampleQuality();
             break;
+        }
     }
 
     return S_OK;
@@ -2059,170 +1056,130 @@ HRESULT CD3DSettingsDlg::OnMultisampleQualityChanged()
 
 
 //-------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnVertexProcessingChanged()
+HRESULT CD3DSettingsDlg::OnMultisampleTypeChanged()
 {
-    DWORD dwBehavior = g_DeviceSettings.d3d9.BehaviorFlags;
-
-    // Clear vertex processing flags
-    dwBehavior &= ~D3DCREATE_HARDWARE_VERTEXPROCESSING;
-    dwBehavior &= ~D3DCREATE_SOFTWARE_VERTEXPROCESSING;
-    dwBehavior &= ~D3DCREATE_MIXED_VERTEXPROCESSING;
-    dwBehavior &= ~D3DCREATE_PUREDEVICE;
-
-    // Determine new flags
-    DWORD dwNewFlags = GetSelectedVertexProcessingType();
-    if( dwNewFlags & D3DCREATE_PUREDEVICE )
-        dwNewFlags |= D3DCREATE_HARDWARE_VERTEXPROCESSING;
-
-    // Make changes
-    g_DeviceSettings.d3d9.BehaviorFlags = dwBehavior | dwNewFlags;
+    HRESULT hr = S_OK;
 
-    return S_OK;
-}
+    UINT multisampleCount = GetSelectedD3D11MultisampleCount();
+    g_DeviceSettings.d3d11.sd.SampleDesc.Count = multisampleCount;
 
+    auto pDeviceSettingsCombo = GetCurrentD3D11DeviceSettingsCombo();
+    if( !pDeviceSettingsCombo )
+        return E_FAIL;
 
-//-------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnPresentIntervalChanged()
-{
-    switch( g_DeviceSettings.ver )
+    UINT MaxQuality = 0;
+    for( size_t iCount = 0; iCount < pDeviceSettingsCombo->multiSampleCountList.size(); iCount++ )
     {
-        case DXUT_D3D9_DEVICE:
-            g_DeviceSettings.d3d9.pp.PresentationInterval = GetSelectedPresentInterval();
-            break;
-
-        case DXUT_D3D11_DEVICE:
-            g_DeviceSettings.d3d11.SyncInterval = GetSelectedD3D11PresentInterval();
+        UINT Count = pDeviceSettingsCombo->multiSampleCountList[ iCount ];
+        if( Count == multisampleCount )
+        {
+            MaxQuality = pDeviceSettingsCombo->multiSampleQualityList[ iCount ];
             break;
+        }
     }
 
-    return S_OK;
-}
-
-
-//-------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnDebugDeviceChanged()
-{
-    bool bDebugDevice = GetSelectedDebugDeviceValue();
-
-    if( bDebugDevice )
-        g_DeviceSettings.d3d11.CreateFlags |= D3D11_CREATE_DEVICE_DEBUG;
-    else
-        g_DeviceSettings.d3d11.CreateFlags &= ~D3D11_CREATE_DEVICE_DEBUG;
-
-    return S_OK;
-}
-
-//-------------------------------------------------------------------------------------
-HRESULT CD3DSettingsDlg::OnDeviceClipChanged()
-{
-    if( IsDeviceClip() )
-        g_DeviceSettings.d3d9.pp.Flags |= D3DPRESENTFLAG_DEVICECLIP;
-    else
-        g_DeviceSettings.d3d9.pp.Flags &= ~D3DPRESENTFLAG_DEVICECLIP;
+    // DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY
+    auto pMultisampleQualityCombo = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY );
+    pMultisampleQualityCombo->RemoveAllItems();
 
-    return S_OK;
-}
+    for( UINT iQuality = 0; iQuality < MaxQuality; iQuality++ )
+    {
+        AddD3D11MultisampleQuality( iQuality );
+    }
 
+    pMultisampleQualityCombo->SetSelectedByData( ULongToPtr( g_DeviceSettings.d3d11.sd.SampleDesc.Quality ) );
 
-//-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddAPIVersion( DXUTDeviceVersion version )
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_API_VERSION );
+    hr = OnMultisampleQualityChanged();
+    if( FAILED( hr ) )
+        return hr;
 
-    if( !pComboBox->ContainsItem( DXUTAPIVersionToString( version ) ) )
-        pComboBox->AddItem( DXUTAPIVersionToString( version ), ULongToPtr( version ) );
+    return S_OK;
 }
 
 
 //-------------------------------------------------------------------------------------
-DXUTDeviceVersion CD3DSettingsDlg::GetSelectedAPIVersion()
+HRESULT CD3DSettingsDlg::OnMultisampleQualityChanged()
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_API_VERSION );
+            g_DeviceSettings.d3d11.sd.SampleDesc.Quality = GetSelectedD3D11MultisampleQuality();
 
-    return ( DXUTDeviceVersion )PtrToUlong( pComboBox->GetSelectedData() );
+    return S_OK;
 }
 
 
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddAdapter( const WCHAR* strDescription, UINT iAdapter )
+HRESULT CD3DSettingsDlg::OnPresentIntervalChanged()
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER );
+            g_DeviceSettings.d3d11.SyncInterval = GetSelectedD3D11PresentInterval();
 
-    if( !pComboBox->ContainsItem( strDescription ) )
-        pComboBox->AddItem( strDescription, ULongToPtr( iAdapter ) );
+    return S_OK;
 }
 
 
 //-------------------------------------------------------------------------------------
-UINT CD3DSettingsDlg::GetSelectedAdapter()
+HRESULT CD3DSettingsDlg::OnDebugDeviceChanged()
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER );
+    bool bDebugDevice = GetSelectedDebugDeviceValue();
 
-    return PtrToUlong( pComboBox->GetSelectedData() );
+    if( bDebugDevice )
+        g_DeviceSettings.d3d11.CreateFlags |= D3D11_CREATE_DEVICE_DEBUG;
+    else
+        g_DeviceSettings.d3d11.CreateFlags &= ~D3D11_CREATE_DEVICE_DEBUG;
+
+    return S_OK;
 }
 
 
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddDeviceType( D3DDEVTYPE devType )
+void CD3DSettingsDlg::AddAdapter( _In_z_ const WCHAR* strDescription, _In_ UINT iAdapter )
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEVICE_TYPE );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER );
 
-    if( !pComboBox->ContainsItem( DXUTD3DDeviceTypeToString( devType ) ) )
-        pComboBox->AddItem( DXUTD3DDeviceTypeToString( devType ), ULongToPtr( devType ) );
+    if( !pComboBox->ContainsItem( strDescription ) )
+        pComboBox->AddItem( strDescription, ULongToPtr( iAdapter ) );
 }
 
 
 //-------------------------------------------------------------------------------------
-D3DDEVTYPE CD3DSettingsDlg::GetSelectedDeviceType()
+UINT CD3DSettingsDlg::GetSelectedAdapter() const
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEVICE_TYPE );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER );
 
-    return ( D3DDEVTYPE )PtrToUlong( pComboBox->GetSelectedData() );
+    return PtrToUlong( pComboBox->GetSelectedData() );
 }
 
 
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::SetWindowed( bool bWindowed )
+void CD3DSettingsDlg::SetWindowed( _In_ bool bWindowed )
 {
-    CDXUTRadioButton* pRadioButton = m_Dialog.GetRadioButton( DXUTSETTINGSDLG_WINDOWED );
+    auto pRadioButton = m_Dialog.GetRadioButton( DXUTSETTINGSDLG_WINDOWED );
     pRadioButton->SetChecked( bWindowed );
 
     pRadioButton = m_Dialog.GetRadioButton( DXUTSETTINGSDLG_FULLSCREEN );
     pRadioButton->SetChecked( !bWindowed );
-}
-
-
-//-------------------------------------------------------------------------------------
-bool CD3DSettingsDlg::IsWindowed()
-{
-    CDXUTRadioButton* pRadioButton = m_Dialog.GetRadioButton( DXUTSETTINGSDLG_WINDOWED );
-    return pRadioButton->GetChecked();
-}
 
+    m_Dialog.SetControlEnabled(DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT_LABEL, !bWindowed);
+    m_Dialog.SetControlEnabled(DXUTSETTINGSDLG_D3D11_RESOLUTION_LABEL, !bWindowed);
+    m_Dialog.SetControlEnabled(DXUTSETTINGSDLG_D3D11_REFRESH_RATE_LABEL, !bWindowed);
 
-//-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddAdapterFormat( D3DFORMAT format )
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER_FORMAT );
-
-    if( !pComboBox->ContainsItem( DXUTD3DFormatToString( format, TRUE ) ) )
-        pComboBox->AddItem( DXUTD3DFormatToString( format, TRUE ), ULongToPtr( format ) );
+    m_Dialog.SetControlEnabled(DXUTSETTINGSDLG_RESOLUTION_SHOW_ALL, !bWindowed);
+    m_Dialog.SetControlEnabled(DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT, !bWindowed);
+    m_Dialog.SetControlEnabled(DXUTSETTINGSDLG_D3D11_RESOLUTION, !bWindowed);
+    m_Dialog.SetControlEnabled(DXUTSETTINGSDLG_D3D11_REFRESH_RATE, !bWindowed);
 }
 
 
 //-------------------------------------------------------------------------------------
-D3DFORMAT CD3DSettingsDlg::GetSelectedAdapterFormat()
+bool CD3DSettingsDlg::IsWindowed() const
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_ADAPTER_FORMAT );
-
-    return ( D3DFORMAT )PtrToUlong( pComboBox->GetSelectedData() );
+    auto pRadioButton = m_Dialog.GetRadioButton( DXUTSETTINGSDLG_WINDOWED );
+    return pRadioButton->GetChecked();
 }
 
 
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddD3D11AdapterOutput( const WCHAR* strName, UINT Output )
+void CD3DSettingsDlg::AddD3D11AdapterOutput( _In_z_ const WCHAR* strName, _In_ UINT Output )
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT );
 
     if( !pComboBox->ContainsItem( strName ) )
         pComboBox->AddItem( strName, ULongToPtr( Output ) );
@@ -2230,23 +1187,24 @@ void CD3DSettingsDlg::AddD3D11AdapterOutput( const WCHAR* strName, UINT Output )
 
 
 //-------------------------------------------------------------------------------------
-UINT CD3DSettingsDlg::GetSelectedD3D11AdapterOutput()
+UINT CD3DSettingsDlg::GetSelectedD3D11AdapterOutput() const
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT );
 
     return PtrToUlong( pComboBox->GetSelectedData() );
 }
 
 
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddResolution( DWORD dwWidth, DWORD dwHeight )
+_Use_decl_annotations_
+void CD3DSettingsDlg::AddD3D11Resolution( DWORD dwWidth, DWORD dwHeight )
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_RESOLUTION );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_RESOLUTION );
 
     DWORD dwResolutionData;
     WCHAR strResolution[50];
     dwResolutionData = MAKELONG( dwWidth, dwHeight );
-    swprintf_s( strResolution, 50, L"%d by %d", dwWidth, dwHeight );
+    swprintf_s( strResolution, 50, L"%u by %u", dwWidth, dwHeight );
 
     if( !pComboBox->ContainsItem( strResolution ) )
         pComboBox->AddItem( strResolution, ULongToPtr( dwResolutionData ) );
@@ -2254,9 +1212,10 @@ void CD3DSettingsDlg::AddResolution( DWORD dwWidth, DWORD dwHeight )
 
 
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::GetSelectedResolution( DWORD* pdwWidth, DWORD* pdwHeight )
+_Use_decl_annotations_
+void CD3DSettingsDlg::GetSelectedD3D11Resolution( DWORD* pdwWidth, DWORD* pdwHeight ) const
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_RESOLUTION );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_RESOLUTION );
 
     DWORD dwResolution = PtrToUlong( pComboBox->GetSelectedData() );
 
@@ -2266,33 +1225,9 @@ void CD3DSettingsDlg::GetSelectedResolution( DWORD* pdwWidth, DWORD* pdwHeight )
 
 
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddD3D11Resolution( DWORD dwWidth, DWORD dwHeight )
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_RESOLUTION );
-
-    DWORD dwResolutionData;
-    WCHAR strResolution[50];
-    dwResolutionData = MAKELONG( dwWidth, dwHeight );
-    swprintf_s( strResolution, 50, L"%d by %d", dwWidth, dwHeight );
-
-    if( !pComboBox->ContainsItem( strResolution ) )
-        pComboBox->AddItem( strResolution, ULongToPtr( dwResolutionData ) );
-}
-
-
-//-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::GetSelectedD3D11Resolution( DWORD* pdwWidth, DWORD* pdwHeight )
+void CD3DSettingsDlg::AddD3D11FeatureLevel( _In_ D3D_FEATURE_LEVEL fl)
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_RESOLUTION );
-
-    DWORD dwResolution = PtrToUlong( pComboBox->GetSelectedData() );
-
-    *pdwWidth = LOWORD( dwResolution );
-    *pdwHeight = HIWORD( dwResolution );
-}
-
-void CD3DSettingsDlg::AddD3D11FeatureLevel(D3D_FEATURE_LEVEL fl) {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL );
     switch( fl )
     {
     case D3D_FEATURE_LEVEL_9_1: 
@@ -2331,56 +1266,53 @@ void CD3DSettingsDlg::AddD3D11FeatureLevel(D3D_FEATURE_LEVEL fl) {
                 pComboBox->AddItem( L"D3D_FEATURE_LEVEL_11_0", ULongToPtr( D3D_FEATURE_LEVEL_11_0 ) ); 
         }
         break;
+    case D3D_FEATURE_LEVEL_11_1: 
+        {
+            if( !pComboBox->ContainsItem( L"D3D_FEATURE_LEVEL_11_1" ) )
+                pComboBox->AddItem( L"D3D_FEATURE_LEVEL_11_1", ULongToPtr( D3D_FEATURE_LEVEL_11_1 ) ); 
+        }
+        break;
+#if defined(USE_DIRECT3D11_3) || defined(USE_DIRECT3D11_4) 
+        case D3D_FEATURE_LEVEL_12_0:
+        {
+            if (!pComboBox->ContainsItem(L"D3D_FEATURE_LEVEL_12_0"))
+                pComboBox->AddItem(L"D3D_FEATURE_LEVEL_12_0", ULongToPtr(D3D_FEATURE_LEVEL_12_0));
+        }
+        break;
+        case D3D_FEATURE_LEVEL_12_1:
+        {
+            if (!pComboBox->ContainsItem(L"D3D_FEATURE_LEVEL_12_1"))
+                pComboBox->AddItem(L"D3D_FEATURE_LEVEL_12_1", ULongToPtr(D3D_FEATURE_LEVEL_12_1));
+        }
+        break;
+#endif
     }
 
 }
 
-D3D_FEATURE_LEVEL CD3DSettingsDlg::GetSelectedFeatureLevel() {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL );
-
-    return (D3D_FEATURE_LEVEL)PtrToUlong( pComboBox->GetSelectedData() );
-}
-//-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddRefreshRate( DWORD dwRate )
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_REFRESH_RATE );
-
-    WCHAR strRefreshRate[50];
-
-    if( dwRate == 0 )
-        wcscpy_s( strRefreshRate, 50, L"Default Rate" );
-    else
-        swprintf_s( strRefreshRate, 50, L"%d Hz", dwRate );
-
-    if( !pComboBox->ContainsItem( strRefreshRate ) )
-        pComboBox->AddItem( strRefreshRate, ULongToPtr( dwRate ) );
-}
-
-
-//-------------------------------------------------------------------------------------
-DWORD CD3DSettingsDlg::GetSelectedRefreshRate()
+D3D_FEATURE_LEVEL CD3DSettingsDlg::GetSelectedFeatureLevel() const
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_REFRESH_RATE );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_FEATURE_LEVEL );
 
-    return PtrToUlong( pComboBox->GetSelectedData() );
+    return (D3D_FEATURE_LEVEL)PtrToUlong( pComboBox->GetSelectedData() );
 }
 
 
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddD3D11RefreshRate( DXGI_RATIONAL RefreshRate )
+void CD3DSettingsDlg::AddD3D11RefreshRate( _In_ DXGI_RATIONAL RefreshRate )
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE );
 
     WCHAR strRefreshRate[50];
 
     if( RefreshRate.Numerator == 0 && RefreshRate.Denominator == 0 )
         wcscpy_s( strRefreshRate, 50, L"Default Rate" );
     else
-        swprintf_s( strRefreshRate, 50, L"%d Hz", RefreshRate.Numerator / RefreshRate.Denominator );
+        swprintf_s( strRefreshRate, 50, L"%u Hz", RefreshRate.Numerator / RefreshRate.Denominator );
 
     if( !pComboBox->ContainsItem( strRefreshRate ) )
     {
-        DXGI_RATIONAL* pNewRate = new DXGI_RATIONAL;
+        auto pNewRate = new (std::nothrow) DXGI_RATIONAL;
         if( pNewRate )
         {
             *pNewRate = RefreshRate;
@@ -2391,42 +1323,23 @@ void CD3DSettingsDlg::AddD3D11RefreshRate( DXGI_RATIONAL RefreshRate )
 
 
 //-------------------------------------------------------------------------------------
-DXGI_RATIONAL CD3DSettingsDlg::GetSelectedD3D11RefreshRate()
+DXGI_RATIONAL CD3DSettingsDlg::GetSelectedD3D11RefreshRate() const
 {
-    DXGI_RATIONAL dxgiR;
-    dxgiR.Numerator = 0;
-    dxgiR.Denominator = 1;
-    
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE );
-
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE );
     return *reinterpret_cast<DXGI_RATIONAL*>( pComboBox->GetSelectedData() );
-     
-}
-
-
-//-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddBackBufferFormat( D3DFORMAT format )
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_BACK_BUFFER_FORMAT );
-
-    if( !pComboBox->ContainsItem( DXUTD3DFormatToString( format, TRUE ) ) )
-        pComboBox->AddItem( DXUTD3DFormatToString( format, TRUE ), ULongToPtr( format ) );
 }
 
 
 //-------------------------------------------------------------------------------------
-D3DFORMAT CD3DSettingsDlg::GetSelectedBackBufferFormat()
+void CD3DSettingsDlg::AddD3D11BackBufferFormat( _In_ DXGI_FORMAT format )
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_BACK_BUFFER_FORMAT );
-
-    return ( D3DFORMAT )PtrToUlong( pComboBox->GetSelectedData() );
-}
-
+    if ( g_DeviceSettings.d3d11.DeviceFeatureLevel < D3D_FEATURE_LEVEL_10_0 )
+    {
+        if ( (format == DXGI_FORMAT_R16G16B16A16_FLOAT) || (format == DXGI_FORMAT_R10G10B10A2_UNORM) )
+            return;
+    }
 
-//-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddD3D11BackBufferFormat( DXGI_FORMAT format )
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT );
 
     if( !pComboBox->ContainsItem( DXUTDXGIFormatToString( format, TRUE ) ) )
         pComboBox->AddItem( DXUTDXGIFormatToString( format, TRUE ), ULongToPtr( format ) );
@@ -2434,78 +1347,18 @@ void CD3DSettingsDlg::AddD3D11BackBufferFormat( DXGI_FORMAT format )
 
 
 //-------------------------------------------------------------------------------------
-DXGI_FORMAT CD3DSettingsDlg::GetSelectedD3D11BackBufferFormat()
+DXGI_FORMAT CD3DSettingsDlg::GetSelectedD3D11BackBufferFormat() const
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_BACK_BUFFER_FORMAT );
 
     return ( DXGI_FORMAT )PtrToUlong( pComboBox->GetSelectedData() );
 }
 
 
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddDepthStencilBufferFormat( D3DFORMAT format )
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEPTH_STENCIL );
-
-    if( !pComboBox->ContainsItem( DXUTD3DFormatToString( format, TRUE ) ) )
-        pComboBox->AddItem( DXUTD3DFormatToString( format, TRUE ), ULongToPtr( format ) );
-}
-
-
-//-------------------------------------------------------------------------------------
-D3DFORMAT CD3DSettingsDlg::GetSelectedDepthStencilBufferFormat()
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEPTH_STENCIL );
-
-    return ( D3DFORMAT )PtrToUlong( pComboBox->GetSelectedData() );
-}
-
-
-//-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddMultisampleType( D3DMULTISAMPLE_TYPE type )
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_MULTISAMPLE_TYPE );
-
-    if( !pComboBox->ContainsItem( DXUTMultisampleTypeToString( type ) ) )
-        pComboBox->AddItem( DXUTMultisampleTypeToString( type ), ULongToPtr( type ) );
-}
-
-
-//-------------------------------------------------------------------------------------
-D3DMULTISAMPLE_TYPE CD3DSettingsDlg::GetSelectedMultisampleType()
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_MULTISAMPLE_TYPE );
-
-    return ( D3DMULTISAMPLE_TYPE )PtrToUlong( pComboBox->GetSelectedData() );
-}
-
-
-//-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddMultisampleQuality( DWORD dwQuality )
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_MULTISAMPLE_QUALITY );
-
-    WCHAR strQuality[50];
-    swprintf_s( strQuality, 50, L"%d", dwQuality );
-
-    if( !pComboBox->ContainsItem( strQuality ) )
-        pComboBox->AddItem( strQuality, ULongToPtr( dwQuality ) );
-}
-
-
-//-------------------------------------------------------------------------------------
-DWORD CD3DSettingsDlg::GetSelectedMultisampleQuality()
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_MULTISAMPLE_QUALITY );
-
-    return PtrToUlong( pComboBox->GetSelectedData() );
-}
-
-
-//-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddD3D11MultisampleCount( UINT Count )
+void CD3DSettingsDlg::AddD3D11MultisampleCount( _In_ UINT Count )
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT );
 
     WCHAR str[50];
     swprintf_s( str, 50, L"%u", Count );
@@ -2516,21 +1369,21 @@ void CD3DSettingsDlg::AddD3D11MultisampleCount( UINT Count )
 
 
 //-------------------------------------------------------------------------------------
-UINT CD3DSettingsDlg::GetSelectedD3D11MultisampleCount()
+UINT CD3DSettingsDlg::GetSelectedD3D11MultisampleCount() const
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_COUNT );
 
     return ( UINT )PtrToUlong( pComboBox->GetSelectedData() );
 }
 
 
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddD3D11MultisampleQuality( UINT Quality )
+void CD3DSettingsDlg::AddD3D11MultisampleQuality( _In_ UINT Quality )
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY );
 
     WCHAR strQuality[50];
-    swprintf_s( strQuality, 50, L"%d", Quality );
+    swprintf_s( strQuality, 50, L"%u", Quality );
 
     if( !pComboBox->ContainsItem( strQuality ) )
         pComboBox->AddItem( strQuality, ULongToPtr( Quality ) );
@@ -2538,129 +1391,140 @@ void CD3DSettingsDlg::AddD3D11MultisampleQuality( UINT Quality )
 
 
 //-------------------------------------------------------------------------------------
-UINT CD3DSettingsDlg::GetSelectedD3D11MultisampleQuality()
+UINT CD3DSettingsDlg::GetSelectedD3D11MultisampleQuality() const
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_MULTISAMPLE_QUALITY );
 
     return ( UINT )PtrToUlong( pComboBox->GetSelectedData() );
 }
 
 
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddVertexProcessingType( DWORD dwType )
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_VERTEX_PROCESSING );
-
-    if( !pComboBox->ContainsItem( DXUTVertexProcessingTypeToString( dwType ) ) )
-        pComboBox->AddItem( DXUTVertexProcessingTypeToString( dwType ), ULongToPtr( dwType ) );
-}
-
-
-//-------------------------------------------------------------------------------------
-DWORD CD3DSettingsDlg::GetSelectedVertexProcessingType()
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_VERTEX_PROCESSING );
-
-    return PtrToUlong( pComboBox->GetSelectedData() );
-}
-
-
-//-------------------------------------------------------------------------------------
-DWORD CD3DSettingsDlg::GetSelectedPresentInterval()
-{
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_PRESENT_INTERVAL );
-
-    return PtrToUlong( pComboBox->GetSelectedData() );
-}
-
-
-//-------------------------------------------------------------------------------------
-DWORD CD3DSettingsDlg::GetSelectedD3D11PresentInterval()
+DWORD CD3DSettingsDlg::GetSelectedD3D11PresentInterval() const
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_PRESENT_INTERVAL );
 
     return PtrToUlong( pComboBox->GetSelectedData() );
 }
 
 //-------------------------------------------------------------------------------------
-bool CD3DSettingsDlg::GetSelectedDebugDeviceValue()
+bool CD3DSettingsDlg::GetSelectedDebugDeviceValue() const
 {
-    CDXUTCheckBox* pCheckBox = m_Dialog.GetCheckBox( DXUTSETTINGSDLG_D3D11_DEBUG_DEVICE );
+    auto pCheckBox = m_Dialog.GetCheckBox( DXUTSETTINGSDLG_D3D11_DEBUG_DEVICE );
 
     return pCheckBox->GetChecked();
 }
 
 
-//-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::SetDeviceClip( bool bDeviceClip )
-{
-    CDXUTCheckBox* pCheckBox = m_Dialog.GetCheckBox( DXUTSETTINGSDLG_DEVICECLIP );
-    pCheckBox->SetChecked( bDeviceClip );
-}
-
-
-//-------------------------------------------------------------------------------------
-bool CD3DSettingsDlg::IsDeviceClip()
-{
-    CDXUTCheckBox* pCheckBox = m_Dialog.GetCheckBox( DXUTSETTINGSDLG_DEVICECLIP );
-    return pCheckBox->GetChecked();
-}
-
 //--------------------------------------------------------------------------------------
 // Updates the resolution list for D3D11
 //--------------------------------------------------------------------------------------
 HRESULT CD3DSettingsDlg::UpdateD3D11Resolutions()
 {
-
     const DWORD dwWidth = g_DeviceSettings.d3d11.sd.BufferDesc.Width;
     const DWORD dwHeight = g_DeviceSettings.d3d11.sd.BufferDesc.Height;
 
     // DXUTSETTINGSDLG_D3D11_RESOLUTION
-    CDXUTComboBox* pResolutionComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_RESOLUTION );
+    auto pResolutionComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_RESOLUTION );
     pResolutionComboBox->RemoveAllItems();
 
-    CD3D11EnumOutputInfo* pOutputInfo = GetCurrentD3D11OutputInfo();
-    if( pOutputInfo == NULL )
+    auto pOutputInfo = GetCurrentD3D11OutputInfo();
+    if( !pOutputInfo )
         return E_FAIL;
 
-    bool bShowAll = m_Dialog.GetCheckBox( DXUTSETTINGSDLG_RESOLUTION_SHOW_ALL )->GetChecked();
+    bool bWindowed = IsWindowed();
+    if ( !bWindowed )
+    {
+        auto pShowAllCB = m_Dialog.GetCheckBox( DXUTSETTINGSDLG_RESOLUTION_SHOW_ALL );
+        bool bShowAll = pShowAllCB->GetChecked();
 
-    // Get the desktop aspect ratio
-    DXGI_MODE_DESC dmDesktop;
-    DXUTGetDesktopResolution( g_DeviceSettings.d3d11.AdapterOrdinal, &dmDesktop.Width, &dmDesktop.Height );
-    float fDesktopAspectRatio = dmDesktop.Width / ( float )dmDesktop.Height;
+        // Get the desktop aspect ratio
+        DXGI_MODE_DESC dmDesktop;
+        DXUTGetDesktopResolution(g_DeviceSettings.d3d11.AdapterOrdinal, &dmDesktop.Width, &dmDesktop.Height);
+        float fDesktopAspectRatio = dmDesktop.Width / (float) dmDesktop.Height;
 
-    for( int idm = 0; idm < pOutputInfo->displayModeList.GetSize(); idm++ )
-    {
-        DXGI_MODE_DESC DisplayMode = pOutputInfo->displayModeList.GetAt( idm );
-        float fAspect = ( float )DisplayMode.Width / ( float )DisplayMode.Height;
+        if ( !bShowAll && !DXUTIsWindowed() )
+        {
+            float fAspect = (float) dwWidth / (float) dwHeight;
+            if ( fabsf(fDesktopAspectRatio - fAspect) >= 0.05f )
+            {
+                // Our current fullscren resolution should be listed in the combo box despite the aspect ratio
+                pShowAllCB->SetChecked(true);
+                bShowAll = true;
+            }
+        }
 
-        if( DisplayMode.Format == g_DeviceSettings.d3d11.sd.BufferDesc.Format )
+        for (size_t idm = 0; idm < pOutputInfo->displayModeList.size(); idm++)
         {
-            // If "Show All" is not checked, then hide all resolutions
-            // that don't match the aspect ratio of the desktop resolution
-            if( bShowAll || ( !bShowAll && fabsf( fDesktopAspectRatio - fAspect ) < 0.05f ) )
+            auto DisplayMode = pOutputInfo->displayModeList[idm];
+            float fAspect = (float) DisplayMode.Width / (float) DisplayMode.Height;
+
+            if (DisplayMode.Format == g_DeviceSettings.d3d11.sd.BufferDesc.Format)
             {
-                AddD3D11Resolution( DisplayMode.Width, DisplayMode.Height );
+                // If "Show All" is not checked, then hide all resolutions
+                // that don't match the aspect ratio of the desktop resolution
+                if (bShowAll || (!bShowAll && fabsf(fDesktopAspectRatio - fAspect) < 0.05f))
+                {
+                    AddD3D11Resolution(DisplayMode.Width, DisplayMode.Height);
+                }
             }
         }
     }
+    else
+    {
+        pResolutionComboBox->RemoveAllItems();
+        AddD3D11Resolution( dwWidth, dwHeight );
+    }
+
+    pResolutionComboBox->SetSelectedByData(ULongToPtr(MAKELONG(dwWidth, dwHeight)));
+    OnD3D11ResolutionChanged();
 
-    const DWORD dwCurResolution = MAKELONG( g_DeviceSettings.d3d11.sd.BufferDesc.Width,
-                                            g_DeviceSettings.d3d11.sd.BufferDesc.Height );
+    return S_OK;
+}
 
-    pResolutionComboBox->SetSelectedByData( ULongToPtr( dwCurResolution ) );
 
+//--------------------------------------------------------------------------------------
+// Updates the refresh list for D3D11
+//--------------------------------------------------------------------------------------
+HRESULT CD3DSettingsDlg::UpdateD3D11RefreshRates()
+{
+    const DWORD dwWidth = g_DeviceSettings.d3d11.sd.BufferDesc.Width;
+    const DWORD dwHeight = g_DeviceSettings.d3d11.sd.BufferDesc.Height;
+    DXGI_FORMAT backBuffer = g_DeviceSettings.d3d11.sd.BufferDesc.Format;
+    const DXGI_RATIONAL RefreshRate = g_DeviceSettings.d3d11.sd.BufferDesc.RefreshRate;
+
+    auto pRefreshRateComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_D3D11_REFRESH_RATE );
+    for( UINT i = 0; i < pRefreshRateComboBox->GetNumItems(); ++i )
+    {
+        auto pRefreshRate = reinterpret_cast<DXGI_RATIONAL*>( pRefreshRateComboBox->GetItemData( i ) );
+        delete pRefreshRate;
+    }
+    pRefreshRateComboBox->RemoveAllItems();
 
     bool bWindowed = IsWindowed();
     if( bWindowed )
     {
-        pResolutionComboBox->RemoveAllItems();
-        AddD3D11Resolution( dwWidth, dwHeight );
+        DXGI_RATIONAL def;
+        def.Denominator = def.Numerator = 0;
+        AddD3D11RefreshRate(def);
+    }
+    else
+    {
+        auto pD3DEnum = DXUTGetD3D11Enumeration();
+        if ( !pD3DEnum )
+            return E_POINTER;
 
-        pResolutionComboBox->SetSelectedByData( ULongToPtr( MAKELONG( dwWidth, dwHeight ) ) );
+        auto pOutputInfo = pD3DEnum->GetOutputInfo( g_DeviceSettings.d3d11.AdapterOrdinal, g_DeviceSettings.d3d11.Output );
+        if ( !pOutputInfo )
+            return E_POINTER;
 
+        for( auto it = pOutputInfo->displayModeList.cbegin(); it != pOutputInfo->displayModeList.cend(); ++it )
+        {
+            if ( it->Width == dwWidth && it->Height == dwHeight && it->Format == backBuffer )
+                AddD3D11RefreshRate( it->RefreshRate );
+        }
 
+        SetSelectedD3D11RefreshRate( RefreshRate );
     }
 
     return S_OK;
@@ -2669,25 +1533,25 @@ HRESULT CD3DSettingsDlg::UpdateD3D11Resolutions()
 
 //
 //-------------------------------------------------------------------------------------
-void CD3DSettingsDlg::AddD3D11DeviceType( D3D_DRIVER_TYPE devType )
+void CD3DSettingsDlg::AddD3D11DeviceType( _In_ D3D_DRIVER_TYPE devType )
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEVICE_TYPE );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEVICE_TYPE );
 
-    if( !pComboBox->ContainsItem( DXUTD3DX11DeviceTypeToString( devType ) ) )
-        pComboBox->AddItem( DXUTD3DX11DeviceTypeToString( devType ), ULongToPtr( devType ) );
+    if( !pComboBox->ContainsItem( DXUTDeviceTypeToString( devType ) ) )
+        pComboBox->AddItem( DXUTDeviceTypeToString( devType ), ULongToPtr( devType ) );
 }
 
 
 //-------------------------------------------------------------------------------------
-D3D_DRIVER_TYPE CD3DSettingsDlg::GetSelectedD3D11DeviceType()
+D3D_DRIVER_TYPE CD3DSettingsDlg::GetSelectedD3D11DeviceType() const
 {
-    CDXUTComboBox* pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEVICE_TYPE );
+    auto pComboBox = m_Dialog.GetComboBox( DXUTSETTINGSDLG_DEVICE_TYPE );
 
     return ( D3D_DRIVER_TYPE )PtrToUlong( pComboBox->GetSelectedData() );
 }
 
 
-void CD3DSettingsDlg::UpdateModeChangeTimeoutText( int nSecRemaining )
+void CD3DSettingsDlg::UpdateModeChangeTimeoutText( _In_ int nSecRemaining )
 {
     const WCHAR StrTimeout[] = L"Reverting to previous display settings in %d seconds";
     const DWORD CchBuf = sizeof( StrTimeout ) / sizeof( WCHAR ) + 16;
@@ -2695,52 +1559,14 @@ void CD3DSettingsDlg::UpdateModeChangeTimeoutText( int nSecRemaining )
 
     swprintf_s( buf, CchBuf, StrTimeout, nSecRemaining );
 
-    CDXUTStatic* pStatic = m_RevertModeDialog.GetStatic( DXUTSETTINGSDLG_STATIC_MODE_CHANGE_TIMEOUT );
+    auto pStatic = m_RevertModeDialog.GetStatic( DXUTSETTINGSDLG_STATIC_MODE_CHANGE_TIMEOUT );
     pStatic->SetText( buf );
 }
 
-//--------------------------------------------------------------------------------------
-// Returns the string for the given DXUTDeviceVersion.
-//--------------------------------------------------------------------------------------
-WCHAR* DXUTAPIVersionToString( DXUTDeviceVersion version )
-{
-    switch( version )
-    {
-        case DXUT_D3D9_DEVICE:
-            return L"Direct3D 9";
-		case DXUT_D3D11_DEVICE:
-			return L"Direct3D 11";
-        default:
-            return L"Unknown version";
-    }
-}
-
-
-//--------------------------------------------------------------------------------------
-// Returns the string for the given D3DDEVTYPE.
-//--------------------------------------------------------------------------------------
-WCHAR* DXUTD3DDeviceTypeToString( D3DDEVTYPE devType )
-{
-    switch( devType )
-    {
-        case D3DDEVTYPE_HAL:
-            return L"D3DDEVTYPE_HAL";
-        case D3DDEVTYPE_SW:
-            return L"D3DDEVTYPE_SW";
-        case D3DDEVTYPE_REF:
-            return L"D3DDEVTYPE_REF";
-        default:
-            return L"Unknown devType";
-    }
-}
-
-
-
-
 //--------------------------------------------------------------------------------------
 // Returns the string for the given D3D_DRIVER_TYPE.
 //--------------------------------------------------------------------------------------
-WCHAR* DXUTD3DX11DeviceTypeToString( D3D_DRIVER_TYPE devType )
+const WCHAR* DXUTDeviceTypeToString( _In_ D3D_DRIVER_TYPE devType )
 {
     switch( devType )
     {
@@ -2758,96 +1584,3 @@ WCHAR* DXUTD3DX11DeviceTypeToString( D3D_DRIVER_TYPE devType )
 }
 
 
-//--------------------------------------------------------------------------------------
-// Returns the string for the given D3DMULTISAMPLE_TYPE.
-//--------------------------------------------------------------------------------------
-WCHAR* DXUTMultisampleTypeToString( D3DMULTISAMPLE_TYPE MultiSampleType )
-{
-    switch( MultiSampleType )
-    {
-        case D3DMULTISAMPLE_NONE:
-            return L"D3DMULTISAMPLE_NONE";
-        case D3DMULTISAMPLE_NONMASKABLE:
-            return L"D3DMULTISAMPLE_NONMASKABLE";
-        case D3DMULTISAMPLE_2_SAMPLES:
-            return L"D3DMULTISAMPLE_2_SAMPLES";
-        case D3DMULTISAMPLE_3_SAMPLES:
-            return L"D3DMULTISAMPLE_3_SAMPLES";
-        case D3DMULTISAMPLE_4_SAMPLES:
-            return L"D3DMULTISAMPLE_4_SAMPLES";
-        case D3DMULTISAMPLE_5_SAMPLES:
-            return L"D3DMULTISAMPLE_5_SAMPLES";
-        case D3DMULTISAMPLE_6_SAMPLES:
-            return L"D3DMULTISAMPLE_6_SAMPLES";
-        case D3DMULTISAMPLE_7_SAMPLES:
-            return L"D3DMULTISAMPLE_7_SAMPLES";
-        case D3DMULTISAMPLE_8_SAMPLES:
-            return L"D3DMULTISAMPLE_8_SAMPLES";
-        case D3DMULTISAMPLE_9_SAMPLES:
-            return L"D3DMULTISAMPLE_9_SAMPLES";
-        case D3DMULTISAMPLE_10_SAMPLES:
-            return L"D3DMULTISAMPLE_10_SAMPLES";
-        case D3DMULTISAMPLE_11_SAMPLES:
-            return L"D3DMULTISAMPLE_11_SAMPLES";
-        case D3DMULTISAMPLE_12_SAMPLES:
-            return L"D3DMULTISAMPLE_12_SAMPLES";
-        case D3DMULTISAMPLE_13_SAMPLES:
-            return L"D3DMULTISAMPLE_13_SAMPLES";
-        case D3DMULTISAMPLE_14_SAMPLES:
-            return L"D3DMULTISAMPLE_14_SAMPLES";
-        case D3DMULTISAMPLE_15_SAMPLES:
-            return L"D3DMULTISAMPLE_15_SAMPLES";
-        case D3DMULTISAMPLE_16_SAMPLES:
-            return L"D3DMULTISAMPLE_16_SAMPLES";
-        default:
-            return L"Unknown Multisample Type";
-    }
-}
-
-
-//--------------------------------------------------------------------------------------
-// Returns the string for the given vertex processing type
-//--------------------------------------------------------------------------------------
-WCHAR* DXUTVertexProcessingTypeToString( DWORD vpt )
-{
-    switch( vpt )
-    {
-        case D3DCREATE_SOFTWARE_VERTEXPROCESSING:
-            return L"Software vertex processing";
-        case D3DCREATE_MIXED_VERTEXPROCESSING:
-            return L"Mixed vertex processing";
-        case D3DCREATE_HARDWARE_VERTEXPROCESSING:
-            return L"Hardware vertex processing";
-        case D3DCREATE_PUREDEVICE:
-            return L"Pure hardware vertex processing";
-        default:
-            return L"Unknown vertex processing type";
-    }
-}
-
-
-//--------------------------------------------------------------------------------------
-// Returns the string for the given present interval.
-//--------------------------------------------------------------------------------------
-WCHAR* DXUTPresentIntervalToString( UINT pi )
-{
-    switch( pi )
-    {
-        case D3DPRESENT_INTERVAL_IMMEDIATE:
-            return L"D3DPRESENT_INTERVAL_IMMEDIATE";
-        case D3DPRESENT_INTERVAL_DEFAULT:
-            return L"D3DPRESENT_INTERVAL_DEFAULT";
-        case D3DPRESENT_INTERVAL_ONE:
-            return L"D3DPRESENT_INTERVAL_ONE";
-        case D3DPRESENT_INTERVAL_TWO:
-            return L"D3DPRESENT_INTERVAL_TWO";
-        case D3DPRESENT_INTERVAL_THREE:
-            return L"D3DPRESENT_INTERVAL_THREE";
-        case D3DPRESENT_INTERVAL_FOUR:
-            return L"D3DPRESENT_INTERVAL_FOUR";
-        default:
-            return L"Unknown PresentInterval";
-    }
-}
-
-
diff --git a/samples/DX_APIUsage/DXUT/Optional/DXUTsettingsdlg.h b/samples/DX_APIUsage/DXUT/Optional/DXUTsettingsdlg.h
index 5d4db4f..fd7f0c8 100644
--- a/samples/DX_APIUsage/DXUT/Optional/DXUTsettingsdlg.h
+++ b/samples/DX_APIUsage/DXUT/Optional/DXUTsettingsdlg.h
@@ -1,16 +1,18 @@
 //--------------------------------------------------------------------------------------
-// File: DXUTSettingsDlg.cpp
+// File: DXUTSettingsDlg.h
 //
-// Copyright (c) Microsoft Corporation. All rights reserved
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #pragma once
-#ifndef DXUT_SETTINGS_H
-#define DXUT_SETTINGS_H
 
 //--------------------------------------------------------------------------------------
 // Header Includes
 //--------------------------------------------------------------------------------------
 #include "DXUTgui.h"
+
 //--------------------------------------------------------------------------------------
 // Control IDs
 //--------------------------------------------------------------------------------------
@@ -21,27 +23,7 @@
 #define DXUTSETTINGSDLG_DEVICE_TYPE                     4
 #define DXUTSETTINGSDLG_WINDOWED                        5
 #define DXUTSETTINGSDLG_FULLSCREEN                      6
-#define DXUTSETTINGSDLG_ADAPTER_FORMAT                  7
-#define DXUTSETTINGSDLG_ADAPTER_FORMAT_LABEL            8
-#define DXUTSETTINGSDLG_RESOLUTION                      9
-#define DXUTSETTINGSDLG_RESOLUTION_LABEL                10
-#define DXUTSETTINGSDLG_REFRESH_RATE                    11
-#define DXUTSETTINGSDLG_REFRESH_RATE_LABEL              12
-#define DXUTSETTINGSDLG_BACK_BUFFER_FORMAT              13
-#define DXUTSETTINGSDLG_BACK_BUFFER_FORMAT_LABEL        14
-#define DXUTSETTINGSDLG_DEPTH_STENCIL                   15
-#define DXUTSETTINGSDLG_DEPTH_STENCIL_LABEL             16
-#define DXUTSETTINGSDLG_MULTISAMPLE_TYPE                17
-#define DXUTSETTINGSDLG_MULTISAMPLE_TYPE_LABEL          18
-#define DXUTSETTINGSDLG_MULTISAMPLE_QUALITY             19
-#define DXUTSETTINGSDLG_MULTISAMPLE_QUALITY_LABEL       20
-#define DXUTSETTINGSDLG_VERTEX_PROCESSING               21
-#define DXUTSETTINGSDLG_VERTEX_PROCESSING_LABEL         22
-#define DXUTSETTINGSDLG_PRESENT_INTERVAL                23
-#define DXUTSETTINGSDLG_PRESENT_INTERVAL_LABEL          24
-#define DXUTSETTINGSDLG_DEVICECLIP                      25
 #define DXUTSETTINGSDLG_RESOLUTION_SHOW_ALL             26
-#define DXUTSETTINGSDLG_API_VERSION                     27
 #define DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT            28
 #define DXUTSETTINGSDLG_D3D11_ADAPTER_OUTPUT_LABEL      29
 #define DXUTSETTINGSDLG_D3D11_RESOLUTION                30
@@ -65,169 +47,109 @@
 #define DXUTSETTINGSDLG_STATIC_MODE_CHANGE_TIMEOUT      60
 #define DXUTSETTINGSDLG_WINDOWED_GROUP                  0x0100
 
-#define TOTAL_FEATURE_LEVLES                            6
+#define TOTAL_FEATURE_LEVELS                            9
+
 //--------------------------------------------------------------------------------------
 // Dialog for selection of device settings 
 // Use DXUTGetD3DSettingsDialog() to access global instance
-// To control the contents of the dialog, use the CD3D9Enumeration class.
+// To control the contents of the dialog, use the CD3D11Enumeration class.
 //--------------------------------------------------------------------------------------
 class CD3DSettingsDlg
 {
 public:
-                        CD3DSettingsDlg();
-                        ~CD3DSettingsDlg();
-
-    void                Init( CDXUTDialogResourceManager* pManager );
-    void                Init( CDXUTDialogResourceManager* pManager, LPCWSTR szControlTextureFileName );
-    void                Init( CDXUTDialogResourceManager* pManager, LPCWSTR pszControlTextureResourcename,
-                              HMODULE hModule );
-
-    HRESULT             Refresh();
-    void                OnRender( float fElapsedTime );
-    void                OnRender9( float fElapsedTime );
-    void                OnRender10( float fElapsedTime );
-    void                OnRender11( float fElapsedTime );
-
-    HRESULT             OnD3D9CreateDevice( IDirect3DDevice9* pd3dDevice );
-    HRESULT             OnD3D9ResetDevice();
-    void                OnD3D9LostDevice();
-    void                OnD3D9DestroyDevice();
-
-    HRESULT             OnD3D11CreateDevice( ID3D11Device* pd3dDevice );
-    HRESULT             OnD3D11ResizedSwapChain( ID3D11Device* pd3dDevice,
-                                                 const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc );
-    void                OnD3D11DestroyDevice();
-
-    CDXUTDialog* GetDialogControl()
-    {
-        return &m_Dialog;
-    }
-    bool                IsActive()
-    {
-        return m_bActive;
-    }
-    void                SetActive( bool bActive )
-    {
-        m_bActive = bActive; if( bActive ) Refresh();
-    }
-    void                ShowControlSet( DXUTDeviceVersion ver );
-
-    LRESULT             MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
-
-protected:
-    friend CD3DSettingsDlg* WINAPI DXUTGetD3DSettingsDialog();
-
-    void                CreateControls();
-    HRESULT             SetDeviceSettingsFromUI();
-    void                SetSelectedD3D11RefreshRate( DXGI_RATIONAL RefreshRate );
-    HRESULT             UpdateD3D11Resolutions();
-
-    void                OnEvent( UINT nEvent, int nControlID, CDXUTControl* pControl );
-    static void WINAPI  StaticOnEvent( UINT nEvent, int nControlID, CDXUTControl* pControl, void* pUserData );
-    static void WINAPI  StaticOnModeChangeTimer( UINT nIDEvent, void* pUserContext );
+    CD3DSettingsDlg();
+    ~CD3DSettingsDlg();
 
-    CD3D9EnumAdapterInfo* GetCurrentAdapterInfo();
-    CD3D9EnumDeviceInfo* GetCurrentDeviceInfo();
-    CD3D9EnumDeviceSettingsCombo* GetCurrentDeviceSettingsCombo();
+    void Init( _In_ CDXUTDialogResourceManager* pManager );
+    void Init( _In_ CDXUTDialogResourceManager* pManager, _In_z_ LPCWSTR szControlTextureFileName );
+    void Init( _In_ CDXUTDialogResourceManager* pManager, _In_z_ LPCWSTR pszControlTextureResourcename,
+               _In_ HMODULE hModule );
 
-    CD3D11EnumAdapterInfo* GetCurrentD3D11AdapterInfo();
-    CD3D11EnumDeviceInfo* GetCurrentD3D11DeviceInfo();
-    CD3D11EnumOutputInfo* GetCurrentD3D11OutputInfo();
-    CD3D11EnumDeviceSettingsCombo* GetCurrentD3D11DeviceSettingsCombo();
+    HRESULT Refresh();
+    void OnRender( _In_ float fElapsedTime );
 
-    void                AddAPIVersion( DXUTDeviceVersion version );
-    DXUTDeviceVersion   GetSelectedAPIVersion();
+    HRESULT OnD3D11CreateDevice( _In_ ID3D11Device* pd3dDevice );
+    HRESULT OnD3D11ResizedSwapChain( _In_ ID3D11Device* pd3dDevice,
+                                     _In_ const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc );
+    void OnD3D11DestroyDevice();
 
-    void                AddAdapter( const WCHAR* strDescription, UINT iAdapter );
-    UINT                GetSelectedAdapter();
-
-    void                AddDeviceType( D3DDEVTYPE devType );
-    D3DDEVTYPE          GetSelectedDeviceType();
-
-    void                SetWindowed( bool bWindowed );
-    bool                IsWindowed();
-
-    void                AddAdapterFormat( D3DFORMAT format );
-    D3DFORMAT           GetSelectedAdapterFormat();
-
-    void                AddResolution( DWORD dwWidth, DWORD dwHeight );
-    void                GetSelectedResolution( DWORD* pdwWidth, DWORD* pdwHeight );
+    CDXUTDialog* GetDialogControl() { return &m_Dialog; }
+    bool IsActive() const { return m_bActive; }
+    void SetActive( _In_ bool bActive )
+    {
+        m_bActive = bActive;
+        if( bActive ) Refresh();
+    }
 
-    void                AddRefreshRate( DWORD dwRate );
-    DWORD               GetSelectedRefreshRate();
+    LRESULT MsgProc( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam );
 
-    void                AddBackBufferFormat( D3DFORMAT format );
-    D3DFORMAT           GetSelectedBackBufferFormat();
+protected:
+    friend CD3DSettingsDlg* WINAPI DXUTGetD3DSettingsDialog();
 
-    void                AddDepthStencilBufferFormat( D3DFORMAT format );
-    D3DFORMAT           GetSelectedDepthStencilBufferFormat();
+    void CreateControls();
+    void SetSelectedD3D11RefreshRate( _In_ DXGI_RATIONAL RefreshRate );
+    HRESULT UpdateD3D11Resolutions();
+    HRESULT UpdateD3D11RefreshRates();
 
-    void                AddMultisampleType( D3DMULTISAMPLE_TYPE type );
-    D3DMULTISAMPLE_TYPE GetSelectedMultisampleType();
+    void OnEvent( _In_ UINT nEvent, _In_ int nControlID, _In_ CDXUTControl* pControl );
 
-    void                AddMultisampleQuality( DWORD dwQuality );
-    DWORD               GetSelectedMultisampleQuality();
+    static void WINAPI StaticOnEvent( _In_ UINT nEvent, _In_ int nControlID, _In_ CDXUTControl* pControl, _In_opt_ void* pUserData );
+    static void WINAPI StaticOnModeChangeTimer( _In_ UINT nIDEvent, _In_opt_ void* pUserContext );
 
-    void                AddVertexProcessingType( DWORD dwType );
-    DWORD               GetSelectedVertexProcessingType();
+    CD3D11EnumAdapterInfo* GetCurrentD3D11AdapterInfo() const;
+    CD3D11EnumDeviceInfo* GetCurrentD3D11DeviceInfo() const;
+    CD3D11EnumOutputInfo* GetCurrentD3D11OutputInfo() const;
+    CD3D11EnumDeviceSettingsCombo* GetCurrentD3D11DeviceSettingsCombo() const;
 
-    DWORD               GetSelectedPresentInterval();
+    void AddAdapter( _In_z_ const WCHAR* strDescription, _In_ UINT iAdapter );
+    UINT GetSelectedAdapter() const;
 
-    void                SetDeviceClip( bool bDeviceClip );
-    bool                IsDeviceClip();
+    void SetWindowed( _In_ bool bWindowed );
+    bool IsWindowed() const;
 
     // D3D11
-    void                AddD3D11DeviceType( D3D_DRIVER_TYPE devType );
-    D3D_DRIVER_TYPE   GetSelectedD3D11DeviceType();
+    void                AddD3D11DeviceType( _In_ D3D_DRIVER_TYPE devType );
+    D3D_DRIVER_TYPE     GetSelectedD3D11DeviceType() const;
 
-    void                AddD3D11AdapterOutput( const WCHAR* strName, UINT nOutput );
-    UINT                GetSelectedD3D11AdapterOutput();
+    void                AddD3D11AdapterOutput( _In_z_ const WCHAR* strName, _In_ UINT nOutput );
+    UINT                GetSelectedD3D11AdapterOutput() const;
 
-    void                AddD3D11Resolution( DWORD dwWidth, DWORD dwHeight );
-    void                GetSelectedD3D11Resolution( DWORD* pdwWidth, DWORD* pdwHeight );
+    void                AddD3D11Resolution( _In_ DWORD dwWidth, _In_ DWORD dwHeight );
+    void                GetSelectedD3D11Resolution( _Out_ DWORD* pdwWidth, _Out_ DWORD* pdwHeight ) const;
 
-    void                AddD3D11FeatureLevel(D3D_FEATURE_LEVEL);
-    D3D_FEATURE_LEVEL   GetSelectedFeatureLevel();
+    void                AddD3D11FeatureLevel( _In_ D3D_FEATURE_LEVEL fl );
+    D3D_FEATURE_LEVEL   GetSelectedFeatureLevel() const;
 
-    void                AddD3D11RefreshRate( DXGI_RATIONAL RefreshRate );
-    DXGI_RATIONAL       GetSelectedD3D11RefreshRate();
+    void                AddD3D11RefreshRate( _In_ DXGI_RATIONAL RefreshRate );
+    DXGI_RATIONAL       GetSelectedD3D11RefreshRate() const;
 
-    void                AddD3D11BackBufferFormat( DXGI_FORMAT format );
-    DXGI_FORMAT         GetSelectedD3D11BackBufferFormat();
-
-    void                AddD3D11MultisampleCount( UINT count );
-    UINT                GetSelectedD3D11MultisampleCount();
-
-    void                AddD3D11MultisampleQuality( UINT Quality );
-    UINT                GetSelectedD3D11MultisampleQuality();
-
-    DWORD               GetSelectedD3D11PresentInterval();
-    bool                GetSelectedDebugDeviceValue();
+    void                AddD3D11BackBufferFormat( _In_ DXGI_FORMAT format );
+    DXGI_FORMAT         GetSelectedD3D11BackBufferFormat() const;
 
+    void                AddD3D11MultisampleCount( _In_ UINT count );
+    UINT                GetSelectedD3D11MultisampleCount() const;
 
+    void                AddD3D11MultisampleQuality( _In_ UINT Quality );
+    UINT                GetSelectedD3D11MultisampleQuality() const;
 
+    DWORD               GetSelectedD3D11PresentInterval() const;
+    bool                GetSelectedDebugDeviceValue() const;
+    
     HRESULT             OnD3D11ResolutionChanged ();
-    HRESULT             OnAPIVersionChanged( bool bRefresh=false );
     HRESULT             OnFeatureLevelChanged();
     HRESULT             OnAdapterChanged();
     HRESULT             OnDeviceTypeChanged();
     HRESULT             OnWindowedFullScreenChanged();
     HRESULT             OnAdapterOutputChanged();
-    HRESULT             OnAdapterFormatChanged();
-    HRESULT             OnResolutionChanged();
     HRESULT             OnRefreshRateChanged();
     HRESULT             OnBackBufferFormatChanged();
-    HRESULT             OnDepthStencilBufferFormatChanged();
     HRESULT             OnMultisampleTypeChanged();
     HRESULT             OnMultisampleQualityChanged();
-    HRESULT             OnVertexProcessingChanged();
     HRESULT             OnPresentIntervalChanged();
     HRESULT             OnDebugDeviceChanged();
-    HRESULT             OnDeviceClipChanged();
 
-    void                UpdateModeChangeTimeoutText( int nSecRemaining );
+    void                UpdateModeChangeTimeoutText( _In_ int nSecRemaining );
 
-    IDirect3DStateBlock9* m_pStateBlock;
     CDXUTDialog* m_pActiveDialog;
     CDXUTDialog m_Dialog;
     CDXUTDialog m_RevertModeDialog;
@@ -235,14 +157,9 @@ protected:
     UINT m_nIDEvent;
     bool m_bActive;
 
-    D3D_FEATURE_LEVEL m_Levels[TOTAL_FEATURE_LEVLES];
+    D3D_FEATURE_LEVEL m_Levels[TOTAL_FEATURE_LEVELS];
 
 };
 
 
 CD3DSettingsDlg* WINAPI DXUTGetD3DSettingsDialog();
-
-
-
-#endif
-
diff --git a/samples/DX_APIUsage/DXUT/Optional/ImeUi.cpp b/samples/DX_APIUsage/DXUT/Optional/ImeUi.cpp
index f7a0cb2..2c6b4ef 100644
--- a/samples/DX_APIUsage/DXUT/Optional/ImeUi.cpp
+++ b/samples/DX_APIUsage/DXUT/Optional/ImeUi.cpp
@@ -2,19 +2,22 @@
 // File: ImeUi.cpp
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #include "dxut.h"
 #include "ImeUi.h"
 #include <math.h>
 #include <msctf.h>
 #include <malloc.h>
-#include <strsafe.h>
 
 // Ignore typecast warnings
 #pragma warning( disable : 4312 )
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4311 )
 
+#pragma prefast( disable : 28159, "GetTickCount() is fine for a blinking cursor" )
 
 #define MAX_CANDIDATE_LENGTH 256
 #define COUNTOF(a) ( sizeof( a ) / sizeof( ( a )[0] ) )
@@ -61,7 +64,7 @@ static IMEUI_APPEARANCE         gSkinIME =
     24,			// symbolHeight;
     0xa0,		// symbolTranslucence;
     0,			// symbolPlacement;
-    NULL,		// symbolFont;
+    nullptr,	// symbolFont;
     0xffffffff,	// candColorBase;
     0xff000000,	// candColorBorder;
     0,			// candColorText;
@@ -121,7 +124,7 @@ FAR*                            LPINPUTCONTEXT2;
 class CDisableCicero
 {
 public:
-            CDisableCicero() : m_ptim( NULL ),
+            CDisableCicero() : m_ptim( nullptr ),
                                m_bComInit( false )
             {
             }
@@ -136,12 +139,12 @@ public:
             return;
         }
         HRESULT hr;
-        hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
+        hr = CoInitializeEx( nullptr, COINIT_APARTMENTTHREADED );
         if( SUCCEEDED( hr ) )
         {
             m_bComInit = true;
             hr = CoCreateInstance( CLSID_TF_ThreadMgr,
-                                   NULL,
+                                   nullptr,
                                    CLSCTX_INPROC_SERVER,
                                    __uuidof( ITfThreadMgr ),
                                    ( void** )&m_ptim );
@@ -152,7 +155,7 @@ public:
         if( m_ptim )
         {
             m_ptim->Release();
-            m_ptim = NULL;
+            m_ptim = nullptr;
         }
         if( m_bComInit )
             CoUninitialize();
@@ -161,13 +164,13 @@ public:
 
     void    DisableCiceroOnThisWnd( HWND hwnd )
     {
-        if( m_ptim == NULL )
+        if( !m_ptim )
             return;
         ITfDocumentMgr* pdimPrev; // the dim that is associated previously.
-        // Associate NULL dim to the window.
+        // Associate nullptr dim to the window.
         // When this window gets the focus, Cicero does not work and IMM32 IME
         // will be activated.
-        if( SUCCEEDED( m_ptim->AssociateFocus( hwnd, NULL, &pdimPrev ) ) )
+        if( SUCCEEDED( m_ptim->AssociateFocus( hwnd, nullptr, &pdimPrev ) ) )
         {
             if( pdimPrev )
                 pdimPrev->Release();
@@ -255,7 +258,7 @@ static DWORD                    g_hCompChar;
 static int                      g_iCandListIndexBase;
 static DWORD                    g_dwImeUiFlags = IMEUI_FLAG_SUPPORT_CARET;
 static bool                     g_bUILessMode = false;
-static HMODULE                  g_hImmDll = NULL;
+static HMODULE                  g_hImmDll = nullptr;
 
 #define IsNT() (g_osi.dwPlatformId == VER_PLATFORM_WIN32_NT)
 
@@ -289,36 +292,29 @@ static double                   lastSwirl;
 
 static HKL                      g_hklCurrent = 0;
 static UINT                     g_uCodePage = 0;
-static LPTSTR g_aszIndicator[] =
+static LPCTSTR g_aszIndicator[] =
 {
     TEXT( "A" ),
-#ifdef UNICODE
-		L"\x7B80",
-		L"\x7E41",
-		L"\xac00",
-		L"\x3042",
-#else
-    "\xd6\xd0",
-    "\xa4\xa4",
-    "\xb0\xa1",
-    "\x82\xa0",
-#endif
+        L"\x7B80",
+        L"\x7E41",
+        L"\xac00",
+        L"\x3042",
 };
-static LPTSTR                   g_pszIndicatior = g_aszIndicator[0];
+static LPCTSTR                  g_pszIndicatior = g_aszIndicator[0];
 
-static void GetReadingString( HWND hWnd );
-static DWORD GetImeId( UINT uIndex = 0 );
+static void GetReadingString( _In_ HWND hWnd );
+static DWORD GetImeId( _In_ UINT uIndex = 0 );
 static void CheckToggleState();
 static void DrawImeIndicator();
 static void DrawCandidateList();
-static void DrawCompositionString( bool bDrawCompAttr );
-static void GetReadingWindowOrientation( DWORD dwId );
+static void DrawCompositionString( _In_ bool bDrawCompAttr );
+static void GetReadingWindowOrientation( _In_ DWORD dwId );
 static void OnInputLangChangeWorker();
 static void OnInputLangChange();
 static void SetImeApi();
 static void CheckInputLocale();
-static void SetSupportLevel( DWORD dwImeLevel );
-void ImeUi_SetSupportLevel( DWORD dwImeLevel );
+static void SetSupportLevel( _In_ DWORD dwImeLevel );
+void ImeUi_SetSupportLevel( _In_ DWORD dwImeLevel );
 
 
 //
@@ -352,15 +348,15 @@ protected:
                            public ITfCompartmentEventSink
     {
     public:
-                        CUIElementSink();
-                        ~CUIElementSink();
+        CUIElementSink();
+        virtual ~CUIElementSink();
 
         // IUnknown
-        STDMETHODIMP    QueryInterface( REFIID riid, void** ppvObj );
-		STDMETHODIMP_( ULONG )
-                        AddRef( void );
-		STDMETHODIMP_( ULONG )
-                        Release( void );
+        STDMETHODIMP    QueryInterface( _In_ REFIID riid, _COM_Outptr_ void** ppvObj );
+        STDMETHODIMP_( ULONG )
+                        AddRef();
+        STDMETHODIMP_( ULONG )
+                        Release();
 
         // ITfUIElementSink
         //   Notifications for Reading Window events. We could process candidate as well, but we'll use IMM for simplicity sake.
@@ -370,12 +366,12 @@ protected:
 
         // ITfInputProcessorProfileActivationSink
         //   Notification for keyboard input locale change
-        STDMETHODIMP    OnActivated( DWORD dwProfileType, LANGID langid, REFCLSID clsid, REFGUID catid,
-                                     REFGUID guidProfile, HKL hkl, DWORD dwFlags );
+        STDMETHODIMP    OnActivated( DWORD dwProfileType, LANGID langid, _In_ REFCLSID clsid, _In_ REFGUID catid,
+                                     _In_ REFGUID guidProfile, HKL hkl, DWORD dwFlags );
 
         // ITfCompartmentEventSink
         //    Notification for open mode (toggle state) change
-        STDMETHODIMP    OnChange( REFGUID rguid );
+        STDMETHODIMP    OnChange( _In_ REFGUID rguid );
 
     private:
         LONG _cRef;
@@ -386,8 +382,8 @@ protected:
     static ITfUIElement* GetUIElement( DWORD dwUIElementId );
     static BOOL GetCompartments( ITfCompartmentMgr** ppcm, ITfCompartment** ppTfOpenMode,
                                  ITfCompartment** ppTfConvMode );
-    static BOOL SetupCompartmentSinks( BOOL bResetOnly = FALSE, ITfCompartment* pTfOpenMode = NULL,
-                                       ITfCompartment* ppTfConvMode = NULL );
+    static BOOL SetupCompartmentSinks( BOOL bResetOnly = FALSE, ITfCompartment* pTfOpenMode = nullptr,
+                                       ITfCompartment* ppTfConvMode = nullptr );
 
     static ITfThreadMgrEx* m_tm;
     static DWORD m_dwUIElementSinkCookie;
@@ -414,8 +410,8 @@ DWORD                           CTsfUiLessMode::m_dwUIElementSinkCookie = TF_INV
 DWORD                           CTsfUiLessMode::m_dwAlpnSinkCookie = TF_INVALID_COOKIE;
 DWORD                           CTsfUiLessMode::m_dwOpenModeSinkCookie = TF_INVALID_COOKIE;
 DWORD                           CTsfUiLessMode::m_dwConvModeSinkCookie = TF_INVALID_COOKIE;
-CTsfUiLessMode::CUIElementSink* CTsfUiLessMode::m_TsfSink = NULL;
-int                             CTsfUiLessMode::m_nCandidateRefCount = NULL;
+CTsfUiLessMode::CUIElementSink* CTsfUiLessMode::m_TsfSink = nullptr;
+int                             CTsfUiLessMode::m_nCandidateRefCount = 0;
 
 static unsigned long _strtoul( LPCSTR psz, LPTSTR*, int )
 {
@@ -452,282 +448,8 @@ static unsigned long _strtoul( LPCSTR psz, LPTSTR*, int )
     return ulRet;
 }
 
-#ifdef UNICODE
-#define GetCharCount(psz) lstrlen(psz)
+#define GetCharCount(psz) (int)wcslen(psz)
 #define GetCharCountFromBytes(psz,iBytes) (iBytes)
-static void AW_SendCompString()
-{
-	int i, iLen;
-	if ( ImeUiCallback_OnChar )
-	{
-		for ( i = 0; g_szCompositionString[i]; i++ )
-		{
-			ImeUiCallback_OnChar( g_szCompositionString[i] );
-		}
-		return;
-	}
-
-	BYTE szCompStr[COUNTOF(g_szCompositionString) * 2];
-	iLen = WideCharToMultiByte(g_uCodePage, 0, g_szCompositionString, -1,
-				(LPSTR)szCompStr, COUNTOF(szCompStr), NULL, NULL) - 1; // don't need to send NUL terminator;
-	for (i = 0; i < iLen; i++)
-	{
-		SendKeyMsg(g_hwndCurr, WM_CHAR, szCompStr[i]);
-	}
-}
-
-// The following AW_Imm* functions are there to support Win95/98 first version.
-// They can be deleted if the game doesn't supports them (i.e. games requires Win98 SE or later).
-static DWORD AW_GetCandidateList(HIMC himc, DWORD dwIndex, LPCANDIDATELIST* ppCandList)
-{
-	DWORD dwBufLen = ImmGetCandidateListA( himc, dwIndex, NULL, 0 );
-	if (dwBufLen)
-	{
-		LPCANDIDATELIST pCandList = (LPCANDIDATELIST)ImeUiCallback_Malloc(dwBufLen);
-		if (pCandList) {
-			dwBufLen = ImmGetCandidateListA( himc, dwIndex, pCandList, dwBufLen );
-			if (dwBufLen) {
-				int i;
-				int wideBufLen = 0;
-				for (i = 0; i < (int)pCandList->dwCount; i++) {
-					wideBufLen += MultiByteToWideChar(g_uCodePage, 0, (LPSTR)pCandList + pCandList->dwOffset[i], -1, NULL, 0) * sizeof(WCHAR);
-				}
-				wideBufLen += pCandList->dwOffset[0];
-				*ppCandList = (LPCANDIDATELIST)ImeUiCallback_Malloc(wideBufLen);
-				LPCANDIDATELIST pCandListW = *ppCandList;
-				memcpy(pCandListW, pCandList, pCandList->dwOffset[0]);
-				LPWSTR pwz = (LPWSTR)((LPSTR)pCandListW + pCandList->dwOffset[0]);
-				for (i = 0; i < (int)pCandList->dwCount; i++) {
-					pCandListW->dwOffset[i] = (LPSTR)pwz - (LPSTR)pCandListW;
-					pwz += MultiByteToWideChar(g_uCodePage, 0, (LPSTR)pCandList + pCandList->dwOffset[i], -1, pwz, 256);
-				}
-				dwBufLen = wideBufLen;
-			}
-			ImeUiCallback_Free(pCandList);
-		}
-	}
-	return dwBufLen;
-}
-
-static LONG WINAPI AW_ImmGetCompositionString(HIMC himc, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen)
-{
-	char pszMb[COUNTOF(g_szCompositionString) * 2];
-	DWORD dwRet = ImmGetCompositionStringA(himc, dwIndex, pszMb, sizeof(pszMb));
-	switch (dwIndex) {
-	case GCS_RESULTSTR:
-	case GCS_COMPSTR:
-		if (dwRet) {
-			pszMb[dwRet] = 0;
-			dwRet = (DWORD)MultiByteToWideChar(g_uCodePage, 0, pszMb, -1, (LPWSTR)lpBuf, dwBufLen);
-			if (dwRet) {
-				// Note that ImmGetCompositionString() returns number of bytes copied, regardless of the width of character.
-				dwRet = (dwRet - 1) * sizeof(WCHAR);
-			}
-		}
-		break;
-	case GCS_CURSORPOS:
-		dwRet /= 2;
-		break;
-	case GCS_COMPATTR: {
-		char pszMb2[COUNTOF(g_szCompositionString) * 2];
-		DWORD dwRet2 = ImmGetCompositionStringA(himc, GCS_COMPSTR, pszMb2, sizeof(pszMb2));
-		if (!dwRet2) {
-			dwRet2 = ImmGetCompositionStringA(himc, GCS_RESULTSTR, pszMb2, sizeof(pszMb2));
-			if (!dwRet2) {
-				return 0;
-			}
-		}
-		char* pOut = (char*)lpBuf;
-		for (DWORD i = 0; i < dwRet; i++) {
-			*pOut++ = pszMb[i];	// copy attribute
-			if (_IsLeadByte(pszMb2[i]))
-				i++;
-		}
-		dwRet = pOut - (char*)lpBuf;
-		}
-		break;
-	}
-	return dwRet;
-}
-
-#else	// !UNICODE
-// returns number of characters from number of bytes
-static int GetCharCountFromBytes( LPCSTR pszString, int iBytes )
-{
-    int iCount = 0;
-    int i;
-    for( i = 0; pszString[i] && i < iBytes; i++ )
-    {
-        iCount++;
-        if( _IsLeadByte(pszString[i]) )
-            i++;
-    }
-    if( i != iBytes )
-        iCount = -iCount;	// indicate error - iBytes specifies wrong boundary (i.e. the last byte is leadbyte)
-    return iCount;
-}
-
-static int GetCharCount( LPTSTR psz )
-{
-    int i = 0;
-    while( *psz )
-    {
-        if( _IsLeadByte(*psz) )
-        {
-            psz++;
-        }
-        psz++;
-        i++;
-    }
-    return i;
-}
-
-static DWORD WA_GetCandidateList( HIMC himc, DWORD dwIndex, LPCANDIDATELIST* ppCandList )
-{
-    DWORD dwBufLen = ImmGetCandidateListW( himc, dwIndex, NULL, 0 );
-    if( dwBufLen )
-    {
-        LPCANDIDATELIST pCandList = ( LPCANDIDATELIST )ImeUiCallback_Malloc( dwBufLen );
-        if( pCandList )
-        {
-            dwBufLen = ImmGetCandidateListW( himc, dwIndex, pCandList, dwBufLen );
-            if( dwBufLen )
-            {
-                int i;
-                int mbBufLen = 0;
-                for( i = 0; i < ( int )pCandList->dwCount; i++ )
-                {
-                    mbBufLen += WideCharToMultiByte( g_uCodePage, 0, ( LPWSTR )( ( LPSTR )pCandList +
-                                                                                 pCandList->dwOffset[i] ), -1, NULL, 0,
-                                                     NULL, NULL );
-                }
-                mbBufLen += pCandList->dwOffset[0];
-                *ppCandList = ( LPCANDIDATELIST )ImeUiCallback_Malloc( mbBufLen );
-                LPCANDIDATELIST pCandListA = *ppCandList;
-                memcpy( pCandListA, pCandList, pCandList->dwOffset[0] );
-                LPSTR psz = ( LPSTR )pCandListA + pCandList->dwOffset[0];
-                for( i = 0; i < ( int )pCandList->dwCount; i++ )
-                {
-                    pCandListA->dwOffset[i] = ( LPSTR )psz - ( LPSTR )pCandListA;
-                    psz += WideCharToMultiByte( g_uCodePage, 0, ( LPWSTR )( ( LPSTR )pCandList +
-                                                                            pCandList->dwOffset[i] ), -1, psz, 256,
-                                                NULL, NULL );
-                }
-                dwBufLen = mbBufLen;
-            }
-            ImeUiCallback_Free( pCandList );
-        }
-    }
-    return dwBufLen;
-}
-
-static LONG WINAPI WA_ImmGetCompositionString( HIMC himc, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen )
-{
-    WCHAR pwzUc[COUNTOF(g_szCompositionString)];
-    DWORD dwRet = ImmGetCompositionStringW( himc, dwIndex, pwzUc, sizeof( pwzUc ) );
-    switch( dwIndex )
-    {
-        case GCS_RESULTSTR:
-        case GCS_COMPSTR:
-            if( dwRet )
-            {
-                pwzUc[dwRet / sizeof( WCHAR )] = 0;
-                dwRet = ( DWORD )WideCharToMultiByte( g_uCodePage, 0, pwzUc, -1, ( LPSTR )lpBuf, dwBufLen, NULL,
-                                                      NULL );
-                if( dwRet )
-                {
-                    dwRet = dwRet - 1;
-                }
-            }
-            break;
-
-        case GCS_CURSORPOS:
-        {
-            WCHAR pwzUc2[COUNTOF(g_szCompositionString)];
-            DWORD dwRet2 = ImmGetCompositionStringW( himc, GCS_COMPSTR, pwzUc2, sizeof( pwzUc2 ) );
-            if( !dwRet2 )
-            {
-                dwRet2 = ImmGetCompositionStringW( himc, GCS_RESULTSTR, pwzUc2, sizeof( pwzUc2 ) );
-                if( !dwRet2 )
-                {
-                    return 0;
-                }
-            }
-            dwRet2 /= 2;
-            //The return value of WideCharToMultiByte() should probably be checked/asserted for success.
-            //bounds violation (overflow) 'pszMb[iRc]'
-            const int bufSize = COUNTOF(g_szCompositionString) * 2;
-            char pszMb[bufSize];
-            int iRc = WideCharToMultiByte( g_uCodePage, 0, pwzUc2, dwRet2, pszMb, sizeof( pszMb ), NULL, NULL );
-            assert( iRc > 0 ); //WideCharToMultiByte returns 0 if it failed, and it should *never* be negative in the first place
-            if( iRc >= bufSize ) //if we wrote more bytes than the length of the buffer, we need to terminate it
-            {
-                pszMb[ bufSize - 1] = 0; //0 terminate the end of the buffer
-            }
-            else
-            {
-                pszMb[ iRc ] = 0;
-            }
-            char* psz = pszMb;
-            for( dwRet2 = 0; dwRet2 != dwRet; dwRet2++ )
-            {
-                if( _IsLeadByte( *psz ) )
-                    psz++;
-                psz++;
-            }
-            dwRet = psz - pszMb;
-        }
-            break;
-
-        case GCS_COMPATTR:
-        {
-            WCHAR pwzUc2[COUNTOF(g_szCompositionString)];
-            DWORD dwRet2 = ImmGetCompositionStringW( himc, GCS_COMPSTR, pwzUc2, sizeof( pwzUc2 ) );
-            if( !dwRet2 )
-            {
-                dwRet2 = ImmGetCompositionStringW( himc, GCS_RESULTSTR, pwzUc2, sizeof( pwzUc2 ) );
-                if( !dwRet2 )
-                {
-                    return 0;
-                }
-            }
-            dwRet2 /= 2;
-            const int bufSize = COUNTOF(g_szCompositionString) * 2;
-            char pszMb[bufSize];
-            int iRc = WideCharToMultiByte( g_uCodePage, 0, pwzUc2, dwRet2, pszMb, sizeof( pszMb ), NULL, NULL );
-            assert( iRc > 0 ); //WideCharToMultiByte returns 0 if it failed, and it should *never* be negative in the first place
-            if( iRc >= bufSize ) //if we wrote more bytes than the length of the buffer, we need to terminate it
-            {
-                pszMb[ bufSize - 1] = 0; //0 terminate the end of the buffer
-            }
-            else
-            {
-                pszMb[ iRc ] = 0;
-            }
-            char* pSrc = ( char* )pwzUc;
-            char* pOut = ( char* )lpBuf;
-            for( char* psz = pszMb; *psz; psz++, pSrc++ )
-            {
-                *pOut++ = *pSrc;	// copy attribute
-                if( _IsLeadByte( *psz ) )
-                {
-                    *pOut++ = *pSrc;
-                    psz++;
-                }
-                // buffer overrun protection, pOut is incremented in the loop, but not part	of the 
-                // loop	invariant test.	To make	the	code more readable we have a test rather than
-                // rolling this	into the for stmt.
-                if( ( DWORD )( pOut - ( char* )lpBuf ) >= dwBufLen )
-                    break;
-            }
-            dwRet = pOut - ( char* )lpBuf;
-        }
-            break;
-    }
-    return dwRet;
-}
-
-#endif	// UNICODE
 
 static void ComposeCandidateLine( int index, LPCTSTR pszCandidate )
 {
@@ -746,17 +468,11 @@ static void ComposeCandidateLine( int index, LPCTSTR pszCandidate )
 
 static void SendCompString()
 {
-    int i, iLen = lstrlen( g_szCompositionString );
+    int i, iLen = (int)wcslen( g_szCompositionString );
     if( ImeUiCallback_OnChar )
     {
         LPCWSTR pwz;
-#ifdef UNICODE
-		pwz = g_szCompositionString;
-#else
-        WCHAR szUnicode[COUNTOF( g_szCompositionString ) ];
-        pwz = szUnicode;
-        iLen = MultiByteToWideChar( g_uCodePage, 0, g_szCompositionString, -1, szUnicode, COUNTOF(szUnicode) ) - 1;
-#endif
+        pwz = g_szCompositionString;
         for( i = 0; i < iLen; i++ )
         {
             ImeUiCallback_OnChar( pwz[i] );
@@ -766,18 +482,14 @@ static void SendCompString()
     for( i = 0; i < iLen; i++ )
     {
         SendKeyMsg( g_hwndCurr, WM_CHAR,
-#ifdef UNICODE
-			(WPARAM)g_szCompositionString[i]
-#else
-                    ( WPARAM )( BYTE )g_szCompositionString[i]
-#endif
+       (WPARAM)g_szCompositionString[i]
                     );
     }
 }
 
 static DWORD GetCandidateList( HIMC himc, DWORD dwIndex, LPCANDIDATELIST* ppCandList )
 {
-    DWORD dwBufLen = _ImmGetCandidateList( himc, dwIndex, NULL, 0 );
+    DWORD dwBufLen = _ImmGetCandidateList( himc, dwIndex, nullptr, 0 );
     if( dwBufLen )
     {
         *ppCandList = ( LPCANDIDATELIST )ImeUiCallback_Malloc( dwBufLen );
@@ -833,7 +545,7 @@ static void CancelCompString( HWND hwnd, bool bUseBackSpace = true, int iNewStrL
 }
 
 // initialize composition string data.
-static void InitCompStringData( void )
+static void InitCompStringData()
 {
     g_IMECursorBytes = 0;
     g_IMECursorChars = 0;
@@ -856,7 +568,7 @@ static void DrawCaret( DWORD x, DWORD y, DWORD height )
 //     // Draw text in the edit box;
 //     ImeUi_RenderUi(false, true); // paint the rest of IME UI;
 //
-void ImeUi_RenderUI( bool bDrawCompAttr, bool bDrawOtherUi )
+void ImeUi_RenderUI( _In_ bool bDrawCompAttr, _In_ bool bDrawOtherUi )
 {
     if( !g_bInitialized || !g_bImeEnabled || !g_CaretInfo.pFont )
         return;
@@ -936,7 +648,7 @@ static void DrawImeIndicator()
         swirl = 0;
     for( int t1 = 1; t1 < 16; t1++ )
     {
-        float radian = 2.0f * 3.1415926f * ( t1 - 1 + ( bOn * swirl ) ) / 14.0f;
+        float radian = 2.0f * 3.1415926f * ( t1 - 1 + ( DWORD(bOn) * swirl ) ) / 14.0f;
         PieData[t1].sx = ( float )( PieData[0].sx + SizeOfPie / 2 * cos( radian ) );
         PieData[t1].sy = ( float )( PieData[0].sy + SizeOfPie / 2 * sin( radian ) );
         PieData[t1].rhw = 1.0f;
@@ -987,9 +699,9 @@ static void DrawImeIndicator()
     if( gSkinIME.symbolFont )
     {
 #ifdef DS2
-		// save the font height here since DS2 shares editbox font and indicator font
-		DWORD _w, _h;
-		g_CaretInfo.pFont->GetTextExtent( TEXT(" "), &_w, &_h );
+        // save the font height here since DS2 shares editbox font and indicator font
+        DWORD _w, _h;
+        g_CaretInfo.pFont->GetTextExtent( TEXT(" "), &_w, &_h );
 #endif //DS2
 
         // GOS deals height in points that is 1/72nd inch and assumes display device is 96dpi.
@@ -1008,33 +720,33 @@ static void DrawImeIndicator()
         gSkinIME.symbolFont->DrawText( cszSymbol );
 
 #ifdef DS2
-		// revert the height.
-		g_CaretInfo.pFont->SetHeight( _h );
-		
-		// Double-check: Confirm match by testing a range of font heights to find best fit
-		DWORD _h2;
-		g_CaretInfo.pFont->GetTextExtent( TEXT(" "), &_w, &_h2 );
-		if ( _h2 < _h )
-		{
-			for ( int i=1; _h2<_h && i<10; i++ )
-			{
-				g_CaretInfo.pFont->SetHeight( _h+i );
-				g_CaretInfo.pFont->GetTextExtent( TEXT(" "), &_w, &_h2 );
-			}
-		}
-		else if ( _h2 > _h )
-		{
-			for ( int i=1; _h2>_h && i<10; i++ )
-			{
-				g_CaretInfo.pFont->SetHeight( _h-i );
-				g_CaretInfo.pFont->GetTextExtent( TEXT(" "), &_w, &_h2 );
-			}
-		}
+        // revert the height.
+        g_CaretInfo.pFont->SetHeight( _h );
+        
+        // Double-check: Confirm match by testing a range of font heights to find best fit
+        DWORD _h2;
+        g_CaretInfo.pFont->GetTextExtent( TEXT(" "), &_w, &_h2 );
+        if ( _h2 < _h )
+        {
+            for ( int i=1; _h2<_h && i<10; i++ )
+            {
+                g_CaretInfo.pFont->SetHeight( _h+i );
+                g_CaretInfo.pFont->GetTextExtent( TEXT(" "), &_w, &_h2 );
+            }
+        }
+        else if ( _h2 > _h )
+        {
+            for ( int i=1; _h2>_h && i<10; i++ )
+            {
+                g_CaretInfo.pFont->SetHeight( _h-i );
+                g_CaretInfo.pFont->GetTextExtent( TEXT(" "), &_w, &_h2 );
+            }
+        }
 #endif //DS2
     }
 }
 
-static void DrawCompositionString( bool bDrawCompAttr )
+static void DrawCompositionString( _In_ bool bDrawCompAttr )
 {
     // Process timer for caret blink
     UINT uCurrentTime = GetTickCount();
@@ -1050,7 +762,7 @@ static void DrawCompositionString( bool bDrawCompAttr )
 
     DWORD uDummy;
 
-    int len = lstrlen( g_szCompositionString );
+    int len = (int)wcslen( g_szCompositionString );
 
     DWORD bgX = g_CaretInfo.caretX;
     DWORD bgY = g_CaretInfo.caretY;
@@ -1089,11 +801,6 @@ static void DrawCompositionString( bool bDrawCompAttr )
             TCHAR szChar[3];
             szChar[0] = g_szCompositionString[i];
             szChar[1] = szChar[2] = 0;
-#ifndef UNICODE
-            cType = 1 + ( ( _IsLeadByte(g_szCompositionString[i]) ) ? 1 : 0 );
-            if( cType == 2 && g_szCompositionString[i + 1] )	// in case we have 0 in trailbyte, we don't count it.
-                szChar[1] = g_szCompositionString[i + 1];
-#endif
             bgX = bgXnext;
             TCHAR cSave = g_szCompositionString[i + cType];
             g_szCompositionString[i + cType] = 0;
@@ -1169,10 +876,6 @@ static void DrawCompositionString( bool bDrawCompAttr )
                 if( bWrite )
                 {
                     *pszMlcs++ = g_szCompositionString[i];
-#ifndef UNICODE
-                    if( cType == 2 )
-                        *pszMlcs++ = g_szCompositionString[i + 1];
-#endif
                 }
                 if( ( DWORD )i == g_IMECursorBytes )
                 {
@@ -1214,7 +917,7 @@ static void DrawCompositionString( bool bDrawCompAttr )
         {
             g_CaretInfo.pFont->SetPosition( x, y );
             g_CaretInfo.pFont->DrawText( pszMlcs );
-            pszMlcs += lstrlen( pszMlcs ) + 1;
+            pszMlcs += wcslen( pszMlcs ) + 1;
             x = g_CaretInfo.margins.left;
             y += hCompChar;
         }
@@ -1231,6 +934,8 @@ static void DrawCompositionString( bool bDrawCompAttr )
 
 static void DrawCandidateList()
 {
+    assert( g_CaretInfo.pFont != nullptr );
+    _Analysis_assume_( g_CaretInfo.pFont != nullptr );
     DWORD candX = g_dwCandX;
     DWORD candY = g_dwCandY;
     DWORD hCompChar = g_hCompChar;
@@ -1267,7 +972,7 @@ static void DrawCandidateList()
     static DWORD uDigitWidth = 0;
     DWORD uSpaceWidth = 0;
     static DWORD uDigitWidthList[10];
-    static CImeUiFont_Base* pPrevFont = NULL;
+    static CImeUiFont_Base* pPrevFont = nullptr;
     // find out the widest width of the digits
     if( pPrevFont != g_CaretInfo.pFont )
     {
@@ -1406,13 +1111,9 @@ static void DrawCandidateList()
         TCHAR szTemp[COUNTOF( g_szReadingString ) ];
         if( g_iReadingError >= 0 )
         {
-            StringCchCopy( szTemp, COUNTOF(szTemp), g_szReadingString );
+            wcscpy_s( szTemp, COUNTOF(szTemp), g_szReadingString );
             LPTSTR psz = szTemp + g_iReadingError;
-#ifdef UNICODE
-			psz++;
-#else
-            psz += ( _IsLeadByte( szTemp[g_iReadingError] ) ) ? 2 : 1;
-#endif
+            psz++;
             *psz = 0;
             g_CaretInfo.pFont->GetTextExtent( szTemp, ( DWORD* )&iEnd, ( DWORD* )&iDummy );
             TCHAR cSave = szTemp[ g_iReadingError ];
@@ -1477,7 +1178,7 @@ static void DrawCandidateList()
 
                     int dx = candX + ( seperateLineX - candX - uDigitWidthList[nOneDigit] ) / 2;
                     int dy = candY + largest.cy * i;
-					
+                    
                     g_CaretInfo.pFont->SetPosition( dx, dy );
                     g_CaretInfo.pFont->DrawText( szOneDigit );
                     g_CaretInfo.pFont->SetPosition( seperateLineX + dwMarginX, dy );
@@ -1519,6 +1220,9 @@ static void CloseCandidateList()
 //	ProcessIMEMessages()
 //	Processes IME related messages and acquire information
 //
+#pragma warning(push)
+#pragma warning( disable : 4616 6305 )
+_Use_decl_annotations_
 LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam, bool* trapped )
 {
     HIMC himc;
@@ -1559,7 +1263,8 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
             TCHAR szCompStr[COUNTOF(g_szCompositionString)];
 
             *trapped = true;
-            if( NULL == ( himc = _ImmGetContext( hWnd ) ) )
+            himc = ImmGetContext( hWnd );
+            if( !himc )
             {
                 break;
             }
@@ -1571,7 +1276,7 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
                                                          COUNTOF( szCompStr ) ) / sizeof( TCHAR );
                 szCompStr[lRet] = 0;
                 CancelCompString( g_hwndCurr, false, GetCharCount( szCompStr ) );
-                StringCchCopy( g_szCompositionString, COUNTOF(g_szCompositionString), szCompStr );
+                wcscpy_s( g_szCompositionString, COUNTOF(g_szCompositionString), szCompStr );
                 _SendCompString();
                 InitCompStringData();
             }
@@ -1590,14 +1295,14 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
                 //
                 CancelCompString( g_hwndCurr, false, GetCharCount( szCompStr ) );
 
-                StringCchCopy( g_szCompositionString, COUNTOF(g_szCompositionString), szCompStr );
+                wcscpy_s( g_szCompositionString, COUNTOF(g_szCompositionString), szCompStr );
                 lRet = _ImmGetCompositionString( himc, GCS_COMPATTR, g_szCompAttrString,
                                                  COUNTOF( g_szCompAttrString ) );
                 g_szCompAttrString[lRet] = 0;
                 // Older CHT IME uses composition string for reading string
                 if( GETLANG() == LANG_CHT && !GetImeId() )
                 {
-                    int i, chars = lstrlen( g_szCompositionString ) / ( 3 - sizeof( TCHAR ) );
+                    int i, chars = (int)wcslen( g_szCompositionString ) / ( 3 - sizeof( TCHAR ) );
                     if( chars )
                     {
                         g_dwCount = 4;
@@ -1609,14 +1314,8 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
                                 g_szCandidate[i][0] = 0;
                             else
                             {
-#ifdef UNICODE
-									g_szCandidate[i][0] = g_szCompositionString[i];
-									g_szCandidate[i][1] = 0;
-#else
-                                g_szCandidate[i][0] = g_szCompositionString[i * 2];
-                                g_szCandidate[i][1] = g_szCompositionString[i * 2 + 1];
-                                g_szCandidate[i][2] = 0;
-#endif
+                                g_szCandidate[i][0] = g_szCompositionString[i];
+                                g_szCandidate[i][1] = 0;
                             }
                         }
                         g_uCandPageSize = MAX_CANDLIST;
@@ -1630,7 +1329,7 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
                             for( i = 0; i < ( int )g_dwCount; i++ )
                             {
                                 if( g_dwSelection == ( DWORD )i )
-                                    g_iReadingError = lstrlen( g_szReadingString );
+                                    g_iReadingError = (int)wcslen( g_szReadingString );
                                 LPCTSTR pszTmp = g_szCandidate[i];
                                 wcscat_s( g_szReadingString, COUNTOF(g_szReadingString), pszTmp );
                             }
@@ -1641,7 +1340,7 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
                 }
 
                 // get caret position in composition string
-                g_IMECursorBytes = _ImmGetCompositionString( himc, GCS_CURSORPOS, NULL, 0 );
+                g_IMECursorBytes = _ImmGetCompositionString( himc, GCS_CURSORPOS, nullptr, 0 );
                 g_IMECursorChars = GetCharCountFromBytes( g_szCompositionString, g_IMECursorBytes );
 
                 if( g_dwIMELevel == 3 )
@@ -1686,7 +1385,7 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
                         break;
                     CheckToggleState();
                     break;
-			
+            
                 case IMN_OPENCANDIDATE:
                 case IMN_CHANGECANDIDATE:
                     if( g_bUILessMode )
@@ -1696,9 +1395,10 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
                     {
                         g_bCandList = true;
                         *trapped = true;
-                        if( NULL == ( himc = _ImmGetContext( hWnd ) ) )
+                        himc = _ImmGetContext( hWnd );
+                        if( !himc )
                             break;
-					
+                    
                         LPCANDIDATELIST lpCandList;
                         DWORD dwIndex, dwBufLen;
 
@@ -1721,8 +1421,8 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
                                 UINT i;
                                 for( i = 0; i < g_dwCount; i++ )
                                 {
-                                    UINT uLen = lstrlen(
-                                        ( LPTSTR )( ( DWORD )lpCandList + lpCandList->dwOffset[i] ) ) +
+                                    UINT uLen = (int)wcslen(
+                                        ( LPTSTR )( (UINT_PTR)lpCandList + lpCandList->dwOffset[i] ) ) +
                                         ( 3 - sizeof( TCHAR ) );
                                     if( uLen + cChars > maxCandChar )
                                     {
@@ -1742,7 +1442,7 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
                             }
                             else
                             {
-                                g_uCandPageSize = min( lpCandList->dwPageSize, MAX_CANDLIST );
+                                g_uCandPageSize = std::min<UINT>( lpCandList->dwPageSize, MAX_CANDLIST );
                                 startOfPage = g_bUILessMode ? lpCandList->dwPageStart :
                                     ( g_dwSelection / g_uCandPageSize ) * g_uCandPageSize;
                             }
@@ -1756,7 +1456,7 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
                                  i++, j++ )
                             {
                                 ComposeCandidateLine( j,
-                                                      ( LPTSTR )( ( DWORD )lpCandList + lpCandList->dwOffset[i] ) );
+                                                      ( LPTSTR )( (UINT_PTR)lpCandList + lpCandList->dwOffset[i] ) );
                             }
                             ImeUiCallback_Free( ( HANDLE )lpCandList );
                             _ImmReleaseContext( hWnd, himc );
@@ -1768,7 +1468,7 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
                         }
                         break;
                     }
-			
+            
                 case IMN_CLOSECANDIDATE:
                     if( g_bUILessMode )
                     {
@@ -1859,7 +1559,9 @@ LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam
     }
     return 0;
 }
+#pragma warning(pop)
 
+_Use_decl_annotations_
 void ImeUi_SetCaretPosition( UINT x, UINT y )
 {
     if( !g_bInitialized )
@@ -1868,6 +1570,7 @@ void ImeUi_SetCaretPosition( UINT x, UINT y )
     g_CaretInfo.caretY = y;
 }
 
+_Use_decl_annotations_
 void ImeUi_SetCompStringAppearance( CImeUiFont_Base* pFont, DWORD color, const RECT* prc )
 {
     if( !g_bInitialized )
@@ -1885,7 +1588,7 @@ void ImeUi_SetCompStringAppearance( CImeUiFont_Base* pFont, DWORD color, const R
         g_CaretInfo.colorComp = gSkinIME.compColorText;
 }
 
-void ImeUi_SetState( DWORD dwState )
+void ImeUi_SetState( _In_ DWORD dwState )
 {
     if( !g_bInitialized )
         return;
@@ -1894,7 +1597,8 @@ void ImeUi_SetState( DWORD dwState )
     {
         ImeUi_EnableIme( true );
     }
-    if( NULL != ( himc = _ImmGetContext( g_hwndCurr ) ) )
+    himc = _ImmGetContext( g_hwndCurr );
+    if( himc )
     {
         if( g_bDisableImeCompletely )
             dwState = IMEUI_STATE_OFF;
@@ -1951,7 +1655,7 @@ DWORD ImeUi_GetState()
     return g_dwState;
 }
 
-void ImeUi_EnableIme( bool bEnable )
+void ImeUi_EnableIme( _In_ bool bEnable )
 {
     if( !g_bInitialized || !g_hwndCurr )
         return;
@@ -1961,7 +1665,7 @@ void ImeUi_EnableIme( bool bEnable )
     if( g_hwndCurr == g_hwndMain )
     {
         HIMC himcDbg;
-        himcDbg = _ImmAssociateContext( g_hwndCurr, bEnable? g_himcOrg : NULL );
+        himcDbg = _ImmAssociateContext( g_hwndCurr, bEnable? g_himcOrg : nullptr );
     }
     g_bImeEnabled = bEnable;
     if( bEnable )
@@ -1971,12 +1675,12 @@ void ImeUi_EnableIme( bool bEnable )
     CTsfUiLessMode::EnableUiUpdates( bEnable );
 }
 
-bool ImeUi_IsEnabled( void )
+bool ImeUi_IsEnabled()
 {
     return g_bImeEnabled;
 }
 
-bool ImeUi_Initialize( HWND hwnd, bool bDisable )
+bool ImeUi_Initialize(_In_  HWND hwnd, _In_ bool bDisable )
 {
     if( g_bInitialized )
     {
@@ -1985,29 +1689,17 @@ bool ImeUi_Initialize( HWND hwnd, bool bDisable )
     g_hwndMain = hwnd;
     g_disableCicero.Initialize();
 
-    g_osi.dwOSVersionInfoSize = sizeof( OSVERSIONINFOA );
-    GetVersionExA( &g_osi );
-
-    bool bUnicodeImm = false;
-    // IMM in NT or Win98 supports Unicode
-    if( g_osi.dwPlatformId == VER_PLATFORM_WIN32_NT ||
-        ( g_osi.dwMajorVersion > 4 ) ||
-        ( g_osi.dwMajorVersion == 4 ) && ( g_osi.dwMinorVersion > 0 ) )
-    {
-        bUnicodeImm = true;
-    }
-
-    g_hImmDll = LoadLibraryA( "imm32.dll" );
+    g_hImmDll = LoadLibraryEx( L"imm32.dll", nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
     g_bDisableImeCompletely = false;
 
     if( g_hImmDll )
     {
-        _ImmLockIMC = ( LPINPUTCONTEXT2 ( WINAPI* )( HIMC hIMC ) )GetProcAddress( g_hImmDll, "ImmLockIMC" );
-        _ImmUnlockIMC = ( BOOL ( WINAPI* )( HIMC hIMC ) )GetProcAddress( g_hImmDll, "ImmUnlockIMC" );
-        _ImmLockIMCC = ( LPVOID ( WINAPI* )( HIMCC hIMCC ) )GetProcAddress( g_hImmDll, "ImmLockIMCC" );
-        _ImmUnlockIMCC = ( BOOL ( WINAPI* )( HIMCC hIMCC ) )GetProcAddress( g_hImmDll, "ImmUnlockIMCC" );
-        BOOL ( WINAPI* _ImmDisableTextFrameService )( DWORD ) = ( BOOL ( WINAPI* )( DWORD ) )GetProcAddress( g_hImmDll,
-                                                                                                             "ImmDisableTextFrameService" );
+        _ImmLockIMC = reinterpret_cast<LPINPUTCONTEXT2 ( WINAPI* )( HIMC hIMC )>( reinterpret_cast<void*>( GetProcAddress( g_hImmDll, "ImmLockIMC" ) ) );
+        _ImmUnlockIMC = reinterpret_cast<BOOL ( WINAPI* )( HIMC hIMC )>( reinterpret_cast<void*>( GetProcAddress( g_hImmDll, "ImmUnlockIMC" ) ) );
+        _ImmLockIMCC = reinterpret_cast<LPVOID ( WINAPI* )( HIMCC hIMCC )>( reinterpret_cast<void*>( GetProcAddress( g_hImmDll, "ImmLockIMCC" ) ) );
+        _ImmUnlockIMCC = reinterpret_cast<BOOL ( WINAPI* )( HIMCC hIMCC )>( reinterpret_cast<void*>( GetProcAddress( g_hImmDll, "ImmUnlockIMCC" ) ) );
+        BOOL ( WINAPI* _ImmDisableTextFrameService )( DWORD ) = reinterpret_cast<BOOL ( WINAPI* )( DWORD )>( reinterpret_cast<void*>( GetProcAddress( g_hImmDll,
+                                                                                                             "ImmDisableTextFrameService" ) ) );
         if( _ImmDisableTextFrameService )
         {
             _ImmDisableTextFrameService( ( DWORD )-1 );
@@ -2018,52 +1710,11 @@ bool ImeUi_Initialize( HWND hwnd, bool bDisable )
         g_bDisableImeCompletely = true;
         return false;
     }
-#ifdef UNICODE
-	if ( bUnicodeImm )
-	{
-		_ImmGetCompositionString =	ImmGetCompositionStringW;
-		_ImmGetCandidateList =		ImmGetCandidateListW;
-		_GetCandidateList =			GetCandidateList;
-	}
-	else
-	{
-		_ImmGetCandidateList =		ImmGetCandidateListA;
-		_ImmGetCompositionString =	AW_ImmGetCompositionString;
-		_GetCandidateList =			AW_GetCandidateList;
-	}
-#else
-    if( bUnicodeImm )
-    {
-        _ImmGetCompositionString = WA_ImmGetCompositionString;
-        _ImmGetCandidateList = ImmGetCandidateListA;
-        _GetCandidateList = WA_GetCandidateList;
-    }
-    else
-    {
-        _ImmGetCompositionString = ImmGetCompositionStringA;
-        _ImmGetCandidateList = ImmGetCandidateListA;
-        _GetCandidateList = GetCandidateList;
-    }
-#endif
-
-    // There are the following combinations of code config, window type, and the method of sending characters.
-    // Wnd: Unicode, Code: Unicode, Method: SendMessageW (SendMessageW must be supported since RegisterClassW is successful)
-    // Wnd: non Uni, Code: Unicode, Method: AW_SendCompString (Send characters in multibyte after W->A conversion)
-    // Wnd: Unicode, Code: non Uni, Method: SendMessageA (System does A->W conversion) - possible, but unlikely to be used.
-    // Wnd: non Uni, Code: non Uni, Method: SendMessageA
-#ifdef UNICODE
-	if ( !IsWindowUnicode( hwnd ) )
-	{
-		_SendCompString = AW_SendCompString;
-	}
-	else
-#endif
-    {
-        _SendCompString = SendCompString;
-#ifdef UNICODE
-		_SendMessage = SendMessageW;
-#endif
-    }
+    _ImmGetCompositionString = ImmGetCompositionStringW;
+    _ImmGetCandidateList = ImmGetCandidateListW;
+    _GetCandidateList = GetCandidateList;
+    _SendCompString = SendCompString;
+    _SendMessage = SendMessageW;
 
     // turn init flag on so that subsequent calls to ImeUi functions work. 
     g_bInitialized = true;
@@ -2091,19 +1742,6 @@ bool ImeUi_Initialize( HWND hwnd, bool bDisable )
 
     g_uCaretBlinkTime = GetCaretBlinkTime();
 
-#ifndef UNICODE
-    // Check if system is SBCS system
-    CPINFO cpi;
-    BOOL bRc = GetCPInfo( CP_ACP, &cpi );
-    if( bRc )
-    {
-        if( cpi.MaxCharSize == 1 )
-        {
-            g_bDisableImeCompletely = true;	// SBCS system. Disable IME.
-        }
-    }
-#endif
-
     g_CaretInfo.caretX = 0;
     g_CaretInfo.caretY = 0;
     g_CaretInfo.pFont = 0;
@@ -2142,12 +1780,12 @@ void ImeUi_Uninitialize()
     {
         ImmAssociateContext( g_hwndMain, g_himcOrg );
     }
-    g_hwndMain = NULL;
-    g_himcOrg = NULL;
+    g_hwndMain = nullptr;
+    g_himcOrg = nullptr;
     if( g_hImmDll )
     {
         FreeLibrary( g_hImmDll );
-        g_hImmDll = NULL;
+        g_hImmDll = nullptr;
     }
     g_disableCicero.Uninitialize();
     g_bInitialized = false;
@@ -2172,14 +1810,14 @@ void ImeUi_Uninitialize()
 //
 //	Use IMEID_VER and IMEID_LANG macro to extract version and language information.
 //	
-static DWORD GetImeId( UINT uIndex )
+static DWORD GetImeId( _In_ UINT uIndex )
 {
     static HKL hklPrev = 0;
     static DWORD dwRet[2] =
     {
         0, 0
     };
-	
+    
     DWORD dwVerSize;
     DWORD dwVerHandle;
     LPVOID lpVerBuffer;
@@ -2196,7 +1834,7 @@ static DWORD GetImeId( UINT uIndex )
         return dwRet[uIndex];
     }
     hklPrev = kl;
-    DWORD dwLang = ( ( DWORD )kl & 0xffff );
+    DWORD dwLang = ( static_cast<DWORD>(reinterpret_cast<UINT_PTR>(kl)) & 0xffff );
 
     if( g_bUILessMode && GETLANG() == LANG_CHT )
     {
@@ -2211,7 +1849,7 @@ static DWORD GetImeId( UINT uIndex )
     {
         goto error;
     }
-	
+    
     if( _ImmGetIMEFileNameA( kl, szTmp, sizeof( szTmp ) - 1 ) <= 0 )
     {
         goto error;
@@ -2237,7 +1875,7 @@ static DWORD GetImeId( UINT uIndex )
         lpVerBuffer = ( LPVOID )ImeUiCallback_Malloc( dwVerSize );
         if( lpVerBuffer )
         {
-            if( GetFileVersionInfoA( szTmp, dwVerHandle, dwVerSize, lpVerBuffer ) )
+            if( GetFileVersionInfoA( szTmp, 0, dwVerSize, lpVerBuffer ) )
             {
                 if( VerQueryValueA( lpVerBuffer, "\\", &lpVerData, &cbVerData ) )
                 {
@@ -2267,10 +1905,9 @@ static DWORD GetImeId( UINT uIndex )
 #undef pVerFixedInfo
                 }
             }
+            ImeUiCallback_Free( lpVerBuffer );
         }
-        ImeUiCallback_Free( lpVerBuffer );
     }
-
     // The flow comes here in the following conditions
     // - Non Chinese IME input locale
     // - Older Chinese IME
@@ -2280,7 +1917,7 @@ error:
     return dwRet[uIndex];
 }
 
-static void GetReadingString( HWND hWnd )
+static void GetReadingString( _In_ HWND hWnd )
 {
     if( g_bUILessMode )
     {
@@ -2291,7 +1928,7 @@ static void GetReadingString( HWND hWnd )
     {
         return;
     }
-	
+    
     HIMC himc;
     himc = _ImmGetContext( hWnd );
     if( !himc )
@@ -2302,13 +1939,13 @@ static void GetReadingString( HWND hWnd )
     WCHAR wzBuf[16];	// We believe 16 wchars are big enough to hold reading string after having discussion with CHT IME team.
     WCHAR* wstr = wzBuf;
     bool unicode = FALSE;
-    LPINPUTCONTEXT2 lpIMC = NULL;
+    LPINPUTCONTEXT2 lpIMC = nullptr;
 
     if( _GetReadingString )
     {
         BOOL bVertical;
         UINT uMaxUiLen;
-        dwlen = _GetReadingString( himc, 0, NULL, ( PINT )&dwerr, &bVertical, &uMaxUiLen );
+        dwlen = _GetReadingString( himc, 0, nullptr, ( PINT )&dwerr, &bVertical, &uMaxUiLen );
         if( dwlen )
         {
             if( dwlen > COUNTOF(wzBuf) )
@@ -2324,18 +1961,18 @@ static void GetReadingString( HWND hWnd )
     else //	IMEs that doesn't implement Reading String API
     {
         lpIMC = _ImmLockIMC( himc );
-		
+        
         // *** hacking code from Michael Yang ***
-		
+        
         LPBYTE p = 0;
-		
+        
         switch( dwId )
         {
-		
+        
             case IMEID_CHT_VER42: // New(Phonetic/ChanJie)IME98  : 4.2.x.x // Win98
             case IMEID_CHT_VER43: // New(Phonetic/ChanJie)IME98a : 4.3.x.x // WinMe, Win2k
             case IMEID_CHT_VER44: // New ChanJie IME98b          : 4.4.x.x // WinXP
-			
+            
                 p = *( LPBYTE* )( ( LPBYTE )_ImmLockIMCC( lpIMC->hPrivate ) + 24 );
                 if( !p ) break;
                 dwlen = *( DWORD* )( p + 7 * 4 + 32 * 4 );	//m_dwInputReadStrLen
@@ -2343,9 +1980,9 @@ static void GetReadingString( HWND hWnd )
                 wstr = ( WCHAR* )( p + 56 );
                 unicode = TRUE;
                 break;
-		
+        
             case IMEID_CHT_VER50: // 5.0.x.x // WinME
-			
+            
                 p = *( LPBYTE* )( ( LPBYTE )_ImmLockIMCC( lpIMC->hPrivate ) + 3 * 4 ); // PCKeyCtrlManager
                 if( !p ) break;
                 p = *( LPBYTE* )( ( LPBYTE )p + 1 * 4 + 5 * 4 + 4 * 2 ); // = PCReading = &STypingInfo
@@ -2380,7 +2017,7 @@ static void GetReadingString( HWND hWnd )
                 if( !p ) break;
                 dwlen = *( DWORD* )( p + 7 * 4 + 16 * 2 * 4 );
                 dwerr = *( DWORD* )( p + 8 * 4 + 16 * 2 * 4 );
-                dwerr = min( dwerr, dwlen );
+                dwerr = std::min( dwerr, dwlen );
                 wstr = ( WCHAR* )( p + 6 * 4 + 16 * 2 * 1 );
                 unicode = TRUE;
                 break;
@@ -2397,7 +2034,7 @@ static void GetReadingString( HWND hWnd )
                 unicode = IsNT() ? TRUE : FALSE;
             }
         }	// switch
-		
+        
         g_szCandidate[0][0] = 0;
         g_szCandidate[1][0] = 0;
         g_szCandidate[2][0] = 0;
@@ -2414,19 +2051,8 @@ static void GetReadingString( HWND hWnd )
             { // select error char
                 g_dwSelection = i;
             }
-#ifdef UNICODE
-			g_szCandidate[i][0] = wstr[i];
-			g_szCandidate[i][1] = 0;
-#else
-            char mbc[3];
-            mbc[1] = 0;
-            mbc[2] = 0;
-            WideCharToMultiByte( g_uCodePage, 0, wstr + i, 1, mbc, sizeof( mbc ), NULL, NULL );
-
-            g_szCandidate[i][0] = mbc[0];
-            g_szCandidate[i][1] = mbc[1];
-            g_szCandidate[i][2] = 0;
-#endif
+            g_szCandidate[i][0] = wstr[i];
+            g_szCandidate[i][1] = 0;
         }
         g_szCandidate[i][0] = 0;
     }
@@ -2440,23 +2066,12 @@ static void GetReadingString( HWND hWnd )
             {
                 g_dwSelection = ( DWORD )j;
             }
-#ifdef UNICODE
-			MultiByteToWideChar( g_uCodePage, 0, p + i, 1 + ( _IsLeadByte( p[i] ) ? 1 : 0 ),
-				g_szCandidate[j], 1 );
-			if ( _IsLeadByte( p[i] ) )
-			{
-				i++;
-			}
-#else
-            g_szCandidate[j][0] = p[i];
-            g_szCandidate[j][1] = 0;
-            g_szCandidate[j][2] = 0;
-            if( _IsLeadByte(p[i]) )
+            MultiByteToWideChar( g_uCodePage, 0, p + i, 1 + ( _IsLeadByte( p[i] ) ? 1 : 0 ),
+                g_szCandidate[j], 1 );
+            if ( _IsLeadByte( p[i] ) )
             {
                 i++;
-                g_szCandidate[j][1] = p[i];
             }
-#endif
         }
         g_szCandidate[j][0] = 0;
         g_dwCount = j;
@@ -2477,7 +2092,7 @@ static void GetReadingString( HWND hWnd )
         for( UINT i = 0; i < g_dwCount; i++ )
         {
             if( g_dwSelection == ( DWORD )i )
-                g_iReadingError = lstrlen( g_szReadingString );
+                g_iReadingError = (int)wcslen( g_szReadingString );
             LPCTSTR pszTmp = g_szCandidate[i];
             wcscat_s( g_szReadingString, COUNTOF(g_szReadingString), pszTmp );
         }
@@ -2525,7 +2140,7 @@ static struct
 // - Caller doesn't have to check whether IME is on.
 // - This function must be called before TranslateMessage() is called.
 //
-bool ImeUi_IgnoreHotKey( const MSG* pmsg )
+bool ImeUi_IgnoreHotKey( _In_ const MSG* pmsg )
 {
     if( !g_bInitialized || !pmsg )
         return false;
@@ -2567,34 +2182,29 @@ bool ImeUi_IgnoreHotKey( const MSG* pmsg )
     return false;
 }
 
-void ImeUi_FinalizeString( bool bSend )
+void ImeUi_FinalizeString( _In_ bool bSend )
 {
     HIMC himc;
     static bool bProcessing = false; // to avoid infinite recursion
-    if( !g_bInitialized || bProcessing || NULL == ( himc = _ImmGetContext( g_hwndCurr ) ) )
+    if( !g_bInitialized || bProcessing )
+        return;
+        
+    himc = _ImmGetContext( g_hwndCurr );
+    if ( !himc )
         return;
     bProcessing = true;
 
     if( g_dwIMELevel == 2 && bSend )
     {
         // Send composition string to app.
-        LONG lRet = lstrlen( g_szCompositionString );
+        LONG lRet = (int)wcslen( g_szCompositionString );
         assert( lRet >= 2 );
         // In case of CHT IME, don't send the trailing double byte space, if it exists.
-#ifdef UNICODE
-		if ( GETLANG() == LANG_CHT && (lRet >= 1)
-			&& g_szCompositionString[lRet - 1] == 0x3000 )
-		{
-			lRet--;
-		}
-#else
-        if( GETLANG() == LANG_CHT && ( lRet >= 2 )
-            && ( BYTE )( g_szCompositionString[lRet - 2] ) == 0xa1
-            && ( BYTE )( g_szCompositionString[lRet - 1] ) == 0x40 )
+        if ( GETLANG() == LANG_CHT && (lRet >= 1)
+            && g_szCompositionString[lRet - 1] == 0x3000 )
         {
-            lRet -= 2;
+            lRet--;
         }
-#endif
         _SendCompString();
     }
 
@@ -2604,7 +2214,7 @@ void ImeUi_FinalizeString( bool bSend )
     if( g_bUILessMode )
     {
         // For some reason ImmNotifyIME doesn't work on DaYi and Array CHT IMEs. Cancel composition string by setting zero-length string.
-        ImmSetCompositionString( himc, SCS_SETSTR, TEXT( "" ), sizeof( TCHAR ), TEXT( "" ), sizeof( TCHAR ) );
+        ImmSetCompositionString( himc, SCS_SETSTR, const_cast<wchar_t*>(L""), sizeof(wchar_t), const_cast<char*>(""), sizeof(wchar_t) );
     }
     // the following line is necessary as Korean IME doesn't close cand list when comp string is cancelled.
     _ImmNotifyIME( himc, NI_CLOSECANDIDATE, 0, 0 );	
@@ -2627,7 +2237,7 @@ static void SetCompStringColor()
     gSkinCompStr.colorInputErr = dwTranslucency | gSkinIME.compColorInputErr;
 }
 
-static void SetSupportLevel( DWORD dwImeLevel )
+static void SetSupportLevel( _In_ DWORD dwImeLevel )
 {
     if( dwImeLevel < 2 || 3 < dwImeLevel )
         return;
@@ -2641,7 +2251,7 @@ static void SetSupportLevel( DWORD dwImeLevel )
     SetCompStringColor();
 }
 
-void ImeUi_SetSupportLevel( DWORD dwImeLevel )
+void ImeUi_SetSupportLevel( _In_ DWORD dwImeLevel )
 {
     if( !g_bInitialized )
         return;
@@ -2649,9 +2259,9 @@ void ImeUi_SetSupportLevel( DWORD dwImeLevel )
     SetSupportLevel( dwImeLevel );
 }
 
-void ImeUi_SetAppearance( const IMEUI_APPEARANCE* pia )
+void ImeUi_SetAppearance( _In_opt_ const IMEUI_APPEARANCE* pia )
 {
-    if( !g_bInitialized || NULL == pia )
+    if( !g_bInitialized || !pia )
         return;
     gSkinIME = *pia;
     gSkinIME.symbolColor &= 0xffffff; // mask translucency
@@ -2665,11 +2275,18 @@ void ImeUi_SetAppearance( const IMEUI_APPEARANCE* pia )
     SetCompStringColor();
 }
 
-void ImeUi_GetAppearance( IMEUI_APPEARANCE* pia )
+void ImeUi_GetAppearance( _Out_opt_ IMEUI_APPEARANCE* pia )
 {
-    if( g_bInitialized && pia )
+    if ( pia )
     {
-        *pia = gSkinIME;
+        if ( g_bInitialized )
+        {
+            *pia = gSkinIME;
+        }
+        else
+        {
+            memset( pia, 0, sizeof(IMEUI_APPEARANCE) );
+        }
     }
 }
 
@@ -2686,11 +2303,11 @@ static void CheckToggleState()
     }
 
     bool bIme = _ImmIsIME( g_hklCurrent ) != 0
-        && ( ( 0xF0000000 & ( DWORD )g_hklCurrent ) == 0xE0000000 ); // Hack to detect IME correctly. When IME is running as TIP, ImmIsIME() returns true for CHT US keyboard.
+        && ( ( 0xF0000000 & static_cast<DWORD>( reinterpret_cast<UINT_PTR>( g_hklCurrent ) ) ) == 0xE0000000 ); // Hack to detect IME correctly. When IME is running as TIP, ImmIsIME() returns true for CHT US keyboard.
     g_bChineseIME = ( GETPRIMLANG() == LANG_CHINESE ) && bIme;
 
-    HIMC himc;
-    if( NULL != ( himc = _ImmGetContext( g_hwndCurr ) ) )
+    HIMC himc = _ImmGetContext( g_hwndCurr );
+    if( himc )
     {
         if( g_bChineseIME )
         {
@@ -2708,7 +2325,7 @@ static void CheckToggleState()
         g_dwState = IMEUI_STATE_OFF;
 }
 
-void ImeUi_SetInsertMode( bool bInsert )
+void ImeUi_SetInsertMode( _In_ bool bInsert )
 {
     if( !g_bInitialized )
         return;
@@ -2720,7 +2337,7 @@ bool ImeUi_GetCaretStatus()
     return !g_bInitialized || !g_szCompositionString[0];
 }
 
-void ImeUi_SetScreenDimension( UINT width, UINT height )
+void ImeUi_SetScreenDimension( _In_ UINT width, _In_ UINT height )
 {
     if( !g_bInitialized )
         return;
@@ -2732,9 +2349,9 @@ void ImeUi_SetScreenDimension( UINT width, UINT height )
 static void _PumpMessage()
 {
     MSG msg;
-    while( PeekMessageA( &msg, NULL, 0, 0, PM_NOREMOVE ) )
+    while( PeekMessageA( &msg, nullptr, 0, 0, PM_NOREMOVE ) )
     {
-        if( !GetMessageA( &msg, NULL, 0, 0 ) )
+        if( !GetMessageA( &msg, nullptr, 0, 0 ) )
         {
             PostQuitMessage( msg.wParam );
             return;
@@ -2746,7 +2363,7 @@ static void _PumpMessage()
     }
 }
 
-static void GetReadingWindowOrientation( DWORD dwId )
+static void GetReadingWindowOrientation( _In_ DWORD dwId )
 {
     g_bHorizontalReading = ( g_hklCurrent == _CHS_HKL ) || ( g_hklCurrent == _CHT_HKL_NEW_CHANG_JIE ) || ( dwId == 0 );
     if( !g_bHorizontalReading && IMEID_LANG( dwId ) == LANG_CHT )
@@ -2754,13 +2371,13 @@ static void GetReadingWindowOrientation( DWORD dwId )
         char szRegPath[MAX_PATH];
         HKEY hkey;
         DWORD dwVer = IMEID_VER( dwId );
-        StringCchCopyA( szRegPath, COUNTOF(szRegPath), "software\\microsoft\\windows\\currentversion\\" );
+        strcpy_s( szRegPath, COUNTOF(szRegPath), "software\\microsoft\\windows\\currentversion\\" );
         strcat_s( szRegPath, COUNTOF(szRegPath), ( dwVer >= MAKEIMEVERSION(5, 1) ) ? "MSTCIPH" : "TINTLGNT" );
         LONG lRc = RegOpenKeyExA( HKEY_CURRENT_USER, szRegPath, 0, KEY_READ, &hkey );
         if( lRc == ERROR_SUCCESS )
         {
             DWORD dwSize = sizeof( DWORD ), dwMapping, dwType;
-            lRc = RegQueryValueExA( hkey, "keyboard mapping", NULL, &dwType, ( PBYTE )&dwMapping, &dwSize );
+            lRc = RegQueryValueExA( hkey, "keyboard mapping", nullptr, &dwType, ( PBYTE )&dwMapping, &dwSize );
             if( lRc == ERROR_SUCCESS )
             {
                 if(
@@ -2780,7 +2397,7 @@ static void GetReadingWindowOrientation( DWORD dwId )
     }
 }
 
-void ImeUi_ToggleLanguageBar( BOOL bRestore )
+void ImeUi_ToggleLanguageBar( _In_ BOOL bRestore )
 {
     static BOOL prevRestore = TRUE;
     bool bCheck = ( prevRestore == TRUE || bRestore == TRUE );
@@ -2792,17 +2409,17 @@ void ImeUi_ToggleLanguageBar( BOOL bRestore )
     if( iShowStatusWindow == -1 )
     {
         iShowStatusWindow = IsNT() && g_osi.dwMajorVersion >= 5 &&
-            ( g_osi.dwMinorVersion > 1 || ( g_osi.dwMinorVersion == 1 && lstrlenA( g_osi.szCSDVersion ) ) ) ? 1 : 0;
+            ( g_osi.dwMinorVersion > 1 || ( g_osi.dwMinorVersion == 1 && strlen( g_osi.szCSDVersion ) ) ) ? 1 : 0;
     }
     HWND hwndImeDef = _ImmGetDefaultIMEWnd( g_hwndCurr );
     if( hwndImeDef && bRestore && iShowStatusWindow )
         SendMessageA( hwndImeDef, WM_IME_CONTROL, IMC_OPENSTATUSWINDOW, 0 );
     HRESULT hr;
-    hr = CoInitialize( NULL );
+    hr = CoInitialize( nullptr );
     if( SUCCEEDED( hr ) )
     {
-        ITfLangBarMgr* plbm = NULL;
-        hr = CoCreateInstance( CLSID_TF_LangBarMgr, NULL, CLSCTX_INPROC_SERVER, __uuidof( ITfLangBarMgr ),
+        ITfLangBarMgr* plbm = nullptr;
+        hr = CoCreateInstance( CLSID_TF_LangBarMgr, nullptr, CLSCTX_INPROC_SERVER, __uuidof( ITfLangBarMgr ),
                                ( void** )&plbm );
         if( SUCCEEDED( hr ) && plbm )
         {
@@ -2874,8 +2491,8 @@ static void OnInputLangChange()
 
 static void SetImeApi()
 {
-    _GetReadingString = NULL;
-    _ShowReadingWindow = NULL;
+    _GetReadingString = nullptr;
+    _ShowReadingWindow = nullptr;
     if( g_bUILessMode )
         return;
 
@@ -2883,17 +2500,15 @@ static void SetImeApi()
     HKL kl = g_hklCurrent;
     if( _ImmGetIMEFileNameA( kl, szImeFile, sizeof( szImeFile ) - 1 ) <= 0 )
         return;
-    HMODULE hIme = LoadLibraryA( szImeFile );
+    HMODULE hIme = LoadLibraryExA( szImeFile, nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
     if( !hIme )
         return;
-    _GetReadingString = ( UINT ( WINAPI* )( HIMC, UINT, LPWSTR, PINT, BOOL*, PUINT ) )
-        ( GetProcAddress( hIme, "GetReadingString" ) );
-    _ShowReadingWindow = ( BOOL ( WINAPI* )( HIMC himc, BOOL ) )
-        ( GetProcAddress( hIme, "ShowReadingWindow" ) );
+    _GetReadingString = reinterpret_cast<UINT ( WINAPI* )( HIMC, UINT, LPWSTR, PINT, BOOL*, PUINT )>( reinterpret_cast<void*>( GetProcAddress( hIme, "GetReadingString" ) ) );
+    _ShowReadingWindow = reinterpret_cast<BOOL ( WINAPI* )( HIMC himc, BOOL )>( reinterpret_cast<void*>( GetProcAddress( hIme, "ShowReadingWindow" ) ) );
     if( _ShowReadingWindow )
     {
-        HIMC himc;
-        if( NULL != ( himc = _ImmGetContext( g_hwndCurr ) ) )
+        HIMC himc = _ImmGetContext( g_hwndCurr );
+        if( himc )
         {
             _ShowReadingWindow( himc, false );
             _ImmReleaseContext( g_hwndCurr, himc );
@@ -2944,16 +2559,16 @@ static void CheckInputLocale()
             g_pszIndicatior = g_aszIndicator[INDICATOR_NON_IME];
     }
     char szCodePage[8];
-    int iRc = GetLocaleInfoA( MAKELCID( GETLANG(), SORT_DEFAULT ), LOCALE_IDEFAULTANSICODEPAGE, szCodePage,
-                              COUNTOF( szCodePage ) ); iRc;
-    g_uCodePage = _strtoul( szCodePage, NULL, 0 );
+    (void)GetLocaleInfoA( MAKELCID( GETLANG(), SORT_DEFAULT ), LOCALE_IDEFAULTANSICODEPAGE, szCodePage,
+                              COUNTOF( szCodePage ) );
+    g_uCodePage = _strtoul( szCodePage, nullptr, 0 );
     for( int i = 0; i < 256; i++ )
     {
         LeadByteTable[i] = ( BYTE )IsDBCSLeadByteEx( g_uCodePage, ( BYTE )i );
     }
 }
 
-void ImeUi_SetWindow( HWND hwnd )
+void ImeUi_SetWindow( _In_ HWND hwnd )
 {
     g_hwndCurr = hwnd;
     g_disableCicero.DisableCiceroOnThisWnd( hwnd );
@@ -2969,7 +2584,7 @@ DWORD ImeUi_GetFlags()
     return g_dwImeUiFlags;
 }
 
-void ImeUi_SetFlags( DWORD dwFlags, bool bSet )
+void ImeUi_SetFlags( _In_ DWORD dwFlags, _In_ bool bSet )
 {
     if( bSet )
     {
@@ -2997,7 +2612,7 @@ BOOL CTsfUiLessMode::SetupSinks()
     // ITfThreadMgrEx is available on Vista or later.
     HRESULT hr;
     hr = CoCreateInstance( CLSID_TF_ThreadMgr,
-                           NULL,
+                           nullptr,
                            CLSCTX_INPROC_SERVER,
                            __uuidof( ITfThreadMgrEx ),
                            ( void** )&m_tm );
@@ -3016,7 +2631,7 @@ BOOL CTsfUiLessMode::SetupSinks()
 
     // Setup sinks
     BOOL bRc = FALSE;
-    m_TsfSink = new CUIElementSink();
+    m_TsfSink = new (std::nothrow) CUIElementSink();
     if( m_TsfSink )
     {
         ITfSource* srcTm;
@@ -3071,16 +2686,16 @@ CTsfUiLessMode::CUIElementSink::~CUIElementSink()
 {
 }
 
-STDAPI CTsfUiLessMode::CUIElementSink::QueryInterface( REFIID riid, void** ppvObj )
+STDAPI CTsfUiLessMode::CUIElementSink::QueryInterface( _In_ REFIID riid, _COM_Outptr_ void** ppvObj )
 {
-    if( ppvObj == NULL )
+    if( !ppvObj )
         return E_INVALIDARG;
 
-    *ppvObj = NULL;
+    *ppvObj = nullptr;
 
     if( IsEqualIID( riid, IID_IUnknown ) )
     {
-        *ppvObj = reinterpret_cast<IUnknown*>( this );
+        *ppvObj = static_cast<IUnknown*>( static_cast<ITfUIElementSink*>( this ) );
     }
     else if( IsEqualIID( riid, __uuidof( ITfUIElementSink ) ) )
     {
@@ -3125,12 +2740,12 @@ CTsfUiLessMode::CUIElementSink::Release()
 
 STDAPI CTsfUiLessMode::CUIElementSink::BeginUIElement( DWORD dwUIElementId, BOOL* pbShow )
 {
-    ITfUIElement* pElement = GetUIElement( dwUIElementId );
+    auto pElement = GetUIElement( dwUIElementId );
     if( !pElement )
         return E_INVALIDARG;
 
-    ITfReadingInformationUIElement* preading = NULL;
-    ITfCandidateListUIElement* pcandidate = NULL;
+    ITfReadingInformationUIElement* preading = nullptr;
+    ITfCandidateListUIElement* pcandidate = nullptr;
     *pbShow = FALSE;
     if( !g_bCandList && SUCCEEDED( pElement->QueryInterface( __uuidof( ITfReadingInformationUIElement ),
                                                              ( void** )&preading ) ) )
@@ -3152,12 +2767,12 @@ STDAPI CTsfUiLessMode::CUIElementSink::BeginUIElement( DWORD dwUIElementId, BOOL
 
 STDAPI CTsfUiLessMode::CUIElementSink::UpdateUIElement( DWORD dwUIElementId )
 {
-    ITfUIElement* pElement = GetUIElement( dwUIElementId );
+    auto pElement = GetUIElement( dwUIElementId );
     if( !pElement )
         return E_INVALIDARG;
 
-    ITfReadingInformationUIElement* preading = NULL;
-    ITfCandidateListUIElement* pcandidate = NULL;
+    ITfReadingInformationUIElement* preading = nullptr;
+    ITfCandidateListUIElement* pcandidate = nullptr;
     if( !g_bCandList && SUCCEEDED( pElement->QueryInterface( __uuidof( ITfReadingInformationUIElement ),
                                                              ( void** )&preading ) ) )
     {
@@ -3177,11 +2792,11 @@ STDAPI CTsfUiLessMode::CUIElementSink::UpdateUIElement( DWORD dwUIElementId )
 
 STDAPI CTsfUiLessMode::CUIElementSink::EndUIElement( DWORD dwUIElementId )
 {
-    ITfUIElement* pElement = GetUIElement( dwUIElementId );
+    auto pElement = GetUIElement( dwUIElementId );
     if( !pElement )
         return E_INVALIDARG;
 
-    ITfReadingInformationUIElement* preading = NULL;
+    ITfReadingInformationUIElement* preading = nullptr;
     if( !g_bCandList && SUCCEEDED( pElement->QueryInterface( __uuidof( ITfReadingInformationUIElement ),
                                                              ( void** )&preading ) ) )
     {
@@ -3189,7 +2804,7 @@ STDAPI CTsfUiLessMode::CUIElementSink::EndUIElement( DWORD dwUIElementId )
         preading->Release();
     }
 
-    ITfCandidateListUIElement* pcandidate = NULL;
+    ITfCandidateListUIElement* pcandidate = nullptr;
     if( SUCCEEDED( pElement->QueryInterface( __uuidof( ITfCandidateListUIElement ),
                                              ( void** )&pcandidate ) ) )
     {
@@ -3206,27 +2821,31 @@ STDAPI CTsfUiLessMode::CUIElementSink::EndUIElement( DWORD dwUIElementId )
 void CTsfUiLessMode::UpdateImeState( BOOL bResetCompartmentEventSink )
 {
     ITfCompartmentMgr* pcm;
-    ITfCompartment* pTfOpenMode = NULL;
-    ITfCompartment* pTfConvMode = NULL;
+    ITfCompartment* pTfOpenMode = nullptr;
+    ITfCompartment* pTfConvMode = nullptr;
     if( GetCompartments( &pcm, &pTfOpenMode, &pTfConvMode ) )
     {
         VARIANT valOpenMode;
-        VARIANT valConvMode;
-        pTfOpenMode->GetValue( &valOpenMode );
-        pTfConvMode->GetValue( &valConvMode );
-        if( valOpenMode.vt == VT_I4 )
+        if ( SUCCEEDED(pTfOpenMode->GetValue(&valOpenMode)) )
         {
-            if( g_bChineseIME )
-            {
-                g_dwState = valOpenMode.lVal != 0 && valConvMode.lVal != 0 ? IMEUI_STATE_ON : IMEUI_STATE_ENGLISH;
-            }
-            else
+            VARIANT valConvMode;
+            if (SUCCEEDED(pTfConvMode->GetValue(&valConvMode)))
             {
-                g_dwState = valOpenMode.lVal != 0 ? IMEUI_STATE_ON : IMEUI_STATE_OFF;
+                if (valOpenMode.vt == VT_I4)
+                {
+                    if (g_bChineseIME)
+                    {
+                        g_dwState = valOpenMode.lVal != 0 && valConvMode.lVal != 0 ? IMEUI_STATE_ON : IMEUI_STATE_ENGLISH;
+                    }
+                    else
+                    {
+                        g_dwState = valOpenMode.lVal != 0 ? IMEUI_STATE_ON : IMEUI_STATE_OFF;
+                    }
+                }
+                VariantClear(&valConvMode);
             }
+            VariantClear(&valOpenMode);
         }
-        VariantClear( &valOpenMode );
-        VariantClear( &valConvMode );
 
         if( bResetCompartmentEventSink )
         {
@@ -3238,14 +2857,17 @@ void CTsfUiLessMode::UpdateImeState( BOOL bResetCompartmentEventSink )
     }
 }
 
-STDAPI CTsfUiLessMode::CUIElementSink::OnActivated( DWORD dwProfileType, LANGID langid, REFCLSID clsid, REFGUID catid,
-                                                    REFGUID guidProfile, HKL hkl, DWORD dwFlags )
+STDAPI CTsfUiLessMode::CUIElementSink::OnActivated( DWORD dwProfileType, LANGID langid, _In_ REFCLSID clsid, _In_ REFGUID catid,
+                                                    _In_ REFGUID guidProfile, HKL hkl, DWORD dwFlags )
 {
-    static GUID TF_PROFILE_DAYI =
+    UNREFERENCED_PARAMETER(clsid);
+    UNREFERENCED_PARAMETER(hkl);
+
+    static GUID s_TF_PROFILE_DAYI =
     {
         0x037B2C25, 0x480C, 0x4D7F, 0xB0, 0x27, 0xD6, 0xCA, 0x6B, 0x69, 0x78, 0x8A
     };
-    g_iCandListIndexBase = IsEqualGUID( TF_PROFILE_DAYI, guidProfile ) ? 0 : 1;
+    g_iCandListIndexBase = IsEqualGUID( s_TF_PROFILE_DAYI, guidProfile ) ? 0 : 1;
     if( IsEqualIID( catid, GUID_TFCAT_TIP_KEYBOARD ) && ( dwFlags & TF_IPSINK_FLAG_ACTIVE ) )
     {
         g_bChineseIME = ( dwProfileType & TF_PROFILETYPE_INPUTPROCESSOR ) && langid == LANG_CHT;
@@ -3260,8 +2882,9 @@ STDAPI CTsfUiLessMode::CUIElementSink::OnActivated( DWORD dwProfileType, LANGID
     return S_OK;
 }
 
-STDAPI CTsfUiLessMode::CUIElementSink::OnChange( REFGUID rguid )
+STDAPI CTsfUiLessMode::CUIElementSink::OnChange( _In_ REFGUID rguid )
 {
+    UNREFERENCED_PARAMETER(rguid);
     UpdateImeState();
     return S_OK;
 }
@@ -3283,39 +2906,13 @@ void CTsfUiLessMode::MakeReadingInformationString( ITfReadingInformationUIElemen
     g_uCandPageSize = MAX_CANDLIST;
     g_dwSelection = g_iReadingError ? g_iReadingError - 1 : ( DWORD )-1;
     g_iReadingError--;	// g_iReadingError is used only in horizontal window, and has to be -1 if there's no error.
-#ifndef UNICODE
-    if( g_iReadingError > 0 )
-    {
-        // convert g_iReadingError to byte based
-        LPCSTR pszNext = g_szReadingString;
-        for( int i = 0; i < g_iReadingError && pszNext && *pszNext; ++i )
-        {
-            pszNext = CharNext( pszNext );
-        }
-        if( pszNext )	// should be non-NULL, but just in case
-        {
-            g_iReadingError = pszNext - g_szReadingString;
-        }
-    }
-#endif
 
     BSTR bstr;
     if( SUCCEEDED( preading->GetString( &bstr ) ) )
     {
         if( bstr )
         {
-#ifndef UNICODE
-            char szStr[COUNTOF(g_szReadingString)*2];
-            szStr[0] = 0;
-            int iRc = WideCharToMultiByte( CP_ACP, 0, bstr, -1, szStr, sizeof( szStr ), NULL, NULL );
-            if( iRc >= sizeof( szStr ) )
-            {
-                szStr[sizeof( szStr ) - 1] = 0;
-            }
-            StringCchCopy( g_szReadingString, COUNTOF(g_szReadingString), szStr );
-#else
-			StringCchCopy( g_szReadingString, COUNTOF(g_szReadingString), bstr );
-#endif
+            wcscpy_s( g_szReadingString, COUNTOF(g_szReadingString), bstr );
             g_dwCount = cchMax;
             LPCTSTR pszSource = g_szReadingString;
             if( fVertical )
@@ -3328,7 +2925,7 @@ void CTsfUiLessMode::MakeReadingInformationString( ITfReadingInformationUIElemen
                     {
                         LPTSTR pszNextSrc = CharNext( pszSource );
                         SIZE_T size = ( LPSTR )pszNextSrc - ( LPSTR )pszSource;
-                        CopyMemory( pszDest, pszSource, size );
+                        memcpy( pszDest, pszSource, size );
                         pszSource = pszNextSrc;
                         pszDest += size;
                     }
@@ -3349,7 +2946,7 @@ void CTsfUiLessMode::MakeCandidateStrings( ITfCandidateListUIElement* pcandidate
     UINT uIndex = 0;
     UINT uCount = 0;
     UINT uCurrentPage = 0;
-    UINT* IndexList = NULL;
+    UINT* IndexList = nullptr;
     UINT uPageCnt = 0;
     DWORD dwPageStart = 0;
     DWORD dwPageSize = 0;
@@ -3363,7 +2960,7 @@ void CTsfUiLessMode::MakeCandidateStrings( ITfCandidateListUIElement* pcandidate
     g_bCandList = true;
     g_bReadingWindow = false;
 
-    pcandidate->GetPageIndex( NULL, 0, &uPageCnt );
+    pcandidate->GetPageIndex( nullptr, 0, &uPageCnt );
     if( uPageCnt > 0 )
     {
         IndexList = ( UINT* )ImeUiCallback_Malloc( sizeof( UINT ) * uPageCnt );
@@ -3372,12 +2969,12 @@ void CTsfUiLessMode::MakeCandidateStrings( ITfCandidateListUIElement* pcandidate
             pcandidate->GetPageIndex( IndexList, uPageCnt, &uPageCnt );
             dwPageStart = IndexList[uCurrentPage];
             dwPageSize = ( uCurrentPage < uPageCnt - 1 ) ?
-                min( uCount, IndexList[uCurrentPage + 1] ) - dwPageStart:
+                std::min( uCount, IndexList[uCurrentPage + 1] ) - dwPageStart:
                 uCount - dwPageStart;
         }
     }
 
-    g_uCandPageSize = min( dwPageSize, MAX_CANDLIST );
+    g_uCandPageSize = std::min<UINT>( dwPageSize, MAX_CANDLIST );
     g_dwSelection = g_dwSelection - dwPageStart;
 
     memset( &g_szCandidate, 0, sizeof( g_szCandidate ) );
@@ -3387,18 +2984,7 @@ void CTsfUiLessMode::MakeCandidateStrings( ITfCandidateListUIElement* pcandidate
         {
             if( bstr )
             {
-#ifndef UNICODE
-                char szStr[COUNTOF(g_szCandidate[0])*2];
-                szStr[0] = 0;
-                int iRc = WideCharToMultiByte( CP_ACP, 0, bstr, -1, szStr, sizeof( szStr ), NULL, NULL );
-                if( iRc >= sizeof( szStr ) )
-                {
-                    szStr[sizeof( szStr ) - 1] = 0;
-                }
-                ComposeCandidateLine( j, szStr );
-#else
-				ComposeCandidateLine( j, bstr );
-#endif
+                ComposeCandidateLine( j, bstr );
                 SysFreeString( bstr );
             }
         }
@@ -3418,7 +3004,7 @@ void CTsfUiLessMode::MakeCandidateStrings( ITfCandidateListUIElement* pcandidate
 ITfUIElement* CTsfUiLessMode::GetUIElement( DWORD dwUIElementId )
 {
     ITfUIElementMgr* puiem;
-    ITfUIElement* pElement = NULL;
+    ITfUIElement* pElement = nullptr;
 
     if( SUCCEEDED( m_tm->QueryInterface( __uuidof( ITfUIElementMgr ), ( void** )&puiem ) ) )
     {
@@ -3435,7 +3021,7 @@ BOOL CTsfUiLessMode::CurrentInputLocaleIsIme()
     HRESULT hr;
 
     ITfInputProcessorProfiles* pProfiles;
-    hr = CoCreateInstance( CLSID_TF_InputProcessorProfiles, NULL, CLSCTX_INPROC_SERVER,
+    hr = CoCreateInstance( CLSID_TF_InputProcessorProfiles, nullptr, CLSCTX_INPROC_SERVER,
                            __uuidof( ITfInputProcessorProfiles ), ( LPVOID* )&pProfiles );
     if( SUCCEEDED( hr ) )
     {
@@ -3461,13 +3047,13 @@ BOOL CTsfUiLessMode::CurrentInputLocaleIsIme()
 // otherwise the sink can be triggered when a game has multiple instances of IME UI library.
 void CTsfUiLessMode::EnableUiUpdates( bool bEnable )
 {
-    if( m_tm == NULL ||
+    if( !m_tm ||
         ( bEnable && m_dwUIElementSinkCookie != TF_INVALID_COOKIE ) ||
         ( !bEnable && m_dwUIElementSinkCookie == TF_INVALID_COOKIE ) )
     {
         return;
     }
-    ITfSource* srcTm = NULL;
+    ITfSource* srcTm = nullptr;
     HRESULT hr = E_FAIL;
     if( SUCCEEDED( hr = m_tm->QueryInterface( __uuidof( ITfSource ), ( void** )&srcTm ) ) )
     {
@@ -3490,9 +3076,9 @@ void CTsfUiLessMode::EnableUiUpdates( bool bEnable )
 BOOL CTsfUiLessMode::GetCompartments( ITfCompartmentMgr** ppcm, ITfCompartment** ppTfOpenMode,
                                       ITfCompartment** ppTfConvMode )
 {
-    ITfCompartmentMgr* pcm = NULL;
-    ITfCompartment* pTfOpenMode = NULL;
-    ITfCompartment* pTfConvMode = NULL;
+    ITfCompartmentMgr* pcm = nullptr;
+    ITfCompartment* pTfOpenMode = nullptr;
+    ITfCompartment* pTfConvMode = nullptr;
 
     static GUID _GUID_COMPARTMENT_KEYBOARD_INPUTMODE_CONVERSION =
     {
@@ -3527,7 +3113,7 @@ BOOL CTsfUiLessMode::SetupCompartmentSinks( BOOL bRemoveOnly, ITfCompartment* pT
                                             ITfCompartment* pTfConvMode )
 {
     bool bLocalCompartments = false;
-    ITfCompartmentMgr* pcm = NULL;
+    ITfCompartmentMgr* pcm = nullptr;
     BOOL bRc = FALSE;
     HRESULT hr = E_FAIL;
 
@@ -3541,7 +3127,7 @@ BOOL CTsfUiLessMode::SetupCompartmentSinks( BOOL bRemoveOnly, ITfCompartment* pT
         // Invalid parameters or GetCompartments() has failed.
         return FALSE;
     }
-    ITfSource* srcOpenMode = NULL;
+    ITfSource* srcOpenMode = nullptr;
     if( SUCCEEDED( hr = pTfOpenMode->QueryInterface( IID_ITfSource, ( void** )&srcOpenMode ) ) )
     {
         // Remove existing sink for open mode
@@ -3555,7 +3141,7 @@ BOOL CTsfUiLessMode::SetupCompartmentSinks( BOOL bRemoveOnly, ITfCompartment* pT
                                                                     ( ITfCompartmentEventSink* )m_TsfSink,
                                                                     &m_dwOpenModeSinkCookie ) ) )
         {
-            ITfSource* srcConvMode = NULL;
+            ITfSource* srcConvMode = nullptr;
             if( SUCCEEDED( hr = pTfConvMode->QueryInterface( IID_ITfSource, ( void** )&srcConvMode ) ) )
             {
                 // Remove existing sink for open mode
@@ -3591,7 +3177,7 @@ WORD ImeUi_GetPrimaryLanguage()
     return GETPRIMLANG();
 };
 
-DWORD ImeUi_GetImeId( UINT uIndex )
+DWORD ImeUi_GetImeId( _In_ UINT uIndex )
 {
     return GetImeId( uIndex );
 };
@@ -3601,7 +3187,7 @@ WORD ImeUi_GetLanguage()
     return GETLANG();
 };
 
-PTSTR ImeUi_GetIndicatior()
+PCTSTR ImeUi_GetIndicatior()
 {
     return g_pszIndicatior;
 };
@@ -3627,7 +3213,7 @@ bool ImeUi_IsHorizontalReading()
     return g_bHorizontalReading;
 };
 
-TCHAR* ImeUi_GetCandidate( UINT idx )
+TCHAR* ImeUi_GetCandidate( _In_ UINT idx )
 {
     if( idx < MAX_CANDLIST )
         return g_szCandidate[idx];
diff --git a/samples/DX_APIUsage/DXUT/Optional/ImeUi.h b/samples/DX_APIUsage/DXUT/Optional/ImeUi.h
index deae8f4..d7cbeaa 100644
--- a/samples/DX_APIUsage/DXUT/Optional/ImeUi.h
+++ b/samples/DX_APIUsage/DXUT/Optional/ImeUi.h
@@ -2,25 +2,25 @@
 // File: ImeUi.h
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
-#ifndef _IMEUI_H_
-#define _IMEUI_H_
-#if _WIN32_WINNT < 0x0400
-#error IMEUI requires _WIN32_WINNT to be 0x0400 or higher. Please add "_WIN32_WINNT=0x0400" to your project's preprocessor setting.
-#endif
+#pragma once
+
 #include <windows.h>
 
 class CImeUiFont_Base
 {
 public:
-    virtual void    SetHeight( UINT uHeight )
+    virtual void    SetHeight( _In_ UINT uHeight )
     {
-        uHeight;
+        UNREFERENCED_PARAMETER(uHeight);
     }; // for backward compatibility
-    virtual void    SetColor( DWORD color ) = 0;
-    virtual void    SetPosition( int x, int y ) = 0;
-    virtual void    GetTextExtent( LPCTSTR szText, DWORD* puWidth, DWORD* puHeight ) = 0;
-    virtual void    DrawText( LPCTSTR pszText ) = 0;
+    virtual void    SetColor( _In_ DWORD color ) = 0;
+    virtual void    SetPosition( _In_ int x, _In_ int y ) = 0;
+    virtual void    GetTextExtent( _In_z_ LPCTSTR szText, _Out_ DWORD* puWidth, _Out_ DWORD* puHeight ) = 0;
+    virtual void    DrawText( _In_z_ LPCTSTR pszText ) = 0;
 };
 
 typedef struct
@@ -76,49 +76,47 @@ typedef struct	// D3DTLVERTEX compatible
 // IME Flags
 #define IMEUI_FLAG_SUPPORT_CARET	0x00000001
 
-bool ImeUi_Initialize( HWND hwnd, bool bDisable = false );
+bool ImeUi_Initialize( _In_ HWND hwnd, _In_ bool bDisable = false );
 void ImeUi_Uninitialize();
-void ImeUi_SetAppearance( const IMEUI_APPEARANCE* pia );
-void ImeUi_GetAppearance( IMEUI_APPEARANCE* pia );
-bool ImeUi_IgnoreHotKey( const MSG* pmsg );
-LPARAM ImeUi_ProcessMessage( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM& lParam, bool* trapped );
-void ImeUi_SetScreenDimension( UINT width, UINT height );
-void ImeUi_RenderUI( bool bDrawCompAttr = true, bool bDrawOtherUi = true );
-void ImeUi_SetCaretPosition( UINT x, UINT y );
-void ImeUi_SetCompStringAppearance( CImeUiFont_Base* pFont, DWORD color, const RECT* prc );
+void ImeUi_SetAppearance( _In_opt_ const IMEUI_APPEARANCE* pia );
+void ImeUi_GetAppearance( _Out_opt_ IMEUI_APPEARANCE* pia );
+bool ImeUi_IgnoreHotKey( _In_ const MSG* pmsg );
+LPARAM ImeUi_ProcessMessage( _In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM wParam, _Inout_ LPARAM& lParam, _Out_ bool* trapped );
+void ImeUi_SetScreenDimension( _In_ UINT width, _In_ UINT height );
+void ImeUi_RenderUI( _In_ bool bDrawCompAttr = true, _In_ bool bDrawOtherUi = true );
+void ImeUi_SetCaretPosition( _In_ UINT x, _In_ UINT y );
+void ImeUi_SetCompStringAppearance( _In_ CImeUiFont_Base* pFont, _In_ DWORD color, _In_ const RECT* prc );
 bool ImeUi_GetCaretStatus();
-void ImeUi_SetInsertMode( bool bInsert );
-void ImeUi_SetState( DWORD dwState );
+void ImeUi_SetInsertMode( _In_ bool bInsert );
+void ImeUi_SetState( _In_ DWORD dwState );
 DWORD ImeUi_GetState();
-void ImeUi_EnableIme( bool bEnable );
-bool ImeUi_IsEnabled( void );
-void ImeUi_FinalizeString( bool bSend = false );
-void ImeUi_ToggleLanguageBar( BOOL bRestore );
+void ImeUi_EnableIme( _In_ bool bEnable );
+bool ImeUi_IsEnabled();
+void ImeUi_FinalizeString( _In_ bool bSend = false );
+void ImeUi_ToggleLanguageBar( _In_ BOOL bRestore );
 bool ImeUi_IsSendingKeyMessage();
-void ImeUi_SetWindow( HWND hwnd );
+void ImeUi_SetWindow( _In_ HWND hwnd );
 UINT ImeUi_GetInputCodePage();
 DWORD ImeUi_GetFlags();
-void ImeUi_SetFlags( DWORD dwFlags, bool bSet );
+void ImeUi_SetFlags( _In_ DWORD dwFlags, _In_ bool bSet );
 
 WORD ImeUi_GetPrimaryLanguage();
-DWORD ImeUi_GetImeId( UINT uIndex );
+DWORD ImeUi_GetImeId( _In_ UINT uIndex );
 WORD ImeUi_GetLanguage();
-LPTSTR ImeUi_GetIndicatior();
+LPCTSTR ImeUi_GetIndicatior();
 bool ImeUi_IsShowReadingWindow();
 bool ImeUi_IsShowCandListWindow();
 bool ImeUi_IsVerticalCand();
 bool ImeUi_IsHorizontalReading();
-TCHAR*          ImeUi_GetCandidate( UINT idx );
+TCHAR*          ImeUi_GetCandidate( _In_ UINT idx );
 TCHAR*          ImeUi_GetCompositionString();
 DWORD ImeUi_GetCandidateSelection();
 DWORD ImeUi_GetCandidateCount();
 BYTE*           ImeUi_GetCompStringAttr();
 DWORD ImeUi_GetImeCursorChars();
 
-extern void ( CALLBACK*ImeUiCallback_DrawRect )( int x1, int y1, int x2, int y2, DWORD color );
-extern void*    ( __cdecl*ImeUiCallback_Malloc )( size_t bytes );
-extern void ( __cdecl*ImeUiCallback_Free )( void* ptr );
-extern void ( CALLBACK*ImeUiCallback_DrawFans )( const IMEUI_VERTEX* paVertex, UINT uNum );
-extern void ( CALLBACK*ImeUiCallback_OnChar )( WCHAR wc );
-
-#endif //_IMEUI_H_
+extern void ( CALLBACK*ImeUiCallback_DrawRect )( _In_ int x1, _In_ int y1, _In_ int x2, _In_ int y2, _In_ DWORD color );
+extern void*    ( __cdecl*ImeUiCallback_Malloc )( _In_ size_t bytes );
+extern void ( __cdecl*ImeUiCallback_Free )( _In_ void* ptr );
+extern void ( CALLBACK*ImeUiCallback_DrawFans )( _In_ const IMEUI_VERTEX* paVertex, _In_ UINT uNum );
+extern void ( CALLBACK*ImeUiCallback_OnChar )( _In_ WCHAR wc );
diff --git a/samples/DX_APIUsage/DXUT/Optional/SDKmesh.cpp b/samples/DX_APIUsage/DXUT/Optional/SDKmesh.cpp
index 5002d74..207020f 100644
--- a/samples/DX_APIUsage/DXUT/Optional/SDKmesh.cpp
+++ b/samples/DX_APIUsage/DXUT/Optional/SDKmesh.cpp
@@ -7,12 +7,18 @@
 // meets the specific needs of the application.
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #include "DXUT.h"
 #include "SDKMesh.h"
 #include "SDKMisc.h"
 
+using namespace DirectX;
+
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTSDKMesh::LoadMaterials( ID3D11Device* pd3dDevice, SDKMESH_MATERIAL* pMaterials, UINT numMaterials,
                                   SDKMESH_CALLBACKS11* pLoaderCallbacks )
 {
@@ -22,12 +28,12 @@ void CDXUTSDKMesh::LoadMaterials( ID3D11Device* pd3dDevice, SDKMESH_MATERIAL* pM
     {
         for( UINT m = 0; m < numMaterials; m++ )
         {
-            pMaterials[m].pDiffuseTexture11 = NULL;
-            pMaterials[m].pNormalTexture11 = NULL;
-            pMaterials[m].pSpecularTexture11 = NULL;
-            pMaterials[m].pDiffuseRV11 = NULL;
-            pMaterials[m].pNormalRV11 = NULL;
-            pMaterials[m].pSpecularRV11 = NULL;
+            pMaterials[m].pDiffuseTexture11 = nullptr;
+            pMaterials[m].pNormalTexture11 = nullptr;
+            pMaterials[m].pSpecularTexture11 = nullptr;
+            pMaterials[m].pDiffuseRV11 = nullptr;
+            pMaterials[m].pNormalRV11 = nullptr;
+            pMaterials[m].pSpecularRV11 = nullptr;
 
             // load textures
             if( pMaterials[m].DiffuseTexture[0] != 0 )
@@ -54,12 +60,12 @@ void CDXUTSDKMesh::LoadMaterials( ID3D11Device* pd3dDevice, SDKMESH_MATERIAL* pM
     {
         for( UINT m = 0; m < numMaterials; m++ )
         {
-            pMaterials[m].pDiffuseTexture11 = NULL;
-            pMaterials[m].pNormalTexture11 = NULL;
-            pMaterials[m].pSpecularTexture11 = NULL;
-            pMaterials[m].pDiffuseRV11 = NULL;
-            pMaterials[m].pNormalRV11 = NULL;
-            pMaterials[m].pSpecularRV11 = NULL;
+            pMaterials[m].pDiffuseTexture11 = nullptr;
+            pMaterials[m].pNormalTexture11 = nullptr;
+            pMaterials[m].pSpecularTexture11 = nullptr;
+            pMaterials[m].pDiffuseRV11 = nullptr;
+            pMaterials[m].pNormalRV11 = nullptr;
+            pMaterials[m].pSpecularRV11 = nullptr;
 
             // load textures
             if( pMaterials[m].DiffuseTexture[0] != 0 )
@@ -92,84 +98,7 @@ void CDXUTSDKMesh::LoadMaterials( ID3D11Device* pd3dDevice, SDKMESH_MATERIAL* pM
 }
 
 //--------------------------------------------------------------------------------------
-void CDXUTSDKMesh::LoadMaterials( IDirect3DDevice9* pd3dDevice, SDKMESH_MATERIAL* pMaterials, UINT numMaterials,
-                                  SDKMESH_CALLBACKS9* pLoaderCallbacks )
-{
-    char strPath[MAX_PATH];
-
-    if( pLoaderCallbacks && pLoaderCallbacks->pCreateTextureFromFile )
-    {
-        for( UINT m = 0; m < numMaterials; m++ )
-        {
-            pMaterials[m].pDiffuseTexture9 = NULL;
-            pMaterials[m].pNormalTexture9 = NULL;
-            pMaterials[m].pSpecularTexture9 = NULL;
-
-            // load textures
-            if( pMaterials[m].DiffuseTexture[0] != 0 )
-            {
-                pLoaderCallbacks->pCreateTextureFromFile( pd3dDevice,
-                                                          pMaterials[m].DiffuseTexture,
-                                                          &pMaterials[m].pDiffuseTexture9,
-                                                          pLoaderCallbacks->pContext );
-            }
-            if( pMaterials[m].NormalTexture[0] != 0 )
-            {
-                pLoaderCallbacks->pCreateTextureFromFile( pd3dDevice,
-                                                          pMaterials[m].NormalTexture, &pMaterials[m].pNormalTexture9,
-                                                          pLoaderCallbacks->pContext );
-            }
-            if( pMaterials[m].SpecularTexture[0] != 0 )
-            {
-                pLoaderCallbacks->pCreateTextureFromFile( pd3dDevice,
-                                                          pMaterials[m].SpecularTexture,
-                                                          &pMaterials[m].pSpecularTexture9,
-                                                          pLoaderCallbacks->pContext );
-            }
-        }
-    }
-    else
-    {
-        for( UINT m = 0; m < numMaterials; m++ )
-        {
-            pMaterials[m].pDiffuseTexture9 = NULL;
-            pMaterials[m].pNormalTexture9 = NULL;
-            pMaterials[m].pSpecularTexture9 = NULL;
-            pMaterials[m].pDiffuseRV11 = NULL;
-            pMaterials[m].pNormalRV11 = NULL;
-            pMaterials[m].pSpecularRV11 = NULL;
-
-            // load textures
-            if( pMaterials[m].DiffuseTexture[0] != 0 )
-            {
-                sprintf_s( strPath, MAX_PATH, "%s%s", m_strPath, pMaterials[m].DiffuseTexture );
-                if( FAILED( DXUTGetGlobalResourceCache().CreateTextureFromFile( pd3dDevice,
-                                                                                strPath,
-                                                                                &pMaterials[m].pDiffuseTexture9 ) ) )
-                    pMaterials[m].pDiffuseTexture9 = ( IDirect3DTexture9* )ERROR_RESOURCE_VALUE;
-            }
-            if( pMaterials[m].NormalTexture[0] != 0 )
-            {
-                sprintf_s( strPath, MAX_PATH, "%s%s", m_strPath, pMaterials[m].NormalTexture );
-                if( FAILED( DXUTGetGlobalResourceCache().CreateTextureFromFile( pd3dDevice,
-                                                                                strPath,
-                                                                                &pMaterials[m].pNormalTexture9 ) ) )
-                    pMaterials[m].pNormalTexture9 = ( IDirect3DTexture9* )ERROR_RESOURCE_VALUE;
-            }
-            if( pMaterials[m].SpecularTexture[0] != 0 )
-            {
-                sprintf_s( strPath, MAX_PATH, "%s%s", m_strPath, pMaterials[m].SpecularTexture );
-                if( FAILED( DXUTGetGlobalResourceCache().CreateTextureFromFile( pd3dDevice,
-                                                                                strPath,
-                                                                                &pMaterials[m].pSpecularTexture9 ) ) )
-                    pMaterials[m].pSpecularTexture9 = ( IDirect3DTexture9* )ERROR_RESOURCE_VALUE;
-            }
-
-        }
-    }
-}
-
-//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTSDKMesh::CreateVertexBuffer( ID3D11Device* pd3dDevice, SDKMESH_VERTEX_BUFFER_HEADER* pHeader,
                                           void* pVertices, SDKMESH_CALLBACKS11* pLoaderCallbacks )
 {
@@ -193,7 +122,10 @@ HRESULT CDXUTSDKMesh::CreateVertexBuffer( ID3D11Device* pd3dDevice, SDKMESH_VERT
         D3D11_SUBRESOURCE_DATA InitData;
         InitData.pSysMem = pVertices;
         hr = pd3dDevice->CreateBuffer( &bufferDesc, &InitData, &pHeader->pVB11 );
-        DXUT_SetDebugName( pHeader->pVB11, "CDXUTSDKMesh" );
+        if (SUCCEEDED(hr))
+        {
+            DXUT_SetDebugName(pHeader->pVB11, "CDXUTSDKMesh");
+        }
     }
 
     return hr;
@@ -201,6 +133,7 @@ HRESULT CDXUTSDKMesh::CreateVertexBuffer( ID3D11Device* pd3dDevice, SDKMESH_VERT
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTSDKMesh::CreateIndexBuffer( ID3D11Device* pd3dDevice, SDKMESH_INDEX_BUFFER_HEADER* pHeader,
                                          void* pIndices, SDKMESH_CALLBACKS11* pLoaderCallbacks )
 {
@@ -224,101 +157,21 @@ HRESULT CDXUTSDKMesh::CreateIndexBuffer( ID3D11Device* pd3dDevice, SDKMESH_INDEX
         D3D11_SUBRESOURCE_DATA InitData;
         InitData.pSysMem = pIndices;
         hr = pd3dDevice->CreateBuffer( &bufferDesc, &InitData, &pHeader->pIB11 );
-        DXUT_SetDebugName( pHeader->pIB11, "CDXUTSDKMesh" );
-    }
-
-    return hr;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTSDKMesh::CreateVertexBuffer( IDirect3DDevice9* pd3dDevice, SDKMESH_VERTEX_BUFFER_HEADER* pHeader,
-                                          void* pVertices, SDKMESH_CALLBACKS9* pLoaderCallbacks )
-{
-    HRESULT hr = S_OK;
-
-    pHeader->DataOffset = 0;
-    if( pLoaderCallbacks && pLoaderCallbacks->pCreateVertexBuffer )
-    {
-        pLoaderCallbacks->pCreateVertexBuffer( pd3dDevice, &pHeader->pVB9, ( UINT )pHeader->SizeBytes,
-                                               D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, pVertices,
-                                               pLoaderCallbacks->pContext );
-    }
-    else
-    {
-        hr = pd3dDevice->CreateVertexBuffer( ( UINT )pHeader->SizeBytes,
-                                             D3DUSAGE_WRITEONLY,
-                                             0,
-                                             D3DPOOL_DEFAULT,
-                                             &pHeader->pVB9,
-                                             NULL );
-
-        //lock
-        if( SUCCEEDED( hr ) )
+        if (SUCCEEDED(hr))
         {
-            void* pLockedVerts = NULL;
-            V_RETURN( pHeader->pVB9->Lock( 0, 0, &pLockedVerts, 0 ) );
-            CopyMemory( pLockedVerts, pVertices, ( size_t )pHeader->SizeBytes );
-            pHeader->pVB9->Unlock();
+            DXUT_SetDebugName(pHeader->pIB11, "CDXUTSDKMesh");
         }
     }
 
     return hr;
 }
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTSDKMesh::CreateIndexBuffer( IDirect3DDevice9* pd3dDevice, SDKMESH_INDEX_BUFFER_HEADER* pHeader,
-                                         void* pIndices, SDKMESH_CALLBACKS9* pLoaderCallbacks )
-{
-    HRESULT hr = S_OK;
-
-    pHeader->DataOffset = 0;
-
-    D3DFORMAT ibFormat = D3DFMT_INDEX16;
-    switch( pHeader->IndexType )
-    {
-        case IT_16BIT:
-            ibFormat = D3DFMT_INDEX16;
-            break;
-        case IT_32BIT:
-            ibFormat = D3DFMT_INDEX32;
-            break;
-    };
-
-    if( pLoaderCallbacks && pLoaderCallbacks->pCreateIndexBuffer )
-    {
-        pLoaderCallbacks->pCreateIndexBuffer( pd3dDevice, &pHeader->pIB9, ( UINT )pHeader->SizeBytes,
-                                              D3DUSAGE_WRITEONLY, ibFormat, D3DPOOL_DEFAULT, pIndices,
-                                              pLoaderCallbacks->pContext );
-    }
-    else
-    {
-        hr = pd3dDevice->CreateIndexBuffer( ( UINT )( pHeader->SizeBytes ),
-                                            D3DUSAGE_WRITEONLY,
-                                            ibFormat,
-                                            D3DPOOL_DEFAULT,
-                                            &pHeader->pIB9,
-                                            NULL );
-
-        if( SUCCEEDED( hr ) )
-        {
-            void* pLockedIndices = NULL;
-            V_RETURN( pHeader->pIB9->Lock( 0, 0, &pLockedIndices, 0 ) );
-            CopyMemory( pLockedIndices, pIndices, ( size_t )( pHeader->SizeBytes ) );
-            pHeader->pIB9->Unlock();
-        }
-    }
-
-    return hr;
-}
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT CDXUTSDKMesh::CreateFromFile( ID3D11Device* pDev11,
-                                      IDirect3DDevice9* pDev9,
-                                      LPCTSTR szFileName,
-                                      bool bCreateAdjacencyIndices,
-                                      SDKMESH_CALLBACKS11* pLoaderCallbacks11,
-                                      SDKMESH_CALLBACKS9* pLoaderCallbacks9 )
+                                      LPCWSTR szFileName,
+                                      SDKMESH_CALLBACKS11* pLoaderCallbacks11 )
 {
     HRESULT hr = S_OK;
 
@@ -326,8 +179,8 @@ HRESULT CDXUTSDKMesh::CreateFromFile( ID3D11Device* pDev11,
     V_RETURN( DXUTFindDXSDKMediaFileCch( m_strPathW, sizeof( m_strPathW ) / sizeof( WCHAR ), szFileName ) );
 
     // Open the file
-    m_hFile = CreateFile( m_strPathW, FILE_READ_DATA, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN,
-                          NULL );
+    m_hFile = CreateFile( m_strPathW, FILE_READ_DATA, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN,
+                          nullptr );
     if( INVALID_HANDLE_VALUE == m_hFile )
         return DXUTERR_MEDIANOTFOUND;
 
@@ -338,7 +191,7 @@ HRESULT CDXUTSDKMesh::CreateFromFile( ID3D11Device* pDev11,
     else
         *m_strPathW = L'\0';
 
-    WideCharToMultiByte( CP_ACP, 0, m_strPathW, -1, m_strPath, MAX_PATH, NULL, FALSE );
+    WideCharToMultiByte( CP_ACP, 0, m_strPathW, -1, m_strPath, MAX_PATH, nullptr, FALSE );
 
     // Get the file size
     LARGE_INTEGER FileSize;
@@ -346,7 +199,7 @@ HRESULT CDXUTSDKMesh::CreateFromFile( ID3D11Device* pDev11,
     UINT cBytes = FileSize.LowPart;
 
     // Allocate memory
-    m_pStaticMeshData = new BYTE[ cBytes ];
+    m_pStaticMeshData = new (std::nothrow) BYTE[ cBytes ];
     if( !m_pStaticMeshData )
     {
         CloseHandle( m_hFile );
@@ -355,7 +208,7 @@ HRESULT CDXUTSDKMesh::CreateFromFile( ID3D11Device* pDev11,
 
     // Read in the file
     DWORD dwBytesRead;
-    if( !ReadFile( m_hFile, m_pStaticMeshData, cBytes, &dwBytesRead, NULL ) )
+    if( !ReadFile( m_hFile, m_pStaticMeshData, cBytes, &dwBytesRead, nullptr ) )
         hr = E_FAIL;
 
     CloseHandle( m_hFile );
@@ -363,13 +216,10 @@ HRESULT CDXUTSDKMesh::CreateFromFile( ID3D11Device* pDev11,
     if( SUCCEEDED( hr ) )
     {
         hr = CreateFromMemory( pDev11,
-                               pDev9,
                                m_pStaticMeshData,
                                cBytes,
-                               bCreateAdjacencyIndices,
                                false,
-                               pLoaderCallbacks11,
-                               pLoaderCallbacks9 );
+                               pLoaderCallbacks11 );
         if( FAILED( hr ) )
             delete []m_pStaticMeshData;
     }
@@ -377,37 +227,39 @@ HRESULT CDXUTSDKMesh::CreateFromFile( ID3D11Device* pDev11,
     return hr;
 }
 
+_Use_decl_annotations_
 HRESULT CDXUTSDKMesh::CreateFromMemory( ID3D11Device* pDev11,
-                                        IDirect3DDevice9* pDev9,
                                         BYTE* pData,
-                                        UINT DataBytes,
-                                        bool bCreateAdjacencyIndices,
+                                        size_t DataBytes,
                                         bool bCopyStatic,
-                                        SDKMESH_CALLBACKS11* pLoaderCallbacks11,
-                                        SDKMESH_CALLBACKS9* pLoaderCallbacks9 )
+                                        SDKMESH_CALLBACKS11* pLoaderCallbacks11 )
 {
-    HRESULT hr = E_FAIL;
-    D3DXVECTOR3 lower; 
-    D3DXVECTOR3 upper; 
+    XMFLOAT3 lower; 
+    XMFLOAT3 upper; 
     
-    m_pDev9 = pDev9;
-	m_pDev11 = pDev11;
+    m_pDev11 = pDev11;
+
+    if ( DataBytes < sizeof(SDKMESH_HEADER) )
+        return E_FAIL;
 
     // Set outstanding resources to zero
     m_NumOutstandingResources = 0;
 
     if( bCopyStatic )
     {
-        SDKMESH_HEADER* pHeader = ( SDKMESH_HEADER* )pData;
+        auto pHeader = reinterpret_cast<SDKMESH_HEADER*>( pData );
 
         SIZE_T StaticSize = ( SIZE_T )( pHeader->HeaderSize + pHeader->NonBufferDataSize );
-        m_pHeapData = new BYTE[ StaticSize ];
+        if ( DataBytes < StaticSize )
+            return E_FAIL;
+
+        m_pHeapData = new (std::nothrow) BYTE[ StaticSize ];
         if( !m_pHeapData )
-            return hr;
+            return E_OUTOFMEMORY;
 
         m_pStaticMeshData = m_pHeapData;
 
-        CopyMemory( m_pStaticMeshData, pData, StaticSize );
+        memcpy( m_pStaticMeshData, pData, StaticSize );
     }
     else
     {
@@ -416,7 +268,8 @@ HRESULT CDXUTSDKMesh::CreateFromMemory( ID3D11Device* pDev11,
     }
 
     // Pointer fixup
-    m_pMeshHeader = ( SDKMESH_HEADER* )m_pStaticMeshData;
+    m_pMeshHeader = reinterpret_cast<SDKMESH_HEADER*>( m_pStaticMeshData );
+
     m_pVertexBufferArray = ( SDKMESH_VERTEX_BUFFER_HEADER* )( m_pStaticMeshData +
                                                               m_pMeshHeader->VertexStreamHeadersOffset );
     m_pIndexBufferArray = ( SDKMESH_INDEX_BUFFER_HEADER* )( m_pStaticMeshData +
@@ -436,8 +289,7 @@ HRESULT CDXUTSDKMesh::CreateFromMemory( ID3D11Device* pDev11,
     // error condition
     if( m_pMeshHeader->Version != SDKMESH_FILE_VERSION )
     {
-        hr = E_NOINTERFACE;
-        goto Error;
+        return E_NOINTERFACE;
     }
 
     // Setup buffer data pointer
@@ -447,31 +299,36 @@ HRESULT CDXUTSDKMesh::CreateFromMemory( ID3D11Device* pDev11,
     UINT64 BufferDataStart = m_pMeshHeader->HeaderSize + m_pMeshHeader->NonBufferDataSize;
 
     // Create VBs
-    m_ppVertices = new BYTE*[m_pMeshHeader->NumVertexBuffers];
+    m_ppVertices = new (std::nothrow) BYTE*[m_pMeshHeader->NumVertexBuffers];
+    if ( !m_ppVertices )
+    {
+        return E_OUTOFMEMORY;
+    }
     for( UINT i = 0; i < m_pMeshHeader->NumVertexBuffers; i++ )
     {
-        BYTE* pVertices = NULL;
+        BYTE* pVertices = nullptr;
         pVertices = ( BYTE* )( pBufferData + ( m_pVertexBufferArray[i].DataOffset - BufferDataStart ) );
 
         if( pDev11 )
             CreateVertexBuffer( pDev11, &m_pVertexBufferArray[i], pVertices, pLoaderCallbacks11 );
-        else if( pDev9 )
-            CreateVertexBuffer( pDev9, &m_pVertexBufferArray[i], pVertices, pLoaderCallbacks9 );
 
         m_ppVertices[i] = pVertices;
     }
 
     // Create IBs
-    m_ppIndices = new BYTE*[m_pMeshHeader->NumIndexBuffers];
+    m_ppIndices = new (std::nothrow) BYTE*[m_pMeshHeader->NumIndexBuffers];
+    if ( !m_ppIndices )
+    {
+        return E_OUTOFMEMORY;
+    }
+
     for( UINT i = 0; i < m_pMeshHeader->NumIndexBuffers; i++ )
     {
-        BYTE* pIndices = NULL;
+        BYTE* pIndices = nullptr;
         pIndices = ( BYTE* )( pBufferData + ( m_pIndexBufferArray[i].DataOffset - BufferDataStart ) );
 
         if( pDev11 )
             CreateIndexBuffer( pDev11, &m_pIndexBufferArray[i], pIndices, pLoaderCallbacks11 );
-        else if( pDev9 )
-            CreateIndexBuffer( pDev9, &m_pIndexBufferArray[i], pIndices, pLoaderCallbacks9 );
 
         m_ppIndices[i] = pIndices;
     }
@@ -479,23 +336,28 @@ HRESULT CDXUTSDKMesh::CreateFromMemory( ID3D11Device* pDev11,
     // Load Materials
     if( pDev11 )
         LoadMaterials( pDev11, m_pMaterialArray, m_pMeshHeader->NumMaterials, pLoaderCallbacks11 );
-    else if( pDev9 )
-        LoadMaterials( pDev9, m_pMaterialArray, m_pMeshHeader->NumMaterials, pLoaderCallbacks9 );
 
     // Create a place to store our bind pose frame matrices
-    m_pBindPoseFrameMatrices = new D3DXMATRIX[ m_pMeshHeader->NumFrames ];
+    m_pBindPoseFrameMatrices = new (std::nothrow) XMFLOAT4X4[ m_pMeshHeader->NumFrames ];
     if( !m_pBindPoseFrameMatrices )
-        goto Error;
+    {
+        return E_OUTOFMEMORY;
+    }
 
     // Create a place to store our transformed frame matrices
-    m_pTransformedFrameMatrices = new D3DXMATRIX[ m_pMeshHeader->NumFrames ];
+    m_pTransformedFrameMatrices = new (std::nothrow) XMFLOAT4X4[ m_pMeshHeader->NumFrames ];
     if( !m_pTransformedFrameMatrices )
-        goto Error;
-    m_pWorldPoseFrameMatrices = new D3DXMATRIX[ m_pMeshHeader->NumFrames ];
+    {
+        return E_OUTOFMEMORY;
+    }
+
+    m_pWorldPoseFrameMatrices = new (std::nothrow) XMFLOAT4X4[ m_pMeshHeader->NumFrames ];
     if( !m_pWorldPoseFrameMatrices )
-        goto Error;
+    {
+        return E_OUTOFMEMORY;
+    }
 
-    SDKMESH_SUBSET* pSubset = NULL;
+    SDKMESH_SUBSET* pSubset = nullptr;
     D3D11_PRIMITIVE_TOPOLOGY PrimType;
 
     // update bounding volume 
@@ -528,10 +390,10 @@ HRESULT CDXUTSDKMesh::CreateFromMemory( ID3D11Device* pDev11,
                 IndexStart *= 2;
             }*/
      
-        //BYTE* pIndices = NULL;
+        //BYTE* pIndices = nullptr;
             //m_ppIndices[i]
             UINT *ind = ( UINT * )m_ppIndices[currentMesh->IndexBuffer];
-            FLOAT *verts =  ( FLOAT* )m_ppVertices[currentMesh->VertexBuffers[0]];
+            float *verts =  ( float* )m_ppVertices[currentMesh->VertexBuffers[0]];
             UINT stride = (UINT)m_pVertexBufferArray[currentMesh->VertexBuffers[0]].StrideBytes;
             assert (stride % 4 == 0);
             stride /=4;
@@ -550,7 +412,7 @@ HRESULT CDXUTSDKMesh::CreateFromMemory( ID3D11Device* pDev11,
                     current_ind = ind[vertind];
                 }
                 tris++;
-                D3DXVECTOR3 *pt = (D3DXVECTOR3*)&(verts[stride * current_ind]);
+                XMFLOAT3 *pt = (XMFLOAT3*)&(verts[stride * current_ind]);
                 if (pt->x < lower.x) {
                     lower.x = pt->x;
                 }
@@ -575,153 +437,137 @@ HRESULT CDXUTSDKMesh::CreateFromMemory( ID3D11Device* pDev11,
             //pd3dDeviceContext->DrawIndexed( IndexCount, IndexStart, VertexStart );
         }
 
-        D3DXVECTOR3 half = upper - lower;
-        half *=0.5f;
+        XMFLOAT3 half( ( upper.x - lower.x ) * 0.5f,
+                       ( upper.y - lower.y ) * 0.5f,
+                       ( upper.z - lower.z ) * 0.5f );
+
+        currentMesh->BoundingBoxCenter.x = lower.x + half.x;
+        currentMesh->BoundingBoxCenter.y = lower.y + half.y;
+        currentMesh->BoundingBoxCenter.z = lower.z + half.z;
 
-        currentMesh->BoundingBoxCenter = lower + half;
         currentMesh->BoundingBoxExtents = half;
 
     }
     // Update 
         
-
-
-    hr = S_OK;
-Error:
-
-    if( !pLoaderCallbacks9 )
-    {
-        CheckLoadDone();
-    }
-
-    return hr;
+    return S_OK;
 }
 
+
 //--------------------------------------------------------------------------------------
 // transform bind pose frame using a recursive traversal
 //--------------------------------------------------------------------------------------
-void CDXUTSDKMesh::TransformBindPoseFrame( UINT iFrame, D3DXMATRIX* pParentWorld )
+_Use_decl_annotations_
+void CDXUTSDKMesh::TransformBindPoseFrame( UINT iFrame, CXMMATRIX parentWorld )
 {
     if( !m_pBindPoseFrameMatrices )
         return;
 
     // Transform ourselves
-    D3DXMATRIX LocalWorld;
-    D3DXMatrixMultiply( &LocalWorld, &m_pFrameArray[iFrame].Matrix, pParentWorld );
-    m_pBindPoseFrameMatrices[iFrame] = LocalWorld;
+    XMMATRIX m = XMLoadFloat4x4( &m_pFrameArray[iFrame].Matrix );
+    XMMATRIX mLocalWorld = XMMatrixMultiply( m, parentWorld );
+    XMStoreFloat4x4( &m_pBindPoseFrameMatrices[iFrame], mLocalWorld );
 
     // Transform our siblings
     if( m_pFrameArray[iFrame].SiblingFrame != INVALID_FRAME )
-        TransformBindPoseFrame( m_pFrameArray[iFrame].SiblingFrame, pParentWorld );
+    {
+        TransformBindPoseFrame( m_pFrameArray[iFrame].SiblingFrame, parentWorld );
+    }
 
     // Transform our children
     if( m_pFrameArray[iFrame].ChildFrame != INVALID_FRAME )
-        TransformBindPoseFrame( m_pFrameArray[iFrame].ChildFrame, &LocalWorld );
+    {
+        TransformBindPoseFrame( m_pFrameArray[iFrame].ChildFrame, mLocalWorld );
+    }
 }
 
+
 //--------------------------------------------------------------------------------------
 // transform frame using a recursive traversal
 //--------------------------------------------------------------------------------------
-void CDXUTSDKMesh::TransformFrame( UINT iFrame, D3DXMATRIX* pParentWorld, double fTime )
+_Use_decl_annotations_
+void CDXUTSDKMesh::TransformFrame( UINT iFrame, CXMMATRIX parentWorld, double fTime )
 {
     // Get the tick data
-    D3DXMATRIX LocalTransform;
+    XMMATRIX mLocalTransform;
+
     UINT iTick = GetAnimationKeyFromTime( fTime );
 
     if( INVALID_ANIMATION_DATA != m_pFrameArray[iFrame].AnimationDataIndex )
     {
-        SDKANIMATION_FRAME_DATA* pFrameData = &m_pAnimationFrameData[ m_pFrameArray[iFrame].AnimationDataIndex ];
-        SDKANIMATION_DATA* pData = &pFrameData->pAnimationData[ iTick ];
+        auto pFrameData = &m_pAnimationFrameData[ m_pFrameArray[iFrame].AnimationDataIndex ];
+        auto pData = &pFrameData->pAnimationData[ iTick ];
 
         // turn it into a matrix (Ignore scaling for now)
-        D3DXVECTOR3 parentPos = pData->Translation;
-        D3DXMATRIX mTranslate;
-        D3DXMatrixTranslation( &mTranslate, parentPos.x, parentPos.y, parentPos.z );
-
-        D3DXQUATERNION quat;
-        D3DXMATRIX mQuat;
-        quat.w = pData->Orientation.w;
-        quat.x = pData->Orientation.x;
-        quat.y = pData->Orientation.y;
-        quat.z = pData->Orientation.z;
-        if( quat.w == 0 && quat.x == 0 && quat.y == 0 && quat.z == 0 )
-            D3DXQuaternionIdentity( &quat );
-        D3DXQuaternionNormalize( &quat, &quat );
-        D3DXMatrixRotationQuaternion( &mQuat, &quat );
-        LocalTransform = ( mQuat * mTranslate );
+        XMFLOAT3 parentPos = pData->Translation;
+        XMMATRIX mTranslate = XMMatrixTranslation( parentPos.x, parentPos.y, parentPos.z );
+
+        XMVECTOR quat = XMVectorSet( pData->Orientation.x, pData->Orientation.y, pData->Orientation.z, pData->Orientation.w );
+        if ( XMVector4Equal( quat, g_XMZero ) )
+            quat = XMQuaternionIdentity();
+        quat = XMQuaternionNormalize( quat );
+        XMMATRIX mQuat = XMMatrixRotationQuaternion( quat );
+        mLocalTransform = ( mQuat * mTranslate );
     }
     else
     {
-        LocalTransform = m_pFrameArray[iFrame].Matrix;
+        mLocalTransform = XMLoadFloat4x4( &m_pFrameArray[iFrame].Matrix );
     }
 
     // Transform ourselves
-    D3DXMATRIX LocalWorld;
-    D3DXMatrixMultiply( &LocalWorld, &LocalTransform, pParentWorld );
-    m_pTransformedFrameMatrices[iFrame] = LocalWorld;
-    m_pWorldPoseFrameMatrices[iFrame] = LocalWorld;
+    XMMATRIX mLocalWorld = XMMatrixMultiply( mLocalTransform, parentWorld );
+    XMStoreFloat4x4( &m_pTransformedFrameMatrices[iFrame], mLocalWorld );
+    XMStoreFloat4x4( &m_pWorldPoseFrameMatrices[iFrame], mLocalWorld );
 
     // Transform our siblings
     if( m_pFrameArray[iFrame].SiblingFrame != INVALID_FRAME )
-        TransformFrame( m_pFrameArray[iFrame].SiblingFrame, pParentWorld, fTime );
+    {
+        TransformFrame( m_pFrameArray[iFrame].SiblingFrame, parentWorld, fTime );
+    }
 
     // Transform our children
     if( m_pFrameArray[iFrame].ChildFrame != INVALID_FRAME )
-        TransformFrame( m_pFrameArray[iFrame].ChildFrame, &LocalWorld, fTime );
+    {
+        TransformFrame( m_pFrameArray[iFrame].ChildFrame, mLocalWorld, fTime );
+    }
 }
 
+
 //--------------------------------------------------------------------------------------
 // transform frame assuming that it is an absolute transformation
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTSDKMesh::TransformFrameAbsolute( UINT iFrame, double fTime )
 {
-    D3DXMATRIX mTrans1;
-    D3DXMATRIX mTrans2;
-    D3DXMATRIX mRot1;
-    D3DXMATRIX mRot2;
-    D3DXQUATERNION quat1;
-    D3DXQUATERNION quat2;
-    D3DXMATRIX mTo;
-    D3DXMATRIX mInvTo;
-    D3DXMATRIX mFrom;
-
     UINT iTick = GetAnimationKeyFromTime( fTime );
 
     if( INVALID_ANIMATION_DATA != m_pFrameArray[iFrame].AnimationDataIndex )
     {
-        SDKANIMATION_FRAME_DATA* pFrameData = &m_pAnimationFrameData[ m_pFrameArray[iFrame].AnimationDataIndex ];
-        SDKANIMATION_DATA* pData = &pFrameData->pAnimationData[ iTick ];
-        SDKANIMATION_DATA* pDataOrig = &pFrameData->pAnimationData[ 0 ];
-
-        D3DXMatrixTranslation( &mTrans1, -pDataOrig->Translation.x,
-                               -pDataOrig->Translation.y,
-                               -pDataOrig->Translation.z );
-        D3DXMatrixTranslation( &mTrans2, pData->Translation.x,
-                               pData->Translation.y,
-                               pData->Translation.z );
-
-        quat1.x = pDataOrig->Orientation.x;
-        quat1.y = pDataOrig->Orientation.y;
-        quat1.z = pDataOrig->Orientation.z;
-        quat1.w = pDataOrig->Orientation.w;
-        D3DXQuaternionInverse( &quat1, &quat1 );
-        D3DXMatrixRotationQuaternion( &mRot1, &quat1 );
-        mInvTo = mTrans1 * mRot1;
-
-        quat2.x = pData->Orientation.x;
-        quat2.y = pData->Orientation.y;
-        quat2.z = pData->Orientation.z;
-        quat2.w = pData->Orientation.w;
-        D3DXMatrixRotationQuaternion( &mRot2, &quat2 );
-        mFrom = mRot2 * mTrans2;
-
-        D3DXMATRIX mOutput = mInvTo * mFrom;
-        m_pTransformedFrameMatrices[iFrame] = mOutput;
+        auto pFrameData = &m_pAnimationFrameData[ m_pFrameArray[iFrame].AnimationDataIndex ];
+        auto pData = &pFrameData->pAnimationData[ iTick ];
+        auto pDataOrig = &pFrameData->pAnimationData[ 0 ];
+
+        XMMATRIX mTrans1 = XMMatrixTranslation( -pDataOrig->Translation.x, -pDataOrig->Translation.y, -pDataOrig->Translation.z );
+        XMMATRIX mTrans2 = XMMatrixTranslation( pData->Translation.x, pData->Translation.y, pData->Translation.z );
+
+        XMVECTOR quat1 = XMVectorSet( pDataOrig->Orientation.x, pDataOrig->Orientation.y, pDataOrig->Orientation.z, pDataOrig->Orientation.w );
+        quat1 = XMQuaternionInverse( quat1 );
+        XMMATRIX mRot1 = XMMatrixRotationQuaternion( quat1 );
+        XMMATRIX mInvTo = mTrans1 * mRot1;
+
+        XMVECTOR quat2 = XMVectorSet( pData->Orientation.x, pData->Orientation.y, pData->Orientation.z, pData->Orientation.w );
+        XMMATRIX mRot2 = XMMatrixRotationQuaternion( quat2 );
+        XMMATRIX mFrom = mRot2 * mTrans2;
+
+        XMMATRIX mOutput = mInvTo * mFrom;
+        XMStoreFloat4x4( &m_pTransformedFrameMatrices[iFrame], mOutput );
     }
 }
 
 #define MAX_D3D11_VERTEX_STREAMS D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT
+
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTSDKMesh::RenderMesh( UINT iMesh,
                                bool bAdjacent,
                                ID3D11DeviceContext* pd3dDeviceContext,
@@ -732,7 +578,7 @@ void CDXUTSDKMesh::RenderMesh( UINT iMesh,
     if( 0 < GetOutstandingBufferResources() )
         return;
 
-    SDKMESH_MESH* pMesh = &m_pMeshArray[iMesh];
+    auto pMesh = &m_pMeshArray[iMesh];
 
     UINT Strides[MAX_D3D11_VERTEX_STREAMS];
     UINT Offsets[MAX_D3D11_VERTEX_STREAMS];
@@ -754,7 +600,7 @@ void CDXUTSDKMesh::RenderMesh( UINT iMesh,
     else
         pIndexBufferArray = m_pIndexBufferArray;
 
-    ID3D11Buffer* pIB = pIndexBufferArray[ pMesh->IndexBuffer ].pIB11;
+    auto pIB = pIndexBufferArray[ pMesh->IndexBuffer ].pIB11;
     DXGI_FORMAT ibFormat = DXGI_FORMAT_R16_UINT;
     switch( pIndexBufferArray[ pMesh->IndexBuffer ].IndexType )
     {
@@ -769,8 +615,8 @@ void CDXUTSDKMesh::RenderMesh( UINT iMesh,
     pd3dDeviceContext->IASetVertexBuffers( 0, pMesh->NumVertexBuffers, pVB, Strides, Offsets );
     pd3dDeviceContext->IASetIndexBuffer( pIB, ibFormat, 0 );
 
-    SDKMESH_SUBSET* pSubset = NULL;
-    SDKMESH_MATERIAL* pMat = NULL;
+    SDKMESH_SUBSET* pSubset = nullptr;
+    SDKMESH_MATERIAL* pMat = nullptr;
     D3D11_PRIMITIVE_TOPOLOGY PrimType;
 
     for( UINT subset = 0; subset < pMesh->NumSubsets; subset++ )
@@ -821,6 +667,7 @@ void CDXUTSDKMesh::RenderMesh( UINT iMesh,
 }
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTSDKMesh::RenderFrame( UINT iFrame,
                                 bool bAdjacent,
                                 ID3D11DeviceContext* pd3dDeviceContext,
@@ -852,141 +699,23 @@ void CDXUTSDKMesh::RenderFrame( UINT iFrame,
                      iNormalSlot, iSpecularSlot );
 }
 
-//--------------------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------------------
-void CDXUTSDKMesh::RenderMesh( UINT iMesh,
-                               LPDIRECT3DDEVICE9 pd3dDevice,
-                               LPD3DXEFFECT pEffect,
-                               D3DXHANDLE hTechnique,
-                               D3DXHANDLE htxDiffuse,
-                               D3DXHANDLE htxNormal,
-                               D3DXHANDLE htxSpecular )
-{
-    if( 0 < GetOutstandingBufferResources() )
-        return;
-
-    SDKMESH_MESH* pMesh = &m_pMeshArray[iMesh];
-
-    // set vb streams
-    for( UINT i = 0; i < ( UINT )pMesh->NumVertexBuffers; i++ )
-    {
-        pd3dDevice->SetStreamSource( i,
-                                     m_pVertexBufferArray[ pMesh->VertexBuffers[i] ].pVB9,
-                                     0,
-                                     ( UINT )m_pVertexBufferArray[ pMesh->VertexBuffers[i] ].StrideBytes );
-    }
-
-    // Set our index buffer as well
-    pd3dDevice->SetIndices( m_pIndexBufferArray[ pMesh->IndexBuffer ].pIB9 );
-
-    // Render the scene with this technique 
-    pEffect->SetTechnique( hTechnique );
-
-    SDKMESH_SUBSET* pSubset = NULL;
-    SDKMESH_MATERIAL* pMat = NULL;
-    D3DPRIMITIVETYPE PrimType;
-    UINT cPasses = 0;
-    pEffect->Begin( &cPasses, 0 );
-
-    for( UINT p = 0; p < cPasses; ++p )
-    {
-        pEffect->BeginPass( p );
-
-        for( UINT subset = 0; subset < pMesh->NumSubsets; subset++ )
-        {
-            pSubset = &m_pSubsetArray[ pMesh->pSubsets[subset] ];
-
-            PrimType = GetPrimitiveType9( ( SDKMESH_PRIMITIVE_TYPE )pSubset->PrimitiveType );
-
-            if( INVALID_MATERIAL != pSubset->MaterialID && m_pMeshHeader->NumMaterials > 0 )
-            {
-                pMat = &m_pMaterialArray[ pSubset->MaterialID ];
-                if( htxDiffuse && !IsErrorResource( pMat->pDiffuseTexture9 ) )
-                    pEffect->SetTexture( htxDiffuse, pMat->pDiffuseTexture9 );
-                if( htxNormal && !IsErrorResource( pMat->pNormalTexture9 ) )
-                    pEffect->SetTexture( htxNormal, pMat->pNormalTexture9 );
-                if( htxSpecular && !IsErrorResource( pMat->pSpecularTexture9 ) )
-                    pEffect->SetTexture( htxSpecular, pMat->pSpecularTexture9 );
-            }
-
-            pEffect->CommitChanges();
-
-            UINT PrimCount = ( UINT )pSubset->IndexCount;
-            UINT IndexStart = ( UINT )pSubset->IndexStart;
-            UINT VertexStart = ( UINT )pSubset->VertexStart;
-            UINT VertexCount = ( UINT )pSubset->VertexCount;
-            if( D3DPT_TRIANGLELIST == PrimType )
-                PrimCount /= 3;
-            if( D3DPT_LINELIST == PrimType )
-                PrimCount /= 2;
-            if( D3DPT_TRIANGLESTRIP == PrimType )
-                PrimCount = ( PrimCount - 3 ) + 1;
-            if( D3DPT_LINESTRIP == PrimType )
-                PrimCount -= 1;
-
-            pd3dDevice->DrawIndexedPrimitive( PrimType, VertexStart, 0, VertexCount, IndexStart, PrimCount );
-        }
-
-        pEffect->EndPass();
-    }
-
-    pEffect->End();
-}
-
-//--------------------------------------------------------------------------------------
-void CDXUTSDKMesh::RenderFrame( UINT iFrame,
-                                LPDIRECT3DDEVICE9 pd3dDevice,
-                                LPD3DXEFFECT pEffect,
-                                D3DXHANDLE hTechnique,
-                                D3DXHANDLE htxDiffuse,
-                                D3DXHANDLE htxNormal,
-                                D3DXHANDLE htxSpecular )
-{
-    if( !m_pStaticMeshData || !m_pFrameArray )
-        return;
-
-    if( m_pFrameArray[iFrame].Mesh != INVALID_MESH )
-    {
-        RenderMesh( m_pFrameArray[iFrame].Mesh,
-                    pd3dDevice,
-                    pEffect,
-                    hTechnique,
-                    htxDiffuse,
-                    htxNormal,
-                    htxSpecular );
-    }
-
-    // Render our children
-    if( m_pFrameArray[iFrame].ChildFrame != INVALID_FRAME )
-        RenderFrame( m_pFrameArray[iFrame].ChildFrame, pd3dDevice, pEffect, hTechnique, htxDiffuse, htxNormal,
-                     htxSpecular );
-
-    // Render our siblings
-    if( m_pFrameArray[iFrame].SiblingFrame != INVALID_FRAME )
-        RenderFrame( m_pFrameArray[iFrame].SiblingFrame, pd3dDevice, pEffect, hTechnique, htxDiffuse, htxNormal,
-                     htxSpecular );
-}
-
-
 //--------------------------------------------------------------------------------------
 CDXUTSDKMesh::CDXUTSDKMesh() : m_NumOutstandingResources( 0 ),
                                m_bLoading( false ),
                                m_hFile( 0 ),
                                m_hFileMappingObject( 0 ),
-                               m_pMeshHeader( NULL ),
-                               m_pStaticMeshData( NULL ),
-                               m_pHeapData( NULL ),
-                               m_pAdjacencyIndexBufferArray( NULL ),
-                               m_pAnimationData( NULL ),
-                               m_pAnimationHeader( NULL ),
-                               m_ppVertices( NULL ),
-                               m_ppIndices( NULL ),
-                               m_pBindPoseFrameMatrices( NULL ),
-                               m_pTransformedFrameMatrices( NULL ),
-                               m_pWorldPoseFrameMatrices( NULL ),
-                               m_pDev9( NULL ),
-							   m_pDev11( NULL )
+                               m_pMeshHeader( nullptr ),
+                               m_pStaticMeshData( nullptr ),
+                               m_pHeapData( nullptr ),
+                               m_pAdjacencyIndexBufferArray( nullptr ),
+                               m_pAnimationData( nullptr ),
+                               m_pAnimationHeader( nullptr ),
+                               m_ppVertices( nullptr ),
+                               m_ppIndices( nullptr ),
+                               m_pBindPoseFrameMatrices( nullptr ),
+                               m_pTransformedFrameMatrices( nullptr ),
+                               m_pWorldPoseFrameMatrices( nullptr ),
+                               m_pDev11( nullptr )
 {
 }
 
@@ -998,38 +727,22 @@ CDXUTSDKMesh::~CDXUTSDKMesh()
 }
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTSDKMesh::Create( ID3D11Device* pDev11, LPCTSTR szFileName, bool bCreateAdjacencyIndices,
-                              SDKMESH_CALLBACKS11* pLoaderCallbacks )
+_Use_decl_annotations_
+HRESULT CDXUTSDKMesh::Create( ID3D11Device* pDev11, LPCWSTR szFileName, SDKMESH_CALLBACKS11* pLoaderCallbacks )
 {
-    return CreateFromFile( pDev11,  NULL, szFileName, bCreateAdjacencyIndices, pLoaderCallbacks,  NULL );
+    return CreateFromFile( pDev11, szFileName, pLoaderCallbacks );
 }
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTSDKMesh::Create( IDirect3DDevice9* pDev9, LPCTSTR szFileName, bool bCreateAdjacencyIndices,
-                              SDKMESH_CALLBACKS9* pLoaderCallbacks )
+_Use_decl_annotations_
+HRESULT CDXUTSDKMesh::Create( ID3D11Device* pDev11, BYTE* pData, size_t DataBytes, bool bCopyStatic, SDKMESH_CALLBACKS11* pLoaderCallbacks )
 {
-    return CreateFromFile( NULL,  pDev9, szFileName, bCreateAdjacencyIndices, NULL,  pLoaderCallbacks );
+    return CreateFromMemory( pDev11, pData, DataBytes, bCopyStatic, pLoaderCallbacks );
 }
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTSDKMesh::Create( ID3D11Device* pDev11, BYTE* pData, UINT DataBytes, bool bCreateAdjacencyIndices,
-                              bool bCopyStatic, SDKMESH_CALLBACKS11* pLoaderCallbacks )
-{
-    return CreateFromMemory( pDev11, NULL, pData, DataBytes, bCreateAdjacencyIndices, bCopyStatic,
-                             pLoaderCallbacks,  NULL );
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTSDKMesh::Create( IDirect3DDevice9* pDev9, BYTE* pData, UINT DataBytes, bool bCreateAdjacencyIndices,
-                              bool bCopyStatic, SDKMESH_CALLBACKS9* pLoaderCallbacks )
-{
-    return CreateFromMemory( NULL, pDev9, pData, DataBytes, bCreateAdjacencyIndices, bCopyStatic, NULL, 
-                             pLoaderCallbacks );
-}
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTSDKMesh::LoadAnimation( WCHAR* szFileName )
+HRESULT CDXUTSDKMesh::LoadAnimation( _In_z_ const WCHAR* szFileName )
 {
     HRESULT hr = E_FAIL;
     DWORD dwBytesRead = 0;
@@ -1040,32 +753,42 @@ HRESULT CDXUTSDKMesh::LoadAnimation( WCHAR* szFileName )
     V_RETURN( DXUTFindDXSDKMediaFileCch( strPath, MAX_PATH, szFileName ) );
 
     // Open the file
-    HANDLE hFile = CreateFile( strPath, FILE_READ_DATA, FILE_SHARE_READ, NULL, OPEN_EXISTING,
-                               FILE_FLAG_SEQUENTIAL_SCAN, NULL );
+    HANDLE hFile = CreateFile( strPath, FILE_READ_DATA, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
+                               FILE_FLAG_SEQUENTIAL_SCAN, nullptr );
     if( INVALID_HANDLE_VALUE == hFile )
         return DXUTERR_MEDIANOTFOUND;
 
     /////////////////////////
     // Header
     SDKANIMATION_FILE_HEADER fileheader;
-    if( !ReadFile( hFile, &fileheader, sizeof( SDKANIMATION_FILE_HEADER ), &dwBytesRead, NULL ) )
-        goto Error;
+    if( !ReadFile( hFile, &fileheader, sizeof( SDKANIMATION_FILE_HEADER ), &dwBytesRead, nullptr ) )
+    {
+        CloseHandle(hFile);
+        return HRESULT_FROM_WIN32(GetLastError());
+    }
 
     //allocate
-    m_pAnimationData = new BYTE[ ( size_t )( sizeof( SDKANIMATION_FILE_HEADER ) + fileheader.AnimationDataSize ) ];
+    m_pAnimationData = new (std::nothrow) BYTE[ ( size_t )( sizeof( SDKANIMATION_FILE_HEADER ) + fileheader.AnimationDataSize ) ];
     if( !m_pAnimationData )
     {
-        hr = E_OUTOFMEMORY;
-        goto Error;
+        CloseHandle(hFile);
+        return E_OUTOFMEMORY;
     }
 
     // read it all in
     liMove.QuadPart = 0;
-    if( !SetFilePointerEx( hFile, liMove, NULL, FILE_BEGIN ) )
-        goto Error;
+    if( !SetFilePointerEx( hFile, liMove, nullptr, FILE_BEGIN ) )
+    {
+        CloseHandle(hFile);
+        return HRESULT_FROM_WIN32(GetLastError());
+    }
+
     if( !ReadFile( hFile, m_pAnimationData, ( DWORD )( sizeof( SDKANIMATION_FILE_HEADER ) +
-                                                       fileheader.AnimationDataSize ), &dwBytesRead, NULL ) )
-        goto Error;
+                                                       fileheader.AnimationDataSize ), &dwBytesRead, nullptr ) )
+    {
+        CloseHandle(hFile);
+        return HRESULT_FROM_WIN32(GetLastError());
+    }
 
     // pointer fixup
     m_pAnimationHeader = ( SDKANIMATION_FILE_HEADER* )m_pAnimationData;
@@ -1077,17 +800,14 @@ HRESULT CDXUTSDKMesh::LoadAnimation( WCHAR* szFileName )
         m_pAnimationFrameData[i].pAnimationData = ( SDKANIMATION_DATA* )( m_pAnimationData +
                                                                           m_pAnimationFrameData[i].DataOffset +
                                                                           BaseOffset );
-        SDKMESH_FRAME* pFrame = FindFrame( m_pAnimationFrameData[i].FrameName );
+        auto pFrame = FindFrame( m_pAnimationFrameData[i].FrameName );
         if( pFrame )
         {
             pFrame->AnimationDataIndex = i;
         }
     }
 
-    hr = S_OK;
-Error:
-    CloseHandle( hFile );
-    return hr;
+    return S_OK;
 }
 
 //--------------------------------------------------------------------------------------
@@ -1102,18 +822,8 @@ void CDXUTSDKMesh::Destroy()
         {
             for( UINT64 m = 0; m < m_pMeshHeader->NumMaterials; m++ )
             {
-                if( m_pDev9 )
-                {
-                    if( !IsErrorResource( m_pMaterialArray[m].pDiffuseTexture9 ) )
-                        SAFE_RELEASE( m_pMaterialArray[m].pDiffuseTexture9 );
-                    if( !IsErrorResource( m_pMaterialArray[m].pNormalTexture9 ) )
-                        SAFE_RELEASE( m_pMaterialArray[m].pNormalTexture9 );
-                    if( !IsErrorResource( m_pMaterialArray[m].pSpecularTexture9 ) )
-                        SAFE_RELEASE( m_pMaterialArray[m].pSpecularTexture9 );
-                }
-				else if( m_pDev11 )
+                if( m_pDev11 )
                 {
-                    //ID3D11Resource* pRes = NULL;
                     if( m_pMaterialArray[m].pDiffuseRV11 && !IsErrorResource( m_pMaterialArray[m].pDiffuseRV11 ) )
                     {
                         //m_pMaterialArray[m].pDiffuseRV11->GetResource( &pRes );
@@ -1138,17 +848,14 @@ void CDXUTSDKMesh::Destroy()
                 }
             }
         }
-
         for( UINT64 i = 0; i < m_pMeshHeader->NumVertexBuffers; i++ )
         {
-            if( !IsErrorResource( m_pVertexBufferArray[i].pVB9 ) )
-                SAFE_RELEASE( m_pVertexBufferArray[i].pVB9 );
+            SAFE_RELEASE( m_pVertexBufferArray[i].pVB11 );
         }
 
         for( UINT64 i = 0; i < m_pMeshHeader->NumIndexBuffers; i++ )
         {
-            if( !IsErrorResource( m_pIndexBufferArray[i].pIB9 ) )
-                SAFE_RELEASE( m_pIndexBufferArray[i].pIB9 );
+            SAFE_RELEASE( m_pIndexBufferArray[i].pIB11 );
         }
     }
 
@@ -1162,7 +869,7 @@ void CDXUTSDKMesh::Destroy()
     SAFE_DELETE_ARRAY( m_pAdjacencyIndexBufferArray );
 
     SAFE_DELETE_ARRAY( m_pHeapData );
-    m_pStaticMeshData = NULL;
+    m_pStaticMeshData = nullptr;
     SAFE_DELETE_ARRAY( m_pAnimationData );
     SAFE_DELETE_ARRAY( m_pBindPoseFrameMatrices );
     SAFE_DELETE_ARRAY( m_pTransformedFrameMatrices );
@@ -1171,45 +878,39 @@ void CDXUTSDKMesh::Destroy()
     SAFE_DELETE_ARRAY( m_ppVertices );
     SAFE_DELETE_ARRAY( m_ppIndices );
 
-    m_pMeshHeader = NULL;
-    m_pVertexBufferArray = NULL;
-    m_pIndexBufferArray = NULL;
-    m_pMeshArray = NULL;
-    m_pSubsetArray = NULL;
-    m_pFrameArray = NULL;
-    m_pMaterialArray = NULL;
+    m_pMeshHeader = nullptr;
+    m_pVertexBufferArray = nullptr;
+    m_pIndexBufferArray = nullptr;
+    m_pMeshArray = nullptr;
+    m_pSubsetArray = nullptr;
+    m_pFrameArray = nullptr;
+    m_pMaterialArray = nullptr;
 
-    m_pAnimationHeader = NULL;
-    m_pAnimationFrameData = NULL;
+    m_pAnimationHeader = nullptr;
+    m_pAnimationFrameData = nullptr;
 
 }
 
-//--------------------------------------------------------------------------------------
-// transform the bind pose
-//--------------------------------------------------------------------------------------
-void CDXUTSDKMesh::TransformBindPose( D3DXMATRIX* pWorld )
-{
-    TransformBindPoseFrame( 0, pWorld );
-}
 
 //--------------------------------------------------------------------------------------
 // transform the mesh frames according to the animation for time fTime
 //--------------------------------------------------------------------------------------
-void CDXUTSDKMesh::TransformMesh( D3DXMATRIX* pWorld, double fTime )
+_Use_decl_annotations_
+void CDXUTSDKMesh::TransformMesh( CXMMATRIX world, double fTime )
 {
-    if( m_pAnimationHeader == NULL || FTT_RELATIVE == m_pAnimationHeader->FrameTransformType )
+    if( !m_pAnimationHeader || FTT_RELATIVE == m_pAnimationHeader->FrameTransformType )
     {
-        TransformFrame( 0, pWorld, fTime );
+        TransformFrame( 0, world, fTime );
 
         // For each frame, move the transform to the bind pose, then
         // move it to the final position
-        D3DXMATRIX mInvBindPose;
-        D3DXMATRIX mFinal;
         for( UINT i = 0; i < m_pMeshHeader->NumFrames; i++ )
         {
-            D3DXMatrixInverse( &mInvBindPose, NULL, &m_pBindPoseFrameMatrices[i] );
-            mFinal = mInvBindPose * m_pTransformedFrameMatrices[i];
-            m_pTransformedFrameMatrices[i] = mFinal;
+            XMMATRIX m = XMLoadFloat4x4( &m_pBindPoseFrameMatrices[i] );
+            XMMATRIX mInvBindPose = XMMatrixInverse( nullptr, m );
+            m = XMLoadFloat4x4( &m_pTransformedFrameMatrices[i] );
+            XMMATRIX mFinal = mInvBindPose * m;
+            XMStoreFloat4x4( &m_pTransformedFrameMatrices[i], mFinal );
         }
     }
     else if( FTT_ABSOLUTE == m_pAnimationHeader->FrameTransformType )
@@ -1221,6 +922,7 @@ void CDXUTSDKMesh::TransformMesh( D3DXMATRIX* pWorld, double fTime )
 
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTSDKMesh::Render( ID3D11DeviceContext* pd3dDeviceContext,
                            UINT iDiffuseSlot,
                            UINT iNormalSlot,
@@ -1230,6 +932,7 @@ void CDXUTSDKMesh::Render( ID3D11DeviceContext* pd3dDeviceContext,
 }
 
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 void CDXUTSDKMesh::RenderAdjacent( ID3D11DeviceContext* pd3dDeviceContext,
                                    UINT iDiffuseSlot,
                                    UINT iNormalSlot,
@@ -1240,18 +943,7 @@ void CDXUTSDKMesh::RenderAdjacent( ID3D11DeviceContext* pd3dDeviceContext,
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTSDKMesh::Render( LPDIRECT3DDEVICE9 pd3dDevice,
-                           LPD3DXEFFECT pEffect,
-                           D3DXHANDLE hTechnique,
-                           D3DXHANDLE htxDiffuse,
-                           D3DXHANDLE htxNormal,
-                           D3DXHANDLE htxSpecular )
-{
-    RenderFrame( 0, pd3dDevice, pEffect, hTechnique, htxDiffuse, htxNormal, htxSpecular );
-}
-
-//--------------------------------------------------------------------------------------
-D3D11_PRIMITIVE_TOPOLOGY CDXUTSDKMesh::GetPrimitiveType11( SDKMESH_PRIMITIVE_TYPE PrimType )
+D3D11_PRIMITIVE_TOPOLOGY CDXUTSDKMesh::GetPrimitiveType11( _In_ SDKMESH_PRIMITIVE_TYPE PrimType )
 {
     D3D11_PRIMITIVE_TOPOLOGY retType = D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
 
@@ -1290,7 +982,7 @@ D3D11_PRIMITIVE_TOPOLOGY CDXUTSDKMesh::GetPrimitiveType11( SDKMESH_PRIMITIVE_TYP
 }
 
 //--------------------------------------------------------------------------------------
-DXGI_FORMAT CDXUTSDKMesh::GetIBFormat11( UINT iMesh )
+DXGI_FORMAT CDXUTSDKMesh::GetIBFormat11( _In_ UINT iMesh ) const
 {
     switch( m_pIndexBufferArray[ m_pMeshArray[ iMesh ].IndexBuffer ].IndexType )
     {
@@ -1303,100 +995,48 @@ DXGI_FORMAT CDXUTSDKMesh::GetIBFormat11( UINT iMesh )
 }
 
 //--------------------------------------------------------------------------------------
-ID3D11Buffer* CDXUTSDKMesh::GetVB11( UINT iMesh, UINT iVB )
+ID3D11Buffer* CDXUTSDKMesh::GetVB11( _In_ UINT iMesh, _In_ UINT iVB ) const
 {
     return m_pVertexBufferArray[ m_pMeshArray[ iMesh ].VertexBuffers[iVB] ].pVB11;
 }
 
 //--------------------------------------------------------------------------------------
-ID3D11Buffer* CDXUTSDKMesh::GetIB11( UINT iMesh )
+ID3D11Buffer* CDXUTSDKMesh::GetIB11( _In_ UINT iMesh ) const
 {
     return m_pIndexBufferArray[ m_pMeshArray[ iMesh ].IndexBuffer ].pIB11;
 }
-SDKMESH_INDEX_TYPE CDXUTSDKMesh::GetIndexType( UINT iMesh ) 
+SDKMESH_INDEX_TYPE CDXUTSDKMesh::GetIndexType( _In_ UINT iMesh ) const
 {
     return ( SDKMESH_INDEX_TYPE ) m_pIndexBufferArray[m_pMeshArray[ iMesh ].IndexBuffer].IndexType;
 }
 //--------------------------------------------------------------------------------------
-ID3D11Buffer* CDXUTSDKMesh::GetAdjIB11( UINT iMesh )
+ID3D11Buffer* CDXUTSDKMesh::GetAdjIB11( _In_ UINT iMesh ) const
 {
     return m_pAdjacencyIndexBufferArray[ m_pMeshArray[ iMesh ].IndexBuffer ].pIB11;
 }
 
 //--------------------------------------------------------------------------------------
-D3DPRIMITIVETYPE CDXUTSDKMesh::GetPrimitiveType9( SDKMESH_PRIMITIVE_TYPE PrimType )
+const char* CDXUTSDKMesh::GetMeshPathA() const
 {
-    D3DPRIMITIVETYPE retType = D3DPT_TRIANGLELIST;
-
-    switch( PrimType )
-    {
-        case PT_TRIANGLE_LIST:
-            retType = D3DPT_TRIANGLELIST;
-            break;
-        case PT_TRIANGLE_STRIP:
-            retType = D3DPT_TRIANGLESTRIP;
-            break;
-        case PT_LINE_LIST:
-            retType = D3DPT_LINELIST;
-            break;
-        case PT_LINE_STRIP:
-            retType = D3DPT_LINESTRIP;
-            break;
-        case PT_POINT_LIST:
-            retType = D3DPT_POINTLIST;
-            break;
-    };
-
-    return retType;
+    return m_strPath;
 }
 
 //--------------------------------------------------------------------------------------
-D3DFORMAT CDXUTSDKMesh::GetIBFormat9( UINT iMesh )
+const WCHAR* CDXUTSDKMesh::GetMeshPathW() const
 {
-    switch( m_pIndexBufferArray[ m_pMeshArray[ iMesh ].IndexBuffer ].IndexType )
-    {
-        case IT_16BIT:
-            return D3DFMT_INDEX16;
-        case IT_32BIT:
-            return D3DFMT_INDEX32;
-    };
-    return D3DFMT_INDEX16;
+    return m_strPathW;
 }
 
 //--------------------------------------------------------------------------------------
-IDirect3DVertexBuffer9* CDXUTSDKMesh::GetVB9( UINT iMesh, UINT iVB )
+UINT CDXUTSDKMesh::GetNumMeshes() const
 {
-    return m_pVertexBufferArray[ m_pMeshArray[ iMesh ].VertexBuffers[iVB] ].pVB9;
+    if( !m_pMeshHeader )
+        return 0;
+    return m_pMeshHeader->NumMeshes;
 }
 
 //--------------------------------------------------------------------------------------
-IDirect3DIndexBuffer9* CDXUTSDKMesh::GetIB9( UINT iMesh )
-{
-    return m_pIndexBufferArray[ m_pMeshArray[ iMesh ].IndexBuffer ].pIB9;
-}
-
-//--------------------------------------------------------------------------------------
-char* CDXUTSDKMesh::GetMeshPathA()
-{
-    return m_strPath;
-}
-
-//--------------------------------------------------------------------------------------
-WCHAR* CDXUTSDKMesh::GetMeshPathW()
-{
-    return m_strPathW;
-}
-
-//--------------------------------------------------------------------------------------
-UINT CDXUTSDKMesh::GetNumMeshes()
-{
-    if( !m_pMeshHeader )
-        return 0;
-    return m_pMeshHeader->NumMeshes;
-}
-
-//--------------------------------------------------------------------------------------
-UINT CDXUTSDKMesh::GetNumMaterials()
+UINT CDXUTSDKMesh::GetNumMaterials() const
 {
     if( !m_pMeshHeader )
         return 0;
@@ -1404,7 +1044,7 @@ UINT CDXUTSDKMesh::GetNumMaterials()
 }
 
 //--------------------------------------------------------------------------------------
-UINT CDXUTSDKMesh::GetNumVBs()
+UINT CDXUTSDKMesh::GetNumVBs() const
 {
     if( !m_pMeshHeader )
         return 0;
@@ -1412,7 +1052,7 @@ UINT CDXUTSDKMesh::GetNumVBs()
 }
 
 //--------------------------------------------------------------------------------------
-UINT CDXUTSDKMesh::GetNumIBs()
+UINT CDXUTSDKMesh::GetNumIBs() const
 {
     if( !m_pMeshHeader )
         return 0;
@@ -1420,86 +1060,74 @@ UINT CDXUTSDKMesh::GetNumIBs()
 }
 
 //--------------------------------------------------------------------------------------
-ID3D11Buffer* CDXUTSDKMesh::GetVB11At( UINT iVB )
+ID3D11Buffer* CDXUTSDKMesh::GetVB11At( _In_ UINT iVB ) const
 {
     return m_pVertexBufferArray[ iVB ].pVB11;
 }
 
 //--------------------------------------------------------------------------------------
-ID3D11Buffer* CDXUTSDKMesh::GetIB11At( UINT iIB )
+ID3D11Buffer* CDXUTSDKMesh::GetIB11At( _In_ UINT iIB ) const
 {
     return m_pIndexBufferArray[ iIB ].pIB11;
 }
 
 //--------------------------------------------------------------------------------------
-IDirect3DVertexBuffer9* CDXUTSDKMesh::GetVB9At( UINT iVB )
-{
-    return m_pVertexBufferArray[ iVB ].pVB9;
-}
-
-//--------------------------------------------------------------------------------------
-IDirect3DIndexBuffer9* CDXUTSDKMesh::GetIB9At( UINT iIB )
-{
-    return m_pIndexBufferArray[ iIB ].pIB9;
-}
-
-//--------------------------------------------------------------------------------------
-BYTE* CDXUTSDKMesh::GetRawVerticesAt( UINT iVB )
+BYTE* CDXUTSDKMesh::GetRawVerticesAt( _In_ UINT iVB ) const
 {
     return m_ppVertices[iVB];
 }
 
 //--------------------------------------------------------------------------------------
-BYTE* CDXUTSDKMesh::GetRawIndicesAt( UINT iIB )
+BYTE* CDXUTSDKMesh::GetRawIndicesAt( _In_ UINT iIB ) const
 {
     return m_ppIndices[iIB];
 }
 
 //--------------------------------------------------------------------------------------
-SDKMESH_MATERIAL* CDXUTSDKMesh::GetMaterial( UINT iMaterial )
+SDKMESH_MATERIAL* CDXUTSDKMesh::GetMaterial( _In_ UINT iMaterial ) const
 {
     return &m_pMaterialArray[ iMaterial ];
 }
 
 //--------------------------------------------------------------------------------------
-SDKMESH_MESH* CDXUTSDKMesh::GetMesh( UINT iMesh )
+SDKMESH_MESH* CDXUTSDKMesh::GetMesh( _In_ UINT iMesh ) const
 {
     return &m_pMeshArray[ iMesh ];
 }
 
 //--------------------------------------------------------------------------------------
-UINT CDXUTSDKMesh::GetNumSubsets( UINT iMesh )
+UINT CDXUTSDKMesh::GetNumSubsets( _In_ UINT iMesh ) const
 {
     return m_pMeshArray[ iMesh ].NumSubsets;
 }
 
 //--------------------------------------------------------------------------------------
-SDKMESH_SUBSET* CDXUTSDKMesh::GetSubset( UINT iMesh, UINT iSubset )
+SDKMESH_SUBSET* CDXUTSDKMesh::GetSubset( _In_ UINT iMesh, _In_ UINT iSubset ) const
 {
     return &m_pSubsetArray[ m_pMeshArray[ iMesh ].pSubsets[iSubset] ];
 }
 
 //--------------------------------------------------------------------------------------
-UINT CDXUTSDKMesh::GetVertexStride( UINT iMesh, UINT iVB )
+UINT CDXUTSDKMesh::GetVertexStride( _In_ UINT iMesh, _In_ UINT iVB ) const
 {
     return ( UINT )m_pVertexBufferArray[ m_pMeshArray[ iMesh ].VertexBuffers[iVB] ].StrideBytes;
 }
 
 //--------------------------------------------------------------------------------------
-UINT CDXUTSDKMesh::GetNumFrames()
+UINT CDXUTSDKMesh::GetNumFrames() const
 {
     return m_pMeshHeader->NumFrames;
 }
 
 //--------------------------------------------------------------------------------------
-SDKMESH_FRAME* CDXUTSDKMesh::GetFrame( UINT iFrame )
+SDKMESH_FRAME* CDXUTSDKMesh::GetFrame( _In_ UINT iFrame ) const
 {
     assert( iFrame < m_pMeshHeader->NumFrames );
     return &m_pFrameArray[ iFrame ];
 }
 
 //--------------------------------------------------------------------------------------
-SDKMESH_FRAME* CDXUTSDKMesh::FindFrame( char* pszName )
+SDKMESH_FRAME* CDXUTSDKMesh::FindFrame( _In_z_ const char* pszName ) const
 {
     for( UINT i = 0; i < m_pMeshHeader->NumFrames; i++ )
     {
@@ -1508,35 +1136,35 @@ SDKMESH_FRAME* CDXUTSDKMesh::FindFrame( char* pszName )
             return &m_pFrameArray[i];
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 //--------------------------------------------------------------------------------------
-UINT64 CDXUTSDKMesh::GetNumVertices( UINT iMesh, UINT iVB )
+UINT64 CDXUTSDKMesh::GetNumVertices( _In_ UINT iMesh, _In_ UINT iVB ) const
 {
     return m_pVertexBufferArray[ m_pMeshArray[ iMesh ].VertexBuffers[iVB] ].NumVertices;
 }
 
 //--------------------------------------------------------------------------------------
-UINT64 CDXUTSDKMesh::GetNumIndices( UINT iMesh )
+UINT64 CDXUTSDKMesh::GetNumIndices( _In_ UINT iMesh ) const
 {
     return m_pIndexBufferArray[ m_pMeshArray[ iMesh ].IndexBuffer ].NumIndices;
 }
 
 //--------------------------------------------------------------------------------------
-D3DXVECTOR3 CDXUTSDKMesh::GetMeshBBoxCenter( UINT iMesh )
+XMVECTOR CDXUTSDKMesh::GetMeshBBoxCenter( _In_ UINT iMesh ) const
 {
-    return m_pMeshArray[iMesh].BoundingBoxCenter;
+    return XMLoadFloat3( &m_pMeshArray[iMesh].BoundingBoxCenter );
 }
 
 //--------------------------------------------------------------------------------------
-D3DXVECTOR3 CDXUTSDKMesh::GetMeshBBoxExtents( UINT iMesh )
+XMVECTOR CDXUTSDKMesh::GetMeshBBoxExtents( _In_ UINT iMesh ) const
 {
-    return m_pMeshArray[iMesh].BoundingBoxExtents;
+    return XMLoadFloat3( &m_pMeshArray[iMesh].BoundingBoxExtents );
 }
 
 //--------------------------------------------------------------------------------------
-UINT CDXUTSDKMesh::GetOutstandingResources()
+UINT CDXUTSDKMesh::GetOutstandingResources() const
 {
     UINT outstandingResources = 0;
     if( !m_pMeshHeader )
@@ -1544,9 +1172,9 @@ UINT CDXUTSDKMesh::GetOutstandingResources()
 
     outstandingResources += GetOutstandingBufferResources();
 
-	if( m_pDev11 )
-	{
-		for( UINT i = 0; i < m_pMeshHeader->NumMaterials; i++ )
+    if( m_pDev11 )
+    {
+        for( UINT i = 0; i < m_pMeshHeader->NumMaterials; i++ )
         {
             if( m_pMaterialArray[i].DiffuseTexture[0] != 0 )
             {
@@ -1566,54 +1194,18 @@ UINT CDXUTSDKMesh::GetOutstandingResources()
                     outstandingResources ++;
             }
         }
-	}
-    else
-    {
-        for( UINT i = 0; i < m_pMeshHeader->NumMaterials; i++ )
-        {
-            if( m_pMaterialArray[i].DiffuseTexture[0] != 0 )
-            {
-                if( !m_pMaterialArray[i].pDiffuseTexture9 && !IsErrorResource( m_pMaterialArray[i].pDiffuseTexture9 ) )
-                    outstandingResources ++;
-            }
-
-            if( m_pMaterialArray[i].NormalTexture[0] != 0 )
-            {
-                if( !m_pMaterialArray[i].pNormalTexture9 && !IsErrorResource( m_pMaterialArray[i].pNormalTexture9 ) )
-                    outstandingResources ++;
-            }
-
-            if( m_pMaterialArray[i].SpecularTexture[0] != 0 )
-            {
-                if( !m_pMaterialArray[i].pSpecularTexture9 &&
-                    !IsErrorResource( m_pMaterialArray[i].pSpecularTexture9 ) )
-                    outstandingResources ++;
-            }
-        }
     }
 
     return outstandingResources;
 }
 
 //--------------------------------------------------------------------------------------
-UINT CDXUTSDKMesh::GetOutstandingBufferResources()
+UINT CDXUTSDKMesh::GetOutstandingBufferResources() const
 {
     UINT outstandingResources = 0;
     if( !m_pMeshHeader )
         return 1;
 
-    for( UINT i = 0; i < m_pMeshHeader->NumVertexBuffers; i++ )
-    {
-        if( !m_pVertexBufferArray[i].pVB9 && !IsErrorResource( m_pVertexBufferArray[i].pVB9 ) )
-            outstandingResources ++;
-    }
-
-    for( UINT i = 0; i < m_pMeshHeader->NumIndexBuffers; i++ )
-    {
-        if( !m_pIndexBufferArray[i].pIB9 && !IsErrorResource( m_pIndexBufferArray[i].pIB9 ) )
-            outstandingResources ++;
-    }
-
     return outstandingResources;
 }
 
@@ -1630,7 +1222,7 @@ bool CDXUTSDKMesh::CheckLoadDone()
 }
 
 //--------------------------------------------------------------------------------------
-bool CDXUTSDKMesh::IsLoaded()
+bool CDXUTSDKMesh::IsLoaded() const
 {
     if( m_pStaticMeshData && !m_bLoading )
     {
@@ -1641,65 +1233,51 @@ bool CDXUTSDKMesh::IsLoaded()
 }
 
 //--------------------------------------------------------------------------------------
-bool CDXUTSDKMesh::IsLoading()
+bool CDXUTSDKMesh::IsLoading() const
 {
     return m_bLoading;
 }
 
 //--------------------------------------------------------------------------------------
-void CDXUTSDKMesh::SetLoading( bool bLoading )
+void CDXUTSDKMesh::SetLoading( _In_ bool bLoading )
 {
     m_bLoading = bLoading;
 }
 
 //--------------------------------------------------------------------------------------
-BOOL CDXUTSDKMesh::HadLoadingError()
+BOOL CDXUTSDKMesh::HadLoadingError() const
 {
-    if( m_pMeshHeader )
-    {
-        for( UINT i = 0; i < m_pMeshHeader->NumVertexBuffers; i++ )
-        {
-            if( IsErrorResource( m_pVertexBufferArray[i].pVB9 ) )
-                return TRUE;
-        }
-
-        for( UINT i = 0; i < m_pMeshHeader->NumIndexBuffers; i++ )
-        {
-            if( IsErrorResource( m_pIndexBufferArray[i].pIB9 ) )
-                return TRUE;
-        }
-    }
-
     return FALSE;
 }
 
 //--------------------------------------------------------------------------------------
-UINT CDXUTSDKMesh::GetNumInfluences( UINT iMesh )
+UINT CDXUTSDKMesh::GetNumInfluences( _In_ UINT iMesh ) const
 {
     return m_pMeshArray[iMesh].NumFrameInfluences;
 }
 
 //--------------------------------------------------------------------------------------
-const D3DXMATRIX* CDXUTSDKMesh::GetMeshInfluenceMatrix( UINT iMesh, UINT iInfluence )
+XMMATRIX CDXUTSDKMesh::GetMeshInfluenceMatrix( _In_ UINT iMesh, _In_ UINT iInfluence ) const
 {
     UINT iFrame = m_pMeshArray[iMesh].pFrameInfluences[ iInfluence ];
-    return &m_pTransformedFrameMatrices[iFrame];
+    return XMLoadFloat4x4( &m_pTransformedFrameMatrices[iFrame] );
 }
 
-const D3DXMATRIX* CDXUTSDKMesh::GetWorldMatrix( UINT iFrameIndex )
+XMMATRIX CDXUTSDKMesh::GetWorldMatrix( _In_ UINT iFrameIndex ) const
 {
-    return &m_pWorldPoseFrameMatrices[iFrameIndex];
+    return XMLoadFloat4x4( &m_pWorldPoseFrameMatrices[iFrameIndex] );
 }
 
-const D3DXMATRIX* CDXUTSDKMesh::GetInfluenceMatrix( UINT iFrameIndex )
+XMMATRIX CDXUTSDKMesh::GetInfluenceMatrix( _In_ UINT iFrameIndex ) const
 {
-    return &m_pTransformedFrameMatrices[iFrameIndex];
+    return XMLoadFloat4x4( &m_pTransformedFrameMatrices[iFrameIndex] );
 }
 
+
 //--------------------------------------------------------------------------------------
-UINT CDXUTSDKMesh::GetAnimationKeyFromTime( double fTime )
+UINT CDXUTSDKMesh::GetAnimationKeyFromTime( _In_ double fTime ) const
 {
-    if( m_pAnimationHeader == NULL )
+    if( !m_pAnimationHeader )
     {
         return 0;
     }
@@ -1712,638 +1290,18 @@ UINT CDXUTSDKMesh::GetAnimationKeyFromTime( double fTime )
     return iTick;
 }
 
-bool CDXUTSDKMesh::GetAnimationProperties( UINT* pNumKeys, FLOAT* pFrameTime )
+_Use_decl_annotations_
+bool CDXUTSDKMesh::GetAnimationProperties( UINT* pNumKeys, float* pFrameTime ) const
 {
-    if( m_pAnimationHeader == NULL )
+    if( !m_pAnimationHeader )
     {
+        *pNumKeys = 0;
+        *pFrameTime = 0;
         return false;
     }
 
     *pNumKeys = m_pAnimationHeader->NumAnimationKeys;
-    *pFrameTime = 1.0f / (FLOAT)m_pAnimationHeader->AnimationFPS;
+    *pFrameTime = 1.0f / (float)m_pAnimationHeader->AnimationFPS;
 
     return true;
 }
-
-
-//-------------------------------------------------------------------------------------
-// CDXUTXFileMesh implementation.
-//-------------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-CDXUTXFileMesh::CDXUTXFileMesh( LPCWSTR strName )
-{
-    wcscpy_s( m_strName, 512, strName );
-    m_pMesh = NULL;
-    m_pMaterials = NULL;
-    m_pTextures = NULL;
-    m_bUseMaterials = TRUE;
-    m_pVB = NULL;
-    m_pIB = NULL;
-    m_pDecl = NULL;
-    m_strMaterials = NULL;
-    m_dwNumMaterials = 0;
-    m_dwNumVertices = 0;
-    m_dwNumFaces = 0;
-    m_dwBytesPerVertex = 0;
-}
-
-
-
-
-//-----------------------------------------------------------------------------
-CDXUTXFileMesh::~CDXUTXFileMesh()
-{
-    Destroy();
-}
-
-
-
-
-//-----------------------------------------------------------------------------
-HRESULT CDXUTXFileMesh::Create( LPDIRECT3DDEVICE9 pd3dDevice, LPCWSTR strFilename )
-{
-    WCHAR strPath[MAX_PATH];
-    LPD3DXBUFFER pAdjacencyBuffer = NULL;
-    LPD3DXBUFFER pMtrlBuffer = NULL;
-    HRESULT hr;
-
-    // Cleanup previous mesh if any
-    Destroy();
-
-    // Find the path for the file, and convert it to ANSI (for the D3DX API)
-    DXUTFindDXSDKMediaFileCch( strPath, sizeof( strPath ) / sizeof( WCHAR ), strFilename );
-
-    // Load the mesh
-    if( FAILED( hr = D3DXLoadMeshFromX( strPath, D3DXMESH_MANAGED, pd3dDevice,
-                                        &pAdjacencyBuffer, &pMtrlBuffer, NULL,
-                                        &m_dwNumMaterials, &m_pMesh ) ) )
-    {
-        return hr;
-    }
-
-    // Optimize the mesh for performance
-    if( FAILED( hr = m_pMesh->OptimizeInplace(
-                D3DXMESHOPT_COMPACT | D3DXMESHOPT_ATTRSORT | D3DXMESHOPT_VERTEXCACHE,
-                ( DWORD* )pAdjacencyBuffer->GetBufferPointer(), NULL, NULL, NULL ) ) )
-    {
-        SAFE_RELEASE( pAdjacencyBuffer );
-        SAFE_RELEASE( pMtrlBuffer );
-        return hr;
-    }
-
-    // Set strPath to the path of the mesh file
-    WCHAR* pLastBSlash = wcsrchr( strPath, L'\\' );
-    if( pLastBSlash )
-        *( pLastBSlash + 1 ) = L'\0';
-    else
-        *strPath = L'\0';
-
-    D3DXMATERIAL* d3dxMtrls = ( D3DXMATERIAL* )pMtrlBuffer->GetBufferPointer();
-    hr = CreateMaterials( strPath, pd3dDevice, d3dxMtrls, m_dwNumMaterials );
-
-    SAFE_RELEASE( pAdjacencyBuffer );
-    SAFE_RELEASE( pMtrlBuffer );
-
-    // Extract data from m_pMesh for easy access
-    D3DVERTEXELEMENT9 decl[MAX_FVF_DECL_SIZE];
-    m_dwNumVertices = m_pMesh->GetNumVertices();
-    m_dwNumFaces = m_pMesh->GetNumFaces();
-    m_dwBytesPerVertex = m_pMesh->GetNumBytesPerVertex();
-    m_pMesh->GetIndexBuffer( &m_pIB );
-    m_pMesh->GetVertexBuffer( &m_pVB );
-    m_pMesh->GetDeclaration( decl );
-    pd3dDevice->CreateVertexDeclaration( decl, &m_pDecl );
-
-    return hr;
-}
-
-
-//-----------------------------------------------------------------------------
-HRESULT CDXUTXFileMesh::Create( LPDIRECT3DDEVICE9 pd3dDevice,
-                                LPD3DXFILEDATA pFileData )
-{
-    LPD3DXBUFFER pMtrlBuffer = NULL;
-    LPD3DXBUFFER pAdjacencyBuffer = NULL;
-    HRESULT hr;
-
-    // Cleanup previous mesh if any
-    Destroy();
-
-    // Load the mesh from the DXFILEDATA object
-    if( FAILED( hr = D3DXLoadMeshFromXof( pFileData, D3DXMESH_MANAGED, pd3dDevice,
-                                          &pAdjacencyBuffer, &pMtrlBuffer, NULL,
-                                          &m_dwNumMaterials, &m_pMesh ) ) )
-    {
-        return hr;
-    }
-
-    // Optimize the mesh for performance
-    if( FAILED( hr = m_pMesh->OptimizeInplace(
-                D3DXMESHOPT_COMPACT | D3DXMESHOPT_ATTRSORT | D3DXMESHOPT_VERTEXCACHE,
-                ( DWORD* )pAdjacencyBuffer->GetBufferPointer(), NULL, NULL, NULL ) ) )
-    {
-        SAFE_RELEASE( pAdjacencyBuffer );
-        SAFE_RELEASE( pMtrlBuffer );
-        return hr;
-    }
-
-    D3DXMATERIAL* d3dxMtrls = ( D3DXMATERIAL* )pMtrlBuffer->GetBufferPointer();
-    hr = CreateMaterials( L"", pd3dDevice, d3dxMtrls, m_dwNumMaterials );
-
-    SAFE_RELEASE( pAdjacencyBuffer );
-    SAFE_RELEASE( pMtrlBuffer );
-
-    // Extract data from m_pMesh for easy access
-    D3DVERTEXELEMENT9 decl[MAX_FVF_DECL_SIZE];
-    m_dwNumVertices = m_pMesh->GetNumVertices();
-    m_dwNumFaces = m_pMesh->GetNumFaces();
-    m_dwBytesPerVertex = m_pMesh->GetNumBytesPerVertex();
-    m_pMesh->GetIndexBuffer( &m_pIB );
-    m_pMesh->GetVertexBuffer( &m_pVB );
-    m_pMesh->GetDeclaration( decl );
-    pd3dDevice->CreateVertexDeclaration( decl, &m_pDecl );
-
-    return hr;
-}
-
-
-//-----------------------------------------------------------------------------
-HRESULT CDXUTXFileMesh::Create( LPDIRECT3DDEVICE9 pd3dDevice, ID3DXMesh* pInMesh,
-                                D3DXMATERIAL* pd3dxMaterials, DWORD dwMaterials )
-{
-    // Cleanup previous mesh if any
-    Destroy();
-
-    // Optimize the mesh for performance
-    DWORD* rgdwAdjacency = NULL;
-    rgdwAdjacency = new DWORD[pInMesh->GetNumFaces() * 3];
-    if( rgdwAdjacency == NULL )
-        return E_OUTOFMEMORY;
-    pInMesh->GenerateAdjacency( 1e-6f, rgdwAdjacency );
-
-    D3DVERTEXELEMENT9 decl[MAX_FVF_DECL_SIZE];
-    pInMesh->GetDeclaration( decl );
-
-    DWORD dwOptions = pInMesh->GetOptions();
-    dwOptions &= ~( D3DXMESH_32BIT | D3DXMESH_SYSTEMMEM | D3DXMESH_WRITEONLY );
-    dwOptions |= D3DXMESH_MANAGED;
-    dwOptions |= D3DXMESHOPT_COMPACT | D3DXMESHOPT_ATTRSORT | D3DXMESHOPT_VERTEXCACHE;
-
-    ID3DXMesh* pTempMesh = NULL;
-    if( FAILED( pInMesh->Optimize( dwOptions, rgdwAdjacency, NULL, NULL, NULL, &pTempMesh ) ) )
-    {
-        SAFE_DELETE_ARRAY( rgdwAdjacency );
-        return E_FAIL;
-    }
-
-    SAFE_DELETE_ARRAY( rgdwAdjacency );
-    SAFE_RELEASE( m_pMesh );
-    m_pMesh = pTempMesh;
-
-    HRESULT hr;
-    hr = CreateMaterials( L"", pd3dDevice, pd3dxMaterials, dwMaterials );
-
-    // Extract data from m_pMesh for easy access
-    m_dwNumVertices = m_pMesh->GetNumVertices();
-    m_dwNumFaces = m_pMesh->GetNumFaces();
-    m_dwBytesPerVertex = m_pMesh->GetNumBytesPerVertex();
-    m_pMesh->GetIndexBuffer( &m_pIB );
-    m_pMesh->GetVertexBuffer( &m_pVB );
-    m_pMesh->GetDeclaration( decl );
-    pd3dDevice->CreateVertexDeclaration( decl, &m_pDecl );
-
-    return hr;
-}
-
-
-//-----------------------------------------------------------------------------
-HRESULT CDXUTXFileMesh::CreateMaterials( LPCWSTR strPath, IDirect3DDevice9* pd3dDevice, D3DXMATERIAL* d3dxMtrls,
-                                         DWORD dwNumMaterials )
-{
-    // Get material info for the mesh
-    // Get the array of materials out of the buffer
-    m_dwNumMaterials = dwNumMaterials;
-    if( d3dxMtrls && m_dwNumMaterials > 0 )
-    {
-        // Allocate memory for the materials and textures
-        m_pMaterials = new D3DMATERIAL9[m_dwNumMaterials];
-        if( m_pMaterials == NULL )
-            return E_OUTOFMEMORY;
-        m_pTextures = new LPDIRECT3DBASETEXTURE9[m_dwNumMaterials];
-        if( m_pTextures == NULL )
-            return E_OUTOFMEMORY;
-        m_strMaterials = new CHAR[m_dwNumMaterials][MAX_PATH];
-        if( m_strMaterials == NULL )
-            return E_OUTOFMEMORY;
-
-        // Copy each material and create its texture
-        for( DWORD i = 0; i < m_dwNumMaterials; i++ )
-        {
-            // Copy the material
-            m_pMaterials[i] = d3dxMtrls[i].MatD3D;
-            m_pTextures[i] = NULL;
-
-            // Create a texture
-            if( d3dxMtrls[i].pTextureFilename )
-            {
-                strcpy_s( m_strMaterials[i], MAX_PATH, d3dxMtrls[i].pTextureFilename );
-
-                WCHAR strTexture[MAX_PATH];
-                WCHAR strTextureTemp[MAX_PATH];
-                D3DXIMAGE_INFO ImgInfo;
-
-                // First attempt to look for texture in the same folder as the input folder.
-                MultiByteToWideChar( CP_ACP, 0, d3dxMtrls[i].pTextureFilename, -1, strTextureTemp, MAX_PATH );
-                strTextureTemp[MAX_PATH - 1] = 0;
-
-                wcscpy_s( strTexture, MAX_PATH, strPath );
-                wcscat_s( strTexture, MAX_PATH, strTextureTemp );
-
-                // Inspect the texture file to determine the texture type.
-                if( FAILED( D3DXGetImageInfoFromFile( strTexture, &ImgInfo ) ) )
-                {
-                    // Search the media folder
-                    if( FAILED( DXUTFindDXSDKMediaFileCch( strTexture, MAX_PATH, strTextureTemp ) ) )
-                        continue;  // Can't find. Skip.
-
-                    D3DXGetImageInfoFromFile( strTexture, &ImgInfo );
-                }
-
-                // Call the appropriate loader according to the texture type.
-                switch( ImgInfo.ResourceType )
-                {
-                    case D3DRTYPE_TEXTURE:
-                    {
-                        IDirect3DTexture9* pTex;
-                        if( SUCCEEDED( D3DXCreateTextureFromFile( pd3dDevice, strTexture, &pTex ) ) )
-                        {
-                            // Obtain the base texture interface
-                            pTex->QueryInterface( IID_IDirect3DBaseTexture9, ( LPVOID* )&m_pTextures[i] );
-                            // Release the specialized instance
-                            pTex->Release();
-                        }
-                        break;
-                    }
-                    case D3DRTYPE_CUBETEXTURE:
-                    {
-                        IDirect3DCubeTexture9* pTex;
-                        if( SUCCEEDED( D3DXCreateCubeTextureFromFile( pd3dDevice, strTexture, &pTex ) ) )
-                        {
-                            // Obtain the base texture interface
-                            pTex->QueryInterface( IID_IDirect3DBaseTexture9, ( LPVOID* )&m_pTextures[i] );
-                            // Release the specialized instance
-                            pTex->Release();
-                        }
-                        break;
-                    }
-                    case D3DRTYPE_VOLUMETEXTURE:
-                    {
-                        IDirect3DVolumeTexture9* pTex;
-                        if( SUCCEEDED( D3DXCreateVolumeTextureFromFile( pd3dDevice, strTexture, &pTex ) ) )
-                        {
-                            // Obtain the base texture interface
-                            pTex->QueryInterface( IID_IDirect3DBaseTexture9, ( LPVOID* )&m_pTextures[i] );
-                            // Release the specialized instance
-                            pTex->Release();
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-    }
-    return S_OK;
-}
-
-
-//-----------------------------------------------------------------------------
-HRESULT CDXUTXFileMesh::SetFVF( LPDIRECT3DDEVICE9 pd3dDevice, DWORD dwFVF )
-{
-    LPD3DXMESH pTempMesh = NULL;
-
-    if( m_pMesh )
-    {
-        if( FAILED( m_pMesh->CloneMeshFVF( m_pMesh->GetOptions(), dwFVF,
-                                           pd3dDevice, &pTempMesh ) ) )
-        {
-            SAFE_RELEASE( pTempMesh );
-            return E_FAIL;
-        }
-
-        DWORD dwOldFVF = 0;
-        dwOldFVF = m_pMesh->GetFVF();
-        SAFE_RELEASE( m_pMesh );
-        m_pMesh = pTempMesh;
-
-        // Compute normals if they are being requested and
-        // the old mesh does not have them.
-        if( !( dwOldFVF & D3DFVF_NORMAL ) && dwFVF & D3DFVF_NORMAL )
-        {
-            D3DXComputeNormals( m_pMesh, NULL );
-        }
-    }
-
-    return S_OK;
-}
-
-
-
-
-//-----------------------------------------------------------------------------
-// Convert the mesh to the format specified by the given vertex declarations.
-//-----------------------------------------------------------------------------
-HRESULT CDXUTXFileMesh::SetVertexDecl( LPDIRECT3DDEVICE9 pd3dDevice, const D3DVERTEXELEMENT9* pDecl,
-                                       bool bAutoComputeNormals, bool bAutoComputeTangents,
-                                       bool bSplitVertexForOptimalTangents )
-{
-    LPD3DXMESH pTempMesh = NULL;
-
-    if( m_pMesh )
-    {
-        if( FAILED( m_pMesh->CloneMesh( m_pMesh->GetOptions(), pDecl,
-                                        pd3dDevice, &pTempMesh ) ) )
-        {
-            SAFE_RELEASE( pTempMesh );
-            return E_FAIL;
-        }
-    }
-
-
-    // Check if the old declaration contains a normal.
-    bool bHadNormal = false;
-    bool bHadTangent = false;
-    D3DVERTEXELEMENT9 aOldDecl[MAX_FVF_DECL_SIZE];
-    if( m_pMesh && SUCCEEDED( m_pMesh->GetDeclaration( aOldDecl ) ) )
-    {
-        for( UINT index = 0; index < D3DXGetDeclLength( aOldDecl ); ++index )
-        {
-            if( aOldDecl[index].Usage == D3DDECLUSAGE_NORMAL )
-            {
-                bHadNormal = true;
-            }
-            if( aOldDecl[index].Usage == D3DDECLUSAGE_TANGENT )
-            {
-                bHadTangent = true;
-            }
-        }
-    }
-
-    // Check if the new declaration contains a normal.
-    bool bHaveNormalNow = false;
-    bool bHaveTangentNow = false;
-    D3DVERTEXELEMENT9 aNewDecl[MAX_FVF_DECL_SIZE];
-    if( pTempMesh && SUCCEEDED( pTempMesh->GetDeclaration( aNewDecl ) ) )
-    {
-        for( UINT index = 0; index < D3DXGetDeclLength( aNewDecl ); ++index )
-        {
-            if( aNewDecl[index].Usage == D3DDECLUSAGE_NORMAL )
-            {
-                bHaveNormalNow = true;
-            }
-            if( aNewDecl[index].Usage == D3DDECLUSAGE_TANGENT )
-            {
-                bHaveTangentNow = true;
-            }
-        }
-    }
-
-    SAFE_RELEASE( m_pMesh );
-
-    if( pTempMesh )
-    {
-        m_pMesh = pTempMesh;
-
-        if( !bHadNormal && bHaveNormalNow && bAutoComputeNormals )
-        {
-            // Compute normals in case the meshes have them
-            D3DXComputeNormals( m_pMesh, NULL );
-        }
-
-        if( bHaveNormalNow && !bHadTangent && bHaveTangentNow && bAutoComputeTangents )
-        {
-            ID3DXMesh* pNewMesh;
-            HRESULT hr;
-
-            DWORD* rgdwAdjacency = NULL;
-            rgdwAdjacency = new DWORD[m_pMesh->GetNumFaces() * 3];
-            if( rgdwAdjacency == NULL )
-                return E_OUTOFMEMORY;
-            V( m_pMesh->GenerateAdjacency( 1e-6f, rgdwAdjacency ) );
-
-            float fPartialEdgeThreshold;
-            float fSingularPointThreshold;
-            float fNormalEdgeThreshold;
-            if( bSplitVertexForOptimalTangents )
-            {
-                fPartialEdgeThreshold = 0.01f;
-                fSingularPointThreshold = 0.25f;
-                fNormalEdgeThreshold = 0.01f;
-            }
-            else
-            {
-                fPartialEdgeThreshold = -1.01f;
-                fSingularPointThreshold = 0.01f;
-                fNormalEdgeThreshold = -1.01f;
-            }
-
-            // Compute tangents, which are required for normal mapping
-            hr = D3DXComputeTangentFrameEx( m_pMesh,
-                                            D3DDECLUSAGE_TEXCOORD, 0,
-                                            D3DDECLUSAGE_TANGENT, 0,
-                                            D3DX_DEFAULT, 0,
-                                            D3DDECLUSAGE_NORMAL, 0,
-                                            0, rgdwAdjacency,
-                                            fPartialEdgeThreshold, fSingularPointThreshold, fNormalEdgeThreshold,
-                                            &pNewMesh, NULL );
-
-            SAFE_DELETE_ARRAY( rgdwAdjacency );
-            if( FAILED( hr ) )
-                return hr;
-
-            SAFE_RELEASE( m_pMesh );
-            m_pMesh = pNewMesh;
-        }
-    }
-
-    return S_OK;
-}
-
-
-
-
-//-----------------------------------------------------------------------------
-HRESULT CDXUTXFileMesh::RestoreDeviceObjects( LPDIRECT3DDEVICE9 pd3dDevice )
-{
-    return S_OK;
-}
-
-
-
-
-//-----------------------------------------------------------------------------
-HRESULT CDXUTXFileMesh::InvalidateDeviceObjects()
-{
-    SAFE_RELEASE( m_pIB );
-    SAFE_RELEASE( m_pVB );
-    SAFE_RELEASE( m_pDecl );
-
-    return S_OK;
-}
-
-
-
-
-//-----------------------------------------------------------------------------
-HRESULT CDXUTXFileMesh::Destroy()
-{
-    InvalidateDeviceObjects();
-    for( UINT i = 0; i < m_dwNumMaterials; i++ )
-        SAFE_RELEASE( m_pTextures[i] );
-    SAFE_DELETE_ARRAY( m_pTextures );
-    SAFE_DELETE_ARRAY( m_pMaterials );
-    SAFE_DELETE_ARRAY( m_strMaterials );
-
-    SAFE_RELEASE( m_pMesh );
-
-    m_dwNumMaterials = 0L;
-
-    return S_OK;
-}
-
-
-
-
-//-----------------------------------------------------------------------------
-HRESULT CDXUTXFileMesh::Render( LPDIRECT3DDEVICE9 pd3dDevice, bool bDrawOpaqueSubsets,
-                                bool bDrawAlphaSubsets )
-{
-    if( NULL == m_pMesh )
-        return E_FAIL;
-
-    // Frist, draw the subsets without alpha
-    if( bDrawOpaqueSubsets )
-    {
-        for( DWORD i = 0; i < m_dwNumMaterials; i++ )
-        {
-            if( m_bUseMaterials )
-            {
-                if( m_pMaterials[i].Diffuse.a < 1.0f )
-                    continue;
-                pd3dDevice->SetMaterial( &m_pMaterials[i] );
-                pd3dDevice->SetTexture( 0, m_pTextures[i] );
-            }
-            m_pMesh->DrawSubset( i );
-        }
-    }
-
-    // Then, draw the subsets with alpha
-    if( bDrawAlphaSubsets && m_bUseMaterials )
-    {
-        for( DWORD i = 0; i < m_dwNumMaterials; i++ )
-        {
-            if( m_pMaterials[i].Diffuse.a == 1.0f )
-                continue;
-
-            // Set the material and texture
-            pd3dDevice->SetMaterial( &m_pMaterials[i] );
-            pd3dDevice->SetTexture( 0, m_pTextures[i] );
-            m_pMesh->DrawSubset( i );
-        }
-    }
-
-    return S_OK;
-}
-
-
-
-
-//-----------------------------------------------------------------------------
-HRESULT CDXUTXFileMesh::Render( ID3DXEffect* pEffect,
-                                D3DXHANDLE hTexture,
-                                D3DXHANDLE hDiffuse,
-                                D3DXHANDLE hAmbient,
-                                D3DXHANDLE hSpecular,
-                                D3DXHANDLE hEmissive,
-                                D3DXHANDLE hPower,
-                                bool bDrawOpaqueSubsets,
-                                bool bDrawAlphaSubsets )
-{
-    if( NULL == m_pMesh )
-        return E_FAIL;
-
-    UINT cPasses;
-    // Frist, draw the subsets without alpha
-    if( bDrawOpaqueSubsets )
-    {
-        pEffect->Begin( &cPasses, 0 );
-        for( UINT p = 0; p < cPasses; ++p )
-        {
-            pEffect->BeginPass( p );
-            for( DWORD i = 0; i < m_dwNumMaterials; i++ )
-            {
-                if( m_bUseMaterials )
-                {
-                    if( m_pMaterials[i].Diffuse.a < 1.0f )
-                        continue;
-                    if( hTexture )
-                        pEffect->SetTexture( hTexture, m_pTextures[i] );
-                    // D3DCOLORVALUE and D3DXVECTOR4 are data-wise identical.
-                    // No conversion is needed.
-                    if( hDiffuse )
-                        pEffect->SetVector( hDiffuse, ( D3DXVECTOR4* )&m_pMaterials[i].Diffuse );
-                    if( hAmbient )
-                        pEffect->SetVector( hAmbient, ( D3DXVECTOR4* )&m_pMaterials[i].Ambient );
-                    if( hSpecular )
-                        pEffect->SetVector( hSpecular, ( D3DXVECTOR4* )&m_pMaterials[i].Specular );
-                    if( hEmissive )
-                        pEffect->SetVector( hEmissive, ( D3DXVECTOR4* )&m_pMaterials[i].Emissive );
-                    if( hPower )
-                        pEffect->SetFloat( hPower, m_pMaterials[i].Power );
-                    pEffect->CommitChanges();
-                }
-                m_pMesh->DrawSubset( i );
-            }
-            pEffect->EndPass();
-        }
-        pEffect->End();
-    }
-
-    // Then, draw the subsets with alpha
-    if( bDrawAlphaSubsets && m_bUseMaterials )
-    {
-        pEffect->Begin( &cPasses, 0 );
-        for( UINT p = 0; p < cPasses; ++p )
-        {
-            pEffect->BeginPass( p );
-            for( DWORD i = 0; i < m_dwNumMaterials; i++ )
-            {
-                if( m_bUseMaterials )
-                {
-                    if( m_pMaterials[i].Diffuse.a == 1.0f )
-                        continue;
-                    if( hTexture )
-                        pEffect->SetTexture( hTexture, m_pTextures[i] );
-                    // D3DCOLORVALUE and D3DXVECTOR4 are data-wise identical.
-                    // No conversion is needed.
-                    if( hDiffuse )
-                        pEffect->SetVector( hDiffuse, ( D3DXVECTOR4* )&m_pMaterials[i].Diffuse );
-                    if( hAmbient )
-                        pEffect->SetVector( hAmbient, ( D3DXVECTOR4* )&m_pMaterials[i].Ambient );
-                    if( hSpecular )
-                        pEffect->SetVector( hSpecular, ( D3DXVECTOR4* )&m_pMaterials[i].Specular );
-                    if( hEmissive )
-                        pEffect->SetVector( hEmissive, ( D3DXVECTOR4* )&m_pMaterials[i].Emissive );
-                    if( hPower )
-                        pEffect->SetFloat( hPower, m_pMaterials[i].Power );
-                    pEffect->CommitChanges();
-                }
-                m_pMesh->DrawSubset( i );
-            }
-            pEffect->EndPass();
-        }
-        pEffect->End();
-    }
-
-    return S_OK;
-}
diff --git a/samples/DX_APIUsage/DXUT/Optional/SDKmesh.h b/samples/DX_APIUsage/DXUT/Optional/SDKmesh.h
index 2032c52..8fba374 100644
--- a/samples/DX_APIUsage/DXUT/Optional/SDKmesh.h
+++ b/samples/DX_APIUsage/DXUT/Optional/SDKmesh.h
@@ -8,10 +8,14 @@
 //   meets the specific needs of the application.
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #pragma once
-#ifndef _SDKMESH_
-#define _SDKMESH_
+
+#undef D3DCOLOR_ARGB
+#include <d3d9.h>
 
 //--------------------------------------------------------------------------------------
 // Hard Defines for the various structures
@@ -40,7 +44,7 @@ template<typename TYPE> BOOL IsErrorResource( TYPE data )
     return FALSE;
 }
 //--------------------------------------------------------------------------------------
-// Enumerated Types.  These will have mirrors in both D3D9 and D3D11
+// Enumerated Types.
 //--------------------------------------------------------------------------------------
 enum SDKMESH_PRIMITIVE_TYPE
 {
@@ -72,6 +76,8 @@ enum FRAME_TRANSFORM_TYPE
 //--------------------------------------------------------------------------------------
 // Structures.  Unions with pointers are forced to 64bit.
 //--------------------------------------------------------------------------------------
+#pragma pack(push,8)
+
 struct SDKMESH_HEADER
 {
     //Basic Info and sizes
@@ -107,7 +113,6 @@ struct SDKMESH_VERTEX_BUFFER_HEADER
     union
     {
         UINT64 DataOffset;				//(This also forces the union to 64bits)
-        IDirect3DVertexBuffer9* pVB9;
         ID3D11Buffer* pVB11;
     };
 };
@@ -120,7 +125,6 @@ struct SDKMESH_INDEX_BUFFER_HEADER
     union
     {
         UINT64 DataOffset;				//(This also forces the union to 64bits)
-        IDirect3DIndexBuffer9* pIB9;
         ID3D11Buffer* pIB11;
     };
 };
@@ -134,8 +138,8 @@ struct SDKMESH_MESH
     UINT NumSubsets;
     UINT NumFrameInfluences; //aka bones
 
-    D3DXVECTOR3 BoundingBoxCenter;
-    D3DXVECTOR3 BoundingBoxExtents;
+    DirectX::XMFLOAT3 BoundingBoxCenter;
+    DirectX::XMFLOAT3 BoundingBoxExtents;
 
     union
     {
@@ -167,7 +171,7 @@ struct SDKMESH_FRAME
     UINT ParentFrame;
     UINT ChildFrame;
     UINT SiblingFrame;
-    D3DXMATRIX Matrix;
+    DirectX::XMFLOAT4X4 Matrix;
     UINT AnimationDataIndex;		//Used to index which set of keyframes transforms this frame
 };
 
@@ -183,28 +187,25 @@ struct SDKMESH_MATERIAL
     char    NormalTexture[MAX_TEXTURE_NAME];
     char    SpecularTexture[MAX_TEXTURE_NAME];
 
-    D3DXVECTOR4 Diffuse;
-    D3DXVECTOR4 Ambient;
-    D3DXVECTOR4 Specular;
-    D3DXVECTOR4 Emissive;
-    FLOAT Power;
+    DirectX::XMFLOAT4 Diffuse;
+    DirectX::XMFLOAT4 Ambient;
+    DirectX::XMFLOAT4 Specular;
+    DirectX::XMFLOAT4 Emissive;
+    float Power;
 
     union
     {
         UINT64 Force64_1;			//Force the union to 64bits
-        IDirect3DTexture9* pDiffuseTexture9;
         ID3D11Texture2D* pDiffuseTexture11;
     };
     union
     {
         UINT64 Force64_2;			//Force the union to 64bits
-        IDirect3DTexture9* pNormalTexture9;
         ID3D11Texture2D* pNormalTexture11;
     };
     union
     {
         UINT64 Force64_3;			//Force the union to 64bits
-        IDirect3DTexture9* pSpecularTexture9;
         ID3D11Texture2D* pSpecularTexture11;
     };
 
@@ -240,9 +241,9 @@ struct SDKANIMATION_FILE_HEADER
 
 struct SDKANIMATION_DATA
 {
-    D3DXVECTOR3 Translation;
-    D3DXVECTOR4 Orientation;
-    D3DXVECTOR3 Scaling;
+    DirectX::XMFLOAT3 Translation;
+    DirectX::XMFLOAT4 Orientation;
+    DirectX::XMFLOAT3 Scaling;
 };
 
 struct SDKANIMATION_FRAME_DATA
@@ -255,34 +256,31 @@ struct SDKANIMATION_FRAME_DATA
     };
 };
 
+#pragma pack(pop)
+
+static_assert( sizeof(D3DVERTEXELEMENT9) == 8, "Direct3D9 Decl structure size incorrect" );
+static_assert( sizeof(SDKMESH_HEADER)== 104, "SDK Mesh structure size incorrect" );
+static_assert( sizeof(SDKMESH_VERTEX_BUFFER_HEADER) == 288, "SDK Mesh structure size incorrect" );
+static_assert( sizeof(SDKMESH_INDEX_BUFFER_HEADER) == 32, "SDK Mesh structure size incorrect" );
+static_assert( sizeof(SDKMESH_MESH) == 224, "SDK Mesh structure size incorrect" );
+static_assert( sizeof(SDKMESH_SUBSET) == 144, "SDK Mesh structure size incorrect" );
+static_assert( sizeof(SDKMESH_FRAME) == 184, "SDK Mesh structure size incorrect" );
+static_assert( sizeof(SDKMESH_MATERIAL) == 1256, "SDK Mesh structure size incorrect" );
+static_assert( sizeof(SDKANIMATION_FILE_HEADER) == 40, "SDK Mesh structure size incorrect" );
+static_assert( sizeof(SDKANIMATION_DATA) == 40, "SDK Mesh structure size incorrect" );
+static_assert( sizeof(SDKANIMATION_FRAME_DATA) == 112, "SDK Mesh structure size incorrect" );
+
 #ifndef _CONVERTER_APP_
 
 //--------------------------------------------------------------------------------------
 // AsyncLoading callbacks
 //--------------------------------------------------------------------------------------
-typedef void ( CALLBACK*LPCREATETEXTUREFROMFILE9 )( IDirect3DDevice9* pDev, char* szFileName,
-                                                    IDirect3DTexture9** ppTexture, void* pContext );
-typedef void ( CALLBACK*LPCREATEVERTEXBUFFER9 )( IDirect3DDevice9* pDev, IDirect3DVertexBuffer9** ppBuffer,
-                                                 UINT iSizeBytes, DWORD Usage, DWORD FVF, D3DPOOL Pool, void* pData,
-                                                 void* pContext );
-typedef void ( CALLBACK*LPCREATEINDEXBUFFER9 )( IDirect3DDevice9* pDev, IDirect3DIndexBuffer9** ppBuffer,
-                                                UINT iSizeBytes, DWORD Usage, D3DFORMAT ibFormat, D3DPOOL Pool,
-                                                void* pData, void* pContext );
-struct SDKMESH_CALLBACKS9
-{
-    LPCREATETEXTUREFROMFILE9 pCreateTextureFromFile;
-    LPCREATEVERTEXBUFFER9 pCreateVertexBuffer;
-    LPCREATEINDEXBUFFER9 pCreateIndexBuffer;
-    void* pContext;
-};
-
-
-typedef void ( CALLBACK*LPCREATETEXTUREFROMFILE11 )( ID3D11Device* pDev, char* szFileName,
-                                                     ID3D11ShaderResourceView** ppRV, void* pContext );
-typedef void ( CALLBACK*LPCREATEVERTEXBUFFER11 )( ID3D11Device* pDev, ID3D11Buffer** ppBuffer,
-                                                  D3D11_BUFFER_DESC BufferDesc, void* pData, void* pContext );
-typedef void ( CALLBACK*LPCREATEINDEXBUFFER11 )( ID3D11Device* pDev, ID3D11Buffer** ppBuffer,
-                                                 D3D11_BUFFER_DESC BufferDesc, void* pData, void* pContext );
+typedef void ( CALLBACK*LPCREATETEXTUREFROMFILE11 )( _In_ ID3D11Device* pDev, _In_z_ char* szFileName,
+                                                     _Outptr_ ID3D11ShaderResourceView** ppRV, _In_opt_ void* pContext );
+typedef void ( CALLBACK*LPCREATEVERTEXBUFFER11 )( _In_ ID3D11Device* pDev, _Outptr_ ID3D11Buffer** ppBuffer,
+                                                  _In_ D3D11_BUFFER_DESC BufferDesc, _In_ void* pData, _In_opt_ void* pContext );
+typedef void ( CALLBACK*LPCREATEINDEXBUFFER11 )( _In_ ID3D11Device* pDev, _Outptr_ ID3D11Buffer** ppBuffer,
+                                                 _In_ D3D11_BUFFER_DESC BufferDesc, _In_ void* pData, _In_opt_ void* pContext );
 struct SDKMESH_CALLBACKS11
 {
     LPCREATETEXTUREFROMFILE11 pCreateTextureFromFile;
@@ -302,8 +300,7 @@ private:
     //BYTE*                         m_pBufferData;
     HANDLE m_hFile;
     HANDLE m_hFileMappingObject;
-    CGrowableArray <BYTE*> m_MappedPointers;
-    IDirect3DDevice9* m_pDev9;
+    std::vector<BYTE*> m_MappedPointers;
     ID3D11Device* m_pDev11;
     ID3D11DeviceContext* m_pDevContext11;
 
@@ -331,259 +328,129 @@ protected:
     // Adjacency information (not part of the m_pStaticMeshData, so it must be created and destroyed separately )
     SDKMESH_INDEX_BUFFER_HEADER* m_pAdjacencyIndexBufferArray;
 
-    //Animation (TODO: Add ability to load/track multiple animation sets)
+    //Animation
     SDKANIMATION_FILE_HEADER* m_pAnimationHeader;
     SDKANIMATION_FRAME_DATA* m_pAnimationFrameData;
-    D3DXMATRIX* m_pBindPoseFrameMatrices;
-    D3DXMATRIX* m_pTransformedFrameMatrices;
-    D3DXMATRIX* m_pWorldPoseFrameMatrices;
+    DirectX::XMFLOAT4X4* m_pBindPoseFrameMatrices;
+    DirectX::XMFLOAT4X4* m_pTransformedFrameMatrices;
+    DirectX::XMFLOAT4X4* m_pWorldPoseFrameMatrices;
 
 protected:
-    void                            LoadMaterials( ID3D11Device* pd3dDevice, SDKMESH_MATERIAL* pMaterials,
-                                                   UINT NumMaterials, SDKMESH_CALLBACKS11* pLoaderCallbacks=NULL );
-
-    void                            LoadMaterials( IDirect3DDevice9* pd3dDevice, SDKMESH_MATERIAL* pMaterials,
-                                                   UINT NumMaterials, SDKMESH_CALLBACKS9* pLoaderCallbacks=NULL );
-
-    HRESULT                         CreateVertexBuffer( ID3D11Device* pd3dDevice,
-                                                        SDKMESH_VERTEX_BUFFER_HEADER* pHeader, void* pVertices,
-                                                        SDKMESH_CALLBACKS11* pLoaderCallbacks=NULL );
-    HRESULT                         CreateVertexBuffer( IDirect3DDevice9* pd3dDevice,
-                                                        SDKMESH_VERTEX_BUFFER_HEADER* pHeader, void* pVertices,
-                                                        SDKMESH_CALLBACKS9* pLoaderCallbacks=NULL );
-
-    HRESULT                         CreateIndexBuffer( ID3D11Device* pd3dDevice, SDKMESH_INDEX_BUFFER_HEADER* pHeader,
-                                                       void* pIndices, SDKMESH_CALLBACKS11* pLoaderCallbacks=NULL );
-    HRESULT                         CreateIndexBuffer( IDirect3DDevice9* pd3dDevice,
-                                                       SDKMESH_INDEX_BUFFER_HEADER* pHeader, void* pIndices,
-                                                       SDKMESH_CALLBACKS9* pLoaderCallbacks=NULL );
-
-    virtual HRESULT                 CreateFromFile( ID3D11Device* pDev11,
-                                                    IDirect3DDevice9* pDev9,
-                                                    LPCTSTR szFileName,
-                                                    bool bCreateAdjacencyIndices,
-                                                    SDKMESH_CALLBACKS11* pLoaderCallbacks11 = NULL,
-                                                    SDKMESH_CALLBACKS9* pLoaderCallbacks9 = NULL );
-
-    virtual HRESULT                 CreateFromMemory( ID3D11Device* pDev11,
-                                                      IDirect3DDevice9* pDev9,
-                                                      BYTE* pData,
-                                                      UINT DataBytes,
-                                                      bool bCreateAdjacencyIndices,
-                                                      bool bCopyStatic,
-                                                      SDKMESH_CALLBACKS11* pLoaderCallbacks11 = NULL,
-                                                      SDKMESH_CALLBACKS9* pLoaderCallbacks9 = NULL );
+    void LoadMaterials( _In_ ID3D11Device* pd3dDevice, _In_reads_(NumMaterials) SDKMESH_MATERIAL* pMaterials,
+                        _In_ UINT NumMaterials, _In_opt_ SDKMESH_CALLBACKS11* pLoaderCallbacks = nullptr );
+
+    HRESULT CreateVertexBuffer( _In_ ID3D11Device* pd3dDevice,
+                                _In_ SDKMESH_VERTEX_BUFFER_HEADER* pHeader, _In_reads_(pHeader->SizeBytes) void* pVertices,
+                                _In_opt_ SDKMESH_CALLBACKS11* pLoaderCallbacks = nullptr );
+
+    HRESULT CreateIndexBuffer( _In_ ID3D11Device* pd3dDevice,
+                               _In_ SDKMESH_INDEX_BUFFER_HEADER* pHeader, _In_reads_(pHeader->SizeBytes) void* pIndices,
+                               _In_opt_ SDKMESH_CALLBACKS11* pLoaderCallbacks = nullptr );
+
+    virtual HRESULT CreateFromFile( _In_opt_ ID3D11Device* pDev11,
+                                    _In_z_ LPCWSTR szFileName,
+                                    _In_opt_ SDKMESH_CALLBACKS11* pLoaderCallbacks11 = nullptr );
+
+    virtual HRESULT CreateFromMemory( _In_opt_ ID3D11Device* pDev11,
+                                      _In_reads_(DataBytes) BYTE* pData,
+                                      _In_ size_t DataBytes,
+                                      _In_ bool bCopyStatic,
+                                      _In_opt_ SDKMESH_CALLBACKS11* pLoaderCallbacks11 = nullptr );
 
     //frame manipulation
-    void                            TransformBindPoseFrame( UINT iFrame, D3DXMATRIX* pParentWorld );
-    void                            TransformFrame( UINT iFrame, D3DXMATRIX* pParentWorld, double fTime );
-    void                            TransformFrameAbsolute( UINT iFrame, double fTime );
+    void TransformBindPoseFrame( _In_ UINT iFrame, _In_ DirectX::CXMMATRIX parentWorld );
+    void TransformFrame( _In_ UINT iFrame, _In_ DirectX::CXMMATRIX parentWorld, _In_ double fTime );
+    void TransformFrameAbsolute( _In_ UINT iFrame, _In_ double fTime );
 
     //Direct3D 11 rendering helpers
-    void                            RenderMesh( UINT iMesh,
-                                                bool bAdjacent,
-                                                ID3D11DeviceContext* pd3dDeviceContext,
-                                                UINT iDiffuseSlot,
-                                                UINT iNormalSlot,
-                                                UINT iSpecularSlot );
-    void                            RenderFrame( UINT iFrame,
-                                                 bool bAdjacent,
-                                                 ID3D11DeviceContext* pd3dDeviceContext,
-                                                 UINT iDiffuseSlot,
-                                                 UINT iNormalSlot,
-                                                 UINT iSpecularSlot );
-
-
-    //Direct3D 9 rendering helpers
-    void                            RenderMesh( UINT iMesh,
-                                                LPDIRECT3DDEVICE9 pd3dDevice,
-                                                LPD3DXEFFECT pEffect,
-                                                D3DXHANDLE hTechnique,
-                                                D3DXHANDLE htxDiffuse,
-                                                D3DXHANDLE htxNormal,
-                                                D3DXHANDLE htxSpecular );
-    void                            RenderFrame( UINT iFrame,
-                                                 LPDIRECT3DDEVICE9 pd3dDevice,
-                                                 LPD3DXEFFECT pEffect,
-                                                 D3DXHANDLE hTechnique,
-                                                 D3DXHANDLE htxDiffuse,
-                                                 D3DXHANDLE htxNormal,
-                                                 D3DXHANDLE htxSpecular );
+    void RenderMesh( _In_ UINT iMesh,
+                     _In_ bool bAdjacent,
+                     _In_ ID3D11DeviceContext* pd3dDeviceContext,
+                     _In_ UINT iDiffuseSlot,
+                     _In_ UINT iNormalSlot,
+                     _In_ UINT iSpecularSlot );
+    void RenderFrame( _In_ UINT iFrame,
+                      _In_ bool bAdjacent,
+                      _In_ ID3D11DeviceContext* pd3dDeviceContext,
+                      _In_ UINT iDiffuseSlot,
+                      _In_ UINT iNormalSlot,
+                      _In_ UINT iSpecularSlot );
 
 public:
-                                    CDXUTSDKMesh();
-    virtual                         ~CDXUTSDKMesh();
-
-    virtual HRESULT                 Create( ID3D11Device* pDev11, LPCTSTR szFileName, bool bCreateAdjacencyIndices=
-                                            false, SDKMESH_CALLBACKS11* pLoaderCallbacks=NULL );
-    virtual HRESULT                 Create( IDirect3DDevice9* pDev9, LPCTSTR szFileName, bool bCreateAdjacencyIndices=
-                                            false, SDKMESH_CALLBACKS9* pLoaderCallbacks=NULL );
-    virtual HRESULT                 Create( ID3D11Device* pDev11, BYTE* pData, UINT DataBytes,
-                                            bool bCreateAdjacencyIndices=false, bool bCopyStatic=false,
-                                            SDKMESH_CALLBACKS11* pLoaderCallbacks=NULL );
-    virtual HRESULT                 Create( IDirect3DDevice9* pDev9, BYTE* pData, UINT DataBytes,
-                                            bool bCreateAdjacencyIndices=false, bool bCopyStatic=false,
-                                            SDKMESH_CALLBACKS9* pLoaderCallbacks=NULL );
-    virtual HRESULT                 LoadAnimation( WCHAR* szFileName );
-    virtual void                    Destroy();
+    CDXUTSDKMesh();
+    virtual ~CDXUTSDKMesh();
 
-    //Frame manipulation
-    void                            TransformBindPose( D3DXMATRIX* pWorld );
-    void                            TransformMesh( D3DXMATRIX* pWorld, double fTime );
+    virtual HRESULT Create( _In_ ID3D11Device* pDev11, _In_z_ LPCWSTR szFileName, _In_opt_ SDKMESH_CALLBACKS11* pLoaderCallbacks = nullptr );
+    virtual HRESULT Create( _In_ ID3D11Device* pDev11, BYTE* pData, size_t DataBytes, _In_ bool bCopyStatic=false,
+                            _In_opt_ SDKMESH_CALLBACKS11* pLoaderCallbacks = nullptr );
+    virtual HRESULT LoadAnimation( _In_z_ const WCHAR* szFileName );
+    virtual void Destroy();
 
+    //Frame manipulation
+    void TransformBindPose( _In_ DirectX::CXMMATRIX world ) { TransformBindPoseFrame( 0, world ); };
+    void TransformMesh( _In_ DirectX::CXMMATRIX world, _In_ double fTime );
 
     //Direct3D 11 Rendering
-    virtual void                    Render( ID3D11DeviceContext* pd3dDeviceContext,
-                                            UINT iDiffuseSlot = INVALID_SAMPLER_SLOT,
-                                            UINT iNormalSlot = INVALID_SAMPLER_SLOT,
-                                            UINT iSpecularSlot = INVALID_SAMPLER_SLOT );
-    virtual void                    RenderAdjacent( ID3D11DeviceContext* pd3dDeviceContext,
-                                                    UINT iDiffuseSlot = INVALID_SAMPLER_SLOT,
-                                                    UINT iNormalSlot = INVALID_SAMPLER_SLOT,
-                                                    UINT iSpecularSlot = INVALID_SAMPLER_SLOT );
-
-    //Direct3D 9 Rendering
-    virtual void                    Render( LPDIRECT3DDEVICE9 pd3dDevice,
-                                            LPD3DXEFFECT pEffect,
-                                            D3DXHANDLE hTechnique,
-                                            D3DXHANDLE htxDiffuse = 0,
-                                            D3DXHANDLE htxNormal = 0,
-                                            D3DXHANDLE htxSpecular = 0 );
+    virtual void Render( _In_ ID3D11DeviceContext* pd3dDeviceContext,
+                         _In_ UINT iDiffuseSlot = INVALID_SAMPLER_SLOT,
+                         _In_ UINT iNormalSlot = INVALID_SAMPLER_SLOT,
+                         _In_ UINT iSpecularSlot = INVALID_SAMPLER_SLOT );
+    virtual void RenderAdjacent( _In_ ID3D11DeviceContext* pd3dDeviceContext,
+                                 _In_ UINT iDiffuseSlot = INVALID_SAMPLER_SLOT,
+                                 _In_ UINT iNormalSlot = INVALID_SAMPLER_SLOT,
+                                 _In_ UINT iSpecularSlot = INVALID_SAMPLER_SLOT );
 
     //Helpers (D3D11 specific)
-    static D3D11_PRIMITIVE_TOPOLOGY GetPrimitiveType11( SDKMESH_PRIMITIVE_TYPE PrimType );
-    DXGI_FORMAT                     GetIBFormat11( UINT iMesh );
-    ID3D11Buffer* GetVB11( UINT iMesh, UINT iVB );
-    ID3D11Buffer* GetIB11( UINT iMesh );
-    SDKMESH_INDEX_TYPE GetIndexType( UINT iMesh ); 
+    static D3D11_PRIMITIVE_TOPOLOGY GetPrimitiveType11( _In_ SDKMESH_PRIMITIVE_TYPE PrimType );
+    DXGI_FORMAT GetIBFormat11( _In_ UINT iMesh ) const;
+    ID3D11Buffer* GetVB11( _In_ UINT iMesh, _In_ UINT iVB ) const;
+    ID3D11Buffer* GetIB11( _In_ UINT iMesh ) const;
+    SDKMESH_INDEX_TYPE GetIndexType( _In_ UINT iMesh ) const; 
 
-    ID3D11Buffer* GetAdjIB11( UINT iMesh );
-
-    //Helpers (D3D9 specific)
-    static D3DPRIMITIVETYPE         GetPrimitiveType9( SDKMESH_PRIMITIVE_TYPE PrimType );
-    D3DFORMAT                       GetIBFormat9( UINT iMesh );
-    IDirect3DVertexBuffer9* GetVB9( UINT iMesh, UINT iVB );
-    IDirect3DIndexBuffer9* GetIB9( UINT iMesh );
+    ID3D11Buffer* GetAdjIB11( _In_ UINT iMesh ) const;
 
     //Helpers (general)
-    char* GetMeshPathA();
-    WCHAR* GetMeshPathW();
-    UINT                            GetNumMeshes();
-    UINT                            GetNumMaterials();
-    UINT                            GetNumVBs();
-    UINT                            GetNumIBs();
-
-    ID3D11Buffer* GetVB11At( UINT iVB );
-    ID3D11Buffer* GetIB11At( UINT iIB );
-
-    IDirect3DVertexBuffer9* GetVB9At( UINT iVB );
-    IDirect3DIndexBuffer9* GetIB9At( UINT iIB );
-
-    BYTE* GetRawVerticesAt( UINT iVB );
-    BYTE* GetRawIndicesAt( UINT iIB );
-    SDKMESH_MATERIAL* GetMaterial( UINT iMaterial );
-    SDKMESH_MESH* GetMesh( UINT iMesh );
-    UINT                            GetNumSubsets( UINT iMesh );
-    SDKMESH_SUBSET* GetSubset( UINT iMesh, UINT iSubset );
-    UINT                            GetVertexStride( UINT iMesh, UINT iVB );
-    UINT                            GetNumFrames();
-    SDKMESH_FRAME*                  GetFrame( UINT iFrame );
-    SDKMESH_FRAME*                  FindFrame( char* pszName );
-    UINT64                          GetNumVertices( UINT iMesh, UINT iVB );
-    UINT64                          GetNumIndices( UINT iMesh );
-    D3DXVECTOR3                     GetMeshBBoxCenter( UINT iMesh );
-    D3DXVECTOR3                     GetMeshBBoxExtents( UINT iMesh );
-    UINT                            GetOutstandingResources();
-    UINT                            GetOutstandingBufferResources();
-    bool                            CheckLoadDone();
-    bool                            IsLoaded();
-    bool                            IsLoading();
-    void                            SetLoading( bool bLoading );
-    BOOL                            HadLoadingError();
+    const char* GetMeshPathA() const;
+    const WCHAR* GetMeshPathW() const;
+    UINT GetNumMeshes() const;
+    UINT GetNumMaterials() const;
+    UINT GetNumVBs() const;
+    UINT GetNumIBs() const;
+
+    ID3D11Buffer* GetVB11At( _In_ UINT iVB ) const;
+    ID3D11Buffer* GetIB11At( _In_ UINT iIB ) const;
+
+    BYTE* GetRawVerticesAt( _In_ UINT iVB ) const;
+    BYTE* GetRawIndicesAt( _In_ UINT iIB ) const;
+
+    SDKMESH_MATERIAL* GetMaterial( _In_ UINT iMaterial ) const;
+    SDKMESH_MESH*     GetMesh( _In_ UINT iMesh ) const;
+    UINT              GetNumSubsets( _In_ UINT iMesh ) const;
+    SDKMESH_SUBSET*   GetSubset( _In_ UINT iMesh, _In_ UINT iSubset ) const;
+    UINT              GetVertexStride( _In_ UINT iMesh, _In_ UINT iVB ) const;
+    UINT              GetNumFrames() const;
+    SDKMESH_FRAME*    GetFrame( _In_ UINT iFrame ) const; 
+    SDKMESH_FRAME*    FindFrame( _In_z_ const char* pszName ) const;
+    UINT64            GetNumVertices( _In_ UINT iMesh, _In_ UINT iVB ) const;
+    UINT64            GetNumIndices( _In_ UINT iMesh ) const;
+    DirectX::XMVECTOR GetMeshBBoxCenter( _In_ UINT iMesh ) const;
+    DirectX::XMVECTOR GetMeshBBoxExtents( _In_ UINT iMesh ) const;
+    UINT              GetOutstandingResources() const;
+    UINT              GetOutstandingBufferResources() const;
+    bool              CheckLoadDone();
+    bool              IsLoaded() const;
+    bool              IsLoading() const;
+    void              SetLoading( _In_ bool bLoading );
+    BOOL              HadLoadingError() const;
 
     //Animation
-    UINT                            GetNumInfluences( UINT iMesh );
-    const D3DXMATRIX*               GetMeshInfluenceMatrix( UINT iMesh, UINT iInfluence );
-    UINT                            GetAnimationKeyFromTime( double fTime );
-    const D3DXMATRIX*               GetWorldMatrix( UINT iFrameIndex );
-    const D3DXMATRIX*               GetInfluenceMatrix( UINT iFrameIndex );
-    bool                            GetAnimationProperties( UINT* pNumKeys, FLOAT* pFrameTime );
+    UINT              GetNumInfluences( _In_ UINT iMesh ) const;
+    DirectX::XMMATRIX GetMeshInfluenceMatrix( _In_ UINT iMesh, _In_ UINT iInfluence ) const;
+    UINT              GetAnimationKeyFromTime( _In_ double fTime ) const;
+    DirectX::XMMATRIX GetWorldMatrix( _In_ UINT iFrameIndex ) const;
+    DirectX::XMMATRIX GetInfluenceMatrix( _In_ UINT iFrameIndex ) const;
+    bool              GetAnimationProperties( _Out_ UINT* pNumKeys, _Out_ float* pFrameTime ) const;
 };
 
-//-----------------------------------------------------------------------------
-// Name: class CDXUTXFileMesh
-// Desc: Class for loading and rendering file-based meshes
-//-----------------------------------------------------------------------------
-class CDXUTXFileMesh
-{
-public:
-    WCHAR       m_strName[512];
-    LPD3DXMESH m_pMesh;   // Managed mesh
-
-    // Cache of data in m_pMesh for easy access
-    IDirect3DVertexBuffer9* m_pVB;
-    IDirect3DIndexBuffer9* m_pIB;
-    IDirect3DVertexDeclaration9* m_pDecl;
-    DWORD m_dwNumVertices;
-    DWORD m_dwNumFaces;
-    DWORD m_dwBytesPerVertex;
-
-    DWORD m_dwNumMaterials; // Materials for the mesh
-    D3DMATERIAL9* m_pMaterials;
-    CHAR        (*m_strMaterials )[MAX_PATH];
-    IDirect3DBaseTexture9** m_pTextures;
-    bool m_bUseMaterials;
-
-public:
-    // Rendering
-    HRESULT     Render( LPDIRECT3DDEVICE9 pd3dDevice,
-                        bool bDrawOpaqueSubsets = true,
-                        bool bDrawAlphaSubsets = true );
-    HRESULT     Render( ID3DXEffect* pEffect,
-                        D3DXHANDLE hTexture = NULL,
-                        D3DXHANDLE hDiffuse = NULL,
-                        D3DXHANDLE hAmbient = NULL,
-                        D3DXHANDLE hSpecular = NULL,
-                        D3DXHANDLE hEmissive = NULL,
-                        D3DXHANDLE hPower = NULL,
-                        bool bDrawOpaqueSubsets = true,
-                        bool bDrawAlphaSubsets = true );
-
-    // Mesh access
-    LPD3DXMESH  GetMesh()
-    {
-        return m_pMesh;
-    }
-
-    // Rendering options
-    void        UseMeshMaterials( bool bFlag )
-    {
-        m_bUseMaterials = bFlag;
-    }
-    HRESULT     SetFVF( LPDIRECT3DDEVICE9 pd3dDevice, DWORD dwFVF );
-    HRESULT     SetVertexDecl( LPDIRECT3DDEVICE9 pd3dDevice, const D3DVERTEXELEMENT9* pDecl,
-                               bool bAutoComputeNormals = true, bool bAutoComputeTangents = true,
-                               bool bSplitVertexForOptimalTangents = false );
-
-    // Initializing
-    HRESULT     RestoreDeviceObjects( LPDIRECT3DDEVICE9 pd3dDevice );
-    HRESULT     InvalidateDeviceObjects();
-
-    // Creation/destruction
-    HRESULT     Create( LPDIRECT3DDEVICE9 pd3dDevice, LPCWSTR strFilename );
-    HRESULT     Create( LPDIRECT3DDEVICE9 pd3dDevice, LPD3DXFILEDATA pFileData );
-    HRESULT     Create( LPDIRECT3DDEVICE9 pd3dDevice, ID3DXMesh* pInMesh, D3DXMATERIAL* pd3dxMaterials,
-                        DWORD dwMaterials );
-    HRESULT     CreateMaterials( LPCWSTR strPath, IDirect3DDevice9* pd3dDevice, D3DXMATERIAL* d3dxMtrls,
-                                 DWORD dwNumMaterials );
-    HRESULT     Destroy();
-
-                CDXUTXFileMesh( LPCWSTR strName = L"CDXUTXMeshFile_Mesh" );
-    virtual     ~CDXUTXFileMesh();
-};
-
-
-#endif
-
 #endif
 
diff --git a/samples/DX_APIUsage/DXUT/Optional/SDKmisc.cpp b/samples/DX_APIUsage/DXUT/Optional/SDKmisc.cpp
index aec7572..dbfc8f1 100644
--- a/samples/DX_APIUsage/DXUT/Optional/SDKmisc.cpp
+++ b/samples/DX_APIUsage/DXUT/Optional/SDKmisc.cpp
@@ -3,61 +3,82 @@
 //
 // Various helper functionality that is shared between SDK samples
 //
-// Copyright (c) Microsoft Corporation. All rights reserved
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #include "dxut.h"
 #include "SDKmisc.h"
 #include "DXUTres.h"
-#undef min // use __min instead
-#undef max // use __max instead
 
 #include "DXUTGui.h"
 
+#include "DDSTextureLoader.h"
+#include "WICTextureLoader.h"
+#include "ScreenGrab.h"
+
+using namespace DirectX;
+
 //--------------------------------------------------------------------------------------
 // Global/Static Members
 //--------------------------------------------------------------------------------------
 CDXUTResourceCache& WINAPI DXUTGetGlobalResourceCache()
 {
     // Using an accessor function gives control of the construction order
-    static CDXUTResourceCache cache;
-    return cache;
+    static CDXUTResourceCache* s_cache = nullptr;
+    if ( !s_cache )
+    {
+#if defined(DEBUG) || defined(_DEBUG)
+        int flag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG );
+        _CrtSetDbgFlag( flag & ~_CRTDBG_ALLOC_MEM_DF );
+#endif
+        s_cache = new CDXUTResourceCache;
+#if defined(DEBUG) || defined(_DEBUG)
+        _CrtSetDbgFlag( flag );
+#endif
+    }
+    return *s_cache;
 }
 
 
 //--------------------------------------------------------------------------------------
 // Internal functions forward declarations
 //--------------------------------------------------------------------------------------
-bool DXUTFindMediaSearchTypicalDirs( __out_ecount(cchSearch) WCHAR* strSearchPath, 
-                                     __in int cchSearch, 
-                                     __in LPCWSTR strLeaf, 
-                                     __in WCHAR* strExePath,
-                                     __in WCHAR* strExeName );
-bool DXUTFindMediaSearchParentDirs( __out_ecount(cchSearch) WCHAR* strSearchPath, 
-                                    __in int cchSearch, 
-                                    __in WCHAR* strStartAt, 
-                                    __in WCHAR* strLeafName );
-INT_PTR CALLBACK DisplaySwitchToREFWarningProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam );
+bool DXUTFindMediaSearchTypicalDirs( _Out_writes_(cchSearch) WCHAR* strSearchPath, 
+                                     _In_ int cchSearch, 
+                                     _In_ LPCWSTR strLeaf, 
+                                     _In_ const WCHAR* strExePath,
+                                     _In_ const WCHAR* strExeName );
+bool DXUTFindMediaSearchParentDirs( _Out_writes_(cchSearch) WCHAR* strSearchPath, 
+                                    _In_ int cchSearch, 
+                                    _In_ const WCHAR* strStartAt, 
+                                    _In_ const WCHAR* strLeafName );
+
+INT_PTR CALLBACK DisplaySwitchToREFWarningProc( _In_ HWND hDlg, _In_ UINT message, _In_ WPARAM wParam, _In_ LPARAM lParam );
 
 
 //--------------------------------------------------------------------------------------
 // Shared code for samples to ask user if they want to use a REF device or quit
 //--------------------------------------------------------------------------------------
-void WINAPI DXUTDisplaySwitchingToREFWarning( DXUTDeviceVersion ver )
+void WINAPI DXUTDisplaySwitchingToREFWarning()
 {
     if( DXUTGetShowMsgBoxOnError() )
     {
         DWORD dwSkipWarning = 0, dwRead = 0, dwWritten = 0;
-        HANDLE hFile = NULL;
+        HANDLE hFile = nullptr;
 
         // Read previous user settings
         WCHAR strPath[MAX_PATH];
-        SHGetFolderPath( DXUTGetHWND(), CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, strPath );
-        wcscat_s( strPath, MAX_PATH, L"\\DXUT\\SkipRefWarning.dat" );
-        if( ( hFile = CreateFile( strPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0,
-                                  NULL ) ) != INVALID_HANDLE_VALUE )
+        if ( SUCCEEDED(SHGetFolderPath(DXUTGetHWND(), CSIDL_LOCAL_APPDATA, nullptr, SHGFP_TYPE_CURRENT, strPath)) )
         {
-            ReadFile( hFile, &dwSkipWarning, sizeof( DWORD ), &dwRead, NULL );
-            CloseHandle( hFile );
+            wcscat_s( strPath, MAX_PATH, L"\\DXUT\\SkipRefWarning.dat" );
+            if( ( hFile = CreateFile( strPath, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, 0,
+                                      nullptr ) ) != INVALID_HANDLE_VALUE )
+            {
+                (void)ReadFile( hFile, &dwSkipWarning, sizeof( DWORD ), &dwRead, nullptr );
+                CloseHandle( hFile );
+            }
         }
 
         if( dwSkipWarning == 0 )
@@ -102,10 +123,7 @@ void WINAPI DXUTDisplaySwitchingToREFWarning( DXUTDeviceVersion ver )
             };
 
             LPARAM lParam;
-            if( ver == DXUT_D3D9_DEVICE )
-                lParam = 9;
-            else
-                lParam = 11;
+            lParam = 11;
             int nResult = ( int )DialogBoxIndirectParam( DXUTGetHINSTANCE(), ( DLGTEMPLATE* )&dtp, DXUTGetHWND(),
                                                          DisplaySwitchToREFWarningProc, lParam );
 
@@ -113,15 +131,17 @@ void WINAPI DXUTDisplaySwitchingToREFWarning( DXUTDeviceVersion ver )
             {
                 // Save user settings
                 dwSkipWarning = 1;
-                SHGetFolderPath( DXUTGetHWND(), CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, strPath );
-                wcscat_s( strPath, MAX_PATH, L"\\DXUT" );
-                CreateDirectory( strPath, NULL );
-                wcscat_s( strPath, MAX_PATH, L"\\SkipRefWarning.dat" );
-                if( ( hFile = CreateFile( strPath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0,
-                                          NULL ) ) != INVALID_HANDLE_VALUE )
+                if ( SUCCEEDED(SHGetFolderPath(DXUTGetHWND(), CSIDL_LOCAL_APPDATA, nullptr, SHGFP_TYPE_CURRENT, strPath)) )
                 {
-                    WriteFile( hFile, &dwSkipWarning, sizeof( DWORD ), &dwWritten, NULL );
-                    CloseHandle( hFile );
+                    wcscat_s( strPath, MAX_PATH, L"\\DXUT" );
+                    CreateDirectory( strPath, nullptr );
+                    wcscat_s( strPath, MAX_PATH, L"\\SkipRefWarning.dat" );
+                    if( ( hFile = CreateFile( strPath, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, 0,
+                                              nullptr ) ) != INVALID_HANDLE_VALUE )
+                    {
+                        WriteFile( hFile, &dwSkipWarning, sizeof( DWORD ), &dwWritten, nullptr );
+                        CloseHandle( hFile );
+                    }
                 }
             }
 
@@ -136,6 +156,7 @@ void WINAPI DXUTDisplaySwitchingToREFWarning( DXUTDeviceVersion ver )
 //--------------------------------------------------------------------------------------
 // MsgProc for DXUTDisplaySwitchingToREFWarning() dialog box
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 INT_PTR CALLBACK DisplaySwitchToREFWarningProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
 {
     switch( message )
@@ -146,7 +167,7 @@ INT_PTR CALLBACK DisplaySwitchToREFWarningProc( HWND hDlg, UINT message, WPARAM
             SendMessage( GetDlgItem( hDlg, 0x100 ), STM_SETIMAGE, IMAGE_ICON, ( LPARAM )LoadIcon( 0, IDI_QUESTION ) );
             WCHAR sz[512];
             swprintf_s( sz, 512,
-                             L"This program needs to use the Direct3D %lld reference device.  This device implements the entire Direct3D %lld feature set, but runs very slowly.  Do you wish to continue?", lParam, lParam );
+                             L"This program needs to use the Direct3D %Iu reference device.  This device implements the entire Direct3D %Iu feature set, but runs very slowly.  Do you wish to continue?", lParam, lParam );
             SetDlgItemText( hDlg, 0x101, sz );
             SetDlgItemText( hDlg, IDYES, L"&Yes" );
             SetDlgItemText( hDlg, IDNO, L"&No" );
@@ -189,6 +210,7 @@ WCHAR* DXUTMediaSearchPath()
 
 }
 
+
 //--------------------------------------------------------------------------------------
 LPCWSTR WINAPI DXUTGetMediaSearchPath()
 {
@@ -197,7 +219,7 @@ LPCWSTR WINAPI DXUTGetMediaSearchPath()
 
 
 //--------------------------------------------------------------------------------------
-HRESULT WINAPI DXUTSetMediaSearchPath( LPCWSTR strPath )
+HRESULT WINAPI DXUTSetMediaSearchPath( _In_z_ LPCWSTR strPath )
 {
     HRESULT hr;
 
@@ -224,13 +246,14 @@ HRESULT WINAPI DXUTSetMediaSearchPath( LPCWSTR strPath )
 //       cchDest is the size in WCHARs of strDestPath.  Be careful not to 
 //       pass in sizeof(strDest) on UNICODE builds.
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 HRESULT WINAPI DXUTFindDXSDKMediaFileCch( WCHAR* strDestPath, int cchDest, 
                                           LPCWSTR strFilename )
 {
     bool bFound;
     WCHAR strSearchFor[MAX_PATH];
 
-    if( NULL == strFilename || strFilename[0] == 0 || NULL == strDestPath || cchDest < 10 )
+    if( !strFilename || strFilename[0] == 0 || !strDestPath || cchDest < 10 )
         return E_INVALIDARG;
 
     // Get the exe name, and exe path
@@ -242,8 +265,8 @@ HRESULT WINAPI DXUTFindDXSDKMediaFileCch( WCHAR* strDestPath, int cchDest,
     {
         0
     };
-    WCHAR* strLastSlash = NULL;
-    GetModuleFileName( NULL, strExePath, MAX_PATH );
+    WCHAR* strLastSlash = nullptr;
+    GetModuleFileName( nullptr, strExePath, MAX_PATH );
     strExePath[MAX_PATH - 1] = 0;
     strLastSlash = wcsrchr( strExePath, TEXT( '\\' ) );
     if( strLastSlash )
@@ -275,7 +298,7 @@ HRESULT WINAPI DXUTFindDXSDKMediaFileCch( WCHAR* strDestPath, int cchDest,
         return S_OK;
 
     // Typical directory search again, but also look in a subdir called "\media\" 
-    swprintf_s( strSearchFor, MAX_PATH, L"media\\%s", strFilename );
+    swprintf_s( strSearchFor, MAX_PATH, L"media\\%ls", strFilename );
     bFound = DXUTFindMediaSearchTypicalDirs( strDestPath, cchDest, strSearchFor, strExePath, strExeName );
     if( bFound )
         return S_OK;
@@ -297,7 +320,7 @@ HRESULT WINAPI DXUTFindDXSDKMediaFileCch( WCHAR* strDestPath, int cchDest,
         return S_OK;
 
     // Search all parent directories starting at .\ and using "media\strFilename" as the leaf name
-    swprintf_s( strLeafName, MAX_PATH, L"media\\%s", strFilename );
+    swprintf_s( strLeafName, MAX_PATH, L"media\\%ls", strFilename );
     bFound = DXUTFindMediaSearchParentDirs( strDestPath, cchDest, L".", strLeafName );
     if( bFound )
         return S_OK;
@@ -317,8 +340,9 @@ HRESULT WINAPI DXUTFindDXSDKMediaFileCch( WCHAR* strDestPath, int cchDest,
 //--------------------------------------------------------------------------------------
 // Search a set of typical directories
 //--------------------------------------------------------------------------------------
+_Use_decl_annotations_
 bool DXUTFindMediaSearchTypicalDirs( WCHAR* strSearchPath, int cchSearch, LPCWSTR strLeaf, 
-                                     WCHAR* strExePath, WCHAR* strExeName )
+                                     const WCHAR* strExePath, const WCHAR* strExeName )
 {
     // Typical directories:
     //      .\
@@ -337,42 +361,42 @@ bool DXUTFindMediaSearchTypicalDirs( WCHAR* strSearchPath, int cchSearch, LPCWST
         return true;
 
     // Search in ..\  
-    swprintf_s( strSearchPath, cchSearch, L"..\\%s", strLeaf );
+    swprintf_s( strSearchPath, cchSearch, L"..\\%ls", strLeaf );
     if( GetFileAttributes( strSearchPath ) != 0xFFFFFFFF )
         return true;
 
     // Search in ..\..\ 
-    swprintf_s( strSearchPath, cchSearch, L"..\\..\\%s", strLeaf );
+    swprintf_s( strSearchPath, cchSearch, L"..\\..\\%ls", strLeaf );
     if( GetFileAttributes( strSearchPath ) != 0xFFFFFFFF )
         return true;
 
     // Search in ..\..\ 
-    swprintf_s( strSearchPath, cchSearch, L"..\\..\\%s", strLeaf );
+    swprintf_s( strSearchPath, cchSearch, L"..\\..\\%ls", strLeaf );
     if( GetFileAttributes( strSearchPath ) != 0xFFFFFFFF )
         return true;
 
     // Search in the %EXE_DIR%\ 
-    swprintf_s( strSearchPath, cchSearch, L"%s\\%s", strExePath, strLeaf );
+    swprintf_s( strSearchPath, cchSearch, L"%ls\\%ls", strExePath, strLeaf );
     if( GetFileAttributes( strSearchPath ) != 0xFFFFFFFF )
         return true;
 
     // Search in the %EXE_DIR%\..\ 
-    swprintf_s( strSearchPath, cchSearch, L"%s\\..\\%s", strExePath, strLeaf );
+    swprintf_s( strSearchPath, cchSearch, L"%ls\\..\\%ls", strExePath, strLeaf );
     if( GetFileAttributes( strSearchPath ) != 0xFFFFFFFF )
         return true;
 
     // Search in the %EXE_DIR%\..\..\ 
-    swprintf_s( strSearchPath, cchSearch, L"%s\\..\\..\\%s", strExePath, strLeaf );
+    swprintf_s( strSearchPath, cchSearch, L"%ls\\..\\..\\%ls", strExePath, strLeaf );
     if( GetFileAttributes( strSearchPath ) != 0xFFFFFFFF )
         return true;
 
     // Search in "%EXE_DIR%\..\%EXE_NAME%\".  This matches the DirectX SDK layout
-    swprintf_s( strSearchPath, cchSearch, L"%s\\..\\%s\\%s", strExePath, strExeName, strLeaf );
+    swprintf_s( strSearchPath, cchSearch, L"%ls\\..\\%ls\\%ls", strExePath, strExeName, strLeaf );
     if( GetFileAttributes( strSearchPath ) != 0xFFFFFFFF )
         return true;
 
     // Search in "%EXE_DIR%\..\..\%EXE_NAME%\".  This matches the DirectX SDK layout
-    swprintf_s( strSearchPath, cchSearch, L"%s\\..\\..\\%s\\%s", strExePath, strExeName, strLeaf );
+    swprintf_s( strSearchPath, cchSearch, L"%ls\\..\\..\\%ls\\%ls", strExePath, strExeName, strLeaf );
     if( GetFileAttributes( strSearchPath ) != 0xFFFFFFFF )
         return true;
 
@@ -380,7 +404,7 @@ bool DXUTFindMediaSearchTypicalDirs( WCHAR* strSearchPath, int cchSearch, LPCWST
     WCHAR* s_strSearchPath = DXUTMediaSearchPath();
     if( s_strSearchPath[0] != 0 )
     {
-        swprintf_s( strSearchPath, cchSearch, L"%s%s", s_strSearchPath, strLeaf );
+        swprintf_s( strSearchPath, cchSearch, L"%ls%ls", s_strSearchPath, strLeaf );
         if( GetFileAttributes( strSearchPath ) != 0xFFFFFFFF )
             return true;
     }
@@ -389,13 +413,13 @@ bool DXUTFindMediaSearchTypicalDirs( WCHAR* strSearchPath, int cchSearch, LPCWST
 }
 
 
-
 //--------------------------------------------------------------------------------------
 // Search parent directories starting at strStartAt, and appending strLeafName
 // at each parent directory.  It stops at the root directory.
 //--------------------------------------------------------------------------------------
-bool DXUTFindMediaSearchParentDirs( WCHAR* strSearchPath, int cchSearch, WCHAR* strStartAt, 
-                                    WCHAR* strLeafName )
+_Use_decl_annotations_
+bool DXUTFindMediaSearchParentDirs( WCHAR* strSearchPath, int cchSearch, const WCHAR* strStartAt, 
+                                    const WCHAR* strLeafName )
 {
     WCHAR strFullPath[MAX_PATH] =
     {
@@ -409,23 +433,24 @@ bool DXUTFindMediaSearchParentDirs( WCHAR* strSearchPath, int cchSearch, WCHAR*
     {
         0
     };
-    WCHAR* strFilePart = NULL;
+    WCHAR* strFilePart = nullptr;
 
-    GetFullPathName( strStartAt, MAX_PATH, strFullPath, &strFilePart );
-    if( strFilePart == NULL )
+    if ( !GetFullPathName( strStartAt, MAX_PATH, strFullPath, &strFilePart ) )
         return false;
 
-    while( strFilePart != NULL && *strFilePart != '\0' )
+#pragma warning( disable : 6102 )
+    while( strFilePart && *strFilePart != '\0' )
     {
-        swprintf_s( strFullFileName, MAX_PATH, L"%s\\%s", strFullPath, strLeafName );
+        swprintf_s( strFullFileName, MAX_PATH, L"%ls\\%ls", strFullPath, strLeafName );
         if( GetFileAttributes( strFullFileName ) != 0xFFFFFFFF )
         {
             wcscpy_s( strSearchPath, cchSearch, strFullFileName );
             return true;
         }
 
-        swprintf_s( strSearch, MAX_PATH, L"%s\\..", strFullPath );
-        GetFullPathName( strSearch, MAX_PATH, strFullPath, &strFilePart );
+        swprintf_s( strSearch, MAX_PATH, L"%ls\\..", strFullPath );
+        if ( !GetFullPathName( strSearch, MAX_PATH, strFullPath, &strFilePart ) )
+            return false;
     }
 
     return false;
@@ -433,1188 +458,483 @@ bool DXUTFindMediaSearchParentDirs( WCHAR* strSearchPath, int cchSearch, WCHAR*
 
 
 //--------------------------------------------------------------------------------------
-// CDXUTResourceCache
+// Compiles HLSL shaders
 //--------------------------------------------------------------------------------------
+#if D3D_COMPILER_VERSION < 46
 
-//--------------------------------------------------------------------------------------
-CDXUTResourceCache::~CDXUTResourceCache()
+namespace
 {
-    OnDestroyDevice();
 
-    m_TextureCache.RemoveAll();
-    m_EffectCache.RemoveAll();
-    m_FontCache.RemoveAll();
-}
+struct handle_closer { void operator()(HANDLE h) { if (h) CloseHandle(h); } };
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateTextureFromFile( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile,
-                                                   LPDIRECT3DTEXTURE9* ppTexture )
-{
-    return CreateTextureFromFileEx( pDevice, pSrcFile, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT,
-                                    0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT,
-                                    0, NULL, NULL, ppTexture );
-}
+typedef public std::unique_ptr<void, handle_closer> ScopedHandle;
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateTextureFromFile( LPDIRECT3DDEVICE9 pDevice, LPCSTR pSrcFile,
-                                                   LPDIRECT3DTEXTURE9* ppTexture )
-{
-    WCHAR szSrcFile[MAX_PATH];
-    MultiByteToWideChar( CP_ACP, 0, pSrcFile, -1, szSrcFile, MAX_PATH );
-    szSrcFile[MAX_PATH - 1] = 0;
+inline HANDLE safe_handle( HANDLE h ) { return (h == INVALID_HANDLE_VALUE) ? 0 : h; }
 
-    return CreateTextureFromFile( pDevice, szSrcFile, ppTexture );
-}
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateTextureFromFile( ID3D11Device* pDevice, ID3D11DeviceContext *pContext, LPCTSTR pSrcFile,
-                                                   ID3D11ShaderResourceView** ppOutputRV, bool bSRGB )
+class CIncludeHandler : public ID3DInclude
+    // Not as robust as D3D_COMPILE_STANDARD_FILE_INCLUDE, but it works in most cases
 {
-    return CreateTextureFromFileEx( pDevice, pContext, pSrcFile, NULL, NULL, ppOutputRV, bSRGB );
-}
+private:
+    static const unsigned int MAX_INCLUDES = 9;
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateTextureFromFile( ID3D11Device* pDevice, ID3D11DeviceContext *pContext, LPCSTR pSrcFile,
-                                                   ID3D11ShaderResourceView** ppOutputRV, bool bSRGB )
-{
-    WCHAR szSrcFile[MAX_PATH];
-    MultiByteToWideChar( CP_ACP, 0, pSrcFile, -1, szSrcFile, MAX_PATH );
-    szSrcFile[MAX_PATH - 1] = 0;
+    struct sInclude
+    {
+        HANDLE         hFile;
+        HANDLE         hFileMap;
+        LARGE_INTEGER  FileSize;
+        void           *pMapData;
+    };
 
-    return CreateTextureFromFile( pDevice, pContext, szSrcFile, ppOutputRV, bSRGB );
-}
+    struct sInclude     m_includeFiles[MAX_INCLUDES];
+    size_t              m_nIncludes;
+    bool                m_reset;
+    WCHAR               m_workingPath[MAX_PATH];
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateTextureFromFileEx( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile, UINT Width,
-                                                     UINT Height, UINT MipLevels, DWORD Usage, D3DFORMAT Format,
-                                                     D3DPOOL Pool, DWORD Filter, DWORD MipFilter, D3DCOLOR ColorKey,
-                                                     D3DXIMAGE_INFO* pSrcInfo, PALETTEENTRY* pPalette,
-                                                     LPDIRECT3DTEXTURE9* ppTexture )
-{
-    // Search the cache for a matching entry.
-    for( int i = 0; i < m_TextureCache.GetSize(); ++i )
+public:
+    CIncludeHandler() : m_nIncludes(0), m_reset(false)
     {
-        DXUTCache_Texture& Entry = m_TextureCache[i];
-        if( Entry.Location == DXUTCACHE_LOCATION_FILE &&
-            !lstrcmpW( Entry.wszSource, pSrcFile ) &&
-            Entry.Width == Width &&
-            Entry.Height == Height &&
-            Entry.MipLevels == MipLevels &&
-            Entry.Usage9 == Usage &&
-            Entry.Format9 == Format &&
-            Entry.Pool9 == Pool &&
-            Entry.Type9 == D3DRTYPE_TEXTURE )
+        if ( !GetCurrentDirectoryW( MAX_PATH, m_workingPath ) )
+            *m_workingPath = 0;
+
+        for ( size_t i = 0; i < MAX_INCLUDES; ++i )
         {
-            // A match is found. Obtain the IDirect3DTexture9 interface and return that.
-            return Entry.pTexture9->QueryInterface( IID_IDirect3DTexture9, ( LPVOID* )ppTexture );
+            m_includeFiles[i].hFile = INVALID_HANDLE_VALUE;
+            m_includeFiles[i].hFileMap = INVALID_HANDLE_VALUE;
+            m_includeFiles[i].pMapData = nullptr;
         }
     }
+    virtual ~CIncludeHandler()
+    {
+        for ( size_t i = 0; i < m_nIncludes; ++i )
+        {
+            UnmapViewOfFile( m_includeFiles[i].pMapData );
 
-#if defined(PROFILE) || defined(DEBUG)
-    CHAR strFileA[MAX_PATH];
-    WideCharToMultiByte( CP_ACP, 0, pSrcFile, -1, strFileA, MAX_PATH, NULL, FALSE );
-    CHAR* pstrName = strrchr( strFileA, '\\' );
-    if( pstrName == NULL )
-        pstrName = strFileA;
-    else
-        pstrName++;
-#endif
-
-    HRESULT hr;
-
-    // No matching entry.  Load the resource and create a new entry.
-    hr = D3DXCreateTextureFromFileEx( pDevice, pSrcFile, Width, Height, MipLevels, Usage, Format,
-                                      Pool, Filter, MipFilter, ColorKey, pSrcInfo, pPalette, ppTexture );
-    if( FAILED( hr ) )
-        return hr;
-
-    DXUTCache_Texture NewEntry;
-    NewEntry.Location = DXUTCACHE_LOCATION_FILE;
-    wcscpy_s( NewEntry.wszSource, MAX_PATH, pSrcFile );
-    NewEntry.Width = Width;
-    NewEntry.Height = Height;
-    NewEntry.MipLevels = MipLevels;
-    NewEntry.Usage9 = Usage;
-    NewEntry.Format9 = Format;
-    NewEntry.Pool9 = Pool;
-    NewEntry.Type9 = D3DRTYPE_TEXTURE;
-    ( *ppTexture )->QueryInterface( IID_IDirect3DBaseTexture9, ( LPVOID* )&NewEntry.pTexture9 );
-
-    DXUT_SetDebugName( *ppTexture, pstrName );
-
-    m_TextureCache.Add( NewEntry );
-    return S_OK;
-}
-
-
+            if ( m_includeFiles[i].hFileMap != INVALID_HANDLE_VALUE)
+                CloseHandle( m_includeFiles[i].hFileMap );
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateTextureFromFileEx( ID3D11Device* pDevice, ID3D11DeviceContext* pContext, LPCTSTR pSrcFile,
-                                                     D3DX11_IMAGE_LOAD_INFO* pLoadInfo, ID3DX11ThreadPump* pPump,
-                                                     ID3D11ShaderResourceView** ppOutputRV, bool bSRGB )
-{
+            if ( m_includeFiles[i].hFile != INVALID_HANDLE_VALUE)
+                CloseHandle( m_includeFiles[i].hFile );
+        }
 
-    bool is10L9 = DXUTGetDeviceSettings().d3d11.DeviceFeatureLevel < D3D_FEATURE_LEVEL_10_0; 
-    HRESULT hr = S_OK;
-    D3DX11_IMAGE_LOAD_INFO ZeroInfo;	//D3DX11_IMAGE_LOAD_INFO has a default constructor
-    D3DX11_IMAGE_INFO SrcInfo;
+        m_nIncludes = 0;
 
-    if( !pLoadInfo )
-    {
-        pLoadInfo = &ZeroInfo;
+        if ( m_reset && *m_workingPath )
+        {
+            SetCurrentDirectoryW( m_workingPath );
+        }
     }
 
-    if( !pLoadInfo->pSrcInfo )
+    STDMETHOD(Open( D3D_INCLUDE_TYPE IncludeType, LPCSTR pFileName, LPCVOID pParentData, LPCVOID *ppData, UINT *pBytes ) )
     {
-        D3DX11GetImageInfoFromFile( pSrcFile, NULL, &SrcInfo, NULL );
-        pLoadInfo->pSrcInfo = &SrcInfo;
+        UNREFERENCED_PARAMETER(IncludeType);
+        UNREFERENCED_PARAMETER(pParentData);
 
-        pLoadInfo->Format = pLoadInfo->pSrcInfo->Format;
-    }
+        size_t incIndex = m_nIncludes+1;
 
-    // Search the cache for a matching entry.
-    for( int i = 0; i < m_TextureCache.GetSize(); ++i )
-    {
-        DXUTCache_Texture& Entry = m_TextureCache[i];
-        if( Entry.Location == DXUTCACHE_LOCATION_FILE &&
-            !lstrcmpW( Entry.wszSource, pSrcFile ) &&
-            Entry.Width == pLoadInfo->Width &&
-            Entry.Height == pLoadInfo->Height &&
-            Entry.MipLevels == pLoadInfo->MipLevels &&
-            Entry.Usage11 == pLoadInfo->Usage &&
-            Entry.Format == pLoadInfo->Format &&
-            Entry.CpuAccessFlags == pLoadInfo->CpuAccessFlags &&
-            Entry.BindFlags == pLoadInfo->BindFlags &&
-            Entry.MiscFlags == pLoadInfo->MiscFlags )
+        // Make sure we have enough room for this include file
+        if ( incIndex >= MAX_INCLUDES )
+            return E_FAIL;
+
+        // try to open the file
+        m_includeFiles[incIndex].hFile  = CreateFileA( pFileName, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr );
+        if( INVALID_HANDLE_VALUE == m_includeFiles[incIndex].hFile )
         {
-            // A match is found. Obtain the IDirect3DTexture9 interface and return that.
-            return Entry.pSRV11->QueryInterface( __uuidof( ID3D11ShaderResourceView ), ( LPVOID* )ppOutputRV );
+            return E_FAIL;
         }
-    }
 
-#if defined(PROFILE) || defined(DEBUG)
-    CHAR strFileA[MAX_PATH];
-    WideCharToMultiByte( CP_ACP, 0, pSrcFile, -1, strFileA, MAX_PATH, NULL, FALSE );
-    CHAR* pstrName = strrchr( strFileA, '\\' );
-    if( pstrName == NULL )
-        pstrName = strFileA;
-    else
-        pstrName++;
-#endif
+        // Get the file size
+        GetFileSizeEx( m_includeFiles[incIndex].hFile, &m_includeFiles[incIndex].FileSize );
 
-    //Ready a new entry to the texture cache
-    //Do this before creating the texture since pLoadInfo may be volatile
-    DXUTCache_Texture NewEntry;
-    NewEntry.Location = DXUTCACHE_LOCATION_FILE;
-    wcscpy_s( NewEntry.wszSource, MAX_PATH, pSrcFile );
-    NewEntry.Width = pLoadInfo->Width;
-    NewEntry.Height = pLoadInfo->Height;
-    NewEntry.MipLevels = pLoadInfo->MipLevels;
-    NewEntry.Usage11 = pLoadInfo->Usage;
-    // 10L9 can't handle typesless, so we cant make a typesless format 
-    if (is10L9 && bSRGB) {
-        NewEntry.Format = MAKE_SRGB(pLoadInfo->Format);
-    }else {
-        NewEntry.Format = pLoadInfo->Format;
-    }
-    NewEntry.CpuAccessFlags = pLoadInfo->CpuAccessFlags;
-    NewEntry.BindFlags = pLoadInfo->BindFlags;
-    NewEntry.MiscFlags = pLoadInfo->MiscFlags;
+        // Use Memory Mapped File I/O for the header data
+        m_includeFiles[incIndex].hFileMap = CreateFileMappingA( m_includeFiles[incIndex].hFile, nullptr, PAGE_READONLY, m_includeFiles[incIndex].FileSize.HighPart, m_includeFiles[incIndex].FileSize.LowPart, pFileName);
+        if( !m_includeFiles[incIndex].hFileMap )
+        {
+            if (m_includeFiles[incIndex].hFile != INVALID_HANDLE_VALUE)
+                CloseHandle( m_includeFiles[incIndex].hFile );
+            return E_FAIL;
+        }
 
-    //Create the rexture
-    ID3D11Texture2D* pRes = NULL;
-    hr = D3DX11CreateTextureFromFile( pDevice, pSrcFile, pLoadInfo, pPump, ( ID3D11Resource** )&pRes, NULL );
+        // Create Map view
+        *ppData = MapViewOfFile( m_includeFiles[incIndex].hFileMap, FILE_MAP_READ, 0, 0, 0 );
+        *pBytes = m_includeFiles[incIndex].FileSize.LowPart;
 
-    if( FAILED( hr ) )
-        return hr;
-    D3D11_TEXTURE2D_DESC tex_dsc;
-    pRes->GetDesc(&tex_dsc);
-
-
-
-    if (bSRGB ) {
-        // This is a workaround so that we can load linearly, but sample in SRGB.  Right now, we can't load
-        // as linear since D3DX will try to do conversion on load.  Loading as TYPELESS doesn't work either, and
-        // loading as typed _UNORM doesn't allow us to create an SRGB view.
-
-        // on d3d11 featuer levels this is just a copy, but on 10L9 we must use a cpu side copy with 2 staging resources.
-        ID3D11Texture2D* unormStaging = NULL;
-        ID3D11Texture2D* srgbStaging = NULL;
-
-        D3D11_TEXTURE2D_DESC CopyDesc;
-        pRes->GetDesc( &CopyDesc );
-
-        pLoadInfo->BindFlags = 0;
-        pLoadInfo->CpuAccessFlags = D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ;
-        pLoadInfo->Depth = 0;
-        pLoadInfo->Filter = D3DX11_FILTER_LINEAR;
-        pLoadInfo->FirstMipLevel = 0;
-        pLoadInfo->Format = CopyDesc.Format;
-        pLoadInfo->Height = CopyDesc.Height;
-        pLoadInfo->MipFilter = D3DX11_FILTER_LINEAR;
-        pLoadInfo->MiscFlags = CopyDesc.MiscFlags;
-        pLoadInfo->Usage = D3D11_USAGE_STAGING;
-        pLoadInfo->Width = CopyDesc.Width;
-
-        CopyDesc.BindFlags = 0;
-        CopyDesc.Usage = D3D11_USAGE_STAGING;
-        CopyDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ;
-        CopyDesc.Format = MAKE_SRGB(CopyDesc.Format);
-
-        hr = D3DX11CreateTextureFromFile( pDevice, pSrcFile, pLoadInfo, pPump, ( ID3D11Resource** )&unormStaging, NULL );
-        DXUT_SetDebugName( unormStaging, "CDXUTResourceCache" );
-
-        hr = pDevice->CreateTexture2D(&CopyDesc, NULL, &srgbStaging);
-        DXUT_SetDebugName( srgbStaging, "CDXUTResourceCache" );
-        pContext->CopyResource( srgbStaging, unormStaging );
-        ID3D11Texture2D* srgbGPU;
-
-        pRes->GetDesc( &CopyDesc );
-        CopyDesc.Format = MAKE_SRGB(CopyDesc.Format);
-        hr = pDevice->CreateTexture2D(&CopyDesc, NULL, &srgbGPU);
-        pContext->CopyResource( srgbGPU, srgbStaging );
-
-        SAFE_RELEASE(pRes);
-        SAFE_RELEASE(srgbStaging);
-        SAFE_RELEASE(unormStaging);
-        pRes = srgbGPU;
-    }
+        // Success - Increment the include file count
+        m_nIncludes = incIndex;
 
-    DXUT_SetDebugName( pRes, pstrName );
+        return S_OK;
+    }
 
-    D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc;
-    if( bSRGB )
-        SRVDesc.Format = MAKE_SRGB( ZeroInfo.Format );
-    else
-        SRVDesc.Format = ZeroInfo.Format;
-    if( pLoadInfo->pSrcInfo->ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE1D )
+    STDMETHOD(Close( LPCVOID pData ))
     {
-        SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1D;
-        SRVDesc.Texture1D.MostDetailedMip = 0;
-        SRVDesc.Texture1D.MipLevels = pLoadInfo->pSrcInfo->MipLevels;
+        UNREFERENCED_PARAMETER(pData);
+        // Defer Closure until the container destructor 
+        return S_OK;
     }
-    else if( pLoadInfo->pSrcInfo->ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D )
+
+    void SetCWD( LPCWSTR pFileName )
     {
-        SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-        SRVDesc.Texture2D.MostDetailedMip = 0;
-        SRVDesc.Texture2D.MipLevels = pLoadInfo->pSrcInfo->MipLevels;
+        WCHAR filePath[MAX_PATH];
+        wcscpy_s( filePath, MAX_PATH, pFileName );
 
-        if( pLoadInfo->pSrcInfo->MiscFlags & D3D11_RESOURCE_MISC_TEXTURECUBE )
+        WCHAR *strLastSlash = wcsrchr( filePath, L'\\' );
+        if( strLastSlash )
         {
-            SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE;
-            SRVDesc.TextureCube.MostDetailedMip = 0;
-            SRVDesc.TextureCube.MipLevels = pLoadInfo->pSrcInfo->MipLevels;
+            // Chop the exe name from the exe path
+            *strLastSlash = 0;
+            m_reset = true;
+            SetCurrentDirectoryW( filePath );
         }
     }
-    else if( pLoadInfo->pSrcInfo->ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE3D )
-    {
-        SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
-        SRVDesc.Texture3D.MostDetailedMip = 0;
-        SRVDesc.Texture3D.MipLevels = pLoadInfo->pSrcInfo->MipLevels;
-    }
-    if (bSRGB) {
-        SRVDesc.Format = MAKE_SRGB(tex_dsc.Format);
-    }else {
-        SRVDesc.Format = tex_dsc.Format;
-    }
-    SRVDesc.Texture2D.MipLevels = tex_dsc.MipLevels;
-    SRVDesc.Texture2D.MostDetailedMip = 0;
-    hr = pDevice->CreateShaderResourceView( pRes, &SRVDesc, ppOutputRV );
-    pRes->Release();
-    if( FAILED( hr ) )
-        return hr;
-
-    DXUT_SetDebugName( *ppOutputRV, pstrName );
+};
 
-    ( *ppOutputRV )->QueryInterface( __uuidof( ID3D11ShaderResourceView ), ( LPVOID* )&NewEntry.pSRV11 );
-
-    m_TextureCache.Add( NewEntry );
-
-    return S_OK;
-}
+}; // namespace
 
+#endif
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateTextureFromResource( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                       LPCTSTR pSrcResource, LPDIRECT3DTEXTURE9* ppTexture )
+_Use_decl_annotations_
+HRESULT WINAPI DXUTCompileFromFile( LPCWSTR pFileName,
+                                    const D3D_SHADER_MACRO* pDefines,
+                                    LPCSTR pEntrypoint, LPCSTR pTarget,
+                                    UINT Flags1, UINT Flags2,
+                                    ID3DBlob** ppCode )
 {
-    return CreateTextureFromResourceEx( pDevice, hSrcModule, pSrcResource, D3DX_DEFAULT, D3DX_DEFAULT,
-                                        D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT,
-                                        D3DX_DEFAULT, 0, NULL, NULL, ppTexture );
-}
-
+    HRESULT hr;
+    WCHAR str[MAX_PATH];
+    V_RETURN( DXUTFindDXSDKMediaFileCch( str, MAX_PATH, pFileName ) );
+
+#if defined( DEBUG ) || defined( _DEBUG )
+    // Set the D3DCOMPILE_DEBUG flag to embed debug information in the shaders.
+    // Setting this flag improves the shader debugging experience, but still allows 
+    // the shaders to be optimized and to run exactly the way they will run in 
+    // the release configuration of this program.
+    Flags1 |= D3DCOMPILE_DEBUG;
+#endif
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateTextureFromResourceEx( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                         LPCTSTR pSrcResource, UINT Width, UINT Height, UINT MipLevels,
-                                                         DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, DWORD Filter,
-                                                         DWORD MipFilter, D3DCOLOR ColorKey, D3DXIMAGE_INFO* pSrcInfo,
-                                                         PALETTEENTRY* pPalette, LPDIRECT3DTEXTURE9* ppTexture )
-{
-    // Search the cache for a matching entry.
-    for( int i = 0; i < m_TextureCache.GetSize(); ++i )
-    {
-        DXUTCache_Texture& Entry = m_TextureCache[i];
-        if( Entry.Location == DXUTCACHE_LOCATION_RESOURCE &&
-            Entry.hSrcModule == hSrcModule &&
-            !lstrcmpW( Entry.wszSource, pSrcResource ) &&
-            Entry.Width == Width &&
-            Entry.Height == Height &&
-            Entry.MipLevels == MipLevels &&
-            Entry.Usage9 == Usage &&
-            Entry.Format9 == Format &&
-            Entry.Pool9 == Pool &&
-            Entry.Type9 == D3DRTYPE_TEXTURE )
-        {
-            // A match is found. Obtain the IDirect3DTexture9 interface and return that.
-            return Entry.pTexture9->QueryInterface( IID_IDirect3DTexture9, ( LPVOID* )ppTexture );
-        }
-    }
+    ID3DBlob* pErrorBlob = nullptr;
 
-    HRESULT hr;
+#if D3D_COMPILER_VERSION >= 46
 
-    // No matching entry.  Load the resource and create a new entry.
-    hr = D3DXCreateTextureFromResourceEx( pDevice, hSrcModule, pSrcResource, Width, Height, MipLevels, Usage,
-                                          Format, Pool, Filter, MipFilter, ColorKey, pSrcInfo, pPalette, ppTexture );
-    if( FAILED( hr ) )
-        return hr;
+    hr = D3DCompileFromFile( str, pDefines, D3D_COMPILE_STANDARD_FILE_INCLUDE,
+                             pEntrypoint, pTarget, Flags1, Flags2,
+                             ppCode, &pErrorBlob );
 
-    DXUTCache_Texture NewEntry;
-    NewEntry.Location = DXUTCACHE_LOCATION_RESOURCE;
-    NewEntry.hSrcModule = hSrcModule;
-    wcscpy_s( NewEntry.wszSource, MAX_PATH, pSrcResource );
-    NewEntry.Width = Width;
-    NewEntry.Height = Height;
-    NewEntry.MipLevels = MipLevels;
-    NewEntry.Usage9 = Usage;
-    NewEntry.Format9 = Format;
-    NewEntry.Pool9 = Pool;
-    NewEntry.Type9 = D3DRTYPE_TEXTURE;
-    ( *ppTexture )->QueryInterface( IID_IDirect3DBaseTexture9, ( LPVOID* )&NewEntry.pTexture9 );
-
-    m_TextureCache.Add( NewEntry );
-    return S_OK;
-}
+#else
 
+    ScopedHandle hFile( safe_handle( CreateFileW( str, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr ) ) );
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateCubeTextureFromFile( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile,
-                                                       LPDIRECT3DCUBETEXTURE9* ppCubeTexture )
-{
-    return CreateCubeTextureFromFileEx( pDevice, pSrcFile, D3DX_DEFAULT, D3DX_DEFAULT, 0,
-                                        D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT,
-                                        0, NULL, NULL, ppCubeTexture );
-}
+    if ( !hFile )
+        return HRESULT_FROM_WIN32( GetLastError() );
 
+    LARGE_INTEGER FileSize = {};
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateCubeTextureFromFileEx( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile, UINT Size,
-                                                         UINT MipLevels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool,
-                                                         DWORD Filter, DWORD MipFilter, D3DCOLOR ColorKey,
-                                                         D3DXIMAGE_INFO* pSrcInfo, PALETTEENTRY* pPalette,
-                                                         LPDIRECT3DCUBETEXTURE9* ppCubeTexture )
-{
-    // Search the cache for a matching entry.
-    for( int i = 0; i < m_TextureCache.GetSize(); ++i )
+#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA)
+    FILE_STANDARD_INFO fileInfo;
+    if ( !GetFileInformationByHandleEx( hFile.get(), FileStandardInfo, &fileInfo, sizeof(fileInfo) ) )
     {
-        DXUTCache_Texture& Entry = m_TextureCache[i];
-        if( Entry.Location == DXUTCACHE_LOCATION_FILE &&
-            !lstrcmpW( Entry.wszSource, pSrcFile ) &&
-            Entry.Width == Size &&
-            Entry.MipLevels == MipLevels &&
-            Entry.Usage9 == Usage &&
-            Entry.Format9 == Format &&
-            Entry.Pool9 == Pool &&
-            Entry.Type9 == D3DRTYPE_CUBETEXTURE )
-        {
-            // A match is found. Obtain the IDirect3DCubeTexture9 interface and return that.
-            return Entry.pTexture9->QueryInterface( IID_IDirect3DCubeTexture9, ( LPVOID* )ppCubeTexture );
-        }
+        return HRESULT_FROM_WIN32( GetLastError() );
     }
+    FileSize = fileInfo.EndOfFile;
+#else
+    GetFileSizeEx( hFile.get(), &FileSize );
+#endif
 
-    HRESULT hr;
-
-    // No matching entry.  Load the resource and create a new entry.
-    hr = D3DXCreateCubeTextureFromFileEx( pDevice, pSrcFile, Size, MipLevels, Usage, Format, Pool, Filter,
-                                          MipFilter, ColorKey, pSrcInfo, pPalette, ppCubeTexture );
-    if( FAILED( hr ) )
-        return hr;
-
-    DXUTCache_Texture NewEntry;
-    NewEntry.Location = DXUTCACHE_LOCATION_FILE;
-    wcscpy_s( NewEntry.wszSource, MAX_PATH, pSrcFile );
-    NewEntry.Width = Size;
-    NewEntry.MipLevels = MipLevels;
-    NewEntry.Usage9 = Usage;
-    NewEntry.Format9 = Format;
-    NewEntry.Pool9 = Pool;
-    NewEntry.Type9 = D3DRTYPE_CUBETEXTURE;
-    ( *ppCubeTexture )->QueryInterface( IID_IDirect3DBaseTexture9, ( LPVOID* )&NewEntry.pTexture9 );
-
-    m_TextureCache.Add( NewEntry );
-    return S_OK;
-}
+    if (!FileSize.LowPart || FileSize.HighPart > 0)
+        return E_FAIL;
 
+    std::unique_ptr<char[]> fxData;
+    fxData.reset( new (std::nothrow) char[ FileSize.LowPart ] );
+    if ( !fxData )
+        return E_OUTOFMEMORY;
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateCubeTextureFromResource( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                           LPCTSTR pSrcResource,
-                                                           LPDIRECT3DCUBETEXTURE9* ppCubeTexture )
-{
-    return CreateCubeTextureFromResourceEx( pDevice, hSrcModule, pSrcResource, D3DX_DEFAULT, D3DX_DEFAULT,
-                                            0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT,
-                                            0, NULL, NULL, ppCubeTexture );
-}
+    DWORD BytesRead = 0;
+    if ( !ReadFile( hFile.get(), fxData.get(), FileSize.LowPart, &BytesRead, nullptr ) )
+        return HRESULT_FROM_WIN32( GetLastError() );
 
+    if (BytesRead < FileSize.LowPart)
+        return E_FAIL;
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateCubeTextureFromResourceEx( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                             LPCTSTR pSrcResource, UINT Size, UINT MipLevels,
-                                                             DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, DWORD Filter,
-                                                             DWORD MipFilter, D3DCOLOR ColorKey,
-                                                             D3DXIMAGE_INFO* pSrcInfo, PALETTEENTRY* pPalette,
-                                                             LPDIRECT3DCUBETEXTURE9* ppCubeTexture )
-{
-    // Search the cache for a matching entry.
-    for( int i = 0; i < m_TextureCache.GetSize(); ++i )
+    char pSrcName[MAX_PATH];
+    int result = WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, str, -1, pSrcName, MAX_PATH, nullptr, FALSE );
+    if ( !result )
+        return E_FAIL;
+    
+    const CHAR* pstrName = strrchr( pSrcName, '\\' );
+    if (!pstrName)
     {
-        DXUTCache_Texture& Entry = m_TextureCache[i];
-        if( Entry.Location == DXUTCACHE_LOCATION_RESOURCE &&
-            Entry.hSrcModule == hSrcModule &&
-            !lstrcmpW( Entry.wszSource, pSrcResource ) &&
-            Entry.Width == Size &&
-            Entry.MipLevels == MipLevels &&
-            Entry.Usage9 == Usage &&
-            Entry.Format9 == Format &&
-            Entry.Pool9 == Pool &&
-            Entry.Type9 == D3DRTYPE_CUBETEXTURE )
-        {
-            // A match is found. Obtain the IDirect3DCubeTexture9 interface and return that.
-            return Entry.pTexture9->QueryInterface( IID_IDirect3DCubeTexture9, ( LPVOID* )ppCubeTexture );
-        }
+        pstrName = pSrcName;
     }
-
-    HRESULT hr;
-
-    // No matching entry.  Load the resource and create a new entry.
-    hr = D3DXCreateCubeTextureFromResourceEx( pDevice, hSrcModule, pSrcResource, Size, MipLevels, Usage, Format,
-                                              Pool, Filter, MipFilter, ColorKey, pSrcInfo, pPalette, ppCubeTexture );
-    if( FAILED( hr ) )
-        return hr;
-
-    DXUTCache_Texture NewEntry;
-    NewEntry.Location = DXUTCACHE_LOCATION_RESOURCE;
-    NewEntry.hSrcModule = hSrcModule;
-    wcscpy_s( NewEntry.wszSource, MAX_PATH, pSrcResource );
-    NewEntry.Width = Size;
-    NewEntry.MipLevels = MipLevels;
-    NewEntry.Usage9 = Usage;
-    NewEntry.Format9 = Format;
-    NewEntry.Pool9 = Pool;
-    NewEntry.Type9 = D3DRTYPE_CUBETEXTURE;
-    ( *ppCubeTexture )->QueryInterface( IID_IDirect3DBaseTexture9, ( LPVOID* )&NewEntry.pTexture9 );
-
-    m_TextureCache.Add( NewEntry );
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateVolumeTextureFromFile( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile,
-                                                         LPDIRECT3DVOLUMETEXTURE9* ppVolumeTexture )
-{
-    return CreateVolumeTextureFromFileEx( pDevice, pSrcFile, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT,
-                                          0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT,
-                                          0, NULL, NULL, ppVolumeTexture );
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateVolumeTextureFromFileEx( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile, UINT Width,
-                                                           UINT Height, UINT Depth, UINT MipLevels, DWORD Usage,
-                                                           D3DFORMAT Format, D3DPOOL Pool, DWORD Filter,
-                                                           DWORD MipFilter, D3DCOLOR ColorKey,
-                                                           D3DXIMAGE_INFO* pSrcInfo, PALETTEENTRY* pPalette,
-                                                           LPDIRECT3DVOLUMETEXTURE9* ppTexture )
-{
-    // Search the cache for a matching entry.
-    for( int i = 0; i < m_TextureCache.GetSize(); ++i )
+    else
     {
-        DXUTCache_Texture& Entry = m_TextureCache[i];
-        if( Entry.Location == DXUTCACHE_LOCATION_FILE &&
-            !lstrcmpW( Entry.wszSource, pSrcFile ) &&
-            Entry.Width == Width &&
-            Entry.Height == Height &&
-            Entry.Depth == Depth &&
-            Entry.MipLevels == MipLevels &&
-            Entry.Usage9 == Usage &&
-            Entry.Format9 == Format &&
-            Entry.Pool9 == Pool &&
-            Entry.Type9 == D3DRTYPE_VOLUMETEXTURE )
-        {
-            // A match is found. Obtain the IDirect3DVolumeTexture9 interface and return that.
-            return Entry.pTexture9->QueryInterface( IID_IDirect3DVolumeTexture9, ( LPVOID* )ppTexture );
-        }
+        pstrName++;
     }
 
-    HRESULT hr;
-
-    // No matching entry.  Load the resource and create a new entry.
-    hr = D3DXCreateVolumeTextureFromFileEx( pDevice, pSrcFile, Width, Height, Depth, MipLevels, Usage, Format,
-                                            Pool, Filter, MipFilter, ColorKey, pSrcInfo, pPalette, ppTexture );
-    if( FAILED( hr ) )
-        return hr;
-
-    DXUTCache_Texture NewEntry;
-    NewEntry.Location = DXUTCACHE_LOCATION_FILE;
-    wcscpy_s( NewEntry.wszSource, MAX_PATH, pSrcFile );
-    NewEntry.Width = Width;
-    NewEntry.Height = Height;
-    NewEntry.Depth = Depth;
-    NewEntry.MipLevels = MipLevels;
-    NewEntry.Usage9 = Usage;
-    NewEntry.Format9 = Format;
-    NewEntry.Pool9 = Pool;
-    NewEntry.Type9 = D3DRTYPE_VOLUMETEXTURE;
-    ( *ppTexture )->QueryInterface( IID_IDirect3DBaseTexture9, ( LPVOID* )&NewEntry.pTexture9 );
-
-    m_TextureCache.Add( NewEntry );
-    return S_OK;
-}
+    std::unique_ptr<CIncludeHandler> includes( new (std::nothrow) CIncludeHandler );
+    if ( !includes )
+        return E_OUTOFMEMORY;
 
+    includes->SetCWD( str );
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateVolumeTextureFromResource( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                             LPCTSTR pSrcResource,
-                                                             LPDIRECT3DVOLUMETEXTURE9* ppVolumeTexture )
-{
-    return CreateVolumeTextureFromResourceEx( pDevice, hSrcModule, pSrcResource, D3DX_DEFAULT, D3DX_DEFAULT,
-                                              D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED,
-                                              D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, ppVolumeTexture );
-}
+    hr = D3DCompile( fxData.get(), BytesRead, pstrName, pDefines, includes.get(),
+                     pEntrypoint, pTarget, Flags1, Flags2,
+                     ppCode, &pErrorBlob );
 
+#endif
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateVolumeTextureFromResourceEx( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                               LPCTSTR pSrcResource, UINT Width, UINT Height,
-                                                               UINT Depth, UINT MipLevels, DWORD Usage,
-                                                               D3DFORMAT Format, D3DPOOL Pool, DWORD Filter,
-                                                               DWORD MipFilter, D3DCOLOR ColorKey,
-                                                               D3DXIMAGE_INFO* pSrcInfo, PALETTEENTRY* pPalette,
-                                                               LPDIRECT3DVOLUMETEXTURE9* ppVolumeTexture )
-{
-    // Search the cache for a matching entry.
-    for( int i = 0; i < m_TextureCache.GetSize(); ++i )
+#pragma warning( suppress : 6102 )
+    if ( pErrorBlob )
     {
-        DXUTCache_Texture& Entry = m_TextureCache[i];
-        if( Entry.Location == DXUTCACHE_LOCATION_RESOURCE &&
-            Entry.hSrcModule == hSrcModule &&
-            !lstrcmpW( Entry.wszSource, pSrcResource ) &&
-            Entry.Width == Width &&
-            Entry.Height == Height &&
-            Entry.Depth == Depth &&
-            Entry.MipLevels == MipLevels &&
-            Entry.Usage9 == Usage &&
-            Entry.Format9 == Format &&
-            Entry.Pool9 == Pool &&
-            Entry.Type9 == D3DRTYPE_VOLUMETEXTURE )
-        {
-            // A match is found. Obtain the IDirect3DVolumeTexture9 interface and return that.
-            return Entry.pTexture9->QueryInterface( IID_IDirect3DVolumeTexture9, ( LPVOID* )ppVolumeTexture );
-        }
+        OutputDebugStringA( reinterpret_cast<const char*>( pErrorBlob->GetBufferPointer() ) );
+        pErrorBlob->Release();
     }
 
-    HRESULT hr;
-
-    // No matching entry.  Load the resource and create a new entry.
-    hr = D3DXCreateVolumeTextureFromResourceEx( pDevice, hSrcModule, pSrcResource, Width, Height, Depth, MipLevels,
-                                                Usage,
-                                                Format, Pool, Filter, MipFilter, ColorKey, pSrcInfo, pPalette,
-                                                ppVolumeTexture );
-    if( FAILED( hr ) )
-        return hr;
-
-    DXUTCache_Texture NewEntry;
-    NewEntry.Location = DXUTCACHE_LOCATION_RESOURCE;
-    NewEntry.hSrcModule = hSrcModule;
-    wcscpy_s( NewEntry.wszSource, MAX_PATH, pSrcResource );
-    NewEntry.Width = Width;
-    NewEntry.Height = Height;
-    NewEntry.Depth = Depth;
-    NewEntry.MipLevels = MipLevels;
-    NewEntry.Usage9 = Usage;
-    NewEntry.Format9 = Format;
-    NewEntry.Pool9 = Pool;
-    NewEntry.Type9 = D3DRTYPE_VOLUMETEXTURE;
-    ( *ppVolumeTexture )->QueryInterface( IID_IDirect3DBaseTexture9, ( LPVOID* )&NewEntry.pTexture9 );
-
-    m_TextureCache.Add( NewEntry );
-    return S_OK;
+    return hr;
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateFont( LPDIRECT3DDEVICE9 pDevice, UINT Height, UINT Width, UINT Weight,
-                                        UINT MipLevels, BOOL Italic, DWORD CharSet, DWORD OutputPrecision,
-                                        DWORD Quality, DWORD PitchAndFamily, LPCTSTR pFacename, LPD3DXFONT* ppFont )
-{
-    D3DXFONT_DESCW Desc;
-
-    Desc.Height = Height;
-    Desc.Width = Width;
-    Desc.Weight = Weight;
-    Desc.MipLevels = MipLevels;
-    Desc.Italic = Italic;
-    Desc.CharSet = ( BYTE )CharSet;
-    Desc.OutputPrecision = ( BYTE )OutputPrecision;
-    Desc.Quality = ( BYTE )Quality;
-    Desc.PitchAndFamily = ( BYTE )PitchAndFamily;
-    wcscpy_s( Desc.FaceName, LF_FACESIZE, pFacename );
-
-    return CreateFontIndirect( pDevice, &Desc, ppFont );
-}
-
-
+// Texture utilities
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateFontIndirect( LPDIRECT3DDEVICE9 pDevice, CONST D3DXFONT_DESC *pDesc, LPD3DXFONT *ppFont )
- {
-    // Search the cache for a matching entry.
-    for( int i = 0; i < m_FontCache.GetSize(); ++i )
- {
-        DXUTCache_Font &Entry = m_FontCache[i];
-
-        if( Entry.Width == pDesc->Width &&
-            Entry.Height == pDesc->Height &&
-            Entry.Weight == pDesc->Weight &&
-            Entry.MipLevels == pDesc->MipLevels &&
-            Entry.Italic == pDesc->Italic &&
-            Entry.CharSet == pDesc->CharSet &&
-            Entry.OutputPrecision == pDesc->OutputPrecision &&
-            Entry.Quality == pDesc->Quality &&
-            Entry.PitchAndFamily == pDesc->PitchAndFamily &&
-            CompareString( LOCALE_USER_DEFAULT, NORM_IGNORECASE,
-                           Entry.FaceName, -1,
-                           pDesc->FaceName, -1 ) == CSTR_EQUAL )
- {
-    // A match is found.  Increment the reference and return the ID3DXFont object.
-            Entry.pFont->AddRef();
-            *ppFont = Entry.pFont;
-            return S_OK;
-        }
-    }
 
-    HRESULT hr;
+_Use_decl_annotations_
+HRESULT WINAPI DXUTCreateShaderResourceViewFromFile( ID3D11Device* d3dDevice, const wchar_t* szFileName, ID3D11ShaderResourceView** textureView )
+{
+    if ( !d3dDevice || !szFileName || !textureView )
+        return E_INVALIDARG;
 
-    // No matching entry.  Load the resource and create a new entry.
-    hr = D3DXCreateFontIndirect( pDevice, pDesc, ppFont );
-    if( FAILED( hr ) )
+    WCHAR str[MAX_PATH];
+    HRESULT hr = DXUTFindDXSDKMediaFileCch( str, MAX_PATH, szFileName );
+    if ( FAILED(hr) )
         return hr;
 
-    DXUTCache_Font NewEntry;
-    ( D3DXFONT_DESC & )NewEntry = *pDesc;
-    NewEntry.pFont = *ppFont;
-    NewEntry.pFont->AddRef();
-
-    m_FontCache.Add( NewEntry );
-    return S_OK;
-}
-
+    WCHAR ext[_MAX_EXT];
+    _wsplitpath_s( str, nullptr, 0, nullptr, 0, nullptr, 0, ext, _MAX_EXT );
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateEffectFromFile( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile,
-                                                  const D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude, DWORD Flags,
-                                                  LPD3DXEFFECTPOOL pPool, LPD3DXEFFECT* ppEffect,
-                                                  LPD3DXBUFFER* ppCompilationErrors )
-{
-    // Search the cache for a matching entry.
-    for( int i = 0; i < m_EffectCache.GetSize(); ++i )
+    if ( _wcsicmp( ext, L".dds" ) == 0 )
     {
-        DXUTCache_Effect& Entry = m_EffectCache[i];
-
-        if( Entry.Location == DXUTCACHE_LOCATION_FILE &&
-            !lstrcmpW( Entry.wszSource, pSrcFile ) &&
-            Entry.dwFlags == Flags )
-        {
-            // A match is found.  Increment the ref coutn and return the ID3DXEffect object.
-            *ppEffect = Entry.pEffect;
-            ( *ppEffect )->AddRef();
-            return S_OK;
-        }
+        hr = DirectX::CreateDDSTextureFromFile( d3dDevice, str, nullptr, textureView );
     }
-
-    HRESULT hr;
-
-    // No matching entry.  Load the resource and create a new entry.
-#ifdef D3DXFX_LARGEADDRESS_HANDLE
-    Flags |= D3DXFX_LARGEADDRESSAWARE;
-#endif
-
-    hr = D3DXCreateEffectFromFile( pDevice, pSrcFile, pDefines, pInclude, Flags, pPool, ppEffect,
-                                   ppCompilationErrors );
-    if( FAILED( hr ) )
-        return hr;
-
-    DXUTCache_Effect NewEntry;
-    NewEntry.Location = DXUTCACHE_LOCATION_FILE;
-    wcscpy_s( NewEntry.wszSource, MAX_PATH, pSrcFile );
-    NewEntry.dwFlags = Flags;
-    NewEntry.pEffect = *ppEffect;
-    NewEntry.pEffect->AddRef();
-
-    m_EffectCache.Add( NewEntry );
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::CreateEffectFromResource( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                      LPCTSTR pSrcResource, const D3DXMACRO* pDefines,
-                                                      LPD3DXINCLUDE pInclude, DWORD Flags, LPD3DXEFFECTPOOL pPool,
-                                                      LPD3DXEFFECT* ppEffect, LPD3DXBUFFER* ppCompilationErrors )
-{
-    // Search the cache for a matching entry.
-    for( int i = 0; i < m_EffectCache.GetSize(); ++i )
+    else
     {
-        DXUTCache_Effect& Entry = m_EffectCache[i];
-
-        if( Entry.Location == DXUTCACHE_LOCATION_RESOURCE &&
-            Entry.hSrcModule == hSrcModule &&
-            !lstrcmpW( Entry.wszSource, pSrcResource ) &&
-            Entry.dwFlags == Flags )
-        {
-            // A match is found.  Increment the ref coutn and return the ID3DXEffect object.
-            *ppEffect = Entry.pEffect;
-            ( *ppEffect )->AddRef();
-            return S_OK;
-        }
+        hr = DirectX::CreateWICTextureFromFile( d3dDevice, nullptr, str, nullptr, textureView );
     }
 
-    HRESULT hr;
-
-    // No matching entry.  Load the resource and create a new entry.
-#ifdef D3DXFX_LARGEADDRESS_HANDLE
-    Flags |= D3DXFX_LARGEADDRESSAWARE;
-#endif
-
-    hr = D3DXCreateEffectFromResource( pDevice, hSrcModule, pSrcResource, pDefines, pInclude, Flags,
-                                       pPool, ppEffect, ppCompilationErrors );
-    if( FAILED( hr ) )
-        return hr;
-
-    DXUTCache_Effect NewEntry;
-    NewEntry.Location = DXUTCACHE_LOCATION_RESOURCE;
-    NewEntry.hSrcModule = hSrcModule;
-    wcscpy_s( NewEntry.wszSource, MAX_PATH, pSrcResource );
-    NewEntry.dwFlags = Flags;
-    NewEntry.pEffect = *ppEffect;
-    NewEntry.pEffect->AddRef();
-
-    m_EffectCache.Add( NewEntry );
-    return S_OK;
+    return hr;
 }
 
-
-//--------------------------------------------------------------------------------------
-// Device event callbacks
-//--------------------------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::OnCreateDevice( IDirect3DDevice9* pd3dDevice )
+_Use_decl_annotations_
+HRESULT WINAPI DXUTCreateTextureFromFile( ID3D11Device* d3dDevice, const wchar_t* szFileName, ID3D11Resource** texture )
 {
-    return S_OK;
-}
+    if ( !d3dDevice || !szFileName || !texture )
+        return E_INVALIDARG;
 
+    WCHAR str[MAX_PATH];
+    HRESULT hr = DXUTFindDXSDKMediaFileCch( str, MAX_PATH, szFileName );
+    if ( FAILED(hr) )
+        return hr;
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::OnResetDevice( IDirect3DDevice9* pd3dDevice )
-{
-    // Call OnResetDevice on all effect and font objects
-    for( int i = 0; i < m_EffectCache.GetSize(); ++i )
-        m_EffectCache[i].pEffect->OnResetDevice();
-    for( int i = 0; i < m_FontCache.GetSize(); ++i )
-        m_FontCache[i].pFont->OnResetDevice();
+    WCHAR ext[_MAX_EXT];
+    _wsplitpath_s( str, nullptr, 0, nullptr, 0, nullptr, 0, ext, _MAX_EXT );
 
+    if ( _wcsicmp( ext, L".dds" ) == 0 )
+    {
+        hr = DirectX::CreateDDSTextureFromFile( d3dDevice, str, texture, nullptr );
+    }
+    else
+    {
+        hr = DirectX::CreateWICTextureFromFile( d3dDevice, nullptr, str, texture, nullptr );
+    }
 
-    return S_OK;
+    return hr;
 }
 
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::OnLostDevice()
+_Use_decl_annotations_
+HRESULT WINAPI DXUTSaveTextureToFile( ID3D11DeviceContext* pContext, ID3D11Resource* pSource, bool usedds, const wchar_t* szFileName )
 {
-    // Call OnLostDevice on all effect and font objects
-    for( int i = 0; i < m_EffectCache.GetSize(); ++i )
-        m_EffectCache[i].pEffect->OnLostDevice();
-    for( int i = 0; i < m_FontCache.GetSize(); ++i )
-        m_FontCache[i].pFont->OnLostDevice();
-
-    // Release all the default pool textures
-    for( int i = m_TextureCache.GetSize() - 1; i >= 0; --i )
-        if( m_TextureCache[i].Pool9 == D3DPOOL_DEFAULT )
-        {
-            SAFE_RELEASE( m_TextureCache[i].pTexture9 );
-            m_TextureCache.Remove( i );  // Remove the entry
-        }
-
-    return S_OK;
-}
+    if ( !pContext || !pSource || !szFileName )
+        return E_INVALIDARG;
 
+    HRESULT hr;
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTResourceCache::OnDestroyDevice()
-{
-    // Release all resources
-    for( int i = m_EffectCache.GetSize() - 1; i >= 0; --i )
+    if ( usedds )
     {
-        SAFE_RELEASE( m_EffectCache[i].pEffect );
-        m_EffectCache.Remove( i );
+        hr = DirectX::SaveDDSTextureToFile( pContext, pSource, szFileName );
     }
-    for( int i = m_FontCache.GetSize() - 1; i >= 0; --i )
-    {
-        SAFE_RELEASE( m_FontCache[i].pFont );
-        m_FontCache.Remove( i );
-    }
-    for( int i = m_TextureCache.GetSize() - 1; i >= 0; --i )
+    else
     {
-        SAFE_RELEASE( m_TextureCache[i].pTexture9 );
-        SAFE_RELEASE( m_TextureCache[i].pSRV11 );
-        m_TextureCache.Remove( i );
+        hr = DirectX::SaveWICTextureToFile( pContext, pSource, GUID_ContainerFormatBmp, szFileName );
     }
 
-    return S_OK;
+    return hr;
 }
 
 
 //--------------------------------------------------------------------------------------
 // Desc: Returns a view matrix for rendering to a face of a cubemap.
 //--------------------------------------------------------------------------------------
-D3DXMATRIX WINAPI DXUTGetCubeMapViewMatrix( DWORD dwFace )
+XMMATRIX WINAPI DXUTGetCubeMapViewMatrix( _In_ DWORD dwFace )
 {
-    D3DXVECTOR3 vEyePt = D3DXVECTOR3( 0.0f, 0.0f, 0.0f );
-    D3DXVECTOR3 vLookDir;
-    D3DXVECTOR3 vUpDir;
-
-    switch( dwFace )
+    static const XMVECTORF32 s_vLookDir[] =
     {
-        case D3DCUBEMAP_FACE_POSITIVE_X:
-            vLookDir = D3DXVECTOR3( 1.0f, 0.0f, 0.0f );
-            vUpDir = D3DXVECTOR3( 0.0f, 1.0f, 0.0f );
-            break;
-        case D3DCUBEMAP_FACE_NEGATIVE_X:
-            vLookDir = D3DXVECTOR3( -1.0f, 0.0f, 0.0f );
-            vUpDir = D3DXVECTOR3( 0.0f, 1.0f, 0.0f );
-            break;
-        case D3DCUBEMAP_FACE_POSITIVE_Y:
-            vLookDir = D3DXVECTOR3( 0.0f, 1.0f, 0.0f );
-            vUpDir = D3DXVECTOR3( 0.0f, 0.0f, -1.0f );
-            break;
-        case D3DCUBEMAP_FACE_NEGATIVE_Y:
-            vLookDir = D3DXVECTOR3( 0.0f, -1.0f, 0.0f );
-            vUpDir = D3DXVECTOR3( 0.0f, 0.0f, 1.0f );
-            break;
-        case D3DCUBEMAP_FACE_POSITIVE_Z:
-            vLookDir = D3DXVECTOR3( 0.0f, 0.0f, 1.0f );
-            vUpDir = D3DXVECTOR3( 0.0f, 1.0f, 0.0f );
-            break;
-        case D3DCUBEMAP_FACE_NEGATIVE_Z:
-            vLookDir = D3DXVECTOR3( 0.0f, 0.0f, -1.0f );
-            vUpDir = D3DXVECTOR3( 0.0f, 1.0f, 0.0f );
-            break;
-    }
+        { 1.0f, 0.0f, 0.0f, 0.0f },
+        { -1.0f, 0.0f, 0.0f, 0.0f },
+        { 0.0f, 1.0f, 0.0f, 0.0f },
+        { 0.0f, -1.0f, 0.0f, 0.0f },
+        { 0.0f, 0.0f, 1.0f, 0.0f },
+        { 0.0f, 0.0f, -1.0f, 0.0f },
+    };
 
-    // Set the view transform for this cubemap surface
-    D3DXMATRIXA16 mView;
-    D3DXMatrixLookAtLH( &mView, &vEyePt, &vLookDir, &vUpDir );
-    return mView;
-}
+    static const XMVECTORF32 s_vUpDir[] = 
+    {
+        { 0.0f, 1.0f, 0.0f, 0.0f },
+        { 0.0f, 1.0f, 0.0f, 0.0f },
+        { 0.0f, 0.0f, -1.0f, 0.0f },
+        { 0.0f, 0.0f, 1.0f, 0.0f },
+        { 0.0f, 1.0f, 0.0f, 0.0f },
+        { 0.0f, 1.0f, 0.0f, 0.0f },
+    };
 
+    static_assert( _countof(s_vLookDir) == _countof(s_vUpDir), "arrays mismatch" );
 
-//--------------------------------------------------------------------------------------
-CDXUTLineManager::CDXUTLineManager()
-{
-    m_pd3dDevice = NULL;
-    m_pD3DXLine = NULL;
-}
-
+    if ( dwFace >= _countof(s_vLookDir)
+         || dwFace >= _countof(s_vUpDir) )
+        return XMMatrixIdentity();
 
-//--------------------------------------------------------------------------------------
-CDXUTLineManager::~CDXUTLineManager()
-{
-    OnDeletedDevice();
+    // Set the view transform for this cubemap surface
+    return XMMatrixLookAtLH( g_XMZero, s_vLookDir[ dwFace ], s_vUpDir[ dwFace ] );
 }
 
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTLineManager::OnCreatedDevice( IDirect3DDevice9* pd3dDevice )
-{
-    m_pd3dDevice = pd3dDevice;
-
-    HRESULT hr;
-    hr = D3DXCreateLine( m_pd3dDevice, &m_pD3DXLine );
-    if( FAILED( hr ) )
-        return hr;
-
-    return S_OK;
-}
-
+//======================================================================================
+// CDXUTResourceCache
+//======================================================================================
 
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTLineManager::OnResetDevice()
+CDXUTResourceCache::~CDXUTResourceCache()
 {
-    if( m_pD3DXLine )
-        m_pD3DXLine->OnResetDevice();
-
-    return S_OK;
+    OnDestroyDevice();
 }
 
-
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTLineManager::OnRender()
+_Use_decl_annotations_
+HRESULT CDXUTResourceCache::CreateTextureFromFile( ID3D11Device* pDevice, ID3D11DeviceContext *pContext, LPCWSTR pSrcFile,
+                                                   ID3D11ShaderResourceView** ppOutputRV, bool bSRGB )
 {
-    HRESULT hr;
-    if( NULL == m_pD3DXLine )
+    if ( !ppOutputRV )
         return E_INVALIDARG;
 
-    bool bDrawingHasBegun = false;
-    float fLastWidth = 0.0f;
-    bool bLastAntiAlias = false;
+    *ppOutputRV = nullptr;
 
-    for( int i = 0; i < m_LinesList.GetSize(); i++ )
+    for( auto it = m_TextureCache.cbegin(); it != m_TextureCache.cend(); ++it )
     {
-        LINE_NODE* pLineNode = m_LinesList.GetAt( i );
-        if( pLineNode )
+        if( !wcscmp( it->wszSource, pSrcFile )
+            && it->bSRGB == bSRGB
+            && it->pSRV11 )
         {
-            if( !bDrawingHasBegun ||
-                fLastWidth != pLineNode->fWidth ||
-                bLastAntiAlias != pLineNode->bAntiAlias )
-            {
-                if( bDrawingHasBegun )
-                {
-                    hr = m_pD3DXLine->End();
-                    if( FAILED( hr ) )
-                        return hr;
-                }
-
-                m_pD3DXLine->SetWidth( pLineNode->fWidth );
-                m_pD3DXLine->SetAntialias( pLineNode->bAntiAlias );
-
-                fLastWidth = pLineNode->fWidth;
-                bLastAntiAlias = pLineNode->bAntiAlias;
-
-                hr = m_pD3DXLine->Begin();
-                if( FAILED( hr ) )
-                    return hr;
-                bDrawingHasBegun = true;
-            }
-
-            hr = m_pD3DXLine->Draw( pLineNode->pVertexList, pLineNode->dwVertexListCount, pLineNode->Color );
-            if( FAILED( hr ) )
-                return hr;
+            it->pSRV11->AddRef();
+            *ppOutputRV = it->pSRV11;
+            return S_OK;
         }
     }
 
-    if( bDrawingHasBegun )
-    {
-        hr = m_pD3DXLine->End();
-        if( FAILED( hr ) )
-            return hr;
-    }
-
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTLineManager::OnLostDevice()
-{
-    if( m_pD3DXLine )
-        m_pD3DXLine->OnLostDevice();
-
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTLineManager::OnDeletedDevice()
-{
-    RemoveAllLines();
-    SAFE_RELEASE( m_pD3DXLine );
+    WCHAR ext[_MAX_EXT];
+    _wsplitpath_s( pSrcFile, nullptr, 0, nullptr, 0, nullptr, 0, ext, _MAX_EXT );
 
-    return S_OK;
-}
-
-
-//--------------------------------------------------------------------------------------
-HRESULT CDXUTLineManager::AddLine( int* pnLineID, D3DXVECTOR2* pVertexList, DWORD dwVertexListCount, D3DCOLOR Color,
-                                   float fWidth, float fScaleRatio, bool bAntiAlias )
-{
-    if( pVertexList == NULL || dwVertexListCount == 0 )
-        return E_INVALIDARG;
-
-    LINE_NODE* pLineNode = new LINE_NODE;
-    if( pLineNode == NULL )
-        return E_OUTOFMEMORY;
-    ZeroMemory( pLineNode, sizeof( LINE_NODE ) );
-
-    pLineNode->nLineID = m_LinesList.GetSize();
-    pLineNode->Color = Color;
-    pLineNode->fWidth = fWidth;
-    pLineNode->bAntiAlias = bAntiAlias;
-    pLineNode->dwVertexListCount = dwVertexListCount;
-
-    if( pnLineID )
-        *pnLineID = pLineNode->nLineID;
-
-    pLineNode->pVertexList = new D3DXVECTOR2[dwVertexListCount];
-    if( pLineNode->pVertexList == NULL )
+    HRESULT hr;
+    if ( _wcsicmp( ext, L".dds" ) == 0 )
     {
-        delete pLineNode;
-        return E_OUTOFMEMORY;
+        hr = DirectX::CreateDDSTextureFromFileEx( pDevice, pSrcFile, 0,
+                                                  D3D11_USAGE_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0, 0, bSRGB,
+                                                  nullptr, ppOutputRV, nullptr );
     }
-    for( DWORD i = 0; i < dwVertexListCount; i++ )
+    else
     {
-        pLineNode->pVertexList[i] = pVertexList[i] * fScaleRatio;
+        hr = DirectX::CreateWICTextureFromFileEx( pDevice, pContext, pSrcFile, 0,
+                                                  D3D11_USAGE_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0, 0, bSRGB,
+                                                  nullptr, ppOutputRV );
     }
 
-    m_LinesList.Add( pLineNode );
+    if ( FAILED(hr) )
+        return hr;
+
+    DXUTCache_Texture entry;
+    wcscpy_s( entry.wszSource, MAX_PATH, pSrcFile );
+    entry.bSRGB = bSRGB;
+    entry.pSRV11 = *ppOutputRV;
+    entry.pSRV11->AddRef();
+    m_TextureCache.push_back( entry );
 
     return S_OK;
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTLineManager::AddRect( int* pnLineID, RECT rc, D3DCOLOR Color, float fWidth, float fScaleRatio,
-                                   bool bAntiAlias )
+_Use_decl_annotations_
+HRESULT CDXUTResourceCache::CreateTextureFromFile( ID3D11Device* pDevice, ID3D11DeviceContext *pContext, LPCSTR pSrcFile,
+                                                   ID3D11ShaderResourceView** ppOutputRV, bool bSRGB )
 {
-    if( fWidth > 2.0f )
-    {
-        D3DXVECTOR2 vertexList[8];
-
-        vertexList[0].x = ( float )rc.left;
-        vertexList[0].y = ( float )rc.top - ( fWidth / 2.0f );
-
-        vertexList[1].x = ( float )rc.left;
-        vertexList[1].y = ( float )rc.bottom + ( fWidth / 2.0f );
-
-        vertexList[2].x = ( float )rc.left;
-        vertexList[2].y = ( float )rc.bottom - 0.5f;
-
-        vertexList[3].x = ( float )rc.right;
-        vertexList[3].y = ( float )rc.bottom - 0.5f;
-
-        vertexList[4].x = ( float )rc.right;
-        vertexList[4].y = ( float )rc.bottom + ( fWidth / 2.0f );
-
-        vertexList[5].x = ( float )rc.right;
-        vertexList[5].y = ( float )rc.top - ( fWidth / 2.0f );
-
-        vertexList[6].x = ( float )rc.right;
-        vertexList[6].y = ( float )rc.top;
-
-        vertexList[7].x = ( float )rc.left;
-        vertexList[7].y = ( float )rc.top;
-
-        return AddLine( pnLineID, vertexList, 8, Color, fWidth, fScaleRatio, bAntiAlias );
-    }
-    else
-    {
-        D3DXVECTOR2 vertexList[5];
-        vertexList[0].x = ( float )rc.left;
-        vertexList[0].y = ( float )rc.top;
-
-        vertexList[1].x = ( float )rc.left;
-        vertexList[1].y = ( float )rc.bottom;
-
-        vertexList[2].x = ( float )rc.right;
-        vertexList[2].y = ( float )rc.bottom;
-
-        vertexList[3].x = ( float )rc.right;
-        vertexList[3].y = ( float )rc.top;
-
-        vertexList[4].x = ( float )rc.left;
-        vertexList[4].y = ( float )rc.top;
+    WCHAR szSrcFile[MAX_PATH];
+    MultiByteToWideChar( CP_ACP, 0, pSrcFile, -1, szSrcFile, MAX_PATH );
+    szSrcFile[MAX_PATH - 1] = 0;
 
-        return AddLine( pnLineID, vertexList, 5, Color, fWidth, fScaleRatio, bAntiAlias );
-    }
+    return CreateTextureFromFile( pDevice, pContext, szSrcFile, ppOutputRV, bSRGB );
 }
 
 
-
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTLineManager::RemoveLine( int nLineID )
-{
-    for( int i = 0; i < m_LinesList.GetSize(); i++ )
-    {
-        LINE_NODE* pLineNode = m_LinesList.GetAt( i );
-        if( pLineNode && pLineNode->nLineID == nLineID )
-        {
-            SAFE_DELETE_ARRAY( pLineNode->pVertexList );
-            delete pLineNode;
-            m_LinesList.SetAt( i, NULL );
-        }
-    }
-
-    return S_OK;
-}
+// Device event callbacks
+//--------------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTLineManager::RemoveAllLines()
+HRESULT CDXUTResourceCache::OnDestroyDevice()
 {
-    for( int i = 0; i < m_LinesList.GetSize(); i++ )
+    // Release all resources
+    for( size_t j = 0; j < m_TextureCache.size(); ++j )
     {
-        LINE_NODE* pLineNode = m_LinesList.GetAt( i );
-        if( pLineNode )
-        {
-            SAFE_DELETE_ARRAY( pLineNode->pVertexList );
-            delete pLineNode;
-        }
+        SAFE_RELEASE( m_TextureCache[ j ].pSRV11 );
     }
-    m_LinesList.RemoveAll();
+    m_TextureCache.clear();
+    m_TextureCache.shrink_to_fit();
 
     return S_OK;
 }
 
 
-//--------------------------------------------------------------------------------------
-CDXUTTextHelper::CDXUTTextHelper( ID3DXFont* pFont9, ID3DXSprite* pSprite9,  int nLineHeight )
-{
-    Init( pFont9, pSprite9, nLineHeight );
-}
+//======================================================================================
+// CDXUTTextHelper
+//======================================================================================
 
+_Use_decl_annotations_
 CDXUTTextHelper::CDXUTTextHelper( ID3D11Device* pd3d11Device, ID3D11DeviceContext* pd3d11DeviceContext, CDXUTDialogResourceManager* pManager, int nLineHeight )
 {
-    Init( NULL, NULL, nLineHeight );
+    Init( nLineHeight );
     m_pd3d11Device = pd3d11Device;
     m_pd3d11DeviceContext = pd3d11DeviceContext;
     m_pManager = pManager;
 }
+
 CDXUTTextHelper::~CDXUTTextHelper()
 {
 
 }
 
+
 //--------------------------------------------------------------------------------------
-void CDXUTTextHelper::Init( ID3DXFont* pFont9, ID3DXSprite* pSprite9, 
-                            int nLineHeight )
+void CDXUTTextHelper::Init( _In_ int nLineHeight )
 {
-    m_pFont9 = pFont9;
-    m_pSprite9 = pSprite9;
-    m_clr = D3DXCOLOR( 1, 1, 1, 1 );
+    m_clr = XMFLOAT4( 1, 1, 1, 1 );
     m_pt.x = 0;
     m_pt.y = 0;
     m_nLineHeight = nLineHeight;
-    m_pd3d11Device = NULL;
-    m_pd3d11DeviceContext = NULL;
-    m_pManager = NULL; 
+    m_pd3d11Device = nullptr;
+    m_pd3d11DeviceContext = nullptr;
+    m_pManager = nullptr; 
 
     // Create a blend state if a sprite is passed in
 }
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTTextHelper::DrawFormattedTextLine( const WCHAR* strMsg, ... )
+HRESULT CDXUTTextHelper::DrawFormattedTextLine( _In_z_ const WCHAR* strMsg, ... )
 {
     WCHAR strBuffer[512];
 
@@ -1629,19 +949,16 @@ HRESULT CDXUTTextHelper::DrawFormattedTextLine( const WCHAR* strMsg, ... )
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CDXUTTextHelper::DrawTextLine( const WCHAR* strMsg )
+HRESULT CDXUTTextHelper::DrawTextLine( _In_z_ const WCHAR* strMsg )
 {
-    if( NULL == m_pFont9 && NULL == m_pd3d11DeviceContext )
+    if( !m_pd3d11DeviceContext )
         return DXUT_ERR_MSGBOX( L"DrawTextLine", E_INVALIDARG );
 
     HRESULT hr = S_OK;
     RECT rc;
     SetRect( &rc, m_pt.x, m_pt.y, 0, 0 );
-    if( m_pFont9 )
-        hr = m_pFont9->DrawText( m_pSprite9, strMsg, -1, &rc, DT_NOCLIP, m_clr );
-    else if( m_pd3d11DeviceContext )
-        DrawText11DXUT( m_pd3d11Device, m_pd3d11DeviceContext, strMsg, rc, m_clr,
-                        (float)m_pManager->m_nBackBufferWidth, (float)m_pManager->m_nBackBufferHeight, false );
+    DrawText11DXUT( m_pd3d11Device, m_pd3d11DeviceContext, strMsg, rc, m_clr,
+                    (float)m_pManager->m_nBackBufferWidth, (float)m_pManager->m_nBackBufferHeight, false );
 
     if( FAILED( hr ) )
         return DXTRACE_ERR_MSGBOX( L"DrawText", hr );
@@ -1652,7 +969,9 @@ HRESULT CDXUTTextHelper::DrawTextLine( const WCHAR* strMsg )
 }
 
 
-HRESULT CDXUTTextHelper::DrawFormattedTextLine( RECT& rc, DWORD dwFlags, const WCHAR* strMsg, ... )
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+HRESULT CDXUTTextHelper::DrawFormattedTextLine( const RECT& rc, const WCHAR* strMsg, ... )
 {
     WCHAR strBuffer[512];
 
@@ -1662,21 +981,20 @@ HRESULT CDXUTTextHelper::DrawFormattedTextLine( RECT& rc, DWORD dwFlags, const W
     strBuffer[511] = L'\0';
     va_end( args );
 
-    return DrawTextLine( rc, dwFlags, strBuffer );
+    return DrawTextLine( rc, strBuffer );
 }
 
 
-HRESULT CDXUTTextHelper::DrawTextLine( RECT& rc, DWORD dwFlags, const WCHAR* strMsg )
+//--------------------------------------------------------------------------------------
+_Use_decl_annotations_
+HRESULT CDXUTTextHelper::DrawTextLine( const RECT& rc, const WCHAR* strMsg )
 {
-    if( NULL == m_pFont9 && NULL == m_pd3d11DeviceContext )
+    if( !m_pd3d11DeviceContext )
         return DXUT_ERR_MSGBOX( L"DrawTextLine", E_INVALIDARG );
 
     HRESULT hr = S_OK;
-    if( m_pFont9 )
-        hr = m_pFont9->DrawText( m_pSprite9, strMsg, -1, &rc, dwFlags, m_clr );
-    else if( m_pd3d11DeviceContext )
-        DrawText11DXUT( m_pd3d11Device, m_pd3d11DeviceContext, strMsg, rc, m_clr,
-                        (float)m_pManager->m_nBackBufferWidth, (float)m_pManager->m_nBackBufferHeight, false );
+    DrawText11DXUT( m_pd3d11Device, m_pd3d11DeviceContext, strMsg, rc, m_clr,
+                    (float)m_pManager->m_nBackBufferWidth, (float)m_pManager->m_nBackBufferHeight, false );
 
     if( FAILED( hr ) )
         return DXTRACE_ERR_MSGBOX( L"DrawText", hr );
@@ -1690,9 +1008,6 @@ HRESULT CDXUTTextHelper::DrawTextLine( RECT& rc, DWORD dwFlags, const WCHAR* str
 //--------------------------------------------------------------------------------------
 void CDXUTTextHelper::Begin()
 {
-    if( m_pSprite9 )
-        m_pSprite9->Begin( D3DXSPRITE_ALPHABLEND | D3DXSPRITE_SORT_TEXTURE );
-
     if( m_pd3d11DeviceContext )
     {
         m_pManager->StoreD3D11State( m_pd3d11DeviceContext );
@@ -1701,11 +1016,11 @@ void CDXUTTextHelper::Begin()
 
 
 }
+
+
+//--------------------------------------------------------------------------------------
 void CDXUTTextHelper::End()
 {
-    if( m_pSprite9 )
-        m_pSprite9->End();
-
     if( m_pd3d11DeviceContext )
     {
         m_pManager->RestoreD3D11State( m_pd3d11DeviceContext );
diff --git a/samples/DX_APIUsage/DXUT/Optional/SDKmisc.h b/samples/DX_APIUsage/DXUT/Optional/SDKmisc.h
index b625b87..a5f8a52 100644
--- a/samples/DX_APIUsage/DXUT/Optional/SDKmisc.h
+++ b/samples/DX_APIUsage/DXUT/Optional/SDKmisc.h
@@ -3,159 +3,42 @@
 //
 // Various helper functionality that is shared between SDK samples
 //
-// Copyright (c) Microsoft Corporation. All rights reserved
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=320437
 //--------------------------------------------------------------------------------------
 #pragma once
-#ifndef SDKMISC_H
-#define SDKMISC_H
-
 
 //-----------------------------------------------------------------------------
 // Resource cache for textures, fonts, meshs, and effects.  
 // Use DXUTGetGlobalResourceCache() to access the global cache
 //-----------------------------------------------------------------------------
 
-enum DXUTCACHE_SOURCELOCATION
-{
-    DXUTCACHE_LOCATION_FILE,
-    DXUTCACHE_LOCATION_RESOURCE
-};
-
 struct DXUTCache_Texture
 {
-    DXUTCACHE_SOURCELOCATION Location;
     WCHAR   wszSource[MAX_PATH];
-    HMODULE hSrcModule;
-    UINT Width;
-    UINT Height;
-    UINT Depth;
-    UINT MipLevels;
-    UINT MiscFlags;
-    union
-    {
-        DWORD Usage9;
-        D3D11_USAGE Usage11;
-    };
-    union
-    {
-        D3DFORMAT Format9;
-        DXGI_FORMAT Format;
-    };
-    union
-    {
-        D3DPOOL Pool9;
-        UINT CpuAccessFlags;
-    };
-    union
-    {
-        D3DRESOURCETYPE Type9;
-        UINT BindFlags;
-    };
-    IDirect3DBaseTexture9* pTexture9;
+    bool    bSRGB;
     ID3D11ShaderResourceView* pSRV11;
 
-            DXUTCache_Texture()
-            {
-                pTexture9 = NULL;
-                pSRV11 = NULL;
-            }
-};
-
-struct DXUTCache_Font : public D3DXFONT_DESC
-{
-    ID3DXFont* pFont;
-};
-
-struct DXUTCache_Effect
-{
-    DXUTCACHE_SOURCELOCATION Location;
-    WCHAR wszSource[MAX_PATH];
-    HMODULE hSrcModule;
-    DWORD dwFlags;
-    ID3DXEffect* pEffect;
+    DXUTCache_Texture() :
+        pSRV11(nullptr)
+    {
+    }
 };
 
 
 class CDXUTResourceCache
 {
 public:
-                            ~CDXUTResourceCache();
-
-    HRESULT                 CreateTextureFromFile( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile,
-                                                   LPDIRECT3DTEXTURE9* ppTexture );
-    HRESULT                 CreateTextureFromFile( LPDIRECT3DDEVICE9 pDevice, LPCSTR pSrcFile,
-                                                   LPDIRECT3DTEXTURE9* ppTexture );
-    HRESULT                 CreateTextureFromFile( ID3D11Device* pDevice, ID3D11DeviceContext *pContext, LPCTSTR pSrcFile,
-                                                   ID3D11ShaderResourceView** ppOutputRV, bool bSRGB=false );
-    HRESULT                 CreateTextureFromFile( ID3D11Device* pDevice, ID3D11DeviceContext *pContext, LPCSTR pSrcFile,
-                                                   ID3D11ShaderResourceView** ppOutputRV, bool bSRGB=false );
-    HRESULT                 CreateTextureFromFileEx( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile, UINT Width,
-                                                     UINT Height, UINT MipLevels, DWORD Usage, D3DFORMAT Format,
-                                                     D3DPOOL Pool, DWORD Filter, DWORD MipFilter, D3DCOLOR ColorKey,
-                                                     D3DXIMAGE_INFO* pSrcInfo, PALETTEENTRY* pPalette,
-                                                     LPDIRECT3DTEXTURE9* ppTexture );
-    HRESULT                 CreateTextureFromFileEx( ID3D11Device* pDevice, ID3D11DeviceContext* pContext, LPCTSTR pSrcFile,
-                                                     D3DX11_IMAGE_LOAD_INFO* pLoadInfo, ID3DX11ThreadPump* pPump,
-                                                     ID3D11ShaderResourceView** ppOutputRV, bool bSRGB );
-    HRESULT                 CreateTextureFromResource( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                       LPCTSTR pSrcResource, LPDIRECT3DTEXTURE9* ppTexture );
-    HRESULT                 CreateTextureFromResourceEx( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                         LPCTSTR pSrcResource, UINT Width, UINT Height, UINT MipLevels,
-                                                         DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, DWORD Filter,
-                                                         DWORD MipFilter, D3DCOLOR ColorKey, D3DXIMAGE_INFO* pSrcInfo,
-                                                         PALETTEENTRY* pPalette, LPDIRECT3DTEXTURE9* ppTexture );
-    HRESULT                 CreateCubeTextureFromFile( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile,
-                                                       LPDIRECT3DCUBETEXTURE9* ppCubeTexture );
-    HRESULT                 CreateCubeTextureFromFileEx( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile, UINT Size,
-                                                         UINT MipLevels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool,
-                                                         DWORD Filter, DWORD MipFilter, D3DCOLOR ColorKey,
-                                                         D3DXIMAGE_INFO* pSrcInfo, PALETTEENTRY* pPalette,
-                                                         LPDIRECT3DCUBETEXTURE9* ppCubeTexture );
-    HRESULT                 CreateCubeTextureFromResource( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                           LPCTSTR pSrcResource,
-                                                           LPDIRECT3DCUBETEXTURE9* ppCubeTexture );
-    HRESULT                 CreateCubeTextureFromResourceEx( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                             LPCTSTR pSrcResource, UINT Size, UINT MipLevels,
-                                                             DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, DWORD Filter,
-                                                             DWORD MipFilter, D3DCOLOR ColorKey,
-                                                             D3DXIMAGE_INFO* pSrcInfo, PALETTEENTRY* pPalette,
-                                                             LPDIRECT3DCUBETEXTURE9* ppCubeTexture );
-    HRESULT                 CreateVolumeTextureFromFile( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile,
-                                                         LPDIRECT3DVOLUMETEXTURE9* ppVolumeTexture );
-    HRESULT                 CreateVolumeTextureFromFileEx( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile, UINT Width,
-                                                           UINT Height, UINT Depth, UINT MipLevels, DWORD Usage,
-                                                           D3DFORMAT Format, D3DPOOL Pool, DWORD Filter,
-                                                           DWORD MipFilter, D3DCOLOR ColorKey,
-                                                           D3DXIMAGE_INFO* pSrcInfo, PALETTEENTRY* pPalette,
-                                                           LPDIRECT3DVOLUMETEXTURE9* ppTexture );
-    HRESULT                 CreateVolumeTextureFromResource( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                             LPCTSTR pSrcResource,
-                                                             LPDIRECT3DVOLUMETEXTURE9* ppVolumeTexture );
-    HRESULT                 CreateVolumeTextureFromResourceEx( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                               LPCTSTR pSrcResource, UINT Width, UINT Height,
-                                                               UINT Depth, UINT MipLevels, DWORD Usage,
-                                                               D3DFORMAT Format, D3DPOOL Pool, DWORD Filter,
-                                                               DWORD MipFilter, D3DCOLOR ColorKey,
-                                                               D3DXIMAGE_INFO* pSrcInfo, PALETTEENTRY* pPalette,
-                                                               LPDIRECT3DVOLUMETEXTURE9* ppVolumeTexture );
-    HRESULT                 CreateFont( LPDIRECT3DDEVICE9 pDevice, UINT Height, UINT Width, UINT Weight,
-                                        UINT MipLevels, BOOL Italic, DWORD CharSet, DWORD OutputPrecision,
-                                        DWORD Quality, DWORD PitchAndFamily, LPCTSTR pFacename, LPD3DXFONT* ppFont );
-    HRESULT CreateFontIndirect( LPDIRECT3DDEVICE9 pDevice, CONST D3DXFONT_DESC *pDesc, LPD3DXFONT *ppFont );
-    HRESULT                 CreateEffectFromFile( LPDIRECT3DDEVICE9 pDevice, LPCTSTR pSrcFile,
-                                                  const D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude, DWORD Flags,
-                                                  LPD3DXEFFECTPOOL pPool, LPD3DXEFFECT* ppEffect,
-                                                  LPD3DXBUFFER* ppCompilationErrors );
-    HRESULT                 CreateEffectFromResource( LPDIRECT3DDEVICE9 pDevice, HMODULE hSrcModule,
-                                                      LPCTSTR pSrcResource, const D3DXMACRO* pDefines,
-                                                      LPD3DXINCLUDE pInclude, DWORD Flags, LPD3DXEFFECTPOOL pPool,
-                                                      LPD3DXEFFECT* ppEffect, LPD3DXBUFFER* ppCompilationErrors );
+    ~CDXUTResourceCache();
 
+    HRESULT CreateTextureFromFile( _In_ ID3D11Device* pDevice, _In_ ID3D11DeviceContext *pContext, _In_z_ LPCWSTR pSrcFile,
+                                   _Outptr_ ID3D11ShaderResourceView** ppOutputRV, _In_ bool bSRGB=false );
+    HRESULT CreateTextureFromFile( _In_ ID3D11Device* pDevice, _In_ ID3D11DeviceContext *pContext, _In_z_ LPCSTR pSrcFile,
+                                   _Outptr_ ID3D11ShaderResourceView** ppOutputRV, _In_ bool bSRGB=false );
 public:
-    HRESULT                 OnCreateDevice( IDirect3DDevice9* pd3dDevice );
-    HRESULT                 OnResetDevice( IDirect3DDevice9* pd3dDevice );
-    HRESULT                 OnLostDevice();
-    HRESULT                 OnDestroyDevice();
+    HRESULT OnDestroyDevice();
 
 protected:
     friend CDXUTResourceCache& WINAPI DXUTGetGlobalResourceCache();
@@ -163,15 +46,11 @@ protected:
     friend HRESULT WINAPI   DXUTReset3DEnvironment();
     friend void WINAPI      DXUTCleanup3DEnvironment( bool bReleaseSettings );
 
-                            CDXUTResourceCache()
-                            {
-                            }
+    CDXUTResourceCache() { }
 
-    CGrowableArray <DXUTCache_Texture> m_TextureCache;
-    CGrowableArray <DXUTCache_Effect> m_EffectCache;
-    CGrowableArray <DXUTCache_Font> m_FontCache;
+    std::vector<DXUTCache_Texture> m_TextureCache;
 };
-
+   
 CDXUTResourceCache& WINAPI DXUTGetGlobalResourceCache();
 
 
@@ -182,187 +61,70 @@ class CDXUTDialogResourceManager;
 class CDXUTTextHelper
 {
 public:
-            CDXUTTextHelper( ID3DXFont* pFont9 = NULL, ID3DXSprite* pSprite9 = NULL,
-                             int nLineHeight = 15 );
-			CDXUTTextHelper( ID3D11Device* pd3d11Device, ID3D11DeviceContext* pd3dDeviceContext, CDXUTDialogResourceManager* pManager, int nLineHeight );
-            ~CDXUTTextHelper();
+    CDXUTTextHelper( _In_ ID3D11Device* pd3d11Device, _In_ ID3D11DeviceContext* pd3dDeviceContext, _In_ CDXUTDialogResourceManager* pManager, _In_ int nLineHeight );
+    ~CDXUTTextHelper();
 
-    void    Init( ID3DXFont* pFont9 = NULL, ID3DXSprite* pSprite9 = NULL, 
-                  int nLineHeight = 15 );
+    void Init( _In_ int nLineHeight = 15 );
 
-    void    SetInsertionPos( int x, int y )
-    {
-        m_pt.x = x; m_pt.y = y;
-    }
-    void    SetForegroundColor( D3DXCOLOR clr )
+    void SetInsertionPos( _In_ int x, _In_ int y )
     {
-        m_clr = clr;
+        m_pt.x = x;
+        m_pt.y = y;
     }
+    void SetForegroundColor( _In_ DirectX::XMFLOAT4 clr ) { m_clr = clr; }
+    void SetForegroundColor( _In_ DirectX::FXMVECTOR clr ) { XMStoreFloat4( &m_clr, clr ); }
 
     void    Begin();
-    HRESULT DrawFormattedTextLine( const WCHAR* strMsg, ... );
-    HRESULT DrawTextLine( const WCHAR* strMsg );
-    HRESULT DrawFormattedTextLine( RECT& rc, DWORD dwFlags, const WCHAR* strMsg, ... );
-    HRESULT DrawTextLine( RECT& rc, DWORD dwFlags, const WCHAR* strMsg );
+    HRESULT DrawFormattedTextLine( _In_z_ const WCHAR* strMsg, ... );
+    HRESULT DrawTextLine( _In_z_ const WCHAR* strMsg );
+    HRESULT DrawFormattedTextLine( _In_ const RECT& rc, _In_z_ const WCHAR* strMsg, ... );
+    HRESULT DrawTextLine( _In_ const RECT& rc, _In_z_ const WCHAR* strMsg );
     void    End();
 
 protected:
-    ID3DXFont* m_pFont9;
-    ID3DXSprite* m_pSprite9;
-    D3DXCOLOR m_clr;
+    DirectX::XMFLOAT4 m_clr;
     POINT m_pt;
     int m_nLineHeight;
 
-	// D3D11 font 
-	ID3D11Device* m_pd3d11Device;
-	ID3D11DeviceContext* m_pd3d11DeviceContext;
-	CDXUTDialogResourceManager* m_pManager;
-};
-
-
-//--------------------------------------------------------------------------------------
-// Manages a persistent list of lines and draws them using ID3DXLine
-//--------------------------------------------------------------------------------------
-class CDXUTLineManager
-{
-public:
-            CDXUTLineManager();
-            ~CDXUTLineManager();
-
-    HRESULT OnCreatedDevice( IDirect3DDevice9* pd3dDevice );
-    HRESULT OnResetDevice();
-    HRESULT OnRender();
-    HRESULT OnLostDevice();
-    HRESULT OnDeletedDevice();
-
-    HRESULT AddLine( int* pnLineID, D3DXVECTOR2* pVertexList, DWORD dwVertexListCount, D3DCOLOR Color, float fWidth,
-                     float fScaleRatio, bool bAntiAlias );
-    HRESULT AddRect( int* pnLineID, RECT rc, D3DCOLOR Color, float fWidth, float fScaleRatio, bool bAntiAlias );
-    HRESULT RemoveLine( int nLineID );
-    HRESULT RemoveAllLines();
-
-protected:
-    struct LINE_NODE
-    {
-        int nLineID;
-        D3DCOLOR Color;
-        float fWidth;
-        bool bAntiAlias;
-        float fScaleRatio;
-        D3DXVECTOR2* pVertexList;
-        DWORD dwVertexListCount;
-    };
-
-    CGrowableArray <LINE_NODE*> m_LinesList;
-    IDirect3DDevice9* m_pd3dDevice;
-    ID3DXLine* m_pD3DXLine;
+    // D3D11 font 
+    ID3D11Device* m_pd3d11Device;
+    ID3D11DeviceContext* m_pd3d11DeviceContext;
+    CDXUTDialogResourceManager* m_pManager;
 };
 
 
 //--------------------------------------------------------------------------------------
 // Shared code for samples to ask user if they want to use a REF device or quit
 //--------------------------------------------------------------------------------------
-void WINAPI DXUTDisplaySwitchingToREFWarning( DXUTDeviceVersion ver );
+void WINAPI DXUTDisplaySwitchingToREFWarning();
 
 //--------------------------------------------------------------------------------------
 // Tries to finds a media file by searching in common locations
 //--------------------------------------------------------------------------------------
-HRESULT WINAPI DXUTFindDXSDKMediaFileCch( __out_ecount(cchDest) WCHAR* strDestPath,
-                                          __in int cchDest, 
-                                          __in LPCWSTR strFilename );
-HRESULT WINAPI DXUTSetMediaSearchPath( LPCWSTR strPath );
+HRESULT WINAPI DXUTFindDXSDKMediaFileCch( _Out_writes_(cchDest) WCHAR* strDestPath,
+                                          _In_ int cchDest, 
+                                          _In_z_ LPCWSTR strFilename );
+HRESULT WINAPI DXUTSetMediaSearchPath( _In_z_ LPCWSTR strPath );
 LPCWSTR WINAPI DXUTGetMediaSearchPath();
 
 
 //--------------------------------------------------------------------------------------
-// Returns a view matrix for rendering to a face of a cubemap.
+// Compiles HLSL shaders
 //--------------------------------------------------------------------------------------
-D3DXMATRIX WINAPI DXUTGetCubeMapViewMatrix( DWORD dwFace );
-
+HRESULT WINAPI DXUTCompileFromFile( _In_z_ LPCWSTR pFileName,
+                                    _In_reads_opt_(_Inexpressible_(pDefines->Name != NULL)) const D3D_SHADER_MACRO* pDefines,
+                                    _In_z_ LPCSTR pEntrypoint, _In_z_ LPCSTR pTarget,
+                                    _In_ UINT Flags1, _In_ UINT Flags2,
+                                    _Outptr_ ID3DBlob** ppCode );
 
 //--------------------------------------------------------------------------------------
-// Simple helper stack class
+// Texture utilities
 //--------------------------------------------------------------------------------------
-template <class T> class CDXUTStack
-{
-private:
-    UINT m_MemorySize;
-    UINT m_NumElements;
-    T* m_pData;
-
-    bool    EnsureStackSize( UINT64 iElements )
-    {
-        if( m_MemorySize > iElements )
-            return true;
-
-        T* pTemp = new T[ ( size_t )( iElements * 2 + 256 ) ];
-        if( !pTemp )
-            return false;
-
-        if( m_NumElements )
-        {
-            CopyMemory( pTemp, m_pData, ( size_t )( m_NumElements * sizeof( T ) ) );
-        }
-
-        if( m_pData ) delete []m_pData;
-        m_pData = pTemp;
-        return true;
-    }
-
-public:
-            CDXUTStack()
-            {
-                m_pData = NULL; m_NumElements = 0; m_MemorySize = 0;
-            }
-            ~CDXUTStack()
-            {
-                if( m_pData ) delete []m_pData;
-            }
-
-    UINT    GetCount()
-    {
-        return m_NumElements;
-    }
-    T       GetAt( UINT i )
-    {
-        return m_pData[i];
-    }
-    T       GetTop()
-    {
-        if( m_NumElements < 1 )
-            return NULL;
-
-        return m_pData[ m_NumElements - 1 ];
-    }
+HRESULT WINAPI DXUTCreateShaderResourceViewFromFile( _In_ ID3D11Device* d3dDevice, _In_z_ const wchar_t* szFileName, _Outptr_ ID3D11ShaderResourceView** textureView );
+HRESULT WINAPI DXUTCreateTextureFromFile( _In_ ID3D11Device* d3dDevice, _In_z_ const wchar_t* szFileName, _Outptr_ ID3D11Resource** texture );
+HRESULT WINAPI DXUTSaveTextureToFile( _In_ ID3D11DeviceContext* pContext, _In_ ID3D11Resource* pSource, _In_ bool usedds, _In_z_ const wchar_t* szFileName );
 
-    T       GetRelative( INT i )
-    {
-        INT64 iVal = m_NumElements - 1 + i;
-        if( iVal < 0 )
-            return NULL;
-        return m_pData[ iVal ];
-    }
-
-    bool    Push( T pElem )
-    {
-        if( !EnsureStackSize( m_NumElements + 1 ) )
-            return false;
-
-        m_pData[m_NumElements] = pElem;
-        m_NumElements++;
-
-        return true;
-    }
-
-    T       Pop()
-    {
-        if( m_NumElements < 1 )
-            return NULL;
-
-        m_NumElements --;
-        return m_pData[m_NumElements];
-    }
-};
-
-
-#endif
+//--------------------------------------------------------------------------------------
+// Returns a view matrix for rendering to a face of a cubemap.
+//--------------------------------------------------------------------------------------
+DirectX::XMMATRIX WINAPI DXUTGetCubeMapViewMatrix( _In_ DWORD dwFace );
diff --git a/samples/DX_APIUsage/DX_APIUsage.vcxproj b/samples/DX_APIUsage/DX_APIUsage.vcxproj
index c14a4de..ed9b77c 100644
--- a/samples/DX_APIUsage/DX_APIUsage.vcxproj
+++ b/samples/DX_APIUsage/DX_APIUsage.vcxproj
@@ -35,10 +35,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="DXUT\Core\DDSTextureLoader.cpp" />
     <ClCompile Include="DXUT\Core\DXUT.cpp" />
     <ClCompile Include="DXUT\Core\DXUTDevice11.cpp" />
-    <ClCompile Include="DXUT\Core\DXUTDevice9.cpp" />
     <ClCompile Include="DXUT\Core\DXUTmisc.cpp" />
+    <ClCompile Include="DXUT\Core\ScreenGrab.cpp" />
+    <ClCompile Include="DXUT\Core\WICTextureLoader.cpp" />
     <ClCompile Include="DXUT\Optional\DXUTcamera.cpp" />
     <ClCompile Include="DXUT\Optional\DXUTgui.cpp" />
     <ClCompile Include="DXUT\Optional\DXUTguiIME.cpp" />
@@ -71,12 +73,16 @@
     </ClCompile>
     <ClCompile Include="jsoncpp\jsoncpp.cpp" />
     <ClCompile Include="Main.cpp" />
+    <ClCompile Include="Splash.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="DXUT\Core\DDSTextureLoader.h" />
     <ClInclude Include="DXUT\Core\DXUT.h" />
     <ClInclude Include="DXUT\Core\DXUTDevice11.h" />
     <ClInclude Include="DXUT\Core\DXUTDevice9.h" />
     <ClInclude Include="DXUT\Core\DXUTmisc.h" />
+    <ClInclude Include="DXUT\Core\ScreenGrab.h" />
+    <ClInclude Include="DXUT\Core\WICTextureLoader.h" />
     <ClInclude Include="DXUT\Optional\DXUTcamera.h" />
     <ClInclude Include="DXUT\Optional\DXUTgui.h" />
     <ClInclude Include="DXUT\Optional\DXUTguiIME.h" />
@@ -154,6 +160,9 @@
     <Image Include="Media\UI\dxutcontrols.dds" />
     <Image Include="Media\UI\Font.dds" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Splash.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{F8E9C3B1-0CBE-495D-8C51-5A936537A15C}</ProjectGuid>
@@ -273,13 +282,13 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>UNICODE=1;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;4838;4302;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>d3dcompiler.lib;d3dx11.lib;d3dx9.lib;DxErr.lib;dxguid.lib;DSound.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;GfeSDK.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win32;$(DXSDK_DIR)\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>d3dcompiler.lib;d3d11.lib;DSound.lib;Usp10.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;psapi.lib;GfeSDK.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -289,13 +298,13 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>UNICODE=1;WIN32;_WINDOWS;GFESDKDEMO_BUILD_C;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;4838;4302;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>d3dcompiler.lib;d3dx11.lib;d3dx9.lib;DxErr.lib;dxguid.lib;DSound.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;GfeSDK.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win32;$(DXSDK_DIR)\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>d3dcompiler.lib;d3d11.lib;DSound.lib;Usp10.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;psapi.lib;GfeSDK.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -305,13 +314,13 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>UNICODE=1;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;4838;4302;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win64;$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>d3dcompiler.lib;d3dx11.lib;d3dx9.lib;DxErr.lib;dxguid.lib;DSound.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;GfeSDK.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>d3dcompiler.lib;d3d11.lib;DSound.lib;Usp10.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;psapi.lib;GfeSDK.lib</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -321,13 +330,13 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>UNICODE=1;WIN32;_WINDOWS;GFESDKDEMO_BUILD_C;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;4838;4302;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win64;$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>d3dcompiler.lib;d3dx11.lib;d3dx9.lib;DxErr.lib;dxguid.lib;DSound.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;GfeSDK.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>d3dcompiler.lib;d3d11.lib;DSound.lib;Usp10.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;psapi.lib;GfeSDK.lib</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -339,15 +348,15 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>UNICODE=1;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;4838;4302;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>d3dcompiler.lib;d3dx11.lib;d3dx9.lib;DxErr.lib;dxguid.lib;DSound.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;GfeSDK.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win32;$(DXSDK_DIR)\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>d3dcompiler.lib;d3d11.lib;DSound.lib;Usp10.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;psapi.lib;GfeSDK.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -359,15 +368,15 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>UNICODE=1;WIN32;_WINDOWS;GFESDKDEMO_BUILD_C;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;4838;4302;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>d3dcompiler.lib;d3dx11.lib;d3dx9.lib;DxErr.lib;dxguid.lib;DSound.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;GfeSDK.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win32;$(DXSDK_DIR)\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>d3dcompiler.lib;d3d11.lib;DSound.lib;Usp10.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;psapi.lib;GfeSDK.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -379,15 +388,15 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>UNICODE=1;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;4838;4302;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win64;$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>d3dcompiler.lib;d3dx11.lib;d3dx9.lib;DxErr.lib;dxguid.lib;DSound.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;GfeSDK.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>d3dcompiler.lib;d3d11.lib;DSound.lib;Usp10.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;psapi.lib;GfeSDK.lib</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
@@ -399,19 +408,19 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)DXUT\Core;$(ProjectDir)DXUT\Optional;$(ProjectDir)jsoncpp;$(ProjectDir)..\..\include;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>UNICODE=1;WIN32;_WINDOWS;GFESDKDEMO_BUILD_C;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;4838;4302;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win64;$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>d3dcompiler.lib;d3dx11.lib;d3dx9.lib;DxErr.lib;dxguid.lib;DSound.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;GfeSDK.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\lib\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>d3dcompiler.lib;d3d11.lib;DSound.lib;Usp10.lib;winmm.lib;comctl32.lib;Imm32.lib;version.lib;legacy_stdio_definitions.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Shlwapi.lib;psapi.lib;GfeSDK.lib</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/DX_APIUsage/GfeSDKWrapper.c b/samples/DX_APIUsage/GfeSDKWrapper.c
index 809d64b..8f9fbe3 100644
--- a/samples/DX_APIUsage/GfeSDKWrapper.c
+++ b/samples/DX_APIUsage/GfeSDKWrapper.c
@@ -57,7 +57,7 @@ static void __stdcall handleGenericResponse(NVGSDK_RetCode rc, void* context);
 static void __stdcall handlePermissionRequested(NVGSDK_RetCode rc, void* context);
 static void updateResultString(NVGSDK_RetCode rc);
 
-typedef struct 
+typedef struct
 {
     char const* defaultLocale;
     NVGSDK_Highlight* highlights;
@@ -77,7 +77,7 @@ void __stdcall handlePermissionRequested(NVGSDK_RetCode rc, void* context)
     free(context);
 }
 
-void Init(char const* gameName, char const* defaultLocale, NVGSDK_Highlight* highlights, size_t numHighlights)
+void Init(char const* gameName, char const* defaultLocale, NVGSDK_Highlight* highlights, size_t numHighlights, char const* targetPath, int targetPid)
 {
     memset(g_lastQueryResult, 0, MAX_QUERY_STRING);
     memset(g_lastResult, 0, NVGSDK_MAX_LENGTH);
@@ -97,6 +97,12 @@ void Init(char const* gameName, char const* defaultLocale, NVGSDK_Highlight* hig
     inParams.scopeTableSize = COUNT_OF(scopes);
     inParams.notificationCallback = handleNotification;
 
+    if (targetPath != NULL && targetPid != 0)
+    {
+        inParams.targetPath = targetPath;
+        inParams.targetPid = targetPid;
+    }
+
     NVGSDK_CreateResponse outParams;
     memset(&outParams, 0, sizeof(outParams));
     outParams.scopePermissionTable = &scopePermissions[0];
diff --git a/samples/DX_APIUsage/GfeSDKWrapper.cpp b/samples/DX_APIUsage/GfeSDKWrapper.cpp
index 33a4a63..9990720 100644
--- a/samples/DX_APIUsage/GfeSDKWrapper.cpp
+++ b/samples/DX_APIUsage/GfeSDKWrapper.cpp
@@ -47,7 +47,7 @@ GfeSdkWrapper::GfeSdkWrapper() :
 {
 }
 
-void GfeSdkWrapper::Init(char const* gameName, char const* defaultLocale, GfeSDK::NVGSDK_Highlight* highlights, size_t numHighlights)
+void GfeSdkWrapper::Init(char const* gameName, char const* defaultLocale, GfeSDK::NVGSDK_Highlight* highlights, size_t numHighlights, char const* targetPath, int targetPid)
 {
     using namespace std::placeholders;
 
@@ -62,6 +62,12 @@ void GfeSdkWrapper::Init(char const* gameName, char const* defaultLocale, GfeSDK
     };
     createParams.notificationCallback = std::bind(&GfeSdkWrapper::OnNotification, this, _1, _2);
 
+    if (targetPath != NULL && targetPid != 0)
+    {
+        createParams.targetPath = targetPath;
+        createParams.targetPid = targetPid;
+    }
+
     GfeSDK::CreateResponse response;
     GfeSDK::Core* gfesdkCore = GfeSDK::Core::Create(createParams, response);
     if (GfeSDK::NVGSDK_SUCCEEDED(response.returnCode))
diff --git a/samples/DX_APIUsage/GfeSDKWrapper.h b/samples/DX_APIUsage/GfeSDKWrapper.h
index b6f5dfd..585c5dd 100644
--- a/samples/DX_APIUsage/GfeSDKWrapper.h
+++ b/samples/DX_APIUsage/GfeSDKWrapper.h
@@ -19,7 +19,7 @@ extern "C" {
 
 typedef struct _GfeSdkWrapper
 {
-    void(*Init)(char const* gameName, char const* defaultLocale, NVGSDK_Highlight* highlights, size_t numHighlights);
+    void(*Init)(char const* gameName, char const* defaultLocale, NVGSDK_Highlight* highlights, size_t numHighlights, char const* targetPath, int targetPid);
     void(*DeInit)();
     void(*OnTick)();
     void(*OnOpenGroup)(char const* groupId);
diff --git a/samples/DX_APIUsage/GfeSDKWrapper.hpp b/samples/DX_APIUsage/GfeSDKWrapper.hpp
index c9c50f2..f84a55c 100644
--- a/samples/DX_APIUsage/GfeSDKWrapper.hpp
+++ b/samples/DX_APIUsage/GfeSDKWrapper.hpp
@@ -26,7 +26,7 @@ class GfeSdkWrapper
 public:
     GfeSdkWrapper();
 
-    void Init(char const* gameName, char const* defaultLocale, GfeSDK::NVGSDK_Highlight* highlights, size_t numHighlights);
+    void Init(char const* gameName, char const* defaultLocale, GfeSDK::NVGSDK_Highlight* highlights, size_t numHighlights, char const* targetPath, int targetPid);
     void DeInit();
     void OnTick(void);
     void OnNotification(GfeSDK::NVGSDK_NotificationType type, GfeSDK::NotificationBase const&);
diff --git a/samples/DX_APIUsage/Main.cpp b/samples/DX_APIUsage/Main.cpp
index 803d799..214ac54 100644
--- a/samples/DX_APIUsage/Main.cpp
+++ b/samples/DX_APIUsage/Main.cpp
@@ -1,27 +1,30 @@
 //--------------------------------------------------------------------------------------
-// File: GfeSDKDemo_APIUsage_DX.cpp
+// File: SimpleSample11.cpp
 //
-// This sample shows a simple example of the Microsoft Direct3D's High-Level
-// Shader Language (HLSL) using the Effect interface.
+// Starting point for new Direct3D 11 Win32 desktop samples.  For a more minimal starting
+// point, use the EmptyProject11 sample instead.
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
 //--------------------------------------------------------------------------------------
 #include "DXUT.h"
-#include "DXUTcamera.h"
 #include "DXUTgui.h"
-#include "DXUTsettingsDlg.h"
+#include "DXUTmisc.h"
+#include "DXUTCamera.h"
+#include "DXUTSettingsDlg.h"
 #include "SDKmisc.h"
-#include "SDKMesh.h"
+#include "SDKmesh.h"
 #include "resource.h"
-#include <vector>
-#include <future>
 #include <fstream>
 #include <codecvt>
 #include <locale>
 #include <array>
 
+#pragma warning( disable : 4100 )
+
 #include <json/json.h>
 #include <Shlwapi.h>
+#include <tlhelp32.h>
+#include <Psapi.h>
 
 #ifdef GFESDKDEMO_BUILD_C
 #include "GfeSDKWrapper.h"
@@ -32,6 +35,10 @@ using namespace GfeSDK;
 
 #include <gfesdk/bindings/cpp/highlights/highlights_types_cpp.h>
 
+#include "Splash.h"
+
+using namespace DirectX;
+
 void TRACE(const char* format, ...)
 {
     char buffer[512];
@@ -44,62 +51,53 @@ void TRACE(const char* format, ...)
     OutputDebugStringA(buffer);
 }
 
-enum class AppState
-{
-    Init,
-    LoadResources,
-    Main
-};
-
 //--------------------------------------------------------------------------------------
 // Global variables
 //--------------------------------------------------------------------------------------
-CDXUTDialogResourceManager  g_DialogResourceManager; // manager for shared resources of dialogs
 CModelViewerCamera          g_Camera;               // A model viewing camera
-CDXUTDirectionWidget        g_LightControl;
-CD3DSettingsDlg             g_D3DSettingsDlg;       // Device settings dialog
-CDXUTDialog                 g_HUD;                  // manages the 3D
+CDXUTDialogResourceManager  g_DialogResourceManager; // manager for shared resources of dialogs
+CDXUTTextHelper*            g_pTxtHelper = nullptr;
+CDXUTDialog                 g_HUD;                  // dialog for standard controls
 CDXUTDialog                 g_SampleUI;             // dialog for sample specific controls
-D3DXMATRIXA16               g_mCenterMesh;
-float                       g_fLightScale;
-int                         g_nNumActiveLights;
-int                         g_nActiveLight;
-bool                        g_bShowHelp = false;    // If true, it renders the UI control text
-
-// Direct3D9 resources
-CDXUTTextHelper*            g_pTxtHelper = NULL;
+XMMATRIX                    g_mCenterMesh;
 
 CDXUTSDKMesh                g_Mesh11;
 
-ID3D11InputLayout*          g_pVertexLayout11 = NULL;
-ID3D11Buffer*               g_pVertexBuffer = NULL;
-ID3D11Buffer*               g_pIndexBuffer = NULL;
-ID3D11VertexShader*         g_pVertexShader = NULL;
-ID3D11PixelShader*          g_pPixelShader = NULL;
-ID3D11SamplerState*         g_pSamLinear = NULL;
+                                                    // Direct3D 11 resources
+ID3D11VertexShader*         g_pVertexShader11 = nullptr;
+ID3D11PixelShader*          g_pPixelShader11 = nullptr;
+ID3D11InputLayout*          g_pLayout11 = nullptr;
+ID3D11SamplerState*         g_pSamLinear = nullptr;
 
+//--------------------------------------------------------------------------------------
+// Constant buffers
+//--------------------------------------------------------------------------------------
+#pragma pack(push,1)
 struct CB_VS_PER_OBJECT
 {
-    D3DXMATRIX m_WorldViewProj;
-    D3DXMATRIX m_World;
+    XMFLOAT4X4  m_mWorldViewProjection;
+    XMFLOAT4X4  m_mWorld;
+    XMFLOAT4    m_MaterialAmbientColor;
+    XMFLOAT4    m_MaterialDiffuseColor;
 };
-UINT                        g_iCBVSPerObjectBind = 0;
 
-struct CB_PS_PER_OBJECT
+struct CB_VS_PER_FRAME
 {
-    D3DXVECTOR4 m_vObjectColor;
+    XMFLOAT3    m_vLightDir;
+    float       m_fTime;
+    XMFLOAT4    m_LightDiffuse;
 };
-UINT                        g_iCBPSPerObjectBind = 0;
+#pragma pack(pop)
 
-struct CB_PS_PER_FRAME
+ID3D11Buffer*                       g_pcbVSPerObject11 = nullptr;
+ID3D11Buffer*                       g_pcbVSPerFrame11 = nullptr;
+
+enum class AppState
 {
-    D3DXVECTOR4 m_vLightDirAmbient;
+    Init,
+    LoadResources,
+    Main
 };
-UINT                        g_iCBPSPerFrameBind = 1;
-
-ID3D11Buffer*               g_pcbVSPerObject = NULL;
-ID3D11Buffer*               g_pcbPSPerObject = NULL;
-ID3D11Buffer*               g_pcbPSPerFrame = NULL;
 
 // Highlights
 struct HighlightsDataHolder
@@ -121,6 +119,8 @@ struct HighlightsData
 };
 
 GfeSdkWrapper g_highlights;
+std::string g_targetPath;
+int g_targetPid = 0;
 NVGSDK_HighlightSignificance g_sigFilter = NVGSDK_HIGHLIGHT_SIGNIFICANCE_NONE;
 NVGSDK_HighlightType g_tagFilter = NVGSDK_HIGHLIGHT_TYPE_NONE;
 std::wstring_convert<std::codecvt_utf8<wchar_t>> g_converter;
@@ -133,182 +133,270 @@ class SettingsManager
 {
 public:
 
-  enum class BackgroundColor
-  {
-    Default,
-    Red,
-    Blue,
-  };
-
-  SettingsManager(const std::wstring& configPath)
-    : m_color(BackgroundColor::Default),
-    m_configPath(configPath)
-  {
-    LoadConfig();
-  }
-
-  std::array<float, 4> GetBackgroundColorArray() const
-  {
-    switch(m_color)
+    enum class BackgroundColor
     {
-    case BackgroundColor::Red:
-      return { 0.25f, 0.10f, 0.10f, 0.55f };
-    case BackgroundColor::Blue:
-      return { 0.10f, 0.10f, 0.25f, 0.55f };
-    case BackgroundColor::Default:
-    default:
-      return { 0.0f, 0.25f, 0.25f, 0.55f };
+        Default,
+        Red,
+        Blue,
+    };
+
+    SettingsManager(const std::wstring& configPath)
+        : m_color(BackgroundColor::Default),
+        m_configPath(configPath)
+    {
+        LoadConfig();
     }
-  }
 
-  std::string GetBackgroundColorString() const
-  {
-    switch(m_color)
+    std::array<float, 4> GetBackgroundColorArray() const
     {
-    case BackgroundColor::Red:
-      return "Red";
-    case BackgroundColor::Blue:
-      return "Blue";
-    case BackgroundColor::Default:
-    default:
-      return "Default";
+        switch (m_color)
+        {
+        case BackgroundColor::Red:
+            return { 0.25f, 0.10f, 0.10f, 0.55f };
+        case BackgroundColor::Blue:
+            return { 0.10f, 0.10f, 0.25f, 0.55f };
+        case BackgroundColor::Default:
+        default:
+            return { 0.0f, 0.25f, 0.25f, 0.55f };
+        }
     }
-  }
 
-  void ToggleBackgroundColor()
-  {
-    switch(m_color)
+    std::string GetBackgroundColorString() const
     {
-    case BackgroundColor::Default:
-      m_color = BackgroundColor::Red;
-      break;
-    case BackgroundColor::Red:
-      m_color = BackgroundColor::Blue;
-      break;
-    case BackgroundColor::Blue:
-      m_color = BackgroundColor::Default;
-      break;
-    default:
-      m_color = BackgroundColor::Default;
+        switch (m_color)
+        {
+        case BackgroundColor::Red:
+            return "Red";
+        case BackgroundColor::Blue:
+            return "Blue";
+        case BackgroundColor::Default:
+        default:
+            return "Default";
+        }
     }
 
-    SaveConfig();
-  }
+    void ToggleBackgroundColor()
+    {
+        switch (m_color)
+        {
+        case BackgroundColor::Default:
+            m_color = BackgroundColor::Red;
+            break;
+        case BackgroundColor::Red:
+            m_color = BackgroundColor::Blue;
+            break;
+        case BackgroundColor::Blue:
+            m_color = BackgroundColor::Default;
+            break;
+        default:
+            m_color = BackgroundColor::Default;
+        }
 
-  void SaveConfig()
-  {
-    Json::Value root;
-    root["Background"] = GetBackgroundColorString();
+        SaveConfig();
+    }
 
-    std::ofstream f(m_configPath);
-    if(!f.good())
+    void SaveConfig()
     {
-      TRACE("Cannot open config file for saving!");
-      return;
-    }
+        Json::Value root;
+        root["Background"] = GetBackgroundColorString();
 
-    f << root;
-  }
+        std::ofstream f(m_configPath);
+        if (!f.good())
+        {
+            TRACE("Cannot open config file for saving!");
+            return;
+        }
 
-  void LoadConfig()
-  {
-    std::ifstream f(m_configPath);
-    if(!f.good())
-    {
-      return;
+        f << root;
     }
 
-    Json::Value root;
-
-    std::string errs;
-    Json::CharReaderBuilder builder;
-    if(!Json::parseFromStream(builder, f, &root, &errs))
+    void LoadConfig()
     {
-      TRACE("FAILED to read json file\n");
-      return;
-    }
+        std::ifstream f(m_configPath);
+        if (!f.good())
+        {
+            return;
+        }
+
+        Json::Value root;
 
-    m_color = BackgroundColorFromString(root["Background"].asString());
-  }
+        std::string errs;
+        Json::CharReaderBuilder builder;
+        if (!Json::parseFromStream(builder, f, &root, &errs))
+        {
+            TRACE("FAILED to read json file\n");
+            return;
+        }
+
+        m_color = BackgroundColorFromString(root["Background"].asString());
+    }
 
 private:
 
-  static BackgroundColor BackgroundColorFromString(const std::string& c)
-  {
-    if(c == "Red") return BackgroundColor::Red;
-    if(c == "Blue") return BackgroundColor::Blue;
-    if(c == "Default") return BackgroundColor::Default;
+    static BackgroundColor BackgroundColorFromString(const std::string& c)
+    {
+        if (c == "Red") return BackgroundColor::Red;
+        if (c == "Blue") return BackgroundColor::Blue;
+        if (c == "Default") return BackgroundColor::Default;
 
-    return BackgroundColor::Default;
-  }
+        return BackgroundColor::Default;
+    }
 
-  const std::wstring m_configPath;
-  BackgroundColor m_color;
+    const std::wstring m_configPath;
+    BackgroundColor m_color;
 };
 
 std::unique_ptr<SettingsManager> g_settingsManager;
 
-
 AppState g_state = AppState::Init;
 
 //--------------------------------------------------------------------------------------
 // Forward declarations
 //--------------------------------------------------------------------------------------
-bool CALLBACK ModifyDeviceSettings( DXUTDeviceSettings* pDeviceSettings, void* pUserContext );
-void CALLBACK OnFrameMove( double fTime, float fElapsedTime, void* pUserContext );
-LRESULT CALLBACK MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, bool* pbNoFurtherProcessing,
-                          void* pUserContext );
-void CALLBACK OnKeyboard( UINT nChar, bool bKeyDown, bool bAltDown, void* pUserContext );
-void CALLBACK OnGUIEvent( UINT nEvent, int nControlID, CDXUTControl* pControl, void* pUserContext );
-
-bool CALLBACK IsD3D11DeviceAcceptable(const CD3D11EnumAdapterInfo *AdapterInfo, UINT Output, const CD3D11EnumDeviceInfo *DeviceInfo,
-                                       DXGI_FORMAT BackBufferFormat, bool bWindowed, void* pUserContext );
-HRESULT CALLBACK OnD3D11CreateDevice( ID3D11Device* pd3dDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc,
-                                      void* pUserContext );
-HRESULT CALLBACK OnD3D11ResizedSwapChain( ID3D11Device* pd3dDevice, IDXGISwapChain* pSwapChain,
-                                          const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc, void* pUserContext );
-void CALLBACK OnD3D11ReleasingSwapChain( void* pUserContext );
-void CALLBACK OnD3D11DestroyDevice( void* pUserContext );
-void CALLBACK OnD3D11FrameRender( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext, double fTime,
-                                  float fElapsedTime, void* pUserContext );
+LRESULT CALLBACK MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, bool* pbNoFurtherProcessing,
+    void* pUserContext);
+void CALLBACK OnKeyboard(UINT nChar, bool bKeyDown, bool bAltDown, void* pUserContext);
+void CALLBACK OnGUIEvent(UINT nEvent, int nControlID, CDXUTControl* pControl, void* pUserContext);
+void CALLBACK OnFrameMove(double fTime, float fElapsedTime, void* pUserContext);
+bool CALLBACK ModifyDeviceSettings(DXUTDeviceSettings* pDeviceSettings, void* pUserContext);
+
+bool CALLBACK IsD3D11DeviceAcceptable(const CD3D11EnumAdapterInfo *AdapterInfo, UINT Output,
+    const CD3D11EnumDeviceInfo *DeviceInfo,
+    DXGI_FORMAT BackBufferFormat, bool bWindowed, void* pUserContext);
+HRESULT CALLBACK OnD3D11CreateDevice(ID3D11Device* pd3dDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc,
+    void* pUserContext);
+HRESULT CALLBACK OnD3D11ResizedSwapChain(ID3D11Device* pd3dDevice, IDXGISwapChain* pSwapChain,
+    const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc, void* pUserContext);
+void CALLBACK OnD3D11ReleasingSwapChain(void* pUserContext);
+void CALLBACK OnD3D11DestroyDevice(void* pUserContext);
+void CALLBACK OnD3D11FrameRender(ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext, double fTime,
+    float fElapsedTime, void* pUserContext);
+void CALLBACK OnQuit(void* pUserContext);
 
 void InitApp();
 void RenderText();
 void RenderLoadingText();
+static std::string WideToUtf8(std::wstring const& wideStr);
 
 //--------------------------------------------------------------------------------------
 // Entry point to the program. Initializes everything and goes into a message processing
 // loop. Idle time is used to render the scene.
 //--------------------------------------------------------------------------------------
-//int main(void)
-int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow )
+int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR lpCmdLine, _In_ int nCmdShow)
 {
+    std::wstring exeName;
+    bool link = false;
+
+    LPWSTR *szArgList;
+    int argCount;
+
+    szArgList = CommandLineToArgvW(GetCommandLine(), &argCount);
+    if (!szArgList)
+    {
+        TRACE("FAILED to read command line\n");
+        return -1;
+    }
+
+    exeName = PathFindFileName(szArgList[0]);
+    for (int i = 0; i < argCount; i++)
+    {
+        if (std::wstring(szArgList[i]) == L"-link" || std::wstring(szArgList[i]) == L"/link")
+        {
+            link = true;
+        }
+    }
+
+    LocalFree(szArgList);
+
+    if (link)
+    {
+        // Try to find another instance of the app already running, to link to it.
+        DWORD myPid = GetCurrentProcessId();
+        PROCESSENTRY32 entry;
+        entry.dwSize = sizeof(PROCESSENTRY32);
+
+        HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, NULL);
+
+        if (Process32FirstW(snapshot, &entry) == TRUE)
+        {
+            while (Process32NextW(snapshot, &entry) == TRUE)
+            {
+                if (exeName == entry.szExeFile && entry.th32ProcessID != myPid)
+                {
+                    // Found the target to link to
+                    HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, entry.th32ProcessID);
+                    if (hProcess == NULL)
+                    {
+                        TRACE("Could not open target process");
+                        continue;
+                    }
+
+                    wchar_t szTargetFileName[MAX_PATH];
+                    if (GetModuleFileNameExW(hProcess, NULL, szTargetFileName, MAX_PATH) > 0)
+                    {
+                        TRACE("Found process to link to!");
+                        g_targetPath = WideToUtf8(szTargetFileName);
+                        g_targetPid = entry.th32ProcessID;
+                    }
+                    else
+                    {
+                        TRACE("Unable to get target path from process handle");
+                    }
+
+                    CloseHandle(hProcess);
+                }
+            }
+        }
+
+        CloseHandle(snapshot);
+
+        if (g_targetPath.empty() || g_targetPid == 0)
+        {
+            MessageBox(NULL, L"-link passed but cannot find target process", L"Error", MB_OK);
+            return -1;
+        }
+    }
+
     // Enable run-time memory check for debug builds.
-#if defined(DEBUG) | defined(_DEBUG)
-    _CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
+#ifdef _DEBUG
+    _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
 
-	// DXUT will create and use the best device
+    if (ShowSplash(hInstance, IDT_TIMER1, IDB_BITMAP1) == 1)
+    {
+        HideSplash();
+        return 0;
+    }
+
+    // DXUT will create and use the best device
     // that is available on the system depending on which D3D callbacks are set below
 
-    // Set DXUT callbacks
-    DXUTSetCallbackDeviceChanging( ModifyDeviceSettings );
-    DXUTSetCallbackMsgProc( MsgProc );
-    DXUTSetCallbackKeyboard( OnKeyboard );
-    DXUTSetCallbackFrameMove( OnFrameMove );
+    // Set DXUT callbacks 
+    DXUTSetCallbackMsgProc(MsgProc);
+    DXUTSetCallbackKeyboard(OnKeyboard);
+    DXUTSetCallbackFrameMove(OnFrameMove);
+    DXUTSetCallbackDeviceChanging(ModifyDeviceSettings);
 
-    DXUTSetCallbackD3D11DeviceAcceptable( IsD3D11DeviceAcceptable );
-    DXUTSetCallbackD3D11DeviceCreated( OnD3D11CreateDevice );
-    DXUTSetCallbackD3D11SwapChainResized( OnD3D11ResizedSwapChain );
-    DXUTSetCallbackD3D11FrameRender( OnD3D11FrameRender );
-    DXUTSetCallbackD3D11SwapChainReleasing( OnD3D11ReleasingSwapChain );
-    DXUTSetCallbackD3D11DeviceDestroyed( OnD3D11DestroyDevice );
+    DXUTSetCallbackD3D11DeviceAcceptable(IsD3D11DeviceAcceptable);
+    DXUTSetCallbackD3D11DeviceCreated(OnD3D11CreateDevice);
+    DXUTSetCallbackD3D11SwapChainResized(OnD3D11ResizedSwapChain);
+    DXUTSetCallbackD3D11SwapChainReleasing(OnD3D11ReleasingSwapChain);
+    DXUTSetCallbackD3D11DeviceDestroyed(OnD3D11DestroyDevice);
+    DXUTSetCallbackD3D11FrameRender(OnD3D11FrameRender);
+
+    DXUTSetCallbackQuit(OnQuit);
 
     InitApp();
-    DXUTInit( true, true, NULL ); // Parse the command line, show msgboxes on error, no extra command line params
-    DXUTSetCursorSettings( true, true ); // Show the cursor and clip it when in full screen
-    DXUTCreateWindow( L"GfeSDKDemo_DX" );
-    DXUTCreateDevice (D3D_FEATURE_LEVEL_9_2, true, 1280, 1024 );
+    DXUTInit(true, true, nullptr); // Parse the command line, show msgboxes on error, no extra command line params
+    DXUTSetCursorSettings(true, true);
+    DXUTCreateWindow(L"SimpleSample11");
+
+    // Only require 10-level hardware, change to D3D_FEATURE_LEVEL_11_0 to require 11-class hardware
+    // Switch to D3D_FEATURE_LEVEL_9_x for 10level9 hardware
+    DXUTCreateDevice(D3D_FEATURE_LEVEL_10_0, true, 1280, 1024);
+
+    HideSplash();
+
     DXUTMainLoop(); // Enter into the DXUT render loop
 
     return DXUTGetExitCode();
@@ -326,7 +414,27 @@ void ToggleTagBit(NVGSDK_HighlightType bit)
 
 void HandleOpsNotification()
 {
-   g_settingsManager->LoadConfig();
+    g_settingsManager->LoadConfig();
+}
+
+std::wstring HK(wchar_t const* str, uint16_t hk_)
+{
+    uint8_t hk = (0xff & hk_);
+    std::wstring ret = std::wstring(str) + L" [";
+
+    if (hk >= VK_F1 && hk <= VK_F12)
+    {
+        ret += L"F" + std::to_wstring(hk - 0x6f);
+    }
+    else if (hk >= VK_NUMPAD0 && hk <= VK_NUMPAD9)
+    {
+        ret += L"N" + std::to_wstring(hk - 0x5f);
+    }
+    else
+    {
+        ret += (wchar_t)hk;
+    }
+    return ret + L"]";
 }
 
 //--------------------------------------------------------------------------------------
@@ -334,14 +442,6 @@ void HandleOpsNotification()
 //--------------------------------------------------------------------------------------
 void InitApp()
 {
-    TRACE("Initialize Application\n");
-
-    D3DXVECTOR3 vLightDir(-1, 1, -1);
-    D3DXVec3Normalize(&vLightDir, &vLightDir);
-    g_LightControl.SetLightDirection(vLightDir);
-
-    // Initialize dialogs
-    g_D3DSettingsDlg.Init(&g_DialogResourceManager);
     g_HUD.Init(&g_DialogResourceManager);
     g_SampleUI.Init(&g_DialogResourceManager);
 
@@ -397,7 +497,7 @@ void InitApp()
         }
         for (auto it = g_highlightsConfig.highlightsData[i].namePairsData.begin(); it != g_highlightsConfig.highlightsData[i].namePairsData.end(); ++it)
         {
-            g_highlightsConfig.highlightsData[i].namePairs.push_back({&it->first[0],&it->second[0]});
+            g_highlightsConfig.highlightsData[i].namePairs.push_back({ &it->first[0],&it->second[0] });
         }
 
         g_highlightsConfig.highlights[i].id = g_highlightsConfig.highlightsData[i].id.c_str();
@@ -410,18 +510,23 @@ void InitApp()
 
     int iY = 10;
     int const PAD = 26;
-    g_HUD.AddButtonCallback([]() {DXUTToggleFullScreen(); }, L"Toggle full screen", 0, iY, 170, 23);
-    g_HUD.AddButtonCallback([]() { g_settingsManager->ToggleBackgroundColor(); }, L"Toggle background color", 0, iY += PAD, 170, 23);
-    g_HUD.AddButtonCallback([]() {g_highlights.OnRequestLanguage(); }, L"Get Overlay Language", 0, iY += PAD, 170, 23);
-    g_HUD.AddButtonCallback([]() {g_highlights.OnRequestUserSettings(); }, L"Get User Settings", 0, iY += PAD, 170, 23);
+    int const WIDTH = 240;
+    int const X = -80;
+
+    uint16_t hk = 0x30;
+    g_HUD.AddButtonCallback([]() {DXUTToggleFullScreen(); }, HK(L"Toggle full screen", hk).c_str(), X, iY, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback([]() { g_settingsManager->ToggleBackgroundColor(); }, HK(L"Toggle background color", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback([]() {g_highlights.OnRequestLanguage(); }, HK(L"Get Overlay Language", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback([]() {g_highlights.OnRequestUserSettings(); }, HK(L"Get User Settings", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
 
     iY += 10;
 
     int iY_groups = iY;
-    int const GROUP1_X = -250;
-    int const GROUP2_X = -30;
+    int const GROUP1_X = X - WIDTH - 10;
+    int const GROUP2_X = X;
 
-    g_HUD.AddButtonCallback([]() {g_highlights.OnOpenGroup(GROUP1_ID); }, L"Open Group 1", GROUP1_X, iY += PAD, 200, 23);
+    hk = 0x40;
+    g_HUD.AddButtonCallback([]() {g_highlights.OnOpenGroup(GROUP1_ID); }, HK(L"Open Group 1", hk).c_str(), GROUP1_X, iY += PAD, WIDTH, 23, ++hk);
     for (size_t i = 0; i < g_highlightsConfig.highlightsData.size(); ++i)
     {
         HighlightsDataHolder const& holder = g_highlightsConfig.highlightsData[i];
@@ -429,21 +534,24 @@ void InitApp()
         {
             std::wstring text = std::wstring(L"VIDEO: ") + g_converter.from_bytes(holder.id);
             g_HUD.AddButtonCallback([holder]() { g_highlights.OnSaveVideo(holder.id.c_str(), GROUP1_ID, holder.startDelta, holder.endDelta); },
-                text.c_str(), GROUP1_X, iY += PAD, 200, 23);
+                HK(text.c_str(), hk).c_str(), GROUP1_X, iY += PAD, WIDTH, 23, ++hk);
         }
         else
         {
             std::wstring text = std::wstring(L"SCREENSHOT: ") + g_converter.from_bytes(holder.id);
-            g_HUD.AddButtonCallback([holder]() { g_highlights.OnSaveScreenshot(holder.id.c_str(), GROUP1_ID); }, text.c_str(), GROUP1_X, iY += PAD, 200, 23);
+            g_HUD.AddButtonCallback([holder]() { g_highlights.OnSaveScreenshot(holder.id.c_str(), GROUP1_ID); }, HK(text.c_str(), hk).c_str(), GROUP1_X, iY += PAD, WIDTH, 23, ++hk);
         }
     }
-    g_HUD.AddButtonCallback([]() {g_highlights.OnOpenSummary(&std::vector<char const*>({ GROUP1_ID })[0], 1, g_sigFilter, g_tagFilter); }, L"Open Group1 Summary", GROUP1_X, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback([]() {g_highlights.OnGetNumHighlights(GROUP1_ID , g_sigFilter, g_tagFilter); }, L"GetNumHighlights in Group1", GROUP1_X, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback([]() {g_highlights.OnCloseGroup(GROUP1_ID, false); }, L"Close Group 1", GROUP1_X, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback([]() {g_highlights.OnCloseGroup(GROUP1_ID, true); }, L"Destroy Group 1", GROUP1_X, iY += PAD, 200, 23);
 
+    g_HUD.AddButtonCallback([]() {g_highlights.OnOpenSummary(&std::vector<char const*>({ GROUP1_ID })[0], 1, g_sigFilter, g_tagFilter); },
+        HK(L"Open Group1 Summary", hk).c_str(), GROUP1_X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback([]() {g_highlights.OnGetNumHighlights(GROUP1_ID, g_sigFilter, g_tagFilter); }, HK(L"GetNumHighlights in Group1", hk).c_str(), GROUP1_X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback([]() {g_highlights.OnCloseGroup(GROUP1_ID, false); }, HK(L"Close Group 1", hk).c_str(), GROUP1_X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback([]() {g_highlights.OnCloseGroup(GROUP1_ID, true); }, HK(L"Destroy Group 1", hk).c_str(), GROUP1_X, iY += PAD, WIDTH, 23, ++hk);
+
+    hk = 0x4d;
     iY = iY_groups;
-    g_HUD.AddButtonCallback([]() {g_highlights.OnOpenGroup(GROUP2_ID); }, L"Open Group 2", GROUP2_X, iY += PAD, 200, 23);
+    g_HUD.AddButtonCallback([]() {g_highlights.OnOpenGroup(GROUP2_ID); }, HK(L"Open Group 2", hk).c_str(), GROUP2_X, iY += PAD, WIDTH, 23, ++hk);
     for (size_t i = 0; i < g_highlightsConfig.highlightsData.size(); ++i)
     {
         HighlightsDataHolder const& holder = g_highlightsConfig.highlightsData[i];
@@ -451,121 +559,68 @@ void InitApp()
         {
             std::wstring text = std::wstring(L"VIDEO: ") + g_converter.from_bytes(holder.id);
             g_HUD.AddButtonCallback([holder]() { g_highlights.OnSaveVideo(holder.id.c_str(), GROUP2_ID, holder.startDelta, holder.endDelta); },
-                text.c_str(), GROUP2_X, iY += PAD, 200, 23);
+                HK(text.c_str(), hk).c_str(), GROUP2_X, iY += PAD, WIDTH, 23, ++hk);
         }
         else
         {
             std::wstring text = std::wstring(L"SCREENSHOT: ") + g_converter.from_bytes(holder.id);
-            g_HUD.AddButtonCallback([holder]() { g_highlights.OnSaveScreenshot(holder.id.c_str(), GROUP2_ID); }, text.c_str(), GROUP2_X, iY += PAD, 200, 23);
+            g_HUD.AddButtonCallback([holder]() { g_highlights.OnSaveScreenshot(holder.id.c_str(), GROUP2_ID); },
+                HK(text.c_str(), hk).c_str(), GROUP2_X, iY += PAD, WIDTH, 23, ++hk);
         }
     }
-    g_HUD.AddButtonCallback([]() {g_highlights.OnOpenSummary(&std::vector<char const*>({ GROUP2_ID })[0], 1, g_sigFilter, g_tagFilter); }, L"Open Group2 Summary", GROUP2_X, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback([]() {g_highlights.OnGetNumHighlights(GROUP2_ID, g_sigFilter, g_tagFilter); }, L"GetNumHighlights in Group2", GROUP2_X, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback([]() {g_highlights.OnCloseGroup(GROUP2_ID, false); }, L"Close Group 2", GROUP2_X, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback([]() {g_highlights.OnCloseGroup(GROUP2_ID, true); }, L"Destroy Group 2", GROUP2_X, iY += PAD, 200, 23);
+    g_HUD.AddButtonCallback([]() {g_highlights.OnOpenSummary(&std::vector<char const*>({ GROUP2_ID })[0], 1, g_sigFilter, g_tagFilter); },
+        HK(L"Open Group2 Summary", hk).c_str(), GROUP2_X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback([]() {g_highlights.OnGetNumHighlights(GROUP2_ID, g_sigFilter, g_tagFilter); }, HK(L"GetNumHighlights in Group2", hk).c_str(), GROUP2_X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback([]() {g_highlights.OnCloseGroup(GROUP2_ID, false); }, HK(L"Close Group 2", hk).c_str(), GROUP2_X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback([]() {g_highlights.OnCloseGroup(GROUP2_ID, true); }, HK(L"Destroy Group 2", hk).c_str(), GROUP2_X, iY += PAD, WIDTH, 23, ++hk);
 
+    hk = 0x59;
     iY += 10;
-    g_HUD.AddButtonCallback([]() {g_highlights.OnOpenSummary(&std::vector<char const*>({ GROUP1_ID, GROUP2_ID })[0], 2, g_sigFilter, g_tagFilter); }, L"Open GroupSummary 1 + 2", -30, iY += PAD, 200, 23);
+    g_HUD.AddButtonCallback([]() {g_highlights.OnOpenSummary(&std::vector<char const*>({ GROUP1_ID, GROUP2_ID })[0], 2, g_sigFilter, g_tagFilter); },
+        HK(L"Open GroupSummary 1 + 2", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
 
+    hk = 0x6f;
     iY += 20;
-    g_HUD.AddButtonCallback([]() {g_sigFilter = NVGSDK_HIGHLIGHT_SIGNIFICANCE_NONE; }, L"Clear Significance Filter", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_BAD), L"Toggle ExtremelyBad", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_BAD), L"Toggle VeryBad", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_BAD), L"Toggle Bad", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_NEUTRAL), L"Toggle Neutral", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_GOOD), L"Toggle Good", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_GOOD), L"Toggle VeryGood", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_GOOD), L"Toggle ExtremelyGood", -30, iY += PAD, 200, 23);
-
+    g_HUD.AddButtonCallback([]() {g_sigFilter = NVGSDK_HIGHLIGHT_SIGNIFICANCE_NONE; }, HK(L"Clear Significance Filter", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_BAD), HK(L"Toggle ExtremelyBad", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_BAD), HK(L"Toggle VeryBad", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_BAD), HK(L"Toggle Bad", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_NEUTRAL), HK(L"Toggle Neutral", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_GOOD), HK(L"Toggle Good", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_GOOD), HK(L"Toggle VeryGood", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleSignificanceBit, NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_GOOD), HK(L"Toggle ExtremelyGood", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+
+    hk = 0x5f;
     iY += 10;
-    g_HUD.AddButtonCallback([]() {g_tagFilter = NVGSDK_HIGHLIGHT_TYPE_NONE; }, L"Clear Tag Filter", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleTagBit, NVGSDK_HIGHLIGHT_TYPE_MILESTONE), L"Toggle Milestone", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleTagBit, NVGSDK_HIGHLIGHT_TYPE_ACHIEVEMENT), L"Toggle Achievement", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleTagBit, NVGSDK_HIGHLIGHT_TYPE_INCIDENT), L"Toggle Incident", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleTagBit, NVGSDK_HIGHLIGHT_TYPE_STATE_CHANGE), L"Toggle StateChange", -30, iY += PAD, 200, 23);
-    g_HUD.AddButtonCallback(std::bind(ToggleTagBit, NVGSDK_HIGHLIGHT_TYPE_UNANNOUNCED), L"Toggle Unannounced", -30, iY += PAD, 200, 23);
-
-    g_SampleUI.SetCallback( OnGUIEvent ); iY = 10;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Called right before creating a D3D9 or D3D11 device, allowing the app to modify the device settings as needed
-//--------------------------------------------------------------------------------------
-bool CALLBACK ModifyDeviceSettings( DXUTDeviceSettings* pDeviceSettings, void* pUserContext )
-{
-    // Uncomment this to get debug information from D3D11
-    //pDeviceSettings->d3d11.CreateFlags |= D3D11_CREATE_DEVICE_DEBUG;
-
-    // For the first device created if its a REF device, optionally display a warning dialog box
-    static bool s_bFirstTime = true;
-    if( s_bFirstTime )
-    {
-        s_bFirstTime = false;
-        if( ( DXUT_D3D11_DEVICE == pDeviceSettings->ver &&
-              pDeviceSettings->d3d11.DriverType == D3D_DRIVER_TYPE_REFERENCE ) )
-        {
-            DXUTDisplaySwitchingToREFWarning( pDeviceSettings->ver );
-        }
-    }
-
-    return true;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Handle updates to the scene.  This is called regardless of which D3D API is used
-//--------------------------------------------------------------------------------------
-void CALLBACK OnFrameMove( double fTime, float fElapsedTime, void* pUserContext )
-{
-    // Update the camera's position based on user input
-    g_Camera.FrameMove( fElapsedTime );
-
+    g_HUD.AddButtonCallback([]() {g_tagFilter = NVGSDK_HIGHLIGHT_TYPE_NONE; }, HK(L"Clear Tag Filter", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleTagBit, NVGSDK_HIGHLIGHT_TYPE_MILESTONE), HK(L"Toggle Milestone", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleTagBit, NVGSDK_HIGHLIGHT_TYPE_ACHIEVEMENT), HK(L"Toggle Achievement", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleTagBit, NVGSDK_HIGHLIGHT_TYPE_INCIDENT), HK(L"Toggle Incident", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleTagBit, NVGSDK_HIGHLIGHT_TYPE_STATE_CHANGE), HK(L"Toggle StateChange", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+    g_HUD.AddButtonCallback(std::bind(ToggleTagBit, NVGSDK_HIGHLIGHT_TYPE_UNANNOUNCED), HK(L"Toggle Unannounced", hk).c_str(), X, iY += PAD, WIDTH, 23, ++hk);
+
+    g_SampleUI.SetCallback(OnGUIEvent); iY = 10;
 }
 
 
 //--------------------------------------------------------------------------------------
-// Render the help and statistics text
+// Render the help and statistics text.
 //--------------------------------------------------------------------------------------
 void RenderText()
 {
-    UINT nBackBufferHeight = ( DXUTIsAppRenderingWithD3D9() ) ? DXUTGetD3D9BackBufferSurfaceDesc()->Height :
-            DXUTGetDXGIBackBufferSurfaceDesc()->Height;
+    UINT nBackBufferHeight = DXUTGetDXGIBackBufferSurfaceDesc()->Height;
 
     g_pTxtHelper->Begin();
-    g_pTxtHelper->SetInsertionPos( 2, 50 );
-    g_pTxtHelper->SetForegroundColor( D3DXCOLOR( 1.0f, 1.0f, 0.0f, 1.0f ) );
-    g_pTxtHelper->DrawTextLine( DXUTGetFrameStats( DXUTIsVsyncEnabled() ) );
-    g_pTxtHelper->DrawTextLine( DXUTGetDeviceStats() );
+    g_pTxtHelper->SetInsertionPos(2, 50);
+    g_pTxtHelper->SetForegroundColor(Colors::White);
+    g_pTxtHelper->DrawTextLine(DXUTGetFrameStats(DXUTIsVsyncEnabled()));
+    g_pTxtHelper->DrawTextLine(DXUTGetDeviceStats());
 
     // Settings
     g_pTxtHelper->DrawFormattedTextLine(L"Background color: %S", g_settingsManager->GetBackgroundColorString().c_str());
 
-    // Draw help
-    if( g_bShowHelp )
-    {
-        g_pTxtHelper->SetInsertionPos( 2, nBackBufferHeight - 20 * 6 );
-        g_pTxtHelper->SetForegroundColor( D3DXCOLOR( 1.0f, 0.75f, 0.0f, 1.0f ) );
-        g_pTxtHelper->DrawTextLine( L"Controls:" );
-
-        g_pTxtHelper->SetInsertionPos( 20, nBackBufferHeight - 20 * 5 );
-        g_pTxtHelper->DrawTextLine( L"Rotate model: Left mouse button\n"
-                                    L"Rotate light: Right mouse button\n"
-                                    L"Rotate camera: Middle mouse button\n"
-                                    L"Zoom camera: Mouse wheel scroll\n" );
-
-        g_pTxtHelper->SetInsertionPos( 550, nBackBufferHeight - 20 * 5 );
-        g_pTxtHelper->DrawTextLine( L"Hide help: F1\n"
-                                    L"Quit: ESC\n" );
-    }
-    else
-    {
-        g_pTxtHelper->SetForegroundColor( D3DXCOLOR( 1.0f, 1.0f, 1.0f, 1.0f ) );
-        g_pTxtHelper->DrawTextLine( L"Press F1 for help" );
-    }
-
     // Highlights
-    g_pTxtHelper->SetForegroundColor(D3DXCOLOR(1.0f, 1.0f, 1.0f, 1.0f));
+    g_pTxtHelper->SetForegroundColor(Colors::White);
     g_pTxtHelper->SetInsertionPos(2, 5);
     g_pTxtHelper->DrawFormattedTextLine(L"Highlights Permission: %s", g_highlights.GetCurrentPermissionStr());
     g_pTxtHelper->DrawFormattedTextLine(L"Last Overlay Event: %s", g_highlights.GetLastOverlayEvent());
@@ -586,223 +641,148 @@ void RenderText()
 //--------------------------------------------------------------------------------------
 void RenderLoadingText()
 {
-    UINT nBackBufferHeight = (DXUTIsAppRenderingWithD3D9()) ? DXUTGetD3D9BackBufferSurfaceDesc()->Height :
-        DXUTGetDXGIBackBufferSurfaceDesc()->Height;
+    UINT nBackBufferHeight = DXUTGetDXGIBackBufferSurfaceDesc()->Height;
 
     g_pTxtHelper->Begin();
 
     g_pTxtHelper->SetInsertionPos(nBackBufferHeight / 2, 300);
-    g_pTxtHelper->SetForegroundColor(D3DXCOLOR(1.0f, 1.0f, 0.0f, 1.0f));
+    g_pTxtHelper->SetForegroundColor(Colors::White);
     g_pTxtHelper->DrawTextLine(L"LOADING...");
 
     g_pTxtHelper->End();
 }
 
-//--------------------------------------------------------------------------------------
-// Handle messages to the application
-//--------------------------------------------------------------------------------------
-LRESULT CALLBACK MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, bool* pbNoFurtherProcessing,
-                          void* pUserContext )
+std::string WideToUtf8(std::wstring const& wideStr)
 {
-    // Pass messages to dialog resource manager calls so GUI state is updated correctly
-    *pbNoFurtherProcessing = g_DialogResourceManager.MsgProc( hWnd, uMsg, wParam, lParam );
-    if( *pbNoFurtherProcessing )
-        return 0;
-
-    // Pass messages to settings dialog if its active
-    if( g_D3DSettingsDlg.IsActive() )
+    int length = WideCharToMultiByte(CP_UTF8, 0, wideStr.c_str(), -1, NULL, 0, NULL, NULL);
+    if (length <= 0)
     {
-        g_D3DSettingsDlg.MsgProc( hWnd, uMsg, wParam, lParam );
-        return 0;
+        throw std::runtime_error("WideCharToMultiByte failed");
     }
 
-    // Give the dialogs a chance to handle the message first
-    *pbNoFurtherProcessing = g_HUD.MsgProc( hWnd, uMsg, wParam, lParam );
-    if( *pbNoFurtherProcessing )
-        return 0;
-    *pbNoFurtherProcessing = g_SampleUI.MsgProc( hWnd, uMsg, wParam, lParam );
-    if( *pbNoFurtherProcessing )
-        return 0;
-
-    g_LightControl.HandleMessages( hWnd, uMsg, wParam, lParam );
+    std::unique_ptr<char[]> outputData(new char[length]);
 
-    // Pass all remaining windows messages to camera so it can respond to user input
-    g_Camera.HandleMessages( hWnd, uMsg, wParam, lParam );
-
-    return 0;
-}
-
-
-//--------------------------------------------------------------------------------------
-// Handle key presses
-//--------------------------------------------------------------------------------------
-void CALLBACK OnKeyboard( UINT nChar, bool bKeyDown, bool bAltDown, void* pUserContext )
-{
-    if( bKeyDown )
+    length = WideCharToMultiByte(CP_UTF8, 0, wideStr.c_str(), -1, &outputData.get()[0], length, NULL, NULL);
+    if (length <= 0)
     {
-        switch( nChar )
-        {
-            case VK_F1:
-                g_bShowHelp = !g_bShowHelp; break;
-        }
+        throw std::runtime_error("WideCharToMultiByte failed");
     }
-}
-
 
-//--------------------------------------------------------------------------------------
-// Handles the GUI events
-//--------------------------------------------------------------------------------------
-void CALLBACK OnGUIEvent(UINT nEvent, int nControlID, CDXUTControl* pControl, void* pUserContext)
-{
-    void* pUserData = pControl->GetUserData();
-    if (pUserData)
-    {
-        std::function<void()>* fn = reinterpret_cast<std::function<void()>*>(pUserData);
-        (*fn)();
-    }
+    return std::string(&outputData.get()[0]);
 }
 
-
 //--------------------------------------------------------------------------------------
 // Reject any D3D11 devices that aren't acceptable by returning false
 //--------------------------------------------------------------------------------------
-bool CALLBACK IsD3D11DeviceAcceptable( const CD3D11EnumAdapterInfo *AdapterInfo, UINT Output, const CD3D11EnumDeviceInfo *DeviceInfo,
-                                       DXGI_FORMAT BackBufferFormat, bool bWindowed, void* pUserContext )
+bool CALLBACK IsD3D11DeviceAcceptable(const CD3D11EnumAdapterInfo *AdapterInfo, UINT Output,
+    const CD3D11EnumDeviceInfo *DeviceInfo,
+    DXGI_FORMAT BackBufferFormat, bool bWindowed, void* pUserContext)
 {
     return true;
 }
 
-//--------------------------------------------------------------------------------------
-// Find and compile the specified shader
-//--------------------------------------------------------------------------------------
-HRESULT CompileShaderFromFile( WCHAR* szFileName, LPCSTR szEntryPoint, LPCSTR szShaderModel, ID3DBlob** ppBlobOut )
-{
-    HRESULT hr = S_OK;
-
-    // find the file
-    WCHAR str[MAX_PATH];
-    V_RETURN( DXUTFindDXSDKMediaFileCch( str, MAX_PATH, szFileName ) );
-
-    DWORD dwShaderFlags = D3DCOMPILE_ENABLE_STRICTNESS;
-#if defined( DEBUG ) || defined( _DEBUG )
-    // Set the D3DCOMPILE_DEBUG flag to embed debug information in the shaders.
-    // Setting this flag improves the shader debugging experience, but still allows
-    // the shaders to be optimized and to run exactly the way they will run in
-    // the release configuration of this program.
-    dwShaderFlags |= D3DCOMPILE_DEBUG;
-#endif
-
-    ID3DBlob* pErrorBlob;
-    hr = D3DX11CompileFromFile( str, NULL, NULL, szEntryPoint, szShaderModel,
-        dwShaderFlags, 0, NULL, ppBlobOut, &pErrorBlob, NULL );
-    if( FAILED(hr) )
-    {
-        if( pErrorBlob != NULL )
-            OutputDebugStringA( (char*)pErrorBlob->GetBufferPointer() );
-        SAFE_RELEASE( pErrorBlob );
-        return hr;
-    }
-    SAFE_RELEASE( pErrorBlob );
-
-    return S_OK;
-}
-
 
 //--------------------------------------------------------------------------------------
 // Create any D3D11 resources that aren't dependant on the back buffer
 //--------------------------------------------------------------------------------------
-HRESULT CALLBACK OnD3D11CreateDevice( ID3D11Device* pd3dDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc,
-                                      void* pUserContext )
+HRESULT CALLBACK OnD3D11CreateDevice(ID3D11Device* pd3dDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc,
+    void* pUserContext)
 {
     HRESULT hr;
 
-    ID3D11DeviceContext* pd3dImmediateContext = DXUTGetD3D11DeviceContext();
-    V_RETURN( g_DialogResourceManager.OnD3D11CreateDevice( pd3dDevice, pd3dImmediateContext ) );
-    V_RETURN( g_D3DSettingsDlg.OnD3D11CreateDevice( pd3dDevice ) );
-    g_pTxtHelper = new CDXUTTextHelper( pd3dDevice, pd3dImmediateContext, &g_DialogResourceManager, 15 );
+    auto pd3dImmediateContext = DXUTGetD3D11DeviceContext();
+    V_RETURN(g_DialogResourceManager.OnD3D11CreateDevice(pd3dDevice, pd3dImmediateContext));
+    g_pTxtHelper = new CDXUTTextHelper(pd3dDevice, pd3dImmediateContext, &g_DialogResourceManager, 15);
 
-    D3DXVECTOR3 vCenter( 0.25767413f, -28.503521f, 111.00689f );
+    XMVECTORF32 vCenter = { 0.25767413f, -28.503521f, 111.00689f };
     FLOAT fObjectRadius = 378.15607f;
 
-    D3DXMatrixTranslation( &g_mCenterMesh, -vCenter.x, -vCenter.y, -vCenter.z );
-    D3DXMATRIXA16 m;
-    D3DXMatrixRotationY( &m, D3DX_PI );
+    g_mCenterMesh = XMMatrixTranslation(-vCenter.f[0], -vCenter.f[1], -vCenter.f[2]);
+    XMMATRIX m = XMMatrixRotationY(XM_PI);
     g_mCenterMesh *= m;
-    D3DXMatrixRotationX( &m, D3DX_PI / 2.0f );
+    m = XMMatrixRotationX(XM_PI / 2.0f);
     g_mCenterMesh *= m;
 
-    // Compile the shaders using the lowest possible profile for broadest feature level support
-    ID3DBlob* pVertexShaderBuffer = NULL;
-    V_RETURN( CompileShaderFromFile( L"BasicHLSL11_VS.hlsl", "VSMain", "vs_4_0_level_9_1", &pVertexShaderBuffer ) );
+    // Read the HLSL file
+    // You should use the lowest possible shader profile for your shader to enable various feature levels. These
+    // shaders are simple enough to work well within the lowest possible profile, and will run on all feature levels
 
-    ID3DBlob* pPixelShaderBuffer = NULL;
-    V_RETURN( CompileShaderFromFile( L"BasicHLSL11_PS.hlsl", "PSMain", "ps_4_0_level_9_1", &pPixelShaderBuffer ) );
+    DWORD dwShaderFlags = D3DCOMPILE_ENABLE_STRICTNESS;
+#ifdef _DEBUG
+    // Disable optimizations to further improve shader debugging
+    dwShaderFlags |= D3DCOMPILE_SKIP_OPTIMIZATION;
+#endif
+
+    ID3DBlob* pVertexShaderBuffer = nullptr;
+    V_RETURN(DXUTCompileFromFile(L"SimpleSample.hlsl", nullptr, "RenderSceneVS", "vs_4_0_level_9_1", dwShaderFlags, 0,
+        &pVertexShaderBuffer));
+
+    ID3DBlob* pPixelShaderBuffer = nullptr;
+    V_RETURN(DXUTCompileFromFile(L"SimpleSample.hlsl", nullptr, "RenderScenePS", "ps_4_0_level_9_1", dwShaderFlags, 0,
+        &pPixelShaderBuffer));
 
     // Create the shaders
-    V_RETURN( pd3dDevice->CreateVertexShader( pVertexShaderBuffer->GetBufferPointer(),
-                                              pVertexShaderBuffer->GetBufferSize(), NULL, &g_pVertexShader ) );
-    DXUT_SetDebugName( g_pVertexShader, "VSMain" );
-    V_RETURN( pd3dDevice->CreatePixelShader( pPixelShaderBuffer->GetBufferPointer(),
-                                             pPixelShaderBuffer->GetBufferSize(), NULL, &g_pPixelShader ) );
-    DXUT_SetDebugName( g_pPixelShader, "PSMain" );
-
-    // Create our vertex input layout
+    V_RETURN(pd3dDevice->CreateVertexShader(pVertexShaderBuffer->GetBufferPointer(),
+        pVertexShaderBuffer->GetBufferSize(), nullptr, &g_pVertexShader11));
+    DXUT_SetDebugName(g_pVertexShader11, "RenderSceneVS");
+
+    V_RETURN(pd3dDevice->CreatePixelShader(pPixelShaderBuffer->GetBufferPointer(),
+        pPixelShaderBuffer->GetBufferSize(), nullptr, &g_pPixelShader11));
+    DXUT_SetDebugName(g_pPixelShader11, "RenderScenePS");
+
+    // Create a layout for the object data
     const D3D11_INPUT_ELEMENT_DESC layout[] =
     {
-        { "POSITION",  0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0,  D3D11_INPUT_PER_VERTEX_DATA, 0 },
-        { "NORMAL",    0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-        { "TEXCOORD",  0, DXGI_FORMAT_R32G32_FLOAT,    0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+        { "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0,  0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+    { "NORMAL",   0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+    { "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT,    0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0 },
     };
 
-    V_RETURN( pd3dDevice->CreateInputLayout( layout, ARRAYSIZE( layout ), pVertexShaderBuffer->GetBufferPointer(),
-                                             pVertexShaderBuffer->GetBufferSize(), &g_pVertexLayout11 ) );
-    DXUT_SetDebugName( g_pVertexLayout11, "Primary" );
-
-    SAFE_RELEASE( pVertexShaderBuffer );
-    SAFE_RELEASE( pPixelShaderBuffer );
+    V_RETURN(pd3dDevice->CreateInputLayout(layout, ARRAYSIZE(layout), pVertexShaderBuffer->GetBufferPointer(),
+        pVertexShaderBuffer->GetBufferSize(), &g_pLayout11));
+    DXUT_SetDebugName(g_pLayout11, "Primary");
 
     // Load the mesh
-    V_RETURN( g_Mesh11.Create( pd3dDevice, L"tiny\\tiny.sdkmesh", true ) );
-
-    // Create a sampler state
-    D3D11_SAMPLER_DESC SamDesc;
-    SamDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-    SamDesc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP;
-    SamDesc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP;
-    SamDesc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP;
-    SamDesc.MipLODBias = 0.0f;
-    SamDesc.MaxAnisotropy = 1;
-    SamDesc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
-    SamDesc.BorderColor[0] = SamDesc.BorderColor[1] = SamDesc.BorderColor[2] = SamDesc.BorderColor[3] = 0;
-    SamDesc.MinLOD = 0;
-    SamDesc.MaxLOD = D3D11_FLOAT32_MAX;
-    V_RETURN( pd3dDevice->CreateSamplerState( &SamDesc, &g_pSamLinear ) );
-    DXUT_SetDebugName( g_pSamLinear, "Primary" );
-
-    // Setup constant buffers
-    D3D11_BUFFER_DESC Desc;
-    Desc.Usage = D3D11_USAGE_DYNAMIC;
-    Desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
-    Desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-    Desc.MiscFlags = 0;
-
-    Desc.ByteWidth = sizeof( CB_VS_PER_OBJECT );
-    V_RETURN( pd3dDevice->CreateBuffer( &Desc, NULL, &g_pcbVSPerObject ) );
-    DXUT_SetDebugName( g_pcbVSPerObject, "CB_VS_PER_OBJECT" );
-
-    Desc.ByteWidth = sizeof( CB_PS_PER_OBJECT );
-    V_RETURN( pd3dDevice->CreateBuffer( &Desc, NULL, &g_pcbPSPerObject ) );
-    DXUT_SetDebugName( g_pcbPSPerObject, "CB_PS_PER_OBJECT" );
-
-    Desc.ByteWidth = sizeof( CB_PS_PER_FRAME );
-    V_RETURN( pd3dDevice->CreateBuffer( &Desc, NULL, &g_pcbPSPerFrame ) );
-    DXUT_SetDebugName( g_pcbPSPerFrame, "CB_PS_PER_FRAME" );
+    V_RETURN(g_Mesh11.Create(pd3dDevice, L"tiny\\tiny.sdkmesh"));
+
+    // No longer need the shader blobs
+    SAFE_RELEASE(pVertexShaderBuffer);
+    SAFE_RELEASE(pPixelShaderBuffer);
+
+    // Create state objects
+    D3D11_SAMPLER_DESC samDesc;
+    ZeroMemory(&samDesc, sizeof(samDesc));
+    samDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+    samDesc.AddressU = samDesc.AddressV = samDesc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP;
+    samDesc.MaxAnisotropy = 1;
+    samDesc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
+    samDesc.MaxLOD = D3D11_FLOAT32_MAX;
+    V_RETURN(pd3dDevice->CreateSamplerState(&samDesc, &g_pSamLinear));
+    DXUT_SetDebugName(g_pSamLinear, "Linear");
+
+    // Create constant buffers
+    D3D11_BUFFER_DESC cbDesc;
+    ZeroMemory(&cbDesc, sizeof(cbDesc));
+    cbDesc.Usage = D3D11_USAGE_DYNAMIC;
+    cbDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
+    cbDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+
+    cbDesc.ByteWidth = sizeof(CB_VS_PER_OBJECT);
+    V_RETURN(pd3dDevice->CreateBuffer(&cbDesc, nullptr, &g_pcbVSPerObject11));
+    DXUT_SetDebugName(g_pcbVSPerObject11, "CB_VS_PER_OBJECT");
+
+    cbDesc.ByteWidth = sizeof(CB_VS_PER_FRAME);
+    V_RETURN(pd3dDevice->CreateBuffer(&cbDesc, nullptr, &g_pcbVSPerFrame11));
+    DXUT_SetDebugName(g_pcbVSPerFrame11, "CB_VS_PER_FRAME");
+
+    // Create other render resources here
 
     // Setup the camera's view parameters
-    D3DXVECTOR3 vecEye( 0.0f, 0.0f, -100.0f );
-    D3DXVECTOR3 vecAt ( 0.0f, 0.0f, -0.0f );
-    g_Camera.SetViewParams( &vecEye, &vecAt );
-    g_Camera.SetRadius( fObjectRadius * 3.0f, fObjectRadius * 0.5f, fObjectRadius * 10.0f );
+    static const XMVECTORF32 s_vecEye = { 0.0f, 0.0f, -100.0f };
+    static const XMVECTORF32 s_vecAt = { 0.0f, 0.0f, -0.0f };
+
+    g_Camera.SetViewParams(s_vecEye, s_vecAt);
+    g_Camera.SetRadius(fObjectRadius * 3.0f, fObjectRadius * 0.5f, fObjectRadius * 10.0f);
 
     return S_OK;
 }
@@ -811,36 +791,43 @@ HRESULT CALLBACK OnD3D11CreateDevice( ID3D11Device* pd3dDevice, const DXGI_SURFA
 //--------------------------------------------------------------------------------------
 // Create any D3D11 resources that depend on the back buffer
 //--------------------------------------------------------------------------------------
-HRESULT CALLBACK OnD3D11ResizedSwapChain( ID3D11Device* pd3dDevice, IDXGISwapChain* pSwapChain,
-                                          const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc, void* pUserContext )
+HRESULT CALLBACK OnD3D11ResizedSwapChain(ID3D11Device* pd3dDevice, IDXGISwapChain* pSwapChain,
+    const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc, void* pUserContext)
 {
     HRESULT hr;
 
-    V_RETURN( g_DialogResourceManager.OnD3D11ResizedSwapChain( pd3dDevice, pBackBufferSurfaceDesc ) );
-    V_RETURN( g_D3DSettingsDlg.OnD3D11ResizedSwapChain( pd3dDevice, pBackBufferSurfaceDesc ) );
+    V_RETURN(g_DialogResourceManager.OnD3D11ResizedSwapChain(pd3dDevice, pBackBufferSurfaceDesc));
 
     // Setup the camera's projection parameters
-    float fAspectRatio = pBackBufferSurfaceDesc->Width / ( FLOAT )pBackBufferSurfaceDesc->Height;
-    g_Camera.SetProjParams( D3DX_PI / 4, fAspectRatio, 2.0f, 4000.0f );
-    g_Camera.SetWindow( pBackBufferSurfaceDesc->Width, pBackBufferSurfaceDesc->Height );
-    g_Camera.SetButtonMasks( MOUSE_MIDDLE_BUTTON, MOUSE_WHEEL, MOUSE_LEFT_BUTTON );
+    float fAspectRatio = pBackBufferSurfaceDesc->Width / (FLOAT)pBackBufferSurfaceDesc->Height;
+    g_Camera.SetProjParams(XM_PI / 4, fAspectRatio, 2.0f, 10000.0f);
+    g_Camera.SetWindow(pBackBufferSurfaceDesc->Width, pBackBufferSurfaceDesc->Height);
+    g_Camera.SetButtonMasks(MOUSE_LEFT_BUTTON, MOUSE_WHEEL, MOUSE_MIDDLE_BUTTON);
 
-    g_HUD.SetLocation( pBackBufferSurfaceDesc->Width - 170, 0 );
-    g_HUD.SetSize( 170, 170 );
-    g_SampleUI.SetLocation( pBackBufferSurfaceDesc->Width - 170, pBackBufferSurfaceDesc->Height - 300 );
-    g_SampleUI.SetSize( 170, 300 );
+    g_HUD.SetLocation(pBackBufferSurfaceDesc->Width - 170, 0);
+    g_HUD.SetSize(170, 170);
+    g_SampleUI.SetLocation(pBackBufferSurfaceDesc->Width - 170, pBackBufferSurfaceDesc->Height - 300);
+    g_SampleUI.SetSize(170, 300);
 
     return S_OK;
 }
 
+static DWORD LastFrameTime = 0;
+DWORD FPSLimit = 60;
 
 //--------------------------------------------------------------------------------------
 // Render the scene using the D3D11 device
 //--------------------------------------------------------------------------------------
-void CALLBACK OnD3D11FrameRender( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext, double fTime,
-                                  float fElapsedTime, void* pUserContext )
+void CALLBACK OnD3D11FrameRender(ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext, double fTime,
+    float fElapsedTime, void* pUserContext)
 {
-    HRESULT hr;
+    // Limit FPS
+    DWORD currentTime = timeGetTime();
+    if ((currentTime - LastFrameTime) < (1000 / FPSLimit))
+    {
+        Sleep(currentTime - LastFrameTime);
+    }
+    LastFrameTime = currentTime;
 
     g_highlights.OnTick();
 
@@ -851,44 +838,52 @@ void CALLBACK OnD3D11FrameRender( ID3D11Device* pd3dDevice, ID3D11DeviceContext*
         return;
     case AppState::LoadResources:
         RenderLoadingText();
-        //g_highlights.Init(g_highlightsConfig);
-        g_highlights.Init(g_highlightsConfig.gameName.c_str(), g_highlightsConfig.defaultLocale.c_str(), &g_highlightsConfig.highlights[0], g_highlightsConfig.highlights.size());
+        g_highlights.Init(g_highlightsConfig.gameName.c_str(), g_highlightsConfig.defaultLocale.c_str(), &g_highlightsConfig.highlights[0], g_highlightsConfig.highlights.size(),
+            g_targetPath.c_str(), g_targetPid);
         g_state = AppState::Main;
         return;
     case AppState::Main:
     {
-        // Clear the render target and depth stencil
-        ID3D11RenderTargetView* pRTV = DXUTGetD3D11RenderTargetView();
+        auto pRTV = DXUTGetD3D11RenderTargetView();
         pd3dImmediateContext->ClearRenderTargetView(pRTV, g_settingsManager->GetBackgroundColorArray().data());
-        ID3D11DepthStencilView* pDSV = DXUTGetD3D11DepthStencilView();
+
+        // Clear the depth stencil
+        auto pDSV = DXUTGetD3D11DepthStencilView();
         pd3dImmediateContext->ClearDepthStencilView(pDSV, D3D11_CLEAR_DEPTH, 1.0, 0);
 
-        D3DXMATRIX mWorldViewProjection;
-        D3DXVECTOR3 vLightDir;
-        D3DXMATRIX mWorld;
-        D3DXMATRIX mView;
-        D3DXMATRIX mProj;
+        // Slowly rotate world
+        XMMATRIX rotMatrix = XMMatrixRotationRollPitchYaw(0.0f, 0.001f, 0.001f);
+        g_mCenterMesh = g_mCenterMesh * rotMatrix;
 
         // Get the projection & view matrix from the camera class
-        mProj = *g_Camera.GetProjMatrix();
-        mView = *g_Camera.GetViewMatrix();
+        XMMATRIX mWorld = g_mCenterMesh * g_Camera.GetWorldMatrix();
+        XMMATRIX mView = g_Camera.GetViewMatrix();
+        XMMATRIX mProj = g_Camera.GetProjMatrix();
+        XMMATRIX mWorldViewProjection = mWorld * mView * mProj;
 
-        // Get the light direction
-        vLightDir = g_LightControl.GetLightDirection();
-
-        // Per frame cb update
+        // Set the constant buffers
+        HRESULT hr;
         D3D11_MAPPED_SUBRESOURCE MappedResource;
-        V(pd3dImmediateContext->Map(g_pcbPSPerFrame, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource));
-        CB_PS_PER_FRAME* pPerFrame = (CB_PS_PER_FRAME*)MappedResource.pData;
-        float fAmbient = 0.1f;
-        pPerFrame->m_vLightDirAmbient = D3DXVECTOR4(vLightDir.x, vLightDir.y, vLightDir.z, fAmbient);
-        pd3dImmediateContext->Unmap(g_pcbPSPerFrame, 0);
-
-        pd3dImmediateContext->PSSetConstantBuffers(g_iCBPSPerFrameBind, 1, &g_pcbPSPerFrame);
+        V(pd3dImmediateContext->Map(g_pcbVSPerFrame11, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource));
+        auto pVSPerFrame = reinterpret_cast<CB_VS_PER_FRAME*>(MappedResource.pData);
+        pVSPerFrame->m_vLightDir = XMFLOAT3(0, 0.707f, -0.707f);
+        pVSPerFrame->m_fTime = (float)fTime;
+        pVSPerFrame->m_LightDiffuse = XMFLOAT4(1.f, 1.f, 1.f, 1.f);
+        pd3dImmediateContext->Unmap(g_pcbVSPerFrame11, 0);
+        pd3dImmediateContext->VSSetConstantBuffers(1, 1, &g_pcbVSPerFrame11);
+
+        V(pd3dImmediateContext->Map(g_pcbVSPerObject11, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource));
+        auto pVSPerObject = reinterpret_cast<CB_VS_PER_OBJECT*>(MappedResource.pData);
+        XMStoreFloat4x4(&pVSPerObject->m_mWorldViewProjection, XMMatrixTranspose(mWorldViewProjection));
+        XMStoreFloat4x4(&pVSPerObject->m_mWorld, XMMatrixTranspose(mWorld));
+        pVSPerObject->m_MaterialAmbientColor = XMFLOAT4(0.3f, 0.3f, 0.3f, 1.0f);
+        pVSPerObject->m_MaterialDiffuseColor = XMFLOAT4(0.7f, 0.7f, 0.7f, 1.0f);
+        pd3dImmediateContext->Unmap(g_pcbVSPerObject11, 0);
+        pd3dImmediateContext->VSSetConstantBuffers(0, 1, &g_pcbVSPerObject11);
 
         //Get the mesh
         //IA setup
-        pd3dImmediateContext->IASetInputLayout(g_pVertexLayout11);
+        pd3dImmediateContext->IASetInputLayout(g_pLayout11);
         UINT Strides[1];
         UINT Offsets[1];
         ID3D11Buffer* pVB[1];
@@ -898,40 +893,15 @@ void CALLBACK OnD3D11FrameRender( ID3D11Device* pd3dDevice, ID3D11DeviceContext*
         pd3dImmediateContext->IASetVertexBuffers(0, 1, pVB, Strides, Offsets);
         pd3dImmediateContext->IASetIndexBuffer(g_Mesh11.GetIB11(0), g_Mesh11.GetIBFormat11(0), 0);
 
-        // Set the shaders
-        pd3dImmediateContext->VSSetShader(g_pVertexShader, NULL, 0);
-        pd3dImmediateContext->PSSetShader(g_pPixelShader, NULL, 0);
-
-        // Set the per object constant data
-        mWorld = g_mCenterMesh * *g_Camera.GetWorldMatrix();
-        mProj = *g_Camera.GetProjMatrix();
-        mView = *g_Camera.GetViewMatrix();
-
-        mWorldViewProjection = mWorld * mView * mProj;
-
-        // VS Per object
-        V(pd3dImmediateContext->Map(g_pcbVSPerObject, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource));
-        CB_VS_PER_OBJECT* pVSPerObject = (CB_VS_PER_OBJECT*)MappedResource.pData;
-        D3DXMatrixTranspose(&pVSPerObject->m_WorldViewProj, &mWorldViewProjection);
-        D3DXMatrixTranspose(&pVSPerObject->m_World, &mWorld);
-        pd3dImmediateContext->Unmap(g_pcbVSPerObject, 0);
-
-        pd3dImmediateContext->VSSetConstantBuffers(g_iCBVSPerObjectBind, 1, &g_pcbVSPerObject);
-
-        // PS Per object
-        V(pd3dImmediateContext->Map(g_pcbPSPerObject, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource));
-        CB_PS_PER_OBJECT* pPSPerObject = (CB_PS_PER_OBJECT*)MappedResource.pData;
-        pPSPerObject->m_vObjectColor = D3DXVECTOR4(1, 1, 1, 1);
-        pd3dImmediateContext->Unmap(g_pcbPSPerObject, 0);
-
-        pd3dImmediateContext->PSSetConstantBuffers(g_iCBPSPerObjectBind, 1, &g_pcbPSPerObject);
+        // Set render resources
+        pd3dImmediateContext->IASetInputLayout(g_pLayout11);
+        pd3dImmediateContext->VSSetShader(g_pVertexShader11, nullptr, 0);
+        pd3dImmediateContext->PSSetShader(g_pPixelShader11, nullptr, 0);
+        pd3dImmediateContext->PSSetSamplers(0, 1, &g_pSamLinear);
 
-        //Render
+        // Render objects here...
         SDKMESH_SUBSET* pSubset = NULL;
         D3D11_PRIMITIVE_TOPOLOGY PrimType;
-
-        pd3dImmediateContext->PSSetSamplers(0, 1, &g_pSamLinear);
-
         for (UINT subset = 0; subset < g_Mesh11.GetNumSubsets(0); ++subset)
         {
             // Get the subset
@@ -952,16 +922,29 @@ void CALLBACK OnD3D11FrameRender( ID3D11Device* pd3dDevice, ID3D11DeviceContext*
         g_SampleUI.OnRender(fElapsedTime);
         RenderText();
         DXUT_EndPerfEvent();
+
+        static ULONGLONG timefirst = GetTickCount64();
+        if (GetTickCount64() - timefirst > 5000)
+        {
+            OutputDebugString(DXUTGetFrameStats(DXUTIsVsyncEnabled()));
+            OutputDebugString(L"\n");
+            timefirst = GetTickCount64();
+        }
         return;
     }
     }
 }
 
+void CALLBACK OnQuit(void* pUserContext)
+{
+    g_highlights.DeInit();
+    PostQuitMessage(0);
+}
 
 //--------------------------------------------------------------------------------------
 // Release D3D11 resources created in OnD3D11ResizedSwapChain
 //--------------------------------------------------------------------------------------
-void CALLBACK OnD3D11ReleasingSwapChain( void* pUserContext )
+void CALLBACK OnD3D11ReleasingSwapChain(void* pUserContext)
 {
     g_DialogResourceManager.OnD3D11ReleasingSwapChain();
 }
@@ -970,27 +953,88 @@ void CALLBACK OnD3D11ReleasingSwapChain( void* pUserContext )
 //--------------------------------------------------------------------------------------
 // Release D3D11 resources created in OnD3D11CreateDevice
 //--------------------------------------------------------------------------------------
-void CALLBACK OnD3D11DestroyDevice( void* pUserContext )
+void CALLBACK OnD3D11DestroyDevice(void* pUserContext)
 {
     g_DialogResourceManager.OnD3D11DestroyDevice();
-    g_D3DSettingsDlg.OnD3D11DestroyDevice();
-    //CDXUTDirectionWidget::StaticOnD3D11DestroyDevice();
     DXUTGetGlobalResourceCache().OnDestroyDevice();
-    SAFE_DELETE( g_pTxtHelper );
+    SAFE_DELETE(g_pTxtHelper);
 
     g_Mesh11.Destroy();
 
-    SAFE_RELEASE( g_pVertexLayout11 );
-    SAFE_RELEASE( g_pVertexBuffer );
-    SAFE_RELEASE( g_pIndexBuffer );
-    SAFE_RELEASE( g_pVertexShader );
-    SAFE_RELEASE( g_pPixelShader );
-    SAFE_RELEASE( g_pSamLinear );
+    SAFE_RELEASE(g_pVertexShader11);
+    SAFE_RELEASE(g_pPixelShader11);
+    SAFE_RELEASE(g_pLayout11);
+    SAFE_RELEASE(g_pSamLinear);
+
+    // Delete additional render resources here...
+
+    SAFE_RELEASE(g_pcbVSPerObject11);
+    SAFE_RELEASE(g_pcbVSPerFrame11);
+}
+
+
+//--------------------------------------------------------------------------------------
+// Called right before creating a D3D device, allowing the app to modify the device settings as needed
+//--------------------------------------------------------------------------------------
+bool CALLBACK ModifyDeviceSettings(DXUTDeviceSettings* pDeviceSettings, void* pUserContext)
+{
+    return true;
+}
+
+
+//--------------------------------------------------------------------------------------
+// Handle updates to the scene.  This is called regardless of which D3D API is used
+//--------------------------------------------------------------------------------------
+void CALLBACK OnFrameMove(double fTime, float fElapsedTime, void* pUserContext)
+{
+    // Update the camera's position based on user input
+    g_Camera.FrameMove(fElapsedTime);
+}
+
 
-    SAFE_RELEASE( g_pcbVSPerObject );
-    SAFE_RELEASE( g_pcbPSPerObject );
-    SAFE_RELEASE( g_pcbPSPerFrame );
+//--------------------------------------------------------------------------------------
+// Handle messages to the application
+//--------------------------------------------------------------------------------------
+LRESULT CALLBACK MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, bool* pbNoFurtherProcessing,
+    void* pUserContext)
+{
+    // Pass messages to dialog resource manager calls so GUI state is updated correctly
+    *pbNoFurtherProcessing = g_DialogResourceManager.MsgProc(hWnd, uMsg, wParam, lParam);
+    if (*pbNoFurtherProcessing)
+        return 0;
+
+    // Give the dialogs a chance to handle the message first
+    *pbNoFurtherProcessing = g_HUD.MsgProc(hWnd, uMsg, wParam, lParam);
+    if (*pbNoFurtherProcessing)
+        return 0;
+    *pbNoFurtherProcessing = g_SampleUI.MsgProc(hWnd, uMsg, wParam, lParam);
+    if (*pbNoFurtherProcessing)
+        return 0;
+
+    // Pass all remaining windows messages to camera so it can respond to user input
+    g_Camera.HandleMessages(hWnd, uMsg, wParam, lParam);
+
+    return 0;
 }
 
 
+//--------------------------------------------------------------------------------------
+// Handle key presses
+//--------------------------------------------------------------------------------------
+void CALLBACK OnKeyboard(UINT nChar, bool bKeyDown, bool bAltDown, void* pUserContext)
+{
+}
+
 
+//--------------------------------------------------------------------------------------
+// Handles the GUI events
+//--------------------------------------------------------------------------------------
+void CALLBACK OnGUIEvent(UINT nEvent, int nControlID, CDXUTControl* pControl, void* pUserContext)
+{
+    void* pUserData = pControl->GetUserData();
+    if (pUserData)
+    {
+        std::function<void()>* fn = reinterpret_cast<std::function<void()>*>(pUserData);
+        (*fn)();
+    }
+}
diff --git a/samples/DX_APIUsage/SimpleSample.hlsl b/samples/DX_APIUsage/SimpleSample.hlsl
new file mode 100644
index 0000000..7e667c1
--- /dev/null
+++ b/samples/DX_APIUsage/SimpleSample.hlsl
@@ -0,0 +1,84 @@
+//--------------------------------------------------------------------------------------
+// File: SimpleSample.hlsl
+//
+// The HLSL file for the SimpleSample sample for the Direct3D 11 device
+// 
+// Copyright (c) Microsoft Corporation. All rights reserved.
+//--------------------------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------------------------
+// Constant Buffers
+//--------------------------------------------------------------------------------------
+cbuffer cbPerObject : register( b0 )
+{
+    matrix  g_mWorldViewProjection  : packoffset( c0 );
+    matrix  g_mWorld                : packoffset( c4 );
+    float4  g_MaterialAmbientColor  : packoffset( c8 );
+    float4  g_MaterialDiffuseColor  : packoffset( c9 );
+}
+
+cbuffer cbPerFrame : register( b1 )
+{
+    float3              g_vLightDir             : packoffset( c0 );
+    float               g_fTime                 : packoffset( c0.w );
+    float4              g_LightDiffuse          : packoffset( c1 );
+};
+
+//-----------------------------------------------------------------------------------------
+// Textures and Samplers
+//-----------------------------------------------------------------------------------------
+Texture2D    g_txDiffuse : register( t0 );
+SamplerState g_samLinear : register( s0 );
+
+//--------------------------------------------------------------------------------------
+// shader input/output structure
+//--------------------------------------------------------------------------------------
+struct VS_INPUT
+{
+    float4 Position     : POSITION; // vertex position 
+    float3 Normal       : NORMAL;   // this normal comes in per-vertex
+    float2 TextureUV    : TEXCOORD0;// vertex texture coords 
+};
+
+struct VS_OUTPUT
+{
+    float4 Position     : SV_POSITION; // vertex position 
+    float4 Diffuse      : COLOR0;      // vertex diffuse color (note that COLOR0 is clamped from 0..1)
+    float2 TextureUV    : TEXCOORD0;   // vertex texture coords 
+};
+
+//--------------------------------------------------------------------------------------
+// This shader computes standard transform and lighting
+//--------------------------------------------------------------------------------------
+VS_OUTPUT RenderSceneVS( VS_INPUT input )
+{
+    VS_OUTPUT Output;
+    float3 vNormalWorldSpace;
+    
+    // Transform the position from object space to homogeneous projection space
+    Output.Position = mul( input.Position, g_mWorldViewProjection );
+    
+    // Transform the normal from object space to world space    
+    vNormalWorldSpace = normalize(mul(input.Normal, (float3x3)g_mWorld)); // normal (world space)
+
+    // Calc diffuse color    
+    Output.Diffuse.rgb = g_MaterialDiffuseColor * g_LightDiffuse * max(0,dot(vNormalWorldSpace, g_vLightDir)) + 
+                         g_MaterialAmbientColor;   
+    Output.Diffuse.a = 1.0f; 
+    
+    // Just copy the texture coordinate through
+    Output.TextureUV = input.TextureUV; 
+    
+    return Output;    
+}
+
+//--------------------------------------------------------------------------------------
+// This shader outputs the pixel's color by modulating the texture's
+// color with diffuse material color
+//--------------------------------------------------------------------------------------
+float4 RenderScenePS( VS_OUTPUT In ) : SV_TARGET
+{ 
+    // Lookup mesh texture and modulate it with diffuse
+    return g_txDiffuse.Sample( g_samLinear, In.TextureUV ) * In.Diffuse;
+}
diff --git a/samples/DX_APIUsage/Splash.bmp b/samples/DX_APIUsage/Splash.bmp
new file mode 100644
index 0000000..9001e4d
Binary files /dev/null and b/samples/DX_APIUsage/Splash.bmp differ
diff --git a/samples/DX_APIUsage/Splash.cpp b/samples/DX_APIUsage/Splash.cpp
new file mode 100644
index 0000000..f5aa853
--- /dev/null
+++ b/samples/DX_APIUsage/Splash.cpp
@@ -0,0 +1,185 @@
+#include "splash.h"
+
+const wchar_t SplashClassName[] = L"SplashWindowClass";
+
+static HBITMAP g_hSplashBMP = nullptr;
+static HDC g_hSplashDC = nullptr;
+static HDC g_hMemoryDC = nullptr;
+static LONG g_BitmapWidth = 628;
+static LONG g_BitmapHeight = 888;
+static HWND g_hSplashWnd = nullptr;
+static UINT_PTR g_TimerId = 0;
+static int g_iExitApplication = 0;
+
+#define DEMO_SPLASH_TIME 5000
+
+LRESULT CALLBACK SplashWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+{
+    switch (Msg)
+    {
+    case WM_CLOSE:
+        g_iExitApplication = 1;
+        KillTimer(g_hSplashWnd, g_TimerId);
+        PostQuitMessage(0);
+        return 0;
+
+    case WM_TIMER:
+        g_iExitApplication = 0;
+        KillTimer(g_hSplashWnd, g_TimerId);
+        PostQuitMessage(0);
+        return 0;
+
+    case WM_ERASEBKGND:
+        BitBlt(reinterpret_cast<HDC>(wParam), 0, 0, g_BitmapWidth, g_BitmapHeight, g_hMemoryDC, 0, 0, SRCCOPY);
+        break;
+
+    default:
+        return (DefWindowProc(hWnd, Msg, wParam, lParam));
+    }
+
+    return 0;
+}
+
+int ShowSplash(HINSTANCE hInstance, UINT_PTR TimerId, int BitmapId)
+{
+    g_TimerId = TimerId;
+    if (TimerId == 0)
+    {
+        return 0;
+    }
+
+    if (BitmapId == 0)
+    {
+        return 0;
+    }
+
+    g_hSplashBMP = LoadBitmap(hInstance, MAKEINTRESOURCE(BitmapId));
+    if (!g_hSplashBMP)
+    {
+        return 0;
+    }
+
+    BITMAP Bitmap;
+    if (GetObject(g_hSplashBMP, sizeof(BITMAP), &Bitmap))
+    {
+        g_BitmapWidth = Bitmap.bmWidth;
+        g_BitmapHeight = Bitmap.bmHeight;
+    }
+
+    int X = 0;
+    int Y = 0;
+    RECT DesktopRect;
+    if (GetWindowRect(GetDesktopWindow(), &DesktopRect))
+    {
+        X = (DesktopRect.right - g_BitmapWidth) / 2;
+        Y = (DesktopRect.bottom - g_BitmapHeight) / 2;
+    }
+
+    WNDCLASSEX splashwc;
+    splashwc.cbSize = sizeof(WNDCLASSEX);
+    splashwc.style = 0;
+    splashwc.lpfnWndProc = SplashWndProc;
+    splashwc.cbClsExtra = 0;
+    splashwc.cbWndExtra = 0;
+    splashwc.hInstance = hInstance;
+    splashwc.hIcon = NULL;
+    splashwc.hIconSm = NULL;
+    splashwc.hCursor = LoadCursor(NULL, IDC_ARROW);
+    splashwc.hbrBackground = NULL;
+    splashwc.lpszMenuName = NULL;
+    splashwc.lpszClassName = SplashClassName;
+    if (!RegisterClassEx(&splashwc))
+    {
+        return 0;
+    }
+
+    g_hSplashWnd = CreateWindowEx(
+        0,
+        SplashClassName,
+        L"Splash Screen",
+        WS_POPUP,
+        X,
+        Y,
+        Bitmap.bmWidth,
+        Bitmap.bmHeight,
+        NULL,
+        NULL,
+        hInstance,
+        NULL);
+
+    if (!g_hSplashWnd)
+    {
+        return 0;
+    }
+
+    g_hSplashDC = GetDC(g_hSplashWnd);
+    if (!g_hSplashDC)
+    {
+        return 0;
+    }
+
+    g_hMemoryDC = CreateCompatibleDC(g_hSplashDC);
+    if (!g_hMemoryDC)
+    {
+        return 0;
+    }
+
+    HGDIOBJ hGdiObj;
+    hGdiObj = SelectObject(g_hMemoryDC, g_hSplashBMP);
+    if (hGdiObj == NULL)
+    {
+        return 0;
+    }
+
+    ShowWindow(g_hSplashWnd, SW_SHOW);
+    if (!UpdateWindow(g_hSplashWnd))
+    {
+        return 0;
+    }
+
+    if (!SetTimer(g_hSplashWnd, g_TimerId, DEMO_SPLASH_TIME, NULL))
+    {
+        return 0;
+    }
+
+    MSG msg;
+
+    while (GetMessage(&msg, NULL, 0, 0))
+    {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+    }
+
+    return g_iExitApplication;
+}
+
+int HideSplash()
+{
+    if (g_hSplashWnd)
+    {
+        KillTimer(g_hSplashWnd, g_TimerId);
+
+        if (g_hSplashDC)
+        {
+            ReleaseDC(g_hSplashWnd, g_hSplashDC);
+            g_hSplashDC = nullptr;
+        }
+
+        if (g_hMemoryDC)
+        {
+            ReleaseDC(g_hSplashWnd, g_hMemoryDC);
+            g_hMemoryDC = nullptr;
+        }
+
+        DestroyWindow(g_hSplashWnd);
+        g_hSplashWnd = nullptr;
+    }
+
+    if (g_hSplashBMP)
+    {
+        DeleteObject(g_hSplashBMP);
+        g_hSplashBMP = nullptr;
+    }
+
+    return 0;
+}
\ No newline at end of file
diff --git a/samples/DX_APIUsage/Splash.h b/samples/DX_APIUsage/Splash.h
new file mode 100644
index 0000000..3eac0ed
--- /dev/null
+++ b/samples/DX_APIUsage/Splash.h
@@ -0,0 +1,4 @@
+#include <windows.h>
+
+int ShowSplash(HINSTANCE hInstance, UINT_PTR TimerId, int BitmapId);
+int HideSplash();
diff --git a/samples/DX_APIUsage/Splash.rc b/samples/DX_APIUsage/Splash.rc
new file mode 100644
index 0000000..ab81a49
Binary files /dev/null and b/samples/DX_APIUsage/Splash.rc differ
diff --git a/samples/DX_APIUsage/resource.h b/samples/DX_APIUsage/resource.h
index 962a2db..b83187f 100644
--- a/samples/DX_APIUsage/resource.h
+++ b/samples/DX_APIUsage/resource.h
@@ -3,14 +3,17 @@
 // Used by BasicHLSL10.rc
 //
 #define IDI_MAIN_ICON                   101
+#define IDB_BITMAP1                     102
+#define IDT_TIMER1                      103
+
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        113
 #define _APS_NEXT_COMMAND_VALUE         40029
 #define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
+#define _APS_NEXT_SYMED_VALUE           104
 #endif
 #endif
diff --git a/samples/README.md b/samples/README.md
new file mode 100644
index 0000000..4fbb929
--- /dev/null
+++ b/samples/README.md
@@ -0,0 +1,49 @@
+## List of samples
+There are two sample applications provided.
+
+#### DX_APIUsage
+This app is based on the simple DXUT framework (a simple game engine based on DX11).
+The aim of this sample application is to demonstrate all functionality present in
+GfeSDK. It shows usage using both the C API directly, and the C++ API bindings. This
+is done using a "GfeSDKWrapper". This is not part of the GfeSDK, just used as an
+abstraction layer so that the main app can use either set of bindings.
+
+All the business logic lives in Main.cpp. The highlights definitions are stored as
+JSON data in highlights_config.json. Main.cpp will read this and configure GfeSDK.
+
+#### NV_UWP_MarbleMaze
+This is based on a Microsoft UWP sample application. The aim of this sample app is
+not to fully demonstrate every GfeSDK API, but just to demonstrate a semi-realistic
+game integration.
+
+To save a highlight, drop the marble down a hole, or successfully complete the level.
+Once a level is completed, you may view the highlights from that run at any time
+from the scoreboard. This demonstrates highlight persistance.
+
+## Build and debug the samples
+Both samples provide a .sln file. Each .sln file containts a single project to build,
+and works with debug/release and x64/x86 configurations. The WindowsSDK must be
+installed in order to build the applications. This is usually installed if Visual
+Studio is installed. In addition, the UWP project may prompt you to install certain
+Visual Studio UWP components.
+
+## Run the samples without building
+Binary versions of the sample applications are provided in samples/bin. These are
+both build as x86 release applications, to allow any PC setup to run them.
+
+#### DX_APIUsage
+Installation is not necessary for this sample. Just run the .exe
+
+#### NV_UWP_MarbleMaze
+UWP applications must be sideloaded in order to run them.
+* Ensure you are able to run PowerShell scripts https://stackoverflow.com/a/4038991
+* Ensure you are able to sideload .appx files.
+  * Windows settings -> Updates and Security -> For Developers -> Sideload Apps
+* Ensure you've uninstalled the previous version of the test app, if necessary. This can be accomplished by finding the demo application in the start menu, right clicking, and choosing "Uninstall". Another option is to find the app by opening Powershell and running "Get-AppxPackage". It should be near the bottom of the big list. Find the full app name, and run "Remove-AppxPackage -Package <fullappname>"
+  * Install the new app by opening PowerShell, and running the .ps1 script found in the sample package. This will sideload the application. Newer versions of Windows10 are able to right click the PowerShell script from Windows Explorer and run it that way.
+* You should now be able to find the sample application in the start menu, or through Cortana, etc.
+
+If installation doesn't work, there are several possible problems
+* Haven't enabled sideloading
+* A file is open in the app's data direction, such as any logfile or direction here: %LOCALAPPDATA%\Package\<fullappname>
+
diff --git a/samples/bin/DX_APIUsage/win32/GfeSDK.dll b/samples/bin/DX_APIUsage/win32/GfeSDK.dll
index 6818fd2..31473ae 100644
Binary files a/samples/bin/DX_APIUsage/win32/GfeSDK.dll and b/samples/bin/DX_APIUsage/win32/GfeSDK.dll differ
diff --git a/samples/bin/DX_APIUsage/win32/SimpleSample.hlsl b/samples/bin/DX_APIUsage/win32/SimpleSample.hlsl
new file mode 100644
index 0000000..7e667c1
--- /dev/null
+++ b/samples/bin/DX_APIUsage/win32/SimpleSample.hlsl
@@ -0,0 +1,84 @@
+//--------------------------------------------------------------------------------------
+// File: SimpleSample.hlsl
+//
+// The HLSL file for the SimpleSample sample for the Direct3D 11 device
+// 
+// Copyright (c) Microsoft Corporation. All rights reserved.
+//--------------------------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------------------------
+// Constant Buffers
+//--------------------------------------------------------------------------------------
+cbuffer cbPerObject : register( b0 )
+{
+    matrix  g_mWorldViewProjection  : packoffset( c0 );
+    matrix  g_mWorld                : packoffset( c4 );
+    float4  g_MaterialAmbientColor  : packoffset( c8 );
+    float4  g_MaterialDiffuseColor  : packoffset( c9 );
+}
+
+cbuffer cbPerFrame : register( b1 )
+{
+    float3              g_vLightDir             : packoffset( c0 );
+    float               g_fTime                 : packoffset( c0.w );
+    float4              g_LightDiffuse          : packoffset( c1 );
+};
+
+//-----------------------------------------------------------------------------------------
+// Textures and Samplers
+//-----------------------------------------------------------------------------------------
+Texture2D    g_txDiffuse : register( t0 );
+SamplerState g_samLinear : register( s0 );
+
+//--------------------------------------------------------------------------------------
+// shader input/output structure
+//--------------------------------------------------------------------------------------
+struct VS_INPUT
+{
+    float4 Position     : POSITION; // vertex position 
+    float3 Normal       : NORMAL;   // this normal comes in per-vertex
+    float2 TextureUV    : TEXCOORD0;// vertex texture coords 
+};
+
+struct VS_OUTPUT
+{
+    float4 Position     : SV_POSITION; // vertex position 
+    float4 Diffuse      : COLOR0;      // vertex diffuse color (note that COLOR0 is clamped from 0..1)
+    float2 TextureUV    : TEXCOORD0;   // vertex texture coords 
+};
+
+//--------------------------------------------------------------------------------------
+// This shader computes standard transform and lighting
+//--------------------------------------------------------------------------------------
+VS_OUTPUT RenderSceneVS( VS_INPUT input )
+{
+    VS_OUTPUT Output;
+    float3 vNormalWorldSpace;
+    
+    // Transform the position from object space to homogeneous projection space
+    Output.Position = mul( input.Position, g_mWorldViewProjection );
+    
+    // Transform the normal from object space to world space    
+    vNormalWorldSpace = normalize(mul(input.Normal, (float3x3)g_mWorld)); // normal (world space)
+
+    // Calc diffuse color    
+    Output.Diffuse.rgb = g_MaterialDiffuseColor * g_LightDiffuse * max(0,dot(vNormalWorldSpace, g_vLightDir)) + 
+                         g_MaterialAmbientColor;   
+    Output.Diffuse.a = 1.0f; 
+    
+    // Just copy the texture coordinate through
+    Output.TextureUV = input.TextureUV; 
+    
+    return Output;    
+}
+
+//--------------------------------------------------------------------------------------
+// This shader outputs the pixel's color by modulating the texture's
+// color with diffuse material color
+//--------------------------------------------------------------------------------------
+float4 RenderScenePS( VS_OUTPUT In ) : SV_TARGET
+{ 
+    // Lookup mesh texture and modulate it with diffuse
+    return g_txDiffuse.Sample( g_samLinear, In.TextureUV ) * In.Diffuse;
+}
-- 
cgit v1.2.3