MetadataTypedef attribute does not work. Fixed #1575.

microsoft · May 11, 2023 · 3608e3f · 3608e3f
1 parent 7b4fb0c
commit 3608e3f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/generation/WinSDK/autoTypes.json b/generation/WinSDK/autoTypes.json
@@ -290,20 +290,12 @@
     "NativeTypedef": true
   },
   {
+    "Namespace": "Windows.Win32.Graphics.Gdi",
     "Name": "HDC",
     "ValueType": "DECLARE_HANDLE",
-    "CloseApi": "ReleaseDC",
     "InvalidHandleValues": [ -1, 0 ],
     "NativeTypedef": true
   },
-  {
-    "Name": "CreatedHDC",
-    "ValueType": "IntPtr",
-    "CloseApi": "DeleteDC",
-    "AlsoUsableFor": "HDC",
-    "InvalidHandleValues": [ -1, 0 ],
-    "NativeTypedef": false
-  },
   {
     "Namespace": "Windows.Win32.Graphics.Gdi",
     "Name": "HGDIOBJ",

diff --git a/generation/WinSDK/emitter.settings.rsp b/generation/WinSDK/emitter.settings.rsp
@@ -416,12 +416,6 @@ PRTM_ENTITY_EXPORT_METHOD,RTM_ENTITY_EXPORT_METHOD*
 OpenProcessToken::DesiredAccess=TOKEN_ACCESS_MASK
 OpenThreadToken::DesiredAccess=TOKEN_ACCESS_MASK
 DuplicateTokenEx::dwDesiredAccess=TOKEN_ACCESS_MASK
-CreateDCW::return=CreatedHDC
-CreateDCA::return=CreatedHDC
-CreateICW::return=CreatedHDC
-CreateICA::return=CreatedHDC
-CreateCompatibleDC::return=CreatedHDC
-DeleteDC::hdc=CreatedHDC
 DXVAHD_STREAM_DATA::ppPastSurfaces=[NativeArrayInfo(CountParamIndex=3)]
 DXVAHD_STREAM_DATA::ppFutureSurfaces=[NativeArrayInfo(CountParamIndex=4)]
 CreateIcon::lpbANDbits=[NativeArrayInfo]

diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
@@ -5039,3 +5039,12 @@ Windows.Win32.Graphics.Dxgi.IDXGIResource.SetEvictionPriority : EvictionPriority
 # Fixed MetadataTypedef definitions.
 Windows.Win32.System.LibraryLoader.UPDATERESOURCE_HANDLE : [InvalidHandleValue(0),NativeTypedef,RAIIFree(EndUpdateResourceW)] => [InvalidHandleValue(0),MetadataTypedef,RAIIFree(EndUpdateResourceW)]
 Windows.Win32.UI.WindowsAndMessaging.LOADIMAGE_HANDLE : [InvalidHandleValue(0),NativeTypedef] => [InvalidHandleValue(0),MetadataTypedef]
+# Fixed #1575.
+Windows.Win32.Graphics.Gdi.Apis.CreateCompatibleDC : return...CreatedHDC => HDC
+Windows.Win32.Graphics.Gdi.Apis.CreateDCA : return...CreatedHDC => HDC
+Windows.Win32.Graphics.Gdi.Apis.CreateDCW : return...CreatedHDC => HDC
+Windows.Win32.Graphics.Gdi.Apis.CreateICA : return...CreatedHDC => HDC
+Windows.Win32.Graphics.Gdi.Apis.CreateICW : return...CreatedHDC => HDC
+Windows.Win32.Graphics.Gdi.Apis.DeleteDC : hdc...CreatedHDC => HDC
+Windows.Win32.Graphics.Gdi.CreatedHDC removed
+Windows.Win32.Graphics.Gdi.HDC : [InvalidHandleValue(-1),InvalidHandleValue(0),NativeTypedef,RAIIFree(ReleaseDC)] => [InvalidHandleValue(-1),InvalidHandleValue(0),NativeTypedef]