Create a new type to handle Pdh* functions. Fixed #1962.

microsoft · Aug 20, 2024 · ff991cf · ff991cf
1 parent a133cf4
commit ff991cf
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 1 deletion.
diff --git a/generation/WinSDK/autoTypes.json b/generation/WinSDK/autoTypes.json
@@ -2755,5 +2755,23 @@
     "ValueType": "long",
     "CloseApi": "EventUnregister",
     "NativeTypedef": true
+  },
+  {
+    "Namespace": "Windows.Win32.System.Performance",
+    "Name": "PDH_HCOUNTER",
+    "ValueType": "DECLARE_HANDLE",
+    "NativeTypedef": true
+  },
+  {
+    "Name": "PDH_HLOG",
+    "ValueType": "DECLARE_HANDLE",
+    "CloseApi": "PdhCloseLog",
+    "NativeTypedef": true
+  },
+  {
+    "Name": "PDH_HQUERY",
+    "ValueType": "DECLARE_HANDLE",
+    "CloseApi": "PdhCloseQuery",
+    "NativeTypedef": true
   }
-  ]
+]
diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
@@ -1224,3 +1224,75 @@ Windows.Win32.Networking.WinSock.Apis.WSASetEvent : hEvent...HANDLE => WSAEVENT
 Windows.Win32.Media.MediaFoundation.Apis.MFCreateAttributes : ppMFAttributes : [Out] => [ComOutPtr,Out]
 # Move FILE_CASE_SENSITIVE_INFO to Windows.Win32.Storage.FileSystem #1943
 Windows.Win32.System.WindowsProgramming.FILE_CASE_SENSITIVE_INFO => Windows.Win32.Storage.FileSystem.FILE_CASE_SENSITIVE_INFO
+# Create a newtype to handle Pdh* functions #1962
+Windows.Win32.System.Performance.Apis.PdhAddCounterA : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhAddCounterA : phCounter...IntPtr* => PDH_HCOUNTER*
+Windows.Win32.System.Performance.Apis.PdhAddCounterW : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhAddCounterW : phCounter...IntPtr* => PDH_HCOUNTER*
+Windows.Win32.System.Performance.Apis.PdhAddEnglishCounterA : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhAddEnglishCounterA : phCounter...IntPtr* => PDH_HCOUNTER*
+Windows.Win32.System.Performance.Apis.PdhAddEnglishCounterW : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhAddEnglishCounterW : phCounter...IntPtr* => PDH_HCOUNTER*
+Windows.Win32.System.Performance.Apis.PdhBindInputDataSourceA : phDataSource...IntPtr* => PDH_HLOG*
+Windows.Win32.System.Performance.Apis.PdhBindInputDataSourceW : phDataSource...IntPtr* => PDH_HLOG*
+Windows.Win32.System.Performance.Apis.PdhCalculateCounterFromRawValue : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhCloseLog : hLog...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhCloseQuery : hQuery : [In] => [In,Out]
+Windows.Win32.System.Performance.Apis.PdhCloseQuery : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhCollectQueryData : hQuery : [In] => [In,Out]
+Windows.Win32.System.Performance.Apis.PdhCollectQueryData : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhCollectQueryDataEx : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhCollectQueryDataWithTime : hQuery : [In] => [In,Out]
+Windows.Win32.System.Performance.Apis.PdhCollectQueryDataWithTime : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhComputeCounterStatistics : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhEnumMachinesHA : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhEnumMachinesHW : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhEnumObjectItemsHA : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhEnumObjectItemsHW : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhEnumObjectsHA : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhEnumObjectsHW : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhExpandWildCardPathHA : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhExpandWildCardPathHW : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhGetCounterInfoA : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhGetCounterInfoW : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhGetCounterTimeBase : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhGetDataSourceTimeRangeH : hDataSource : [In,Optional] => [In,Optional,Out]
+Windows.Win32.System.Performance.Apis.PdhGetDataSourceTimeRangeH : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhGetDefaultPerfCounterHA : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhGetDefaultPerfCounterHW : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhGetDefaultPerfObjectHA : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhGetDefaultPerfObjectHW : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhGetFormattedCounterArrayA : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhGetFormattedCounterArrayW : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhGetFormattedCounterValue : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhGetLogFileSize : hLog...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhGetLogSetGUID : hLog...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhGetRawCounterArrayA : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhGetRawCounterArrayW : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhGetRawCounterValue : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhIsRealTimeQuery : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhOpenLogA : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhOpenLogA : phLog...IntPtr* => PDH_HLOG*
+Windows.Win32.System.Performance.Apis.PdhOpenLogW : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhOpenLogW : phLog...IntPtr* => PDH_HLOG*
+Windows.Win32.System.Performance.Apis.PdhOpenQueryA : phQuery...IntPtr* => PDH_HQUERY*
+Windows.Win32.System.Performance.Apis.PdhOpenQueryH : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhOpenQueryH : phQuery...IntPtr* => PDH_HQUERY*
+Windows.Win32.System.Performance.Apis.PdhOpenQueryW : phQuery...IntPtr* => PDH_HQUERY*
+Windows.Win32.System.Performance.Apis.PdhReadRawLogRecord : hLog...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhRemoveCounter : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhSetCounterScaleFactor : hCounter : [In] => [In,Out]
+Windows.Win32.System.Performance.Apis.PdhSetCounterScaleFactor : hCounter...IntPtr => PDH_HCOUNTER
+Windows.Win32.System.Performance.Apis.PdhSetLogSetRunID : hLog : [In] => [In,Out]
+Windows.Win32.System.Performance.Apis.PdhSetLogSetRunID : hLog...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhSetQueryTimeRange : hQuery...IntPtr => PDH_HQUERY
+Windows.Win32.System.Performance.Apis.PdhUpdateLogA : hLog...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhUpdateLogFileCatalog : hLog...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhUpdateLogW : hLog...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhValidatePathExA : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.Apis.PdhValidatePathExW : hDataSource...IntPtr => PDH_HLOG
+Windows.Win32.System.Performance.PDH_BROWSE_DLG_CONFIG_HA.hDataSource...System.IntPtr => Windows.Win32.System.Performance.PDH_HLOG
+Windows.Win32.System.Performance.PDH_BROWSE_DLG_CONFIG_HW.hDataSource...System.IntPtr => Windows.Win32.System.Performance.PDH_HLOG
+Windows.Win32.System.Performance.PDH_HCOUNTER added
+Windows.Win32.System.Performance.PDH_HLOG added
+Windows.Win32.System.Performance.PDH_HQUERY added