ExtendedTools: Update d3dkmt to latest SDK

Author: dmex

plugins/ExtendedTools/PresentMon/ETW/Microsoft_Windows_DxgKrnl.h

@@ -400,19 +400,19 @@ enum class MMIOFlip {
 }
 
 // d3dkmthk.h
-enum D3DKMT_PRESENT_MODEL
-{
-    D3DKMT_PM_UNINITIALIZED       = 0,
-    D3DKMT_PM_REDIRECTED_GDI       = 1,
-    D3DKMT_PM_REDIRECTED_FLIP      = 2,
-    D3DKMT_PM_REDIRECTED_BLT       = 3,
-    D3DKMT_PM_REDIRECTED_VISTABLT  = 4,
-    D3DKMT_PM_SCREENCAPTUREFENCE   = 5,
-    D3DKMT_PM_REDIRECTED_GDI_SYSMEM  = 6,
-    D3DKMT_PM_REDIRECTED_COMPOSITION = 7,
-    D3DKMT_PM_SURFACECOMPLETE        = 8,
-    D3DKMT_PM_FLIPMANAGER            = 9,
-};
+//enum D3DKMT_PRESENT_MODEL
+//{
+//    D3DKMT_PM_UNINITIALIZED       = 0,
+//    D3DKMT_PM_REDIRECTED_GDI       = 1,
+//    D3DKMT_PM_REDIRECTED_FLIP      = 2,
+//    D3DKMT_PM_REDIRECTED_BLT       = 3,
+//    D3DKMT_PM_REDIRECTED_VISTABLT  = 4,
+//    D3DKMT_PM_SCREENCAPTUREFENCE   = 5,
+//    D3DKMT_PM_REDIRECTED_GDI_SYSMEM  = 6,
+//    D3DKMT_PM_REDIRECTED_COMPOSITION = 7,
+//    D3DKMT_PM_SURFACECOMPLETE        = 8,
+//    D3DKMT_PM_FLIPMANAGER            = 9,
+//};
 
 // dxetwevt.h
 enum DXGKETW_QUEUE_PACKET_TYPE {

plugins/ExtendedTools/exttools.h

@@ -30,6 +30,10 @@
 #include <settings.h>
 #include <math.h>
 
+#include <dxmini.h>
+#include <d3dkmddi.h>
+#include <d3dkmthk.h>
+
 #include "resource.h"
 
 #include "framemon.h"
@@ -77,6 +81,10 @@ extern BOOLEAN EtPropagateCpuUsage;
 #define ET_WM_SHOWDIALOG (WM_APP + 1)
 #define ET_WM_UPDATE (WM_APP + 2)
 
+VOID EtLoadSettings(
+    VOID
+    );
+
 // phsvc extensions
 
 typedef enum _ET_PHSVC_API_NUMBER
@@ -536,6 +544,8 @@ VOID EtSaveSettingsDiskTreeList(
 
 // gpumon
 
+typedef D3DKMT_HANDLE* PD3DKMT_HANDLE;
+
 extern BOOLEAN EtGpuEnabled;
 extern BOOLEAN EtGpuSupported;
 extern BOOLEAN EtD3DEnabled;
@@ -582,6 +592,12 @@ NTSTATUS EtQueryAdapterInformation(
     _In_ UINT32 InformationLength
     );
 
+_Success_(return)
+BOOLEAN EtOpenAdapterFromDeviceName(
+    _Out_ PD3DKMT_HANDLE AdapterHandle,
+    _In_ PWSTR DeviceName
+    );
+
 BOOLEAN EtCloseAdapterHandle(
     _In_ D3DKMT_HANDLE AdapterHandle
     );

plugins/ExtendedTools/framemon.cpp

@@ -76,7 +76,10 @@ VOID EtFramesMonitorUninitialization(
     VOID
     )
 {
-    StopFpsTraceSession();
+    if (EtFramesEnabled)
+    {
+        StopFpsTraceSession();
+    }
 }
 
 VOID EtFramesMonitorStart(

plugins/ExtendedTools/fwmon.c

@@ -538,7 +538,7 @@ PPH_STRING EtFwGetDnsReverseNameFromAddress(
             {
                 PH_FORMAT format[4];
                 SIZE_T returnLength;
-                WCHAR reverseNameBuffer[PH_INT32_STR_LEN_1];
+                WCHAR reverseNameBuffer[IP6_REVERSE_DOMAIN_STRING_LENGTH];
 
                 PhInitFormatX(&format[0], Address->In6Addr.s6_addr[i] & 0xF);
                 PhInitFormatC(&format[1], L'.');

plugins/ExtendedTools/gpudetails.c

@@ -66,7 +66,7 @@ VOID EtpGpuDetailsAddListViewItemGroups(
 }
 
 VOID EtpQueryAdapterDeviceProperties(
-    _In_ PWSTR DeviceName,
+    _In_ PCWSTR DeviceName,
     _In_ HWND ListViewHandle)
 {
     PPH_STRING driverDate;
@@ -362,7 +362,7 @@ VOID EtpGpuDetailsEnumAdapters(
         gpuAdapter = EtpGpuAdapterList->Items[i];
 
         memset(&openAdapterFromDeviceName, 0, sizeof(D3DKMT_OPENADAPTERFROMDEVICENAME));
-        openAdapterFromDeviceName.DeviceName = PhGetString(gpuAdapter->DeviceInterface);
+        openAdapterFromDeviceName.pDeviceName = PhGetString(gpuAdapter->DeviceInterface);
 
         if (!NT_SUCCESS(D3DKMTOpenAdapterFromDeviceName(&openAdapterFromDeviceName)))
             continue;
@@ -371,22 +371,22 @@ VOID EtpGpuDetailsEnumAdapters(
         {
             if (PhAddListViewGroup(ListViewHandle, i, PhGetString(gpuAdapter->Description)) == MAXINT)
             {
-                EtCloseAdapterHandle(openAdapterFromDeviceName.AdapterHandle);
+                EtCloseAdapterHandle(openAdapterFromDeviceName.hAdapter);
                 continue;
             }
 
             EtpGpuDetailsAddListViewItemGroups(ListViewHandle, i);
         }
 
-        EtpQueryAdapterDeviceProperties(openAdapterFromDeviceName.DeviceName, ListViewHandle);
+        EtpQueryAdapterDeviceProperties(openAdapterFromDeviceName.pDeviceName, ListViewHandle);
         //EtpQueryAdapterRegistryInfo(openAdapterFromDeviceName.AdapterHandle, ListViewHandle);
-        EtpQueryAdapterDriverModel(openAdapterFromDeviceName.AdapterHandle, ListViewHandle);
+        EtpQueryAdapterDriverModel(openAdapterFromDeviceName.hAdapter, ListViewHandle);
         //EtpQueryAdapterDriverVersion(openAdapterFromDeviceName.AdapterHandle, ListViewHandle);
-        EtpQueryAdapterDeviceIds(openAdapterFromDeviceName.AdapterHandle, ListViewHandle);
+        EtpQueryAdapterDeviceIds(openAdapterFromDeviceName.hAdapter, ListViewHandle);
         //EtQueryAdapterFeatureLevel(openAdapterFromDeviceName.AdapterLuid);
-        EtpQueryAdapterPerfInfo(openAdapterFromDeviceName.AdapterHandle, ListViewHandle);
+        EtpQueryAdapterPerfInfo(openAdapterFromDeviceName.hAdapter, ListViewHandle);
 
-        EtCloseAdapterHandle(openAdapterFromDeviceName.AdapterHandle);
+        EtCloseAdapterHandle(openAdapterFromDeviceName.hAdapter);
     }
 }