mirror/Vortice.Win32
1
0
Fork 0
mirror of https://github.com/amerkoleci/Vortice.Win32.git synced 2026-01-14 16:16:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to Win32Metadata 38.0.19-preview and FIX struct generation.

Browse Source
This commit is contained in:
Amer Koleci
2022-11-21 09:20:46 +01:00
parent 8951f5b092
commit cf55322a11
45 changed files with 474 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Generator/win32json/api/Graphics.Direct2D.json
View File

@@ -6850,45 +6850,6 @@
}
]
}
,{
"Name":"Matrix4x3F"
,"Architectures":[]
,"Platform":null
,"Kind":"Struct"
,"Size":0
,"PackingSize":0
,"Fields":[
{"Name":"Base","Type":{"Kind":"ApiRef","Name":"D2D_MATRIX_4X3_F","TargetKind":"Default","Api":"Graphics.Direct2D.Common","Parents":[]},"Attrs":[]}
]
,"NestedTypes":[
]
}
,{
"Name":"Matrix4x4F"
,"Architectures":[]
,"Platform":null
,"Kind":"Struct"
,"Size":0
,"PackingSize":0
,"Fields":[
{"Name":"Base","Type":{"Kind":"ApiRef","Name":"D2D_MATRIX_4X4_F","TargetKind":"Default","Api":"Graphics.Direct2D.Common","Parents":[]},"Attrs":[]}
]
,"NestedTypes":[
]
}
,{
"Name":"Matrix5x4F"
,"Architectures":[]
,"Platform":null
,"Kind":"Struct"
,"Size":0
,"PackingSize":0
,"Fields":[
{"Name":"Base","Type":{"Kind":"ApiRef","Name":"D2D_MATRIX_5X4_F","TargetKind":"Default","Api":"Graphics.Direct2D.Common","Parents":[]},"Attrs":[]}
]
,"NestedTypes":[
]
}
,{
"Name":"PD2D1_PROPERTY_SET_FUNCTION"
,"Architectures":[]

4
src/Generator/win32json/api/Graphics.Direct3D11.json
View File

@@ -3856,13 +3856,13 @@
,"Architectures":[]
,"Platform":null
,"Kind":"Enum"
,"Flags":false
,"Flags":true
,"Scoped":false
,"Values":[
{"Name":"D3D11_CLEAR_DEPTH","Value":1}
,{"Name":"D3D11_CLEAR_STENCIL","Value":2}
]
,"IntegerBase":"Int32"
,"IntegerBase":"UInt32"
}
,{
"Name":"D3D11_BOX"

8
src/Generator/win32json/api/Graphics.DirectComposition.json
View File

@@ -2123,7 +2123,7 @@
,"Params":[
{"Name":"updateRect","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"RECT","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["In","Optional","Const"]}
,{"Name":"iid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
,{"Name":"updateObject","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out"]}
,{"Name":"updateObject","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr"]}
,{"Name":"updateOffset","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"POINT","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out"]}
]
}
@@ -4438,7 +4438,7 @@
,"Params":[
{"Name":"dxgiDevice","Type":{"Kind":"ApiRef","Name":"IDXGIDevice","TargetKind":"Com","Api":"Graphics.Dxgi","Parents":[]},"Attrs":["In","Optional"]}
,{"Name":"iid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out"]}
,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr"]}
]
}
,{
@@ -4453,7 +4453,7 @@
,"Params":[
{"Name":"renderingDevice","Type":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]},"Attrs":["In","Optional"]}
,{"Name":"iid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out"]}
,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr"]}
]
}
,{
@@ -4468,7 +4468,7 @@
,"Params":[
{"Name":"renderingDevice","Type":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]},"Attrs":["In","Optional"]}
,{"Name":"iid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out"]}
,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr"]}
]
}
,{

2
src/Generator/win32json/api/Graphics.DirectWrite.json
View File

@@ -9089,7 +9089,7 @@
,"Params":[
{"Name":"factoryType","Type":{"Kind":"ApiRef","Name":"DWRITE_FACTORY_TYPE","TargetKind":"Default","Api":"Graphics.DirectWrite","Parents":[]},"Attrs":["In"]}
,{"Name":"iid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
,{"Name":"factory","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
,{"Name":"factory","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr"]}
]
}
]

75
src/Generator/win32json/api/Graphics.Dxgi.json
View File

@@ -2,55 +2,6 @@
"Constants":[
{
"Name":"DXGI_USAGE_SHADER_INPUT"
,"Type":{"Kind":"Native","Name":"UInt32"}
,"ValueType":"UInt32"
,"Value":16
,"Attrs":[]
}
,{
"Name":"DXGI_USAGE_RENDER_TARGET_OUTPUT"
,"Type":{"Kind":"Native","Name":"UInt32"}
,"ValueType":"UInt32"
,"Value":32
,"Attrs":[]
}
,{
"Name":"DXGI_USAGE_BACK_BUFFER"
,"Type":{"Kind":"Native","Name":"UInt32"}
,"ValueType":"UInt32"
,"Value":64
,"Attrs":[]
}
,{
"Name":"DXGI_USAGE_SHARED"
,"Type":{"Kind":"Native","Name":"UInt32"}
,"ValueType":"UInt32"
,"Value":128
,"Attrs":[]
}
,{
"Name":"DXGI_USAGE_READ_ONLY"
,"Type":{"Kind":"Native","Name":"UInt32"}
,"ValueType":"UInt32"
,"Value":256
,"Attrs":[]
}
,{
"Name":"DXGI_USAGE_DISCARD_ON_PRESENT"
,"Type":{"Kind":"Native","Name":"UInt32"}
,"ValueType":"UInt32"
,"Value":512
,"Attrs":[]
}
,{
"Name":"DXGI_USAGE_UNORDERED_ACCESS"
,"Type":{"Kind":"Native","Name":"UInt32"}
,"ValueType":"UInt32"
,"Value":1024
,"Attrs":[]
}
,{
"Name":"DXGI_MAP_READ"
,"Type":{"Kind":"Native","Name":"UInt32"}
,"ValueType":"UInt32"
@@ -526,6 +477,24 @@
]
,"IntegerBase":"UInt32"
}
,{
"Name":"DXGI_USAGE"
,"Architectures":[]
,"Platform":null
,"Kind":"Enum"
,"Flags":true
,"Scoped":false
,"Values":[
{"Name":"DXGI_USAGE_SHADER_INPUT","Value":16}
,{"Name":"DXGI_USAGE_RENDER_TARGET_OUTPUT","Value":32}
,{"Name":"DXGI_USAGE_BACK_BUFFER","Value":64}
,{"Name":"DXGI_USAGE_SHARED","Value":128}
,{"Name":"DXGI_USAGE_READ_ONLY","Value":256}
,{"Name":"DXGI_USAGE_DISCARD_ON_PRESENT","Value":512}
,{"Name":"DXGI_USAGE_UNORDERED_ACCESS","Value":1024}
]
,"IntegerBase":"UInt32"
}
,{
"Name":"DXGI_FRAME_STATISTICS"
,"Architectures":[]
@@ -687,7 +656,7 @@
,"Fields":[
{"Name":"BufferDesc","Type":{"Kind":"ApiRef","Name":"DXGI_MODE_DESC","TargetKind":"Default","Api":"Graphics.Dxgi.Common","Parents":[]},"Attrs":[]}
,{"Name":"SampleDesc","Type":{"Kind":"ApiRef","Name":"DXGI_SAMPLE_DESC","TargetKind":"Default","Api":"Graphics.Dxgi.Common","Parents":[]},"Attrs":[]}
,{"Name":"BufferUsage","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
,{"Name":"BufferUsage","Type":{"Kind":"ApiRef","Name":"DXGI_USAGE","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]},"Attrs":[]}
,{"Name":"BufferCount","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
,{"Name":"OutputWindow","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
,{"Name":"Windowed","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
@@ -813,7 +782,7 @@
,"Platform":null
,"Attrs":[]
,"Params":[
{"Name":"pUsage","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["Out"]}
{"Name":"pUsage","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DXGI_USAGE","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]}},"Attrs":["Out"]}
]
}
,{
@@ -1409,7 +1378,7 @@
,"Params":[
{"Name":"pDesc","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DXGI_SURFACE_DESC","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]}},"Attrs":["In","Const"]}
,{"Name":"NumSurfaces","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
,{"Name":"Usage","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
,{"Name":"Usage","Type":{"Kind":"ApiRef","Name":"DXGI_USAGE","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]},"Attrs":["In"]}
,{"Name":"pSharedResource","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DXGI_SHARED_RESOURCE","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]}},"Attrs":["In","Optional","Const"]}
,{"Name":"ppSurface","Type":{"Kind":"LPArray","NullNullTerm":false,"CountConst":-1,"CountParamIndex":1,"Child":{"Kind":"ApiRef","Name":"IDXGISurface","TargetKind":"Com","Api":"Graphics.Dxgi","Parents":[]}},"Attrs":["Out"]}
]
@@ -2006,7 +1975,7 @@
,{"Name":"Format","Type":{"Kind":"ApiRef","Name":"DXGI_FORMAT","TargetKind":"Default","Api":"Graphics.Dxgi.Common","Parents":[]},"Attrs":[]}
,{"Name":"Stereo","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
,{"Name":"SampleDesc","Type":{"Kind":"ApiRef","Name":"DXGI_SAMPLE_DESC","TargetKind":"Default","Api":"Graphics.Dxgi.Common","Parents":[]},"Attrs":[]}
,{"Name":"BufferUsage","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
,{"Name":"BufferUsage","Type":{"Kind":"ApiRef","Name":"DXGI_USAGE","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]},"Attrs":[]}
,{"Name":"BufferCount","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
,{"Name":"Scaling","Type":{"Kind":"ApiRef","Name":"DXGI_SCALING","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]},"Attrs":[]}
,{"Name":"SwapEffect","Type":{"Kind":"ApiRef","Name":"DXGI_SWAP_EFFECT","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]},"Attrs":[]}

2
src/Generator/win32json/api/Graphics.Imaging.json
View File

@@ -5029,7 +5029,7 @@
,"Attrs":[]
,"Params":[
{"Name":"wzFilename","Type":{"Kind":"ApiRef","Name":"PWSTR","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In","Const"]}
,{"Name":"pguidVendor","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
,{"Name":"pguidVendor","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Optional","Const"]}
,{"Name":"dwDesiredAccess","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
,{"Name":"metadataOptions","Type":{"Kind":"ApiRef","Name":"WICDecodeOptions","TargetKind":"Default","Api":"Graphics.Imaging","Parents":[]},"Attrs":["In"]}
,{"Name":"ppIDecoder","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IWICBitmapDecoder","TargetKind":"Com","Api":"Graphics.Imaging","Parents":[]}},"Attrs":["Out","RetVal"]}