Skip to content

Commit

Permalink
Add missing types for WindowsCodec (#2167)
Browse files Browse the repository at this point in the history
* Strongly-typed WindowsCodec

* Add more types to Win32 extras

* Use IntPtr for handles

* Bring back IMessageFilter

* Minor fixes and resolving CR feedbacks

* More fixes
  • Loading branch information
hez2010 authored May 15, 2024
1 parent b6d2aaf commit aa4c2b3
Show file tree
Hide file tree
Showing 216 changed files with 147,712 additions and 6,856 deletions.
Binary file modified build/cache/wic.json.gz
Binary file not shown.
Binary file modified build/cache/win32extras.json.gz
Binary file not shown.
221 changes: 212 additions & 9 deletions generator.json
Original file line number Diff line number Diff line change
Expand Up @@ -1155,6 +1155,7 @@
"-Ibuild/include"
],
"traverse": [
"$windowsSdkDir/Include/$windowsSdkVersion/shared/wtypes.h",
"$windowsSdkDir/Include/$windowsSdkVersion/shared/rpcdcep.h",
"$windowsSdkDir/Include/$windowsSdkVersion/shared/WTypesbase.h",
"$windowsSdkDir/Include/$windowsSdkVersion/shared/evntrace.h",
Expand All @@ -1165,6 +1166,10 @@
"$windowsSdkDir/Include/$windowsSdkVersion/um/fileapi.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/objidlbase.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/objidl.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/ocidl.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/oaidl.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/propidlbase.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/propidl.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/Documenttarget.h",
"$windowsSdkDir/Include/$windowsSdkVersion/shared/evntprov.h"
],
Expand All @@ -1177,7 +1182,104 @@
"_STGMEDIUM_UNION",
"_GDI_OBJECT",
"__MIDL_IAdviseSink_0002",
"__MIDL_IAdviseSink_0003"
"__MIDL_IAdviseSink_0003",
"__MIDL_IOleAutomationTypes_0001",
"__MIDL___MIDL_itf_d3d11_0000_0034_0001",
"__MIDL___MIDL_itf_dxva2api_0000_0000_0003",
"__MIDL___MIDL_itf_dxva2api_0000_0000_0004",
"__MIDL___MIDL_itf_dxva2api_0000_0000_0005",
"__MIDL___MIDL_itf_dxva2api_0000_0000_0006",
"__MIDL___MIDL_itf_dxva2api_0000_0000_0007",
"__MIDL___MIDL_itf_dxva2api_0000_0000_0008",
"__MIDL___MIDL_itf_dxva2api_0000_0000_0009",
"__MIDL___MIDL_itf_dxva2api_0000_0000_0010",
"__MIDL___MIDL_itf_dxva2api_0000_0000_0011",
"__MIDL___MIDL_itf_dxva2api_0000_0000_0012",
"__MIDL___MIDL_itf_dxva2api_0000_0000_0013",
"__MIDL___MIDL_itf_dxva2api_0000_0006_0001",
"IClassFactory2",
"IViewObjectEx",
"IOleInPlaceSiteEx",
"IOleInPlaceSiteWindowless",
"IPicture",
"IPicture2",
"IPictureDisp",
"IFont",
"IFontDisp",
"IFontEventsDisp",
"ISimpleFrameSite",
"IPersistPropertyBag",
"IPersistPropertyBag2",
"IPropertyPage",
"IPropertyPage2",
"IPropertyPageSite",
"IQuickActivate",
"IPointerInactive",
"IOleControl",
"IOleControlSite",
"IOleInPlaceObjectWindowless",
"tagVARIANT",
"tagVARIANTUnion",
"tagVARIANTUnionUnion",
"tagVARIANTUnionUnionUnion",
"tagVARIANTUnionUnionUnionUnion",
"tagSAFEARRAY",
"tagSAFEARRAYBOUND",
"tagQACONTAINER",
"tagQACONTAINERFLAGS",
"tagPROPPAGEINFO",
"tagDISPPARAMS",
"_wireBRECORD",
"_wireSAFEARRAY",
"_wireSAFEARRAY_UNION",
"_wireSAFEARR_BRECORD",
"_wireSAFEARR_BSTR",
"_wireSAFEARR_DISPATCH",
"_wireSAFEARR_HAVEIID",
"_wireSAFEARR_UNKNOWN",
"_wireSAFEARR_VARIANT",
"_wireVARIANT",
"_wireVARIANTUnion",
"_userBITMAP",
"_userCLIPFORMAT",
"_userHBITMAP",
"_userHENHMETAFILE",
"_userHGLOBAL",
"_userHMETAFILE",
"_userHMETAFILEPICT",
"_userHPALETTE",
"tagCSPLATFORM",
"tagCY",
"tagCYUnion",
"tagDEC",
"tagDECUnion1",
"tagDECUnion1Union",
"tagDECUnion2",
"tagDECUnion2Union",
"tagPOINTF",
"tagQUERYCONTEXT",
"tagRemBRUSH",
"tagRemHBITMAP",
"tagRemHENHMETAFILE",
"tagRemHGLOBAL",
"tagRemHMETAFILEPICT",
"tagRemHPALETTE",
"tagpropertykey",
"tagEXCEPINFO",
"_RemotableHandle",
"_remoteMETAFILEPICT",
"_GDI_NONREMOTE",
"__MIDL_IWinTypes_0001",
"__MIDL_IWinTypes_0002",
"__MIDL_IWinTypes_0003",
"__MIDL_IWinTypes_0004",
"__MIDL_IWinTypes_0005",
"__MIDL_IWinTypes_0006",
"__MIDL_IWinTypes_0007",
"__MIDL_IWinTypes_0008",
"__MIDL_IWinTypes_0009",
"__MIDL___MIDL_itf_wtypes_0000_0001_0001",
"__MIDL___MIDL_itf_wtypes_0000_0001_0005"
],
"rename": {
"ETW_COMPRESSION_RESUMPTION_MODE": "EtwCompressionResumptionMode",
Expand Down Expand Up @@ -1228,7 +1330,103 @@
"tagRemSTGMEDIUM": "RemSTGMEDIUM",
"tagSTATDATA": "STATDATA",
"tagSTGMEDIUM": "STGMEDIUM",
"tagStorageLayout": "StorageLayout"
"tagStorageLayout": "StorageLayout",
"tagPROPBAG2": "PropBag2",
"tagCABOOL": "CABool",
"tagCABSTR": "CABSTR",
"tagCABSTRBLOB": "CABSTRBlob",
"tagCAC": "CAC",
"tagCACLIPDATA": "CAClipData",
"tagCACLSID": "CACLSID",
"tagCACY": "CACY",
"tagCADATE": "CADate",
"tagCADBL": "CADBL",
"tagCAFILETIME": "CAFileTime",
"tagCAFLT": "CAFLT",
"tagCAH": "CAH",
"tagCAI": "CAI",
"tagCAL": "CAL",
"tagCALPSTR": "CALPSTR",
"tagCALPWSTR": "CALPWSTR",
"tagCAPROPVARIANT": "CAPropVariant",
"tagCASCODE": "CASCode",
"tagCAUB": "CAUB",
"tagCAUH": "CAUH",
"tagCAUI": "CAUI",
"tagCAUL": "CAUL",
"tagPROPVARIANT": "PropVariant",
"tagPROPVARIANTUnion": "PropVariantUnion",
"tagPROPVARIANTUnionUnion": "PropVariantUnionUnion",
"tagPROPVARIANTUnionUnionUnion": "PropVariantUnionUnionUnion",
"tagSERIALIZEDPROPERTYVALUE": "SerializedPropertyValue",
"tagSTATPROPSETSTG": "STATPROPSETSTG",
"tagSTATPROPSTG": "STATPROPSTG",
"tagVersionedStream": "VersionedStream",
"tagAspectInfo": "AspectInfo",
"tagCADWORD": "CADWORD",
"tagCALPOLESTR": "CALPOLESTR",
"tagCAUUID": "CAUUID",
"tagCONNECTDATA": "ConnectData",
"tagCONTROLINFO": "ControlInfo",
"tagExtentInfo": "ExtentInfo",
"tagLICINFO": "LICInfo",
"tagACTIVATEFLAGS": "ActivateFlags",
"tagAspectInfoFlag": "AspectInfoFlag",
"tagCTRLINFO": "CTRLInfo",
"tagDVASPECT2": "DVASPECT2",
"tagExtentMode": "ExtentMode",
"tagGUIDKIND": "GuidKind",
"tagHITRESULT": "HitResult",
"tagOLEDCFLAGS": "OLEDCFlags",
"tagPOINTERINACTIVE": "PointerInactive",
"tagPROPPAGESTATUS": "PropPageStatus",
"tagPictureAttributes": "PictureAttributes",
"tagQACONTAINERFLAGS": "QAContainerFlags",
"tagREADYSTATE": "ReadyState",
"tagUASFLAGS": "UASFlags",
"tagVIEWSTATUS": "ViewStatus",
"tagXFORMCOORDS": "XFormCoords",
"tagPROPBAG2_TYPE": "PropBag2Type",
"tagPROPSPEC": "PropSpec",
"tagARRAYDESC": "ArrayDesc",
"tagBINDPTR": "BindPtr",
"tagCLEANLOCALSTORAGE": "CleanLocalStorage",
"tagCUSTDATA": "CustomData",
"tagCUSTDATAITEM": "CustomDataItem",
"tagELEMDESC": "ElemDesc",
"tagELEMDESCUnion": "ElemDescUnion",
"tagFUNCDESC": "FuncDesc",
"tagIDLDESC": "IdlDesc",
"tagPARAMDESC": "ParamDesc",
"tagPARAMDESCEX": "ParamDescEx",
"tagTLIBATTR": "TLibAttr",
"tagTYPEATTR": "TypeAttr",
"tagTYPEDESC": "TypeDesc",
"tagTYPEDESCUnion": "TypeDescUnion",
"tagVARDESC": "VarDesc",
"tagVARDESCUnion": "VarDescUnion",
"tagCALLCONV": "CallConv",
"tagCHANGEKIND": "ChangeKind",
"tagDESCKIND": "DescKind",
"tagDVASPECT": "DVASPECT",
"tagFUNCFLAGS": "FuncFlags",
"tagFUNCKIND": "FuncKind",
"tagINVOKEKIND": "InvokeKind",
"tagLIBFLAGS": "LibFlags",
"tagSF_TYPE": "SFType",
"tagSTATFLAG": "StatFlag",
"tagSTGC": "STGC",
"tagSTGMOVE": "STGMove",
"tagSYSKIND": "SysKind",
"tagTYPEFLAGS": "TypeFlags",
"tagTYPEKIND": "TypeKind",
"tagTYSPEC": "TypeSpec",
"tagVARFLAGS": "VarFlags",
"tagVARKIND": "VarKind",
"tagQACONTROL": "QAControl",
"tagBSTRBLOB": "BSTRBlob",
"tagCLIPDATA": "ClipData",
"__MIDL___MIDL_itf_documenttarget_0000_0002_0001": "MIDLMIDLItfDocumentTarget000000020001"
},
"bakery": {
"profileNames": [
Expand All @@ -1253,19 +1451,24 @@
"_EXCEPTION_RECORD": "ExceptionRecord",
"_FILE_SEGMENT_ELEMENT": "FileSegmentElement",
"_RPC_MESSAGE": "RPCMessage",
"IDispatch": "Silk.NET.Core.Native.IUnknown",
"IRecordInfo": "Silk.NET.Core.Native.IUnknown",
"ITypeInfo": "Silk.NET.Core.Native.IUnknown",
"IQuickActivate": "Silk.NET.Core.Native.IUnknown",
"IClassFactory2": "Silk.NET.Core.Native.IUnknown",
"tagEXCEPINFO": "ExceptionInfo",
"tagVARIANT": "Variant",
"tagDISPPARAMS": "DispatchParams",
"tagSAFEARRAY": "SafeArray",
"tagCY": "CY",
"tagDEC": "TagDecimal",
"tagSAFEARRAYBOUND": "SafeArrayBound",
"tagQACONTAINER": "void",
"PfnTagEXCEPINFOvI": "PfnExceptionInfovI",
"HICON__": "void",
"tagPOINTF": "Silk.NET.Maths.Vector2<float>",
"HPALETTE__": "void",
"HBITMAP__": "void",
"HICON__": "void",
"HFONT__": "void",
"HRGN__": "void",
"HACCEL__": "void",
"HTASK__": "void"
},
{
Expand Down Expand Up @@ -1817,13 +2020,13 @@
"ISequentialStream": "Silk.NET.Core.Win32Extras.ISequentialStream",
"IPersist": "Silk.NET.Core.Win32Extras.IPersist",
"IPersistStream": "Silk.NET.Core.Win32Extras.IPersistStream",
"IPropertyBag2": "Silk.NET.Core.Native.IUnknown",
"IPropertyBag2": "Silk.NET.Core.Win32Extras.IPropertyBag2",
"IEnumUnknown": "Silk.NET.Core.Win32Extras.IEnumUnknown",
"IEnumString": "Silk.NET.Core.Win32Extras.IEnumString",
"tagSAFEARRAY": "Silk.NET.Core.Win32Extras.SafeArray",
"tagSTATSTG": "Silk.NET.Core.Win32Extras.STATSTG",
"tagPROPVARIANT": "void",
"tagPROPBAG2": "void",
"tagPROPVARIANT": "Silk.NET.Core.Win32Extras.PropVariant",
"tagPROPBAG2": "Silk.NET.Core.Win32Extras.PropBag2",
"HPALETTE__": "void",
"HBITMAP__": "void",
"HICON__": "void",
Expand Down
18 changes: 18 additions & 0 deletions src/Core/Silk.NET.Core.Win32Extras/Enums/ActivateFlags.gen.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.


using System;
using Silk.NET.Core.Attributes;

#pragma warning disable 1591

namespace Silk.NET.Core.Win32Extras
{
[NativeName("Name", "tagACTIVATEFLAGS")]
public enum ActivateFlags : int
{
[NativeName("Name", "ACTIVATE_WINDOWLESS")]
ActivateWindowless = 0x1,
}
}
18 changes: 18 additions & 0 deletions src/Core/Silk.NET.Core.Win32Extras/Enums/AspectInfoFlag.gen.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.


using System;
using Silk.NET.Core.Attributes;

#pragma warning disable 1591

namespace Silk.NET.Core.Win32Extras
{
[NativeName("Name", "tagAspectInfoFlag")]
public enum AspectInfoFlag : int
{
[NativeName("Name", "DVASPECTINFOFLAG_CANOPTIMIZE")]
DvaspectinfoflagCanoptimize = 0x1,
}
}
26 changes: 26 additions & 0 deletions src/Core/Silk.NET.Core.Win32Extras/Enums/CTRLInfo.gen.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.


using System;
using Silk.NET.Core.Attributes;

#pragma warning disable 1591

namespace Silk.NET.Core.Win32Extras
{
[NativeName("Name", "tagCTRLINFO")]
public enum CTRLInfo : int
{
[Obsolete("Deprecated in favour of \"Return\"")]
[NativeName("Name", "CTRLINFO_EATS_RETURN")]
CtrlinfoEatsReturn = 0x1,
[Obsolete("Deprecated in favour of \"Escape\"")]
[NativeName("Name", "CTRLINFO_EATS_ESCAPE")]
CtrlinfoEatsEscape = 0x2,
[NativeName("Name", "CTRLINFO_EATS_RETURN")]
Return = 0x1,
[NativeName("Name", "CTRLINFO_EATS_ESCAPE")]
Escape = 0x2,
}
}
Loading

0 comments on commit aa4c2b3

Please sign in to comment.