diff --git a/Directory.Build.targets b/Directory.Build.targets index d99ec6f044..9ef235c3e8 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -19,8 +19,8 @@ - - + + diff --git a/generation/shared/devpropdef/generate.rsp b/generation/shared/devpropdef/generate.rsp index ef12a4e6c1..834c498203 100644 --- a/generation/shared/devpropdef/generate.rsp +++ b/generation/shared/devpropdef/generate.rsp @@ -1,7 +1,16 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint +--exclude +Equals +NotEquals --file shared-devpropdef.h --headerFile @@ -10,8 +19,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -unused --methodClassName Windows --namespace diff --git a/generation/shared/dxgi/generate.rsp b/generation/shared/dxgi/generate.rsp index f381b89f10..bbc32faa8b 100644 --- a/generation/shared/dxgi/generate.rsp +++ b/generation/shared/dxgi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_dxgi_0000_0000_v0_0_c_ifspec __MIDL_itf_dxgi_0000_0000_v0_0_s_ifspec @@ -58,7 +64,7 @@ HDC__*=IntPtr HINSTANCE__*=IntPtr HMONITOR__*=IntPtr HWND__*=IntPtr -SIZE_T=UIntPtr +SIZE_T=nuint tagRECT=RECT --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared/dxgi.h diff --git a/generation/shared/dxgi1_2/generate.rsp b/generation/shared/dxgi1_2/generate.rsp index 29cc065129..705d1f3e43 100644 --- a/generation/shared/dxgi1_2/generate.rsp +++ b/generation/shared/dxgi1_2/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_dxgi1_2_0000_0000_v0_0_c_ifspec __MIDL_itf_dxgi1_2_0000_0000_v0_0_s_ifspec @@ -51,7 +57,7 @@ HANDLE=IntPtr HDC__*=IntPtr HINSTANCE__*=IntPtr HWND__*=IntPtr -SIZE_T=UIntPtr +SIZE_T=nuint tagPOINT=POINT tagRECT=RECT --traverse diff --git a/generation/shared/dxgi1_3/generate.rsp b/generation/shared/dxgi1_3/generate.rsp index 78325d1675..5199d04991 100644 --- a/generation/shared/dxgi1_3/generate.rsp +++ b/generation/shared/dxgi1_3/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_dxgi1_3_0000_0000_v0_0_c_ifspec __MIDL_itf_dxgi1_3_0000_0000_v0_0_s_ifspec diff --git a/generation/shared/dxgi1_4/generate.rsp b/generation/shared/dxgi1_4/generate.rsp index c30994291b..1d55d32fa8 100644 --- a/generation/shared/dxgi1_4/generate.rsp +++ b/generation/shared/dxgi1_4/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_dxgi1_4_0000_0000_v0_0_c_ifspec __MIDL_itf_dxgi1_4_0000_0000_v0_0_s_ifspec diff --git a/generation/shared/dxgi1_5/generate.rsp b/generation/shared/dxgi1_5/generate.rsp index 5f39c0dfb2..9b1b2a33d6 100644 --- a/generation/shared/dxgi1_5/generate.rsp +++ b/generation/shared/dxgi1_5/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_dxgi1_5_0000_0000_v0_0_c_ifspec __MIDL_itf_dxgi1_5_0000_0000_v0_0_s_ifspec diff --git a/generation/shared/dxgi1_6/generate.rsp b/generation/shared/dxgi1_6/generate.rsp index c487325ac9..d4b0bbb3ec 100644 --- a/generation/shared/dxgi1_6/generate.rsp +++ b/generation/shared/dxgi1_6/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_dxgi1_6_0000_0000_v0_0_c_ifspec __MIDL_itf_dxgi1_6_0000_0000_v0_0_s_ifspec @@ -44,7 +50,7 @@ HANDLE=IntPtr HINSTANCE__*=IntPtr HMONITOR__*=IntPtr HWND__*=IntPtr -SIZE_T=UIntPtr +SIZE_T=nuint tagRECT=RECT --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared/dxgi1_6.h diff --git a/generation/shared/dxgicommon/generate.rsp b/generation/shared/dxgicommon/generate.rsp index 31dc3ed321..1ab9c92d86 100644 --- a/generation/shared/dxgicommon/generate.rsp +++ b/generation/shared/dxgicommon/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file shared-dxgicommon.h --headerFile diff --git a/generation/shared/dxgiformat/generate.rsp b/generation/shared/dxgiformat/generate.rsp index a07977fa6d..698b4979d1 100644 --- a/generation/shared/dxgiformat/generate.rsp +++ b/generation/shared/dxgiformat/generate.rsp @@ -2,6 +2,7 @@ -m32 --config multi-file +preview-codegen-nint --file shared-dxgiformat.h --headerFile diff --git a/generation/shared/dxgitype/generate.rsp b/generation/shared/dxgitype/generate.rsp index 5b215c3636..67c94fa4f0 100644 --- a/generation/shared/dxgitype/generate.rsp +++ b/generation/shared/dxgitype/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file shared-dxgitype.h --headerFile diff --git a/generation/shared/hidclass/generate.rsp b/generation/shared/hidclass/generate.rsp index d0dcf62a3d..4836d18aae 100644 --- a/generation/shared/hidclass/generate.rsp +++ b/generation/shared/hidclass/generate.rsp @@ -1,7 +1,17 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint +--exclude +GUID_DEVINTERFACE_HID +GUID_HID_INTERFACE_NOTIFY +GUID_HID_INTERFACE_HIDPARSE --file shared-hidclass.h --headerFile @@ -10,8 +20,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -hid --methodClassName Windows --namespace @@ -19,6 +27,7 @@ TerraFX.Interop --output ../../../sources/Interop/Windows/shared/hidclass --remap +_GUID=Guid _HID_COLLECTION_INFORMATION=HID_COLLECTION_INFORMATION _HID_DRIVER_CONFIG=HID_DRIVER_CONFIG _HID_XFER_PACKET=HID_XFER_PACKET diff --git a/generation/shared/hidpi/generate.rsp b/generation/shared/hidpi/generate.rsp index 16c96f3cb8..290bf6f617 100644 --- a/generation/shared/hidpi/generate.rsp +++ b/generation/shared/hidpi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude _HIDP_PREPARSED_DATA --file @@ -12,8 +18,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -hid --methodClassName Hid --namespace diff --git a/generation/shared/hidsdi/generate.rsp b/generation/shared/hidsdi/generate.rsp index 3b891a262b..2194724da3 100644 --- a/generation/shared/hidsdi/generate.rsp +++ b/generation/shared/hidsdi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude _HIDP_PREPARSED_DATA --file @@ -12,8 +18,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -hid --methodClassName Hid --namespace diff --git a/generation/shared/tvout/generate.rsp b/generation/shared/tvout/generate.rsp index 02d2989a3b..f9125f7a05 100644 --- a/generation/shared/tvout/generate.rsp +++ b/generation/shared/tvout/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --define-macro NOSYSPARAMSINFO --file diff --git a/generation/um/DXGIMessages/generate.rsp b/generation/um/DXGIMessages/generate.rsp index f0aa9c3151..53f6ffa749 100644 --- a/generation/um/DXGIMessages/generate.rsp +++ b/generation/um/DXGIMessages/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-DXGIMessages.h --headerFile diff --git a/generation/um/ObjIdlbase/generate.rsp b/generation/um/ObjIdlbase/generate.rsp index e75b89086c..fee8d34294 100644 --- a/generation/um/ObjIdlbase/generate.rsp +++ b/generation/um/ObjIdlbase/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_objidlbase_0000_0000_v0_0_c_ifspec __MIDL_itf_objidlbase_0000_0000_v0_0_s_ifspec diff --git a/generation/um/SetupAPI/generate.rsp b/generation/um/SetupAPI/generate.rsp index 4ba7181493..47b25141a2 100644 --- a/generation/um/SetupAPI/generate.rsp +++ b/generation/um/SetupAPI/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-SetupAPI.h --headerFile @@ -97,7 +103,7 @@ HKEY__*=IntPtr HICON__=IntPtr HINSTANCE__*=IntPtr HWND__*=IntPtr -ULONG_PTR=UIntPtr +ULONG_PTR=nuint tagRECT=RECT --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/SetupAPI.h diff --git a/generation/um/SoftPub/generate.rsp b/generation/um/SoftPub/generate.rsp index 56ed1e6d36..e35dd9ddcc 100644 --- a/generation/um/SoftPub/generate.rsp +++ b/generation/um/SoftPub/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-SoftPub.h --headerFile @@ -39,7 +45,7 @@ CONFIG_CI_PROV_INFO_RESULT_=CONFIG_CI_PROV_INFO_RESULT DRIVER_VER_INFO_=DRIVER_VER_INFO DRIVER_VER_MAJORMINOR_=DRIVER_VER_MAJORMINOR HANDLE=IntPtr -ULONG_PTR=UIntPtr +ULONG_PTR=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/SoftPub.h --with-callconv diff --git a/generation/um/WinBase/generate.rsp b/generation/um/WinBase/generate.rsp index 3f5ae6d82f..e65f7d81ac 100644 --- a/generation/um/WinBase/generate.rsp +++ b/generation/um/WinBase/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude unsigned long long _InterlockedIncrement(volatile unsigned long long *) unsigned long long _InterlockedDecrement(volatile unsigned long long *) diff --git a/generation/um/WinTrust/generate.rsp b/generation/um/WinTrust/generate.rsp index 050988a2b4..6b6f7f7ef6 100644 --- a/generation/um/WinTrust/generate.rsp +++ b/generation/um/WinTrust/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude SIP_DISPATCH_INFO_ SIP_INDIRECT_DATA_ diff --git a/generation/um/WinUser/generate.rsp b/generation/um/WinUser/generate.rsp index 646612ac8b..0825e2f98d 100644 --- a/generation/um/WinUser/generate.rsp +++ b/generation/um/WinUser/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude DESKTOPENUMPROC DESKTOPENUMPROCA @@ -95,9 +101,9 @@ HTOUCHINPUT__*=IntPtr HWINEVENTHOOK__*=IntPtr HWINSTA__*=IntPtr HWND__*=IntPtr -INT_PTR=IntPtr -LRESULT=IntPtr -LPARAM=IntPtr +INT_PTR=nint +LRESULT=nint +LPARAM=nint tagACCEL=ACCEL tagACCESSTIMEOUT=ACCESSTIMEOUT tagALTTABINFO=ALTTABINFO @@ -235,9 +241,9 @@ tagWNDCLASSEXA=WNDCLASSEXA tagWNDCLASSEXW=WNDCLASSEXW tagWNDCLASSW=WNDCLASSW tagWTSSESSION_NOTIFICATION=WTSSESSION_NOTIFICATION -UINT_PTR=UIntPtr -ULONG_PTR=UIntPtr -WPARAM=UIntPtr +UINT_PTR=nuint +ULONG_PTR=nuint +WPARAM=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/WinUser.h --with-callconv diff --git a/generation/um/Xinput/generate.rsp b/generation/um/Xinput/generate.rsp index 83f4b232ea..1ec900f205 100644 --- a/generation/um/Xinput/generate.rsp +++ b/generation/um/Xinput/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-Xinput.h --headerFile diff --git a/generation/um/combaseapi/generate.rsp b/generation/um/combaseapi/generate.rsp index da3a729742..91befe9f78 100644 --- a/generation/um/combaseapi/generate.rsp +++ b/generation/um/combaseapi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude CO_MTA_USAGE_COOKIE__ --file diff --git a/generation/um/d2d1/generate.rsp b/generation/um/d2d1/generate.rsp index 5dc0d379ba..508e38d826 100644 --- a/generation/um/d2d1/generate.rsp +++ b/generation/um/d2d1/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude DWRITE_GLYPH_RUN IDWriteRenderingParams diff --git a/generation/um/d2d1_1/generate.rsp b/generation/um/d2d1_1/generate.rsp index 238d2db350..5a38ad1e22 100644 --- a/generation/um/d2d1_1/generate.rsp +++ b/generation/um/d2d1_1/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude D2D1_PROPERTY_BINDING DWRITE_GLYPH_RUN_DESCRIPTION diff --git a/generation/um/d2d1_2/generate.rsp b/generation/um/d2d1_2/generate.rsp index fd8716a263..ec9db977e6 100644 --- a/generation/um/d2d1_2/generate.rsp +++ b/generation/um/d2d1_2/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude IID_ID2D1CommandSink1 IID_ID2D1Device1 diff --git a/generation/um/d2d1_3/generate.rsp b/generation/um/d2d1_3/generate.rsp index 53532f2978..a378f05b5f 100644 --- a/generation/um/d2d1_3/generate.rsp +++ b/generation/um/d2d1_3/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude IDWriteFontFace IID_ID2D1ColorContext1 diff --git a/generation/um/d2d1effectauthor/generate.rsp b/generation/um/d2d1effectauthor/generate.rsp index 26b15bc5dc..b2365dcdc1 100644 --- a/generation/um/d2d1effectauthor/generate.rsp +++ b/generation/um/d2d1effectauthor/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude IID_ID2D1AnalysisTransform IID_ID2D1BlendTransform diff --git a/generation/um/d2d1effectauthor_1/generate.rsp b/generation/um/d2d1effectauthor_1/generate.rsp index e511c29748..9a27289f43 100644 --- a/generation/um/d2d1effectauthor_1/generate.rsp +++ b/generation/um/d2d1effectauthor_1/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude IID_ID2D1EffectContext1 IID_ID2D1EffectContext2 diff --git a/generation/um/d2d1effects/generate.rsp b/generation/um/d2d1effects/generate.rsp index aa75ed7d9e..ab9aa189fa 100644 --- a/generation/um/d2d1effects/generate.rsp +++ b/generation/um/d2d1effects/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude CLSID_D2D12DAffineTransform CLSID_D2D13DPerspectiveTransform diff --git a/generation/um/d2d1effects_1/generate.rsp b/generation/um/d2d1effects_1/generate.rsp index 19a9d0e7d5..43ef5ee015 100644 --- a/generation/um/d2d1effects_1/generate.rsp +++ b/generation/um/d2d1effects_1/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude CLSID_D2D1YCbCr --file diff --git a/generation/um/d2d1effects_2/generate.rsp b/generation/um/d2d1effects_2/generate.rsp index 2e0873ab43..69501d5380 100644 --- a/generation/um/d2d1effects_2/generate.rsp +++ b/generation/um/d2d1effects_2/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude CLSID_D2D1AlphaMask CLSID_D2D1ChromaKey diff --git a/generation/um/d2d1svg/generate.rsp b/generation/um/d2d1svg/generate.rsp index ff38cdddad..85191437bf 100644 --- a/generation/um/d2d1svg/generate.rsp +++ b/generation/um/d2d1svg/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude IID_ID2D1SvgAttribute IID_ID2D1SvgDocument diff --git a/generation/um/d3d11/generate.rsp b/generation/um/d3d11/generate.rsp index d180ce22d9..7778d3ffbb 100644 --- a/generation/um/d3d11/generate.rsp +++ b/generation/um/d3d11/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3d11_0000_0000_v0_0_c_ifspec __MIDL_itf_d3d11_0000_0000_v0_0_s_ifspec @@ -229,7 +235,7 @@ _D3D11_AES_CTR_IV=D3D11_AES_CTR_IV _GUID=Guid HANDLE=IntPtr HINSTANCE__*=IntPtr -SIZE_T=UIntPtr +SIZE_T=nuint tagRECT=RECT tagSIZE=SIZE --traverse diff --git a/generation/um/d3d11_1/generate.rsp b/generation/um/d3d11_1/generate.rsp index d736ac93f3..8dd7075476 100644 --- a/generation/um/d3d11_1/generate.rsp +++ b/generation/um/d3d11_1/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3d11_1_0000_0000_v0_0_c_ifspec __MIDL_itf_d3d11_1_0000_0000_v0_0_s_ifspec @@ -41,7 +47,7 @@ TerraFX.Interop --remap _GUID=Guid HANDLE=IntPtr -SIZE_T=UIntPtr +SIZE_T=nuint tagRECT=RECT tagSIZE=SIZE --traverse diff --git a/generation/um/d3d11_2/generate.rsp b/generation/um/d3d11_2/generate.rsp index d12f65dd48..75a54a4bcc 100644 --- a/generation/um/d3d11_2/generate.rsp +++ b/generation/um/d3d11_2/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3d11_2_0000_0000_v0_0_c_ifspec __MIDL_itf_d3d11_2_0000_0000_v0_0_s_ifspec @@ -26,7 +32,7 @@ TerraFX.Interop --remap _GUID=Guid HANDLE=IntPtr -SIZE_T=UIntPtr +SIZE_T=nuint tagRECT=RECT --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11_2.h diff --git a/generation/um/d3d11_3/generate.rsp b/generation/um/d3d11_3/generate.rsp index dfea93c3b3..d1b1d03c25 100644 --- a/generation/um/d3d11_3/generate.rsp +++ b/generation/um/d3d11_3/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3d11_3_0000_0000_v0_0_c_ifspec __MIDL_itf_d3d11_3_0000_0000_v0_0_s_ifspec @@ -70,7 +76,7 @@ __AnonymousRecord_d3d11_3_L1623_C5=_Anonymous_e__Union _GUID=Guid _SECURITY_ATTRIBUTES=SECURITY_ATTRIBUTES HANDLE=IntPtr -SIZE_T=UIntPtr +SIZE_T=nuint tagRECT=RECT --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11_3.h diff --git a/generation/um/d3d11_4/generate.rsp b/generation/um/d3d11_4/generate.rsp index ab0f97b533..10f6ed05ff 100644 --- a/generation/um/d3d11_4/generate.rsp +++ b/generation/um/d3d11_4/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3d11_4_0000_0000_v0_0_c_ifspec __MIDL_itf_d3d11_4_0000_0000_v0_0_s_ifspec @@ -43,7 +49,7 @@ C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11_4.h --remap _GUID=Guid HANDLE=IntPtr -SIZE_T=UIntPtr +SIZE_T=nuint tagRECT=RECT tagSIZE=SIZE --with-attribute diff --git a/generation/um/d3d11on12/generate.rsp b/generation/um/d3d11on12/generate.rsp index 30dd063514..e68afa7cb4 100644 --- a/generation/um/d3d11on12/generate.rsp +++ b/generation/um/d3d11on12/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3d11on12_0000_0000_v0_0_c_ifspec __MIDL_itf_d3d11on12_0000_0000_v0_0_s_ifspec diff --git a/generation/um/d3d11sdklayers/generate.rsp b/generation/um/d3d11sdklayers/generate.rsp index 85d3eac508..7f4273f9a9 100644 --- a/generation/um/d3d11sdklayers/generate.rsp +++ b/generation/um/d3d11sdklayers/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3d11sdklayers_0000_0000_v0_0_c_ifspec __MIDL_itf_d3d11sdklayers_0000_0000_v0_0_s_ifspec @@ -43,7 +49,7 @@ TerraFX.Interop ../../../sources/Interop/D3D11/um/d3d11sdklayers --remap _GUID=Guid -SIZE_T=UIntPtr +SIZE_T=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11sdklayers.h --with-attribute diff --git a/generation/um/d3d11shader/generate.rsp b/generation/um/d3d11shader/generate.rsp index 5e7a97d2f5..3e426a7d7f 100644 --- a/generation/um/d3d11shader/generate.rsp +++ b/generation/um/d3d11shader/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude IID_ID3D11FunctionLinkingGraph IID_ID3D11FunctionParameterReflection diff --git a/generation/um/d3d11shadertracing/generate.rsp b/generation/um/d3d11shadertracing/generate.rsp index 2c0803f4fc..8943ed3da0 100644 --- a/generation/um/d3d11shadertracing/generate.rsp +++ b/generation/um/d3d11shadertracing/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3d11ShaderTracing_0000_0000_v0_0_c_ifspec __MIDL_itf_d3d11ShaderTracing_0000_0000_v0_0_s_ifspec @@ -31,7 +37,7 @@ __AnonymousRecord_d3d11shadertracing_L126_C5=_Anonymous_e__Union __AnonymousRecord_d3d11shadertracing_L226_C5=_Anonymous_e__Union _GUID=Guid ID3D10Blob=ID3DBlob -SIZE_T=UIntPtr +SIZE_T=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11shadertracing.h --with-attribute diff --git a/generation/um/d3d12/generate.rsp b/generation/um/d3d12/generate.rsp index 2734b8202d..acfaeb0800 100644 --- a/generation/um/d3d12/generate.rsp +++ b/generation/um/d3d12/generate.rsp @@ -1,9 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined -Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic -Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3d12_0000_0000_v0_0_c_ifspec __MIDL_itf_d3d12_0000_0000_v0_0_s_ifspec @@ -156,8 +160,8 @@ _LUID=LUID _SECURITY_ATTRIBUTES=SECURITY_ATTRIBUTES HANDLE=IntPtr ID3D10Blob=ID3DBlob -LONG_PTR=IntPtr -SIZE_T=UIntPtr +LONG_PTR=nint +SIZE_T=nuint tagRECT=RECT --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h diff --git a/generation/um/d3d12sdklayers/generate.rsp b/generation/um/d3d12sdklayers/generate.rsp index f67d7bda40..972413120e 100644 --- a/generation/um/d3d12sdklayers/generate.rsp +++ b/generation/um/d3d12sdklayers/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3d12sdklayers_0000_0000_v0_0_c_ifspec __MIDL_itf_d3d12sdklayers_0000_0000_v0_0_s_ifspec @@ -58,7 +64,7 @@ TerraFX.Interop _GUID=Guid GetMessageA=GetMessage HWND__*=IntPtr -SIZE_T=UIntPtr +SIZE_T=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12sdklayers.h --with-attribute diff --git a/generation/um/d3d12shader/generate.rsp b/generation/um/d3d12shader/generate.rsp index e5115bfaae..cfebce48d1 100644 --- a/generation/um/d3d12shader/generate.rsp +++ b/generation/um/d3d12shader/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude IID_ID3D12ShaderReflectionType IID_ID3D12ShaderReflectionVariable diff --git a/generation/um/d3d12video/generate.rsp b/generation/um/d3d12video/generate.rsp index 978ca3ee03..83e61c930b 100644 --- a/generation/um/d3d12video/generate.rsp +++ b/generation/um/d3d12video/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3d12video_0000_0000_v0_0_c_ifspec __MIDL_itf_d3d12video_0000_0000_v0_0_s_ifspec diff --git a/generation/um/d3dcommon/generate.rsp b/generation/um/d3dcommon/generate.rsp index 2145bfc939..fe59ff2146 100644 --- a/generation/um/d3dcommon/generate.rsp +++ b/generation/um/d3dcommon/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_d3dcommon_0000_0000_v0_0_c_ifspec __MIDL_itf_d3dcommon_0000_0000_v0_0_s_ifspec @@ -45,7 +51,7 @@ _D3D_SHADER_VARIABLE_FLAGS=D3D_SHADER_VARIABLE_FLAGS _D3D_SHADER_VARIABLE_TYPE=D3D_SHADER_VARIABLE_TYPE _GUID=Guid ID3D10Blob=ID3DBlob -SIZE_T=UIntPtr +SIZE_T=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3dcommon.h --with-attribute diff --git a/generation/um/d3dcompiler/generate.rsp b/generation/um/d3dcompiler/generate.rsp index 7f6c9b663f..e6bb6b5cc2 100644 --- a/generation/um/d3dcompiler/generate.rsp +++ b/generation/um/d3dcompiler/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude D3DCreateFunctionLinkingGraph D3DCreateLinker @@ -31,7 +37,7 @@ _D3D_SHADER_DATA=D3D_SHADER_DATA _D3D_SHADER_MACRO=D3D_SHADER_MACRO _GUID=Guid ID3D10Blob=ID3DBlob -SIZE_T=UIntPtr +SIZE_T=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3dcompiler.h C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um\d3dcompiler.inl diff --git a/generation/um/dcommon/generate.rsp b/generation/um/dcommon/generate.rsp index 6b5c677112..7ad04ef29f 100644 --- a/generation/um/dcommon/generate.rsp +++ b/generation/um/dcommon/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude IDXGISurface operator| diff --git a/generation/um/dwrite/generate.rsp b/generation/um/dwrite/generate.rsp index f6e0631929..784827f3ec 100644 --- a/generation/um/dwrite/generate.rsp +++ b/generation/um/dwrite/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude ID2D1SimplifiedGeometrySink operator| diff --git a/generation/um/dwrite_1/generate.rsp b/generation/um/dwrite_1/generate.rsp index 04d6b47212..e8d54ca89a 100644 --- a/generation/um/dwrite_1/generate.rsp +++ b/generation/um/dwrite_1/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-dwrite_1.h --headerFile diff --git a/generation/um/dwrite_2/generate.rsp b/generation/um/dwrite_2/generate.rsp index 155b10ca1c..750561f058 100644 --- a/generation/um/dwrite_2/generate.rsp +++ b/generation/um/dwrite_2/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude _D3DCOLORVALUE --file diff --git a/generation/um/dwrite_3/generate.rsp b/generation/um/dwrite_3/generate.rsp index 6c360a4e4c..983a3b42ee 100644 --- a/generation/um/dwrite_3/generate.rsp +++ b/generation/um/dwrite_3/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude operator| operator|= diff --git a/generation/um/dxgidebug/generate.rsp b/generation/um/dxgidebug/generate.rsp index 32c1014fb1..9aff9c4f24 100644 --- a/generation/um/dxgidebug/generate.rsp +++ b/generation/um/dxgidebug/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_dxgidebug_0000_0000_v0_0_c_ifspec __MIDL_itf_dxgidebug_0000_0000_v0_0_s_ifspec @@ -33,7 +39,7 @@ TerraFX.Interop --remap _GUID=Guid GetMessageA=GetMessage -SIZE_T=UIntPtr +SIZE_T=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dxgidebug.h --with-attribute diff --git a/generation/um/fileapi/generate.rsp b/generation/um/fileapi/generate.rsp index 83ba05aaed..2413bdc027 100644 --- a/generation/um/fileapi/generate.rsp +++ b/generation/um/fileapi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-fileapi.h --headerFile @@ -10,8 +16,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -kernel32 --methodClassName Kernel32 --namespace diff --git a/generation/um/handleapi/generate.rsp b/generation/um/handleapi/generate.rsp index 58b0fe4345..b1aa172935 100644 --- a/generation/um/handleapi/generate.rsp +++ b/generation/um/handleapi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-handleapi.h --headerFile diff --git a/generation/um/heapapi/generate.rsp b/generation/um/heapapi/generate.rsp index a5258e7603..c1da798f21 100644 --- a/generation/um/heapapi/generate.rsp +++ b/generation/um/heapapi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-heapapi.h --headerFile @@ -21,8 +27,8 @@ _HEAP_INFORMATION_CLASS=HEAP_INFORMATION_CLASS _HEAP_SUMMARY=HEAP_SUMMARY _PROCESS_HEAP_ENTRY=PROCESS_HEAP_ENTRY HANDLE=IntPtr -PSIZE_T=UIntPtr* -SIZE_T=UIntPtr +PSIZE_T=nuint* +SIZE_T=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/heapapi.h --with-callconv diff --git a/generation/um/ioapiset/generate.rsp b/generation/um/ioapiset/generate.rsp index 898e839c67..d99f0e7a3d 100644 --- a/generation/um/ioapiset/generate.rsp +++ b/generation/um/ioapiset/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-ioapiset.h --headerFile @@ -10,8 +16,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -kernel32 --methodClassName Kernel32 --namespace diff --git a/generation/um/libloaderapi/generate.rsp b/generation/um/libloaderapi/generate.rsp index d0cb5d5337..dc0cab403d 100644 --- a/generation/um/libloaderapi/generate.rsp +++ b/generation/um/libloaderapi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-libloaderapi.h --headerFile @@ -23,7 +29,7 @@ HANDLE=IntPtr HGLOBAL=IntPtr HINSTANCE__*=IntPtr HRSRC__*=IntPtr -LONG_PTR=IntPtr +LONG_PTR=nint tagENUMUILANG=ENUMUILANG --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/libloaderapi.h diff --git a/generation/um/minwinbase/generate.rsp b/generation/um/minwinbase/generate.rsp index f102572404..fbd9f1abb2 100644 --- a/generation/um/minwinbase/generate.rsp +++ b/generation/um/minwinbase/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-minwinbase.h --headerFile @@ -10,8 +16,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -unused --methodClassName Windows --namespace @@ -57,7 +61,7 @@ _WIN32_FIND_DATAA=WIN32_FIND_DATAA _WIN32_FIND_DATAW=WIN32_FIND_DATAW HANDLE=IntPtr HINSTANCE__*=IntPtr -ULONG_PTR=UIntPtr +ULONG_PTR=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/minwinbase.h --with-callconv diff --git a/generation/um/mssip/generate.rsp b/generation/um/mssip/generate.rsp index 979977e55f..673fb84aa8 100644 --- a/generation/um/mssip/generate.rsp +++ b/generation/um/mssip/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-mssip.h --headerFile diff --git a/generation/um/processthreadsapi/generate.rsp b/generation/um/processthreadsapi/generate.rsp index 93868725d1..58bb8e61fb 100644 --- a/generation/um/processthreadsapi/generate.rsp +++ b/generation/um/processthreadsapi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-processthreadsapi.h --headerFile @@ -10,8 +16,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -advapi32 --methodClassName Advapi32 --namespace @@ -19,7 +23,28 @@ TerraFX.Interop --output ../../../sources/Interop/Advapi32/um/processthreadsapi --remap +_APP_MEMORY_INFORMATION=APP_MEMORY_INFORMATION +_CONTEXT=CONTEXT +_FILETIME=FILETIME +_GUID=Guid +_MEMORY_PRIORITY_INFORMATION=MEMORY_PRIORITY_INFORMATION +_PROC_THREAD_ATTRIBUTE_LIST=PROC_THREAD_ATTRIBUTE_LIST +_PROCESS_INFORMATION=PROCESS_INFORMATION +_PROCESS_INFORMATION_CLASS=PROCESS_INFORMATION_CLASS +_PROCESS_LEAP_SECOND_INFO=PROCESS_LEAP_SECOND_INFO +_PROCESS_MEMORY_EXHAUSTION_INFO=PROCESS_MEMORY_EXHAUSTION_INFO +_PROCESS_MEMORY_EXHAUSTION_TYPE=PROCESS_MEMORY_EXHAUSTION_TYPE +_PROCESS_MITIGATION_POLICY=PROCESS_MITIGATION_POLICY +_PROCESS_POWER_THROTTLING_STATE=PROCESS_POWER_THROTTLING_STATE +_PROCESSOR_NUMBER=PROCESSOR_NUMBER +_SECURITY_ATTRIBUTES=SECURITY_ATTRIBUTES +_STARTUPINFOA=STARTUPINFOA +_STARTUPINFOW=STARTUPINFOW +_SYSTEM_CPU_SET_INFORMATION=SYSTEM_CPU_SET_INFORMATION +_THREAD_INFORMATION_CLASS=THREAD_INFORMATION_CLASS +_THREAD_POWER_THROTTLING_STATE=THREAD_POWER_THROTTLING_STATE HANDLE=IntPtr +ULONG_PTR=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/processthreadsapi.h --with-callconv diff --git a/generation/um/profileapi/generate.rsp b/generation/um/profileapi/generate.rsp index 4954e1b501..655192de46 100644 --- a/generation/um/profileapi/generate.rsp +++ b/generation/um/profileapi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-profileapi.h --headerFile diff --git a/generation/um/prsht/generate.rsp b/generation/um/prsht/generate.rsp index f904376aae..a2500ee006 100644 --- a/generation/um/prsht/generate.rsp +++ b/generation/um/prsht/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude _PSP --file @@ -77,8 +83,8 @@ HICON__*=IntPtr HINSTANCE__*=IntPtr HPALETTE__*=IntPtr HWND__*=IntPtr -LPARAM=IntPtr -INT_PTR=IntPtr +LPARAM=nint +INT_PTR=nint tagNMHDR=NMHDR --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/prsht.h diff --git a/generation/um/securitybaseapi/generate.rsp b/generation/um/securitybaseapi/generate.rsp index 8be4842a13..0179c38f04 100644 --- a/generation/um/securitybaseapi/generate.rsp +++ b/generation/um/securitybaseapi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-securitybaseapi.h --headerFile @@ -10,8 +16,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -advapi32 --methodClassName Advapi32 --namespace @@ -19,6 +23,23 @@ TerraFX.Interop --output ../../../sources/Interop/Advapi32/um/securitybaseapi --remap +_ACL=ACL +_ACL_INFORMATION_CLASS=ACL_INFORMATION_CLASS +_AUDIT_EVENT_TYPE=AUDIT_EVENT_TYPE +_CLAIM_SECURITY_ATTRIBUTES_INFORMATION=CLAIM_SECURITY_ATTRIBUTES_INFORMATION +_GENERIC_MAPPING=GENERIC_MAPPING +_GUID=Guid +_LUID=LUID +_LUID_AND_ATTRIBUTES=LUID_AND_ATTRIBUTES +_OBJECT_TYPE_LIST=OBJECT_TYPE_LIST +_PRIVILEGE_SET=PRIVILEGE_SET +_SECURITY_ATTRIBUTES=SECURITY_ATTRIBUTES +_SECURITY_IMPERSONATION_LEVEL=SECURITY_IMPERSONATION_LEVEL +_SID_AND_ATTRIBUTES=SID_AND_ATTRIBUTES +_SID_IDENTIFIER_AUTHORITY=SID_IDENTIFIER_AUTHORITY +_TOKEN_GROUPS=TOKEN_GROUPS +_TOKEN_INFORMATION_CLASS=TOKEN_INFORMATION_CLASS +_TOKEN_TYPE=TOKEN_TYPE HANDLE=IntPtr _TOKEN_PRIVILEGES=TOKEN_PRIVILEGES --traverse diff --git a/generation/um/synchapi/generate.rsp b/generation/um/synchapi/generate.rsp index eb79c2778e..3277adaa4f 100644 --- a/generation/um/synchapi/generate.rsp +++ b/generation/um/synchapi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-synchapi.h --headerFile @@ -26,7 +32,7 @@ _RTL_RUN_ONCE=RTL_RUN_ONCE _RTL_SRWLOCK=RTL_SRWLOCK _SECURITY_ATTRIBUTES=SECURITY_ATTRIBUTES HANDLE=IntPtr -SIZE_T=UIntPtr +SIZE_T=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/synchapi.h --with-callconv diff --git a/generation/um/sysinfoapi/generate.rsp b/generation/um/sysinfoapi/generate.rsp index d0cb447465..f47dfbc357 100644 --- a/generation/um/sysinfoapi/generate.rsp +++ b/generation/um/sysinfoapi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-sysinfoapi.h --headerFile @@ -10,8 +16,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -kernel32 --methodClassName Kernel32 --namespace @@ -34,7 +38,7 @@ _SYSTEM_LOGICAL_PROCESSOR_INFORMATION=SYSTEM_LOGICAL_PROCESSOR_INFORMATION _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX=SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX _SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION=SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION _SYSTEMTIME=SYSTEMTIME -DWORD_PTR=UIntPtr +DWORD_PTR=nuint HANDLE=IntPtr --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/sysinfoapi.h diff --git a/generation/um/wincodec/generate.rsp b/generation/um/wincodec/generate.rsp index 026623f112..b829a65b34 100644 --- a/generation/um/wincodec/generate.rsp +++ b/generation/um/wincodec/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_wincodec_0000_0000_v0_0_c_ifspec __MIDL_itf_wincodec_0000_0000_v0_0_s_ifspec @@ -251,7 +257,7 @@ ID2D1Image=IUnknown tagPROPVARIANT=PROPVARIANT tagSAFEARRAY=SAFEARRAY tagSTATSTG=STATSTG -ULONG_PTR=UIntPtr +ULONG_PTR=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wincodec.h --with-attribute diff --git a/generation/um/wincodecsdk/generate.rsp b/generation/um/wincodecsdk/generate.rsp index 9e4de415f2..e5d5a7ead2 100644 --- a/generation/um/wincodecsdk/generate.rsp +++ b/generation/um/wincodecsdk/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude __MIDL_itf_wincodecsdk_0000_0000_v0_0_c_ifspec __MIDL_itf_wincodecsdk_0000_0000_v0_0_s_ifspec @@ -186,7 +192,7 @@ HICON__*=IntPtr HPALETTE__*=IntPtr tagPROPBAG2=PROPBAG2 tagPROPVARIANT=PROPVARIANT -ULONG_PTR=UIntPtr +ULONG_PTR=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wincodecsdk.h --with-attribute diff --git a/generation/um/wincrypt/generate.rsp b/generation/um/wincrypt/generate.rsp index c8a8fd6e2f..3cff84e855 100644 --- a/generation/um/wincrypt/generate.rsp +++ b/generation/um/wincrypt/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --file um-wincrypt.h --headerFile @@ -10,8 +16,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -advapi32 --methodClassName Advapi32 --namespace @@ -354,7 +358,7 @@ _SYSTEMTIME=SYSTEMTIME HANDLE=IntPtr HINSTANCE__*=IntPtr HKEY__*=IntPtr -ULONG_PTR=UIntPtr +ULONG_PTR=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wincrypt.h --with-callconv diff --git a/generation/um/wingdi/generate.rsp b/generation/um/wingdi/generate.rsp index 5c0069c760..782b0b9298 100644 --- a/generation/um/wingdi/generate.rsp +++ b/generation/um/wingdi/generate.rsp @@ -1,7 +1,13 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --define-macro COMBOX_SANDBOX --exclude @@ -124,7 +130,7 @@ HPALETTE__*=IntPtr HPEN__*=IntPtr HRGN__*=IntPtr HWND__*=IntPtr -LPARAM=IntPtr +LPARAM=nint tagABORTPATH=ABORTPATH tagAXESLISTA=AXESLISTA tagAXESLISTW=AXESLISTW @@ -268,7 +274,7 @@ tagTTPOLYCURVE=TTPOLYCURVE tagTTPOLYGONHEADER=TTPOLYGONHEADER tagWCRANGE=WCRANGE tagXFORM=XFORM -ULONG_PTR=UIntPtr +ULONG_PTR=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h --with-callconv diff --git a/generation/um/winnt/generate.rsp b/generation/um/winnt/generate.rsp index 613c6aa3a1..02e5c8608e 100644 --- a/generation/um/winnt/generate.rsp +++ b/generation/um/winnt/generate.rsp @@ -1,10 +1,81 @@ --additional -m32 +-Wno-expansion-to-defined +-Wno-ignored-attributes +-Wno-ignored-pragma-intrinsic +-Wno-nonportable-include-path +-Wno-pragma-pack --config multi-file +preview-codegen-nint --exclude +__addfsbyte +__addfsdword +__addfsword +__cpuidex +__fastfail +__incfsbyte +__incfsdword +__incfsword +__int2c +__rdtsc +__readfsbyte +__readfsword +__readfsdword +__readpmc +__writefsbyte +__writefsword +__writefsdword _ACTIVATION_CONTEXT +_BitScanForward +_BitScanReverse +_bittest +_bittestandcomplement +_bittestandreset +_bittestandset _ImageArchitectureHeader +_InlineBitScanForward64 +_InlineBitScanReverse64 +_InlineInterlockedAnd64 +_InlineInterlockedAdd +_InlineInterlockedAdd64 +_InlineInterlockedCompareExchangePointer +_InlineInterlockedDecrement64 +_InlineInterlockedExchange64 +_InlineInterlockedExchangeAdd64 +_InlineInterlockedExchangePointer +_InlineInterlockedIncrement64 +_InlineInterlockedOr64 +_InlineInterlockedXor64 +_InterlockedAnd +_InterlockedAnd8 +_InterlockedAnd16 +_interlockedbittestandreset +_interlockedbittestandset +_InterlockedCompareExchange +_InterlockedCompareExchange16 +_InterlockedCompareExchange64 +_InterlockedDecrement +_InterlockedDecrement16 +_InterlockedExchange +_InterlockedExchange8 +_InterlockedExchange16 +_InterlockedExchangeAdd +_InterlockedExchangeAdd8 +_InterlockedIncrement +_InterlockedIncrement16 +_InterlockedOr +_InterlockedOr8 +_InterlockedOr16 +_InterlockedXor +_InterlockedXor8 +_InterlockedXor16 +_mm_pause +_mm_prefetch +_rotl +_rotl64 +_rotr +_rotr64 _TEB _TP_CALLBACK_INSTANCE _TP_CLEANUP_GROUP @@ -13,7 +84,338 @@ _TP_POOL _TP_TIMER _TP_WAIT _TP_WORK +ALL_POWERSCHEMES_GUID +CUSTOM_SYSTEM_EVENT_TRIGGER_INIT +GetCurrentFiber +GetFiberData +GUID_ACDC_POWER_SOURCE +GUID_ACTIVE_POWERSCHEME +GUID_ADAPTIVE_INPUT_CONTROLLER_STATE +GUID_ADAPTIVE_POWER_BEHAVIOR_SUBGROUP +GUID_ADVANCED_COLOR_QUALITY_BIAS +GUID_ALLOW_AWAYMODE +GUID_ALLOW_DISPLAY_REQUIRED +GUID_ALLOW_RTC_WAKE +GUID_ALLOW_STANDBY_STATES +GUID_ALLOW_SYSTEM_REQUIRED +GUID_APPLAUNCH_BUTTON +GUID_BACKGROUND_TASK_NOTIFICATION +GUID_BATTERY_COUNT +GUID_BATTERY_DISCHARGE_ACTION_0 +GUID_BATTERY_DISCHARGE_ACTION_1 +GUID_BATTERY_DISCHARGE_ACTION_2 +GUID_BATTERY_DISCHARGE_ACTION_3 +GUID_BATTERY_DISCHARGE_FLAGS_0 +GUID_BATTERY_DISCHARGE_FLAGS_1 +GUID_BATTERY_DISCHARGE_FLAGS_2 +GUID_BATTERY_DISCHARGE_FLAGS_3 +GUID_BATTERY_DISCHARGE_LEVEL_0 +GUID_BATTERY_DISCHARGE_LEVEL_1 +GUID_BATTERY_DISCHARGE_LEVEL_2 +GUID_BATTERY_DISCHARGE_LEVEL_3 +GUID_BATTERY_PERCENTAGE_REMAINING +GUID_BATTERY_SUBGROUP +GUID_CONNECTIVITY_IN_STANDBY +GUID_CONSOLE_DISPLAY_STATE +GUID_CRITICAL_POWER_TRANSITION +GUID_DEEP_SLEEP_ENABLED +GUID_DEEP_SLEEP_PLATFORM_STATE +GUID_DEVICE_IDLE_POLICY +GUID_DEVICE_POWER_POLICY_VIDEO_BRIGHTNESS +GUID_DEVICE_POWER_POLICY_VIDEO_DIM_BRIGHTNESS +GUID_DISCONNECTED_STANDBY_MODE +GUID_DISK_ADAPTIVE_POWERDOWN +GUID_DISK_BURST_IGNORE_THRESHOLD +GUID_DISK_COALESCING_POWERDOWN_TIMEOUT +GUID_DISK_IDLE_TIMEOUT +GUID_DISK_MAX_POWER +GUID_DISK_POWERDOWN_TIMEOUT +GUID_DISK_SUBGROUP +GUID_ENABLE_SWITCH_FORCED_SHUTDOWN +GUID_ENERGY_SAVER_BATTERY_THRESHOLD +GUID_ENERGY_SAVER_BRIGHTNESS +GUID_ENERGY_SAVER_POLICY +GUID_ENERGY_SAVER_SUBGROUP +GUID_EXECUTION_REQUIRED_REQUEST_TIMEOUT +GUID_GLOBAL_USER_PRESENCE +GUID_GPU_PREFERENCE_POLICY +GUID_GRAPHICS_SUBGROUP +GUID_HIBERNATE_FASTS4_POLICY +GUID_HIBERNATE_TIMEOUT +GUID_IDLE_BACKGROUND_TASK +GUID_IDLE_RESILIENCY_PERIOD +GUID_IDLE_RESILIENCY_SUBGROUP +GUID_INTSTEER_LOAD_PER_PROC_TRIGGER +GUID_INTSTEER_MODE +GUID_INTSTEER_SUBGROUP +GUID_INTSTEER_TIME_UNPARK_TRIGGER +GUID_LEGACY_RTC_MITIGATION +GUID_LIDCLOSE_ACTION +GUID_LIDOPEN_POWERSTATE +GUID_LIDSWITCH_STATE_CHANGE +GUID_LOCK_CONSOLE_ON_WAKE +GUID_MAX_POWER_SAVINGS +GUID_MIN_POWER_SAVINGS +GUID_MIXED_REALITY_MODE +GUID_MONITOR_POWER_ON +GUID_NON_ADAPTIVE_INPUT_TIMEOUT +GUID_PCIEXPRESS_ASPM_POLICY +GUID_PCIEXPRESS_SETTINGS_SUBGROUP +GUID_POWERBUTTON_ACTION +GUID_POWERSCHEME_PERSONALITY +GUID_POWER_SAVING_STATUS +GUID_PROCESSOR_ALLOW_THROTTLING +GUID_PROCESSOR_CLASS0_FLOOR_PERF +GUID_PROCESSOR_CLASS1_INITIAL_PERF +GUID_PROCESSOR_CORE_PARKING_AFFINITY_HISTORY_DECREASE_FACTOR +GUID_PROCESSOR_CORE_PARKING_AFFINITY_HISTORY_THRESHOLD +GUID_PROCESSOR_CORE_PARKING_AFFINITY_WEIGHTING +GUID_PROCESSOR_CORE_PARKING_DECREASE_POLICY +GUID_PROCESSOR_CORE_PARKING_DECREASE_THRESHOLD +GUID_PROCESSOR_CORE_PARKING_DECREASE_TIME +GUID_PROCESSOR_CORE_PARKING_INCREASE_POLICY +GUID_PROCESSOR_CORE_PARKING_INCREASE_THRESHOLD +GUID_PROCESSOR_CORE_PARKING_INCREASE_TIME +GUID_PROCESSOR_CORE_PARKING_MAX_CORES +GUID_PROCESSOR_CORE_PARKING_MAX_CORES_1 +GUID_PROCESSOR_CORE_PARKING_MIN_CORES +GUID_PROCESSOR_CORE_PARKING_MIN_CORES_1 +GUID_PROCESSOR_CORE_PARKING_OVER_UTILIZATION_HISTORY_DECREASE_FACTOR +GUID_PROCESSOR_CORE_PARKING_OVER_UTILIZATION_HISTORY_THRESHOLD +GUID_PROCESSOR_CORE_PARKING_OVER_UTILIZATION_THRESHOLD +GUID_PROCESSOR_CORE_PARKING_OVER_UTILIZATION_WEIGHTING +GUID_PROCESSOR_DISTRIBUTE_UTILITY +GUID_PROCESSOR_DUTY_CYCLING +GUID_PROCESSOR_FREQUENCY_LIMIT +GUID_PROCESSOR_FREQUENCY_LIMIT_1 +GUID_PROCESSOR_HETEROGENEOUS_POLICY +GUID_PROCESSOR_HETERO_DECREASE_THRESHOLD +GUID_PROCESSOR_HETERO_DECREASE_TIME +GUID_PROCESSOR_HETERO_INCREASE_THRESHOLD +GUID_PROCESSOR_HETERO_INCREASE_TIME +GUID_PROCESSOR_IDLESTATE_POLICY +GUID_PROCESSOR_IDLE_ALLOW_SCALING +GUID_PROCESSOR_IDLE_DEMOTE_THRESHOLD +GUID_PROCESSOR_IDLE_DISABLE +GUID_PROCESSOR_IDLE_PROMOTE_THRESHOLD +GUID_PROCESSOR_IDLE_STATE_MAXIMUM +GUID_PROCESSOR_IDLE_TIME_CHECK +GUID_PROCESSOR_LATENCY_HINT_MIN_UNPARK +GUID_PROCESSOR_LATENCY_HINT_MIN_UNPARK_1 +GUID_PROCESSOR_PARKING_CONCURRENCY_THRESHOLD +GUID_PROCESSOR_PARKING_CORE_OVERRIDE +GUID_PROCESSOR_PARKING_DISTRIBUTION_THRESHOLD +GUID_PROCESSOR_PARKING_HEADROOM_THRESHOLD +GUID_PROCESSOR_PARKING_PERF_STATE +GUID_PROCESSOR_PARKING_PERF_STATE_1 +GUID_PROCESSOR_PERFSTATE_POLICY +GUID_PROCESSOR_PERF_AUTONOMOUS_ACTIVITY_WINDOW +GUID_PROCESSOR_PERF_AUTONOMOUS_MODE +GUID_PROCESSOR_PERF_BOOST_MODE +GUID_PROCESSOR_PERF_BOOST_POLICY +GUID_PROCESSOR_PERF_CORE_PARKING_HISTORY +GUID_PROCESSOR_PERF_DECREASE_HISTORY +GUID_PROCESSOR_PERF_DECREASE_POLICY +GUID_PROCESSOR_PERF_DECREASE_POLICY_1 +GUID_PROCESSOR_PERF_DECREASE_THRESHOLD +GUID_PROCESSOR_PERF_DECREASE_THRESHOLD_1 +GUID_PROCESSOR_PERF_DECREASE_TIME +GUID_PROCESSOR_PERF_DECREASE_TIME_1 +GUID_PROCESSOR_PERF_ENERGY_PERFORMANCE_PREFERENCE +GUID_PROCESSOR_PERF_ENERGY_PERFORMANCE_PREFERENCE_1 +GUID_PROCESSOR_PERF_HISTORY +GUID_PROCESSOR_PERF_HISTORY_1 +GUID_PROCESSOR_PERF_INCREASE_HISTORY +GUID_PROCESSOR_PERF_INCREASE_POLICY +GUID_PROCESSOR_PERF_INCREASE_POLICY_1 +GUID_PROCESSOR_PERF_INCREASE_THRESHOLD +GUID_PROCESSOR_PERF_INCREASE_THRESHOLD_1 +GUID_PROCESSOR_PERF_INCREASE_TIME +GUID_PROCESSOR_PERF_INCREASE_TIME_1 +GUID_PROCESSOR_PERF_LATENCY_HINT +GUID_PROCESSOR_PERF_LATENCY_HINT_PERF +GUID_PROCESSOR_PERF_LATENCY_HINT_PERF_1 +GUID_PROCESSOR_PERF_TIME_CHECK +GUID_PROCESSOR_RESPONSIVENESS_DISABLE_THRESHOLD +GUID_PROCESSOR_RESPONSIVENESS_DISABLE_THRESHOLD_1 +GUID_PROCESSOR_RESPONSIVENESS_DISABLE_TIME +GUID_PROCESSOR_RESPONSIVENESS_DISABLE_TIME_1 +GUID_PROCESSOR_RESPONSIVENESS_ENABLE_THRESHOLD +GUID_PROCESSOR_RESPONSIVENESS_ENABLE_THRESHOLD_1 +GUID_PROCESSOR_RESPONSIVENESS_ENABLE_TIME +GUID_PROCESSOR_RESPONSIVENESS_ENABLE_TIME_1 +GUID_PROCESSOR_RESPONSIVENESS_EPP_CEILING +GUID_PROCESSOR_RESPONSIVENESS_EPP_CEILING_1 +GUID_PROCESSOR_RESPONSIVENESS_PERF_FLOOR +GUID_PROCESSOR_RESPONSIVENESS_PERF_FLOOR_1 +GUID_PROCESSOR_SETTINGS_SUBGROUP +GUID_PROCESSOR_SHORT_THREAD_SCHEDULING_POLICY +GUID_PROCESSOR_THREAD_SCHEDULING_POLICY +GUID_PROCESSOR_THROTTLE_MAXIMUM +GUID_PROCESSOR_THROTTLE_MAXIMUM_1 +GUID_PROCESSOR_THROTTLE_MINIMUM +GUID_PROCESSOR_THROTTLE_MINIMUM_1 +GUID_PROCESSOR_THROTTLE_POLICY +GUID_SESSION_DISPLAY_STATUS +GUID_SESSION_USER_PRESENCE +GUID_SLEEPBUTTON_ACTION +GUID_SLEEP_IDLE_THRESHOLD +GUID_SLEEP_SUBGROUP +GUID_SPR_ACTIVE_SESSION_CHANGE +GUID_STANDBY_BUDGET_GRACE_PERIOD +GUID_STANDBY_BUDGET_PERCENT +GUID_STANDBY_RESERVE_GRACE_PERIOD +GUID_STANDBY_RESERVE_TIME +GUID_STANDBY_RESET_PERCENT +GUID_STANDBY_TIMEOUT +GUID_SYSTEM_AWAYMODE +GUID_SYSTEM_BUTTON_SUBGROUP +GUID_SYSTEM_COOLING_POLICY +GUID_TYPICAL_POWER_SAVINGS +GUID_UNATTEND_SLEEP_TIMEOUT +GUID_USERINTERFACEBUTTON_ACTION +GUID_USER_PRESENCE_PREDICTION +GUID_VIDEO_ADAPTIVE_DISPLAY_BRIGHTNESS +GUID_VIDEO_ADAPTIVE_PERCENT_INCREASE +GUID_VIDEO_ADAPTIVE_POWERDOWN +GUID_VIDEO_ANNOYANCE_TIMEOUT +GUID_VIDEO_CONSOLE_LOCK_TIMEOUT +GUID_VIDEO_CURRENT_MONITOR_BRIGHTNESS +GUID_VIDEO_DIM_TIMEOUT +GUID_VIDEO_POWERDOWN_TIMEOUT +GUID_VIDEO_SUBGROUP +Int64ShllMod32 +Int64ShraMod32 +Int64ShrlMod32 +MemoryBarrier +NO_SUBGROUP_GUID +NtCurrentTeb +operator~ +operator| +operator|= +operator& +operator&= +operator^ +operator^= PEXCEPTION_ROUTINE +PPM_IDLESTATES_DATA_GUID +PPM_IDLESTATE_CHANGE_GUID +PPM_IDLE_ACCOUNTING_EX_GUID +PPM_IDLE_ACCOUNTING_GUID +PPM_PERFMON_PERFSTATE_GUID +PPM_PERFSTATES_DATA_GUID +PPM_PERFSTATE_CHANGE_GUID +PPM_PERFSTATE_DOMAIN_CHANGE_GUID +PPM_THERMALCONSTRAINT_GUID +PPM_THERMAL_POLICY_CHANGE_GUID +ReadAcquire +ReadAcquire8 +ReadAcquire16 +ReadAcquire64 +ReadBooleanAcquire +ReadBooleanNoFence +ReadBooleanRaw +ReadNoFence +ReadNoFence8 +ReadNoFence16 +ReadNoFence64 +ReadPointerAcquire +ReadPointerNoFence +ReadPointerRaw +ReadRaw +ReadRaw8 +ReadRaw16 +ReadRaw64 +ReadUCharAcquire +ReadUCharNoFence +ReadUCharRaw +ReadULongAcquire +ReadULongNoFence +ReadULongRaw +ReadULong64Acquire +ReadULong64NoFence +ReadULong64Raw +ReadUShortAcquire +ReadUShortNoFence +ReadUShortRaw +RtlCaptureContext +RtlCaptureStackBackTrace +RtlCompareMemory +RtlConvertDeviceFamilyInfoToString +RtlCrc32 +RtlCrc64 +RtlExtendCorrelationVector +RtlFirstEntrySList +RtlGetDeviceFamilyInfoEnum +RtlGetProductInfo +RtlIncrementCorrelationVector +RtlInitializeCorrelationVector +RtlInitializeSListHead +RtlInterlockedFlushSList +RtlInterlockedPopEntrySList +RtlInterlockedPushEntrySList +RtlInterlockedPushListSListEx +RtlOsDeploymentState +RtlPcToFileHeader +RtlQueryDepthSList +RtlRaiseCustomSystemEventTrigger +RtlRaiseException +RtlSecureZeroMemory +RtlSwitchedVVI +RtlUnwind +RtlValidateCorrelationVector +TpDestroyCallbackEnviron +TpInitializeCallbackEnviron +TpSetCallbackActivationContext +TpSetCallbackCleanupGroup +TpSetCallbackFinalizationCallback +TpSetCallbackLongFunction +TpSetCallbackNoActivationContext +TpSetCallbackPersistent +TpSetCallbackPriority +TpSetCallbackRaceWithDll +TpSetCallbackThreadpool +VerSetConditionMask +WriteAcquire +WriteAcquire8 +WriteAcquire16 +WriteAcquire64 +WriteBooleanAcquire +WriteBooleanNoFence +WriteBooleanRaw +WriteBooleanRelease +WriteNoFence +WriteNoFence8 +WriteNoFence16 +WriteNoFence64 +WritePointerAcquire +WritePointerNoFence +WritePointerRaw +WritePointerRelease +WriteRaw +WriteRaw8 +WriteRaw16 +WriteRaw64 +WriteRelease +WriteRelease8 +WriteRelease16 +WriteRelease64 +WriteUCharAcquire +WriteUCharNoFence +WriteUCharRaw +WriteUCharRelease +WriteULongAcquire +WriteULongNoFence +WriteULongRaw +WriteULongRelease +WriteULong64Acquire +WriteULong64NoFence +WriteULong64Raw +WriteULong64Release +WriteUShortAcquire +WriteUShortNoFence +WriteUShortRaw +WriteUShortRelease --file um-winnt.h --headerFile @@ -22,8 +424,6 @@ header.txt C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/shared --include-directory C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um ---libraryPath -unused --methodClassName Windows --namespace @@ -561,6 +961,7 @@ _TAPE_SET_MEDIA_PARAMETERS=TAPE_SET_MEDIA_PARAMETERS _TAPE_SET_POSITION=TAPE_SET_POSITION _TAPE_WMI_OPERATIONS=TAPE_WMI_OPERATIONS _TAPE_WRITE_MARKS=TAPE_WRITE_MARKS +_TEB=TEB _TOKEN_ACCESS_INFORMATION=TOKEN_ACCESS_INFORMATION _TOKEN_APPCONTAINER_INFORMATION=TOKEN_APPCONTAINER_INFORMATION _TOKEN_AUDIT_POLICY=TOKEN_AUDIT_POLICY @@ -635,7 +1036,7 @@ TP_POOL*=IntPtr TP_TIMER*=IntPtr TP_WAIT*=IntPtr TP_WORK*=IntPtr -ULONG_PTR=UIntPtr +ULONG_PTR=nuint --traverse C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/winnt.h --with-attribute diff --git a/samples/DirectX/TerraFX.Samples.DirectX.csproj b/samples/DirectX/TerraFX.Samples.DirectX.csproj index ded0bf5bf5..68a428f520 100644 --- a/samples/DirectX/TerraFX.Samples.DirectX.csproj +++ b/samples/DirectX/TerraFX.Samples.DirectX.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/samples/WinForms/TerraFX.Samples.WinForms.csproj b/samples/WinForms/TerraFX.Samples.WinForms.csproj index ace50bd145..330a6d7eb4 100644 --- a/samples/WinForms/TerraFX.Samples.WinForms.csproj +++ b/samples/WinForms/TerraFX.Samples.WinForms.csproj @@ -4,7 +4,7 @@ WinExe - netcoreapp5.0 + net5.0 true diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 0c10be92ce..984f6de2bc 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -120,7 +120,7 @@ try { $DotNetInstallDirectory = Join-Path -Path $ArtifactsDir -ChildPath "dotnet" Create-Directory -Path $DotNetInstallDirectory - & $DotNetInstallScript -Channel release/5.0.1xx-preview2 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture + & $DotNetInstallScript -Channel master -Version 5.0.100-preview.4.20258.7 -InstallDir $DotNetInstallDirectory -Architecture $architecture & $DotNetInstallScript -Channel 3.1 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture -Runtime dotnet $env:PATH="$DotNetInstallDirectory;$env:PATH" diff --git a/scripts/build.sh b/scripts/build.sh index 26384ee143..1288794089 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -204,7 +204,7 @@ if [[ ! -z "$architecture" ]]; then DotNetInstallDirectory="$ArtifactsDir/dotnet" CreateDirectory "$DotNetInstallDirectory" - . "$DotNetInstallScript" --channel release/5.0.1xx-preview2 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" + . "$DotNetInstallScript" --channel master --version 5.0.100-preview.4.20258.7 --install-dir "$DotNetInstallDirectory" --architecture "$architecture" . "$DotNetInstallScript" --channel 3.1 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" --runtime dotnet PATH="$DotNetInstallDirectory:$PATH:" diff --git a/sources/Interop/Advapi32/Advapi32.cs b/sources/Interop/Advapi32/Advapi32.cs index 7ad9c1d7cc..4bf7b762bf 100644 --- a/sources/Interop/Advapi32/Advapi32.cs +++ b/sources/Interop/Advapi32/Advapi32.cs @@ -4,6 +4,6 @@ namespace TerraFX.Interop { public static unsafe partial class Advapi32 { - private const string LibraryPath = "kernel32"; + private const string LibraryPath = "advapi32"; } } diff --git a/sources/Interop/Advapi32/TerraFX.Interop.Advapi32.csproj b/sources/Interop/Advapi32/TerraFX.Interop.Advapi32.csproj index ac3faf3282..6a73dafec2 100644 --- a/sources/Interop/Advapi32/TerraFX.Interop.Advapi32.csproj +++ b/sources/Interop/Advapi32/TerraFX.Interop.Advapi32.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/Advapi32/um/processthreadsapi/APP_MEMORY_INFORMATION.cs b/sources/Interop/Advapi32/um/processthreadsapi/APP_MEMORY_INFORMATION.cs new file mode 100644 index 0000000000..cebe7ef241 --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/APP_MEMORY_INFORMATION.cs @@ -0,0 +1,22 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public partial struct APP_MEMORY_INFORMATION + { + [NativeTypeName("ULONG64")] + public ulong AvailableCommit; + + [NativeTypeName("ULONG64")] + public ulong PrivateCommitUsage; + + [NativeTypeName("ULONG64")] + public ulong PeakPrivateCommitUsage; + + [NativeTypeName("ULONG64")] + public ulong TotalCommitUsage; + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/Advapi32.cs b/sources/Interop/Advapi32/um/processthreadsapi/Advapi32.cs index 439253a6a9..fd5cbf610d 100644 --- a/sources/Interop/Advapi32/um/processthreadsapi/Advapi32.cs +++ b/sources/Interop/Advapi32/um/processthreadsapi/Advapi32.cs @@ -10,8 +10,350 @@ namespace TerraFX.Interop { public static unsafe partial class Advapi32 { + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "QueueUserAPC", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint QueueUserAPC([NativeTypeName("PAPCFUNC")] IntPtr pfnAPC, [NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("ULONG_PTR")] nuint dwData); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetProcessTimes", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetProcessTimes([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("LPFILETIME")] FILETIME* lpCreationTime, [NativeTypeName("LPFILETIME")] FILETIME* lpExitTime, [NativeTypeName("LPFILETIME")] FILETIME* lpKernelTime, [NativeTypeName("LPFILETIME")] FILETIME* lpUserTime); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetCurrentProcess", ExactSpelling = true)] + [return: NativeTypeName("HANDLE")] + public static extern IntPtr GetCurrentProcess(); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetCurrentProcessId", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetCurrentProcessId(); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ExitProcess", ExactSpelling = true)] + public static extern void ExitProcess([NativeTypeName("UINT")] uint uExitCode); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "TerminateProcess", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int TerminateProcess([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("UINT")] uint uExitCode); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetExitCodeProcess", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetExitCodeProcess([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("LPDWORD")] uint* lpExitCode); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SwitchToThread", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SwitchToThread(); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateThread", ExactSpelling = true)] + [return: NativeTypeName("HANDLE")] + public static extern IntPtr CreateThread([NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpThreadAttributes, [NativeTypeName("SIZE_T")] nuint dwStackSize, [NativeTypeName("LPTHREAD_START_ROUTINE")] IntPtr lpStartAddress, [NativeTypeName("LPVOID")] void* lpParameter, [NativeTypeName("DWORD")] uint dwCreationFlags, [NativeTypeName("LPDWORD")] uint* lpThreadId); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateRemoteThread", ExactSpelling = true)] + [return: NativeTypeName("HANDLE")] + public static extern IntPtr CreateRemoteThread([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpThreadAttributes, [NativeTypeName("SIZE_T")] nuint dwStackSize, [NativeTypeName("LPTHREAD_START_ROUTINE")] IntPtr lpStartAddress, [NativeTypeName("LPVOID")] void* lpParameter, [NativeTypeName("DWORD")] uint dwCreationFlags, [NativeTypeName("LPDWORD")] uint* lpThreadId); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetCurrentThread", ExactSpelling = true)] + [return: NativeTypeName("HANDLE")] + public static extern IntPtr GetCurrentThread(); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetCurrentThreadId", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetCurrentThreadId(); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "OpenThread", ExactSpelling = true)] + [return: NativeTypeName("HANDLE")] + public static extern IntPtr OpenThread([NativeTypeName("DWORD")] uint dwDesiredAccess, [NativeTypeName("BOOL")] int bInheritHandle, [NativeTypeName("DWORD")] uint dwThreadId); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetThreadPriority", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetThreadPriority([NativeTypeName("HANDLE")] IntPtr hThread, int nPriority); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetThreadPriorityBoost", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetThreadPriorityBoost([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("BOOL")] int bDisablePriorityBoost); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetThreadPriorityBoost", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetThreadPriorityBoost([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("PBOOL")] int* pDisablePriorityBoost); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetThreadPriority", ExactSpelling = true)] + public static extern int GetThreadPriority([NativeTypeName("HANDLE")] IntPtr hThread); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ExitThread", ExactSpelling = true)] + public static extern void ExitThread([NativeTypeName("DWORD")] uint dwExitCode); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "TerminateThread", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int TerminateThread([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("DWORD")] uint dwExitCode); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetExitCodeThread", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetExitCodeThread([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("LPDWORD")] uint* lpExitCode); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SuspendThread", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint SuspendThread([NativeTypeName("HANDLE")] IntPtr hThread); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ResumeThread", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint ResumeThread([NativeTypeName("HANDLE")] IntPtr hThread); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "TlsAlloc", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint TlsAlloc(); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "TlsGetValue", ExactSpelling = true)] + [return: NativeTypeName("LPVOID")] + public static extern void* TlsGetValue([NativeTypeName("DWORD")] uint dwTlsIndex); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "TlsSetValue", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int TlsSetValue([NativeTypeName("DWORD")] uint dwTlsIndex, [NativeTypeName("LPVOID")] void* lpTlsValue); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "TlsFree", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int TlsFree([NativeTypeName("DWORD")] uint dwTlsIndex); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateProcessA", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CreateProcessA([NativeTypeName("LPCSTR")] sbyte* lpApplicationName, [NativeTypeName("LPSTR")] sbyte* lpCommandLine, [NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpProcessAttributes, [NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpThreadAttributes, [NativeTypeName("BOOL")] int bInheritHandles, [NativeTypeName("DWORD")] uint dwCreationFlags, [NativeTypeName("LPVOID")] void* lpEnvironment, [NativeTypeName("LPCSTR")] sbyte* lpCurrentDirectory, [NativeTypeName("LPSTARTUPINFOA")] STARTUPINFOA* lpStartupInfo, [NativeTypeName("LPPROCESS_INFORMATION")] PROCESS_INFORMATION* lpProcessInformation); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateProcessW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CreateProcessW([NativeTypeName("LPCWSTR")] ushort* lpApplicationName, [NativeTypeName("LPWSTR")] ushort* lpCommandLine, [NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpProcessAttributes, [NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpThreadAttributes, [NativeTypeName("BOOL")] int bInheritHandles, [NativeTypeName("DWORD")] uint dwCreationFlags, [NativeTypeName("LPVOID")] void* lpEnvironment, [NativeTypeName("LPCWSTR")] ushort* lpCurrentDirectory, [NativeTypeName("LPSTARTUPINFOW")] STARTUPINFOW* lpStartupInfo, [NativeTypeName("LPPROCESS_INFORMATION")] PROCESS_INFORMATION* lpProcessInformation); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetProcessShutdownParameters", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetProcessShutdownParameters([NativeTypeName("DWORD")] uint dwLevel, [NativeTypeName("DWORD")] uint dwFlags); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetProcessVersion", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetProcessVersion([NativeTypeName("DWORD")] uint ProcessId); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetStartupInfoW", ExactSpelling = true)] + public static extern void GetStartupInfoW([NativeTypeName("LPSTARTUPINFOW")] STARTUPINFOW* lpStartupInfo); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateProcessAsUserW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CreateProcessAsUserW([NativeTypeName("HANDLE")] IntPtr hToken, [NativeTypeName("LPCWSTR")] ushort* lpApplicationName, [NativeTypeName("LPWSTR")] ushort* lpCommandLine, [NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpProcessAttributes, [NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpThreadAttributes, [NativeTypeName("BOOL")] int bInheritHandles, [NativeTypeName("DWORD")] uint dwCreationFlags, [NativeTypeName("LPVOID")] void* lpEnvironment, [NativeTypeName("LPCWSTR")] ushort* lpCurrentDirectory, [NativeTypeName("LPSTARTUPINFOW")] STARTUPINFOW* lpStartupInfo, [NativeTypeName("LPPROCESS_INFORMATION")] PROCESS_INFORMATION* lpProcessInformation); + + [return: NativeTypeName("HANDLE")] + public static IntPtr GetCurrentProcessToken() + { + return (IntPtr)(int)-4; + } + + [return: NativeTypeName("HANDLE")] + public static IntPtr GetCurrentThreadToken() + { + return (IntPtr)(int)-5; + } + + [return: NativeTypeName("HANDLE")] + public static IntPtr GetCurrentThreadEffectiveToken() + { + return (IntPtr)(int)-6; + } + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetThreadToken", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetThreadToken([NativeTypeName("PHANDLE")] IntPtr* Thread, [NativeTypeName("HANDLE")] IntPtr Token); + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "OpenProcessToken", ExactSpelling = true)] [return: NativeTypeName("BOOL")] public static extern int OpenProcessToken([NativeTypeName("HANDLE")] IntPtr ProcessHandle, [NativeTypeName("DWORD")] uint DesiredAccess, [NativeTypeName("PHANDLE")] IntPtr* TokenHandle); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "OpenThreadToken", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int OpenThreadToken([NativeTypeName("HANDLE")] IntPtr ThreadHandle, [NativeTypeName("DWORD")] uint DesiredAccess, [NativeTypeName("BOOL")] int OpenAsSelf, [NativeTypeName("PHANDLE")] IntPtr* TokenHandle); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetPriorityClass", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetPriorityClass([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("DWORD")] uint dwPriorityClass); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetPriorityClass", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetPriorityClass([NativeTypeName("HANDLE")] IntPtr hProcess); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetThreadStackGuarantee", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetThreadStackGuarantee([NativeTypeName("PULONG")] uint* StackSizeInBytes); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ProcessIdToSessionId", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int ProcessIdToSessionId([NativeTypeName("DWORD")] uint dwProcessId, [NativeTypeName("DWORD *")] uint* pSessionId); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetProcessId", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetProcessId([NativeTypeName("HANDLE")] IntPtr Process); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetThreadId", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetThreadId([NativeTypeName("HANDLE")] IntPtr Thread); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "FlushProcessWriteBuffers", ExactSpelling = true)] + public static extern void FlushProcessWriteBuffers(); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetProcessIdOfThread", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetProcessIdOfThread([NativeTypeName("HANDLE")] IntPtr Thread); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "InitializeProcThreadAttributeList", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int InitializeProcThreadAttributeList([NativeTypeName("LPPROC_THREAD_ATTRIBUTE_LIST")] PROC_THREAD_ATTRIBUTE_LIST* lpAttributeList, [NativeTypeName("DWORD")] uint dwAttributeCount, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("PSIZE_T")] nuint* lpSize); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DeleteProcThreadAttributeList", ExactSpelling = true)] + public static extern void DeleteProcThreadAttributeList([NativeTypeName("LPPROC_THREAD_ATTRIBUTE_LIST")] PROC_THREAD_ATTRIBUTE_LIST* lpAttributeList); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetProcessAffinityUpdateMode", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetProcessAffinityUpdateMode([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("DWORD")] uint dwFlags); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "QueryProcessAffinityUpdateMode", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int QueryProcessAffinityUpdateMode([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("LPDWORD")] uint* lpdwFlags); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "UpdateProcThreadAttribute", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int UpdateProcThreadAttribute([NativeTypeName("LPPROC_THREAD_ATTRIBUTE_LIST")] PROC_THREAD_ATTRIBUTE_LIST* lpAttributeList, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("DWORD_PTR")] nuint Attribute, [NativeTypeName("PVOID")] void* lpValue, [NativeTypeName("SIZE_T")] nuint cbSize, [NativeTypeName("PVOID")] void* lpPreviousValue, [NativeTypeName("PSIZE_T")] nuint* lpReturnSize); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateRemoteThreadEx", ExactSpelling = true)] + [return: NativeTypeName("HANDLE")] + public static extern IntPtr CreateRemoteThreadEx([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpThreadAttributes, [NativeTypeName("SIZE_T")] nuint dwStackSize, [NativeTypeName("LPTHREAD_START_ROUTINE")] IntPtr lpStartAddress, [NativeTypeName("LPVOID")] void* lpParameter, [NativeTypeName("DWORD")] uint dwCreationFlags, [NativeTypeName("LPPROC_THREAD_ATTRIBUTE_LIST")] PROC_THREAD_ATTRIBUTE_LIST* lpAttributeList, [NativeTypeName("LPDWORD")] uint* lpThreadId); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetCurrentThreadStackLimits", ExactSpelling = true)] + public static extern void GetCurrentThreadStackLimits([NativeTypeName("PULONG_PTR")] uint* LowLimit, [NativeTypeName("PULONG_PTR")] uint* HighLimit); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetThreadContext", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetThreadContext([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("LPCONTEXT")] CONTEXT* lpContext); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetProcessMitigationPolicy", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetProcessMitigationPolicy([NativeTypeName("HANDLE")] IntPtr hProcess, PROCESS_MITIGATION_POLICY MitigationPolicy, [NativeTypeName("PVOID")] void* lpBuffer, [NativeTypeName("SIZE_T")] nuint dwLength); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetThreadContext", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetThreadContext([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("const CONTEXT *")] CONTEXT* lpContext); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetProcessMitigationPolicy", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY MitigationPolicy, [NativeTypeName("PVOID")] void* lpBuffer, [NativeTypeName("SIZE_T")] nuint dwLength); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "FlushInstructionCache", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int FlushInstructionCache([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("LPCVOID")] void* lpBaseAddress, [NativeTypeName("SIZE_T")] nuint dwSize); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetThreadTimes", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetThreadTimes([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("LPFILETIME")] FILETIME* lpCreationTime, [NativeTypeName("LPFILETIME")] FILETIME* lpExitTime, [NativeTypeName("LPFILETIME")] FILETIME* lpKernelTime, [NativeTypeName("LPFILETIME")] FILETIME* lpUserTime); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "OpenProcess", ExactSpelling = true)] + [return: NativeTypeName("HANDLE")] + public static extern IntPtr OpenProcess([NativeTypeName("DWORD")] uint dwDesiredAccess, [NativeTypeName("BOOL")] int bInheritHandle, [NativeTypeName("DWORD")] uint dwProcessId); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "IsProcessorFeaturePresent", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int IsProcessorFeaturePresent([NativeTypeName("DWORD")] uint ProcessorFeature); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetProcessHandleCount", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetProcessHandleCount([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("PDWORD")] uint* pdwHandleCount); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetCurrentProcessorNumber", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetCurrentProcessorNumber(); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetThreadIdealProcessorEx", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetThreadIdealProcessorEx([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("PPROCESSOR_NUMBER")] PROCESSOR_NUMBER* lpIdealProcessor, [NativeTypeName("PPROCESSOR_NUMBER")] PROCESSOR_NUMBER* lpPreviousIdealProcessor); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetThreadIdealProcessorEx", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetThreadIdealProcessorEx([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("PPROCESSOR_NUMBER")] PROCESSOR_NUMBER* lpIdealProcessor); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetCurrentProcessorNumberEx", ExactSpelling = true)] + public static extern void GetCurrentProcessorNumberEx([NativeTypeName("PPROCESSOR_NUMBER")] PROCESSOR_NUMBER* ProcNumber); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetProcessPriorityBoost", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetProcessPriorityBoost([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("PBOOL")] int* pDisablePriorityBoost); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetProcessPriorityBoost", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetProcessPriorityBoost([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("BOOL")] int bDisablePriorityBoost); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetThreadIOPendingFlag", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetThreadIOPendingFlag([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("PBOOL")] int* lpIOIsPending); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSystemTimes", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetSystemTimes([NativeTypeName("PFILETIME")] FILETIME* lpIdleTime, [NativeTypeName("PFILETIME")] FILETIME* lpKernelTime, [NativeTypeName("PFILETIME")] FILETIME* lpUserTime); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetThreadInformation", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetThreadInformation([NativeTypeName("HANDLE")] IntPtr hThread, THREAD_INFORMATION_CLASS ThreadInformationClass, [NativeTypeName("LPVOID")] void* ThreadInformation, [NativeTypeName("DWORD")] uint ThreadInformationSize); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetThreadInformation", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetThreadInformation([NativeTypeName("HANDLE")] IntPtr hThread, THREAD_INFORMATION_CLASS ThreadInformationClass, [NativeTypeName("LPVOID")] void* ThreadInformation, [NativeTypeName("DWORD")] uint ThreadInformationSize); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "IsProcessCritical", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int IsProcessCritical([NativeTypeName("HANDLE")] IntPtr hProcess, [NativeTypeName("PBOOL")] int* Critical); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetProtectedPolicy", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetProtectedPolicy([NativeTypeName("LPCGUID")] Guid* PolicyGuid, [NativeTypeName("ULONG_PTR")] nuint PolicyValue, [NativeTypeName("PULONG_PTR")] uint* OldPolicyValue); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "QueryProtectedPolicy", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int QueryProtectedPolicy([NativeTypeName("LPCGUID")] Guid* PolicyGuid, [NativeTypeName("PULONG_PTR")] uint* PolicyValue); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetThreadIdealProcessor", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint SetThreadIdealProcessor([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("DWORD")] uint dwIdealProcessor); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetProcessInformation", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetProcessInformation([NativeTypeName("HANDLE")] IntPtr hProcess, PROCESS_INFORMATION_CLASS ProcessInformationClass, [NativeTypeName("LPVOID")] void* ProcessInformation, [NativeTypeName("DWORD")] uint ProcessInformationSize); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetProcessInformation", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetProcessInformation([NativeTypeName("HANDLE")] IntPtr hProcess, PROCESS_INFORMATION_CLASS ProcessInformationClass, [NativeTypeName("LPVOID")] void* ProcessInformation, [NativeTypeName("DWORD")] uint ProcessInformationSize); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSystemCpuSetInformation", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetSystemCpuSetInformation([NativeTypeName("PSYSTEM_CPU_SET_INFORMATION")] SYSTEM_CPU_SET_INFORMATION* Information, [NativeTypeName("ULONG")] uint BufferLength, [NativeTypeName("PULONG")] uint* ReturnedLength, [NativeTypeName("HANDLE")] IntPtr Process, [NativeTypeName("ULONG")] uint Flags); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetProcessDefaultCpuSets", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetProcessDefaultCpuSets([NativeTypeName("HANDLE")] IntPtr Process, [NativeTypeName("PULONG")] uint* CpuSetIds, [NativeTypeName("ULONG")] uint CpuSetIdCount, [NativeTypeName("PULONG")] uint* RequiredIdCount); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetProcessDefaultCpuSets", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetProcessDefaultCpuSets([NativeTypeName("HANDLE")] IntPtr Process, [NativeTypeName("const ULONG *")] uint* CpuSetIds, [NativeTypeName("ULONG")] uint CpuSetIdCount); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetThreadSelectedCpuSets", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetThreadSelectedCpuSets([NativeTypeName("HANDLE")] IntPtr Thread, [NativeTypeName("PULONG")] uint* CpuSetIds, [NativeTypeName("ULONG")] uint CpuSetIdCount, [NativeTypeName("PULONG")] uint* RequiredIdCount); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetThreadSelectedCpuSets", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetThreadSelectedCpuSets([NativeTypeName("HANDLE")] IntPtr Thread, [NativeTypeName("const ULONG *")] uint* CpuSetIds, [NativeTypeName("ULONG")] uint CpuSetIdCount); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateProcessAsUserA", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CreateProcessAsUserA([NativeTypeName("HANDLE")] IntPtr hToken, [NativeTypeName("LPCSTR")] sbyte* lpApplicationName, [NativeTypeName("LPSTR")] sbyte* lpCommandLine, [NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpProcessAttributes, [NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpThreadAttributes, [NativeTypeName("BOOL")] int bInheritHandles, [NativeTypeName("DWORD")] uint dwCreationFlags, [NativeTypeName("LPVOID")] void* lpEnvironment, [NativeTypeName("LPCSTR")] sbyte* lpCurrentDirectory, [NativeTypeName("LPSTARTUPINFOA")] STARTUPINFOA* lpStartupInfo, [NativeTypeName("LPPROCESS_INFORMATION")] PROCESS_INFORMATION* lpProcessInformation); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetProcessShutdownParameters", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetProcessShutdownParameters([NativeTypeName("LPDWORD")] uint* lpdwLevel, [NativeTypeName("LPDWORD")] uint* lpdwFlags); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetThreadDescription", ExactSpelling = true)] + [return: NativeTypeName("HRESULT")] + public static extern int SetThreadDescription([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("PCWSTR")] ushort* lpThreadDescription); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetThreadDescription", ExactSpelling = true)] + [return: NativeTypeName("HRESULT")] + public static extern int GetThreadDescription([NativeTypeName("HANDLE")] IntPtr hThread, [NativeTypeName("PWSTR *")] ushort** ppszThreadDescription); } } diff --git a/sources/Interop/Advapi32/um/processthreadsapi/MEMORY_PRIORITY_INFORMATION.cs b/sources/Interop/Advapi32/um/processthreadsapi/MEMORY_PRIORITY_INFORMATION.cs new file mode 100644 index 0000000000..2608c5e816 --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/MEMORY_PRIORITY_INFORMATION.cs @@ -0,0 +1,13 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public partial struct MEMORY_PRIORITY_INFORMATION + { + [NativeTypeName("ULONG")] + public uint MemoryPriority; + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_INFORMATION.cs b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_INFORMATION.cs new file mode 100644 index 0000000000..0e8108a655 --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_INFORMATION.cs @@ -0,0 +1,24 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +using System; + +namespace TerraFX.Interop +{ + public partial struct PROCESS_INFORMATION + { + [NativeTypeName("HANDLE")] + public IntPtr hProcess; + + [NativeTypeName("HANDLE")] + public IntPtr hThread; + + [NativeTypeName("DWORD")] + public uint dwProcessId; + + [NativeTypeName("DWORD")] + public uint dwThreadId; + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_INFORMATION_CLASS.cs b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_INFORMATION_CLASS.cs new file mode 100644 index 0000000000..9eb09b47c2 --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_INFORMATION_CLASS.cs @@ -0,0 +1,21 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public enum PROCESS_INFORMATION_CLASS + { + ProcessMemoryPriority, + ProcessMemoryExhaustionInfo, + ProcessAppMemoryInfo, + ProcessInPrivateInfo, + ProcessPowerThrottling, + ProcessReservedValue1, + ProcessTelemetryCoverageInfo, + ProcessProtectionLevelInfo, + ProcessLeapSecondInfo, + ProcessInformationClassMax, + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_LEAP_SECOND_INFO.cs b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_LEAP_SECOND_INFO.cs new file mode 100644 index 0000000000..b919e0de9a --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_LEAP_SECOND_INFO.cs @@ -0,0 +1,16 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public partial struct PROCESS_LEAP_SECOND_INFO + { + [NativeTypeName("ULONG")] + public uint Flags; + + [NativeTypeName("ULONG")] + public uint Reserved; + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_MEMORY_EXHAUSTION_INFO.cs b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_MEMORY_EXHAUSTION_INFO.cs new file mode 100644 index 0000000000..a0b8fdacb5 --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_MEMORY_EXHAUSTION_INFO.cs @@ -0,0 +1,21 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public partial struct PROCESS_MEMORY_EXHAUSTION_INFO + { + [NativeTypeName("USHORT")] + public ushort Version; + + [NativeTypeName("USHORT")] + public ushort Reserved; + + public PROCESS_MEMORY_EXHAUSTION_TYPE Type; + + [NativeTypeName("ULONG_PTR")] + public nuint Value; + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_MEMORY_EXHAUSTION_TYPE.cs b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_MEMORY_EXHAUSTION_TYPE.cs new file mode 100644 index 0000000000..626356cdcb --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_MEMORY_EXHAUSTION_TYPE.cs @@ -0,0 +1,13 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public enum PROCESS_MEMORY_EXHAUSTION_TYPE + { + PMETypeFailFastOnCommitFailure, + PMETypeMax, + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_POWER_THROTTLING_STATE.cs b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_POWER_THROTTLING_STATE.cs new file mode 100644 index 0000000000..7a97856ccf --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_POWER_THROTTLING_STATE.cs @@ -0,0 +1,19 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public partial struct PROCESS_POWER_THROTTLING_STATE + { + [NativeTypeName("ULONG")] + public uint Version; + + [NativeTypeName("ULONG")] + public uint ControlMask; + + [NativeTypeName("ULONG")] + public uint StateMask; + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_PROTECTION_LEVEL_INFORMATION.cs b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_PROTECTION_LEVEL_INFORMATION.cs new file mode 100644 index 0000000000..6c3d55bc90 --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/PROCESS_PROTECTION_LEVEL_INFORMATION.cs @@ -0,0 +1,13 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public partial struct PROCESS_PROTECTION_LEVEL_INFORMATION + { + [NativeTypeName("DWORD")] + public uint ProtectionLevel; + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/PROC_THREAD_ATTRIBUTE_LIST.cs b/sources/Interop/Advapi32/um/processthreadsapi/PROC_THREAD_ATTRIBUTE_LIST.cs new file mode 100644 index 0000000000..64cafdafd1 --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/PROC_THREAD_ATTRIBUTE_LIST.cs @@ -0,0 +1,11 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public partial struct PROC_THREAD_ATTRIBUTE_LIST + { + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/STARTUPINFOA.cs b/sources/Interop/Advapi32/um/processthreadsapi/STARTUPINFOA.cs new file mode 100644 index 0000000000..8126bac18e --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/STARTUPINFOA.cs @@ -0,0 +1,66 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +using System; + +namespace TerraFX.Interop +{ + public unsafe partial struct STARTUPINFOA + { + [NativeTypeName("DWORD")] + public uint cb; + + [NativeTypeName("LPSTR")] + public sbyte* lpReserved; + + [NativeTypeName("LPSTR")] + public sbyte* lpDesktop; + + [NativeTypeName("LPSTR")] + public sbyte* lpTitle; + + [NativeTypeName("DWORD")] + public uint dwX; + + [NativeTypeName("DWORD")] + public uint dwY; + + [NativeTypeName("DWORD")] + public uint dwXSize; + + [NativeTypeName("DWORD")] + public uint dwYSize; + + [NativeTypeName("DWORD")] + public uint dwXCountChars; + + [NativeTypeName("DWORD")] + public uint dwYCountChars; + + [NativeTypeName("DWORD")] + public uint dwFillAttribute; + + [NativeTypeName("DWORD")] + public uint dwFlags; + + [NativeTypeName("WORD")] + public ushort wShowWindow; + + [NativeTypeName("WORD")] + public ushort cbReserved2; + + [NativeTypeName("LPBYTE")] + public byte* lpReserved2; + + [NativeTypeName("HANDLE")] + public IntPtr hStdInput; + + [NativeTypeName("HANDLE")] + public IntPtr hStdOutput; + + [NativeTypeName("HANDLE")] + public IntPtr hStdError; + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/STARTUPINFOW.cs b/sources/Interop/Advapi32/um/processthreadsapi/STARTUPINFOW.cs new file mode 100644 index 0000000000..173a607eda --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/STARTUPINFOW.cs @@ -0,0 +1,66 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +using System; + +namespace TerraFX.Interop +{ + public unsafe partial struct STARTUPINFOW + { + [NativeTypeName("DWORD")] + public uint cb; + + [NativeTypeName("LPWSTR")] + public ushort* lpReserved; + + [NativeTypeName("LPWSTR")] + public ushort* lpDesktop; + + [NativeTypeName("LPWSTR")] + public ushort* lpTitle; + + [NativeTypeName("DWORD")] + public uint dwX; + + [NativeTypeName("DWORD")] + public uint dwY; + + [NativeTypeName("DWORD")] + public uint dwXSize; + + [NativeTypeName("DWORD")] + public uint dwYSize; + + [NativeTypeName("DWORD")] + public uint dwXCountChars; + + [NativeTypeName("DWORD")] + public uint dwYCountChars; + + [NativeTypeName("DWORD")] + public uint dwFillAttribute; + + [NativeTypeName("DWORD")] + public uint dwFlags; + + [NativeTypeName("WORD")] + public ushort wShowWindow; + + [NativeTypeName("WORD")] + public ushort cbReserved2; + + [NativeTypeName("LPBYTE")] + public byte* lpReserved2; + + [NativeTypeName("HANDLE")] + public IntPtr hStdInput; + + [NativeTypeName("HANDLE")] + public IntPtr hStdOutput; + + [NativeTypeName("HANDLE")] + public IntPtr hStdError; + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/THREAD_INFORMATION_CLASS.cs b/sources/Interop/Advapi32/um/processthreadsapi/THREAD_INFORMATION_CLASS.cs new file mode 100644 index 0000000000..3cfe1cc6a0 --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/THREAD_INFORMATION_CLASS.cs @@ -0,0 +1,16 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public enum THREAD_INFORMATION_CLASS + { + ThreadMemoryPriority, + ThreadAbsoluteCpuPriority, + ThreadDynamicCodePolicy, + ThreadPowerThrottling, + ThreadInformationClassMax, + } +} diff --git a/sources/Interop/Advapi32/um/processthreadsapi/THREAD_POWER_THROTTLING_STATE.cs b/sources/Interop/Advapi32/um/processthreadsapi/THREAD_POWER_THROTTLING_STATE.cs new file mode 100644 index 0000000000..909811731b --- /dev/null +++ b/sources/Interop/Advapi32/um/processthreadsapi/THREAD_POWER_THROTTLING_STATE.cs @@ -0,0 +1,19 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/processthreadsapi.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public partial struct THREAD_POWER_THROTTLING_STATE + { + [NativeTypeName("ULONG")] + public uint Version; + + [NativeTypeName("ULONG")] + public uint ControlMask; + + [NativeTypeName("ULONG")] + public uint StateMask; + } +} diff --git a/sources/Interop/Advapi32/um/securitybaseapi/Advapi32.cs b/sources/Interop/Advapi32/um/securitybaseapi/Advapi32.cs index 2fbd61ddaf..5fac9f4fb2 100644 --- a/sources/Interop/Advapi32/um/securitybaseapi/Advapi32.cs +++ b/sources/Interop/Advapi32/um/securitybaseapi/Advapi32.cs @@ -10,8 +10,417 @@ namespace TerraFX.Interop { public static unsafe partial class Advapi32 { + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AccessCheck", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AccessCheck([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("HANDLE")] IntPtr ClientToken, [NativeTypeName("DWORD")] uint DesiredAccess, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping, [NativeTypeName("PPRIVILEGE_SET")] PRIVILEGE_SET* PrivilegeSet, [NativeTypeName("LPDWORD")] uint* PrivilegeSetLength, [NativeTypeName("LPDWORD")] uint* GrantedAccess, [NativeTypeName("LPBOOL")] int* AccessStatus); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AccessCheckAndAuditAlarmW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AccessCheckAndAuditAlarmW([NativeTypeName("LPCWSTR")] ushort* SubsystemName, [NativeTypeName("LPVOID")] void* HandleId, [NativeTypeName("LPWSTR")] ushort* ObjectTypeName, [NativeTypeName("LPWSTR")] ushort* ObjectName, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* SecurityDescriptor, [NativeTypeName("DWORD")] uint DesiredAccess, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping, [NativeTypeName("BOOL")] int ObjectCreation, [NativeTypeName("LPDWORD")] uint* GrantedAccess, [NativeTypeName("LPBOOL")] int* AccessStatus, [NativeTypeName("LPBOOL")] int* pfGenerateOnClose); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AccessCheckByType", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AccessCheckByType([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("PSID")] void* PrincipalSelfSid, [NativeTypeName("HANDLE")] IntPtr ClientToken, [NativeTypeName("DWORD")] uint DesiredAccess, [NativeTypeName("POBJECT_TYPE_LIST")] OBJECT_TYPE_LIST* ObjectTypeList, [NativeTypeName("DWORD")] uint ObjectTypeListLength, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping, [NativeTypeName("PPRIVILEGE_SET")] PRIVILEGE_SET* PrivilegeSet, [NativeTypeName("LPDWORD")] uint* PrivilegeSetLength, [NativeTypeName("LPDWORD")] uint* GrantedAccess, [NativeTypeName("LPBOOL")] int* AccessStatus); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AccessCheckByTypeResultList", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AccessCheckByTypeResultList([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("PSID")] void* PrincipalSelfSid, [NativeTypeName("HANDLE")] IntPtr ClientToken, [NativeTypeName("DWORD")] uint DesiredAccess, [NativeTypeName("POBJECT_TYPE_LIST")] OBJECT_TYPE_LIST* ObjectTypeList, [NativeTypeName("DWORD")] uint ObjectTypeListLength, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping, [NativeTypeName("PPRIVILEGE_SET")] PRIVILEGE_SET* PrivilegeSet, [NativeTypeName("LPDWORD")] uint* PrivilegeSetLength, [NativeTypeName("LPDWORD")] uint* GrantedAccessList, [NativeTypeName("LPDWORD")] uint* AccessStatusList); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AccessCheckByTypeAndAuditAlarmW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AccessCheckByTypeAndAuditAlarmW([NativeTypeName("LPCWSTR")] ushort* SubsystemName, [NativeTypeName("LPVOID")] void* HandleId, [NativeTypeName("LPCWSTR")] ushort* ObjectTypeName, [NativeTypeName("LPCWSTR")] ushort* ObjectName, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* SecurityDescriptor, [NativeTypeName("PSID")] void* PrincipalSelfSid, [NativeTypeName("DWORD")] uint DesiredAccess, AUDIT_EVENT_TYPE AuditType, [NativeTypeName("DWORD")] uint Flags, [NativeTypeName("POBJECT_TYPE_LIST")] OBJECT_TYPE_LIST* ObjectTypeList, [NativeTypeName("DWORD")] uint ObjectTypeListLength, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping, [NativeTypeName("BOOL")] int ObjectCreation, [NativeTypeName("LPDWORD")] uint* GrantedAccess, [NativeTypeName("LPBOOL")] int* AccessStatus, [NativeTypeName("LPBOOL")] int* pfGenerateOnClose); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AccessCheckByTypeResultListAndAuditAlarmW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AccessCheckByTypeResultListAndAuditAlarmW([NativeTypeName("LPCWSTR")] ushort* SubsystemName, [NativeTypeName("LPVOID")] void* HandleId, [NativeTypeName("LPCWSTR")] ushort* ObjectTypeName, [NativeTypeName("LPCWSTR")] ushort* ObjectName, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* SecurityDescriptor, [NativeTypeName("PSID")] void* PrincipalSelfSid, [NativeTypeName("DWORD")] uint DesiredAccess, AUDIT_EVENT_TYPE AuditType, [NativeTypeName("DWORD")] uint Flags, [NativeTypeName("POBJECT_TYPE_LIST")] OBJECT_TYPE_LIST* ObjectTypeList, [NativeTypeName("DWORD")] uint ObjectTypeListLength, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping, [NativeTypeName("BOOL")] int ObjectCreation, [NativeTypeName("LPDWORD")] uint* GrantedAccessList, [NativeTypeName("LPDWORD")] uint* AccessStatusList, [NativeTypeName("LPBOOL")] int* pfGenerateOnClose); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AccessCheckByTypeResultListAndAuditAlarmByHandleW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AccessCheckByTypeResultListAndAuditAlarmByHandleW([NativeTypeName("LPCWSTR")] ushort* SubsystemName, [NativeTypeName("LPVOID")] void* HandleId, [NativeTypeName("HANDLE")] IntPtr ClientToken, [NativeTypeName("LPCWSTR")] ushort* ObjectTypeName, [NativeTypeName("LPCWSTR")] ushort* ObjectName, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* SecurityDescriptor, [NativeTypeName("PSID")] void* PrincipalSelfSid, [NativeTypeName("DWORD")] uint DesiredAccess, AUDIT_EVENT_TYPE AuditType, [NativeTypeName("DWORD")] uint Flags, [NativeTypeName("POBJECT_TYPE_LIST")] OBJECT_TYPE_LIST* ObjectTypeList, [NativeTypeName("DWORD")] uint ObjectTypeListLength, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping, [NativeTypeName("BOOL")] int ObjectCreation, [NativeTypeName("LPDWORD")] uint* GrantedAccessList, [NativeTypeName("LPDWORD")] uint* AccessStatusList, [NativeTypeName("LPBOOL")] int* pfGenerateOnClose); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddAccessAllowedAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddAccessAllowedAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint AccessMask, [NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddAccessAllowedAceEx", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddAccessAllowedAceEx([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint AceFlags, [NativeTypeName("DWORD")] uint AccessMask, [NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddAccessAllowedObjectAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddAccessAllowedObjectAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint AceFlags, [NativeTypeName("DWORD")] uint AccessMask, [NativeTypeName("GUID *")] Guid* ObjectTypeGuid, [NativeTypeName("GUID *")] Guid* InheritedObjectTypeGuid, [NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddAccessDeniedAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddAccessDeniedAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint AccessMask, [NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddAccessDeniedAceEx", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddAccessDeniedAceEx([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint AceFlags, [NativeTypeName("DWORD")] uint AccessMask, [NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddAccessDeniedObjectAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddAccessDeniedObjectAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint AceFlags, [NativeTypeName("DWORD")] uint AccessMask, [NativeTypeName("GUID *")] Guid* ObjectTypeGuid, [NativeTypeName("GUID *")] Guid* InheritedObjectTypeGuid, [NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint dwStartingAceIndex, [NativeTypeName("LPVOID")] void* pAceList, [NativeTypeName("DWORD")] uint nAceListLength); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddAuditAccessAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddAuditAccessAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint dwAccessMask, [NativeTypeName("PSID")] void* pSid, [NativeTypeName("BOOL")] int bAuditSuccess, [NativeTypeName("BOOL")] int bAuditFailure); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddAuditAccessAceEx", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddAuditAccessAceEx([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint AceFlags, [NativeTypeName("DWORD")] uint dwAccessMask, [NativeTypeName("PSID")] void* pSid, [NativeTypeName("BOOL")] int bAuditSuccess, [NativeTypeName("BOOL")] int bAuditFailure); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddAuditAccessObjectAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddAuditAccessObjectAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint AceFlags, [NativeTypeName("DWORD")] uint AccessMask, [NativeTypeName("GUID *")] Guid* ObjectTypeGuid, [NativeTypeName("GUID *")] Guid* InheritedObjectTypeGuid, [NativeTypeName("PSID")] void* pSid, [NativeTypeName("BOOL")] int bAuditSuccess, [NativeTypeName("BOOL")] int bAuditFailure); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddMandatoryAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddMandatoryAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint AceFlags, [NativeTypeName("DWORD")] uint MandatoryPolicy, [NativeTypeName("PSID")] void* pLabelSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddResourceAttributeAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddResourceAttributeAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint AceFlags, [NativeTypeName("DWORD")] uint AccessMask, [NativeTypeName("PSID")] void* pSid, [NativeTypeName("PCLAIM_SECURITY_ATTRIBUTES_INFORMATION")] CLAIM_SECURITY_ATTRIBUTES_INFORMATION* pAttributeInfo, [NativeTypeName("PDWORD")] uint* pReturnLength); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AddScopedPolicyIDAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AddScopedPolicyIDAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceRevision, [NativeTypeName("DWORD")] uint AceFlags, [NativeTypeName("DWORD")] uint AccessMask, [NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AdjustTokenGroups", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AdjustTokenGroups([NativeTypeName("HANDLE")] IntPtr TokenHandle, [NativeTypeName("BOOL")] int ResetToDefault, [NativeTypeName("PTOKEN_GROUPS")] TOKEN_GROUPS* NewState, [NativeTypeName("DWORD")] uint BufferLength, [NativeTypeName("PTOKEN_GROUPS")] TOKEN_GROUPS* PreviousState, [NativeTypeName("PDWORD")] uint* ReturnLength); + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AdjustTokenPrivileges", ExactSpelling = true)] [return: NativeTypeName("BOOL")] public static extern int AdjustTokenPrivileges([NativeTypeName("HANDLE")] IntPtr TokenHandle, [NativeTypeName("BOOL")] int DisableAllPrivileges, [NativeTypeName("PTOKEN_PRIVILEGES")] TOKEN_PRIVILEGES* NewState, [NativeTypeName("DWORD")] uint BufferLength, [NativeTypeName("PTOKEN_PRIVILEGES")] TOKEN_PRIVILEGES* PreviousState, [NativeTypeName("PDWORD")] uint* ReturnLength); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AllocateAndInitializeSid", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AllocateAndInitializeSid([NativeTypeName("PSID_IDENTIFIER_AUTHORITY")] SID_IDENTIFIER_AUTHORITY* pIdentifierAuthority, [NativeTypeName("BYTE")] byte nSubAuthorityCount, [NativeTypeName("DWORD")] uint nSubAuthority0, [NativeTypeName("DWORD")] uint nSubAuthority1, [NativeTypeName("DWORD")] uint nSubAuthority2, [NativeTypeName("DWORD")] uint nSubAuthority3, [NativeTypeName("DWORD")] uint nSubAuthority4, [NativeTypeName("DWORD")] uint nSubAuthority5, [NativeTypeName("DWORD")] uint nSubAuthority6, [NativeTypeName("DWORD")] uint nSubAuthority7, [NativeTypeName("PSID *")] void** pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AllocateLocallyUniqueId", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AllocateLocallyUniqueId([NativeTypeName("PLUID")] LUID* Luid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AreAllAccessesGranted", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AreAllAccessesGranted([NativeTypeName("DWORD")] uint GrantedAccess, [NativeTypeName("DWORD")] uint DesiredAccess); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AreAnyAccessesGranted", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int AreAnyAccessesGranted([NativeTypeName("DWORD")] uint GrantedAccess, [NativeTypeName("DWORD")] uint DesiredAccess); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CheckTokenMembership", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CheckTokenMembership([NativeTypeName("HANDLE")] IntPtr TokenHandle, [NativeTypeName("PSID")] void* SidToCheck, [NativeTypeName("PBOOL")] int* IsMember); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CheckTokenCapability", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CheckTokenCapability([NativeTypeName("HANDLE")] IntPtr TokenHandle, [NativeTypeName("PSID")] void* CapabilitySidToCheck, [NativeTypeName("PBOOL")] int* HasCapability); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetAppContainerAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetAppContainerAce([NativeTypeName("PACL")] ACL* Acl, [NativeTypeName("DWORD")] uint StartingAceIndex, [NativeTypeName("PVOID *")] void** AppContainerAce, [NativeTypeName("DWORD *")] uint* AppContainerAceIndex); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CheckTokenMembershipEx", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CheckTokenMembershipEx([NativeTypeName("HANDLE")] IntPtr TokenHandle, [NativeTypeName("PSID")] void* SidToCheck, [NativeTypeName("DWORD")] uint Flags, [NativeTypeName("PBOOL")] int* IsMember); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ConvertToAutoInheritPrivateObjectSecurity", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int ConvertToAutoInheritPrivateObjectSecurity([NativeTypeName("PSECURITY_DESCRIPTOR")] void* ParentDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* CurrentSecurityDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR *")] void** NewSecurityDescriptor, [NativeTypeName("GUID *")] Guid* ObjectType, [NativeTypeName("BOOLEAN")] byte IsDirectoryObject, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CopySid", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CopySid([NativeTypeName("DWORD")] uint nDestinationSidLength, [NativeTypeName("PSID")] void* pDestinationSid, [NativeTypeName("PSID")] void* pSourceSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreatePrivateObjectSecurity", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CreatePrivateObjectSecurity([NativeTypeName("PSECURITY_DESCRIPTOR")] void* ParentDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* CreatorDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR *")] void** NewDescriptor, [NativeTypeName("BOOL")] int IsDirectoryObject, [NativeTypeName("HANDLE")] IntPtr Token, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreatePrivateObjectSecurityEx", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CreatePrivateObjectSecurityEx([NativeTypeName("PSECURITY_DESCRIPTOR")] void* ParentDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* CreatorDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR *")] void** NewDescriptor, [NativeTypeName("GUID *")] Guid* ObjectType, [NativeTypeName("BOOL")] int IsContainerObject, [NativeTypeName("ULONG")] uint AutoInheritFlags, [NativeTypeName("HANDLE")] IntPtr Token, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreatePrivateObjectSecurityWithMultipleInheritance", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CreatePrivateObjectSecurityWithMultipleInheritance([NativeTypeName("PSECURITY_DESCRIPTOR")] void* ParentDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* CreatorDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR *")] void** NewDescriptor, [NativeTypeName("GUID **")] Guid** ObjectTypes, [NativeTypeName("ULONG")] uint GuidCount, [NativeTypeName("BOOL")] int IsContainerObject, [NativeTypeName("ULONG")] uint AutoInheritFlags, [NativeTypeName("HANDLE")] IntPtr Token, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateRestrictedToken", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CreateRestrictedToken([NativeTypeName("HANDLE")] IntPtr ExistingTokenHandle, [NativeTypeName("DWORD")] uint Flags, [NativeTypeName("DWORD")] uint DisableSidCount, [NativeTypeName("PSID_AND_ATTRIBUTES")] SID_AND_ATTRIBUTES* SidsToDisable, [NativeTypeName("DWORD")] uint DeletePrivilegeCount, [NativeTypeName("PLUID_AND_ATTRIBUTES")] LUID_AND_ATTRIBUTES* PrivilegesToDelete, [NativeTypeName("DWORD")] uint RestrictedSidCount, [NativeTypeName("PSID_AND_ATTRIBUTES")] SID_AND_ATTRIBUTES* SidsToRestrict, [NativeTypeName("PHANDLE")] IntPtr* NewTokenHandle); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateWellKnownSid", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int CreateWellKnownSid(WELL_KNOWN_SID_TYPE WellKnownSidType, [NativeTypeName("PSID")] void* DomainSid, [NativeTypeName("PSID")] void* pSid, [NativeTypeName("DWORD *")] uint* cbSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EqualDomainSid", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int EqualDomainSid([NativeTypeName("PSID")] void* pSid1, [NativeTypeName("PSID")] void* pSid2, [NativeTypeName("BOOL *")] int* pfEqual); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DeleteAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int DeleteAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceIndex); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DestroyPrivateObjectSecurity", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int DestroyPrivateObjectSecurity([NativeTypeName("PSECURITY_DESCRIPTOR *")] void** ObjectDescriptor); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DuplicateToken", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int DuplicateToken([NativeTypeName("HANDLE")] IntPtr ExistingTokenHandle, SECURITY_IMPERSONATION_LEVEL ImpersonationLevel, [NativeTypeName("PHANDLE")] IntPtr* DuplicateTokenHandle); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DuplicateTokenEx", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int DuplicateTokenEx([NativeTypeName("HANDLE")] IntPtr hExistingToken, [NativeTypeName("DWORD")] uint dwDesiredAccess, [NativeTypeName("LPSECURITY_ATTRIBUTES")] SECURITY_ATTRIBUTES* lpTokenAttributes, SECURITY_IMPERSONATION_LEVEL ImpersonationLevel, TOKEN_TYPE TokenType, [NativeTypeName("PHANDLE")] IntPtr* phNewToken); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EqualPrefixSid", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int EqualPrefixSid([NativeTypeName("PSID")] void* pSid1, [NativeTypeName("PSID")] void* pSid2); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EqualSid", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int EqualSid([NativeTypeName("PSID")] void* pSid1, [NativeTypeName("PSID")] void* pSid2); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "FindFirstFreeAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int FindFirstFreeAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("LPVOID *")] void** pAce); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "FreeSid", ExactSpelling = true)] + [return: NativeTypeName("PVOID")] + public static extern void* FreeSid([NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetAce", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetAce([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint dwAceIndex, [NativeTypeName("LPVOID *")] void** pAce); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetAclInformation", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetAclInformation([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("LPVOID")] void* pAclInformation, [NativeTypeName("DWORD")] uint nAclInformationLength, ACL_INFORMATION_CLASS dwAclInformationClass); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetFileSecurityW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetFileSecurityW([NativeTypeName("LPCWSTR")] ushort* lpFileName, [NativeTypeName("SECURITY_INFORMATION")] uint RequestedInformation, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("DWORD")] uint nLength, [NativeTypeName("LPDWORD")] uint* lpnLengthNeeded); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetKernelObjectSecurity", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetKernelObjectSecurity([NativeTypeName("HANDLE")] IntPtr Handle, [NativeTypeName("SECURITY_INFORMATION")] uint RequestedInformation, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("DWORD")] uint nLength, [NativeTypeName("LPDWORD")] uint* lpnLengthNeeded); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetLengthSid", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetLengthSid([NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetPrivateObjectSecurity", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetPrivateObjectSecurity([NativeTypeName("PSECURITY_DESCRIPTOR")] void* ObjectDescriptor, [NativeTypeName("SECURITY_INFORMATION")] uint SecurityInformation, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* ResultantDescriptor, [NativeTypeName("DWORD")] uint DescriptorLength, [NativeTypeName("PDWORD")] uint* ReturnLength); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSecurityDescriptorControl", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetSecurityDescriptorControl([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR_CONTROL")] ushort* pControl, [NativeTypeName("LPDWORD")] uint* lpdwRevision); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSecurityDescriptorDacl", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetSecurityDescriptorDacl([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("LPBOOL")] int* lpbDaclPresent, [NativeTypeName("PACL *")] ACL** pDacl, [NativeTypeName("LPBOOL")] int* lpbDaclDefaulted); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSecurityDescriptorGroup", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetSecurityDescriptorGroup([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("PSID *")] void** pGroup, [NativeTypeName("LPBOOL")] int* lpbGroupDefaulted); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSecurityDescriptorLength", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetSecurityDescriptorLength([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSecurityDescriptorOwner", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetSecurityDescriptorOwner([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("PSID *")] void** pOwner, [NativeTypeName("LPBOOL")] int* lpbOwnerDefaulted); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSecurityDescriptorRMControl", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetSecurityDescriptorRMControl([NativeTypeName("PSECURITY_DESCRIPTOR")] void* SecurityDescriptor, [NativeTypeName("PUCHAR")] byte* RMControl); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSecurityDescriptorSacl", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetSecurityDescriptorSacl([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("LPBOOL")] int* lpbSaclPresent, [NativeTypeName("PACL *")] ACL** pSacl, [NativeTypeName("LPBOOL")] int* lpbSaclDefaulted); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSidIdentifierAuthority", ExactSpelling = true)] + [return: NativeTypeName("PSID_IDENTIFIER_AUTHORITY")] + public static extern SID_IDENTIFIER_AUTHORITY* GetSidIdentifierAuthority([NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSidLengthRequired", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint GetSidLengthRequired([NativeTypeName("UCHAR")] byte nSubAuthorityCount); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSidSubAuthority", ExactSpelling = true)] + [return: NativeTypeName("PDWORD")] + public static extern uint* GetSidSubAuthority([NativeTypeName("PSID")] void* pSid, [NativeTypeName("DWORD")] uint nSubAuthority); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetSidSubAuthorityCount", ExactSpelling = true)] + [return: NativeTypeName("PUCHAR")] + public static extern byte* GetSidSubAuthorityCount([NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetTokenInformation", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetTokenInformation([NativeTypeName("HANDLE")] IntPtr TokenHandle, TOKEN_INFORMATION_CLASS TokenInformationClass, [NativeTypeName("LPVOID")] void* TokenInformation, [NativeTypeName("DWORD")] uint TokenInformationLength, [NativeTypeName("PDWORD")] uint* ReturnLength); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetWindowsAccountDomainSid", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetWindowsAccountDomainSid([NativeTypeName("PSID")] void* pSid, [NativeTypeName("PSID")] void* pDomainSid, [NativeTypeName("DWORD *")] uint* cbDomainSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ImpersonateAnonymousToken", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int ImpersonateAnonymousToken([NativeTypeName("HANDLE")] IntPtr ThreadHandle); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ImpersonateLoggedOnUser", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int ImpersonateLoggedOnUser([NativeTypeName("HANDLE")] IntPtr hToken); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ImpersonateSelf", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "InitializeAcl", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int InitializeAcl([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("DWORD")] uint nAclLength, [NativeTypeName("DWORD")] uint dwAclRevision); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "InitializeSecurityDescriptor", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int InitializeSecurityDescriptor([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("DWORD")] uint dwRevision); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "InitializeSid", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int InitializeSid([NativeTypeName("PSID")] void* Sid, [NativeTypeName("PSID_IDENTIFIER_AUTHORITY")] SID_IDENTIFIER_AUTHORITY* pIdentifierAuthority, [NativeTypeName("BYTE")] byte nSubAuthorityCount); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "IsTokenRestricted", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int IsTokenRestricted([NativeTypeName("HANDLE")] IntPtr TokenHandle); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "IsValidAcl", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int IsValidAcl([NativeTypeName("PACL")] ACL* pAcl); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "IsValidSecurityDescriptor", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int IsValidSecurityDescriptor([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "IsValidSid", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int IsValidSid([NativeTypeName("PSID")] void* pSid); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "IsWellKnownSid", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int IsWellKnownSid([NativeTypeName("PSID")] void* pSid, WELL_KNOWN_SID_TYPE WellKnownSidType); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "MakeAbsoluteSD", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int MakeAbsoluteSD([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSelfRelativeSecurityDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* pAbsoluteSecurityDescriptor, [NativeTypeName("LPDWORD")] uint* lpdwAbsoluteSecurityDescriptorSize, [NativeTypeName("PACL")] ACL* pDacl, [NativeTypeName("LPDWORD")] uint* lpdwDaclSize, [NativeTypeName("PACL")] ACL* pSacl, [NativeTypeName("LPDWORD")] uint* lpdwSaclSize, [NativeTypeName("PSID")] void* pOwner, [NativeTypeName("LPDWORD")] uint* lpdwOwnerSize, [NativeTypeName("PSID")] void* pPrimaryGroup, [NativeTypeName("LPDWORD")] uint* lpdwPrimaryGroupSize); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "MakeSelfRelativeSD", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int MakeSelfRelativeSD([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pAbsoluteSecurityDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSelfRelativeSecurityDescriptor, [NativeTypeName("LPDWORD")] uint* lpdwBufferLength); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "MapGenericMask", ExactSpelling = true)] + public static extern void MapGenericMask([NativeTypeName("PDWORD")] uint* AccessMask, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ObjectCloseAuditAlarmW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int ObjectCloseAuditAlarmW([NativeTypeName("LPCWSTR")] ushort* SubsystemName, [NativeTypeName("LPVOID")] void* HandleId, [NativeTypeName("BOOL")] int GenerateOnClose); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ObjectDeleteAuditAlarmW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int ObjectDeleteAuditAlarmW([NativeTypeName("LPCWSTR")] ushort* SubsystemName, [NativeTypeName("LPVOID")] void* HandleId, [NativeTypeName("BOOL")] int GenerateOnClose); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ObjectOpenAuditAlarmW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int ObjectOpenAuditAlarmW([NativeTypeName("LPCWSTR")] ushort* SubsystemName, [NativeTypeName("LPVOID")] void* HandleId, [NativeTypeName("LPWSTR")] ushort* ObjectTypeName, [NativeTypeName("LPWSTR")] ushort* ObjectName, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("HANDLE")] IntPtr ClientToken, [NativeTypeName("DWORD")] uint DesiredAccess, [NativeTypeName("DWORD")] uint GrantedAccess, [NativeTypeName("PPRIVILEGE_SET")] PRIVILEGE_SET* Privileges, [NativeTypeName("BOOL")] int ObjectCreation, [NativeTypeName("BOOL")] int AccessGranted, [NativeTypeName("LPBOOL")] int* GenerateOnClose); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ObjectPrivilegeAuditAlarmW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int ObjectPrivilegeAuditAlarmW([NativeTypeName("LPCWSTR")] ushort* SubsystemName, [NativeTypeName("LPVOID")] void* HandleId, [NativeTypeName("HANDLE")] IntPtr ClientToken, [NativeTypeName("DWORD")] uint DesiredAccess, [NativeTypeName("PPRIVILEGE_SET")] PRIVILEGE_SET* Privileges, [NativeTypeName("BOOL")] int AccessGranted); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "PrivilegeCheck", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int PrivilegeCheck([NativeTypeName("HANDLE")] IntPtr ClientToken, [NativeTypeName("PPRIVILEGE_SET")] PRIVILEGE_SET* RequiredPrivileges, [NativeTypeName("LPBOOL")] int* pfResult); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "PrivilegedServiceAuditAlarmW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int PrivilegedServiceAuditAlarmW([NativeTypeName("LPCWSTR")] ushort* SubsystemName, [NativeTypeName("LPCWSTR")] ushort* ServiceName, [NativeTypeName("HANDLE")] IntPtr ClientToken, [NativeTypeName("PPRIVILEGE_SET")] PRIVILEGE_SET* Privileges, [NativeTypeName("BOOL")] int AccessGranted); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "QuerySecurityAccessMask", ExactSpelling = true)] + public static extern void QuerySecurityAccessMask([NativeTypeName("SECURITY_INFORMATION")] uint SecurityInformation, [NativeTypeName("LPDWORD")] uint* DesiredAccess); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "RevertToSelf", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int RevertToSelf(); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetAclInformation", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetAclInformation([NativeTypeName("PACL")] ACL* pAcl, [NativeTypeName("LPVOID")] void* pAclInformation, [NativeTypeName("DWORD")] uint nAclInformationLength, ACL_INFORMATION_CLASS dwAclInformationClass); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetFileSecurityW", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetFileSecurityW([NativeTypeName("LPCWSTR")] ushort* lpFileName, [NativeTypeName("SECURITY_INFORMATION")] uint SecurityInformation, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetKernelObjectSecurity", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetKernelObjectSecurity([NativeTypeName("HANDLE")] IntPtr Handle, [NativeTypeName("SECURITY_INFORMATION")] uint SecurityInformation, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* SecurityDescriptor); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetPrivateObjectSecurity", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetPrivateObjectSecurity([NativeTypeName("SECURITY_INFORMATION")] uint SecurityInformation, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* ModificationDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR *")] void** ObjectsSecurityDescriptor, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping, [NativeTypeName("HANDLE")] IntPtr Token); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetPrivateObjectSecurityEx", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetPrivateObjectSecurityEx([NativeTypeName("SECURITY_INFORMATION")] uint SecurityInformation, [NativeTypeName("PSECURITY_DESCRIPTOR")] void* ModificationDescriptor, [NativeTypeName("PSECURITY_DESCRIPTOR *")] void** ObjectsSecurityDescriptor, [NativeTypeName("ULONG")] uint AutoInheritFlags, [NativeTypeName("PGENERIC_MAPPING")] GENERIC_MAPPING* GenericMapping, [NativeTypeName("HANDLE")] IntPtr Token); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetSecurityAccessMask", ExactSpelling = true)] + public static extern void SetSecurityAccessMask([NativeTypeName("SECURITY_INFORMATION")] uint SecurityInformation, [NativeTypeName("LPDWORD")] uint* DesiredAccess); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetSecurityDescriptorControl", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetSecurityDescriptorControl([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("SECURITY_DESCRIPTOR_CONTROL")] ushort ControlBitsOfInterest, [NativeTypeName("SECURITY_DESCRIPTOR_CONTROL")] ushort ControlBitsToSet); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetSecurityDescriptorDacl", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetSecurityDescriptorDacl([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("BOOL")] int bDaclPresent, [NativeTypeName("PACL")] ACL* pDacl, [NativeTypeName("BOOL")] int bDaclDefaulted); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetSecurityDescriptorGroup", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetSecurityDescriptorGroup([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("PSID")] void* pGroup, [NativeTypeName("BOOL")] int bGroupDefaulted); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetSecurityDescriptorOwner", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetSecurityDescriptorOwner([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("PSID")] void* pOwner, [NativeTypeName("BOOL")] int bOwnerDefaulted); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetSecurityDescriptorRMControl", ExactSpelling = true)] + [return: NativeTypeName("DWORD")] + public static extern uint SetSecurityDescriptorRMControl([NativeTypeName("PSECURITY_DESCRIPTOR")] void* SecurityDescriptor, [NativeTypeName("PUCHAR")] byte* RMControl); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetSecurityDescriptorSacl", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetSecurityDescriptorSacl([NativeTypeName("PSECURITY_DESCRIPTOR")] void* pSecurityDescriptor, [NativeTypeName("BOOL")] int bSaclPresent, [NativeTypeName("PACL")] ACL* pSacl, [NativeTypeName("BOOL")] int bSaclDefaulted); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetTokenInformation", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetTokenInformation([NativeTypeName("HANDLE")] IntPtr TokenHandle, TOKEN_INFORMATION_CLASS TokenInformationClass, [NativeTypeName("LPVOID")] void* TokenInformation, [NativeTypeName("DWORD")] uint TokenInformationLength); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetCachedSigningLevel", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int SetCachedSigningLevel([NativeTypeName("PHANDLE")] IntPtr* SourceFiles, [NativeTypeName("ULONG")] uint SourceFileCount, [NativeTypeName("ULONG")] uint Flags, [NativeTypeName("HANDLE")] IntPtr TargetFile); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetCachedSigningLevel", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int GetCachedSigningLevel([NativeTypeName("HANDLE")] IntPtr File, [NativeTypeName("PULONG")] uint* Flags, [NativeTypeName("PULONG")] uint* SigningLevel, [NativeTypeName("PUCHAR")] byte* Thumbprint, [NativeTypeName("PULONG")] uint* ThumbprintSize, [NativeTypeName("PULONG")] uint* ThumbprintAlgorithm); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CveEventWrite", ExactSpelling = true)] + [return: NativeTypeName("LONG")] + public static extern int CveEventWrite([NativeTypeName("PCWSTR")] ushort* CveId, [NativeTypeName("PCWSTR")] ushort* AdditionalDetails); + + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DeriveCapabilitySidsFromName", ExactSpelling = true)] + [return: NativeTypeName("BOOL")] + public static extern int DeriveCapabilitySidsFromName([NativeTypeName("LPCWSTR")] ushort* CapName, [NativeTypeName("PSID **")] void*** CapabilityGroupSids, [NativeTypeName("DWORD *")] uint* CapabilityGroupSidCount, [NativeTypeName("PSID **")] void*** CapabilitySids, [NativeTypeName("DWORD *")] uint* CapabilitySidCount); } } diff --git a/sources/Interop/Advapi32/um/wincrypt/Advapi32.cs b/sources/Interop/Advapi32/um/wincrypt/Advapi32.cs index 2f97e574a8..57d11b1172 100644 --- a/sources/Interop/Advapi32/um/wincrypt/Advapi32.cs +++ b/sources/Interop/Advapi32/um/wincrypt/Advapi32.cs @@ -12,107 +12,107 @@ public static unsafe partial class Advapi32 { [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptAcquireContextA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptAcquireContextA([NativeTypeName("HCRYPTPROV *")] UIntPtr* phProv, [NativeTypeName("LPCSTR")] sbyte* szContainer, [NativeTypeName("LPCSTR")] sbyte* szProvider, [NativeTypeName("DWORD")] uint dwProvType, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptAcquireContextA([NativeTypeName("HCRYPTPROV *")] nuint* phProv, [NativeTypeName("LPCSTR")] sbyte* szContainer, [NativeTypeName("LPCSTR")] sbyte* szProvider, [NativeTypeName("DWORD")] uint dwProvType, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptAcquireContextW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptAcquireContextW([NativeTypeName("HCRYPTPROV *")] UIntPtr* phProv, [NativeTypeName("LPCWSTR")] ushort* szContainer, [NativeTypeName("LPCWSTR")] ushort* szProvider, [NativeTypeName("DWORD")] uint dwProvType, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptAcquireContextW([NativeTypeName("HCRYPTPROV *")] nuint* phProv, [NativeTypeName("LPCWSTR")] ushort* szContainer, [NativeTypeName("LPCWSTR")] ushort* szProvider, [NativeTypeName("DWORD")] uint dwProvType, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptReleaseContext", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptReleaseContext([NativeTypeName("HCRYPTPROV")] UIntPtr hProv, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptReleaseContext([NativeTypeName("HCRYPTPROV")] nuint hProv, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptGenKey", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptGenKey([NativeTypeName("HCRYPTPROV")] UIntPtr hProv, [NativeTypeName("ALG_ID")] uint Algid, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phKey); + public static extern int CryptGenKey([NativeTypeName("HCRYPTPROV")] nuint hProv, [NativeTypeName("ALG_ID")] uint Algid, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTKEY *")] nuint* phKey); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptDeriveKey", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptDeriveKey([NativeTypeName("HCRYPTPROV")] UIntPtr hProv, [NativeTypeName("ALG_ID")] uint Algid, [NativeTypeName("HCRYPTHASH")] UIntPtr hBaseData, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phKey); + public static extern int CryptDeriveKey([NativeTypeName("HCRYPTPROV")] nuint hProv, [NativeTypeName("ALG_ID")] uint Algid, [NativeTypeName("HCRYPTHASH")] nuint hBaseData, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTKEY *")] nuint* phKey); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptDestroyKey", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptDestroyKey([NativeTypeName("HCRYPTKEY")] UIntPtr hKey); + public static extern int CryptDestroyKey([NativeTypeName("HCRYPTKEY")] nuint hKey); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptSetKeyParam", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptSetKeyParam([NativeTypeName("HCRYPTKEY")] UIntPtr hKey, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("const BYTE *")] byte* pbData, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptSetKeyParam([NativeTypeName("HCRYPTKEY")] nuint hKey, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("const BYTE *")] byte* pbData, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptGetKeyParam", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptGetKeyParam([NativeTypeName("HCRYPTKEY")] UIntPtr hKey, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptGetKeyParam([NativeTypeName("HCRYPTKEY")] nuint hKey, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptSetHashParam", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptSetHashParam([NativeTypeName("HCRYPTHASH")] UIntPtr hHash, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("const BYTE *")] byte* pbData, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptSetHashParam([NativeTypeName("HCRYPTHASH")] nuint hHash, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("const BYTE *")] byte* pbData, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptGetHashParam", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptGetHashParam([NativeTypeName("HCRYPTHASH")] UIntPtr hHash, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptGetHashParam([NativeTypeName("HCRYPTHASH")] nuint hHash, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptSetProvParam", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptSetProvParam([NativeTypeName("HCRYPTPROV")] UIntPtr hProv, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("const BYTE *")] byte* pbData, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptSetProvParam([NativeTypeName("HCRYPTPROV")] nuint hProv, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("const BYTE *")] byte* pbData, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptGetProvParam", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptGetProvParam([NativeTypeName("HCRYPTPROV")] UIntPtr hProv, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptGetProvParam([NativeTypeName("HCRYPTPROV")] nuint hProv, [NativeTypeName("DWORD")] uint dwParam, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptGenRandom", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptGenRandom([NativeTypeName("HCRYPTPROV")] UIntPtr hProv, [NativeTypeName("DWORD")] uint dwLen, [NativeTypeName("BYTE *")] byte* pbBuffer); + public static extern int CryptGenRandom([NativeTypeName("HCRYPTPROV")] nuint hProv, [NativeTypeName("DWORD")] uint dwLen, [NativeTypeName("BYTE *")] byte* pbBuffer); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptGetUserKey", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptGetUserKey([NativeTypeName("HCRYPTPROV")] UIntPtr hProv, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phUserKey); + public static extern int CryptGetUserKey([NativeTypeName("HCRYPTPROV")] nuint hProv, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("HCRYPTKEY *")] nuint* phUserKey); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptExportKey", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptExportKey([NativeTypeName("HCRYPTKEY")] UIntPtr hKey, [NativeTypeName("HCRYPTKEY")] UIntPtr hExpKey, [NativeTypeName("DWORD")] uint dwBlobType, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen); + public static extern int CryptExportKey([NativeTypeName("HCRYPTKEY")] nuint hKey, [NativeTypeName("HCRYPTKEY")] nuint hExpKey, [NativeTypeName("DWORD")] uint dwBlobType, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptImportKey", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptImportKey([NativeTypeName("HCRYPTPROV")] UIntPtr hProv, [NativeTypeName("const BYTE *")] byte* pbData, [NativeTypeName("DWORD")] uint dwDataLen, [NativeTypeName("HCRYPTKEY")] UIntPtr hPubKey, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phKey); + public static extern int CryptImportKey([NativeTypeName("HCRYPTPROV")] nuint hProv, [NativeTypeName("const BYTE *")] byte* pbData, [NativeTypeName("DWORD")] uint dwDataLen, [NativeTypeName("HCRYPTKEY")] nuint hPubKey, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTKEY *")] nuint* phKey); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptEncrypt", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptEncrypt([NativeTypeName("HCRYPTKEY")] UIntPtr hKey, [NativeTypeName("HCRYPTHASH")] UIntPtr hHash, [NativeTypeName("BOOL")] int Final, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen, [NativeTypeName("DWORD")] uint dwBufLen); + public static extern int CryptEncrypt([NativeTypeName("HCRYPTKEY")] nuint hKey, [NativeTypeName("HCRYPTHASH")] nuint hHash, [NativeTypeName("BOOL")] int Final, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen, [NativeTypeName("DWORD")] uint dwBufLen); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptDecrypt", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptDecrypt([NativeTypeName("HCRYPTKEY")] UIntPtr hKey, [NativeTypeName("HCRYPTHASH")] UIntPtr hHash, [NativeTypeName("BOOL")] int Final, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen); + public static extern int CryptDecrypt([NativeTypeName("HCRYPTKEY")] nuint hKey, [NativeTypeName("HCRYPTHASH")] nuint hHash, [NativeTypeName("BOOL")] int Final, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("BYTE *")] byte* pbData, [NativeTypeName("DWORD *")] uint* pdwDataLen); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptCreateHash", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptCreateHash([NativeTypeName("HCRYPTPROV")] UIntPtr hProv, [NativeTypeName("ALG_ID")] uint Algid, [NativeTypeName("HCRYPTKEY")] UIntPtr hKey, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTHASH *")] UIntPtr* phHash); + public static extern int CryptCreateHash([NativeTypeName("HCRYPTPROV")] nuint hProv, [NativeTypeName("ALG_ID")] uint Algid, [NativeTypeName("HCRYPTKEY")] nuint hKey, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTHASH *")] nuint* phHash); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptHashData", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptHashData([NativeTypeName("HCRYPTHASH")] UIntPtr hHash, [NativeTypeName("const BYTE *")] byte* pbData, [NativeTypeName("DWORD")] uint dwDataLen, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptHashData([NativeTypeName("HCRYPTHASH")] nuint hHash, [NativeTypeName("const BYTE *")] byte* pbData, [NativeTypeName("DWORD")] uint dwDataLen, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptHashSessionKey", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptHashSessionKey([NativeTypeName("HCRYPTHASH")] UIntPtr hHash, [NativeTypeName("HCRYPTKEY")] UIntPtr hKey, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptHashSessionKey([NativeTypeName("HCRYPTHASH")] nuint hHash, [NativeTypeName("HCRYPTKEY")] nuint hKey, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptDestroyHash", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptDestroyHash([NativeTypeName("HCRYPTHASH")] UIntPtr hHash); + public static extern int CryptDestroyHash([NativeTypeName("HCRYPTHASH")] nuint hHash); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptSignHashA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptSignHashA([NativeTypeName("HCRYPTHASH")] UIntPtr hHash, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("LPCSTR")] sbyte* szDescription, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("BYTE *")] byte* pbSignature, [NativeTypeName("DWORD *")] uint* pdwSigLen); + public static extern int CryptSignHashA([NativeTypeName("HCRYPTHASH")] nuint hHash, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("LPCSTR")] sbyte* szDescription, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("BYTE *")] byte* pbSignature, [NativeTypeName("DWORD *")] uint* pdwSigLen); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptSignHashW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptSignHashW([NativeTypeName("HCRYPTHASH")] UIntPtr hHash, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("LPCWSTR")] ushort* szDescription, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("BYTE *")] byte* pbSignature, [NativeTypeName("DWORD *")] uint* pdwSigLen); + public static extern int CryptSignHashW([NativeTypeName("HCRYPTHASH")] nuint hHash, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("LPCWSTR")] ushort* szDescription, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("BYTE *")] byte* pbSignature, [NativeTypeName("DWORD *")] uint* pdwSigLen); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptVerifySignatureA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptVerifySignatureA([NativeTypeName("HCRYPTHASH")] UIntPtr hHash, [NativeTypeName("const BYTE *")] byte* pbSignature, [NativeTypeName("DWORD")] uint dwSigLen, [NativeTypeName("HCRYPTKEY")] UIntPtr hPubKey, [NativeTypeName("LPCSTR")] sbyte* szDescription, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptVerifySignatureA([NativeTypeName("HCRYPTHASH")] nuint hHash, [NativeTypeName("const BYTE *")] byte* pbSignature, [NativeTypeName("DWORD")] uint dwSigLen, [NativeTypeName("HCRYPTKEY")] nuint hPubKey, [NativeTypeName("LPCSTR")] sbyte* szDescription, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptVerifySignatureW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptVerifySignatureW([NativeTypeName("HCRYPTHASH")] UIntPtr hHash, [NativeTypeName("const BYTE *")] byte* pbSignature, [NativeTypeName("DWORD")] uint dwSigLen, [NativeTypeName("HCRYPTKEY")] UIntPtr hPubKey, [NativeTypeName("LPCWSTR")] ushort* szDescription, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptVerifySignatureW([NativeTypeName("HCRYPTHASH")] nuint hHash, [NativeTypeName("const BYTE *")] byte* pbSignature, [NativeTypeName("DWORD")] uint dwSigLen, [NativeTypeName("HCRYPTKEY")] nuint hPubKey, [NativeTypeName("LPCWSTR")] ushort* szDescription, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptSetProviderA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -156,15 +156,15 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptContextAddRef", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptContextAddRef([NativeTypeName("HCRYPTPROV")] UIntPtr hProv, [NativeTypeName("DWORD *")] uint* pdwReserved, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int CryptContextAddRef([NativeTypeName("HCRYPTPROV")] nuint hProv, [NativeTypeName("DWORD *")] uint* pdwReserved, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptDuplicateKey", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptDuplicateKey([NativeTypeName("HCRYPTKEY")] UIntPtr hKey, [NativeTypeName("DWORD *")] uint* pdwReserved, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phKey); + public static extern int CryptDuplicateKey([NativeTypeName("HCRYPTKEY")] nuint hKey, [NativeTypeName("DWORD *")] uint* pdwReserved, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTKEY *")] nuint* phKey); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptDuplicateHash", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptDuplicateHash([NativeTypeName("HCRYPTHASH")] UIntPtr hHash, [NativeTypeName("DWORD *")] uint* pdwReserved, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTHASH *")] UIntPtr* phHash); + public static extern int CryptDuplicateHash([NativeTypeName("HCRYPTHASH")] nuint hHash, [NativeTypeName("DWORD *")] uint* pdwReserved, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTHASH *")] nuint* phHash); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetEncSChannel", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -240,7 +240,7 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptEnumOIDFunction", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptEnumOIDFunction([NativeTypeName("DWORD")] uint dwEncodingType, [NativeTypeName("LPCSTR")] sbyte* pszFuncName, [NativeTypeName("LPCSTR")] sbyte* pszOID, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CRYPT_ENUM_OID_FUNC")] IntPtr* pfnEnumOIDFunc); + public static extern int CryptEnumOIDFunction([NativeTypeName("DWORD")] uint dwEncodingType, [NativeTypeName("LPCSTR")] sbyte* pszFuncName, [NativeTypeName("LPCSTR")] sbyte* pszOID, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CRYPT_ENUM_OID_FUNC")] IntPtr pfnEnumOIDFunc); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptFindOIDInfo", ExactSpelling = true)] [return: NativeTypeName("PCCRYPT_OID_INFO")] @@ -256,7 +256,7 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptEnumOIDInfo", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptEnumOIDInfo([NativeTypeName("DWORD")] uint dwGroupId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CRYPT_ENUM_OID_INFO")] IntPtr* pfnEnumOIDInfo); + public static extern int CryptEnumOIDInfo([NativeTypeName("DWORD")] uint dwGroupId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CRYPT_ENUM_OID_INFO")] IntPtr pfnEnumOIDInfo); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptFindLocalizedName", ExactSpelling = true)] [return: NativeTypeName("LPCWSTR")] @@ -272,7 +272,7 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptMsgOpenToDecode", ExactSpelling = true)] [return: NativeTypeName("HCRYPTMSG")] - public static extern void* CryptMsgOpenToDecode([NativeTypeName("DWORD")] uint dwMsgEncodingType, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("DWORD")] uint dwMsgType, [NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hCryptProv, [NativeTypeName("PCERT_INFO")] CERT_INFO* pRecipientInfo, [NativeTypeName("PCMSG_STREAM_INFO")] CMSG_STREAM_INFO* pStreamInfo); + public static extern void* CryptMsgOpenToDecode([NativeTypeName("DWORD")] uint dwMsgEncodingType, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("DWORD")] uint dwMsgType, [NativeTypeName("HCRYPTPROV_LEGACY")] nuint hCryptProv, [NativeTypeName("PCERT_INFO")] CERT_INFO* pRecipientInfo, [NativeTypeName("PCMSG_STREAM_INFO")] CMSG_STREAM_INFO* pStreamInfo); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptMsgDuplicate", ExactSpelling = true)] [return: NativeTypeName("HCRYPTMSG")] @@ -296,11 +296,11 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptMsgVerifyCountersignatureEncoded", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptMsgVerifyCountersignatureEncoded([NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwEncodingType, [NativeTypeName("PBYTE")] byte* pbSignerInfo, [NativeTypeName("DWORD")] uint cbSignerInfo, [NativeTypeName("PBYTE")] byte* pbSignerInfoCountersignature, [NativeTypeName("DWORD")] uint cbSignerInfoCountersignature, [NativeTypeName("PCERT_INFO")] CERT_INFO* pciCountersigner); + public static extern int CryptMsgVerifyCountersignatureEncoded([NativeTypeName("HCRYPTPROV_LEGACY")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwEncodingType, [NativeTypeName("PBYTE")] byte* pbSignerInfo, [NativeTypeName("DWORD")] uint cbSignerInfo, [NativeTypeName("PBYTE")] byte* pbSignerInfoCountersignature, [NativeTypeName("DWORD")] uint cbSignerInfoCountersignature, [NativeTypeName("PCERT_INFO")] CERT_INFO* pciCountersigner); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptMsgVerifyCountersignatureEncodedEx", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptMsgVerifyCountersignatureEncodedEx([NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwEncodingType, [NativeTypeName("PBYTE")] byte* pbSignerInfo, [NativeTypeName("DWORD")] uint cbSignerInfo, [NativeTypeName("PBYTE")] byte* pbSignerInfoCountersignature, [NativeTypeName("DWORD")] uint cbSignerInfoCountersignature, [NativeTypeName("DWORD")] uint dwSignerType, [NativeTypeName("void *")] void* pvSigner, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvExtra); + public static extern int CryptMsgVerifyCountersignatureEncodedEx([NativeTypeName("HCRYPTPROV_LEGACY")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwEncodingType, [NativeTypeName("PBYTE")] byte* pbSignerInfo, [NativeTypeName("DWORD")] uint cbSignerInfo, [NativeTypeName("PBYTE")] byte* pbSignerInfoCountersignature, [NativeTypeName("DWORD")] uint cbSignerInfoCountersignature, [NativeTypeName("DWORD")] uint dwSignerType, [NativeTypeName("void *")] void* pvSigner, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvExtra); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptMsgCountersign", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -312,7 +312,7 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertOpenStore", ExactSpelling = true)] [return: NativeTypeName("HCERTSTORE")] - public static extern void* CertOpenStore([NativeTypeName("LPCSTR")] sbyte* lpszStoreProvider, [NativeTypeName("DWORD")] uint dwEncodingType, [NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("const void *")] void* pvPara); + public static extern void* CertOpenStore([NativeTypeName("LPCSTR")] sbyte* lpszStoreProvider, [NativeTypeName("DWORD")] uint dwEncodingType, [NativeTypeName("HCRYPTPROV_LEGACY")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("const void *")] void* pvPara); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertDuplicateStore", ExactSpelling = true)] [return: NativeTypeName("HCERTSTORE")] @@ -563,15 +563,15 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertEnumSystemStoreLocation", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CertEnumSystemStoreLocation([NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CERT_ENUM_SYSTEM_STORE_LOCATION")] IntPtr* pfnEnum); + public static extern int CertEnumSystemStoreLocation([NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CERT_ENUM_SYSTEM_STORE_LOCATION")] IntPtr pfnEnum); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertEnumSystemStore", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CertEnumSystemStore([NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvSystemStoreLocationPara, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CERT_ENUM_SYSTEM_STORE")] IntPtr* pfnEnum); + public static extern int CertEnumSystemStore([NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvSystemStoreLocationPara, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CERT_ENUM_SYSTEM_STORE")] IntPtr pfnEnum); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertEnumPhysicalStore", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CertEnumPhysicalStore([NativeTypeName("const void *")] void* pvSystemStore, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CERT_ENUM_PHYSICAL_STORE")] IntPtr* pfnEnum); + public static extern int CertEnumPhysicalStore([NativeTypeName("const void *")] void* pvSystemStore, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CERT_ENUM_PHYSICAL_STORE")] IntPtr pfnEnum); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertGetEnhancedKeyUsage", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -647,11 +647,11 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptVerifyCertificateSignature", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptVerifyCertificateSignature([NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("const BYTE *")] byte* pbEncoded, [NativeTypeName("DWORD")] uint cbEncoded, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pPublicKey); + public static extern int CryptVerifyCertificateSignature([NativeTypeName("HCRYPTPROV_LEGACY")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("const BYTE *")] byte* pbEncoded, [NativeTypeName("DWORD")] uint cbEncoded, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pPublicKey); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptVerifyCertificateSignatureEx", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptVerifyCertificateSignatureEx([NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("DWORD")] uint dwSubjectType, [NativeTypeName("void *")] void* pvSubject, [NativeTypeName("DWORD")] uint dwIssuerType, [NativeTypeName("void *")] void* pvIssuer, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvExtra); + public static extern int CryptVerifyCertificateSignatureEx([NativeTypeName("HCRYPTPROV_LEGACY")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("DWORD")] uint dwSubjectType, [NativeTypeName("void *")] void* pvSubject, [NativeTypeName("DWORD")] uint dwIssuerType, [NativeTypeName("void *")] void* pvIssuer, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvExtra); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertIsStrongHashToSign", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -659,11 +659,11 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptHashToBeSigned", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptHashToBeSigned([NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("const BYTE *")] byte* pbEncoded, [NativeTypeName("DWORD")] uint cbEncoded, [NativeTypeName("BYTE *")] byte* pbComputedHash, [NativeTypeName("DWORD *")] uint* pcbComputedHash); + public static extern int CryptHashToBeSigned([NativeTypeName("HCRYPTPROV_LEGACY")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("const BYTE *")] byte* pbEncoded, [NativeTypeName("DWORD")] uint cbEncoded, [NativeTypeName("BYTE *")] byte* pbComputedHash, [NativeTypeName("DWORD *")] uint* pcbComputedHash); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptHashCertificate", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptHashCertificate([NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hCryptProv, [NativeTypeName("ALG_ID")] uint Algid, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("const BYTE *")] byte* pbEncoded, [NativeTypeName("DWORD")] uint cbEncoded, [NativeTypeName("BYTE *")] byte* pbComputedHash, [NativeTypeName("DWORD *")] uint* pcbComputedHash); + public static extern int CryptHashCertificate([NativeTypeName("HCRYPTPROV_LEGACY")] nuint hCryptProv, [NativeTypeName("ALG_ID")] uint Algid, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("const BYTE *")] byte* pbEncoded, [NativeTypeName("DWORD")] uint cbEncoded, [NativeTypeName("BYTE *")] byte* pbComputedHash, [NativeTypeName("DWORD *")] uint* pcbComputedHash); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptHashCertificate2", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -671,11 +671,11 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptSignCertificate", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptSignCertificate([NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE")] UIntPtr hCryptProvOrNCryptKey, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("const BYTE *")] byte* pbEncodedToBeSigned, [NativeTypeName("DWORD")] uint cbEncodedToBeSigned, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pSignatureAlgorithm, [NativeTypeName("const void *")] void* pvHashAuxInfo, [NativeTypeName("BYTE *")] byte* pbSignature, [NativeTypeName("DWORD *")] uint* pcbSignature); + public static extern int CryptSignCertificate([NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE")] nuint hCryptProvOrNCryptKey, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("const BYTE *")] byte* pbEncodedToBeSigned, [NativeTypeName("DWORD")] uint cbEncodedToBeSigned, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pSignatureAlgorithm, [NativeTypeName("const void *")] void* pvHashAuxInfo, [NativeTypeName("BYTE *")] byte* pbSignature, [NativeTypeName("DWORD *")] uint* pcbSignature); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptSignAndEncodeCertificate", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptSignAndEncodeCertificate([NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE")] UIntPtr hCryptProvOrNCryptKey, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("LPCSTR")] sbyte* lpszStructType, [NativeTypeName("const void *")] void* pvStructInfo, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pSignatureAlgorithm, [NativeTypeName("const void *")] void* pvHashAuxInfo, [NativeTypeName("BYTE *")] byte* pbEncoded, [NativeTypeName("DWORD *")] uint* pcbEncoded); + public static extern int CryptSignAndEncodeCertificate([NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE")] nuint hCryptProvOrNCryptKey, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("LPCSTR")] sbyte* lpszStructType, [NativeTypeName("const void *")] void* pvStructInfo, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pSignatureAlgorithm, [NativeTypeName("const void *")] void* pvHashAuxInfo, [NativeTypeName("BYTE *")] byte* pbEncoded, [NativeTypeName("DWORD *")] uint* pcbEncoded); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertVerifyTimeValidity", ExactSpelling = true)] [return: NativeTypeName("LONG")] @@ -719,7 +719,7 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptInstallDefaultContext", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptInstallDefaultContext([NativeTypeName("HCRYPTPROV")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwDefaultType, [NativeTypeName("const void *")] void* pvDefaultPara, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvReserved, [NativeTypeName("HCRYPTDEFAULTCONTEXT *")] void** phDefaultContext); + public static extern int CryptInstallDefaultContext([NativeTypeName("HCRYPTPROV")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwDefaultType, [NativeTypeName("const void *")] void* pvDefaultPara, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvReserved, [NativeTypeName("HCRYPTDEFAULTCONTEXT *")] void** phDefaultContext); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptUninstallDefaultContext", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -727,11 +727,11 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptExportPublicKeyInfo", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptExportPublicKeyInfo([NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE")] UIntPtr hCryptProvOrNCryptKey, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("DWORD *")] uint* pcbInfo); + public static extern int CryptExportPublicKeyInfo([NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE")] nuint hCryptProvOrNCryptKey, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("DWORD *")] uint* pcbInfo); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptExportPublicKeyInfoEx", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptExportPublicKeyInfoEx([NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE")] UIntPtr hCryptProvOrNCryptKey, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("LPSTR")] sbyte* pszPublicKeyObjId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("DWORD *")] uint* pcbInfo); + public static extern int CryptExportPublicKeyInfoEx([NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE")] nuint hCryptProvOrNCryptKey, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("LPSTR")] sbyte* pszPublicKeyObjId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("DWORD *")] uint* pcbInfo); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptExportPublicKeyInfoFromBCryptKeyHandle", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -739,11 +739,11 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptImportPublicKeyInfo", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptImportPublicKeyInfo([NativeTypeName("HCRYPTPROV")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phKey); + public static extern int CryptImportPublicKeyInfo([NativeTypeName("HCRYPTPROV")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("HCRYPTKEY *")] nuint* phKey); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptImportPublicKeyInfoEx", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptImportPublicKeyInfoEx([NativeTypeName("HCRYPTPROV")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("ALG_ID")] uint aiKeyAlg, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phKey); + public static extern int CryptImportPublicKeyInfoEx([NativeTypeName("HCRYPTPROV")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("ALG_ID")] uint aiKeyAlg, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo, [NativeTypeName("HCRYPTKEY *")] nuint* phKey); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptImportPublicKeyInfoEx2", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -751,7 +751,7 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptAcquireCertificatePrivateKey", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptAcquireCertificatePrivateKey([NativeTypeName("PCCERT_CONTEXT")] CERT_CONTEXT* pCert, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvParameters, [NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE *")] UIntPtr* phCryptProvOrNCryptKey, [NativeTypeName("DWORD *")] uint* pdwKeySpec, [NativeTypeName("BOOL *")] int* pfCallerFreeProvOrNCryptKey); + public static extern int CryptAcquireCertificatePrivateKey([NativeTypeName("PCCERT_CONTEXT")] CERT_CONTEXT* pCert, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvParameters, [NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE *")] nuint* phCryptProvOrNCryptKey, [NativeTypeName("DWORD *")] uint* pdwKeySpec, [NativeTypeName("BOOL *")] int* pfCallerFreeProvOrNCryptKey); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptFindCertificateKeyProvInfo", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -759,11 +759,11 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptImportPKCS8", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptImportPKCS8(CRYPT_PKCS8_IMPORT_PARAMS sPrivateKeyAndParams, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTPROV *")] UIntPtr* phCryptProv, [NativeTypeName("void *")] void* pvAuxInfo); + public static extern int CryptImportPKCS8(CRYPT_PKCS8_IMPORT_PARAMS sPrivateKeyAndParams, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("HCRYPTPROV *")] nuint* phCryptProv, [NativeTypeName("void *")] void* pvAuxInfo); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptExportPKCS8", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptExportPKCS8([NativeTypeName("HCRYPTPROV")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("LPSTR")] sbyte* pszPrivateKeyObjId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo, [NativeTypeName("BYTE *")] byte* pbPrivateKeyBlob, [NativeTypeName("DWORD *")] uint* pcbPrivateKeyBlob); + public static extern int CryptExportPKCS8([NativeTypeName("HCRYPTPROV")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("LPSTR")] sbyte* pszPrivateKeyObjId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo, [NativeTypeName("BYTE *")] byte* pbPrivateKeyBlob, [NativeTypeName("DWORD *")] uint* pcbPrivateKeyBlob); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptExportPKCS8Ex", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -771,7 +771,7 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptHashPublicKeyInfo", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptHashPublicKeyInfo([NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hCryptProv, [NativeTypeName("ALG_ID")] uint Algid, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("BYTE *")] byte* pbComputedHash, [NativeTypeName("DWORD *")] uint* pcbComputedHash); + public static extern int CryptHashPublicKeyInfo([NativeTypeName("HCRYPTPROV_LEGACY")] nuint hCryptProv, [NativeTypeName("ALG_ID")] uint Algid, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("BYTE *")] byte* pbComputedHash, [NativeTypeName("DWORD *")] uint* pcbComputedHash); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertRDNValueToStrA", ExactSpelling = true)] [return: NativeTypeName("DWORD")] @@ -819,7 +819,7 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptGetMessageCertificates", ExactSpelling = true)] [return: NativeTypeName("HCERTSTORE")] - public static extern void* CryptGetMessageCertificates([NativeTypeName("DWORD")] uint dwMsgAndCertEncodingType, [NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("const BYTE *")] byte* pbSignedBlob, [NativeTypeName("DWORD")] uint cbSignedBlob); + public static extern void* CryptGetMessageCertificates([NativeTypeName("DWORD")] uint dwMsgAndCertEncodingType, [NativeTypeName("HCRYPTPROV_LEGACY")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("const BYTE *")] byte* pbSignedBlob, [NativeTypeName("DWORD")] uint cbSignedBlob); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptVerifyDetachedMessageSignature", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -867,11 +867,11 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertOpenSystemStoreA", ExactSpelling = true)] [return: NativeTypeName("HCERTSTORE")] - public static extern void* CertOpenSystemStoreA([NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hProv, [NativeTypeName("LPCSTR")] sbyte* szSubsystemProtocol); + public static extern void* CertOpenSystemStoreA([NativeTypeName("HCRYPTPROV_LEGACY")] nuint hProv, [NativeTypeName("LPCSTR")] sbyte* szSubsystemProtocol); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertOpenSystemStoreW", ExactSpelling = true)] [return: NativeTypeName("HCERTSTORE")] - public static extern void* CertOpenSystemStoreW([NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hProv, [NativeTypeName("LPCWSTR")] ushort* szSubsystemProtocol); + public static extern void* CertOpenSystemStoreW([NativeTypeName("HCRYPTPROV_LEGACY")] nuint hProv, [NativeTypeName("LPCWSTR")] ushort* szSubsystemProtocol); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertAddEncodedCertificateToSystemStoreA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -906,11 +906,11 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptSetAsyncParam", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptSetAsyncParam([NativeTypeName("HCRYPTASYNC")] IntPtr hAsync, [NativeTypeName("LPSTR")] sbyte* pszParamOid, [NativeTypeName("LPVOID")] void* pvParam, [NativeTypeName("PFN_CRYPT_ASYNC_PARAM_FREE_FUNC")] IntPtr* pfnFree); + public static extern int CryptSetAsyncParam([NativeTypeName("HCRYPTASYNC")] IntPtr hAsync, [NativeTypeName("LPSTR")] sbyte* pszParamOid, [NativeTypeName("LPVOID")] void* pvParam, [NativeTypeName("PFN_CRYPT_ASYNC_PARAM_FREE_FUNC")] IntPtr pfnFree); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptGetAsyncParam", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptGetAsyncParam([NativeTypeName("HCRYPTASYNC")] IntPtr hAsync, [NativeTypeName("LPSTR")] sbyte* pszParamOid, [NativeTypeName("LPVOID *")] void** ppvParam, [NativeTypeName("PFN_CRYPT_ASYNC_PARAM_FREE_FUNC *")] IntPtr** ppfnFree); + public static extern int CryptGetAsyncParam([NativeTypeName("HCRYPTASYNC")] IntPtr hAsync, [NativeTypeName("LPSTR")] sbyte* pszParamOid, [NativeTypeName("LPVOID *")] void** ppvParam, [NativeTypeName("PFN_CRYPT_ASYNC_PARAM_FREE_FUNC *")] IntPtr* ppfnFree); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptCloseAsyncHandle", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -926,7 +926,7 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptInstallCancelRetrieval", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptInstallCancelRetrieval([NativeTypeName("PFN_CRYPT_CANCEL_RETRIEVAL")] IntPtr* pfnCancel, [NativeTypeName("const void *")] void* pvArg, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvReserved); + public static extern int CryptInstallCancelRetrieval([NativeTypeName("PFN_CRYPT_CANCEL_RETRIEVAL")] IntPtr pfnCancel, [NativeTypeName("const void *")] void* pvArg, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvReserved); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptUninstallCancelRetrieval", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -950,7 +950,7 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CertCreateSelfSignCertificate", ExactSpelling = true)] [return: NativeTypeName("PCCERT_CONTEXT")] - public static extern CERT_CONTEXT* CertCreateSelfSignCertificate([NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE")] UIntPtr hCryptProvOrNCryptKey, [NativeTypeName("PCERT_NAME_BLOB")] CRYPTOAPI_BLOB* pSubjectIssuerBlob, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("PCRYPT_KEY_PROV_INFO")] CRYPT_KEY_PROV_INFO* pKeyProvInfo, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pSignatureAlgorithm, [NativeTypeName("PSYSTEMTIME")] SYSTEMTIME* pStartTime, [NativeTypeName("PSYSTEMTIME")] SYSTEMTIME* pEndTime, [NativeTypeName("PCERT_EXTENSIONS")] CERT_EXTENSIONS* pExtensions); + public static extern CERT_CONTEXT* CertCreateSelfSignCertificate([NativeTypeName("HCRYPTPROV_OR_NCRYPT_KEY_HANDLE")] nuint hCryptProvOrNCryptKey, [NativeTypeName("PCERT_NAME_BLOB")] CRYPTOAPI_BLOB* pSubjectIssuerBlob, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("PCRYPT_KEY_PROV_INFO")] CRYPT_KEY_PROV_INFO* pKeyProvInfo, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pSignatureAlgorithm, [NativeTypeName("PSYSTEMTIME")] SYSTEMTIME* pStartTime, [NativeTypeName("PSYSTEMTIME")] SYSTEMTIME* pEndTime, [NativeTypeName("PCERT_EXTENSIONS")] CERT_EXTENSIONS* pExtensions); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptGetKeyIdentifierProperty", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -962,7 +962,7 @@ public static unsafe partial class Advapi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptEnumKeyIdentifierProperties", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int CryptEnumKeyIdentifierProperties([NativeTypeName("const CRYPT_HASH_BLOB *")] CRYPTOAPI_BLOB* pKeyIdentifier, [NativeTypeName("DWORD")] uint dwPropId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LPCWSTR")] ushort* pwszComputerName, [NativeTypeName("void *")] void* pvReserved, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CRYPT_ENUM_KEYID_PROP")] IntPtr* pfnEnum); + public static extern int CryptEnumKeyIdentifierProperties([NativeTypeName("const CRYPT_HASH_BLOB *")] CRYPTOAPI_BLOB* pKeyIdentifier, [NativeTypeName("DWORD")] uint dwPropId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LPCWSTR")] ushort* pwszComputerName, [NativeTypeName("void *")] void* pvReserved, [NativeTypeName("void *")] void* pvArg, [NativeTypeName("PFN_CRYPT_ENUM_KEYID_PROP")] IntPtr pfnEnum); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptCreateKeyIdentifierFromCSP", ExactSpelling = true)] [return: NativeTypeName("BOOL")] diff --git a/sources/Interop/Advapi32/um/wincrypt/CERT_CHAIN_FIND_BY_ISSUER_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CERT_CHAIN_FIND_BY_ISSUER_PARA.cs index 68573507d1..838fb13073 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CERT_CHAIN_FIND_BY_ISSUER_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CERT_CHAIN_FIND_BY_ISSUER_PARA.cs @@ -28,7 +28,7 @@ public unsafe partial struct CERT_CHAIN_FIND_BY_ISSUER_PARA public CRYPTOAPI_BLOB* rgIssuer; [NativeTypeName("PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK")] - public IntPtr* pfnFindCallback; + public IntPtr pfnFindCallback; [NativeTypeName("void *")] public void* pvFindArg; diff --git a/sources/Interop/Advapi32/um/wincrypt/CERT_CREATE_CONTEXT_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CERT_CREATE_CONTEXT_PARA.cs index f8b3a62ec9..bef140fc19 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CERT_CREATE_CONTEXT_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CERT_CREATE_CONTEXT_PARA.cs @@ -13,13 +13,13 @@ public unsafe partial struct CERT_CREATE_CONTEXT_PARA public uint cbSize; [NativeTypeName("PFN_CRYPT_FREE")] - public IntPtr* pfnFree; + public IntPtr pfnFree; [NativeTypeName("void *")] public void* pvFree; [NativeTypeName("PFN_CERT_CREATE_CONTEXT_SORT_FUNC")] - public IntPtr* pfnSort; + public IntPtr pfnSort; [NativeTypeName("void *")] public void* pvSort; diff --git a/sources/Interop/Advapi32/um/wincrypt/CERT_KEY_CONTEXT.cs b/sources/Interop/Advapi32/um/wincrypt/CERT_KEY_CONTEXT.cs index 293ab42a3d..c3736cf666 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CERT_KEY_CONTEXT.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CERT_KEY_CONTEXT.cs @@ -3,7 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -24,11 +23,11 @@ public partial struct _Anonymous_e__Union { [FieldOffset(0)] [NativeTypeName("HCRYPTPROV")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [FieldOffset(0)] [NativeTypeName("NCRYPT_KEY_HANDLE")] - public UIntPtr hNCryptKey; + public nuint hNCryptKey; } } } diff --git a/sources/Interop/Advapi32/um/wincrypt/CERT_SERVER_OCSP_RESPONSE_OPEN_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CERT_SERVER_OCSP_RESPONSE_OPEN_PARA.cs index 3936e0769b..5bd2b1660e 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CERT_SERVER_OCSP_RESPONSE_OPEN_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CERT_SERVER_OCSP_RESPONSE_OPEN_PARA.cs @@ -22,7 +22,7 @@ public unsafe partial struct CERT_SERVER_OCSP_RESPONSE_OPEN_PARA public ushort* pwszOcspDirectory; [NativeTypeName("PFN_CERT_SERVER_OCSP_RESPONSE_UPDATE_CALLBACK")] - public IntPtr* pfnUpdateCallback; + public IntPtr pfnUpdateCallback; [NativeTypeName("PVOID")] public void* pvUpdateCallbackArg; diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_CNG_CONTENT_DECRYPT_INFO.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_CNG_CONTENT_DECRYPT_INFO.cs index 064570ad27..83920a7c6d 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_CNG_CONTENT_DECRYPT_INFO.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_CNG_CONTENT_DECRYPT_INFO.cs @@ -15,13 +15,13 @@ public unsafe partial struct CMSG_CNG_CONTENT_DECRYPT_INFO public CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; [NativeTypeName("PFN_CMSG_ALLOC")] - public IntPtr* pfnAlloc; + public IntPtr pfnAlloc; [NativeTypeName("PFN_CMSG_FREE")] - public IntPtr* pfnFree; + public IntPtr pfnFree; [NativeTypeName("NCRYPT_KEY_HANDLE")] - public UIntPtr hNCryptKey; + public nuint hNCryptKey; [NativeTypeName("BYTE *")] public byte* pbContentEncryptKey; diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_CONTENT_ENCRYPT_INFO.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_CONTENT_ENCRYPT_INFO.cs index 0a56739482..6e89c8957c 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_CONTENT_ENCRYPT_INFO.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_CONTENT_ENCRYPT_INFO.cs @@ -14,7 +14,7 @@ public unsafe partial struct CMSG_CONTENT_ENCRYPT_INFO public uint cbSize; [NativeTypeName("HCRYPTPROV_LEGACY")] - public UIntPtr hCryptProv; + public nuint hCryptProv; public CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; @@ -28,10 +28,10 @@ public unsafe partial struct CMSG_CONTENT_ENCRYPT_INFO public CMSG_RECIPIENT_ENCODE_INFO* rgCmsRecipients; [NativeTypeName("PFN_CMSG_ALLOC")] - public IntPtr* pfnAlloc; + public IntPtr pfnAlloc; [NativeTypeName("PFN_CMSG_FREE")] - public IntPtr* pfnFree; + public IntPtr pfnFree; [NativeTypeName("DWORD")] public uint dwEncryptFlags; @@ -59,7 +59,7 @@ public unsafe partial struct _Anonymous_e__Union { [FieldOffset(0)] [NativeTypeName("HCRYPTKEY")] - public UIntPtr hContentEncryptKey; + public nuint hContentEncryptKey; [FieldOffset(0)] [NativeTypeName("BCRYPT_KEY_HANDLE")] diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_DECRYPT_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_DECRYPT_PARA.cs index 63e3bc0bad..95aba20517 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_DECRYPT_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_DECRYPT_PARA.cs @@ -3,7 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -27,11 +26,11 @@ public partial struct _Anonymous_e__Union { [FieldOffset(0)] [NativeTypeName("HCRYPTPROV")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [FieldOffset(0)] [NativeTypeName("NCRYPT_KEY_HANDLE")] - public UIntPtr hNCryptKey; + public nuint hNCryptKey; } } } diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_KEY_AGREE_DECRYPT_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_KEY_AGREE_DECRYPT_PARA.cs index 1a5c869297..3171dcdeda 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_KEY_AGREE_DECRYPT_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_KEY_AGREE_DECRYPT_PARA.cs @@ -3,7 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -35,11 +34,11 @@ public partial struct _Anonymous_e__Union { [FieldOffset(0)] [NativeTypeName("HCRYPTPROV")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [FieldOffset(0)] [NativeTypeName("NCRYPT_KEY_HANDLE")] - public UIntPtr hNCryptKey; + public nuint hNCryptKey; } } } diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_KEY_TRANS_DECRYPT_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_KEY_TRANS_DECRYPT_PARA.cs index 986422218f..8cdbc7a4cf 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_KEY_TRANS_DECRYPT_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_KEY_TRANS_DECRYPT_PARA.cs @@ -3,7 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -30,11 +29,11 @@ public partial struct _Anonymous_e__Union { [FieldOffset(0)] [NativeTypeName("HCRYPTPROV")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [FieldOffset(0)] [NativeTypeName("NCRYPT_KEY_HANDLE")] - public UIntPtr hNCryptKey; + public nuint hNCryptKey; } } } diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_MAIL_LIST_DECRYPT_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_MAIL_LIST_DECRYPT_PARA.cs index 69a20af0a3..64c0df0a1d 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_MAIL_LIST_DECRYPT_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_MAIL_LIST_DECRYPT_PARA.cs @@ -3,7 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -14,7 +13,7 @@ public unsafe partial struct CMSG_CTRL_MAIL_LIST_DECRYPT_PARA public uint cbSize; [NativeTypeName("HCRYPTPROV")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [NativeTypeName("PCMSG_MAIL_LIST_RECIPIENT_INFO")] public CMSG_MAIL_LIST_RECIPIENT_INFO* pMailList; @@ -33,7 +32,7 @@ public unsafe partial struct _Anonymous_e__Union { [FieldOffset(0)] [NativeTypeName("HCRYPTKEY")] - public UIntPtr hKeyEncryptionKey; + public nuint hKeyEncryptionKey; [FieldOffset(0)] [NativeTypeName("void *")] diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA.cs index 182a71b752..4292b04571 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA.cs @@ -3,8 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA @@ -13,7 +11,7 @@ public unsafe partial struct CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA public uint cbSize; [NativeTypeName("HCRYPTPROV_LEGACY")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [NativeTypeName("DWORD")] public uint dwSignerIndex; diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_ENVELOPED_ENCODE_INFO.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_ENVELOPED_ENCODE_INFO.cs index 7ff306a8fb..358bb32518 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_ENVELOPED_ENCODE_INFO.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_ENVELOPED_ENCODE_INFO.cs @@ -3,8 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct CMSG_ENVELOPED_ENCODE_INFO @@ -13,7 +11,7 @@ public unsafe partial struct CMSG_ENVELOPED_ENCODE_INFO public uint cbSize; [NativeTypeName("HCRYPTPROV_LEGACY")] - public UIntPtr hCryptProv; + public nuint hCryptProv; public CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_HASHED_ENCODE_INFO.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_HASHED_ENCODE_INFO.cs index 823b955fe2..2ab1eb65e9 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_HASHED_ENCODE_INFO.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_HASHED_ENCODE_INFO.cs @@ -3,8 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct CMSG_HASHED_ENCODE_INFO @@ -13,7 +11,7 @@ public unsafe partial struct CMSG_HASHED_ENCODE_INFO public uint cbSize; [NativeTypeName("HCRYPTPROV_LEGACY")] - public UIntPtr hCryptProv; + public nuint hCryptProv; public CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO.cs index 05b76c2b45..222336428b 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO.cs @@ -3,7 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -24,7 +23,7 @@ public unsafe partial struct CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO public void* pvKeyWrapAuxInfo; [NativeTypeName("HCRYPTPROV_LEGACY")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [NativeTypeName("DWORD")] public uint dwKeySpec; diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO.cs index becef398c6..933916014d 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO.cs @@ -3,8 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO @@ -18,7 +16,7 @@ public unsafe partial struct CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO public void* pvKeyEncryptionAuxInfo; [NativeTypeName("HCRYPTPROV_LEGACY")] - public UIntPtr hCryptProv; + public nuint hCryptProv; public CRYPT_BIT_BLOB RecipientPublicKey; diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO.cs index 06c1529240..54c3a97ad2 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO.cs @@ -3,7 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -19,7 +18,7 @@ public unsafe partial struct CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO public void* pvKeyEncryptionAuxInfo; [NativeTypeName("HCRYPTPROV")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [NativeTypeName("DWORD")] public uint dwKeyChoice; @@ -40,7 +39,7 @@ public unsafe partial struct _Anonymous_e__Union { [FieldOffset(0)] [NativeTypeName("HCRYPTKEY")] - public UIntPtr hKeyEncryptionKey; + public nuint hKeyEncryptionKey; [FieldOffset(0)] [NativeTypeName("void *")] diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_SIGNER_ENCODE_INFO.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_SIGNER_ENCODE_INFO.cs index 841ca0f651..d493df461b 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_SIGNER_ENCODE_INFO.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_SIGNER_ENCODE_INFO.cs @@ -3,7 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -44,11 +43,11 @@ public partial struct _Anonymous_e__Union { [FieldOffset(0)] [NativeTypeName("HCRYPTPROV")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [FieldOffset(0)] [NativeTypeName("NCRYPT_KEY_HANDLE")] - public UIntPtr hNCryptKey; + public nuint hNCryptKey; } } } diff --git a/sources/Interop/Advapi32/um/wincrypt/CMSG_STREAM_INFO.cs b/sources/Interop/Advapi32/um/wincrypt/CMSG_STREAM_INFO.cs index 275ffc7403..2c0430d8a0 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CMSG_STREAM_INFO.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CMSG_STREAM_INFO.cs @@ -13,7 +13,7 @@ public unsafe partial struct CMSG_STREAM_INFO public uint cbContent; [NativeTypeName("PFN_CMSG_STREAM_OUTPUT")] - public IntPtr* pfnStreamOutput; + public IntPtr pfnStreamOutput; [NativeTypeName("void *")] public void* pvArg; diff --git a/sources/Interop/Advapi32/um/wincrypt/CRYPT_ASYNC_RETRIEVAL_COMPLETION.cs b/sources/Interop/Advapi32/um/wincrypt/CRYPT_ASYNC_RETRIEVAL_COMPLETION.cs index 85dd6c044f..ff14cc2dc4 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CRYPT_ASYNC_RETRIEVAL_COMPLETION.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CRYPT_ASYNC_RETRIEVAL_COMPLETION.cs @@ -10,7 +10,7 @@ namespace TerraFX.Interop public unsafe partial struct CRYPT_ASYNC_RETRIEVAL_COMPLETION { [NativeTypeName("PFN_CRYPT_ASYNC_RETRIEVAL_COMPLETION_FUNC")] - public IntPtr* pfnCompletion; + public IntPtr pfnCompletion; [NativeTypeName("LPVOID")] public void* pvCompletion; diff --git a/sources/Interop/Advapi32/um/wincrypt/CRYPT_DECODE_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CRYPT_DECODE_PARA.cs index 9c4f2ff865..3ffe174d27 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CRYPT_DECODE_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CRYPT_DECODE_PARA.cs @@ -7,15 +7,15 @@ namespace TerraFX.Interop { - public unsafe partial struct CRYPT_DECODE_PARA + public partial struct CRYPT_DECODE_PARA { [NativeTypeName("DWORD")] public uint cbSize; [NativeTypeName("PFN_CRYPT_ALLOC")] - public IntPtr* pfnAlloc; + public IntPtr pfnAlloc; [NativeTypeName("PFN_CRYPT_FREE")] - public IntPtr* pfnFree; + public IntPtr pfnFree; } } diff --git a/sources/Interop/Advapi32/um/wincrypt/CRYPT_ENCODE_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CRYPT_ENCODE_PARA.cs index 2ea70e0777..e6bb0c2fbf 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CRYPT_ENCODE_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CRYPT_ENCODE_PARA.cs @@ -7,15 +7,15 @@ namespace TerraFX.Interop { - public unsafe partial struct CRYPT_ENCODE_PARA + public partial struct CRYPT_ENCODE_PARA { [NativeTypeName("DWORD")] public uint cbSize; [NativeTypeName("PFN_CRYPT_ALLOC")] - public IntPtr* pfnAlloc; + public IntPtr pfnAlloc; [NativeTypeName("PFN_CRYPT_FREE")] - public IntPtr* pfnFree; + public IntPtr pfnFree; } } diff --git a/sources/Interop/Advapi32/um/wincrypt/CRYPT_ENCRYPT_MESSAGE_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CRYPT_ENCRYPT_MESSAGE_PARA.cs index af802642a4..def5fe7982 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CRYPT_ENCRYPT_MESSAGE_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CRYPT_ENCRYPT_MESSAGE_PARA.cs @@ -3,8 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct CRYPT_ENCRYPT_MESSAGE_PARA @@ -16,7 +14,7 @@ public unsafe partial struct CRYPT_ENCRYPT_MESSAGE_PARA public uint dwMsgEncodingType; [NativeTypeName("HCRYPTPROV_LEGACY")] - public UIntPtr hCryptProv; + public nuint hCryptProv; public CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; diff --git a/sources/Interop/Advapi32/um/wincrypt/CRYPT_HASH_MESSAGE_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CRYPT_HASH_MESSAGE_PARA.cs index 8bc5efb222..6b6f9ae8b4 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CRYPT_HASH_MESSAGE_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CRYPT_HASH_MESSAGE_PARA.cs @@ -3,8 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct CRYPT_HASH_MESSAGE_PARA @@ -16,7 +14,7 @@ public unsafe partial struct CRYPT_HASH_MESSAGE_PARA public uint dwMsgEncodingType; [NativeTypeName("HCRYPTPROV_LEGACY")] - public UIntPtr hCryptProv; + public nuint hCryptProv; public CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; diff --git a/sources/Interop/Advapi32/um/wincrypt/CRYPT_KEY_SIGN_MESSAGE_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CRYPT_KEY_SIGN_MESSAGE_PARA.cs index 5087f46f84..29268ca9c1 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CRYPT_KEY_SIGN_MESSAGE_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CRYPT_KEY_SIGN_MESSAGE_PARA.cs @@ -3,7 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -34,11 +33,11 @@ public partial struct _Anonymous_e__Union { [FieldOffset(0)] [NativeTypeName("HCRYPTPROV")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [FieldOffset(0)] [NativeTypeName("NCRYPT_KEY_HANDLE")] - public UIntPtr hNCryptKey; + public nuint hNCryptKey; } } } diff --git a/sources/Interop/Advapi32/um/wincrypt/CRYPT_KEY_VERIFY_MESSAGE_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CRYPT_KEY_VERIFY_MESSAGE_PARA.cs index 017590ed5f..b444fabb41 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CRYPT_KEY_VERIFY_MESSAGE_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CRYPT_KEY_VERIFY_MESSAGE_PARA.cs @@ -3,8 +3,6 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct CRYPT_KEY_VERIFY_MESSAGE_PARA @@ -16,6 +14,6 @@ public partial struct CRYPT_KEY_VERIFY_MESSAGE_PARA public uint dwMsgEncodingType; [NativeTypeName("HCRYPTPROV_LEGACY")] - public UIntPtr hCryptProv; + public nuint hCryptProv; } } diff --git a/sources/Interop/Advapi32/um/wincrypt/CRYPT_OBJECT_LOCATOR_PROVIDER_TABLE.cs b/sources/Interop/Advapi32/um/wincrypt/CRYPT_OBJECT_LOCATOR_PROVIDER_TABLE.cs index 7d3da11546..9e32fed60b 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CRYPT_OBJECT_LOCATOR_PROVIDER_TABLE.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CRYPT_OBJECT_LOCATOR_PROVIDER_TABLE.cs @@ -7,24 +7,24 @@ namespace TerraFX.Interop { - public unsafe partial struct CRYPT_OBJECT_LOCATOR_PROVIDER_TABLE + public partial struct CRYPT_OBJECT_LOCATOR_PROVIDER_TABLE { [NativeTypeName("DWORD")] public uint cbSize; [NativeTypeName("PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_GET")] - public IntPtr* pfnGet; + public IntPtr pfnGet; [NativeTypeName("PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_RELEASE")] - public IntPtr* pfnRelease; + public IntPtr pfnRelease; [NativeTypeName("PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_FREE_PASSWORD")] - public IntPtr* pfnFreePassword; + public IntPtr pfnFreePassword; [NativeTypeName("PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_FREE")] - public IntPtr* pfnFree; + public IntPtr pfnFree; [NativeTypeName("PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_FREE_IDENTIFIER")] - public IntPtr* pfnFreeIdentifier; + public IntPtr pfnFreeIdentifier; } } diff --git a/sources/Interop/Advapi32/um/wincrypt/CRYPT_PKCS8_EXPORT_PARAMS.cs b/sources/Interop/Advapi32/um/wincrypt/CRYPT_PKCS8_EXPORT_PARAMS.cs index 71b5873a8c..79ee246498 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CRYPT_PKCS8_EXPORT_PARAMS.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CRYPT_PKCS8_EXPORT_PARAMS.cs @@ -10,7 +10,7 @@ namespace TerraFX.Interop public unsafe partial struct CRYPT_PKCS8_EXPORT_PARAMS { [NativeTypeName("HCRYPTPROV")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [NativeTypeName("DWORD")] public uint dwKeySpec; @@ -19,7 +19,7 @@ public unsafe partial struct CRYPT_PKCS8_EXPORT_PARAMS public sbyte* pszPrivateKeyObjId; [NativeTypeName("PCRYPT_ENCRYPT_PRIVATE_KEY_FUNC")] - public IntPtr* pEncryptPrivateKeyFunc; + public IntPtr pEncryptPrivateKeyFunc; [NativeTypeName("LPVOID")] public void* pVoidEncryptFunc; diff --git a/sources/Interop/Advapi32/um/wincrypt/CRYPT_PKCS8_IMPORT_PARAMS.cs b/sources/Interop/Advapi32/um/wincrypt/CRYPT_PKCS8_IMPORT_PARAMS.cs index 9389dfb50f..81201cb39f 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CRYPT_PKCS8_IMPORT_PARAMS.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CRYPT_PKCS8_IMPORT_PARAMS.cs @@ -13,13 +13,13 @@ public unsafe partial struct CRYPT_PKCS8_IMPORT_PARAMS public CRYPTOAPI_BLOB PrivateKey; [NativeTypeName("PCRYPT_RESOLVE_HCRYPTPROV_FUNC")] - public IntPtr* pResolvehCryptProvFunc; + public IntPtr pResolvehCryptProvFunc; [NativeTypeName("LPVOID")] public void* pVoidResolveFunc; [NativeTypeName("PCRYPT_DECRYPT_PRIVATE_KEY_FUNC")] - public IntPtr* pDecryptPrivateKeyFunc; + public IntPtr pDecryptPrivateKeyFunc; [NativeTypeName("LPVOID")] public void* pVoidDecryptFunc; diff --git a/sources/Interop/Advapi32/um/wincrypt/CRYPT_VERIFY_MESSAGE_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/CRYPT_VERIFY_MESSAGE_PARA.cs index f6ae64e1e4..7feffe5be7 100644 --- a/sources/Interop/Advapi32/um/wincrypt/CRYPT_VERIFY_MESSAGE_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/CRYPT_VERIFY_MESSAGE_PARA.cs @@ -16,10 +16,10 @@ public unsafe partial struct CRYPT_VERIFY_MESSAGE_PARA public uint dwMsgAndCertEncodingType; [NativeTypeName("HCRYPTPROV_LEGACY")] - public UIntPtr hCryptProv; + public nuint hCryptProv; [NativeTypeName("PFN_CRYPT_GET_SIGNER_CERTIFICATE")] - public IntPtr* pfnGetSignerCertificate; + public IntPtr pfnGetSignerCertificate; [NativeTypeName("void *")] public void* pvGetArg; diff --git a/sources/Interop/Advapi32/um/wincrypt/PCRYPT_RESOLVE_HCRYPTPROV_FUNC.cs b/sources/Interop/Advapi32/um/wincrypt/PCRYPT_RESOLVE_HCRYPTPROV_FUNC.cs index 57aef91257..3c86e72d33 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PCRYPT_RESOLVE_HCRYPTPROV_FUNC.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PCRYPT_RESOLVE_HCRYPTPROV_FUNC.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PCRYPT_RESOLVE_HCRYPTPROV_FUNC([NativeTypeName("CRYPT_PRIVATE_KEY_INFO *")] CRYPT_PRIVATE_KEY_INFO* pPrivateKeyInfo, [NativeTypeName("HCRYPTPROV *")] UIntPtr* phCryptProv, [NativeTypeName("LPVOID")] void* pVoidResolveFunc); + public unsafe delegate int PCRYPT_RESOLVE_HCRYPTPROV_FUNC([NativeTypeName("CRYPT_PRIVATE_KEY_INFO *")] CRYPT_PRIVATE_KEY_INFO* pPrivateKeyInfo, [NativeTypeName("HCRYPTPROV *")] nuint* phCryptProv, [NativeTypeName("LPVOID")] void* pVoidResolveFunc); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CERT_DLL_OPEN_STORE_PROV_FUNC.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CERT_DLL_OPEN_STORE_PROV_FUNC.cs index 728e4a9a83..007233404e 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CERT_DLL_OPEN_STORE_PROV_FUNC.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CERT_DLL_OPEN_STORE_PROV_FUNC.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_CERT_DLL_OPEN_STORE_PROV_FUNC([NativeTypeName("LPCSTR")] sbyte* lpszStoreProvider, [NativeTypeName("DWORD")] uint dwEncodingType, [NativeTypeName("HCRYPTPROV_LEGACY")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("const void *")] void* pvPara, [NativeTypeName("HCERTSTORE")] void* hCertStore, [NativeTypeName("PCERT_STORE_PROV_INFO")] CERT_STORE_PROV_INFO* pStoreProvInfo); + public unsafe delegate int PFN_CERT_DLL_OPEN_STORE_PROV_FUNC([NativeTypeName("LPCSTR")] sbyte* lpszStoreProvider, [NativeTypeName("DWORD")] uint dwEncodingType, [NativeTypeName("HCRYPTPROV_LEGACY")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("const void *")] void* pvPara, [NativeTypeName("HCERTSTORE")] void* hCertStore, [NativeTypeName("PCERT_STORE_PROV_INFO")] CERT_STORE_PROV_INFO* pStoreProvInfo); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_ALLOC.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_ALLOC.cs index 7181024af7..aeb4175d3d 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_ALLOC.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_ALLOC.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("void *")] - public unsafe delegate void* PFN_CMSG_ALLOC([NativeTypeName("size_t")] UIntPtr cb); + public unsafe delegate void* PFN_CMSG_ALLOC([NativeTypeName("size_t")] nuint cb); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_EXPORT_ENCRYPT_KEY.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_EXPORT_ENCRYPT_KEY.cs index 2e406c8063..f26ddb62b0 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_EXPORT_ENCRYPT_KEY.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_EXPORT_ENCRYPT_KEY.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_CMSG_EXPORT_ENCRYPT_KEY([NativeTypeName("HCRYPTPROV")] UIntPtr hCryptProv, [NativeTypeName("HCRYPTKEY")] UIntPtr hEncryptKey, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pPublicKeyInfo, [NativeTypeName("PBYTE")] byte* pbData, [NativeTypeName("PDWORD")] uint* pcbData); + public unsafe delegate int PFN_CMSG_EXPORT_ENCRYPT_KEY([NativeTypeName("HCRYPTPROV")] nuint hCryptProv, [NativeTypeName("HCRYPTKEY")] nuint hEncryptKey, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pPublicKeyInfo, [NativeTypeName("PBYTE")] byte* pbData, [NativeTypeName("PDWORD")] uint* pcbData); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_GEN_ENCRYPT_KEY.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_GEN_ENCRYPT_KEY.cs index a8fd5ece4f..9597616009 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_GEN_ENCRYPT_KEY.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_GEN_ENCRYPT_KEY.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_CMSG_GEN_ENCRYPT_KEY([NativeTypeName("HCRYPTPROV *")] UIntPtr* phCryptProv, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* paiEncrypt, [NativeTypeName("PVOID")] void* pvEncryptAuxInfo, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pPublicKeyInfo, [NativeTypeName("PFN_CMSG_ALLOC")] IntPtr* pfnAlloc, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phEncryptKey, [NativeTypeName("PBYTE *")] byte** ppbEncryptParameters, [NativeTypeName("PDWORD")] uint* pcbEncryptParameters); + public unsafe delegate int PFN_CMSG_GEN_ENCRYPT_KEY([NativeTypeName("HCRYPTPROV *")] nuint* phCryptProv, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* paiEncrypt, [NativeTypeName("PVOID")] void* pvEncryptAuxInfo, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pPublicKeyInfo, [NativeTypeName("PFN_CMSG_ALLOC")] IntPtr pfnAlloc, [NativeTypeName("HCRYPTKEY *")] nuint* phEncryptKey, [NativeTypeName("PBYTE *")] byte** ppbEncryptParameters, [NativeTypeName("PDWORD")] uint* pcbEncryptParameters); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_ENCRYPT_KEY.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_ENCRYPT_KEY.cs index 2c51d82b11..0b55b6e98e 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_ENCRYPT_KEY.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_ENCRYPT_KEY.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_CMSG_IMPORT_ENCRYPT_KEY([NativeTypeName("HCRYPTPROV")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* paiEncrypt, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* paiPubKey, [NativeTypeName("PBYTE")] byte* pbEncodedKey, [NativeTypeName("DWORD")] uint cbEncodedKey, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phEncryptKey); + public unsafe delegate int PFN_CMSG_IMPORT_ENCRYPT_KEY([NativeTypeName("HCRYPTPROV")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* paiEncrypt, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* paiPubKey, [NativeTypeName("PBYTE")] byte* pbEncodedKey, [NativeTypeName("DWORD")] uint cbEncodedKey, [NativeTypeName("HCRYPTKEY *")] nuint* phEncryptKey); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_KEY_AGREE.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_KEY_AGREE.cs index e8c2c9657e..9e29c312e9 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_KEY_AGREE.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_KEY_AGREE.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_CMSG_IMPORT_KEY_AGREE([NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pContentEncryptionAlgorithm, [NativeTypeName("PCMSG_CTRL_KEY_AGREE_DECRYPT_PARA")] CMSG_CTRL_KEY_AGREE_DECRYPT_PARA* pKeyAgreeDecryptPara, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvReserved, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phContentEncryptKey); + public unsafe delegate int PFN_CMSG_IMPORT_KEY_AGREE([NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pContentEncryptionAlgorithm, [NativeTypeName("PCMSG_CTRL_KEY_AGREE_DECRYPT_PARA")] CMSG_CTRL_KEY_AGREE_DECRYPT_PARA* pKeyAgreeDecryptPara, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvReserved, [NativeTypeName("HCRYPTKEY *")] nuint* phContentEncryptKey); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_KEY_TRANS.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_KEY_TRANS.cs index 287ff15be9..6c1191d286 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_KEY_TRANS.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_KEY_TRANS.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_CMSG_IMPORT_KEY_TRANS([NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pContentEncryptionAlgorithm, [NativeTypeName("PCMSG_CTRL_KEY_TRANS_DECRYPT_PARA")] CMSG_CTRL_KEY_TRANS_DECRYPT_PARA* pKeyTransDecryptPara, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvReserved, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phContentEncryptKey); + public unsafe delegate int PFN_CMSG_IMPORT_KEY_TRANS([NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pContentEncryptionAlgorithm, [NativeTypeName("PCMSG_CTRL_KEY_TRANS_DECRYPT_PARA")] CMSG_CTRL_KEY_TRANS_DECRYPT_PARA* pKeyTransDecryptPara, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvReserved, [NativeTypeName("HCRYPTKEY *")] nuint* phContentEncryptKey); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_MAIL_LIST.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_MAIL_LIST.cs index e785afe345..3a96b549f8 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_MAIL_LIST.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CMSG_IMPORT_MAIL_LIST.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_CMSG_IMPORT_MAIL_LIST([NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pContentEncryptionAlgorithm, [NativeTypeName("PCMSG_CTRL_MAIL_LIST_DECRYPT_PARA")] CMSG_CTRL_MAIL_LIST_DECRYPT_PARA* pMailListDecryptPara, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvReserved, [NativeTypeName("HCRYPTKEY *")] UIntPtr* phContentEncryptKey); + public unsafe delegate int PFN_CMSG_IMPORT_MAIL_LIST([NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pContentEncryptionAlgorithm, [NativeTypeName("PCMSG_CTRL_MAIL_LIST_DECRYPT_PARA")] CMSG_CTRL_MAIL_LIST_DECRYPT_PARA* pMailListDecryptPara, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvReserved, [NativeTypeName("HCRYPTKEY *")] nuint* phContentEncryptKey); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_ALLOC.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_ALLOC.cs index 01cde5f4c0..2834e123a0 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_ALLOC.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_ALLOC.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("LPVOID")] - public unsafe delegate void* PFN_CRYPT_ALLOC([NativeTypeName("size_t")] UIntPtr cbSize); + public unsafe delegate void* PFN_CRYPT_ALLOC([NativeTypeName("size_t")] nuint cbSize); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_EX2_FUNC.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_EX2_FUNC.cs index a903da7429..5881460fb3 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_EX2_FUNC.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_EX2_FUNC.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_EX2_FUNC([NativeTypeName("NCRYPT_KEY_HANDLE")] UIntPtr hNCryptKey, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("LPSTR")] sbyte* pszPublicKeyObjId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("DWORD *")] uint* pcbInfo); + public unsafe delegate int PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_EX2_FUNC([NativeTypeName("NCRYPT_KEY_HANDLE")] nuint hNCryptKey, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("LPSTR")] sbyte* pszPublicKeyObjId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo, [NativeTypeName("PCERT_PUBLIC_KEY_INFO")] CERT_PUBLIC_KEY_INFO* pInfo, [NativeTypeName("DWORD *")] uint* pcbInfo); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_INITIALIZE.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_INITIALIZE.cs index 0c1bdba0d1..8d74f8a95d 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_INITIALIZE.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_INITIALIZE.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_INITIALIZE([NativeTypeName("PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_FLUSH")] IntPtr* pfnFlush, [NativeTypeName("LPVOID")] void* pContext, [NativeTypeName("DWORD *")] uint* pdwExpectedObjectCount, [NativeTypeName("PCRYPT_OBJECT_LOCATOR_PROVIDER_TABLE *")] CRYPT_OBJECT_LOCATOR_PROVIDER_TABLE** ppFuncTable, [NativeTypeName("void **")] void** ppPluginContext); + public unsafe delegate int PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_INITIALIZE([NativeTypeName("PFN_CRYPT_OBJECT_LOCATOR_PROVIDER_FLUSH")] IntPtr pfnFlush, [NativeTypeName("LPVOID")] void* pContext, [NativeTypeName("DWORD *")] uint* pdwExpectedObjectCount, [NativeTypeName("PCRYPT_OBJECT_LOCATOR_PROVIDER_TABLE *")] CRYPT_OBJECT_LOCATOR_PROVIDER_TABLE** ppFuncTable, [NativeTypeName("void **")] void** ppPluginContext); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_SIGN_AND_ENCODE_HASH_FUNC.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_SIGN_AND_ENCODE_HASH_FUNC.cs index e100d65ab8..8fd90f028a 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_SIGN_AND_ENCODE_HASH_FUNC.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_CRYPT_SIGN_AND_ENCODE_HASH_FUNC.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_CRYPT_SIGN_AND_ENCODE_HASH_FUNC([NativeTypeName("NCRYPT_KEY_HANDLE")] UIntPtr hKey, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pSignatureAlgorithm, [NativeTypeName("void *")] void* pvDecodedSignPara, [NativeTypeName("LPCWSTR")] ushort* pwszCNGPubKeyAlgid, [NativeTypeName("LPCWSTR")] ushort* pwszCNGHashAlgid, [NativeTypeName("BYTE *")] byte* pbComputedHash, [NativeTypeName("DWORD")] uint cbComputedHash, [NativeTypeName("BYTE *")] byte* pbSignature, [NativeTypeName("DWORD *")] uint* pcbSignature); + public unsafe delegate int PFN_CRYPT_SIGN_AND_ENCODE_HASH_FUNC([NativeTypeName("NCRYPT_KEY_HANDLE")] nuint hKey, [NativeTypeName("DWORD")] uint dwCertEncodingType, [NativeTypeName("PCRYPT_ALGORITHM_IDENTIFIER")] CRYPT_ALGORITHM_IDENTIFIER* pSignatureAlgorithm, [NativeTypeName("void *")] void* pvDecodedSignPara, [NativeTypeName("LPCWSTR")] ushort* pwszCNGPubKeyAlgid, [NativeTypeName("LPCWSTR")] ushort* pwszCNGHashAlgid, [NativeTypeName("BYTE *")] byte* pbComputedHash, [NativeTypeName("DWORD")] uint cbComputedHash, [NativeTypeName("BYTE *")] byte* pbSignature, [NativeTypeName("DWORD *")] uint* pcbSignature); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_EXPORT_PRIV_KEY_FUNC.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_EXPORT_PRIV_KEY_FUNC.cs index 16bbdc84a1..f064f408eb 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_EXPORT_PRIV_KEY_FUNC.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_EXPORT_PRIV_KEY_FUNC.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_EXPORT_PRIV_KEY_FUNC([NativeTypeName("HCRYPTPROV")] UIntPtr hCryptProv, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("LPSTR")] sbyte* pszPrivateKeyObjId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo, [NativeTypeName("CRYPT_PRIVATE_KEY_INFO *")] CRYPT_PRIVATE_KEY_INFO* pPrivateKeyInfo, [NativeTypeName("DWORD *")] uint* pcbPrivateKeyInfo); + public unsafe delegate int PFN_EXPORT_PRIV_KEY_FUNC([NativeTypeName("HCRYPTPROV")] nuint hCryptProv, [NativeTypeName("DWORD")] uint dwKeySpec, [NativeTypeName("LPSTR")] sbyte* pszPrivateKeyObjId, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo, [NativeTypeName("CRYPT_PRIVATE_KEY_INFO *")] CRYPT_PRIVATE_KEY_INFO* pPrivateKeyInfo, [NativeTypeName("DWORD *")] uint* pcbPrivateKeyInfo); } diff --git a/sources/Interop/Advapi32/um/wincrypt/PFN_IMPORT_PRIV_KEY_FUNC.cs b/sources/Interop/Advapi32/um/wincrypt/PFN_IMPORT_PRIV_KEY_FUNC.cs index 39bbfe0516..e60f60a4e3 100644 --- a/sources/Interop/Advapi32/um/wincrypt/PFN_IMPORT_PRIV_KEY_FUNC.cs +++ b/sources/Interop/Advapi32/um/wincrypt/PFN_IMPORT_PRIV_KEY_FUNC.cs @@ -3,12 +3,11 @@ // Ported from um/wincrypt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PFN_IMPORT_PRIV_KEY_FUNC([NativeTypeName("HCRYPTPROV")] UIntPtr hCryptProv, [NativeTypeName("CRYPT_PRIVATE_KEY_INFO *")] CRYPT_PRIVATE_KEY_INFO* pPrivateKeyInfo, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo); + public unsafe delegate int PFN_IMPORT_PRIV_KEY_FUNC([NativeTypeName("HCRYPTPROV")] nuint hCryptProv, [NativeTypeName("CRYPT_PRIVATE_KEY_INFO *")] CRYPT_PRIVATE_KEY_INFO* pPrivateKeyInfo, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("void *")] void* pvAuxInfo); } diff --git a/sources/Interop/Advapi32/um/wincrypt/SSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA.cs b/sources/Interop/Advapi32/um/wincrypt/SSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA.cs index c63c8f39aa..f39403955f 100644 --- a/sources/Interop/Advapi32/um/wincrypt/SSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA.cs +++ b/sources/Interop/Advapi32/um/wincrypt/SSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA.cs @@ -24,12 +24,12 @@ public unsafe partial struct SSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA public unsafe partial struct _rgpszHpkpValue_e__FixedBuffer { - internal sbyte e0; - internal sbyte e1; + internal IntPtr e0; + internal IntPtr e1; - public ref sbyte this[int index] => ref AsSpan()[index]; + public ref IntPtr this[int index] => ref AsSpan()[index]; - public Span AsSpan() => MemoryMarshal.CreateSpan(ref e0, 2); + public Span AsSpan() => MemoryMarshal.CreateSpan(ref e0, 2); } } } diff --git a/sources/Interop/ComCtl32/ComCtl32.cs b/sources/Interop/ComCtl32/ComCtl32.cs deleted file mode 100644 index 1fd6d98b95..0000000000 --- a/sources/Interop/ComCtl32/ComCtl32.cs +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. - -namespace TerraFX.Interop -{ - public static unsafe partial class ComCtl32 - { - private const string LibraryPath = "comctl32"; - } -} diff --git a/sources/Interop/ComCtl32/TerraFX.Interop.ComCtl32.csproj b/sources/Interop/ComCtl32/TerraFX.Interop.ComCtl32.csproj index 6699be10e0..fb9d5d5567 100644 --- a/sources/Interop/ComCtl32/TerraFX.Interop.ComCtl32.csproj +++ b/sources/Interop/ComCtl32/TerraFX.Interop.ComCtl32.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/ComCtl32/um/prsht/ComCtl32.cs b/sources/Interop/ComCtl32/um/prsht/ComCtl32.cs index c5215fc97c..fa362bfbce 100644 --- a/sources/Interop/ComCtl32/um/prsht/ComCtl32.cs +++ b/sources/Interop/ComCtl32/um/prsht/ComCtl32.cs @@ -10,6 +10,8 @@ namespace TerraFX.Interop { public static unsafe partial class ComCtl32 { + private const string LibraryPath = "comctl32"; + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreatePropertySheetPageA", ExactSpelling = true)] [return: NativeTypeName("HPROPSHEETPAGE")] public static extern IntPtr CreatePropertySheetPageA([NativeTypeName("LPCPROPSHEETPAGEA")] PROPSHEETPAGEA* constPropSheetPagePointer); @@ -24,10 +26,10 @@ public static unsafe partial class ComCtl32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "PropertySheetA", ExactSpelling = true)] [return: NativeTypeName("INT_PTR")] - public static extern IntPtr PropertySheetA([NativeTypeName("LPCPROPSHEETHEADERA")] PROPSHEETHEADERA_V2* param0); + public static extern nint PropertySheetA([NativeTypeName("LPCPROPSHEETHEADERA")] PROPSHEETHEADERA_V2* param0); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "PropertySheetW", ExactSpelling = true)] [return: NativeTypeName("INT_PTR")] - public static extern IntPtr PropertySheetW([NativeTypeName("LPCPROPSHEETHEADERW")] PROPSHEETHEADERW_V2* param0); + public static extern nint PropertySheetW([NativeTypeName("LPCPROPSHEETHEADERW")] PROPSHEETHEADERW_V2* param0); } } diff --git a/sources/Interop/ComCtl32/um/prsht/LPFNADDPROPSHEETPAGE.cs b/sources/Interop/ComCtl32/um/prsht/LPFNADDPROPSHEETPAGE.cs index 0f236135c5..149efd7530 100644 --- a/sources/Interop/ComCtl32/um/prsht/LPFNADDPROPSHEETPAGE.cs +++ b/sources/Interop/ComCtl32/um/prsht/LPFNADDPROPSHEETPAGE.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public delegate int LPFNADDPROPSHEETPAGE([NativeTypeName("HPROPSHEETPAGE")] IntPtr param0, [NativeTypeName("LPARAM")] IntPtr param1); + public delegate int LPFNADDPROPSHEETPAGE([NativeTypeName("HPROPSHEETPAGE")] IntPtr param0, [NativeTypeName("LPARAM")] nint param1); } diff --git a/sources/Interop/ComCtl32/um/prsht/LPFNADDPROPSHEETPAGES.cs b/sources/Interop/ComCtl32/um/prsht/LPFNADDPROPSHEETPAGES.cs index 9e29a37cc8..5b7f99a9c7 100644 --- a/sources/Interop/ComCtl32/um/prsht/LPFNADDPROPSHEETPAGES.cs +++ b/sources/Interop/ComCtl32/um/prsht/LPFNADDPROPSHEETPAGES.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int LPFNADDPROPSHEETPAGES([NativeTypeName("LPVOID")] void* param0, [NativeTypeName("LPFNADDPROPSHEETPAGE")] IntPtr* param1, [NativeTypeName("LPARAM")] IntPtr param2); + public unsafe delegate int LPFNADDPROPSHEETPAGES([NativeTypeName("LPVOID")] void* param0, [NativeTypeName("LPFNADDPROPSHEETPAGE")] IntPtr param1, [NativeTypeName("LPARAM")] nint param2); } diff --git a/sources/Interop/ComCtl32/um/prsht/PFNPROPSHEETCALLBACK.cs b/sources/Interop/ComCtl32/um/prsht/PFNPROPSHEETCALLBACK.cs index 2d325808a4..86731148ed 100644 --- a/sources/Interop/ComCtl32/um/prsht/PFNPROPSHEETCALLBACK.cs +++ b/sources/Interop/ComCtl32/um/prsht/PFNPROPSHEETCALLBACK.cs @@ -9,5 +9,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public delegate int PFNPROPSHEETCALLBACK([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("UINT")] uint param1, [NativeTypeName("LPARAM")] IntPtr param2); + public delegate int PFNPROPSHEETCALLBACK([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("UINT")] uint param1, [NativeTypeName("LPARAM")] nint param2); } diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERA_V1.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERA_V1.cs index 27c7e2356c..6739b71134 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERA_V1.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERA_V1.cs @@ -38,7 +38,7 @@ public unsafe partial struct PROPSHEETHEADERA_V1 public _Anonymous_e__Union3 Anonymous3; [NativeTypeName("PFNPROPSHEETCALLBACK")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [StructLayout(LayoutKind.Explicit)] public unsafe partial struct _Anonymous_e__Union1 diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERA_V2.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERA_V2.cs index a8c7c1520b..f9ce96fef9 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERA_V2.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERA_V2.cs @@ -38,7 +38,7 @@ public unsafe partial struct PROPSHEETHEADERA_V2 public _Anonymous_e__Union3 Anonymous3; [NativeTypeName("PFNPROPSHEETCALLBACK")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [NativeTypeName("_PROPSHEETHEADERA_V2::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/prsht.h:480:5)")] public _Anonymous_e__Union4 Anonymous4; diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERW_V1.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERW_V1.cs index 6cb9b00021..12d75a4a6a 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERW_V1.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERW_V1.cs @@ -38,7 +38,7 @@ public unsafe partial struct PROPSHEETHEADERW_V1 public _Anonymous_e__Union3 Anonymous3; [NativeTypeName("PFNPROPSHEETCALLBACK")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [StructLayout(LayoutKind.Explicit)] public unsafe partial struct _Anonymous_e__Union1 diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERW_V2.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERW_V2.cs index 783379c717..a4b34dadf3 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERW_V2.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETHEADERW_V2.cs @@ -38,7 +38,7 @@ public unsafe partial struct PROPSHEETHEADERW_V2 public _Anonymous_e__Union3 Anonymous3; [NativeTypeName("PFNPROPSHEETCALLBACK")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [NativeTypeName("_PROPSHEETHEADERW_V2::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/prsht.h:527:5)")] public _Anonymous_e__Union4 Anonymous4; diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA.cs index cf9c4a0010..2f338ebc28 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA.cs @@ -29,13 +29,13 @@ public unsafe partial struct PROPSHEETPAGEA public sbyte* pszTitle; [NativeTypeName("DLGPROC")] - public IntPtr* pfnDlgProc; + public IntPtr pfnDlgProc; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("LPFNPSPCALLBACKA")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [NativeTypeName("UINT *")] public uint* pcRefParent; @@ -50,7 +50,7 @@ public unsafe partial struct PROPSHEETPAGEA public IntPtr hActCtx; [NativeTypeName("_PROPSHEETPAGEA::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/prsht.h:232:5)")] - public _Anonymous_e__Union3 Anonymous3; + public _Anonymous_e__Union Anonymous3; [StructLayout(LayoutKind.Explicit)] public unsafe partial struct _Anonymous_e__Union1 @@ -77,7 +77,7 @@ public unsafe partial struct _Anonymous_e__Union2 } [StructLayout(LayoutKind.Explicit)] - public unsafe partial struct _Anonymous_e__Union3 + public unsafe partial struct _Anonymous_e__Union { [FieldOffset(0)] [NativeTypeName("HBITMAP")] diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V1.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V1.cs index 854c604be5..7e943a8f43 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V1.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V1.cs @@ -29,13 +29,13 @@ public unsafe partial struct PROPSHEETPAGEA_V1 public sbyte* pszTitle; [NativeTypeName("DLGPROC")] - public IntPtr* pfnDlgProc; + public IntPtr pfnDlgProc; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("LPFNPSPCALLBACKA")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [NativeTypeName("UINT *")] public uint* pcRefParent; diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V2.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V2.cs index 1def2cf04f..efb3d08205 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V2.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V2.cs @@ -29,13 +29,13 @@ public unsafe partial struct PROPSHEETPAGEA_V2 public sbyte* pszTitle; [NativeTypeName("DLGPROC")] - public IntPtr* pfnDlgProc; + public IntPtr pfnDlgProc; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("LPFNPSPCALLBACKA")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [NativeTypeName("UINT *")] public uint* pcRefParent; diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V3.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V3.cs index 2b6e152b54..56d385ad16 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V3.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEA_V3.cs @@ -29,13 +29,13 @@ public unsafe partial struct PROPSHEETPAGEA_V3 public sbyte* pszTitle; [NativeTypeName("DLGPROC")] - public IntPtr* pfnDlgProc; + public IntPtr pfnDlgProc; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("LPFNPSPCALLBACKA")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [NativeTypeName("UINT *")] public uint* pcRefParent; diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW.cs index 8faa5b0704..8ea81da54d 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW.cs @@ -29,13 +29,13 @@ public unsafe partial struct PROPSHEETPAGEW public ushort* pszTitle; [NativeTypeName("DLGPROC")] - public IntPtr* pfnDlgProc; + public IntPtr pfnDlgProc; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("LPFNPSPCALLBACKW")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [NativeTypeName("UINT *")] public uint* pcRefParent; @@ -50,7 +50,7 @@ public unsafe partial struct PROPSHEETPAGEW public IntPtr hActCtx; [NativeTypeName("_PROPSHEETPAGEW::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/prsht.h:278:5)")] - public _Anonymous_e__Union3 Anonymous3; + public _Anonymous_e__Union Anonymous3; [StructLayout(LayoutKind.Explicit)] public unsafe partial struct _Anonymous_e__Union1 @@ -77,7 +77,7 @@ public unsafe partial struct _Anonymous_e__Union2 } [StructLayout(LayoutKind.Explicit)] - public unsafe partial struct _Anonymous_e__Union3 + public unsafe partial struct _Anonymous_e__Union { [FieldOffset(0)] [NativeTypeName("HBITMAP")] diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V1.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V1.cs index be5659df20..04a6352cb8 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V1.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V1.cs @@ -29,13 +29,13 @@ public unsafe partial struct PROPSHEETPAGEW_V1 public ushort* pszTitle; [NativeTypeName("DLGPROC")] - public IntPtr* pfnDlgProc; + public IntPtr pfnDlgProc; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("LPFNPSPCALLBACKW")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [NativeTypeName("UINT *")] public uint* pcRefParent; diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V2.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V2.cs index ad84dbab4d..8894323942 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V2.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V2.cs @@ -29,13 +29,13 @@ public unsafe partial struct PROPSHEETPAGEW_V2 public ushort* pszTitle; [NativeTypeName("DLGPROC")] - public IntPtr* pfnDlgProc; + public IntPtr pfnDlgProc; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("LPFNPSPCALLBACKW")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [NativeTypeName("UINT *")] public uint* pcRefParent; diff --git a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V3.cs b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V3.cs index 040e8c8754..afb4fdb81e 100644 --- a/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V3.cs +++ b/sources/Interop/ComCtl32/um/prsht/PROPSHEETPAGEW_V3.cs @@ -29,13 +29,13 @@ public unsafe partial struct PROPSHEETPAGEW_V3 public ushort* pszTitle; [NativeTypeName("DLGPROC")] - public IntPtr* pfnDlgProc; + public IntPtr pfnDlgProc; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("LPFNPSPCALLBACKW")] - public IntPtr* pfnCallback; + public IntPtr pfnCallback; [NativeTypeName("UINT *")] public uint* pcRefParent; diff --git a/sources/Interop/ComCtl32/um/prsht/PSHNOTIFY.cs b/sources/Interop/ComCtl32/um/prsht/PSHNOTIFY.cs index f28295c61a..1609dbbc02 100644 --- a/sources/Interop/ComCtl32/um/prsht/PSHNOTIFY.cs +++ b/sources/Interop/ComCtl32/um/prsht/PSHNOTIFY.cs @@ -3,8 +3,6 @@ // Ported from um/prsht.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct PSHNOTIFY @@ -12,6 +10,6 @@ public partial struct PSHNOTIFY public NMHDR hdr; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; } } diff --git a/sources/Interop/Crypt32/Crypt32.cs b/sources/Interop/Crypt32/Crypt32.cs deleted file mode 100644 index 7db5934ded..0000000000 --- a/sources/Interop/Crypt32/Crypt32.cs +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. - -namespace TerraFX.Interop -{ - public static unsafe partial class Crypt32 - { - private const string LibraryPath = "crypt32"; - } -} diff --git a/sources/Interop/Crypt32/TerraFX.Interop.Crypt32.csproj b/sources/Interop/Crypt32/TerraFX.Interop.Crypt32.csproj index cb48d15ad5..d59128e84e 100644 --- a/sources/Interop/Crypt32/TerraFX.Interop.Crypt32.csproj +++ b/sources/Interop/Crypt32/TerraFX.Interop.Crypt32.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/Crypt32/um/mssip/Crypt32.cs b/sources/Interop/Crypt32/um/mssip/Crypt32.cs index 40c3efe1b3..67baa1d585 100644 --- a/sources/Interop/Crypt32/um/mssip/Crypt32.cs +++ b/sources/Interop/Crypt32/um/mssip/Crypt32.cs @@ -10,6 +10,8 @@ namespace TerraFX.Interop { public static unsafe partial class Crypt32 { + private const string LibraryPath = "crypt32"; + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CryptSIPGetSignedDataMsg", ExactSpelling = true)] [return: NativeTypeName("BOOL")] public static extern int CryptSIPGetSignedDataMsg([NativeTypeName("SIP_SUBJECTINFO *")] SIP_SUBJECTINFO* pSubjectInfo, [NativeTypeName("DWORD *")] uint* pdwEncodingType, [NativeTypeName("DWORD")] uint dwIndex, [NativeTypeName("DWORD *")] uint* pcbSignedDataMsg, [NativeTypeName("BYTE *")] byte* pbSignedDataMsg); diff --git a/sources/Interop/Crypt32/um/mssip/SIP_DISPATCH_INFO.cs b/sources/Interop/Crypt32/um/mssip/SIP_DISPATCH_INFO.cs index 0749eacd3f..3513ac3a2c 100644 --- a/sources/Interop/Crypt32/um/mssip/SIP_DISPATCH_INFO.cs +++ b/sources/Interop/Crypt32/um/mssip/SIP_DISPATCH_INFO.cs @@ -7,7 +7,7 @@ namespace TerraFX.Interop { - public unsafe partial struct SIP_DISPATCH_INFO + public partial struct SIP_DISPATCH_INFO { [NativeTypeName("DWORD")] public uint cbSize; @@ -16,18 +16,18 @@ public unsafe partial struct SIP_DISPATCH_INFO public IntPtr hSIP; [NativeTypeName("pCryptSIPGetSignedDataMsg")] - public IntPtr* pfGet; + public IntPtr pfGet; [NativeTypeName("pCryptSIPPutSignedDataMsg")] - public IntPtr* pfPut; + public IntPtr pfPut; [NativeTypeName("pCryptSIPCreateIndirectData")] - public IntPtr* pfCreate; + public IntPtr pfCreate; [NativeTypeName("pCryptSIPVerifyIndirectData")] - public IntPtr* pfVerify; + public IntPtr pfVerify; [NativeTypeName("pCryptSIPRemoveSignedDataMsg")] - public IntPtr* pfRemove; + public IntPtr pfRemove; } } diff --git a/sources/Interop/D2D1/TerraFX.Interop.D2D1.csproj b/sources/Interop/D2D1/TerraFX.Interop.D2D1.csproj index d5e9975b61..a48d48a9f5 100644 --- a/sources/Interop/D2D1/TerraFX.Interop.D2D1.csproj +++ b/sources/Interop/D2D1/TerraFX.Interop.D2D1.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext3.cs b/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext3.cs index 88a0447725..c95510579a 100644 --- a/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext3.cs +++ b/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext3.cs @@ -573,7 +573,6 @@ public int CreateImageSourceFromWic([NativeTypeName("IWICBitmapSource *")] IWICB public void DrawSpriteBatch([NativeTypeName("ID2D1SpriteBatch *")] ID2D1SpriteBatch* spriteBatch, [NativeTypeName("ID2D1Bitmap *")] ID2D1Bitmap* bitmap, D2D1_BITMAP_INTERPOLATION_MODE interpolationMode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, D2D1_SPRITE_OPTIONS spriteOptions = D2D1_SPRITE_OPTIONS_NONE) { DrawSpriteBatch(spriteBatch, 0, spriteBatch->GetSpriteCount(), bitmap, interpolationMode, spriteOptions); - return; } [return: NativeTypeName("HRESULT")] diff --git a/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext4.cs b/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext4.cs index e7b2a32c25..32d6853952 100644 --- a/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext4.cs +++ b/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext4.cs @@ -598,7 +598,6 @@ public int CreateImageSourceFromWic([NativeTypeName("IWICBitmapSource *")] IWICB public void DrawSpriteBatch([NativeTypeName("ID2D1SpriteBatch *")] ID2D1SpriteBatch* spriteBatch, [NativeTypeName("ID2D1Bitmap *")] ID2D1Bitmap* bitmap, D2D1_BITMAP_INTERPOLATION_MODE interpolationMode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, D2D1_SPRITE_OPTIONS spriteOptions = D2D1_SPRITE_OPTIONS_NONE) { DrawSpriteBatch(spriteBatch, 0, spriteBatch->GetSpriteCount(), bitmap, interpolationMode, spriteOptions); - return; } [return: NativeTypeName("HRESULT")] diff --git a/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext5.cs b/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext5.cs index d05d5e63e9..fd45ae9476 100644 --- a/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext5.cs +++ b/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext5.cs @@ -613,7 +613,6 @@ public int CreateImageSourceFromWic([NativeTypeName("IWICBitmapSource *")] IWICB public void DrawSpriteBatch([NativeTypeName("ID2D1SpriteBatch *")] ID2D1SpriteBatch* spriteBatch, [NativeTypeName("ID2D1Bitmap *")] ID2D1Bitmap* bitmap, D2D1_BITMAP_INTERPOLATION_MODE interpolationMode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, D2D1_SPRITE_OPTIONS spriteOptions = D2D1_SPRITE_OPTIONS_NONE) { DrawSpriteBatch(spriteBatch, 0, spriteBatch->GetSpriteCount(), bitmap, interpolationMode, spriteOptions); - return; } [return: NativeTypeName("HRESULT")] diff --git a/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext6.cs b/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext6.cs index f772d5e664..646b9d112a 100644 --- a/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext6.cs +++ b/sources/Interop/D2D1/um/d2d1_3/ID2D1DeviceContext6.cs @@ -616,7 +616,6 @@ public int CreateImageSourceFromWic([NativeTypeName("IWICBitmapSource *")] IWICB public void DrawSpriteBatch([NativeTypeName("ID2D1SpriteBatch *")] ID2D1SpriteBatch* spriteBatch, [NativeTypeName("ID2D1Bitmap *")] ID2D1Bitmap* bitmap, D2D1_BITMAP_INTERPOLATION_MODE interpolationMode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, D2D1_SPRITE_OPTIONS spriteOptions = D2D1_SPRITE_OPTIONS_NONE) { DrawSpriteBatch(spriteBatch, 0, spriteBatch->GetSpriteCount(), bitmap, interpolationMode, spriteOptions); - return; } [return: NativeTypeName("HRESULT")] diff --git a/sources/Interop/D3D11/TerraFX.Interop.D3D11.csproj b/sources/Interop/D3D11/TerraFX.Interop.D3D11.csproj index 0e4918b0b9..90e4c5eaa9 100644 --- a/sources/Interop/D3D11/TerraFX.Interop.D3D11.csproj +++ b/sources/Interop/D3D11/TerraFX.Interop.D3D11.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/D3D11/um/d3d11/D3D11_BUFFER_RTV.cs b/sources/Interop/D3D11/um/d3d11/D3D11_BUFFER_RTV.cs index c80c4fee83..20e4922065 100644 --- a/sources/Interop/D3D11/um/d3d11/D3D11_BUFFER_RTV.cs +++ b/sources/Interop/D3D11/um/d3d11/D3D11_BUFFER_RTV.cs @@ -9,10 +9,10 @@ namespace TerraFX.Interop { public partial struct D3D11_BUFFER_RTV { - [NativeTypeName("D3D11_BUFFER_RTV::(anonymous union at um/d3d11.h:3755:5)")] + [NativeTypeName("D3D11_BUFFER_RTV::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:3755:5)")] public _Anonymous1_e__Union Anonymous1; - [NativeTypeName("D3D11_BUFFER_RTV::(anonymous union at um/d3d11.h:3760:5)")] + [NativeTypeName("D3D11_BUFFER_RTV::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:3760:5)")] public _Anonymous2_e__Union Anonymous2; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11/D3D11_BUFFER_SRV.cs b/sources/Interop/D3D11/um/d3d11/D3D11_BUFFER_SRV.cs index dacac8ff6a..b7a85c684e 100644 --- a/sources/Interop/D3D11/um/d3d11/D3D11_BUFFER_SRV.cs +++ b/sources/Interop/D3D11/um/d3d11/D3D11_BUFFER_SRV.cs @@ -9,10 +9,10 @@ namespace TerraFX.Interop { public partial struct D3D11_BUFFER_SRV { - [NativeTypeName("D3D11_BUFFER_SRV::(anonymous union at um/d3d11.h:3302:5)")] + [NativeTypeName("D3D11_BUFFER_SRV::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:3302:5)")] public _Anonymous1_e__Union Anonymous1; - [NativeTypeName("D3D11_BUFFER_SRV::(anonymous union at um/d3d11.h:3307:5)")] + [NativeTypeName("D3D11_BUFFER_SRV::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:3307:5)")] public _Anonymous2_e__Union Anonymous2; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11/D3D11_DEPTH_STENCIL_VIEW_DESC.cs b/sources/Interop/D3D11/um/d3d11/D3D11_DEPTH_STENCIL_VIEW_DESC.cs index c04770b6fd..2a5ccabdd5 100644 --- a/sources/Interop/D3D11/um/d3d11/D3D11_DEPTH_STENCIL_VIEW_DESC.cs +++ b/sources/Interop/D3D11/um/d3d11/D3D11_DEPTH_STENCIL_VIEW_DESC.cs @@ -16,7 +16,7 @@ public partial struct D3D11_DEPTH_STENCIL_VIEW_DESC [NativeTypeName("UINT")] public uint Flags; - [NativeTypeName("D3D11_DEPTH_STENCIL_VIEW_DESC::(anonymous union at um/d3d11.h:4320:5)")] + [NativeTypeName("D3D11_DEPTH_STENCIL_VIEW_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:4320:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11/D3D11_RENDER_TARGET_VIEW_DESC.cs b/sources/Interop/D3D11/um/d3d11/D3D11_RENDER_TARGET_VIEW_DESC.cs index f0a90358e7..c01c22e2e8 100644 --- a/sources/Interop/D3D11/um/d3d11/D3D11_RENDER_TARGET_VIEW_DESC.cs +++ b/sources/Interop/D3D11/um/d3d11/D3D11_RENDER_TARGET_VIEW_DESC.cs @@ -13,7 +13,7 @@ public partial struct D3D11_RENDER_TARGET_VIEW_DESC public D3D11_RTV_DIMENSION ViewDimension; - [NativeTypeName("D3D11_RENDER_TARGET_VIEW_DESC::(anonymous union at um/d3d11.h:3813:5)")] + [NativeTypeName("D3D11_RENDER_TARGET_VIEW_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:3813:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11/D3D11_SHADER_RESOURCE_VIEW_DESC.cs b/sources/Interop/D3D11/um/d3d11/D3D11_SHADER_RESOURCE_VIEW_DESC.cs index 49c8ca84c2..93e1312fe7 100644 --- a/sources/Interop/D3D11/um/d3d11/D3D11_SHADER_RESOURCE_VIEW_DESC.cs +++ b/sources/Interop/D3D11/um/d3d11/D3D11_SHADER_RESOURCE_VIEW_DESC.cs @@ -14,7 +14,7 @@ public partial struct D3D11_SHADER_RESOURCE_VIEW_DESC [NativeTypeName("D3D11_SRV_DIMENSION")] public D3D_SRV_DIMENSION ViewDimension; - [NativeTypeName("D3D11_SHADER_RESOURCE_VIEW_DESC::(anonymous union at um/d3d11.h:3390:5)")] + [NativeTypeName("D3D11_SHADER_RESOURCE_VIEW_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:3390:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11/D3D11_UNORDERED_ACCESS_VIEW_DESC.cs b/sources/Interop/D3D11/um/d3d11/D3D11_UNORDERED_ACCESS_VIEW_DESC.cs index 3e433db80b..3ad1a92c31 100644 --- a/sources/Interop/D3D11/um/d3d11/D3D11_UNORDERED_ACCESS_VIEW_DESC.cs +++ b/sources/Interop/D3D11/um/d3d11/D3D11_UNORDERED_ACCESS_VIEW_DESC.cs @@ -13,7 +13,7 @@ public partial struct D3D11_UNORDERED_ACCESS_VIEW_DESC public D3D11_UAV_DIMENSION ViewDimension; - [NativeTypeName("D3D11_UNORDERED_ACCESS_VIEW_DESC::(anonymous union at um/d3d11.h:4648:5)")] + [NativeTypeName("D3D11_UNORDERED_ACCESS_VIEW_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:4648:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_COLOR.cs b/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_COLOR.cs index a0b59d336b..7627e29c4a 100644 --- a/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_COLOR.cs +++ b/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_COLOR.cs @@ -9,7 +9,7 @@ namespace TerraFX.Interop { public partial struct D3D11_VIDEO_COLOR { - [NativeTypeName("D3D11_VIDEO_COLOR::(anonymous union at um/d3d11.h:10370:5)")] + [NativeTypeName("D3D11_VIDEO_COLOR::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:10370:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC.cs b/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC.cs index ecd0faa71e..15f12eed5e 100644 --- a/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC.cs +++ b/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC.cs @@ -15,7 +15,7 @@ public partial struct D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC public D3D11_VDOV_DIMENSION ViewDimension; - [NativeTypeName("D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC::(anonymous union at um/d3d11.h:11226:5)")] + [NativeTypeName("D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:11226:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC.cs b/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC.cs index 7e71f52d98..3e3707c1f3 100644 --- a/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC.cs +++ b/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC.cs @@ -14,7 +14,7 @@ public partial struct D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC public D3D11_VPIV_DIMENSION ViewDimension; - [NativeTypeName("D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC::(anonymous union at um/d3d11.h:11391:5)")] + [NativeTypeName("D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:11391:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC.cs b/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC.cs index 93d9f2e9bf..2c9ace8a04 100644 --- a/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC.cs +++ b/sources/Interop/D3D11/um/d3d11/D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC.cs @@ -11,7 +11,7 @@ public partial struct D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC { public D3D11_VPOV_DIMENSION ViewDimension; - [NativeTypeName("D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC::(anonymous union at um/d3d11.h:11562:5)")] + [NativeTypeName("D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11.h:11562:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11/ID3D11ClassInstance.cs b/sources/Interop/D3D11/um/d3d11/ID3D11ClassInstance.cs index 0363cad741..0599cc1a6e 100644 --- a/sources/Interop/D3D11/um/d3d11/ID3D11ClassInstance.cs +++ b/sources/Interop/D3D11/um/d3d11/ID3D11ClassInstance.cs @@ -48,10 +48,10 @@ public unsafe partial struct ID3D11ClassInstance public delegate void _GetDesc(ID3D11ClassInstance* pThis, [NativeTypeName("D3D11_CLASS_INSTANCE_DESC *")] D3D11_CLASS_INSTANCE_DESC* pDesc); [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate void _GetInstanceName(ID3D11ClassInstance* pThis, [NativeTypeName("LPSTR")] sbyte* pInstanceName, [NativeTypeName("SIZE_T *")] UIntPtr* pBufferLength); + public delegate void _GetInstanceName(ID3D11ClassInstance* pThis, [NativeTypeName("LPSTR")] sbyte* pInstanceName, [NativeTypeName("SIZE_T *")] nuint* pBufferLength); [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate void _GetTypeName(ID3D11ClassInstance* pThis, [NativeTypeName("LPSTR")] sbyte* pTypeName, [NativeTypeName("SIZE_T *")] UIntPtr* pBufferLength); + public delegate void _GetTypeName(ID3D11ClassInstance* pThis, [NativeTypeName("LPSTR")] sbyte* pTypeName, [NativeTypeName("SIZE_T *")] nuint* pBufferLength); [return: NativeTypeName("HRESULT")] public int QueryInterface([NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvObject) @@ -104,12 +104,12 @@ public void GetDesc([NativeTypeName("D3D11_CLASS_INSTANCE_DESC *")] D3D11_CLASS_ Marshal.GetDelegateForFunctionPointer<_GetDesc>(lpVtbl->GetDesc)((ID3D11ClassInstance*)Unsafe.AsPointer(ref this), pDesc); } - public void GetInstanceName([NativeTypeName("LPSTR")] sbyte* pInstanceName, [NativeTypeName("SIZE_T *")] UIntPtr* pBufferLength) + public void GetInstanceName([NativeTypeName("LPSTR")] sbyte* pInstanceName, [NativeTypeName("SIZE_T *")] nuint* pBufferLength) { Marshal.GetDelegateForFunctionPointer<_GetInstanceName>(lpVtbl->GetInstanceName)((ID3D11ClassInstance*)Unsafe.AsPointer(ref this), pInstanceName, pBufferLength); } - public void GetTypeName([NativeTypeName("LPSTR")] sbyte* pTypeName, [NativeTypeName("SIZE_T *")] UIntPtr* pBufferLength) + public void GetTypeName([NativeTypeName("LPSTR")] sbyte* pTypeName, [NativeTypeName("SIZE_T *")] nuint* pBufferLength) { Marshal.GetDelegateForFunctionPointer<_GetTypeName>(lpVtbl->GetTypeName)((ID3D11ClassInstance*)Unsafe.AsPointer(ref this), pTypeName, pBufferLength); } diff --git a/sources/Interop/D3D11/um/d3d11/ID3D11Device.cs b/sources/Interop/D3D11/um/d3d11/ID3D11Device.cs index 7c2348768a..7c74e4cfd7 100644 --- a/sources/Interop/D3D11/um/d3d11/ID3D11Device.cs +++ b/sources/Interop/D3D11/um/d3d11/ID3D11Device.cs @@ -60,35 +60,35 @@ public unsafe partial struct ID3D11Device [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateInputLayout(ID3D11Device* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); + public delegate int _CreateInputLayout(ID3D11Device* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateVertexShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); + public delegate int _CreateVertexShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePixelShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); + public delegate int _CreatePixelShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateHullShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); + public delegate int _CreateHullShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateDomainShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); + public delegate int _CreateDomainShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateComputeShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); + public delegate int _CreateComputeShader(ID3D11Device* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -250,49 +250,49 @@ public int CreateDepthStencilView([NativeTypeName("ID3D11Resource *")] ID3D11Res } [return: NativeTypeName("HRESULT")] - public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) + public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) { return Marshal.GetDelegateForFunctionPointer<_CreateInputLayout>(lpVtbl->CreateInputLayout)((ID3D11Device*)Unsafe.AsPointer(ref this), pInputElementDescs, NumElements, pShaderBytecodeWithInputSignature, BytecodeLength, ppInputLayout); } [return: NativeTypeName("HRESULT")] - public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) + public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) { return Marshal.GetDelegateForFunctionPointer<_CreateVertexShader>(lpVtbl->CreateVertexShader)((ID3D11Device*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShader>(lpVtbl->CreateGeometryShader)((ID3D11Device*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShaderWithStreamOutput>(lpVtbl->CreateGeometryShaderWithStreamOutput)((ID3D11Device*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pSODeclaration, NumEntries, pBufferStrides, NumStrides, RasterizedStream, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) + public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) { return Marshal.GetDelegateForFunctionPointer<_CreatePixelShader>(lpVtbl->CreatePixelShader)((ID3D11Device*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppPixelShader); } [return: NativeTypeName("HRESULT")] - public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) + public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) { return Marshal.GetDelegateForFunctionPointer<_CreateHullShader>(lpVtbl->CreateHullShader)((ID3D11Device*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppHullShader); } [return: NativeTypeName("HRESULT")] - public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) + public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) { return Marshal.GetDelegateForFunctionPointer<_CreateDomainShader>(lpVtbl->CreateDomainShader)((ID3D11Device*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppDomainShader); } [return: NativeTypeName("HRESULT")] - public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) + public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) { return Marshal.GetDelegateForFunctionPointer<_CreateComputeShader>(lpVtbl->CreateComputeShader)((ID3D11Device*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppComputeShader); } diff --git a/sources/Interop/D3D11/um/d3d11_1/ID3D11Device1.cs b/sources/Interop/D3D11/um/d3d11_1/ID3D11Device1.cs index 0b48c06260..cb413f3135 100644 --- a/sources/Interop/D3D11/um/d3d11_1/ID3D11Device1.cs +++ b/sources/Interop/D3D11/um/d3d11_1/ID3D11Device1.cs @@ -60,35 +60,35 @@ public unsafe partial struct ID3D11Device1 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateInputLayout(ID3D11Device1* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); + public delegate int _CreateInputLayout(ID3D11Device1* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateVertexShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); + public delegate int _CreateVertexShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePixelShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); + public delegate int _CreatePixelShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateHullShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); + public delegate int _CreateHullShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateDomainShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); + public delegate int _CreateDomainShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateComputeShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); + public delegate int _CreateComputeShader(ID3D11Device1* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -277,49 +277,49 @@ public int CreateDepthStencilView([NativeTypeName("ID3D11Resource *")] ID3D11Res } [return: NativeTypeName("HRESULT")] - public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) + public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) { return Marshal.GetDelegateForFunctionPointer<_CreateInputLayout>(lpVtbl->CreateInputLayout)((ID3D11Device1*)Unsafe.AsPointer(ref this), pInputElementDescs, NumElements, pShaderBytecodeWithInputSignature, BytecodeLength, ppInputLayout); } [return: NativeTypeName("HRESULT")] - public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) + public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) { return Marshal.GetDelegateForFunctionPointer<_CreateVertexShader>(lpVtbl->CreateVertexShader)((ID3D11Device1*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShader>(lpVtbl->CreateGeometryShader)((ID3D11Device1*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShaderWithStreamOutput>(lpVtbl->CreateGeometryShaderWithStreamOutput)((ID3D11Device1*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pSODeclaration, NumEntries, pBufferStrides, NumStrides, RasterizedStream, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) + public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) { return Marshal.GetDelegateForFunctionPointer<_CreatePixelShader>(lpVtbl->CreatePixelShader)((ID3D11Device1*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppPixelShader); } [return: NativeTypeName("HRESULT")] - public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) + public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) { return Marshal.GetDelegateForFunctionPointer<_CreateHullShader>(lpVtbl->CreateHullShader)((ID3D11Device1*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppHullShader); } [return: NativeTypeName("HRESULT")] - public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) + public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) { return Marshal.GetDelegateForFunctionPointer<_CreateDomainShader>(lpVtbl->CreateDomainShader)((ID3D11Device1*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppDomainShader); } [return: NativeTypeName("HRESULT")] - public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) + public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) { return Marshal.GetDelegateForFunctionPointer<_CreateComputeShader>(lpVtbl->CreateComputeShader)((ID3D11Device1*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppComputeShader); } diff --git a/sources/Interop/D3D11/um/d3d11_2/ID3D11Device2.cs b/sources/Interop/D3D11/um/d3d11_2/ID3D11Device2.cs index d82f9a274f..4a5dc8fdea 100644 --- a/sources/Interop/D3D11/um/d3d11_2/ID3D11Device2.cs +++ b/sources/Interop/D3D11/um/d3d11_2/ID3D11Device2.cs @@ -60,35 +60,35 @@ public unsafe partial struct ID3D11Device2 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateInputLayout(ID3D11Device2* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); + public delegate int _CreateInputLayout(ID3D11Device2* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateVertexShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); + public delegate int _CreateVertexShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePixelShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); + public delegate int _CreatePixelShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateHullShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); + public delegate int _CreateHullShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateDomainShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); + public delegate int _CreateDomainShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateComputeShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); + public delegate int _CreateComputeShader(ID3D11Device2* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -291,49 +291,49 @@ public int CreateDepthStencilView([NativeTypeName("ID3D11Resource *")] ID3D11Res } [return: NativeTypeName("HRESULT")] - public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) + public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) { return Marshal.GetDelegateForFunctionPointer<_CreateInputLayout>(lpVtbl->CreateInputLayout)((ID3D11Device2*)Unsafe.AsPointer(ref this), pInputElementDescs, NumElements, pShaderBytecodeWithInputSignature, BytecodeLength, ppInputLayout); } [return: NativeTypeName("HRESULT")] - public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) + public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) { return Marshal.GetDelegateForFunctionPointer<_CreateVertexShader>(lpVtbl->CreateVertexShader)((ID3D11Device2*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShader>(lpVtbl->CreateGeometryShader)((ID3D11Device2*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShaderWithStreamOutput>(lpVtbl->CreateGeometryShaderWithStreamOutput)((ID3D11Device2*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pSODeclaration, NumEntries, pBufferStrides, NumStrides, RasterizedStream, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) + public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) { return Marshal.GetDelegateForFunctionPointer<_CreatePixelShader>(lpVtbl->CreatePixelShader)((ID3D11Device2*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppPixelShader); } [return: NativeTypeName("HRESULT")] - public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) + public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) { return Marshal.GetDelegateForFunctionPointer<_CreateHullShader>(lpVtbl->CreateHullShader)((ID3D11Device2*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppHullShader); } [return: NativeTypeName("HRESULT")] - public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) + public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) { return Marshal.GetDelegateForFunctionPointer<_CreateDomainShader>(lpVtbl->CreateDomainShader)((ID3D11Device2*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppDomainShader); } [return: NativeTypeName("HRESULT")] - public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) + public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) { return Marshal.GetDelegateForFunctionPointer<_CreateComputeShader>(lpVtbl->CreateComputeShader)((ID3D11Device2*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppComputeShader); } diff --git a/sources/Interop/D3D11/um/d3d11_3/D3D11_RENDER_TARGET_VIEW_DESC1.cs b/sources/Interop/D3D11/um/d3d11_3/D3D11_RENDER_TARGET_VIEW_DESC1.cs index 5559ec3848..41fcf56027 100644 --- a/sources/Interop/D3D11/um/d3d11_3/D3D11_RENDER_TARGET_VIEW_DESC1.cs +++ b/sources/Interop/D3D11/um/d3d11_3/D3D11_RENDER_TARGET_VIEW_DESC1.cs @@ -13,7 +13,7 @@ public partial struct D3D11_RENDER_TARGET_VIEW_DESC1 public D3D11_RTV_DIMENSION ViewDimension; - [NativeTypeName("D3D11_RENDER_TARGET_VIEW_DESC1::(anonymous union at um/d3d11_3.h:1276:5)")] + [NativeTypeName("D3D11_RENDER_TARGET_VIEW_DESC1::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11_3.h:1276:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11_3/D3D11_SHADER_RESOURCE_VIEW_DESC1.cs b/sources/Interop/D3D11/um/d3d11_3/D3D11_SHADER_RESOURCE_VIEW_DESC1.cs index 11365ac92d..8d951159aa 100644 --- a/sources/Interop/D3D11/um/d3d11_3/D3D11_SHADER_RESOURCE_VIEW_DESC1.cs +++ b/sources/Interop/D3D11/um/d3d11_3/D3D11_SHADER_RESOURCE_VIEW_DESC1.cs @@ -14,7 +14,7 @@ public partial struct D3D11_SHADER_RESOURCE_VIEW_DESC1 [NativeTypeName("D3D11_SRV_DIMENSION")] public D3D_SRV_DIMENSION ViewDimension; - [NativeTypeName("D3D11_SHADER_RESOURCE_VIEW_DESC1::(anonymous union at um/d3d11_3.h:880:5)")] + [NativeTypeName("D3D11_SHADER_RESOURCE_VIEW_DESC1::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11_3.h:880:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11_3/D3D11_UNORDERED_ACCESS_VIEW_DESC1.cs b/sources/Interop/D3D11/um/d3d11_3/D3D11_UNORDERED_ACCESS_VIEW_DESC1.cs index 0fc6ec9767..31ca8b9b2a 100644 --- a/sources/Interop/D3D11/um/d3d11_3/D3D11_UNORDERED_ACCESS_VIEW_DESC1.cs +++ b/sources/Interop/D3D11/um/d3d11_3/D3D11_UNORDERED_ACCESS_VIEW_DESC1.cs @@ -13,7 +13,7 @@ public partial struct D3D11_UNORDERED_ACCESS_VIEW_DESC1 public D3D11_UAV_DIMENSION ViewDimension; - [NativeTypeName("D3D11_UNORDERED_ACCESS_VIEW_DESC1::(anonymous union at um/d3d11_3.h:1623:5)")] + [NativeTypeName("D3D11_UNORDERED_ACCESS_VIEW_DESC1::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11_3.h:1623:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11_3/ID3D11Device3.cs b/sources/Interop/D3D11/um/d3d11_3/ID3D11Device3.cs index e73b24c4fa..2e0bcc9236 100644 --- a/sources/Interop/D3D11/um/d3d11_3/ID3D11Device3.cs +++ b/sources/Interop/D3D11/um/d3d11_3/ID3D11Device3.cs @@ -60,35 +60,35 @@ public unsafe partial struct ID3D11Device3 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateInputLayout(ID3D11Device3* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); + public delegate int _CreateInputLayout(ID3D11Device3* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateVertexShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); + public delegate int _CreateVertexShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePixelShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); + public delegate int _CreatePixelShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateHullShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); + public delegate int _CreateHullShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateDomainShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); + public delegate int _CreateDomainShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateComputeShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); + public delegate int _CreateComputeShader(ID3D11Device3* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -332,49 +332,49 @@ public int CreateDepthStencilView([NativeTypeName("ID3D11Resource *")] ID3D11Res } [return: NativeTypeName("HRESULT")] - public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) + public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) { return Marshal.GetDelegateForFunctionPointer<_CreateInputLayout>(lpVtbl->CreateInputLayout)((ID3D11Device3*)Unsafe.AsPointer(ref this), pInputElementDescs, NumElements, pShaderBytecodeWithInputSignature, BytecodeLength, ppInputLayout); } [return: NativeTypeName("HRESULT")] - public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) + public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) { return Marshal.GetDelegateForFunctionPointer<_CreateVertexShader>(lpVtbl->CreateVertexShader)((ID3D11Device3*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShader>(lpVtbl->CreateGeometryShader)((ID3D11Device3*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShaderWithStreamOutput>(lpVtbl->CreateGeometryShaderWithStreamOutput)((ID3D11Device3*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pSODeclaration, NumEntries, pBufferStrides, NumStrides, RasterizedStream, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) + public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) { return Marshal.GetDelegateForFunctionPointer<_CreatePixelShader>(lpVtbl->CreatePixelShader)((ID3D11Device3*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppPixelShader); } [return: NativeTypeName("HRESULT")] - public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) + public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) { return Marshal.GetDelegateForFunctionPointer<_CreateHullShader>(lpVtbl->CreateHullShader)((ID3D11Device3*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppHullShader); } [return: NativeTypeName("HRESULT")] - public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) + public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) { return Marshal.GetDelegateForFunctionPointer<_CreateDomainShader>(lpVtbl->CreateDomainShader)((ID3D11Device3*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppDomainShader); } [return: NativeTypeName("HRESULT")] - public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) + public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) { return Marshal.GetDelegateForFunctionPointer<_CreateComputeShader>(lpVtbl->CreateComputeShader)((ID3D11Device3*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppComputeShader); } diff --git a/sources/Interop/D3D11/um/d3d11_4/ID3D11Device4.cs b/sources/Interop/D3D11/um/d3d11_4/ID3D11Device4.cs index e66d439dd5..c989cf6c19 100644 --- a/sources/Interop/D3D11/um/d3d11_4/ID3D11Device4.cs +++ b/sources/Interop/D3D11/um/d3d11_4/ID3D11Device4.cs @@ -60,35 +60,35 @@ public unsafe partial struct ID3D11Device4 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateInputLayout(ID3D11Device4* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); + public delegate int _CreateInputLayout(ID3D11Device4* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateVertexShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); + public delegate int _CreateVertexShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePixelShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); + public delegate int _CreatePixelShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateHullShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); + public delegate int _CreateHullShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateDomainShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); + public delegate int _CreateDomainShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateComputeShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); + public delegate int _CreateComputeShader(ID3D11Device4* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -339,49 +339,49 @@ public int CreateDepthStencilView([NativeTypeName("ID3D11Resource *")] ID3D11Res } [return: NativeTypeName("HRESULT")] - public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) + public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) { return Marshal.GetDelegateForFunctionPointer<_CreateInputLayout>(lpVtbl->CreateInputLayout)((ID3D11Device4*)Unsafe.AsPointer(ref this), pInputElementDescs, NumElements, pShaderBytecodeWithInputSignature, BytecodeLength, ppInputLayout); } [return: NativeTypeName("HRESULT")] - public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) + public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) { return Marshal.GetDelegateForFunctionPointer<_CreateVertexShader>(lpVtbl->CreateVertexShader)((ID3D11Device4*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShader>(lpVtbl->CreateGeometryShader)((ID3D11Device4*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShaderWithStreamOutput>(lpVtbl->CreateGeometryShaderWithStreamOutput)((ID3D11Device4*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pSODeclaration, NumEntries, pBufferStrides, NumStrides, RasterizedStream, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) + public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) { return Marshal.GetDelegateForFunctionPointer<_CreatePixelShader>(lpVtbl->CreatePixelShader)((ID3D11Device4*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppPixelShader); } [return: NativeTypeName("HRESULT")] - public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) + public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) { return Marshal.GetDelegateForFunctionPointer<_CreateHullShader>(lpVtbl->CreateHullShader)((ID3D11Device4*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppHullShader); } [return: NativeTypeName("HRESULT")] - public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) + public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) { return Marshal.GetDelegateForFunctionPointer<_CreateDomainShader>(lpVtbl->CreateDomainShader)((ID3D11Device4*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppDomainShader); } [return: NativeTypeName("HRESULT")] - public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) + public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) { return Marshal.GetDelegateForFunctionPointer<_CreateComputeShader>(lpVtbl->CreateComputeShader)((ID3D11Device4*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppComputeShader); } diff --git a/sources/Interop/D3D11/um/d3d11_4/ID3D11Device5.cs b/sources/Interop/D3D11/um/d3d11_4/ID3D11Device5.cs index 5608b2471c..59bca8c29b 100644 --- a/sources/Interop/D3D11/um/d3d11_4/ID3D11Device5.cs +++ b/sources/Interop/D3D11/um/d3d11_4/ID3D11Device5.cs @@ -60,35 +60,35 @@ public unsafe partial struct ID3D11Device5 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateInputLayout(ID3D11Device5* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); + public delegate int _CreateInputLayout(ID3D11Device5* pThis, [NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateVertexShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); + public delegate int _CreateVertexShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); + public delegate int _CreateGeometryShaderWithStreamOutput(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePixelShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); + public delegate int _CreatePixelShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateHullShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); + public delegate int _CreateHullShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateDomainShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); + public delegate int _CreateDomainShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateComputeShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); + public delegate int _CreateComputeShader(ID3D11Device5* pThis, [NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -347,49 +347,49 @@ public int CreateDepthStencilView([NativeTypeName("ID3D11Resource *")] ID3D11Res } [return: NativeTypeName("HRESULT")] - public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) + public int CreateInputLayout([NativeTypeName("const D3D11_INPUT_ELEMENT_DESC *")] D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, [NativeTypeName("UINT")] uint NumElements, [NativeTypeName("const void *")] void* pShaderBytecodeWithInputSignature, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11InputLayout **")] ID3D11InputLayout** ppInputLayout) { return Marshal.GetDelegateForFunctionPointer<_CreateInputLayout>(lpVtbl->CreateInputLayout)((ID3D11Device5*)Unsafe.AsPointer(ref this), pInputElementDescs, NumElements, pShaderBytecodeWithInputSignature, BytecodeLength, ppInputLayout); } [return: NativeTypeName("HRESULT")] - public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) + public int CreateVertexShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11VertexShader **")] ID3D11VertexShader** ppVertexShader) { return Marshal.GetDelegateForFunctionPointer<_CreateVertexShader>(lpVtbl->CreateVertexShader)((ID3D11Device5*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShader>(lpVtbl->CreateGeometryShader)((ID3D11Device5*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) + public int CreateGeometryShaderWithStreamOutput([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("const D3D11_SO_DECLARATION_ENTRY *")] D3D11_SO_DECLARATION_ENTRY* pSODeclaration, [NativeTypeName("UINT")] uint NumEntries, [NativeTypeName("const UINT *")] uint* pBufferStrides, [NativeTypeName("UINT")] uint NumStrides, [NativeTypeName("UINT")] uint RasterizedStream, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11GeometryShader **")] ID3D11GeometryShader** ppGeometryShader) { return Marshal.GetDelegateForFunctionPointer<_CreateGeometryShaderWithStreamOutput>(lpVtbl->CreateGeometryShaderWithStreamOutput)((ID3D11Device5*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pSODeclaration, NumEntries, pBufferStrides, NumStrides, RasterizedStream, pClassLinkage, ppGeometryShader); } [return: NativeTypeName("HRESULT")] - public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) + public int CreatePixelShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11PixelShader **")] ID3D11PixelShader** ppPixelShader) { return Marshal.GetDelegateForFunctionPointer<_CreatePixelShader>(lpVtbl->CreatePixelShader)((ID3D11Device5*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppPixelShader); } [return: NativeTypeName("HRESULT")] - public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) + public int CreateHullShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11HullShader **")] ID3D11HullShader** ppHullShader) { return Marshal.GetDelegateForFunctionPointer<_CreateHullShader>(lpVtbl->CreateHullShader)((ID3D11Device5*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppHullShader); } [return: NativeTypeName("HRESULT")] - public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) + public int CreateDomainShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11DomainShader **")] ID3D11DomainShader** ppDomainShader) { return Marshal.GetDelegateForFunctionPointer<_CreateDomainShader>(lpVtbl->CreateDomainShader)((ID3D11Device5*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppDomainShader); } [return: NativeTypeName("HRESULT")] - public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) + public int CreateComputeShader([NativeTypeName("const void *")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("ID3D11ClassLinkage *")] ID3D11ClassLinkage* pClassLinkage, [NativeTypeName("ID3D11ComputeShader **")] ID3D11ComputeShader** ppComputeShader) { return Marshal.GetDelegateForFunctionPointer<_CreateComputeShader>(lpVtbl->CreateComputeShader)((ID3D11Device5*)Unsafe.AsPointer(ref this), pShaderBytecode, BytecodeLength, pClassLinkage, ppComputeShader); } diff --git a/sources/Interop/D3D11/um/d3d11sdklayers/D3D11_MESSAGE.cs b/sources/Interop/D3D11/um/d3d11sdklayers/D3D11_MESSAGE.cs index 711a0744aa..0dda576d82 100644 --- a/sources/Interop/D3D11/um/d3d11sdklayers/D3D11_MESSAGE.cs +++ b/sources/Interop/D3D11/um/d3d11sdklayers/D3D11_MESSAGE.cs @@ -3,8 +3,6 @@ // Ported from um/d3d11sdklayers.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct D3D11_MESSAGE @@ -19,6 +17,6 @@ public unsafe partial struct D3D11_MESSAGE public sbyte* pDescription; [NativeTypeName("SIZE_T")] - public UIntPtr DescriptionByteLength; + public nuint DescriptionByteLength; } } diff --git a/sources/Interop/D3D11/um/d3d11sdklayers/ID3D11InfoQueue.cs b/sources/Interop/D3D11/um/d3d11sdklayers/ID3D11InfoQueue.cs index 3f9c982fe9..f6c4ee6c48 100644 --- a/sources/Interop/D3D11/um/d3d11sdklayers/ID3D11InfoQueue.cs +++ b/sources/Interop/D3D11/um/d3d11sdklayers/ID3D11InfoQueue.cs @@ -35,7 +35,7 @@ public unsafe partial struct ID3D11InfoQueue [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _GetMessageA(ID3D11InfoQueue* pThis, [NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("D3D11_MESSAGE *")] D3D11_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] UIntPtr* pMessageByteLength); + public delegate int _GetMessageA(ID3D11InfoQueue* pThis, [NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("D3D11_MESSAGE *")] D3D11_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] nuint* pMessageByteLength); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("UINT64")] @@ -67,7 +67,7 @@ public unsafe partial struct ID3D11InfoQueue [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _GetStorageFilter(ID3D11InfoQueue* pThis, [NativeTypeName("D3D11_INFO_QUEUE_FILTER *")] D3D11_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength); + public delegate int _GetStorageFilter(ID3D11InfoQueue* pThis, [NativeTypeName("D3D11_INFO_QUEUE_FILTER *")] D3D11_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _ClearStorageFilter(ID3D11InfoQueue* pThis); @@ -97,7 +97,7 @@ public unsafe partial struct ID3D11InfoQueue [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _GetRetrievalFilter(ID3D11InfoQueue* pThis, [NativeTypeName("D3D11_INFO_QUEUE_FILTER *")] D3D11_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength); + public delegate int _GetRetrievalFilter(ID3D11InfoQueue* pThis, [NativeTypeName("D3D11_INFO_QUEUE_FILTER *")] D3D11_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _ClearRetrievalFilter(ID3D11InfoQueue* pThis); @@ -190,7 +190,7 @@ public void ClearStoredMessages() } [return: NativeTypeName("HRESULT")] - public int GetMessageA([NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("D3D11_MESSAGE *")] D3D11_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] UIntPtr* pMessageByteLength) + public int GetMessageA([NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("D3D11_MESSAGE *")] D3D11_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] nuint* pMessageByteLength) { return Marshal.GetDelegateForFunctionPointer<_GetMessageA>(lpVtbl->GetMessageA)((ID3D11InfoQueue*)Unsafe.AsPointer(ref this), MessageIndex, pMessage, pMessageByteLength); } @@ -238,7 +238,7 @@ public int AddStorageFilterEntries([NativeTypeName("D3D11_INFO_QUEUE_FILTER *")] } [return: NativeTypeName("HRESULT")] - public int GetStorageFilter([NativeTypeName("D3D11_INFO_QUEUE_FILTER *")] D3D11_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength) + public int GetStorageFilter([NativeTypeName("D3D11_INFO_QUEUE_FILTER *")] D3D11_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength) { return Marshal.GetDelegateForFunctionPointer<_GetStorageFilter>(lpVtbl->GetStorageFilter)((ID3D11InfoQueue*)Unsafe.AsPointer(ref this), pFilter, pFilterByteLength); } @@ -284,7 +284,7 @@ public int AddRetrievalFilterEntries([NativeTypeName("D3D11_INFO_QUEUE_FILTER *" } [return: NativeTypeName("HRESULT")] - public int GetRetrievalFilter([NativeTypeName("D3D11_INFO_QUEUE_FILTER *")] D3D11_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength) + public int GetRetrievalFilter([NativeTypeName("D3D11_INFO_QUEUE_FILTER *")] D3D11_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength) { return Marshal.GetDelegateForFunctionPointer<_GetRetrievalFilter>(lpVtbl->GetRetrievalFilter)((ID3D11InfoQueue*)Unsafe.AsPointer(ref this), pFilter, pFilterByteLength); } diff --git a/sources/Interop/D3D11/um/d3d11shadertracing/D3D11.cs b/sources/Interop/D3D11/um/d3d11shadertracing/D3D11.cs index 6c4ede9ca9..8e3e138168 100644 --- a/sources/Interop/D3D11/um/d3d11shadertracing/D3D11.cs +++ b/sources/Interop/D3D11/um/d3d11shadertracing/D3D11.cs @@ -3,7 +3,6 @@ // Ported from um/d3d11shadertracing.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -12,6 +11,6 @@ public static unsafe partial class D3D11 { [DllImport(LibraryPath, CallingConvention = CallingConvention.StdCall, EntryPoint = "D3DDisassemble11Trace", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DDisassemble11Trace([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("ID3D11ShaderTrace *")] ID3D11ShaderTrace* pTrace, [NativeTypeName("UINT")] uint StartStep, [NativeTypeName("UINT")] uint NumSteps, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("struct ID3D10Blob **")] ID3DBlob** ppDisassembly); + public static extern int D3DDisassemble11Trace([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("ID3D11ShaderTrace *")] ID3D11ShaderTrace* pTrace, [NativeTypeName("UINT")] uint StartStep, [NativeTypeName("UINT")] uint NumSteps, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("struct ID3D10Blob **")] ID3DBlob** ppDisassembly); } } diff --git a/sources/Interop/D3D11/um/d3d11shadertracing/D3D11_SHADER_TRACE_DESC.cs b/sources/Interop/D3D11/um/d3d11shadertracing/D3D11_SHADER_TRACE_DESC.cs index b7abdaa150..c672b32886 100644 --- a/sources/Interop/D3D11/um/d3d11shadertracing/D3D11_SHADER_TRACE_DESC.cs +++ b/sources/Interop/D3D11/um/d3d11shadertracing/D3D11_SHADER_TRACE_DESC.cs @@ -14,7 +14,7 @@ public partial struct D3D11_SHADER_TRACE_DESC [NativeTypeName("UINT")] public uint Flags; - [NativeTypeName("D3D11_SHADER_TRACE_DESC::(anonymous union at um/d3d11shadertracing.h:126:5)")] + [NativeTypeName("D3D11_SHADER_TRACE_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11shadertracing.h:126:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D11/um/d3d11shadertracing/D3D11_TRACE_REGISTER.cs b/sources/Interop/D3D11/um/d3d11shadertracing/D3D11_TRACE_REGISTER.cs index fef35f356a..4c230041b5 100644 --- a/sources/Interop/D3D11/um/d3d11shadertracing/D3D11_TRACE_REGISTER.cs +++ b/sources/Interop/D3D11/um/d3d11shadertracing/D3D11_TRACE_REGISTER.cs @@ -11,7 +11,7 @@ public partial struct D3D11_TRACE_REGISTER { public D3D11_TRACE_REGISTER_TYPE RegType; - [NativeTypeName("D3D11_TRACE_REGISTER::(anonymous union at um/d3d11shadertracing.h:226:5)")] + [NativeTypeName("D3D11_TRACE_REGISTER::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d11shadertracing.h:226:5)")] public _Anonymous_e__Union Anonymous; [NativeTypeName("UINT8")] diff --git a/sources/Interop/D3D12/TerraFX.Interop.D3D12.csproj b/sources/Interop/D3D12/TerraFX.Interop.D3D12.csproj index c834849e16..33fb35b5ae 100644 --- a/sources/Interop/D3D12/TerraFX.Interop.D3D12.csproj +++ b/sources/Interop/D3D12/TerraFX.Interop.D3D12.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/D3D12/um/d3d12/D3D12.cs b/sources/Interop/D3D12/um/d3d12/D3D12.cs index 464235ce46..d32b812572 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12.cs @@ -18,7 +18,7 @@ public static unsafe partial class D3D12 [DllImport(LibraryPath, CallingConvention = CallingConvention.StdCall, EntryPoint = "D3D12CreateRootSignatureDeserializer", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3D12CreateRootSignatureDeserializer([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSizeInBytes, [NativeTypeName("const IID &")] Guid* pRootSignatureDeserializerInterface, [NativeTypeName("void **")] void** ppRootSignatureDeserializer); + public static extern int D3D12CreateRootSignatureDeserializer([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSizeInBytes, [NativeTypeName("const IID &")] Guid* pRootSignatureDeserializerInterface, [NativeTypeName("void **")] void** ppRootSignatureDeserializer); [DllImport(LibraryPath, CallingConvention = CallingConvention.StdCall, EntryPoint = "D3D12SerializeVersionedRootSignature", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] @@ -26,7 +26,7 @@ public static unsafe partial class D3D12 [DllImport(LibraryPath, CallingConvention = CallingConvention.StdCall, EntryPoint = "D3D12CreateVersionedRootSignatureDeserializer", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3D12CreateVersionedRootSignatureDeserializer([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSizeInBytes, [NativeTypeName("const IID &")] Guid* pRootSignatureDeserializerInterface, [NativeTypeName("void **")] void** ppRootSignatureDeserializer); + public static extern int D3D12CreateVersionedRootSignatureDeserializer([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSizeInBytes, [NativeTypeName("const IID &")] Guid* pRootSignatureDeserializerInterface, [NativeTypeName("void **")] void** ppRootSignatureDeserializer); [DllImport(LibraryPath, CallingConvention = CallingConvention.StdCall, EntryPoint = "D3D12CreateDevice", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS.cs b/sources/Interop/D3D12/um/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS.cs index 6fd2260097..f746e6f8a1 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS.cs @@ -18,7 +18,7 @@ public partial struct D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS public D3D12_ELEMENTS_LAYOUT DescsLayout; - [NativeTypeName("D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS::(anonymous union at um/d3d12.h:12369:5)")] + [NativeTypeName("D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:12369:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_CACHED_PIPELINE_STATE.cs b/sources/Interop/D3D12/um/d3d12/D3D12_CACHED_PIPELINE_STATE.cs index 0b300c3fec..bbd49b814e 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_CACHED_PIPELINE_STATE.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_CACHED_PIPELINE_STATE.cs @@ -3,8 +3,6 @@ // Ported from um/d3d12.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct D3D12_CACHED_PIPELINE_STATE @@ -13,6 +11,6 @@ public unsafe partial struct D3D12_CACHED_PIPELINE_STATE public void* pCachedBlob; [NativeTypeName("SIZE_T")] - public UIntPtr CachedBlobSizeInBytes; + public nuint CachedBlobSizeInBytes; } } diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_CLEAR_VALUE.cs b/sources/Interop/D3D12/um/d3d12/D3D12_CLEAR_VALUE.cs index e8c55cece9..3fb811c055 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_CLEAR_VALUE.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_CLEAR_VALUE.cs @@ -11,7 +11,7 @@ public partial struct D3D12_CLEAR_VALUE { public DXGI_FORMAT Format; - [NativeTypeName("D3D12_CLEAR_VALUE::(anonymous union at um/d3d12.h:2479:5)")] + [NativeTypeName("D3D12_CLEAR_VALUE::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:2479:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_CPU_DESCRIPTOR_HANDLE.cs b/sources/Interop/D3D12/um/d3d12/D3D12_CPU_DESCRIPTOR_HANDLE.cs index 3169b859f0..f2f4528787 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_CPU_DESCRIPTOR_HANDLE.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_CPU_DESCRIPTOR_HANDLE.cs @@ -3,13 +3,11 @@ // Ported from um/d3d12.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct D3D12_CPU_DESCRIPTOR_HANDLE { [NativeTypeName("SIZE_T")] - public UIntPtr ptr; + public nuint ptr; } } diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESC.cs b/sources/Interop/D3D12/um/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESC.cs index 7edcb33c8c..a66011ba4b 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESC.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESC.cs @@ -15,7 +15,7 @@ public partial struct D3D12_DEPTH_STENCIL_VIEW_DESC public D3D12_DSV_FLAGS Flags; - [NativeTypeName("D3D12_DEPTH_STENCIL_VIEW_DESC::(anonymous union at um/d3d12.h:3228:5)")] + [NativeTypeName("D3D12_DEPTH_STENCIL_VIEW_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3228:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMAND.cs b/sources/Interop/D3D12/um/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMAND.cs index 5daf5af552..cbc527a515 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMAND.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMAND.cs @@ -19,12 +19,12 @@ public unsafe partial struct D3D12_FEATURE_DATA_QUERY_META_COMMAND public void* pQueryInputData; [NativeTypeName("SIZE_T")] - public UIntPtr QueryInputDataSizeInBytes; + public nuint QueryInputDataSizeInBytes; [NativeTypeName("void *")] public void* pQueryOutputData; [NativeTypeName("SIZE_T")] - public UIntPtr QueryOutputDataSizeInBytes; + public nuint QueryOutputDataSizeInBytes; } } diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_INDIRECT_ARGUMENT_DESC.cs b/sources/Interop/D3D12/um/d3d12/D3D12_INDIRECT_ARGUMENT_DESC.cs index f53c3dd090..690b6ad37b 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_INDIRECT_ARGUMENT_DESC.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_INDIRECT_ARGUMENT_DESC.cs @@ -11,30 +11,30 @@ public partial struct D3D12_INDIRECT_ARGUMENT_DESC { public D3D12_INDIRECT_ARGUMENT_TYPE Type; - [NativeTypeName("D3D12_INDIRECT_ARGUMENT_DESC::(anonymous union at um/d3d12.h:3840:5)")] + [NativeTypeName("D3D12_INDIRECT_ARGUMENT_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3840:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] public partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("struct (anonymous struct at um/d3d12.h:3842:9)")] + [NativeTypeName("struct (anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3842:9)")] public _VertexBuffer_e__Struct VertexBuffer; [FieldOffset(0)] - [NativeTypeName("struct (anonymous struct at um/d3d12.h:3846:9)")] + [NativeTypeName("struct (anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3846:9)")] public _Constant_e__Struct Constant; [FieldOffset(0)] - [NativeTypeName("struct (anonymous struct at um/d3d12.h:3852:9)")] + [NativeTypeName("struct (anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3852:9)")] public _ConstantBufferView_e__Struct ConstantBufferView; [FieldOffset(0)] - [NativeTypeName("struct (anonymous struct at um/d3d12.h:3856:9)")] + [NativeTypeName("struct (anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3856:9)")] public _ShaderResourceView_e__Struct ShaderResourceView; [FieldOffset(0)] - [NativeTypeName("struct (anonymous struct at um/d3d12.h:3860:9)")] + [NativeTypeName("struct (anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3860:9)")] public _UnorderedAccessView_e__Struct UnorderedAccessView; public partial struct _VertexBuffer_e__Struct diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_MEMCPY_DEST.cs b/sources/Interop/D3D12/um/d3d12/D3D12_MEMCPY_DEST.cs index 066250436e..d01b9a4206 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_MEMCPY_DEST.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_MEMCPY_DEST.cs @@ -3,8 +3,6 @@ // Ported from um/d3d12.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct D3D12_MEMCPY_DEST @@ -13,9 +11,9 @@ public unsafe partial struct D3D12_MEMCPY_DEST public void* pData; [NativeTypeName("SIZE_T")] - public UIntPtr RowPitch; + public nuint RowPitch; [NativeTypeName("SIZE_T")] - public UIntPtr SlicePitch; + public nuint SlicePitch; } } diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_PIPELINE_STATE_STREAM_DESC.cs b/sources/Interop/D3D12/um/d3d12/D3D12_PIPELINE_STATE_STREAM_DESC.cs index 09e1081fc0..7267427828 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_PIPELINE_STATE_STREAM_DESC.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_PIPELINE_STATE_STREAM_DESC.cs @@ -3,14 +3,12 @@ // Ported from um/d3d12.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct D3D12_PIPELINE_STATE_STREAM_DESC { [NativeTypeName("SIZE_T")] - public UIntPtr SizeInBytes; + public nuint SizeInBytes; [NativeTypeName("void *")] public void* pPipelineStateSubobjectStream; diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_RANGE.cs b/sources/Interop/D3D12/um/d3d12/D3D12_RANGE.cs index d328746b17..9dea24e56b 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_RANGE.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_RANGE.cs @@ -3,16 +3,14 @@ // Ported from um/d3d12.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct D3D12_RANGE { [NativeTypeName("SIZE_T")] - public UIntPtr Begin; + public nuint Begin; [NativeTypeName("SIZE_T")] - public UIntPtr End; + public nuint End; } } diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_RAYTRACING_GEOMETRY_DESC.cs b/sources/Interop/D3D12/um/d3d12/D3D12_RAYTRACING_GEOMETRY_DESC.cs index f29ab9c5ff..21765337c4 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_RAYTRACING_GEOMETRY_DESC.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_RAYTRACING_GEOMETRY_DESC.cs @@ -13,7 +13,7 @@ public partial struct D3D12_RAYTRACING_GEOMETRY_DESC public D3D12_RAYTRACING_GEOMETRY_FLAGS Flags; - [NativeTypeName("D3D12_RAYTRACING_GEOMETRY_DESC::(anonymous union at um/d3d12.h:12356:5)")] + [NativeTypeName("D3D12_RAYTRACING_GEOMETRY_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:12356:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS.cs b/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS.cs index a9eb6e496b..577164c772 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS.cs @@ -11,7 +11,7 @@ public partial struct D3D12_RENDER_PASS_BEGINNING_ACCESS { public D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE Type; - [NativeTypeName("D3D12_RENDER_PASS_BEGINNING_ACCESS::(anonymous union at um/d3d12.h:15178:5)")] + [NativeTypeName("D3D12_RENDER_PASS_BEGINNING_ACCESS::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:15178:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS.cs b/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS.cs index 608c20ed55..1c504093fe 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS.cs @@ -11,7 +11,7 @@ public partial struct D3D12_RENDER_PASS_ENDING_ACCESS { public D3D12_RENDER_PASS_ENDING_ACCESS_TYPE Type; - [NativeTypeName("D3D12_RENDER_PASS_ENDING_ACCESS::(anonymous union at um/d3d12.h:15216:5)")] + [NativeTypeName("D3D12_RENDER_PASS_ENDING_ACCESS::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:15216:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_TARGET_VIEW_DESC.cs b/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_TARGET_VIEW_DESC.cs index b5bb0894ac..45f9d42eec 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_TARGET_VIEW_DESC.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_RENDER_TARGET_VIEW_DESC.cs @@ -13,7 +13,7 @@ public partial struct D3D12_RENDER_TARGET_VIEW_DESC public D3D12_RTV_DIMENSION ViewDimension; - [NativeTypeName("D3D12_RENDER_TARGET_VIEW_DESC::(anonymous union at um/d3d12.h:3154:5)")] + [NativeTypeName("D3D12_RENDER_TARGET_VIEW_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3154:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_RESOURCE_BARRIER.cs b/sources/Interop/D3D12/um/d3d12/D3D12_RESOURCE_BARRIER.cs index 3fd1866e13..6d28a8b6f4 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_RESOURCE_BARRIER.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_RESOURCE_BARRIER.cs @@ -13,7 +13,7 @@ public partial struct D3D12_RESOURCE_BARRIER public D3D12_RESOURCE_BARRIER_FLAGS Flags; - [NativeTypeName("D3D12_RESOURCE_BARRIER::(anonymous union at um/d3d12.h:2651:5)")] + [NativeTypeName("D3D12_RESOURCE_BARRIER::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:2651:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_ROOT_PARAMETER.cs b/sources/Interop/D3D12/um/d3d12/D3D12_ROOT_PARAMETER.cs index f69edf0728..8d0c725406 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_ROOT_PARAMETER.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_ROOT_PARAMETER.cs @@ -11,7 +11,7 @@ public partial struct D3D12_ROOT_PARAMETER { public D3D12_ROOT_PARAMETER_TYPE ParameterType; - [NativeTypeName("D3D12_ROOT_PARAMETER::(anonymous union at um/d3d12.h:3344:5)")] + [NativeTypeName("D3D12_ROOT_PARAMETER::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3344:5)")] public _Anonymous_e__Union Anonymous; public D3D12_SHADER_VISIBILITY ShaderVisibility; diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_ROOT_PARAMETER1.cs b/sources/Interop/D3D12/um/d3d12/D3D12_ROOT_PARAMETER1.cs index 0bb8d67ed0..37883a7c30 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_ROOT_PARAMETER1.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_ROOT_PARAMETER1.cs @@ -11,7 +11,7 @@ public partial struct D3D12_ROOT_PARAMETER1 { public D3D12_ROOT_PARAMETER_TYPE ParameterType; - [NativeTypeName("D3D12_ROOT_PARAMETER1::(anonymous union at um/d3d12.h:3450:5)")] + [NativeTypeName("D3D12_ROOT_PARAMETER1::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3450:5)")] public _Anonymous_e__Union Anonymous; public D3D12_SHADER_VISIBILITY ShaderVisibility; diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_SHADER_BYTECODE.cs b/sources/Interop/D3D12/um/d3d12/D3D12_SHADER_BYTECODE.cs index 1aebb6abc6..4a94ea82c7 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_SHADER_BYTECODE.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_SHADER_BYTECODE.cs @@ -3,8 +3,6 @@ // Ported from um/d3d12.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct D3D12_SHADER_BYTECODE @@ -13,6 +11,6 @@ public unsafe partial struct D3D12_SHADER_BYTECODE public void* pShaderBytecode; [NativeTypeName("SIZE_T")] - public UIntPtr BytecodeLength; + public nuint BytecodeLength; } } diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESC.cs b/sources/Interop/D3D12/um/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESC.cs index b84f3ddd09..747a15e065 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESC.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESC.cs @@ -16,7 +16,7 @@ public partial struct D3D12_SHADER_RESOURCE_VIEW_DESC [NativeTypeName("UINT")] public uint Shader4ComponentMapping; - [NativeTypeName("D3D12_SHADER_RESOURCE_VIEW_DESC::(anonymous union at um/d3d12.h:2860:5)")] + [NativeTypeName("D3D12_SHADER_RESOURCE_VIEW_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:2860:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_SUBRESOURCE_DATA.cs b/sources/Interop/D3D12/um/d3d12/D3D12_SUBRESOURCE_DATA.cs index acd0edd06f..8410eba97c 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_SUBRESOURCE_DATA.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_SUBRESOURCE_DATA.cs @@ -3,8 +3,6 @@ // Ported from um/d3d12.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct D3D12_SUBRESOURCE_DATA @@ -13,9 +11,9 @@ public unsafe partial struct D3D12_SUBRESOURCE_DATA public void* pData; [NativeTypeName("LONG_PTR")] - public IntPtr RowPitch; + public nint RowPitch; [NativeTypeName("LONG_PTR")] - public IntPtr SlicePitch; + public nint SlicePitch; } } diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_TEXTURE_COPY_LOCATION.cs b/sources/Interop/D3D12/um/d3d12/D3D12_TEXTURE_COPY_LOCATION.cs index d283ee4929..74898950e0 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_TEXTURE_COPY_LOCATION.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_TEXTURE_COPY_LOCATION.cs @@ -14,7 +14,7 @@ public unsafe partial struct D3D12_TEXTURE_COPY_LOCATION public D3D12_TEXTURE_COPY_TYPE Type; - [NativeTypeName("D3D12_TEXTURE_COPY_LOCATION::(anonymous union at um/d3d12.h:2685:5)")] + [NativeTypeName("D3D12_TEXTURE_COPY_LOCATION::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:2685:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESC.cs b/sources/Interop/D3D12/um/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESC.cs index de70edabb1..836ef092dd 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESC.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESC.cs @@ -13,7 +13,7 @@ public partial struct D3D12_UNORDERED_ACCESS_VIEW_DESC public D3D12_UAV_DIMENSION ViewDimension; - [NativeTypeName("D3D12_UNORDERED_ACCESS_VIEW_DESC::(anonymous union at um/d3d12.h:3075:5)")] + [NativeTypeName("D3D12_UNORDERED_ACCESS_VIEW_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3075:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA.cs b/sources/Interop/D3D12/um/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA.cs index 8d3cbe1bfb..1b6aa8017a 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA.cs @@ -11,7 +11,7 @@ public partial struct D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA { public D3D12_DRED_VERSION Version; - [NativeTypeName("D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA::(anonymous union at um/d3d12.h:13277:5)")] + [NativeTypeName("D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:13277:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESC.cs b/sources/Interop/D3D12/um/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESC.cs index b41607fd84..2e50bc5767 100644 --- a/sources/Interop/D3D12/um/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESC.cs +++ b/sources/Interop/D3D12/um/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESC.cs @@ -11,7 +11,7 @@ public partial struct D3D12_VERSIONED_ROOT_SIGNATURE_DESC { public D3D_ROOT_SIGNATURE_VERSION Version; - [NativeTypeName("D3D12_VERSIONED_ROOT_SIGNATURE_DESC::(anonymous union at um/d3d12.h:3471:5)")] + [NativeTypeName("D3D12_VERSIONED_ROOT_SIGNATURE_DESC::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/d3d12.h:3471:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/D3D12/um/d3d12/ID3D12Device.cs b/sources/Interop/D3D12/um/d3d12/ID3D12Device.cs index 472a3fc3cc..8776db7701 100644 --- a/sources/Interop/D3D12/um/d3d12/ID3D12Device.cs +++ b/sources/Interop/D3D12/um/d3d12/ID3D12Device.cs @@ -80,7 +80,7 @@ public unsafe partial struct ID3D12Device [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateRootSignature(ID3D12Device* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); + public delegate int _CreateRootSignature(ID3D12Device* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _CreateConstantBufferView(ID3D12Device* pThis, [NativeTypeName("const D3D12_CONSTANT_BUFFER_VIEW_DESC *")] D3D12_CONSTANT_BUFFER_VIEW_DESC* pDesc, D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); @@ -274,7 +274,7 @@ public uint GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE Descript } [return: NativeTypeName("HRESULT")] - public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) + public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) { return Marshal.GetDelegateForFunctionPointer<_CreateRootSignature>(lpVtbl->CreateRootSignature)((ID3D12Device*)Unsafe.AsPointer(ref this), nodeMask, pBlobWithRootSignature, blobLengthInBytes, riid, ppvRootSignature); } diff --git a/sources/Interop/D3D12/um/d3d12/ID3D12Device1.cs b/sources/Interop/D3D12/um/d3d12/ID3D12Device1.cs index 29fa56f2bf..5632074880 100644 --- a/sources/Interop/D3D12/um/d3d12/ID3D12Device1.cs +++ b/sources/Interop/D3D12/um/d3d12/ID3D12Device1.cs @@ -80,7 +80,7 @@ public unsafe partial struct ID3D12Device1 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateRootSignature(ID3D12Device1* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); + public delegate int _CreateRootSignature(ID3D12Device1* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _CreateConstantBufferView(ID3D12Device1* pThis, [NativeTypeName("const D3D12_CONSTANT_BUFFER_VIEW_DESC *")] D3D12_CONSTANT_BUFFER_VIEW_DESC* pDesc, D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); @@ -179,7 +179,7 @@ public unsafe partial struct ID3D12Device1 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePipelineLibrary(ID3D12Device1* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); + public delegate int _CreatePipelineLibrary(ID3D12Device1* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -286,7 +286,7 @@ public uint GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE Descript } [return: NativeTypeName("HRESULT")] - public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) + public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) { return Marshal.GetDelegateForFunctionPointer<_CreateRootSignature>(lpVtbl->CreateRootSignature)((ID3D12Device1*)Unsafe.AsPointer(ref this), nodeMask, pBlobWithRootSignature, blobLengthInBytes, riid, ppvRootSignature); } @@ -444,7 +444,7 @@ public LUID GetAdapterLuid() } [return: NativeTypeName("HRESULT")] - public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) + public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) { return Marshal.GetDelegateForFunctionPointer<_CreatePipelineLibrary>(lpVtbl->CreatePipelineLibrary)((ID3D12Device1*)Unsafe.AsPointer(ref this), pLibraryBlob, BlobLength, riid, ppPipelineLibrary); } diff --git a/sources/Interop/D3D12/um/d3d12/ID3D12Device2.cs b/sources/Interop/D3D12/um/d3d12/ID3D12Device2.cs index d7dd777d51..429dbb779b 100644 --- a/sources/Interop/D3D12/um/d3d12/ID3D12Device2.cs +++ b/sources/Interop/D3D12/um/d3d12/ID3D12Device2.cs @@ -80,7 +80,7 @@ public unsafe partial struct ID3D12Device2 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateRootSignature(ID3D12Device2* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); + public delegate int _CreateRootSignature(ID3D12Device2* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _CreateConstantBufferView(ID3D12Device2* pThis, [NativeTypeName("const D3D12_CONSTANT_BUFFER_VIEW_DESC *")] D3D12_CONSTANT_BUFFER_VIEW_DESC* pDesc, D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); @@ -179,7 +179,7 @@ public unsafe partial struct ID3D12Device2 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePipelineLibrary(ID3D12Device2* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); + public delegate int _CreatePipelineLibrary(ID3D12Device2* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -290,7 +290,7 @@ public uint GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE Descript } [return: NativeTypeName("HRESULT")] - public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) + public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) { return Marshal.GetDelegateForFunctionPointer<_CreateRootSignature>(lpVtbl->CreateRootSignature)((ID3D12Device2*)Unsafe.AsPointer(ref this), nodeMask, pBlobWithRootSignature, blobLengthInBytes, riid, ppvRootSignature); } @@ -448,7 +448,7 @@ public LUID GetAdapterLuid() } [return: NativeTypeName("HRESULT")] - public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) + public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) { return Marshal.GetDelegateForFunctionPointer<_CreatePipelineLibrary>(lpVtbl->CreatePipelineLibrary)((ID3D12Device2*)Unsafe.AsPointer(ref this), pLibraryBlob, BlobLength, riid, ppPipelineLibrary); } diff --git a/sources/Interop/D3D12/um/d3d12/ID3D12Device3.cs b/sources/Interop/D3D12/um/d3d12/ID3D12Device3.cs index 9d9fd2539d..3b1de54583 100644 --- a/sources/Interop/D3D12/um/d3d12/ID3D12Device3.cs +++ b/sources/Interop/D3D12/um/d3d12/ID3D12Device3.cs @@ -80,7 +80,7 @@ public unsafe partial struct ID3D12Device3 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateRootSignature(ID3D12Device3* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); + public delegate int _CreateRootSignature(ID3D12Device3* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _CreateConstantBufferView(ID3D12Device3* pThis, [NativeTypeName("const D3D12_CONSTANT_BUFFER_VIEW_DESC *")] D3D12_CONSTANT_BUFFER_VIEW_DESC* pDesc, D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); @@ -179,7 +179,7 @@ public unsafe partial struct ID3D12Device3 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePipelineLibrary(ID3D12Device3* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); + public delegate int _CreatePipelineLibrary(ID3D12Device3* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -302,7 +302,7 @@ public uint GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE Descript } [return: NativeTypeName("HRESULT")] - public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) + public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) { return Marshal.GetDelegateForFunctionPointer<_CreateRootSignature>(lpVtbl->CreateRootSignature)((ID3D12Device3*)Unsafe.AsPointer(ref this), nodeMask, pBlobWithRootSignature, blobLengthInBytes, riid, ppvRootSignature); } @@ -460,7 +460,7 @@ public LUID GetAdapterLuid() } [return: NativeTypeName("HRESULT")] - public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) + public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) { return Marshal.GetDelegateForFunctionPointer<_CreatePipelineLibrary>(lpVtbl->CreatePipelineLibrary)((ID3D12Device3*)Unsafe.AsPointer(ref this), pLibraryBlob, BlobLength, riid, ppPipelineLibrary); } diff --git a/sources/Interop/D3D12/um/d3d12/ID3D12Device4.cs b/sources/Interop/D3D12/um/d3d12/ID3D12Device4.cs index 6fc5bf7f86..faccc252b0 100644 --- a/sources/Interop/D3D12/um/d3d12/ID3D12Device4.cs +++ b/sources/Interop/D3D12/um/d3d12/ID3D12Device4.cs @@ -80,7 +80,7 @@ public unsafe partial struct ID3D12Device4 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateRootSignature(ID3D12Device4* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); + public delegate int _CreateRootSignature(ID3D12Device4* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _CreateConstantBufferView(ID3D12Device4* pThis, [NativeTypeName("const D3D12_CONSTANT_BUFFER_VIEW_DESC *")] D3D12_CONSTANT_BUFFER_VIEW_DESC* pDesc, D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); @@ -179,7 +179,7 @@ public unsafe partial struct ID3D12Device4 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePipelineLibrary(ID3D12Device4* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); + public delegate int _CreatePipelineLibrary(ID3D12Device4* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -325,7 +325,7 @@ public uint GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE Descript } [return: NativeTypeName("HRESULT")] - public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) + public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) { return Marshal.GetDelegateForFunctionPointer<_CreateRootSignature>(lpVtbl->CreateRootSignature)((ID3D12Device4*)Unsafe.AsPointer(ref this), nodeMask, pBlobWithRootSignature, blobLengthInBytes, riid, ppvRootSignature); } @@ -483,7 +483,7 @@ public LUID GetAdapterLuid() } [return: NativeTypeName("HRESULT")] - public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) + public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) { return Marshal.GetDelegateForFunctionPointer<_CreatePipelineLibrary>(lpVtbl->CreatePipelineLibrary)((ID3D12Device4*)Unsafe.AsPointer(ref this), pLibraryBlob, BlobLength, riid, ppPipelineLibrary); } diff --git a/sources/Interop/D3D12/um/d3d12/ID3D12Device5.cs b/sources/Interop/D3D12/um/d3d12/ID3D12Device5.cs index b6f542c6f8..97b34819df 100644 --- a/sources/Interop/D3D12/um/d3d12/ID3D12Device5.cs +++ b/sources/Interop/D3D12/um/d3d12/ID3D12Device5.cs @@ -80,7 +80,7 @@ public unsafe partial struct ID3D12Device5 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateRootSignature(ID3D12Device5* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); + public delegate int _CreateRootSignature(ID3D12Device5* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _CreateConstantBufferView(ID3D12Device5* pThis, [NativeTypeName("const D3D12_CONSTANT_BUFFER_VIEW_DESC *")] D3D12_CONSTANT_BUFFER_VIEW_DESC* pDesc, D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); @@ -179,7 +179,7 @@ public unsafe partial struct ID3D12Device5 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePipelineLibrary(ID3D12Device5* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); + public delegate int _CreatePipelineLibrary(ID3D12Device5* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -245,7 +245,7 @@ public unsafe partial struct ID3D12Device5 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateMetaCommand(ID3D12Device5* pThis, [NativeTypeName("const GUID &")] Guid* CommandId, [NativeTypeName("UINT")] uint NodeMask, [NativeTypeName("const void *")] void* pCreationParametersData, [NativeTypeName("SIZE_T")] UIntPtr CreationParametersDataSizeInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppMetaCommand); + public delegate int _CreateMetaCommand(ID3D12Device5* pThis, [NativeTypeName("const GUID &")] Guid* CommandId, [NativeTypeName("UINT")] uint NodeMask, [NativeTypeName("const void *")] void* pCreationParametersData, [NativeTypeName("SIZE_T")] nuint CreationParametersDataSizeInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppMetaCommand); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -354,7 +354,7 @@ public uint GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE Descript } [return: NativeTypeName("HRESULT")] - public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) + public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) { return Marshal.GetDelegateForFunctionPointer<_CreateRootSignature>(lpVtbl->CreateRootSignature)((ID3D12Device5*)Unsafe.AsPointer(ref this), nodeMask, pBlobWithRootSignature, blobLengthInBytes, riid, ppvRootSignature); } @@ -512,7 +512,7 @@ public LUID GetAdapterLuid() } [return: NativeTypeName("HRESULT")] - public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) + public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) { return Marshal.GetDelegateForFunctionPointer<_CreatePipelineLibrary>(lpVtbl->CreatePipelineLibrary)((ID3D12Device5*)Unsafe.AsPointer(ref this), pLibraryBlob, BlobLength, riid, ppPipelineLibrary); } @@ -613,7 +613,7 @@ public int EnumerateMetaCommandParameters([NativeTypeName("const GUID &")] Guid* } [return: NativeTypeName("HRESULT")] - public int CreateMetaCommand([NativeTypeName("const GUID &")] Guid* CommandId, [NativeTypeName("UINT")] uint NodeMask, [NativeTypeName("const void *")] void* pCreationParametersData, [NativeTypeName("SIZE_T")] UIntPtr CreationParametersDataSizeInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppMetaCommand) + public int CreateMetaCommand([NativeTypeName("const GUID &")] Guid* CommandId, [NativeTypeName("UINT")] uint NodeMask, [NativeTypeName("const void *")] void* pCreationParametersData, [NativeTypeName("SIZE_T")] nuint CreationParametersDataSizeInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppMetaCommand) { return Marshal.GetDelegateForFunctionPointer<_CreateMetaCommand>(lpVtbl->CreateMetaCommand)((ID3D12Device5*)Unsafe.AsPointer(ref this), CommandId, NodeMask, pCreationParametersData, CreationParametersDataSizeInBytes, riid, ppMetaCommand); } diff --git a/sources/Interop/D3D12/um/d3d12/ID3D12Device6.cs b/sources/Interop/D3D12/um/d3d12/ID3D12Device6.cs index 66cfbe8f82..1bcc9fcf20 100644 --- a/sources/Interop/D3D12/um/d3d12/ID3D12Device6.cs +++ b/sources/Interop/D3D12/um/d3d12/ID3D12Device6.cs @@ -80,7 +80,7 @@ public unsafe partial struct ID3D12Device6 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateRootSignature(ID3D12Device6* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); + public delegate int _CreateRootSignature(ID3D12Device6* pThis, [NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _CreateConstantBufferView(ID3D12Device6* pThis, [NativeTypeName("const D3D12_CONSTANT_BUFFER_VIEW_DESC *")] D3D12_CONSTANT_BUFFER_VIEW_DESC* pDesc, D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); @@ -179,7 +179,7 @@ public unsafe partial struct ID3D12Device6 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreatePipelineLibrary(ID3D12Device6* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); + public delegate int _CreatePipelineLibrary(ID3D12Device6* pThis, [NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -245,7 +245,7 @@ public unsafe partial struct ID3D12Device6 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateMetaCommand(ID3D12Device6* pThis, [NativeTypeName("const GUID &")] Guid* CommandId, [NativeTypeName("UINT")] uint NodeMask, [NativeTypeName("const void *")] void* pCreationParametersData, [NativeTypeName("SIZE_T")] UIntPtr CreationParametersDataSizeInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppMetaCommand); + public delegate int _CreateMetaCommand(ID3D12Device6* pThis, [NativeTypeName("const GUID &")] Guid* CommandId, [NativeTypeName("UINT")] uint NodeMask, [NativeTypeName("const void *")] void* pCreationParametersData, [NativeTypeName("SIZE_T")] nuint CreationParametersDataSizeInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppMetaCommand); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -358,7 +358,7 @@ public uint GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE Descript } [return: NativeTypeName("HRESULT")] - public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] UIntPtr blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) + public int CreateRootSignature([NativeTypeName("UINT")] uint nodeMask, [NativeTypeName("const void *")] void* pBlobWithRootSignature, [NativeTypeName("SIZE_T")] nuint blobLengthInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvRootSignature) { return Marshal.GetDelegateForFunctionPointer<_CreateRootSignature>(lpVtbl->CreateRootSignature)((ID3D12Device6*)Unsafe.AsPointer(ref this), nodeMask, pBlobWithRootSignature, blobLengthInBytes, riid, ppvRootSignature); } @@ -516,7 +516,7 @@ public LUID GetAdapterLuid() } [return: NativeTypeName("HRESULT")] - public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] UIntPtr BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) + public int CreatePipelineLibrary([NativeTypeName("const void *")] void* pLibraryBlob, [NativeTypeName("SIZE_T")] nuint BlobLength, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppPipelineLibrary) { return Marshal.GetDelegateForFunctionPointer<_CreatePipelineLibrary>(lpVtbl->CreatePipelineLibrary)((ID3D12Device6*)Unsafe.AsPointer(ref this), pLibraryBlob, BlobLength, riid, ppPipelineLibrary); } @@ -617,7 +617,7 @@ public int EnumerateMetaCommandParameters([NativeTypeName("const GUID &")] Guid* } [return: NativeTypeName("HRESULT")] - public int CreateMetaCommand([NativeTypeName("const GUID &")] Guid* CommandId, [NativeTypeName("UINT")] uint NodeMask, [NativeTypeName("const void *")] void* pCreationParametersData, [NativeTypeName("SIZE_T")] UIntPtr CreationParametersDataSizeInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppMetaCommand) + public int CreateMetaCommand([NativeTypeName("const GUID &")] Guid* CommandId, [NativeTypeName("UINT")] uint NodeMask, [NativeTypeName("const void *")] void* pCreationParametersData, [NativeTypeName("SIZE_T")] nuint CreationParametersDataSizeInBytes, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppMetaCommand) { return Marshal.GetDelegateForFunctionPointer<_CreateMetaCommand>(lpVtbl->CreateMetaCommand)((ID3D12Device6*)Unsafe.AsPointer(ref this), CommandId, NodeMask, pCreationParametersData, CreationParametersDataSizeInBytes, riid, ppMetaCommand); } diff --git a/sources/Interop/D3D12/um/d3d12/ID3D12GraphicsCommandList4.cs b/sources/Interop/D3D12/um/d3d12/ID3D12GraphicsCommandList4.cs index 485cf494d7..884b48c9c9 100644 --- a/sources/Interop/D3D12/um/d3d12/ID3D12GraphicsCommandList4.cs +++ b/sources/Interop/D3D12/um/d3d12/ID3D12GraphicsCommandList4.cs @@ -235,10 +235,10 @@ public unsafe partial struct ID3D12GraphicsCommandList4 public delegate void _EndRenderPass(ID3D12GraphicsCommandList4* pThis); [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate void _InitializeMetaCommand(ID3D12GraphicsCommandList4* pThis, [NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pInitializationParametersData, [NativeTypeName("SIZE_T")] UIntPtr InitializationParametersDataSizeInBytes); + public delegate void _InitializeMetaCommand(ID3D12GraphicsCommandList4* pThis, [NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pInitializationParametersData, [NativeTypeName("SIZE_T")] nuint InitializationParametersDataSizeInBytes); [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate void _ExecuteMetaCommand(ID3D12GraphicsCommandList4* pThis, [NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pExecutionParametersData, [NativeTypeName("SIZE_T")] UIntPtr ExecutionParametersDataSizeInBytes); + public delegate void _ExecuteMetaCommand(ID3D12GraphicsCommandList4* pThis, [NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pExecutionParametersData, [NativeTypeName("SIZE_T")] nuint ExecutionParametersDataSizeInBytes); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _BuildRaytracingAccelerationStructure(ID3D12GraphicsCommandList4* pThis, [NativeTypeName("const D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESC *")] D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESC* pDesc, [NativeTypeName("UINT")] uint NumPostbuildInfoDescs, [NativeTypeName("const D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESC *")] D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESC* pPostbuildInfoDescs); @@ -615,12 +615,12 @@ public void EndRenderPass() Marshal.GetDelegateForFunctionPointer<_EndRenderPass>(lpVtbl->EndRenderPass)((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this)); } - public void InitializeMetaCommand([NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pInitializationParametersData, [NativeTypeName("SIZE_T")] UIntPtr InitializationParametersDataSizeInBytes) + public void InitializeMetaCommand([NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pInitializationParametersData, [NativeTypeName("SIZE_T")] nuint InitializationParametersDataSizeInBytes) { Marshal.GetDelegateForFunctionPointer<_InitializeMetaCommand>(lpVtbl->InitializeMetaCommand)((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), pMetaCommand, pInitializationParametersData, InitializationParametersDataSizeInBytes); } - public void ExecuteMetaCommand([NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pExecutionParametersData, [NativeTypeName("SIZE_T")] UIntPtr ExecutionParametersDataSizeInBytes) + public void ExecuteMetaCommand([NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pExecutionParametersData, [NativeTypeName("SIZE_T")] nuint ExecutionParametersDataSizeInBytes) { Marshal.GetDelegateForFunctionPointer<_ExecuteMetaCommand>(lpVtbl->ExecuteMetaCommand)((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), pMetaCommand, pExecutionParametersData, ExecutionParametersDataSizeInBytes); } diff --git a/sources/Interop/D3D12/um/d3d12/ID3D12GraphicsCommandList5.cs b/sources/Interop/D3D12/um/d3d12/ID3D12GraphicsCommandList5.cs index 4087853b88..7270705c3a 100644 --- a/sources/Interop/D3D12/um/d3d12/ID3D12GraphicsCommandList5.cs +++ b/sources/Interop/D3D12/um/d3d12/ID3D12GraphicsCommandList5.cs @@ -235,10 +235,10 @@ public unsafe partial struct ID3D12GraphicsCommandList5 public delegate void _EndRenderPass(ID3D12GraphicsCommandList5* pThis); [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate void _InitializeMetaCommand(ID3D12GraphicsCommandList5* pThis, [NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pInitializationParametersData, [NativeTypeName("SIZE_T")] UIntPtr InitializationParametersDataSizeInBytes); + public delegate void _InitializeMetaCommand(ID3D12GraphicsCommandList5* pThis, [NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pInitializationParametersData, [NativeTypeName("SIZE_T")] nuint InitializationParametersDataSizeInBytes); [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate void _ExecuteMetaCommand(ID3D12GraphicsCommandList5* pThis, [NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pExecutionParametersData, [NativeTypeName("SIZE_T")] UIntPtr ExecutionParametersDataSizeInBytes); + public delegate void _ExecuteMetaCommand(ID3D12GraphicsCommandList5* pThis, [NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pExecutionParametersData, [NativeTypeName("SIZE_T")] nuint ExecutionParametersDataSizeInBytes); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _BuildRaytracingAccelerationStructure(ID3D12GraphicsCommandList5* pThis, [NativeTypeName("const D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESC *")] D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESC* pDesc, [NativeTypeName("UINT")] uint NumPostbuildInfoDescs, [NativeTypeName("const D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESC *")] D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESC* pPostbuildInfoDescs); @@ -621,12 +621,12 @@ public void EndRenderPass() Marshal.GetDelegateForFunctionPointer<_EndRenderPass>(lpVtbl->EndRenderPass)((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this)); } - public void InitializeMetaCommand([NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pInitializationParametersData, [NativeTypeName("SIZE_T")] UIntPtr InitializationParametersDataSizeInBytes) + public void InitializeMetaCommand([NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pInitializationParametersData, [NativeTypeName("SIZE_T")] nuint InitializationParametersDataSizeInBytes) { Marshal.GetDelegateForFunctionPointer<_InitializeMetaCommand>(lpVtbl->InitializeMetaCommand)((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), pMetaCommand, pInitializationParametersData, InitializationParametersDataSizeInBytes); } - public void ExecuteMetaCommand([NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pExecutionParametersData, [NativeTypeName("SIZE_T")] UIntPtr ExecutionParametersDataSizeInBytes) + public void ExecuteMetaCommand([NativeTypeName("ID3D12MetaCommand *")] ID3D12MetaCommand* pMetaCommand, [NativeTypeName("const void *")] void* pExecutionParametersData, [NativeTypeName("SIZE_T")] nuint ExecutionParametersDataSizeInBytes) { Marshal.GetDelegateForFunctionPointer<_ExecuteMetaCommand>(lpVtbl->ExecuteMetaCommand)((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), pMetaCommand, pExecutionParametersData, ExecutionParametersDataSizeInBytes); } diff --git a/sources/Interop/D3D12/um/d3d12/ID3D12PipelineLibrary.cs b/sources/Interop/D3D12/um/d3d12/ID3D12PipelineLibrary.cs index 2eb10d225e..eaf32ca58a 100644 --- a/sources/Interop/D3D12/um/d3d12/ID3D12PipelineLibrary.cs +++ b/sources/Interop/D3D12/um/d3d12/ID3D12PipelineLibrary.cs @@ -60,11 +60,11 @@ public unsafe partial struct ID3D12PipelineLibrary [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("SIZE_T")] - public delegate UIntPtr _GetSerializedSize(ID3D12PipelineLibrary* pThis); + public delegate nuint _GetSerializedSize(ID3D12PipelineLibrary* pThis); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _Serialize(ID3D12PipelineLibrary* pThis, [NativeTypeName("void *")] void* pData, [NativeTypeName("SIZE_T")] UIntPtr DataSizeInBytes); + public delegate int _Serialize(ID3D12PipelineLibrary* pThis, [NativeTypeName("void *")] void* pData, [NativeTypeName("SIZE_T")] nuint DataSizeInBytes); [return: NativeTypeName("HRESULT")] public int QueryInterface([NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvObject) @@ -133,13 +133,13 @@ public int LoadComputePipeline([NativeTypeName("LPCWSTR")] ushort* pName, [Nativ } [return: NativeTypeName("SIZE_T")] - public UIntPtr GetSerializedSize() + public nuint GetSerializedSize() { return Marshal.GetDelegateForFunctionPointer<_GetSerializedSize>(lpVtbl->GetSerializedSize)((ID3D12PipelineLibrary*)Unsafe.AsPointer(ref this)); } [return: NativeTypeName("HRESULT")] - public int Serialize([NativeTypeName("void *")] void* pData, [NativeTypeName("SIZE_T")] UIntPtr DataSizeInBytes) + public int Serialize([NativeTypeName("void *")] void* pData, [NativeTypeName("SIZE_T")] nuint DataSizeInBytes) { return Marshal.GetDelegateForFunctionPointer<_Serialize>(lpVtbl->Serialize)((ID3D12PipelineLibrary*)Unsafe.AsPointer(ref this), pData, DataSizeInBytes); } diff --git a/sources/Interop/D3D12/um/d3d12/ID3D12PipelineLibrary1.cs b/sources/Interop/D3D12/um/d3d12/ID3D12PipelineLibrary1.cs index 4307333838..17ccdff30b 100644 --- a/sources/Interop/D3D12/um/d3d12/ID3D12PipelineLibrary1.cs +++ b/sources/Interop/D3D12/um/d3d12/ID3D12PipelineLibrary1.cs @@ -60,11 +60,11 @@ public unsafe partial struct ID3D12PipelineLibrary1 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("SIZE_T")] - public delegate UIntPtr _GetSerializedSize(ID3D12PipelineLibrary1* pThis); + public delegate nuint _GetSerializedSize(ID3D12PipelineLibrary1* pThis); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _Serialize(ID3D12PipelineLibrary1* pThis, [NativeTypeName("void *")] void* pData, [NativeTypeName("SIZE_T")] UIntPtr DataSizeInBytes); + public delegate int _Serialize(ID3D12PipelineLibrary1* pThis, [NativeTypeName("void *")] void* pData, [NativeTypeName("SIZE_T")] nuint DataSizeInBytes); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -137,13 +137,13 @@ public int LoadComputePipeline([NativeTypeName("LPCWSTR")] ushort* pName, [Nativ } [return: NativeTypeName("SIZE_T")] - public UIntPtr GetSerializedSize() + public nuint GetSerializedSize() { return Marshal.GetDelegateForFunctionPointer<_GetSerializedSize>(lpVtbl->GetSerializedSize)((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this)); } [return: NativeTypeName("HRESULT")] - public int Serialize([NativeTypeName("void *")] void* pData, [NativeTypeName("SIZE_T")] UIntPtr DataSizeInBytes) + public int Serialize([NativeTypeName("void *")] void* pData, [NativeTypeName("SIZE_T")] nuint DataSizeInBytes) { return Marshal.GetDelegateForFunctionPointer<_Serialize>(lpVtbl->Serialize)((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this), pData, DataSizeInBytes); } diff --git a/sources/Interop/D3D12/um/d3d12/PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER.cs b/sources/Interop/D3D12/um/d3d12/PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER.cs index e06f1adb7e..78432f168d 100644 --- a/sources/Interop/D3D12/um/d3d12/PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER.cs +++ b/sources/Interop/D3D12/um/d3d12/PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public unsafe delegate int PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSizeInBytes, [NativeTypeName("const IID &")] Guid* pRootSignatureDeserializerInterface, [NativeTypeName("void **")] void** ppRootSignatureDeserializer); + public unsafe delegate int PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSizeInBytes, [NativeTypeName("const IID &")] Guid* pRootSignatureDeserializerInterface, [NativeTypeName("void **")] void** ppRootSignatureDeserializer); } diff --git a/sources/Interop/D3D12/um/d3d12/PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER.cs b/sources/Interop/D3D12/um/d3d12/PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER.cs index 65c087128f..4937cd86e2 100644 --- a/sources/Interop/D3D12/um/d3d12/PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER.cs +++ b/sources/Interop/D3D12/um/d3d12/PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public unsafe delegate int PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSizeInBytes, [NativeTypeName("const IID &")] Guid* pRootSignatureDeserializerInterface, [NativeTypeName("void **")] void** ppRootSignatureDeserializer); + public unsafe delegate int PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSizeInBytes, [NativeTypeName("const IID &")] Guid* pRootSignatureDeserializerInterface, [NativeTypeName("void **")] void** ppRootSignatureDeserializer); } diff --git a/sources/Interop/D3D12/um/d3d12sdklayers/D3D12_MESSAGE.cs b/sources/Interop/D3D12/um/d3d12sdklayers/D3D12_MESSAGE.cs index 8be0ea3f37..ddb5e907be 100644 --- a/sources/Interop/D3D12/um/d3d12sdklayers/D3D12_MESSAGE.cs +++ b/sources/Interop/D3D12/um/d3d12sdklayers/D3D12_MESSAGE.cs @@ -3,8 +3,6 @@ // Ported from um/d3d12sdklayers.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct D3D12_MESSAGE @@ -19,6 +17,6 @@ public unsafe partial struct D3D12_MESSAGE public sbyte* pDescription; [NativeTypeName("SIZE_T")] - public UIntPtr DescriptionByteLength; + public nuint DescriptionByteLength; } } diff --git a/sources/Interop/D3D12/um/d3d12sdklayers/ID3D12InfoQueue.cs b/sources/Interop/D3D12/um/d3d12sdklayers/ID3D12InfoQueue.cs index 977c47406d..0fd880b1dc 100644 --- a/sources/Interop/D3D12/um/d3d12sdklayers/ID3D12InfoQueue.cs +++ b/sources/Interop/D3D12/um/d3d12sdklayers/ID3D12InfoQueue.cs @@ -35,7 +35,7 @@ public unsafe partial struct ID3D12InfoQueue [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _GetMessage(ID3D12InfoQueue* pThis, [NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("D3D12_MESSAGE *")] D3D12_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] UIntPtr* pMessageByteLength); + public delegate int _GetMessage(ID3D12InfoQueue* pThis, [NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("D3D12_MESSAGE *")] D3D12_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] nuint* pMessageByteLength); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("UINT64")] @@ -67,7 +67,7 @@ public unsafe partial struct ID3D12InfoQueue [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _GetStorageFilter(ID3D12InfoQueue* pThis, [NativeTypeName("D3D12_INFO_QUEUE_FILTER *")] D3D12_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength); + public delegate int _GetStorageFilter(ID3D12InfoQueue* pThis, [NativeTypeName("D3D12_INFO_QUEUE_FILTER *")] D3D12_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _ClearStorageFilter(ID3D12InfoQueue* pThis); @@ -97,7 +97,7 @@ public unsafe partial struct ID3D12InfoQueue [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _GetRetrievalFilter(ID3D12InfoQueue* pThis, [NativeTypeName("D3D12_INFO_QUEUE_FILTER *")] D3D12_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength); + public delegate int _GetRetrievalFilter(ID3D12InfoQueue* pThis, [NativeTypeName("D3D12_INFO_QUEUE_FILTER *")] D3D12_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _ClearRetrievalFilter(ID3D12InfoQueue* pThis); @@ -190,7 +190,7 @@ public void ClearStoredMessages() } [return: NativeTypeName("HRESULT")] - public int GetMessage([NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("D3D12_MESSAGE *")] D3D12_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] UIntPtr* pMessageByteLength) + public int GetMessage([NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("D3D12_MESSAGE *")] D3D12_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] nuint* pMessageByteLength) { return Marshal.GetDelegateForFunctionPointer<_GetMessage>(lpVtbl->GetMessage)((ID3D12InfoQueue*)Unsafe.AsPointer(ref this), MessageIndex, pMessage, pMessageByteLength); } @@ -238,7 +238,7 @@ public int AddStorageFilterEntries([NativeTypeName("D3D12_INFO_QUEUE_FILTER *")] } [return: NativeTypeName("HRESULT")] - public int GetStorageFilter([NativeTypeName("D3D12_INFO_QUEUE_FILTER *")] D3D12_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength) + public int GetStorageFilter([NativeTypeName("D3D12_INFO_QUEUE_FILTER *")] D3D12_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength) { return Marshal.GetDelegateForFunctionPointer<_GetStorageFilter>(lpVtbl->GetStorageFilter)((ID3D12InfoQueue*)Unsafe.AsPointer(ref this), pFilter, pFilterByteLength); } @@ -284,7 +284,7 @@ public int AddRetrievalFilterEntries([NativeTypeName("D3D12_INFO_QUEUE_FILTER *" } [return: NativeTypeName("HRESULT")] - public int GetRetrievalFilter([NativeTypeName("D3D12_INFO_QUEUE_FILTER *")] D3D12_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength) + public int GetRetrievalFilter([NativeTypeName("D3D12_INFO_QUEUE_FILTER *")] D3D12_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength) { return Marshal.GetDelegateForFunctionPointer<_GetRetrievalFilter>(lpVtbl->GetRetrievalFilter)((ID3D12InfoQueue*)Unsafe.AsPointer(ref this), pFilter, pFilterByteLength); } diff --git a/sources/Interop/D3DCommon/TerraFX.Interop.D3DCommon.csproj b/sources/Interop/D3DCommon/TerraFX.Interop.D3DCommon.csproj index 83365b7aad..5ab29b1f89 100644 --- a/sources/Interop/D3DCommon/TerraFX.Interop.D3DCommon.csproj +++ b/sources/Interop/D3DCommon/TerraFX.Interop.D3DCommon.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/D3DCommon/um/d3dcommon/ID3DBlob.cs b/sources/Interop/D3DCommon/um/d3dcommon/ID3DBlob.cs index 06702366e2..0118ff3eff 100644 --- a/sources/Interop/D3DCommon/um/d3dcommon/ID3DBlob.cs +++ b/sources/Interop/D3DCommon/um/d3dcommon/ID3DBlob.cs @@ -32,7 +32,7 @@ public unsafe partial struct ID3DBlob [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("SIZE_T")] - public delegate UIntPtr _GetBufferSize(ID3DBlob* pThis); + public delegate nuint _GetBufferSize(ID3DBlob* pThis); [return: NativeTypeName("HRESULT")] public int QueryInterface([NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("void **")] void** ppvObject) @@ -59,7 +59,7 @@ public uint Release() } [return: NativeTypeName("SIZE_T")] - public UIntPtr GetBufferSize() + public nuint GetBufferSize() { return Marshal.GetDelegateForFunctionPointer<_GetBufferSize>(lpVtbl->GetBufferSize)((ID3DBlob*)Unsafe.AsPointer(ref this)); } diff --git a/sources/Interop/D3DCompiler/TerraFX.Interop.D3DCompiler.csproj b/sources/Interop/D3DCompiler/TerraFX.Interop.D3DCompiler.csproj index 7c8c7844b6..a628a2896a 100644 --- a/sources/Interop/D3DCompiler/TerraFX.Interop.D3DCompiler.csproj +++ b/sources/Interop/D3DCompiler/TerraFX.Interop.D3DCompiler.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/D3DCompiler/um/d3dcompiler/D3DCompiler.cs b/sources/Interop/D3DCompiler/um/d3dcompiler/D3DCompiler.cs index 7013c895a9..79252d68d6 100644 --- a/sources/Interop/D3DCompiler/um/d3dcompiler/D3DCompiler.cs +++ b/sources/Interop/D3DCompiler/um/d3dcompiler/D3DCompiler.cs @@ -22,11 +22,11 @@ public static unsafe partial class D3DCompiler [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DCompile", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DCompile([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("LPCSTR")] sbyte* pSourceName, [NativeTypeName("const D3D_SHADER_MACRO *")] D3D_SHADER_MACRO* pDefines, [NativeTypeName("ID3DInclude *")] ID3DInclude* pInclude, [NativeTypeName("LPCSTR")] sbyte* pEntrypoint, [NativeTypeName("LPCSTR")] sbyte* pTarget, [NativeTypeName("UINT")] uint Flags1, [NativeTypeName("UINT")] uint Flags2, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppCode, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppErrorMsgs); + public static extern int D3DCompile([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("LPCSTR")] sbyte* pSourceName, [NativeTypeName("const D3D_SHADER_MACRO *")] D3D_SHADER_MACRO* pDefines, [NativeTypeName("ID3DInclude *")] ID3DInclude* pInclude, [NativeTypeName("LPCSTR")] sbyte* pEntrypoint, [NativeTypeName("LPCSTR")] sbyte* pTarget, [NativeTypeName("UINT")] uint Flags1, [NativeTypeName("UINT")] uint Flags2, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppCode, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppErrorMsgs); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DCompile2", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DCompile2([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("LPCSTR")] sbyte* pSourceName, [NativeTypeName("const D3D_SHADER_MACRO *")] D3D_SHADER_MACRO* pDefines, [NativeTypeName("ID3DInclude *")] ID3DInclude* pInclude, [NativeTypeName("LPCSTR")] sbyte* pEntrypoint, [NativeTypeName("LPCSTR")] sbyte* pTarget, [NativeTypeName("UINT")] uint Flags1, [NativeTypeName("UINT")] uint Flags2, [NativeTypeName("UINT")] uint SecondaryDataFlags, [NativeTypeName("LPCVOID")] void* pSecondaryData, [NativeTypeName("SIZE_T")] UIntPtr SecondaryDataSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppCode, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppErrorMsgs); + public static extern int D3DCompile2([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("LPCSTR")] sbyte* pSourceName, [NativeTypeName("const D3D_SHADER_MACRO *")] D3D_SHADER_MACRO* pDefines, [NativeTypeName("ID3DInclude *")] ID3DInclude* pInclude, [NativeTypeName("LPCSTR")] sbyte* pEntrypoint, [NativeTypeName("LPCSTR")] sbyte* pTarget, [NativeTypeName("UINT")] uint Flags1, [NativeTypeName("UINT")] uint Flags2, [NativeTypeName("UINT")] uint SecondaryDataFlags, [NativeTypeName("LPCVOID")] void* pSecondaryData, [NativeTypeName("SIZE_T")] nuint SecondaryDataSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppCode, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppErrorMsgs); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DCompileFromFile", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] @@ -34,59 +34,59 @@ public static unsafe partial class D3DCompiler [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DPreprocess", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DPreprocess([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("LPCSTR")] sbyte* pSourceName, [NativeTypeName("const D3D_SHADER_MACRO *")] D3D_SHADER_MACRO* pDefines, [NativeTypeName("ID3DInclude *")] ID3DInclude* pInclude, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppCodeText, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppErrorMsgs); + public static extern int D3DPreprocess([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("LPCSTR")] sbyte* pSourceName, [NativeTypeName("const D3D_SHADER_MACRO *")] D3D_SHADER_MACRO* pDefines, [NativeTypeName("ID3DInclude *")] ID3DInclude* pInclude, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppCodeText, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppErrorMsgs); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DGetDebugInfo", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DGetDebugInfo([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppDebugInfo); + public static extern int D3DGetDebugInfo([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppDebugInfo); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DReflect", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DReflect([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("const IID &")] Guid* pInterface, [NativeTypeName("void **")] void** ppReflector); + public static extern int D3DReflect([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("const IID &")] Guid* pInterface, [NativeTypeName("void **")] void** ppReflector); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DReflectLibrary", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DReflectLibrary([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("LPVOID *")] void** ppReflector); + public static extern int D3DReflectLibrary([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("const IID &")] Guid* riid, [NativeTypeName("LPVOID *")] void** ppReflector); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DDisassemble", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DDisassemble([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("LPCSTR")] sbyte* szComments, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppDisassembly); + public static extern int D3DDisassemble([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("LPCSTR")] sbyte* szComments, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppDisassembly); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DDisassembleRegion", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DDisassembleRegion([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("LPCSTR")] sbyte* szComments, [NativeTypeName("SIZE_T")] UIntPtr StartByteOffset, [NativeTypeName("SIZE_T")] UIntPtr NumInsts, [NativeTypeName("SIZE_T *")] UIntPtr* pFinishByteOffset, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppDisassembly); + public static extern int D3DDisassembleRegion([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("LPCSTR")] sbyte* szComments, [NativeTypeName("SIZE_T")] nuint StartByteOffset, [NativeTypeName("SIZE_T")] nuint NumInsts, [NativeTypeName("SIZE_T *")] nuint* pFinishByteOffset, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppDisassembly); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DGetTraceInstructionOffsets", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DGetTraceInstructionOffsets([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("SIZE_T")] UIntPtr StartInstIndex, [NativeTypeName("SIZE_T")] UIntPtr NumInsts, [NativeTypeName("SIZE_T *")] UIntPtr* pOffsets, [NativeTypeName("SIZE_T *")] UIntPtr* pTotalInsts); + public static extern int D3DGetTraceInstructionOffsets([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("SIZE_T")] nuint StartInstIndex, [NativeTypeName("SIZE_T")] nuint NumInsts, [NativeTypeName("SIZE_T *")] nuint* pOffsets, [NativeTypeName("SIZE_T *")] nuint* pTotalInsts); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DGetInputSignatureBlob", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DGetInputSignatureBlob([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppSignatureBlob); + public static extern int D3DGetInputSignatureBlob([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppSignatureBlob); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DGetOutputSignatureBlob", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DGetOutputSignatureBlob([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppSignatureBlob); + public static extern int D3DGetOutputSignatureBlob([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppSignatureBlob); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DGetInputAndOutputSignatureBlob", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DGetInputAndOutputSignatureBlob([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppSignatureBlob); + public static extern int D3DGetInputAndOutputSignatureBlob([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppSignatureBlob); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DStripShader", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DStripShader([NativeTypeName("LPCVOID")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] UIntPtr BytecodeLength, [NativeTypeName("UINT")] uint uStripFlags, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppStrippedBlob); + public static extern int D3DStripShader([NativeTypeName("LPCVOID")] void* pShaderBytecode, [NativeTypeName("SIZE_T")] nuint BytecodeLength, [NativeTypeName("UINT")] uint uStripFlags, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppStrippedBlob); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DGetBlobPart", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DGetBlobPart([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, D3D_BLOB_PART Part, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppPart); + public static extern int D3DGetBlobPart([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, D3D_BLOB_PART Part, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppPart); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DSetBlobPart", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DSetBlobPart([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, D3D_BLOB_PART Part, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("LPCVOID")] void* pPart, [NativeTypeName("SIZE_T")] UIntPtr PartSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppNewShader); + public static extern int D3DSetBlobPart([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, D3D_BLOB_PART Part, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("LPCVOID")] void* pPart, [NativeTypeName("SIZE_T")] nuint PartSize, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppNewShader); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DCreateBlob", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DCreateBlob([NativeTypeName("SIZE_T")] UIntPtr Size, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppBlob); + public static extern int D3DCreateBlob([NativeTypeName("SIZE_T")] nuint Size, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppBlob); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DCompressShaders", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] @@ -94,6 +94,6 @@ public static unsafe partial class D3DCompiler [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "D3DDecompressShaders", ExactSpelling = true)] [return: NativeTypeName("HRESULT")] - public static extern int D3DDecompressShaders([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("UINT")] uint uNumShaders, [NativeTypeName("UINT")] uint uStartIndex, [NativeTypeName("UINT *")] uint* pIndices, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppShaders, [NativeTypeName("UINT *")] uint* pTotalShaders); + public static extern int D3DDecompressShaders([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("UINT")] uint uNumShaders, [NativeTypeName("UINT")] uint uStartIndex, [NativeTypeName("UINT *")] uint* pIndices, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppShaders, [NativeTypeName("UINT *")] uint* pTotalShaders); } } diff --git a/sources/Interop/D3DCompiler/um/d3dcompiler/D3D_SHADER_DATA.cs b/sources/Interop/D3DCompiler/um/d3dcompiler/D3D_SHADER_DATA.cs index 578eaac69d..4053e7c075 100644 --- a/sources/Interop/D3DCompiler/um/d3dcompiler/D3D_SHADER_DATA.cs +++ b/sources/Interop/D3DCompiler/um/d3dcompiler/D3D_SHADER_DATA.cs @@ -3,8 +3,6 @@ // Ported from um/d3dcompiler.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct D3D_SHADER_DATA @@ -13,6 +11,6 @@ public unsafe partial struct D3D_SHADER_DATA public void* pBytecode; [NativeTypeName("SIZE_T")] - public UIntPtr BytecodeLength; + public nuint BytecodeLength; } } diff --git a/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DCompile.cs b/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DCompile.cs index d7d7291947..80c066169f 100644 --- a/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DCompile.cs +++ b/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DCompile.cs @@ -3,12 +3,11 @@ // Ported from um/d3dcompiler.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("HRESULT")] - public unsafe delegate int pD3DCompile([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("LPCSTR")] sbyte* pFileName, [NativeTypeName("const D3D_SHADER_MACRO *")] D3D_SHADER_MACRO* pDefines, [NativeTypeName("ID3DInclude *")] ID3DInclude* pInclude, [NativeTypeName("LPCSTR")] sbyte* pEntrypoint, [NativeTypeName("LPCSTR")] sbyte* pTarget, [NativeTypeName("UINT")] uint Flags1, [NativeTypeName("UINT")] uint Flags2, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppCode, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppErrorMsgs); + public unsafe delegate int pD3DCompile([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("LPCSTR")] sbyte* pFileName, [NativeTypeName("const D3D_SHADER_MACRO *")] D3D_SHADER_MACRO* pDefines, [NativeTypeName("ID3DInclude *")] ID3DInclude* pInclude, [NativeTypeName("LPCSTR")] sbyte* pEntrypoint, [NativeTypeName("LPCSTR")] sbyte* pTarget, [NativeTypeName("UINT")] uint Flags1, [NativeTypeName("UINT")] uint Flags2, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppCode, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppErrorMsgs); } diff --git a/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DDisassemble.cs b/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DDisassemble.cs index 70b3e47cc3..28956a8d37 100644 --- a/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DDisassemble.cs +++ b/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DDisassemble.cs @@ -3,12 +3,11 @@ // Ported from um/d3dcompiler.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("HRESULT")] - public unsafe delegate int pD3DDisassemble([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("LPCSTR")] sbyte* szComments, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppDisassembly); + public unsafe delegate int pD3DDisassemble([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("LPCSTR")] sbyte* szComments, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppDisassembly); } diff --git a/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DPreprocess.cs b/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DPreprocess.cs index 2de2e13b2b..c7234990f9 100644 --- a/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DPreprocess.cs +++ b/sources/Interop/D3DCompiler/um/d3dcompiler/pD3DPreprocess.cs @@ -3,12 +3,11 @@ // Ported from um/d3dcompiler.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("HRESULT")] - public unsafe delegate int pD3DPreprocess([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] UIntPtr SrcDataSize, [NativeTypeName("LPCSTR")] sbyte* pFileName, [NativeTypeName("const D3D_SHADER_MACRO *")] D3D_SHADER_MACRO* pDefines, [NativeTypeName("ID3DInclude *")] ID3DInclude* pInclude, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppCodeText, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppErrorMsgs); + public unsafe delegate int pD3DPreprocess([NativeTypeName("LPCVOID")] void* pSrcData, [NativeTypeName("SIZE_T")] nuint SrcDataSize, [NativeTypeName("LPCSTR")] sbyte* pFileName, [NativeTypeName("const D3D_SHADER_MACRO *")] D3D_SHADER_MACRO* pDefines, [NativeTypeName("ID3DInclude *")] ID3DInclude* pInclude, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppCodeText, [NativeTypeName("ID3DBlob **")] ID3DBlob** ppErrorMsgs); } diff --git a/sources/Interop/DCommon/TerraFX.Interop.DCommon.csproj b/sources/Interop/DCommon/TerraFX.Interop.DCommon.csproj index 0e4918b0b9..90e4c5eaa9 100644 --- a/sources/Interop/DCommon/TerraFX.Interop.DCommon.csproj +++ b/sources/Interop/DCommon/TerraFX.Interop.DCommon.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_3X2_F.cs b/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_3X2_F.cs index d62596e1b4..fcb3e8ce7f 100644 --- a/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_3X2_F.cs +++ b/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_3X2_F.cs @@ -9,18 +9,18 @@ namespace TerraFX.Interop { public partial struct D2D_MATRIX_3X2_F { - [NativeTypeName("D2D_MATRIX_3X2_F::(anonymous union at um/dcommon.h:277:5)")] + [NativeTypeName("D2D_MATRIX_3X2_F::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dcommon.h:277:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] public unsafe partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("D2D_MATRIX_3X2_F::(anonymous struct at um/dcommon.h:279:9)")] + [NativeTypeName("D2D_MATRIX_3X2_F::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dcommon.h:279:9)")] public _Anonymous1_e__Struct Anonymous1; [FieldOffset(0)] - [NativeTypeName("D2D_MATRIX_3X2_F::(anonymous struct at um/dcommon.h:312:9)")] + [NativeTypeName("D2D_MATRIX_3X2_F::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dcommon.h:312:9)")] public _Anonymous2_e__Struct Anonymous2; [FieldOffset(0)] diff --git a/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_4X3_F.cs b/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_4X3_F.cs index 555ab1bd41..09b02745b7 100644 --- a/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_4X3_F.cs +++ b/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_4X3_F.cs @@ -9,14 +9,14 @@ namespace TerraFX.Interop { public partial struct D2D_MATRIX_4X3_F { - [NativeTypeName("D2D_MATRIX_4X3_F::(anonymous union at um/dcommon.h:331:5)")] + [NativeTypeName("D2D_MATRIX_4X3_F::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dcommon.h:331:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] public unsafe partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("D2D_MATRIX_4X3_F::(anonymous struct at um/dcommon.h:333:9)")] + [NativeTypeName("D2D_MATRIX_4X3_F::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dcommon.h:333:9)")] public _Anonymous_e__Struct Anonymous; [FieldOffset(0)] diff --git a/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_4X4_F.cs b/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_4X4_F.cs index 38f9694252..eabe0dcc4a 100644 --- a/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_4X4_F.cs +++ b/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_4X4_F.cs @@ -9,14 +9,14 @@ namespace TerraFX.Interop { public partial struct D2D_MATRIX_4X4_F { - [NativeTypeName("D2D_MATRIX_4X4_F::(anonymous union at um/dcommon.h:352:5)")] + [NativeTypeName("D2D_MATRIX_4X4_F::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dcommon.h:352:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] public unsafe partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("D2D_MATRIX_4X4_F::(anonymous struct at um/dcommon.h:354:9)")] + [NativeTypeName("D2D_MATRIX_4X4_F::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dcommon.h:354:9)")] public _Anonymous_e__Struct Anonymous; [FieldOffset(0)] diff --git a/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_5X4_F.cs b/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_5X4_F.cs index 577ffa402e..414c931c71 100644 --- a/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_5X4_F.cs +++ b/sources/Interop/DCommon/um/dcommon/D2D_MATRIX_5X4_F.cs @@ -9,14 +9,14 @@ namespace TerraFX.Interop { public partial struct D2D_MATRIX_5X4_F { - [NativeTypeName("D2D_MATRIX_5X4_F::(anonymous union at um/dcommon.h:373:5)")] + [NativeTypeName("D2D_MATRIX_5X4_F::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dcommon.h:373:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] public unsafe partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("D2D_MATRIX_5X4_F::(anonymous struct at um/dcommon.h:375:9)")] + [NativeTypeName("D2D_MATRIX_5X4_F::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dcommon.h:375:9)")] public _Anonymous_e__Struct Anonymous; [FieldOffset(0)] diff --git a/sources/Interop/DWrite/TerraFX.Interop.DWrite.csproj b/sources/Interop/DWrite/TerraFX.Interop.DWrite.csproj index 5c3a38246a..82c53a02ad 100644 --- a/sources/Interop/DWrite/TerraFX.Interop.DWrite.csproj +++ b/sources/Interop/DWrite/TerraFX.Interop.DWrite.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/DWrite/um/dwrite_1/DWRITE_PANOSE.cs b/sources/Interop/DWrite/um/dwrite_1/DWRITE_PANOSE.cs index feab676ab4..ef9aacf00d 100644 --- a/sources/Interop/DWrite/um/dwrite_1/DWRITE_PANOSE.cs +++ b/sources/Interop/DWrite/um/dwrite_1/DWRITE_PANOSE.cs @@ -19,19 +19,19 @@ public unsafe partial struct DWRITE_PANOSE public byte familyKind; [FieldOffset(0)] - [NativeTypeName("struct (anonymous struct at um/dwrite_1.h:758:5)")] + [NativeTypeName("struct (anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dwrite_1.h:758:5)")] public _text_e__Struct text; [FieldOffset(0)] - [NativeTypeName("struct (anonymous struct at um/dwrite_1.h:772:5)")] + [NativeTypeName("struct (anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dwrite_1.h:772:5)")] public _script_e__Struct script; [FieldOffset(0)] - [NativeTypeName("struct (anonymous struct at um/dwrite_1.h:786:5)")] + [NativeTypeName("struct (anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dwrite_1.h:786:5)")] public _decorative_e__Struct decorative; [FieldOffset(0)] - [NativeTypeName("struct (anonymous struct at um/dwrite_1.h:800:5)")] + [NativeTypeName("struct (anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/dwrite_1.h:800:5)")] public _symbol_e__Struct symbol; public partial struct _text_e__Struct diff --git a/sources/Interop/DXGI/TerraFX.Interop.DXGI.csproj b/sources/Interop/DXGI/TerraFX.Interop.DXGI.csproj index 737caa5a88..79a76086c9 100644 --- a/sources/Interop/DXGI/TerraFX.Interop.DXGI.csproj +++ b/sources/Interop/DXGI/TerraFX.Interop.DXGI.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/DXGI/shared/dxgi/DXGI_ADAPTER_DESC.cs b/sources/Interop/DXGI/shared/dxgi/DXGI_ADAPTER_DESC.cs index 25063042de..36f985f513 100644 --- a/sources/Interop/DXGI/shared/dxgi/DXGI_ADAPTER_DESC.cs +++ b/sources/Interop/DXGI/shared/dxgi/DXGI_ADAPTER_DESC.cs @@ -3,8 +3,6 @@ // Ported from shared/dxgi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct DXGI_ADAPTER_DESC @@ -25,13 +23,13 @@ public unsafe partial struct DXGI_ADAPTER_DESC public uint Revision; [NativeTypeName("SIZE_T")] - public UIntPtr DedicatedVideoMemory; + public nuint DedicatedVideoMemory; [NativeTypeName("SIZE_T")] - public UIntPtr DedicatedSystemMemory; + public nuint DedicatedSystemMemory; [NativeTypeName("SIZE_T")] - public UIntPtr SharedSystemMemory; + public nuint SharedSystemMemory; public LUID AdapterLuid; } diff --git a/sources/Interop/DXGI/shared/dxgi/DXGI_ADAPTER_DESC1.cs b/sources/Interop/DXGI/shared/dxgi/DXGI_ADAPTER_DESC1.cs index 5cb10fe16f..c201e23e43 100644 --- a/sources/Interop/DXGI/shared/dxgi/DXGI_ADAPTER_DESC1.cs +++ b/sources/Interop/DXGI/shared/dxgi/DXGI_ADAPTER_DESC1.cs @@ -3,8 +3,6 @@ // Ported from shared/dxgi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct DXGI_ADAPTER_DESC1 @@ -25,13 +23,13 @@ public unsafe partial struct DXGI_ADAPTER_DESC1 public uint Revision; [NativeTypeName("SIZE_T")] - public UIntPtr DedicatedVideoMemory; + public nuint DedicatedVideoMemory; [NativeTypeName("SIZE_T")] - public UIntPtr DedicatedSystemMemory; + public nuint DedicatedSystemMemory; [NativeTypeName("SIZE_T")] - public UIntPtr SharedSystemMemory; + public nuint SharedSystemMemory; public LUID AdapterLuid; diff --git a/sources/Interop/DXGI/shared/dxgi1_2/DXGI_ADAPTER_DESC2.cs b/sources/Interop/DXGI/shared/dxgi1_2/DXGI_ADAPTER_DESC2.cs index b8d8aca24d..97c3013d0d 100644 --- a/sources/Interop/DXGI/shared/dxgi1_2/DXGI_ADAPTER_DESC2.cs +++ b/sources/Interop/DXGI/shared/dxgi1_2/DXGI_ADAPTER_DESC2.cs @@ -3,8 +3,6 @@ // Ported from shared/dxgi1_2.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct DXGI_ADAPTER_DESC2 @@ -25,13 +23,13 @@ public unsafe partial struct DXGI_ADAPTER_DESC2 public uint Revision; [NativeTypeName("SIZE_T")] - public UIntPtr DedicatedVideoMemory; + public nuint DedicatedVideoMemory; [NativeTypeName("SIZE_T")] - public UIntPtr DedicatedSystemMemory; + public nuint DedicatedSystemMemory; [NativeTypeName("SIZE_T")] - public UIntPtr SharedSystemMemory; + public nuint SharedSystemMemory; public LUID AdapterLuid; diff --git a/sources/Interop/DXGI/shared/dxgi1_6/DXGI_ADAPTER_DESC3.cs b/sources/Interop/DXGI/shared/dxgi1_6/DXGI_ADAPTER_DESC3.cs index 07c92e0b28..358cf2af17 100644 --- a/sources/Interop/DXGI/shared/dxgi1_6/DXGI_ADAPTER_DESC3.cs +++ b/sources/Interop/DXGI/shared/dxgi1_6/DXGI_ADAPTER_DESC3.cs @@ -3,8 +3,6 @@ // Ported from shared/dxgi1_6.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct DXGI_ADAPTER_DESC3 @@ -25,13 +23,13 @@ public unsafe partial struct DXGI_ADAPTER_DESC3 public uint Revision; [NativeTypeName("SIZE_T")] - public UIntPtr DedicatedVideoMemory; + public nuint DedicatedVideoMemory; [NativeTypeName("SIZE_T")] - public UIntPtr DedicatedSystemMemory; + public nuint DedicatedSystemMemory; [NativeTypeName("SIZE_T")] - public UIntPtr SharedSystemMemory; + public nuint SharedSystemMemory; public LUID AdapterLuid; diff --git a/sources/Interop/DXGIDebug/TerraFX.Interop.DXGIDebug.csproj b/sources/Interop/DXGIDebug/TerraFX.Interop.DXGIDebug.csproj index 9f5ef288bc..86e1124436 100644 --- a/sources/Interop/DXGIDebug/TerraFX.Interop.DXGIDebug.csproj +++ b/sources/Interop/DXGIDebug/TerraFX.Interop.DXGIDebug.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/DXGIDebug/um/dxgidebug/DXGI_INFO_QUEUE_MESSAGE.cs b/sources/Interop/DXGIDebug/um/dxgidebug/DXGI_INFO_QUEUE_MESSAGE.cs index 55135635be..3faa548f04 100644 --- a/sources/Interop/DXGIDebug/um/dxgidebug/DXGI_INFO_QUEUE_MESSAGE.cs +++ b/sources/Interop/DXGIDebug/um/dxgidebug/DXGI_INFO_QUEUE_MESSAGE.cs @@ -23,6 +23,6 @@ public unsafe partial struct DXGI_INFO_QUEUE_MESSAGE public sbyte* pDescription; [NativeTypeName("SIZE_T")] - public UIntPtr DescriptionByteLength; + public nuint DescriptionByteLength; } } diff --git a/sources/Interop/DXGIDebug/um/dxgidebug/IDXGIInfoQueue.cs b/sources/Interop/DXGIDebug/um/dxgidebug/IDXGIInfoQueue.cs index 95a20e46cf..f96f039e1c 100644 --- a/sources/Interop/DXGIDebug/um/dxgidebug/IDXGIInfoQueue.cs +++ b/sources/Interop/DXGIDebug/um/dxgidebug/IDXGIInfoQueue.cs @@ -35,7 +35,7 @@ public unsafe partial struct IDXGIInfoQueue [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _GetMessage(IDXGIInfoQueue* pThis, [NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("DXGI_INFO_QUEUE_MESSAGE *")] DXGI_INFO_QUEUE_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] UIntPtr* pMessageByteLength); + public delegate int _GetMessage(IDXGIInfoQueue* pThis, [NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("DXGI_INFO_QUEUE_MESSAGE *")] DXGI_INFO_QUEUE_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] nuint* pMessageByteLength); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("UINT64")] @@ -67,7 +67,7 @@ public unsafe partial struct IDXGIInfoQueue [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _GetStorageFilter(IDXGIInfoQueue* pThis, [NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("DXGI_INFO_QUEUE_FILTER *")] DXGI_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength); + public delegate int _GetStorageFilter(IDXGIInfoQueue* pThis, [NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("DXGI_INFO_QUEUE_FILTER *")] DXGI_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _ClearStorageFilter(IDXGIInfoQueue* pThis, [NativeTypeName("DXGI_DEBUG_ID")] Guid Producer); @@ -101,7 +101,7 @@ public unsafe partial struct IDXGIInfoQueue [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _GetRetrievalFilter(IDXGIInfoQueue* pThis, [NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("DXGI_INFO_QUEUE_FILTER *")] DXGI_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength); + public delegate int _GetRetrievalFilter(IDXGIInfoQueue* pThis, [NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("DXGI_INFO_QUEUE_FILTER *")] DXGI_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength); [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void _ClearRetrievalFilter(IDXGIInfoQueue* pThis, [NativeTypeName("DXGI_DEBUG_ID")] Guid Producer); @@ -198,7 +198,7 @@ public void ClearStoredMessages([NativeTypeName("DXGI_DEBUG_ID")] Guid Producer) } [return: NativeTypeName("HRESULT")] - public int GetMessage([NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("DXGI_INFO_QUEUE_MESSAGE *")] DXGI_INFO_QUEUE_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] UIntPtr* pMessageByteLength) + public int GetMessage([NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("UINT64")] ulong MessageIndex, [NativeTypeName("DXGI_INFO_QUEUE_MESSAGE *")] DXGI_INFO_QUEUE_MESSAGE* pMessage, [NativeTypeName("SIZE_T *")] nuint* pMessageByteLength) { return Marshal.GetDelegateForFunctionPointer<_GetMessage>(lpVtbl->GetMessage)((IDXGIInfoQueue*)Unsafe.AsPointer(ref this), Producer, MessageIndex, pMessage, pMessageByteLength); } @@ -246,7 +246,7 @@ public int AddStorageFilterEntries([NativeTypeName("DXGI_DEBUG_ID")] Guid Produc } [return: NativeTypeName("HRESULT")] - public int GetStorageFilter([NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("DXGI_INFO_QUEUE_FILTER *")] DXGI_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength) + public int GetStorageFilter([NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("DXGI_INFO_QUEUE_FILTER *")] DXGI_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength) { return Marshal.GetDelegateForFunctionPointer<_GetStorageFilter>(lpVtbl->GetStorageFilter)((IDXGIInfoQueue*)Unsafe.AsPointer(ref this), Producer, pFilter, pFilterByteLength); } @@ -298,7 +298,7 @@ public int AddRetrievalFilterEntries([NativeTypeName("DXGI_DEBUG_ID")] Guid Prod } [return: NativeTypeName("HRESULT")] - public int GetRetrievalFilter([NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("DXGI_INFO_QUEUE_FILTER *")] DXGI_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] UIntPtr* pFilterByteLength) + public int GetRetrievalFilter([NativeTypeName("DXGI_DEBUG_ID")] Guid Producer, [NativeTypeName("DXGI_INFO_QUEUE_FILTER *")] DXGI_INFO_QUEUE_FILTER* pFilter, [NativeTypeName("SIZE_T *")] nuint* pFilterByteLength) { return Marshal.GetDelegateForFunctionPointer<_GetRetrievalFilter>(lpVtbl->GetRetrievalFilter)((IDXGIInfoQueue*)Unsafe.AsPointer(ref this), Producer, pFilter, pFilterByteLength); } diff --git a/sources/Interop/Gdi32/TerraFX.Interop.Gdi32.csproj b/sources/Interop/Gdi32/TerraFX.Interop.Gdi32.csproj index ac3faf3282..6a73dafec2 100644 --- a/sources/Interop/Gdi32/TerraFX.Interop.Gdi32.csproj +++ b/sources/Interop/Gdi32/TerraFX.Interop.Gdi32.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/Gdi32/um/wingdi/DEVMODEA.cs b/sources/Interop/Gdi32/um/wingdi/DEVMODEA.cs index b932849e8a..b46f3226f3 100644 --- a/sources/Interop/Gdi32/um/wingdi/DEVMODEA.cs +++ b/sources/Interop/Gdi32/um/wingdi/DEVMODEA.cs @@ -27,7 +27,7 @@ public unsafe partial struct DEVMODEA [NativeTypeName("DWORD")] public uint dmFields; - [NativeTypeName("_devicemodeA::(anonymous union at um/wingdi.h:2202:5)")] + [NativeTypeName("_devicemodeA::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2202:5)")] public _Anonymous1_e__Union Anonymous1; public short dmColor; @@ -55,7 +55,7 @@ public unsafe partial struct DEVMODEA [NativeTypeName("DWORD")] public uint dmPelsHeight; - [NativeTypeName("_devicemodeA::(anonymous union at um/wingdi.h:2231:5)")] + [NativeTypeName("_devicemodeA::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2231:5)")] public _Anonymous2_e__Union Anonymous2; [NativeTypeName("DWORD")] @@ -89,11 +89,11 @@ public unsafe partial struct DEVMODEA public partial struct _Anonymous1_e__Union { [FieldOffset(0)] - [NativeTypeName("_devicemodeA::(anonymous struct at um/wingdi.h:2204:7)")] + [NativeTypeName("_devicemodeA::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2204:7)")] public _Anonymous1_e__Struct Anonymous1; [FieldOffset(0)] - [NativeTypeName("_devicemodeA::(anonymous struct at um/wingdi.h:2215:7)")] + [NativeTypeName("_devicemodeA::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2215:7)")] public _Anonymous2_e__Struct Anonymous2; public partial struct _Anonymous1_e__Struct diff --git a/sources/Interop/Gdi32/um/wingdi/DEVMODEW.cs b/sources/Interop/Gdi32/um/wingdi/DEVMODEW.cs index 11fe7d83b4..100c543e68 100644 --- a/sources/Interop/Gdi32/um/wingdi/DEVMODEW.cs +++ b/sources/Interop/Gdi32/um/wingdi/DEVMODEW.cs @@ -27,7 +27,7 @@ public unsafe partial struct DEVMODEW [NativeTypeName("DWORD")] public uint dmFields; - [NativeTypeName("_devicemodeW::(anonymous union at um/wingdi.h:2256:5)")] + [NativeTypeName("_devicemodeW::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2256:5)")] public _Anonymous1_e__Union Anonymous1; public short dmColor; @@ -55,7 +55,7 @@ public unsafe partial struct DEVMODEW [NativeTypeName("DWORD")] public uint dmPelsHeight; - [NativeTypeName("_devicemodeW::(anonymous union at um/wingdi.h:2285:5)")] + [NativeTypeName("_devicemodeW::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2285:5)")] public _Anonymous2_e__Union Anonymous2; [NativeTypeName("DWORD")] @@ -89,11 +89,11 @@ public unsafe partial struct DEVMODEW public partial struct _Anonymous1_e__Union { [FieldOffset(0)] - [NativeTypeName("_devicemodeW::(anonymous struct at um/wingdi.h:2258:7)")] + [NativeTypeName("_devicemodeW::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2258:7)")] public _Anonymous1_e__Struct Anonymous1; [FieldOffset(0)] - [NativeTypeName("_devicemodeW::(anonymous struct at um/wingdi.h:2269:7)")] + [NativeTypeName("_devicemodeW::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2269:7)")] public _Anonymous2_e__Struct Anonymous2; public partial struct _Anonymous1_e__Struct diff --git a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO.cs b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO.cs index 59870d16c8..e41d49b90a 100644 --- a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO.cs +++ b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO.cs @@ -11,7 +11,7 @@ public partial struct DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO { public DISPLAYCONFIG_DEVICE_INFO_HEADER header; - [NativeTypeName("_DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO::(anonymous union at um/wingdi.h:3159:5)")] + [NativeTypeName("_DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:3159:5)")] public _Anonymous_e__Union Anonymous; public DISPLAYCONFIG_COLOR_ENCODING colorEncoding; @@ -23,7 +23,7 @@ public partial struct DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO public partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("_DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO::(anonymous struct at um/wingdi.h:3161:9)")] + [NativeTypeName("_DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:3161:9)")] public _Anonymous_e__Struct Anonymous; [FieldOffset(0)] diff --git a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_MODE_INFO.cs b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_MODE_INFO.cs index dc84eabfe6..43a9f4fb83 100644 --- a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_MODE_INFO.cs +++ b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_MODE_INFO.cs @@ -16,7 +16,7 @@ public partial struct DISPLAYCONFIG_MODE_INFO public LUID adapterId; - [NativeTypeName("DISPLAYCONFIG_MODE_INFO::(anonymous union at um/wingdi.h:2932:5)")] + [NativeTypeName("DISPLAYCONFIG_MODE_INFO::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2932:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_PATH_SOURCE_INFO.cs b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_PATH_SOURCE_INFO.cs index 8816d245a4..20a1ddd909 100644 --- a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_PATH_SOURCE_INFO.cs +++ b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_PATH_SOURCE_INFO.cs @@ -14,7 +14,7 @@ public partial struct DISPLAYCONFIG_PATH_SOURCE_INFO [NativeTypeName("UINT32")] public uint id; - [NativeTypeName("DISPLAYCONFIG_PATH_SOURCE_INFO::(anonymous union at um/wingdi.h:2950:5)")] + [NativeTypeName("DISPLAYCONFIG_PATH_SOURCE_INFO::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2950:5)")] public _Anonymous_e__Union Anonymous; [NativeTypeName("UINT32")] @@ -28,7 +28,7 @@ public partial struct _Anonymous_e__Union public uint modeInfoIdx; [FieldOffset(0)] - [NativeTypeName("DISPLAYCONFIG_PATH_SOURCE_INFO::(anonymous struct at um/wingdi.h:2953:9)")] + [NativeTypeName("DISPLAYCONFIG_PATH_SOURCE_INFO::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2953:9)")] public _Anonymous_e__Struct Anonymous; public partial struct _Anonymous_e__Struct diff --git a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_PATH_TARGET_INFO.cs b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_PATH_TARGET_INFO.cs index acfb4e1bda..ada31a573f 100644 --- a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_PATH_TARGET_INFO.cs +++ b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_PATH_TARGET_INFO.cs @@ -14,7 +14,7 @@ public partial struct DISPLAYCONFIG_PATH_TARGET_INFO [NativeTypeName("UINT32")] public uint id; - [NativeTypeName("DISPLAYCONFIG_PATH_TARGET_INFO::(anonymous union at um/wingdi.h:2973:5)")] + [NativeTypeName("DISPLAYCONFIG_PATH_TARGET_INFO::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2973:5)")] public _Anonymous_e__Union Anonymous; public DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY outputTechnology; @@ -41,7 +41,7 @@ public partial struct _Anonymous_e__Union public uint modeInfoIdx; [FieldOffset(0)] - [NativeTypeName("DISPLAYCONFIG_PATH_TARGET_INFO::(anonymous struct at um/wingdi.h:2976:9)")] + [NativeTypeName("DISPLAYCONFIG_PATH_TARGET_INFO::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2976:9)")] public _Anonymous_e__Struct Anonymous; public partial struct _Anonymous_e__Struct diff --git a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE.cs b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE.cs index c8aa082168..52722023da 100644 --- a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE.cs +++ b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE.cs @@ -11,14 +11,14 @@ public partial struct DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE { public DISPLAYCONFIG_DEVICE_INFO_HEADER header; - [NativeTypeName("_DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE::(anonymous union at um/wingdi.h:3180:5)")] + [NativeTypeName("_DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:3180:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] public partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("_DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE::(anonymous struct at um/wingdi.h:3182:9)")] + [NativeTypeName("_DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:3182:9)")] public _Anonymous_e__Struct Anonymous; [FieldOffset(0)] diff --git a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SET_TARGET_PERSISTENCE.cs b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SET_TARGET_PERSISTENCE.cs index 9d6d0f0f1b..4b167fa74e 100644 --- a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SET_TARGET_PERSISTENCE.cs +++ b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SET_TARGET_PERSISTENCE.cs @@ -11,14 +11,14 @@ public partial struct DISPLAYCONFIG_SET_TARGET_PERSISTENCE { public DISPLAYCONFIG_DEVICE_INFO_HEADER header; - [NativeTypeName("DISPLAYCONFIG_SET_TARGET_PERSISTENCE::(anonymous union at um/wingdi.h:3121:5)")] + [NativeTypeName("DISPLAYCONFIG_SET_TARGET_PERSISTENCE::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:3121:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] public partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("DISPLAYCONFIG_SET_TARGET_PERSISTENCE::(anonymous struct at um/wingdi.h:3123:9)")] + [NativeTypeName("DISPLAYCONFIG_SET_TARGET_PERSISTENCE::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:3123:9)")] public _Anonymous_e__Struct Anonymous; [FieldOffset(0)] diff --git a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION.cs b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION.cs index ac518ed1a8..dac9a0b425 100644 --- a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION.cs +++ b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION.cs @@ -11,14 +11,14 @@ public partial struct DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION { public DISPLAYCONFIG_DEVICE_INFO_HEADER header; - [NativeTypeName("DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION::(anonymous union at um/wingdi.h:3135:5)")] + [NativeTypeName("DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:3135:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] public partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION::(anonymous struct at um/wingdi.h:3137:9)")] + [NativeTypeName("DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:3137:9)")] public _Anonymous_e__Struct Anonymous; [FieldOffset(0)] diff --git a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS.cs b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS.cs index a74743076b..c4dd6bbece 100644 --- a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS.cs +++ b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS.cs @@ -9,14 +9,14 @@ namespace TerraFX.Interop { public partial struct DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS { - [NativeTypeName("DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS::(anonymous union at um/wingdi.h:3073:5)")] + [NativeTypeName("DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:3073:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] public partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS::(anonymous struct at um/wingdi.h:3075:9)")] + [NativeTypeName("DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:3075:9)")] public _Anonymous_e__Struct Anonymous; [FieldOffset(0)] diff --git a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_VIDEO_SIGNAL_INFO.cs b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_VIDEO_SIGNAL_INFO.cs index 0529da0cf1..69c1830219 100644 --- a/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_VIDEO_SIGNAL_INFO.cs +++ b/sources/Interop/Gdi32/um/wingdi/DISPLAYCONFIG_VIDEO_SIGNAL_INFO.cs @@ -20,7 +20,7 @@ public partial struct DISPLAYCONFIG_VIDEO_SIGNAL_INFO public DISPLAYCONFIG_2DREGION totalSize; - [NativeTypeName("DISPLAYCONFIG_VIDEO_SIGNAL_INFO::(anonymous union at um/wingdi.h:2850:5)")] + [NativeTypeName("DISPLAYCONFIG_VIDEO_SIGNAL_INFO::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2850:5)")] public _Anonymous_e__Union Anonymous; public DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering; @@ -29,7 +29,7 @@ public partial struct DISPLAYCONFIG_VIDEO_SIGNAL_INFO public partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("struct (anonymous struct at um/wingdi.h:2852:9)")] + [NativeTypeName("struct (anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/wingdi.h:2852:9)")] public _AdditionalSignalInfo_e__Struct AdditionalSignalInfo; [FieldOffset(0)] diff --git a/sources/Interop/Gdi32/um/wingdi/ENHMFENUMPROC.cs b/sources/Interop/Gdi32/um/wingdi/ENHMFENUMPROC.cs index e8155d72e1..145eeaf806 100644 --- a/sources/Interop/Gdi32/um/wingdi/ENHMFENUMPROC.cs +++ b/sources/Interop/Gdi32/um/wingdi/ENHMFENUMPROC.cs @@ -9,5 +9,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public unsafe delegate int ENHMFENUMPROC([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("HANDLETABLE *")] HANDLETABLE* lpht, [NativeTypeName("const ENHMETARECORD *")] ENHMETARECORD* lpmr, int nHandles, [NativeTypeName("LPARAM")] IntPtr data); + public unsafe delegate int ENHMFENUMPROC([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("HANDLETABLE *")] HANDLETABLE* lpht, [NativeTypeName("const ENHMETARECORD *")] ENHMETARECORD* lpmr, int nHandles, [NativeTypeName("LPARAM")] nint data); } diff --git a/sources/Interop/Gdi32/um/wingdi/EXTLOGPEN.cs b/sources/Interop/Gdi32/um/wingdi/EXTLOGPEN.cs index 88b5952de3..3cbccae5b8 100644 --- a/sources/Interop/Gdi32/um/wingdi/EXTLOGPEN.cs +++ b/sources/Interop/Gdi32/um/wingdi/EXTLOGPEN.cs @@ -3,8 +3,6 @@ // Ported from um/wingdi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct EXTLOGPEN @@ -22,7 +20,7 @@ public unsafe partial struct EXTLOGPEN public uint elpColor; [NativeTypeName("ULONG_PTR")] - public UIntPtr elpHatch; + public nuint elpHatch; [NativeTypeName("DWORD")] public uint elpNumEntries; diff --git a/sources/Interop/Gdi32/um/wingdi/GOBJENUMPROC.cs b/sources/Interop/Gdi32/um/wingdi/GOBJENUMPROC.cs index eebf0bf270..2427a602aa 100644 --- a/sources/Interop/Gdi32/um/wingdi/GOBJENUMPROC.cs +++ b/sources/Interop/Gdi32/um/wingdi/GOBJENUMPROC.cs @@ -3,11 +3,10 @@ // Ported from um/wingdi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public unsafe delegate int GOBJENUMPROC([NativeTypeName("LPVOID")] void* param0, [NativeTypeName("LPARAM")] IntPtr param1); + public unsafe delegate int GOBJENUMPROC([NativeTypeName("LPVOID")] void* param0, [NativeTypeName("LPARAM")] nint param1); } diff --git a/sources/Interop/Gdi32/um/wingdi/Gdi32.cs b/sources/Interop/Gdi32/um/wingdi/Gdi32.cs index b477f5f364..15919a2401 100644 --- a/sources/Interop/Gdi32/um/wingdi/Gdi32.cs +++ b/sources/Interop/Gdi32/um/wingdi/Gdi32.cs @@ -217,25 +217,25 @@ public static unsafe partial class Gdi32 public static extern int Ellipse([NativeTypeName("HDC")] IntPtr hdc, int left, int top, int right, int bottom); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumFontFamiliesExA", ExactSpelling = true)] - public static extern int EnumFontFamiliesExA([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPLOGFONTA")] LOGFONTA* lpLogfont, [NativeTypeName("FONTENUMPROCA")] IntPtr lpProc, [NativeTypeName("LPARAM")] IntPtr lParam, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int EnumFontFamiliesExA([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPLOGFONTA")] LOGFONTA* lpLogfont, [NativeTypeName("FONTENUMPROCA")] IntPtr lpProc, [NativeTypeName("LPARAM")] nint lParam, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumFontFamiliesExW", ExactSpelling = true)] - public static extern int EnumFontFamiliesExW([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPLOGFONTW")] LOGFONTW* lpLogfont, [NativeTypeName("FONTENUMPROCW")] IntPtr lpProc, [NativeTypeName("LPARAM")] IntPtr lParam, [NativeTypeName("DWORD")] uint dwFlags); + public static extern int EnumFontFamiliesExW([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPLOGFONTW")] LOGFONTW* lpLogfont, [NativeTypeName("FONTENUMPROCW")] IntPtr lpProc, [NativeTypeName("LPARAM")] nint lParam, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumFontFamiliesA", ExactSpelling = true)] - public static extern int EnumFontFamiliesA([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPCSTR")] sbyte* lpLogfont, [NativeTypeName("FONTENUMPROCA")] IntPtr lpProc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumFontFamiliesA([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPCSTR")] sbyte* lpLogfont, [NativeTypeName("FONTENUMPROCA")] IntPtr lpProc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumFontFamiliesW", ExactSpelling = true)] - public static extern int EnumFontFamiliesW([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPCWSTR")] ushort* lpLogfont, [NativeTypeName("FONTENUMPROCW")] IntPtr lpProc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumFontFamiliesW([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPCWSTR")] ushort* lpLogfont, [NativeTypeName("FONTENUMPROCW")] IntPtr lpProc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumFontsA", ExactSpelling = true)] - public static extern int EnumFontsA([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPCSTR")] sbyte* lpLogfont, [NativeTypeName("FONTENUMPROCA")] IntPtr lpProc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumFontsA([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPCSTR")] sbyte* lpLogfont, [NativeTypeName("FONTENUMPROCA")] IntPtr lpProc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumFontsW", ExactSpelling = true)] - public static extern int EnumFontsW([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPCWSTR")] ushort* lpLogfont, [NativeTypeName("FONTENUMPROCW")] IntPtr lpProc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumFontsW([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPCWSTR")] ushort* lpLogfont, [NativeTypeName("FONTENUMPROCW")] IntPtr lpProc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumObjects", ExactSpelling = true)] - public static extern int EnumObjects([NativeTypeName("HDC")] IntPtr hdc, int nType, [NativeTypeName("GOBJENUMPROC")] IntPtr lpFunc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumObjects([NativeTypeName("HDC")] IntPtr hdc, int nType, [NativeTypeName("GOBJENUMPROC")] IntPtr lpFunc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EqualRgn", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -604,7 +604,7 @@ public static unsafe partial class Gdi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "LineDDA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int LineDDA(int xStart, int yStart, int xEnd, int yEnd, [NativeTypeName("LINEDDAPROC")] IntPtr lpProc, [NativeTypeName("LPARAM")] IntPtr data); + public static extern int LineDDA(int xStart, int yStart, int xEnd, int yEnd, [NativeTypeName("LINEDDAPROC")] IntPtr lpProc, [NativeTypeName("LPARAM")] nint data); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "LineTo", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -871,7 +871,7 @@ public static unsafe partial class Gdi32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumMetaFile", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumMetaFile([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("HMETAFILE")] IntPtr hmf, [NativeTypeName("MFENUMPROC")] IntPtr proc, [NativeTypeName("LPARAM")] IntPtr param3); + public static extern int EnumMetaFile([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("HMETAFILE")] IntPtr hmf, [NativeTypeName("MFENUMPROC")] IntPtr proc, [NativeTypeName("LPARAM")] nint param3); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CloseEnhMetaFile", ExactSpelling = true)] [return: NativeTypeName("HENHMETAFILE")] @@ -1315,10 +1315,10 @@ public static unsafe partial class Gdi32 public static extern int ColorMatchToTarget([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("HDC")] IntPtr hdcTarget, [NativeTypeName("DWORD")] uint action); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumICMProfilesA", ExactSpelling = true)] - public static extern int EnumICMProfilesA([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("ICMENUMPROCA")] IntPtr proc, [NativeTypeName("LPARAM")] IntPtr param2); + public static extern int EnumICMProfilesA([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("ICMENUMPROCA")] IntPtr proc, [NativeTypeName("LPARAM")] nint param2); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumICMProfilesW", ExactSpelling = true)] - public static extern int EnumICMProfilesW([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("ICMENUMPROCW")] IntPtr proc, [NativeTypeName("LPARAM")] IntPtr param2); + public static extern int EnumICMProfilesW([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("ICMENUMPROCW")] IntPtr proc, [NativeTypeName("LPARAM")] nint param2); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "UpdateICMRegKeyA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] diff --git a/sources/Interop/Gdi32/um/wingdi/ICMENUMPROCA.cs b/sources/Interop/Gdi32/um/wingdi/ICMENUMPROCA.cs index 2f287cc62f..09a835e956 100644 --- a/sources/Interop/Gdi32/um/wingdi/ICMENUMPROCA.cs +++ b/sources/Interop/Gdi32/um/wingdi/ICMENUMPROCA.cs @@ -3,11 +3,10 @@ // Ported from um/wingdi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public unsafe delegate int ICMENUMPROCA([NativeTypeName("LPSTR")] sbyte* param0, [NativeTypeName("LPARAM")] IntPtr param1); + public unsafe delegate int ICMENUMPROCA([NativeTypeName("LPSTR")] sbyte* param0, [NativeTypeName("LPARAM")] nint param1); } diff --git a/sources/Interop/Gdi32/um/wingdi/ICMENUMPROCW.cs b/sources/Interop/Gdi32/um/wingdi/ICMENUMPROCW.cs index 47aff87cbc..f15868edf8 100644 --- a/sources/Interop/Gdi32/um/wingdi/ICMENUMPROCW.cs +++ b/sources/Interop/Gdi32/um/wingdi/ICMENUMPROCW.cs @@ -3,11 +3,10 @@ // Ported from um/wingdi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public unsafe delegate int ICMENUMPROCW([NativeTypeName("LPWSTR")] ushort* param0, [NativeTypeName("LPARAM")] IntPtr param1); + public unsafe delegate int ICMENUMPROCW([NativeTypeName("LPWSTR")] ushort* param0, [NativeTypeName("LPARAM")] nint param1); } diff --git a/sources/Interop/Gdi32/um/wingdi/LINEDDAPROC.cs b/sources/Interop/Gdi32/um/wingdi/LINEDDAPROC.cs index 5e9944d1b8..5b7f053478 100644 --- a/sources/Interop/Gdi32/um/wingdi/LINEDDAPROC.cs +++ b/sources/Interop/Gdi32/um/wingdi/LINEDDAPROC.cs @@ -3,11 +3,10 @@ // Ported from um/wingdi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public delegate void LINEDDAPROC(int param0, int param1, [NativeTypeName("LPARAM")] IntPtr param2); + public delegate void LINEDDAPROC(int param0, int param1, [NativeTypeName("LPARAM")] nint param2); } diff --git a/sources/Interop/Gdi32/um/wingdi/LOGBRUSH.cs b/sources/Interop/Gdi32/um/wingdi/LOGBRUSH.cs index fe66d3bc62..a7c49633cf 100644 --- a/sources/Interop/Gdi32/um/wingdi/LOGBRUSH.cs +++ b/sources/Interop/Gdi32/um/wingdi/LOGBRUSH.cs @@ -3,8 +3,6 @@ // Ported from um/wingdi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct LOGBRUSH @@ -16,6 +14,6 @@ public partial struct LOGBRUSH public uint lbColor; [NativeTypeName("ULONG_PTR")] - public UIntPtr lbHatch; + public nuint lbHatch; } } diff --git a/sources/Interop/Gdi32/um/wingdi/MFENUMPROC.cs b/sources/Interop/Gdi32/um/wingdi/MFENUMPROC.cs index e8cda981e5..02bef15237 100644 --- a/sources/Interop/Gdi32/um/wingdi/MFENUMPROC.cs +++ b/sources/Interop/Gdi32/um/wingdi/MFENUMPROC.cs @@ -9,5 +9,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public unsafe delegate int MFENUMPROC([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("HANDLETABLE *")] HANDLETABLE* lpht, [NativeTypeName("METARECORD *")] METARECORD* lpMR, int nObj, [NativeTypeName("LPARAM")] IntPtr param4); + public unsafe delegate int MFENUMPROC([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("HANDLETABLE *")] HANDLETABLE* lpht, [NativeTypeName("METARECORD *")] METARECORD* lpMR, int nObj, [NativeTypeName("LPARAM")] nint param4); } diff --git a/sources/Interop/Gdi32/um/wingdi/OLDFONTENUMPROCA.cs b/sources/Interop/Gdi32/um/wingdi/OLDFONTENUMPROCA.cs index c375d7827a..1fda3b7537 100644 --- a/sources/Interop/Gdi32/um/wingdi/OLDFONTENUMPROCA.cs +++ b/sources/Interop/Gdi32/um/wingdi/OLDFONTENUMPROCA.cs @@ -3,11 +3,10 @@ // Ported from um/wingdi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public unsafe delegate int OLDFONTENUMPROCA([NativeTypeName("const LOGFONTA *")] LOGFONTA* param0, [NativeTypeName("const TEXTMETRICA *")] TEXTMETRICA* param1, [NativeTypeName("DWORD")] uint param2, [NativeTypeName("LPARAM")] IntPtr param3); + public unsafe delegate int OLDFONTENUMPROCA([NativeTypeName("const LOGFONTA *")] LOGFONTA* param0, [NativeTypeName("const TEXTMETRICA *")] TEXTMETRICA* param1, [NativeTypeName("DWORD")] uint param2, [NativeTypeName("LPARAM")] nint param3); } diff --git a/sources/Interop/Gdi32/um/wingdi/OLDFONTENUMPROCW.cs b/sources/Interop/Gdi32/um/wingdi/OLDFONTENUMPROCW.cs index 638c6be0ee..3a3b7704f5 100644 --- a/sources/Interop/Gdi32/um/wingdi/OLDFONTENUMPROCW.cs +++ b/sources/Interop/Gdi32/um/wingdi/OLDFONTENUMPROCW.cs @@ -3,11 +3,10 @@ // Ported from um/wingdi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public unsafe delegate int OLDFONTENUMPROCW([NativeTypeName("const LOGFONTW *")] LOGFONTW* param0, [NativeTypeName("const TEXTMETRICW *")] TEXTMETRICW* param1, [NativeTypeName("DWORD")] uint param2, [NativeTypeName("LPARAM")] IntPtr param3); + public unsafe delegate int OLDFONTENUMPROCW([NativeTypeName("const LOGFONTW *")] LOGFONTW* param0, [NativeTypeName("const TEXTMETRICW *")] TEXTMETRICW* param1, [NativeTypeName("DWORD")] uint param2, [NativeTypeName("LPARAM")] nint param3); } diff --git a/sources/Interop/Hid/TerraFX.Interop.Hid.csproj b/sources/Interop/Hid/TerraFX.Interop.Hid.csproj index e337e1395a..1574209352 100644 --- a/sources/Interop/Hid/TerraFX.Interop.Hid.csproj +++ b/sources/Interop/Hid/TerraFX.Interop.Hid.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/Hid/shared/hidpi/Hid.cs b/sources/Interop/Hid/shared/hidpi/Hid.cs index b8da145c12..97029e7846 100644 --- a/sources/Interop/Hid/shared/hidpi/Hid.cs +++ b/sources/Interop/Hid/shared/hidpi/Hid.cs @@ -108,10 +108,10 @@ public static unsafe partial class Hid [DllImport(LibraryPath, CallingConvention = CallingConvention.StdCall, EntryPoint = "HidP_TranslateUsageAndPagesToI8042ScanCodes", ExactSpelling = true)] [return: NativeTypeName("NTSTATUS")] - public static extern int HidP_TranslateUsageAndPagesToI8042ScanCodes([NativeTypeName("PUSAGE_AND_PAGE")] USAGE_AND_PAGE* ChangedUsageList, [NativeTypeName("ULONG")] uint UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, [NativeTypeName("PHIDP_KEYBOARD_MODIFIER_STATE")] HIDP_KEYBOARD_MODIFIER_STATE* ModifierState, [NativeTypeName("PHIDP_INSERT_SCANCODES")] IntPtr* InsertCodesProcedure, [NativeTypeName("PVOID")] void* InsertCodesContext); + public static extern int HidP_TranslateUsageAndPagesToI8042ScanCodes([NativeTypeName("PUSAGE_AND_PAGE")] USAGE_AND_PAGE* ChangedUsageList, [NativeTypeName("ULONG")] uint UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, [NativeTypeName("PHIDP_KEYBOARD_MODIFIER_STATE")] HIDP_KEYBOARD_MODIFIER_STATE* ModifierState, [NativeTypeName("PHIDP_INSERT_SCANCODES")] IntPtr InsertCodesProcedure, [NativeTypeName("PVOID")] void* InsertCodesContext); [DllImport(LibraryPath, CallingConvention = CallingConvention.StdCall, EntryPoint = "HidP_TranslateUsagesToI8042ScanCodes", ExactSpelling = true)] [return: NativeTypeName("NTSTATUS")] - public static extern int HidP_TranslateUsagesToI8042ScanCodes([NativeTypeName("PUSAGE")] ushort* ChangedUsageList, [NativeTypeName("ULONG")] uint UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, [NativeTypeName("PHIDP_KEYBOARD_MODIFIER_STATE")] HIDP_KEYBOARD_MODIFIER_STATE* ModifierState, [NativeTypeName("PHIDP_INSERT_SCANCODES")] IntPtr* InsertCodesProcedure, [NativeTypeName("PVOID")] void* InsertCodesContext); + public static extern int HidP_TranslateUsagesToI8042ScanCodes([NativeTypeName("PUSAGE")] ushort* ChangedUsageList, [NativeTypeName("ULONG")] uint UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, [NativeTypeName("PHIDP_KEYBOARD_MODIFIER_STATE")] HIDP_KEYBOARD_MODIFIER_STATE* ModifierState, [NativeTypeName("PHIDP_INSERT_SCANCODES")] IntPtr InsertCodesProcedure, [NativeTypeName("PVOID")] void* InsertCodesContext); } } diff --git a/sources/Interop/Kernel32/TerraFX.Interop.Kernel32.csproj b/sources/Interop/Kernel32/TerraFX.Interop.Kernel32.csproj index ac3faf3282..6a73dafec2 100644 --- a/sources/Interop/Kernel32/TerraFX.Interop.Kernel32.csproj +++ b/sources/Interop/Kernel32/TerraFX.Interop.Kernel32.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/Kernel32/um/fileapi/Kernel32.cs b/sources/Interop/Kernel32/um/fileapi/Kernel32.cs index 936c9adc8a..bfd60cbee0 100644 --- a/sources/Interop/Kernel32/um/fileapi/Kernel32.cs +++ b/sources/Interop/Kernel32/um/fileapi/Kernel32.cs @@ -252,7 +252,7 @@ public static unsafe partial class Kernel32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ReadFileEx", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int ReadFileEx([NativeTypeName("HANDLE")] IntPtr hFile, [NativeTypeName("LPVOID")] void* lpBuffer, [NativeTypeName("DWORD")] uint nNumberOfBytesToRead, [NativeTypeName("LPOVERLAPPED")] OVERLAPPED* lpOverlapped, [NativeTypeName("LPOVERLAPPED_COMPLETION_ROUTINE")] IntPtr* lpCompletionRoutine); + public static extern int ReadFileEx([NativeTypeName("HANDLE")] IntPtr hFile, [NativeTypeName("LPVOID")] void* lpBuffer, [NativeTypeName("DWORD")] uint nNumberOfBytesToRead, [NativeTypeName("LPOVERLAPPED")] OVERLAPPED* lpOverlapped, [NativeTypeName("LPOVERLAPPED_COMPLETION_ROUTINE")] IntPtr lpCompletionRoutine); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ReadFileScatter", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -312,7 +312,7 @@ public static unsafe partial class Kernel32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "WriteFileEx", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int WriteFileEx([NativeTypeName("HANDLE")] IntPtr hFile, [NativeTypeName("LPCVOID")] void* lpBuffer, [NativeTypeName("DWORD")] uint nNumberOfBytesToWrite, [NativeTypeName("LPOVERLAPPED")] OVERLAPPED* lpOverlapped, [NativeTypeName("LPOVERLAPPED_COMPLETION_ROUTINE")] IntPtr* lpCompletionRoutine); + public static extern int WriteFileEx([NativeTypeName("HANDLE")] IntPtr hFile, [NativeTypeName("LPCVOID")] void* lpBuffer, [NativeTypeName("DWORD")] uint nNumberOfBytesToWrite, [NativeTypeName("LPOVERLAPPED")] OVERLAPPED* lpOverlapped, [NativeTypeName("LPOVERLAPPED_COMPLETION_ROUTINE")] IntPtr lpCompletionRoutine); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "WriteFileGather", ExactSpelling = true)] [return: NativeTypeName("BOOL")] diff --git a/sources/Interop/Kernel32/um/heapapi/HEAP_SUMMARY.cs b/sources/Interop/Kernel32/um/heapapi/HEAP_SUMMARY.cs index 7da931c0a3..a99674258d 100644 --- a/sources/Interop/Kernel32/um/heapapi/HEAP_SUMMARY.cs +++ b/sources/Interop/Kernel32/um/heapapi/HEAP_SUMMARY.cs @@ -3,8 +3,6 @@ // Ported from um/heapapi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct HEAP_SUMMARY @@ -13,15 +11,15 @@ public partial struct HEAP_SUMMARY public uint cb; [NativeTypeName("SIZE_T")] - public UIntPtr cbAllocated; + public nuint cbAllocated; [NativeTypeName("SIZE_T")] - public UIntPtr cbCommitted; + public nuint cbCommitted; [NativeTypeName("SIZE_T")] - public UIntPtr cbReserved; + public nuint cbReserved; [NativeTypeName("SIZE_T")] - public UIntPtr cbMaxReserve; + public nuint cbMaxReserve; } } diff --git a/sources/Interop/Kernel32/um/heapapi/Kernel32.cs b/sources/Interop/Kernel32/um/heapapi/Kernel32.cs index 85cc1ea82a..8d237a9b63 100644 --- a/sources/Interop/Kernel32/um/heapapi/Kernel32.cs +++ b/sources/Interop/Kernel32/um/heapapi/Kernel32.cs @@ -12,7 +12,7 @@ public static unsafe partial class Kernel32 { [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "HeapCreate", ExactSpelling = true)] [return: NativeTypeName("HANDLE")] - public static extern IntPtr HeapCreate([NativeTypeName("DWORD")] uint flOptions, [NativeTypeName("SIZE_T")] UIntPtr dwInitialSize, [NativeTypeName("SIZE_T")] UIntPtr dwMaximumSize); + public static extern IntPtr HeapCreate([NativeTypeName("DWORD")] uint flOptions, [NativeTypeName("SIZE_T")] nuint dwInitialSize, [NativeTypeName("SIZE_T")] nuint dwMaximumSize); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "HeapDestroy", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -20,11 +20,11 @@ public static unsafe partial class Kernel32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "HeapAlloc", ExactSpelling = true)] [return: NativeTypeName("LPVOID")] - public static extern void* HeapAlloc([NativeTypeName("HANDLE")] IntPtr hHeap, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("SIZE_T")] UIntPtr dwBytes); + public static extern void* HeapAlloc([NativeTypeName("HANDLE")] IntPtr hHeap, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("SIZE_T")] nuint dwBytes); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "HeapReAlloc", ExactSpelling = true)] [return: NativeTypeName("LPVOID")] - public static extern void* HeapReAlloc([NativeTypeName("HANDLE")] IntPtr hHeap, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LPVOID")] void* lpMem, [NativeTypeName("SIZE_T")] UIntPtr dwBytes); + public static extern void* HeapReAlloc([NativeTypeName("HANDLE")] IntPtr hHeap, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LPVOID")] void* lpMem, [NativeTypeName("SIZE_T")] nuint dwBytes); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "HeapFree", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -32,7 +32,7 @@ public static unsafe partial class Kernel32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "HeapSize", ExactSpelling = true)] [return: NativeTypeName("SIZE_T")] - public static extern UIntPtr HeapSize([NativeTypeName("HANDLE")] IntPtr hHeap, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LPCVOID")] void* lpMem); + public static extern nuint HeapSize([NativeTypeName("HANDLE")] IntPtr hHeap, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LPCVOID")] void* lpMem); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetProcessHeap", ExactSpelling = true)] [return: NativeTypeName("HANDLE")] @@ -40,11 +40,11 @@ public static unsafe partial class Kernel32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "HeapCompact", ExactSpelling = true)] [return: NativeTypeName("SIZE_T")] - public static extern UIntPtr HeapCompact([NativeTypeName("HANDLE")] IntPtr hHeap, [NativeTypeName("DWORD")] uint dwFlags); + public static extern nuint HeapCompact([NativeTypeName("HANDLE")] IntPtr hHeap, [NativeTypeName("DWORD")] uint dwFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "HeapSetInformation", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int HeapSetInformation([NativeTypeName("HANDLE")] IntPtr HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, [NativeTypeName("PVOID")] void* HeapInformation, [NativeTypeName("SIZE_T")] UIntPtr HeapInformationLength); + public static extern int HeapSetInformation([NativeTypeName("HANDLE")] IntPtr HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, [NativeTypeName("PVOID")] void* HeapInformation, [NativeTypeName("SIZE_T")] nuint HeapInformationLength); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "HeapValidate", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -72,6 +72,6 @@ public static unsafe partial class Kernel32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "HeapQueryInformation", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int HeapQueryInformation([NativeTypeName("HANDLE")] IntPtr HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, [NativeTypeName("PVOID")] void* HeapInformation, [NativeTypeName("SIZE_T")] UIntPtr HeapInformationLength, [NativeTypeName("PSIZE_T")] UIntPtr* ReturnLength); + public static extern int HeapQueryInformation([NativeTypeName("HANDLE")] IntPtr HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, [NativeTypeName("PVOID")] void* HeapInformation, [NativeTypeName("SIZE_T")] nuint HeapInformationLength, [NativeTypeName("PSIZE_T")] nuint* ReturnLength); } } diff --git a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESLANGPROCA.cs b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESLANGPROCA.cs index bb1e7fbc67..e3d5f0357f 100644 --- a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESLANGPROCA.cs +++ b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESLANGPROCA.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int ENUMRESLANGPROCA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCSTR")] sbyte* lpType, [NativeTypeName("LPCSTR")] sbyte* lpName, [NativeTypeName("WORD")] ushort wLanguage, [NativeTypeName("LONG_PTR")] IntPtr lParam); + public unsafe delegate int ENUMRESLANGPROCA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCSTR")] sbyte* lpType, [NativeTypeName("LPCSTR")] sbyte* lpName, [NativeTypeName("WORD")] ushort wLanguage, [NativeTypeName("LONG_PTR")] nint lParam); } diff --git a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESLANGPROCW.cs b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESLANGPROCW.cs index 5727d89f48..350949bfee 100644 --- a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESLANGPROCW.cs +++ b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESLANGPROCW.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int ENUMRESLANGPROCW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCWSTR")] ushort* lpType, [NativeTypeName("LPCWSTR")] ushort* lpName, [NativeTypeName("WORD")] ushort wLanguage, [NativeTypeName("LONG_PTR")] IntPtr lParam); + public unsafe delegate int ENUMRESLANGPROCW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCWSTR")] ushort* lpType, [NativeTypeName("LPCWSTR")] ushort* lpName, [NativeTypeName("WORD")] ushort wLanguage, [NativeTypeName("LONG_PTR")] nint lParam); } diff --git a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESNAMEPROCA.cs b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESNAMEPROCA.cs index b5d89183f1..0184bfa98e 100644 --- a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESNAMEPROCA.cs +++ b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESNAMEPROCA.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int ENUMRESNAMEPROCA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCSTR")] sbyte* lpType, [NativeTypeName("LPSTR")] sbyte* lpName, [NativeTypeName("LONG_PTR")] IntPtr lParam); + public unsafe delegate int ENUMRESNAMEPROCA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCSTR")] sbyte* lpType, [NativeTypeName("LPSTR")] sbyte* lpName, [NativeTypeName("LONG_PTR")] nint lParam); } diff --git a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESNAMEPROCW.cs b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESNAMEPROCW.cs index 660e631f89..ec292d6039 100644 --- a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESNAMEPROCW.cs +++ b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESNAMEPROCW.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int ENUMRESNAMEPROCW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCWSTR")] ushort* lpType, [NativeTypeName("LPWSTR")] ushort* lpName, [NativeTypeName("LONG_PTR")] IntPtr lParam); + public unsafe delegate int ENUMRESNAMEPROCW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCWSTR")] ushort* lpType, [NativeTypeName("LPWSTR")] ushort* lpName, [NativeTypeName("LONG_PTR")] nint lParam); } diff --git a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESTYPEPROCA.cs b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESTYPEPROCA.cs index f1f7970be5..d6799cf16d 100644 --- a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESTYPEPROCA.cs +++ b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESTYPEPROCA.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int ENUMRESTYPEPROCA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPSTR")] sbyte* lpType, [NativeTypeName("LONG_PTR")] IntPtr lParam); + public unsafe delegate int ENUMRESTYPEPROCA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPSTR")] sbyte* lpType, [NativeTypeName("LONG_PTR")] nint lParam); } diff --git a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESTYPEPROCW.cs b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESTYPEPROCW.cs index 201fbf9447..e4eee6a949 100644 --- a/sources/Interop/Kernel32/um/libloaderapi/ENUMRESTYPEPROCW.cs +++ b/sources/Interop/Kernel32/um/libloaderapi/ENUMRESTYPEPROCW.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int ENUMRESTYPEPROCW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPWSTR")] ushort* lpType, [NativeTypeName("LONG_PTR")] IntPtr lParam); + public unsafe delegate int ENUMRESTYPEPROCW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPWSTR")] ushort* lpType, [NativeTypeName("LONG_PTR")] nint lParam); } diff --git a/sources/Interop/Kernel32/um/libloaderapi/Kernel32.cs b/sources/Interop/Kernel32/um/libloaderapi/Kernel32.cs index f3cfdb3d0b..159d18045e 100644 --- a/sources/Interop/Kernel32/um/libloaderapi/Kernel32.cs +++ b/sources/Interop/Kernel32/um/libloaderapi/Kernel32.cs @@ -100,27 +100,27 @@ public static unsafe partial class Kernel32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumResourceLanguagesExA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumResourceLanguagesExA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCSTR")] sbyte* lpType, [NativeTypeName("LPCSTR")] sbyte* lpName, [NativeTypeName("ENUMRESLANGPROCA")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] IntPtr lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); + public static extern int EnumResourceLanguagesExA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCSTR")] sbyte* lpType, [NativeTypeName("LPCSTR")] sbyte* lpName, [NativeTypeName("ENUMRESLANGPROCA")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] nint lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumResourceLanguagesExW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumResourceLanguagesExW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCWSTR")] ushort* lpType, [NativeTypeName("LPCWSTR")] ushort* lpName, [NativeTypeName("ENUMRESLANGPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] IntPtr lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); + public static extern int EnumResourceLanguagesExW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCWSTR")] ushort* lpType, [NativeTypeName("LPCWSTR")] ushort* lpName, [NativeTypeName("ENUMRESLANGPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] nint lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumResourceNamesExA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumResourceNamesExA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCSTR")] sbyte* lpType, [NativeTypeName("ENUMRESNAMEPROCA")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] IntPtr lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); + public static extern int EnumResourceNamesExA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCSTR")] sbyte* lpType, [NativeTypeName("ENUMRESNAMEPROCA")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] nint lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumResourceNamesExW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumResourceNamesExW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCWSTR")] ushort* lpType, [NativeTypeName("ENUMRESNAMEPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] IntPtr lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); + public static extern int EnumResourceNamesExW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCWSTR")] ushort* lpType, [NativeTypeName("ENUMRESNAMEPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] nint lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumResourceTypesExA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumResourceTypesExA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("ENUMRESTYPEPROCA")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] IntPtr lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); + public static extern int EnumResourceTypesExA([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("ENUMRESTYPEPROCA")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] nint lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumResourceTypesExW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumResourceTypesExW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("ENUMRESTYPEPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] IntPtr lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); + public static extern int EnumResourceTypesExW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("ENUMRESTYPEPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] nint lParam, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("LANGID")] ushort LangId); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "FindResourceW", ExactSpelling = true)] [return: NativeTypeName("HRSRC")] @@ -136,6 +136,6 @@ public static unsafe partial class Kernel32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumResourceNamesW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumResourceNamesW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCWSTR")] ushort* lpType, [NativeTypeName("ENUMRESNAMEPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] IntPtr lParam); + public static extern int EnumResourceNamesW([NativeTypeName("HMODULE")] IntPtr hModule, [NativeTypeName("LPCWSTR")] ushort* lpType, [NativeTypeName("ENUMRESNAMEPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LONG_PTR")] nint lParam); } } diff --git a/sources/Interop/Kernel32/um/synchapi/Kernel32.cs b/sources/Interop/Kernel32/um/synchapi/Kernel32.cs index 4f596a0789..f38c105c5a 100644 --- a/sources/Interop/Kernel32/um/synchapi/Kernel32.cs +++ b/sources/Interop/Kernel32/um/synchapi/Kernel32.cs @@ -214,7 +214,7 @@ public static unsafe partial class Kernel32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "WaitOnAddress", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int WaitOnAddress([NativeTypeName("volatile void *")] void* Address, [NativeTypeName("PVOID")] void* CompareAddress, [NativeTypeName("SIZE_T")] UIntPtr AddressSize, [NativeTypeName("DWORD")] uint dwMilliseconds); + public static extern int WaitOnAddress([NativeTypeName("volatile void *")] void* Address, [NativeTypeName("PVOID")] void* CompareAddress, [NativeTypeName("SIZE_T")] nuint AddressSize, [NativeTypeName("DWORD")] uint dwMilliseconds); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "WakeByAddressSingle", ExactSpelling = true)] public static extern void WakeByAddressSingle([NativeTypeName("PVOID")] void* Address); diff --git a/sources/Interop/Kernel32/um/sysinfoapi/SYSTEM_INFO.cs b/sources/Interop/Kernel32/um/sysinfoapi/SYSTEM_INFO.cs index 919e534637..29140e3ca4 100644 --- a/sources/Interop/Kernel32/um/sysinfoapi/SYSTEM_INFO.cs +++ b/sources/Interop/Kernel32/um/sysinfoapi/SYSTEM_INFO.cs @@ -3,7 +3,6 @@ // Ported from um/sysinfoapi.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -23,7 +22,7 @@ public unsafe partial struct SYSTEM_INFO public void* lpMaximumApplicationAddress; [NativeTypeName("DWORD_PTR")] - public UIntPtr dwActiveProcessorMask; + public nuint dwActiveProcessorMask; [NativeTypeName("DWORD")] public uint dwNumberOfProcessors; diff --git a/sources/Interop/Ole32/TerraFX.Interop.Ole32.csproj b/sources/Interop/Ole32/TerraFX.Interop.Ole32.csproj index e337e1395a..1574209352 100644 --- a/sources/Interop/Ole32/TerraFX.Interop.Ole32.csproj +++ b/sources/Interop/Ole32/TerraFX.Interop.Ole32.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/SetupApi/SetupApi.cs b/sources/Interop/SetupApi/SetupApi.cs deleted file mode 100644 index 206a1ca693..0000000000 --- a/sources/Interop/SetupApi/SetupApi.cs +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. - -namespace TerraFX.Interop -{ - public static unsafe partial class SetupApi - { - private const string LibraryPath = "setupapi"; - } -} diff --git a/sources/Interop/SetupApi/TerraFX.Interop.SetupApi.csproj b/sources/Interop/SetupApi/TerraFX.Interop.SetupApi.csproj index 4520781cb5..a646629ed5 100644 --- a/sources/Interop/SetupApi/TerraFX.Interop.SetupApi.csproj +++ b/sources/Interop/SetupApi/TerraFX.Interop.SetupApi.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_CLASSIMAGELIST_DATA.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_CLASSIMAGELIST_DATA.cs index 0a9c3dc33f..3cd49f7eae 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_CLASSIMAGELIST_DATA.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_CLASSIMAGELIST_DATA.cs @@ -16,6 +16,6 @@ public partial struct SP_CLASSIMAGELIST_DATA public IntPtr ImageList; [NativeTypeName("ULONG_PTR")] - public UIntPtr Reserved; + public nuint Reserved; } } diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DETECTDEVICE_PARAMS.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DETECTDEVICE_PARAMS.cs index 99e967ddf8..e5ae5af850 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DETECTDEVICE_PARAMS.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DETECTDEVICE_PARAMS.cs @@ -12,7 +12,7 @@ public unsafe partial struct SP_DETECTDEVICE_PARAMS public SP_CLASSINSTALL_HEADER ClassInstallHeader; [NativeTypeName("PDETECT_PROGRESS_NOTIFY")] - public IntPtr* DetectProgressNotify; + public IntPtr DetectProgressNotify; [NativeTypeName("PVOID")] public void* ProgressNotifyParam; diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DEVICE_INTERFACE_DATA.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DEVICE_INTERFACE_DATA.cs index 6e198e3901..ca3410a2ff 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DEVICE_INTERFACE_DATA.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DEVICE_INTERFACE_DATA.cs @@ -19,6 +19,6 @@ public partial struct SP_DEVICE_INTERFACE_DATA public uint Flags; [NativeTypeName("ULONG_PTR")] - public UIntPtr Reserved; + public nuint Reserved; } } diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINFO_DATA.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINFO_DATA.cs index 69e50c14dd..7a40db8c95 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINFO_DATA.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINFO_DATA.cs @@ -19,6 +19,6 @@ public partial struct SP_DEVINFO_DATA public uint DevInst; [NativeTypeName("ULONG_PTR")] - public UIntPtr Reserved; + public nuint Reserved; } } diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINSTALL_PARAMS_A.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINSTALL_PARAMS_A.cs index 9c8ce028ef..5b86008946 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINSTALL_PARAMS_A.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINSTALL_PARAMS_A.cs @@ -22,7 +22,7 @@ public unsafe partial struct SP_DEVINSTALL_PARAMS_A public IntPtr hwndParent; [NativeTypeName("PSP_FILE_CALLBACK_A")] - public IntPtr* InstallMsgHandler; + public IntPtr InstallMsgHandler; [NativeTypeName("PVOID")] public void* InstallMsgHandlerContext; @@ -31,7 +31,7 @@ public unsafe partial struct SP_DEVINSTALL_PARAMS_A public void* FileQueue; [NativeTypeName("ULONG_PTR")] - public UIntPtr ClassInstallReserved; + public nuint ClassInstallReserved; [NativeTypeName("DWORD")] public uint Reserved; diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINSTALL_PARAMS_W.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINSTALL_PARAMS_W.cs index 68a93ddfc8..67af3ed39b 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINSTALL_PARAMS_W.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DEVINSTALL_PARAMS_W.cs @@ -22,7 +22,7 @@ public unsafe partial struct SP_DEVINSTALL_PARAMS_W public IntPtr hwndParent; [NativeTypeName("PSP_FILE_CALLBACK_A")] - public IntPtr* InstallMsgHandler; + public IntPtr InstallMsgHandler; [NativeTypeName("PVOID")] public void* InstallMsgHandlerContext; @@ -31,7 +31,7 @@ public unsafe partial struct SP_DEVINSTALL_PARAMS_W public void* FileQueue; [NativeTypeName("ULONG_PTR")] - public UIntPtr ClassInstallReserved; + public nuint ClassInstallReserved; [NativeTypeName("DWORD")] public uint Reserved; diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V1_A.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V1_A.cs index b42686214f..0336335e83 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V1_A.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V1_A.cs @@ -3,8 +3,6 @@ // Ported from um/SetupAPI.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct SP_DRVINFO_DATA_V1_A @@ -16,7 +14,7 @@ public unsafe partial struct SP_DRVINFO_DATA_V1_A public uint DriverType; [NativeTypeName("ULONG_PTR")] - public UIntPtr Reserved; + public nuint Reserved; [NativeTypeName("CHAR [256]")] public fixed sbyte Description[256]; diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V1_W.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V1_W.cs index 35fbf96282..c4d5f80c54 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V1_W.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V1_W.cs @@ -3,8 +3,6 @@ // Ported from um/SetupAPI.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct SP_DRVINFO_DATA_V1_W @@ -16,7 +14,7 @@ public unsafe partial struct SP_DRVINFO_DATA_V1_W public uint DriverType; [NativeTypeName("ULONG_PTR")] - public UIntPtr Reserved; + public nuint Reserved; [NativeTypeName("WCHAR [256]")] public fixed ushort Description[256]; diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V2_A.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V2_A.cs index ba4f55c6bf..362dc52dfd 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V2_A.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V2_A.cs @@ -3,8 +3,6 @@ // Ported from um/SetupAPI.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct SP_DRVINFO_DATA_V2_A @@ -16,7 +14,7 @@ public unsafe partial struct SP_DRVINFO_DATA_V2_A public uint DriverType; [NativeTypeName("ULONG_PTR")] - public UIntPtr Reserved; + public nuint Reserved; [NativeTypeName("CHAR [256]")] public fixed sbyte Description[256]; diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V2_W.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V2_W.cs index 12969f96a6..f92086c268 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V2_W.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DATA_V2_W.cs @@ -3,8 +3,6 @@ // Ported from um/SetupAPI.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct SP_DRVINFO_DATA_V2_W @@ -16,7 +14,7 @@ public unsafe partial struct SP_DRVINFO_DATA_V2_W public uint DriverType; [NativeTypeName("ULONG_PTR")] - public UIntPtr Reserved; + public nuint Reserved; [NativeTypeName("WCHAR [256]")] public fixed ushort Description[256]; diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DETAIL_DATA_A.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DETAIL_DATA_A.cs index 92425786a8..7b7e6e57ca 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DETAIL_DATA_A.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DETAIL_DATA_A.cs @@ -3,8 +3,6 @@ // Ported from um/SetupAPI.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct SP_DRVINFO_DETAIL_DATA_A @@ -21,7 +19,7 @@ public unsafe partial struct SP_DRVINFO_DETAIL_DATA_A public uint CompatIDsLength; [NativeTypeName("ULONG_PTR")] - public UIntPtr Reserved; + public nuint Reserved; [NativeTypeName("CHAR [256]")] public fixed sbyte SectionName[256]; diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DETAIL_DATA_W.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DETAIL_DATA_W.cs index 08e893c577..dfe985ab3a 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DETAIL_DATA_W.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINFO_DETAIL_DATA_W.cs @@ -3,8 +3,6 @@ // Ported from um/SetupAPI.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct SP_DRVINFO_DETAIL_DATA_W @@ -21,7 +19,7 @@ public unsafe partial struct SP_DRVINFO_DETAIL_DATA_W public uint CompatIDsLength; [NativeTypeName("ULONG_PTR")] - public UIntPtr Reserved; + public nuint Reserved; [NativeTypeName("WCHAR [256]")] public fixed ushort SectionName[256]; diff --git a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINSTALL_PARAMS.cs b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINSTALL_PARAMS.cs index 8dd79ee36a..9ffd037524 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINSTALL_PARAMS.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SP_DRVINSTALL_PARAMS.cs @@ -3,8 +3,6 @@ // Ported from um/SetupAPI.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct SP_DRVINSTALL_PARAMS @@ -19,7 +17,7 @@ public partial struct SP_DRVINSTALL_PARAMS public uint Flags; [NativeTypeName("DWORD_PTR")] - public UIntPtr PrivateData; + public nuint PrivateData; [NativeTypeName("DWORD")] public uint Reserved; diff --git a/sources/Interop/SetupApi/um/SetupAPI/SetupApi.cs b/sources/Interop/SetupApi/um/SetupAPI/SetupApi.cs index be026584e0..44920a1bbb 100644 --- a/sources/Interop/SetupApi/um/SetupAPI/SetupApi.cs +++ b/sources/Interop/SetupApi/um/SetupAPI/SetupApi.cs @@ -10,6 +10,8 @@ namespace TerraFX.Interop { public static unsafe partial class SetupApi { + private const string LibraryPath = "setupapi"; + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupGetInfInformationA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] public static extern int SetupGetInfInformationA([NativeTypeName("LPCVOID")] void* InfSpec, [NativeTypeName("DWORD")] uint SearchControl, [NativeTypeName("PSP_INF_INFORMATION")] SP_INF_INFORMATION* ReturnBuffer, [NativeTypeName("DWORD")] uint ReturnBufferSize, [NativeTypeName("PDWORD")] uint* RequiredSize); @@ -319,19 +321,19 @@ public static unsafe partial class SetupApi [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupInstallFileA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupInstallFileA([NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PINFCONTEXT")] INFCONTEXT* InfContext, [NativeTypeName("PCSTR")] sbyte* SourceFile, [NativeTypeName("PCSTR")] sbyte* SourcePathRoot, [NativeTypeName("PCSTR")] sbyte* DestinationName, [NativeTypeName("DWORD")] uint CopyStyle, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr* CopyMsgHandler, [NativeTypeName("PVOID")] void* Context); + public static extern int SetupInstallFileA([NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PINFCONTEXT")] INFCONTEXT* InfContext, [NativeTypeName("PCSTR")] sbyte* SourceFile, [NativeTypeName("PCSTR")] sbyte* SourcePathRoot, [NativeTypeName("PCSTR")] sbyte* DestinationName, [NativeTypeName("DWORD")] uint CopyStyle, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr CopyMsgHandler, [NativeTypeName("PVOID")] void* Context); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupInstallFileW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupInstallFileW([NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PINFCONTEXT")] INFCONTEXT* InfContext, [NativeTypeName("PCWSTR")] ushort* SourceFile, [NativeTypeName("PCWSTR")] ushort* SourcePathRoot, [NativeTypeName("PCWSTR")] ushort* DestinationName, [NativeTypeName("DWORD")] uint CopyStyle, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr* CopyMsgHandler, [NativeTypeName("PVOID")] void* Context); + public static extern int SetupInstallFileW([NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PINFCONTEXT")] INFCONTEXT* InfContext, [NativeTypeName("PCWSTR")] ushort* SourceFile, [NativeTypeName("PCWSTR")] ushort* SourcePathRoot, [NativeTypeName("PCWSTR")] ushort* DestinationName, [NativeTypeName("DWORD")] uint CopyStyle, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr CopyMsgHandler, [NativeTypeName("PVOID")] void* Context); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupInstallFileExA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupInstallFileExA([NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PINFCONTEXT")] INFCONTEXT* InfContext, [NativeTypeName("PCSTR")] sbyte* SourceFile, [NativeTypeName("PCSTR")] sbyte* SourcePathRoot, [NativeTypeName("PCSTR")] sbyte* DestinationName, [NativeTypeName("DWORD")] uint CopyStyle, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr* CopyMsgHandler, [NativeTypeName("PVOID")] void* Context, [NativeTypeName("PBOOL")] int* FileWasInUse); + public static extern int SetupInstallFileExA([NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PINFCONTEXT")] INFCONTEXT* InfContext, [NativeTypeName("PCSTR")] sbyte* SourceFile, [NativeTypeName("PCSTR")] sbyte* SourcePathRoot, [NativeTypeName("PCSTR")] sbyte* DestinationName, [NativeTypeName("DWORD")] uint CopyStyle, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr CopyMsgHandler, [NativeTypeName("PVOID")] void* Context, [NativeTypeName("PBOOL")] int* FileWasInUse); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupInstallFileExW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupInstallFileExW([NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PINFCONTEXT")] INFCONTEXT* InfContext, [NativeTypeName("PCWSTR")] ushort* SourceFile, [NativeTypeName("PCWSTR")] ushort* SourcePathRoot, [NativeTypeName("PCWSTR")] ushort* DestinationName, [NativeTypeName("DWORD")] uint CopyStyle, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr* CopyMsgHandler, [NativeTypeName("PVOID")] void* Context, [NativeTypeName("PBOOL")] int* FileWasInUse); + public static extern int SetupInstallFileExW([NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PINFCONTEXT")] INFCONTEXT* InfContext, [NativeTypeName("PCWSTR")] ushort* SourceFile, [NativeTypeName("PCWSTR")] ushort* SourcePathRoot, [NativeTypeName("PCWSTR")] ushort* DestinationName, [NativeTypeName("DWORD")] uint CopyStyle, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr CopyMsgHandler, [NativeTypeName("PVOID")] void* Context, [NativeTypeName("PBOOL")] int* FileWasInUse); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupOpenFileQueue", ExactSpelling = true)] [return: NativeTypeName("HSPFILEQ")] @@ -423,19 +425,19 @@ public static unsafe partial class SetupApi [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupCommitFileQueueA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupCommitFileQueueA([NativeTypeName("HWND")] IntPtr Owner, [NativeTypeName("HSPFILEQ")] void* QueueHandle, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr* MsgHandler, [NativeTypeName("PVOID")] void* Context); + public static extern int SetupCommitFileQueueA([NativeTypeName("HWND")] IntPtr Owner, [NativeTypeName("HSPFILEQ")] void* QueueHandle, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr MsgHandler, [NativeTypeName("PVOID")] void* Context); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupCommitFileQueueW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupCommitFileQueueW([NativeTypeName("HWND")] IntPtr Owner, [NativeTypeName("HSPFILEQ")] void* QueueHandle, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr* MsgHandler, [NativeTypeName("PVOID")] void* Context); + public static extern int SetupCommitFileQueueW([NativeTypeName("HWND")] IntPtr Owner, [NativeTypeName("HSPFILEQ")] void* QueueHandle, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr MsgHandler, [NativeTypeName("PVOID")] void* Context); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupScanFileQueueA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupScanFileQueueA([NativeTypeName("HSPFILEQ")] void* FileQueue, [NativeTypeName("DWORD")] uint Flags, [NativeTypeName("HWND")] IntPtr Window, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr* CallbackRoutine, [NativeTypeName("PVOID")] void* CallbackContext, [NativeTypeName("PDWORD")] uint* Result); + public static extern int SetupScanFileQueueA([NativeTypeName("HSPFILEQ")] void* FileQueue, [NativeTypeName("DWORD")] uint Flags, [NativeTypeName("HWND")] IntPtr Window, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr CallbackRoutine, [NativeTypeName("PVOID")] void* CallbackContext, [NativeTypeName("PDWORD")] uint* Result); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupScanFileQueueW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupScanFileQueueW([NativeTypeName("HSPFILEQ")] void* FileQueue, [NativeTypeName("DWORD")] uint Flags, [NativeTypeName("HWND")] IntPtr Window, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr* CallbackRoutine, [NativeTypeName("PVOID")] void* CallbackContext, [NativeTypeName("PDWORD")] uint* Result); + public static extern int SetupScanFileQueueW([NativeTypeName("HSPFILEQ")] void* FileQueue, [NativeTypeName("DWORD")] uint Flags, [NativeTypeName("HWND")] IntPtr Window, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr CallbackRoutine, [NativeTypeName("PVOID")] void* CallbackContext, [NativeTypeName("PDWORD")] uint* Result); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupGetFileQueueCount", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -563,11 +565,11 @@ public static unsafe partial class SetupApi [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupIterateCabinetA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupIterateCabinetA([NativeTypeName("PCSTR")] sbyte* CabinetFile, [NativeTypeName("DWORD")] uint Reserved, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr* MsgHandler, [NativeTypeName("PVOID")] void* Context); + public static extern int SetupIterateCabinetA([NativeTypeName("PCSTR")] sbyte* CabinetFile, [NativeTypeName("DWORD")] uint Reserved, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr MsgHandler, [NativeTypeName("PVOID")] void* Context); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupIterateCabinetW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupIterateCabinetW([NativeTypeName("PCWSTR")] ushort* CabinetFile, [NativeTypeName("DWORD")] uint Reserved, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr* MsgHandler, [NativeTypeName("PVOID")] void* Context); + public static extern int SetupIterateCabinetW([NativeTypeName("PCWSTR")] ushort* CabinetFile, [NativeTypeName("DWORD")] uint Reserved, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr MsgHandler, [NativeTypeName("PVOID")] void* Context); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupPromptReboot", ExactSpelling = true)] [return: NativeTypeName("INT")] @@ -594,11 +596,11 @@ public static unsafe partial class SetupApi [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupInstallFromInfSectionA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupInstallFromInfSectionA([NativeTypeName("HWND")] IntPtr Owner, [NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PCSTR")] sbyte* SectionName, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("HKEY")] IntPtr RelativeKeyRoot, [NativeTypeName("PCSTR")] sbyte* SourceRootPath, [NativeTypeName("UINT")] uint CopyFlags, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr* MsgHandler, [NativeTypeName("PVOID")] void* Context, [NativeTypeName("HDEVINFO")] void* DeviceInfoSet, [NativeTypeName("PSP_DEVINFO_DATA")] SP_DEVINFO_DATA* DeviceInfoData); + public static extern int SetupInstallFromInfSectionA([NativeTypeName("HWND")] IntPtr Owner, [NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PCSTR")] sbyte* SectionName, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("HKEY")] IntPtr RelativeKeyRoot, [NativeTypeName("PCSTR")] sbyte* SourceRootPath, [NativeTypeName("UINT")] uint CopyFlags, [NativeTypeName("PSP_FILE_CALLBACK_A")] IntPtr MsgHandler, [NativeTypeName("PVOID")] void* Context, [NativeTypeName("HDEVINFO")] void* DeviceInfoSet, [NativeTypeName("PSP_DEVINFO_DATA")] SP_DEVINFO_DATA* DeviceInfoData); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupInstallFromInfSectionW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupInstallFromInfSectionW([NativeTypeName("HWND")] IntPtr Owner, [NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PCWSTR")] ushort* SectionName, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("HKEY")] IntPtr RelativeKeyRoot, [NativeTypeName("PCWSTR")] ushort* SourceRootPath, [NativeTypeName("UINT")] uint CopyFlags, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr* MsgHandler, [NativeTypeName("PVOID")] void* Context, [NativeTypeName("HDEVINFO")] void* DeviceInfoSet, [NativeTypeName("PSP_DEVINFO_DATA")] SP_DEVINFO_DATA* DeviceInfoData); + public static extern int SetupInstallFromInfSectionW([NativeTypeName("HWND")] IntPtr Owner, [NativeTypeName("HINF")] void* InfHandle, [NativeTypeName("PCWSTR")] ushort* SectionName, [NativeTypeName("UINT")] uint Flags, [NativeTypeName("HKEY")] IntPtr RelativeKeyRoot, [NativeTypeName("PCWSTR")] ushort* SourceRootPath, [NativeTypeName("UINT")] uint CopyFlags, [NativeTypeName("PSP_FILE_CALLBACK_W")] IntPtr MsgHandler, [NativeTypeName("PVOID")] void* Context, [NativeTypeName("HDEVINFO")] void* DeviceInfoSet, [NativeTypeName("PSP_DEVINFO_DATA")] SP_DEVINFO_DATA* DeviceInfoData); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupInstallFilesFromInfSectionA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -831,7 +833,7 @@ public static unsafe partial class SetupApi [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupDiRegisterDeviceInfo", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SetupDiRegisterDeviceInfo([NativeTypeName("HDEVINFO")] void* DeviceInfoSet, [NativeTypeName("PSP_DEVINFO_DATA")] SP_DEVINFO_DATA* DeviceInfoData, [NativeTypeName("DWORD")] uint Flags, [NativeTypeName("PSP_DETSIG_CMPPROC")] IntPtr* CompareProc, [NativeTypeName("PVOID")] void* CompareContext, [NativeTypeName("PSP_DEVINFO_DATA")] SP_DEVINFO_DATA* DupDeviceInfoData); + public static extern int SetupDiRegisterDeviceInfo([NativeTypeName("HDEVINFO")] void* DeviceInfoSet, [NativeTypeName("PSP_DEVINFO_DATA")] SP_DEVINFO_DATA* DeviceInfoData, [NativeTypeName("DWORD")] uint Flags, [NativeTypeName("PSP_DETSIG_CMPPROC")] IntPtr CompareProc, [NativeTypeName("PVOID")] void* CompareContext, [NativeTypeName("PSP_DEVINFO_DATA")] SP_DEVINFO_DATA* DupDeviceInfoData); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetupDiBuildDriverInfoList", ExactSpelling = true)] [return: NativeTypeName("BOOL")] diff --git a/sources/Interop/User32/TerraFX.Interop.User32.csproj b/sources/Interop/User32/TerraFX.Interop.User32.csproj index 101648f9e9..3bbb6d98b9 100644 --- a/sources/Interop/User32/TerraFX.Interop.User32.csproj +++ b/sources/Interop/User32/TerraFX.Interop.User32.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/User32/um/WinUser/COMPAREITEMSTRUCT.cs b/sources/Interop/User32/um/WinUser/COMPAREITEMSTRUCT.cs index 9e5d763600..c122dd3be6 100644 --- a/sources/Interop/User32/um/WinUser/COMPAREITEMSTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/COMPAREITEMSTRUCT.cs @@ -22,13 +22,13 @@ public partial struct COMPAREITEMSTRUCT public uint itemID1; [NativeTypeName("ULONG_PTR")] - public UIntPtr itemData1; + public nuint itemData1; [NativeTypeName("UINT")] public uint itemID2; [NativeTypeName("ULONG_PTR")] - public UIntPtr itemData2; + public nuint itemData2; [NativeTypeName("DWORD")] public uint dwLocaleId; diff --git a/sources/Interop/User32/um/WinUser/COPYDATASTRUCT.cs b/sources/Interop/User32/um/WinUser/COPYDATASTRUCT.cs index df79f58c22..e008a4bc8a 100644 --- a/sources/Interop/User32/um/WinUser/COPYDATASTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/COPYDATASTRUCT.cs @@ -3,14 +3,12 @@ // Ported from um/WinUser.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct COPYDATASTRUCT { [NativeTypeName("ULONG_PTR")] - public UIntPtr dwData; + public nuint dwData; [NativeTypeName("DWORD")] public uint cbData; diff --git a/sources/Interop/User32/um/WinUser/CWPRETSTRUCT.cs b/sources/Interop/User32/um/WinUser/CWPRETSTRUCT.cs index 8d81e43b91..b5342637b4 100644 --- a/sources/Interop/User32/um/WinUser/CWPRETSTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/CWPRETSTRUCT.cs @@ -10,13 +10,13 @@ namespace TerraFX.Interop public partial struct CWPRETSTRUCT { [NativeTypeName("LRESULT")] - public IntPtr lResult; + public nint lResult; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("WPARAM")] - public UIntPtr wParam; + public nuint wParam; [NativeTypeName("UINT")] public uint message; diff --git a/sources/Interop/User32/um/WinUser/CWPSTRUCT.cs b/sources/Interop/User32/um/WinUser/CWPSTRUCT.cs index 8140a9c514..b30b3aef8d 100644 --- a/sources/Interop/User32/um/WinUser/CWPSTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/CWPSTRUCT.cs @@ -10,10 +10,10 @@ namespace TerraFX.Interop public partial struct CWPSTRUCT { [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("WPARAM")] - public UIntPtr wParam; + public nuint wParam; [NativeTypeName("UINT")] public uint message; diff --git a/sources/Interop/User32/um/WinUser/DEBUGHOOKINFO.cs b/sources/Interop/User32/um/WinUser/DEBUGHOOKINFO.cs index 7bedc51441..def4ca6d92 100644 --- a/sources/Interop/User32/um/WinUser/DEBUGHOOKINFO.cs +++ b/sources/Interop/User32/um/WinUser/DEBUGHOOKINFO.cs @@ -3,8 +3,6 @@ // Ported from um/WinUser.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct DEBUGHOOKINFO @@ -16,10 +14,10 @@ public partial struct DEBUGHOOKINFO public uint idThreadInstaller; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("WPARAM")] - public UIntPtr wParam; + public nuint wParam; public int code; } diff --git a/sources/Interop/User32/um/WinUser/DELETEITEMSTRUCT.cs b/sources/Interop/User32/um/WinUser/DELETEITEMSTRUCT.cs index 9f81257d2e..a7709d80e1 100644 --- a/sources/Interop/User32/um/WinUser/DELETEITEMSTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/DELETEITEMSTRUCT.cs @@ -22,6 +22,6 @@ public partial struct DELETEITEMSTRUCT public IntPtr hwndItem; [NativeTypeName("ULONG_PTR")] - public UIntPtr itemData; + public nuint itemData; } } diff --git a/sources/Interop/User32/um/WinUser/DLGPROC.cs b/sources/Interop/User32/um/WinUser/DLGPROC.cs index f66c264e43..37f6bfa655 100644 --- a/sources/Interop/User32/um/WinUser/DLGPROC.cs +++ b/sources/Interop/User32/um/WinUser/DLGPROC.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("INT_PTR")] - public delegate IntPtr DLGPROC([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("UINT")] uint param1, [NativeTypeName("WPARAM")] UIntPtr param2, [NativeTypeName("LPARAM")] IntPtr param3); + public delegate nint DLGPROC([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("UINT")] uint param1, [NativeTypeName("WPARAM")] nuint param2, [NativeTypeName("LPARAM")] nint param3); } diff --git a/sources/Interop/User32/um/WinUser/DRAWITEMSTRUCT.cs b/sources/Interop/User32/um/WinUser/DRAWITEMSTRUCT.cs index cd4b58604b..2d805f49af 100644 --- a/sources/Interop/User32/um/WinUser/DRAWITEMSTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/DRAWITEMSTRUCT.cs @@ -33,6 +33,6 @@ public partial struct DRAWITEMSTRUCT public RECT rcItem; [NativeTypeName("ULONG_PTR")] - public UIntPtr itemData; + public nuint itemData; } } diff --git a/sources/Interop/User32/um/WinUser/DRAWSTATEPROC.cs b/sources/Interop/User32/um/WinUser/DRAWSTATEPROC.cs index c0db002b1b..9bdfd8d12b 100644 --- a/sources/Interop/User32/um/WinUser/DRAWSTATEPROC.cs +++ b/sources/Interop/User32/um/WinUser/DRAWSTATEPROC.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public delegate int DRAWSTATEPROC([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPARAM")] IntPtr lData, [NativeTypeName("WPARAM")] UIntPtr wData, int cx, int cy); + public delegate int DRAWSTATEPROC([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPARAM")] nint lData, [NativeTypeName("WPARAM")] nuint wData, int cx, int cy); } diff --git a/sources/Interop/User32/um/WinUser/DROPSTRUCT.cs b/sources/Interop/User32/um/WinUser/DROPSTRUCT.cs index d9db44bc6e..6cd1bcba4d 100644 --- a/sources/Interop/User32/um/WinUser/DROPSTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/DROPSTRUCT.cs @@ -19,7 +19,7 @@ public partial struct DROPSTRUCT public uint wFmt; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwData; + public nuint dwData; public POINT ptDrop; diff --git a/sources/Interop/User32/um/WinUser/GRAYSTRINGPROC.cs b/sources/Interop/User32/um/WinUser/GRAYSTRINGPROC.cs index 24b94c0916..83fdea2afa 100644 --- a/sources/Interop/User32/um/WinUser/GRAYSTRINGPROC.cs +++ b/sources/Interop/User32/um/WinUser/GRAYSTRINGPROC.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public delegate int GRAYSTRINGPROC([NativeTypeName("HDC")] IntPtr param0, [NativeTypeName("LPARAM")] IntPtr param1, int param2); + public delegate int GRAYSTRINGPROC([NativeTypeName("HDC")] IntPtr param0, [NativeTypeName("LPARAM")] nint param1, int param2); } diff --git a/sources/Interop/User32/um/WinUser/HARDWAREHOOKSTRUCT.cs b/sources/Interop/User32/um/WinUser/HARDWAREHOOKSTRUCT.cs index 5ccd9347b9..88d7277bf5 100644 --- a/sources/Interop/User32/um/WinUser/HARDWAREHOOKSTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/HARDWAREHOOKSTRUCT.cs @@ -16,9 +16,9 @@ public partial struct HARDWAREHOOKSTRUCT public uint message; [NativeTypeName("WPARAM")] - public UIntPtr wParam; + public nuint wParam; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; } } diff --git a/sources/Interop/User32/um/WinUser/HELPINFO.cs b/sources/Interop/User32/um/WinUser/HELPINFO.cs index 4c6a58be53..850a384b0c 100644 --- a/sources/Interop/User32/um/WinUser/HELPINFO.cs +++ b/sources/Interop/User32/um/WinUser/HELPINFO.cs @@ -20,7 +20,7 @@ public partial struct HELPINFO public IntPtr hItemHandle; [NativeTypeName("DWORD_PTR")] - public UIntPtr dwContextId; + public nuint dwContextId; public POINT MousePos; } diff --git a/sources/Interop/User32/um/WinUser/HOOKPROC.cs b/sources/Interop/User32/um/WinUser/HOOKPROC.cs index 9e51da5175..396fc72b42 100644 --- a/sources/Interop/User32/um/WinUser/HOOKPROC.cs +++ b/sources/Interop/User32/um/WinUser/HOOKPROC.cs @@ -3,12 +3,11 @@ // Ported from um/WinUser.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("LRESULT")] - public delegate IntPtr HOOKPROC(int code, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public delegate nint HOOKPROC(int code, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); } diff --git a/sources/Interop/User32/um/WinUser/INPUT.cs b/sources/Interop/User32/um/WinUser/INPUT.cs index 14d515a0ff..64f75d1e2b 100644 --- a/sources/Interop/User32/um/WinUser/INPUT.cs +++ b/sources/Interop/User32/um/WinUser/INPUT.cs @@ -12,7 +12,7 @@ public partial struct INPUT [NativeTypeName("DWORD")] public uint type; - [NativeTypeName("tagINPUT::(anonymous union at um/WinUser.h:6116:5)")] + [NativeTypeName("tagINPUT::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/WinUser.h:6116:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/User32/um/WinUser/INPUT_TRANSFORM.cs b/sources/Interop/User32/um/WinUser/INPUT_TRANSFORM.cs index 9d756ed002..0f5088c536 100644 --- a/sources/Interop/User32/um/WinUser/INPUT_TRANSFORM.cs +++ b/sources/Interop/User32/um/WinUser/INPUT_TRANSFORM.cs @@ -9,14 +9,14 @@ namespace TerraFX.Interop { public partial struct INPUT_TRANSFORM { - [NativeTypeName("tagINPUT_TRANSFORM::(anonymous union at um/WinUser.h:6787:5)")] + [NativeTypeName("tagINPUT_TRANSFORM::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/WinUser.h:6787:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] public unsafe partial struct _Anonymous_e__Union { [FieldOffset(0)] - [NativeTypeName("tagINPUT_TRANSFORM::(anonymous struct at um/WinUser.h:6788:9)")] + [NativeTypeName("tagINPUT_TRANSFORM::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/WinUser.h:6788:9)")] public _Anonymous_e__Struct Anonymous; [FieldOffset(0)] diff --git a/sources/Interop/User32/um/WinUser/KBDLLHOOKSTRUCT.cs b/sources/Interop/User32/um/WinUser/KBDLLHOOKSTRUCT.cs index 42b6d5de05..7393aff8b1 100644 --- a/sources/Interop/User32/um/WinUser/KBDLLHOOKSTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/KBDLLHOOKSTRUCT.cs @@ -3,8 +3,6 @@ // Ported from um/WinUser.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct KBDLLHOOKSTRUCT @@ -22,6 +20,6 @@ public partial struct KBDLLHOOKSTRUCT public uint time; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwExtraInfo; + public nuint dwExtraInfo; } } diff --git a/sources/Interop/User32/um/WinUser/KEYBDINPUT.cs b/sources/Interop/User32/um/WinUser/KEYBDINPUT.cs index 0e6942469c..9a320f1edd 100644 --- a/sources/Interop/User32/um/WinUser/KEYBDINPUT.cs +++ b/sources/Interop/User32/um/WinUser/KEYBDINPUT.cs @@ -3,8 +3,6 @@ // Ported from um/WinUser.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct KEYBDINPUT @@ -22,6 +20,6 @@ public partial struct KEYBDINPUT public uint time; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwExtraInfo; + public nuint dwExtraInfo; } } diff --git a/sources/Interop/User32/um/WinUser/MDICREATESTRUCTA.cs b/sources/Interop/User32/um/WinUser/MDICREATESTRUCTA.cs index c98d3419eb..eefd6dbcb3 100644 --- a/sources/Interop/User32/um/WinUser/MDICREATESTRUCTA.cs +++ b/sources/Interop/User32/um/WinUser/MDICREATESTRUCTA.cs @@ -30,6 +30,6 @@ public unsafe partial struct MDICREATESTRUCTA public uint style; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; } } diff --git a/sources/Interop/User32/um/WinUser/MDICREATESTRUCTW.cs b/sources/Interop/User32/um/WinUser/MDICREATESTRUCTW.cs index e0f750f2fc..29fee5c7a7 100644 --- a/sources/Interop/User32/um/WinUser/MDICREATESTRUCTW.cs +++ b/sources/Interop/User32/um/WinUser/MDICREATESTRUCTW.cs @@ -30,6 +30,6 @@ public unsafe partial struct MDICREATESTRUCTW public uint style; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; } } diff --git a/sources/Interop/User32/um/WinUser/MEASUREITEMSTRUCT.cs b/sources/Interop/User32/um/WinUser/MEASUREITEMSTRUCT.cs index 6ebe0539ea..cba918243c 100644 --- a/sources/Interop/User32/um/WinUser/MEASUREITEMSTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/MEASUREITEMSTRUCT.cs @@ -3,8 +3,6 @@ // Ported from um/WinUser.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct MEASUREITEMSTRUCT @@ -25,6 +23,6 @@ public partial struct MEASUREITEMSTRUCT public uint itemHeight; [NativeTypeName("ULONG_PTR")] - public UIntPtr itemData; + public nuint itemData; } } diff --git a/sources/Interop/User32/um/WinUser/MENUINFO.cs b/sources/Interop/User32/um/WinUser/MENUINFO.cs index 40a0153646..74e8547448 100644 --- a/sources/Interop/User32/um/WinUser/MENUINFO.cs +++ b/sources/Interop/User32/um/WinUser/MENUINFO.cs @@ -28,6 +28,6 @@ public partial struct MENUINFO public uint dwContextHelpID; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwMenuData; + public nuint dwMenuData; } } diff --git a/sources/Interop/User32/um/WinUser/MENUITEMINFOA.cs b/sources/Interop/User32/um/WinUser/MENUITEMINFOA.cs index 7a70c90e28..06101ca66e 100644 --- a/sources/Interop/User32/um/WinUser/MENUITEMINFOA.cs +++ b/sources/Interop/User32/um/WinUser/MENUITEMINFOA.cs @@ -34,7 +34,7 @@ public unsafe partial struct MENUITEMINFOA public IntPtr hbmpUnchecked; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwItemData; + public nuint dwItemData; [NativeTypeName("LPSTR")] public sbyte* dwTypeData; diff --git a/sources/Interop/User32/um/WinUser/MENUITEMINFOW.cs b/sources/Interop/User32/um/WinUser/MENUITEMINFOW.cs index eda328c24e..7448addc1c 100644 --- a/sources/Interop/User32/um/WinUser/MENUITEMINFOW.cs +++ b/sources/Interop/User32/um/WinUser/MENUITEMINFOW.cs @@ -34,7 +34,7 @@ public unsafe partial struct MENUITEMINFOW public IntPtr hbmpUnchecked; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwItemData; + public nuint dwItemData; [NativeTypeName("LPWSTR")] public ushort* dwTypeData; diff --git a/sources/Interop/User32/um/WinUser/MONITORENUMPROC.cs b/sources/Interop/User32/um/WinUser/MONITORENUMPROC.cs index 40184c7dac..744665f01d 100644 --- a/sources/Interop/User32/um/WinUser/MONITORENUMPROC.cs +++ b/sources/Interop/User32/um/WinUser/MONITORENUMPROC.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int MONITORENUMPROC([NativeTypeName("HMONITOR")] IntPtr param0, [NativeTypeName("HDC")] IntPtr param1, [NativeTypeName("LPRECT")] RECT* param2, [NativeTypeName("LPARAM")] IntPtr param3); + public unsafe delegate int MONITORENUMPROC([NativeTypeName("HMONITOR")] IntPtr param0, [NativeTypeName("HDC")] IntPtr param1, [NativeTypeName("LPRECT")] RECT* param2, [NativeTypeName("LPARAM")] nint param3); } diff --git a/sources/Interop/User32/um/WinUser/MOUSEHOOKSTRUCT.cs b/sources/Interop/User32/um/WinUser/MOUSEHOOKSTRUCT.cs index 35ddbeecf7..9bea57f522 100644 --- a/sources/Interop/User32/um/WinUser/MOUSEHOOKSTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/MOUSEHOOKSTRUCT.cs @@ -18,6 +18,6 @@ public partial struct MOUSEHOOKSTRUCT public uint wHitTestCode; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwExtraInfo; + public nuint dwExtraInfo; } } diff --git a/sources/Interop/User32/um/WinUser/MOUSEINPUT.cs b/sources/Interop/User32/um/WinUser/MOUSEINPUT.cs index 87eb3b80c3..a1f35e3585 100644 --- a/sources/Interop/User32/um/WinUser/MOUSEINPUT.cs +++ b/sources/Interop/User32/um/WinUser/MOUSEINPUT.cs @@ -3,8 +3,6 @@ // Ported from um/WinUser.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct MOUSEINPUT @@ -25,6 +23,6 @@ public partial struct MOUSEINPUT public uint time; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwExtraInfo; + public nuint dwExtraInfo; } } diff --git a/sources/Interop/User32/um/WinUser/MOUSEMOVEPOINT.cs b/sources/Interop/User32/um/WinUser/MOUSEMOVEPOINT.cs index fb350a05ce..2b2ddd2e48 100644 --- a/sources/Interop/User32/um/WinUser/MOUSEMOVEPOINT.cs +++ b/sources/Interop/User32/um/WinUser/MOUSEMOVEPOINT.cs @@ -3,8 +3,6 @@ // Ported from um/WinUser.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct MOUSEMOVEPOINT @@ -17,6 +15,6 @@ public partial struct MOUSEMOVEPOINT public uint time; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwExtraInfo; + public nuint dwExtraInfo; } } diff --git a/sources/Interop/User32/um/WinUser/MSG.cs b/sources/Interop/User32/um/WinUser/MSG.cs index b9c1e5bfde..28ba60a0b4 100644 --- a/sources/Interop/User32/um/WinUser/MSG.cs +++ b/sources/Interop/User32/um/WinUser/MSG.cs @@ -16,10 +16,10 @@ public partial struct MSG public uint message; [NativeTypeName("WPARAM")] - public UIntPtr wParam; + public nuint wParam; [NativeTypeName("LPARAM")] - public IntPtr lParam; + public nint lParam; [NativeTypeName("DWORD")] public uint time; diff --git a/sources/Interop/User32/um/WinUser/MSGBOXPARAMSA.cs b/sources/Interop/User32/um/WinUser/MSGBOXPARAMSA.cs index 838f1308df..54ef47f68c 100644 --- a/sources/Interop/User32/um/WinUser/MSGBOXPARAMSA.cs +++ b/sources/Interop/User32/um/WinUser/MSGBOXPARAMSA.cs @@ -31,7 +31,7 @@ public unsafe partial struct MSGBOXPARAMSA public sbyte* lpszIcon; [NativeTypeName("DWORD_PTR")] - public UIntPtr dwContextHelpId; + public nuint dwContextHelpId; [NativeTypeName("MSGBOXCALLBACK")] public IntPtr lpfnMsgBoxCallback; diff --git a/sources/Interop/User32/um/WinUser/MSGBOXPARAMSW.cs b/sources/Interop/User32/um/WinUser/MSGBOXPARAMSW.cs index 64683d4a1b..fca6ace741 100644 --- a/sources/Interop/User32/um/WinUser/MSGBOXPARAMSW.cs +++ b/sources/Interop/User32/um/WinUser/MSGBOXPARAMSW.cs @@ -31,7 +31,7 @@ public unsafe partial struct MSGBOXPARAMSW public ushort* lpszIcon; [NativeTypeName("DWORD_PTR")] - public UIntPtr dwContextHelpId; + public nuint dwContextHelpId; [NativeTypeName("MSGBOXCALLBACK")] public IntPtr lpfnMsgBoxCallback; diff --git a/sources/Interop/User32/um/WinUser/MSLLHOOKSTRUCT.cs b/sources/Interop/User32/um/WinUser/MSLLHOOKSTRUCT.cs index 92733beda4..ca2d2522cc 100644 --- a/sources/Interop/User32/um/WinUser/MSLLHOOKSTRUCT.cs +++ b/sources/Interop/User32/um/WinUser/MSLLHOOKSTRUCT.cs @@ -3,8 +3,6 @@ // Ported from um/WinUser.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct MSLLHOOKSTRUCT @@ -21,6 +19,6 @@ public partial struct MSLLHOOKSTRUCT public uint time; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwExtraInfo; + public nuint dwExtraInfo; } } diff --git a/sources/Interop/User32/um/WinUser/NAMEENUMPROCA.cs b/sources/Interop/User32/um/WinUser/NAMEENUMPROCA.cs index 0e48844d1b..b5140b7efe 100644 --- a/sources/Interop/User32/um/WinUser/NAMEENUMPROCA.cs +++ b/sources/Interop/User32/um/WinUser/NAMEENUMPROCA.cs @@ -3,12 +3,11 @@ // Ported from um/WinUser.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int NAMEENUMPROCA([NativeTypeName("LPSTR")] sbyte* param0, [NativeTypeName("LPARAM")] IntPtr param1); + public unsafe delegate int NAMEENUMPROCA([NativeTypeName("LPSTR")] sbyte* param0, [NativeTypeName("LPARAM")] nint param1); } diff --git a/sources/Interop/User32/um/WinUser/NAMEENUMPROCW.cs b/sources/Interop/User32/um/WinUser/NAMEENUMPROCW.cs index df88a261b6..e526c4df3a 100644 --- a/sources/Interop/User32/um/WinUser/NAMEENUMPROCW.cs +++ b/sources/Interop/User32/um/WinUser/NAMEENUMPROCW.cs @@ -3,12 +3,11 @@ // Ported from um/WinUser.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int NAMEENUMPROCW([NativeTypeName("LPWSTR")] ushort* param0, [NativeTypeName("LPARAM")] IntPtr param1); + public unsafe delegate int NAMEENUMPROCW([NativeTypeName("LPWSTR")] ushort* param0, [NativeTypeName("LPARAM")] nint param1); } diff --git a/sources/Interop/User32/um/WinUser/NMHDR.cs b/sources/Interop/User32/um/WinUser/NMHDR.cs index a51ecec064..39db80d2b0 100644 --- a/sources/Interop/User32/um/WinUser/NMHDR.cs +++ b/sources/Interop/User32/um/WinUser/NMHDR.cs @@ -13,7 +13,7 @@ public partial struct NMHDR public IntPtr hwndFrom; [NativeTypeName("UINT_PTR")] - public UIntPtr idFrom; + public nuint idFrom; [NativeTypeName("UINT")] public uint code; diff --git a/sources/Interop/User32/um/WinUser/POINTER_TYPE_INFO.cs b/sources/Interop/User32/um/WinUser/POINTER_TYPE_INFO.cs index 06be2508eb..35d7efc1ce 100644 --- a/sources/Interop/User32/um/WinUser/POINTER_TYPE_INFO.cs +++ b/sources/Interop/User32/um/WinUser/POINTER_TYPE_INFO.cs @@ -12,7 +12,7 @@ public partial struct POINTER_TYPE_INFO [NativeTypeName("POINTER_INPUT_TYPE")] public uint type; - [NativeTypeName("tagPOINTER_TYPE_INFO::(anonymous union at um/WinUser.h:6467:5)")] + [NativeTypeName("tagPOINTER_TYPE_INFO::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/WinUser.h:6467:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/User32/um/WinUser/PROPENUMPROCEXA.cs b/sources/Interop/User32/um/WinUser/PROPENUMPROCEXA.cs index e25772c9fc..57aa2b72e0 100644 --- a/sources/Interop/User32/um/WinUser/PROPENUMPROCEXA.cs +++ b/sources/Interop/User32/um/WinUser/PROPENUMPROCEXA.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PROPENUMPROCEXA([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("LPSTR")] sbyte* param1, [NativeTypeName("HANDLE")] IntPtr param2, [NativeTypeName("ULONG_PTR")] UIntPtr param3); + public unsafe delegate int PROPENUMPROCEXA([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("LPSTR")] sbyte* param1, [NativeTypeName("HANDLE")] IntPtr param2, [NativeTypeName("ULONG_PTR")] nuint param3); } diff --git a/sources/Interop/User32/um/WinUser/PROPENUMPROCEXW.cs b/sources/Interop/User32/um/WinUser/PROPENUMPROCEXW.cs index 68a1888da0..1e4f046871 100644 --- a/sources/Interop/User32/um/WinUser/PROPENUMPROCEXW.cs +++ b/sources/Interop/User32/um/WinUser/PROPENUMPROCEXW.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public unsafe delegate int PROPENUMPROCEXW([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("LPWSTR")] ushort* param1, [NativeTypeName("HANDLE")] IntPtr param2, [NativeTypeName("ULONG_PTR")] UIntPtr param3); + public unsafe delegate int PROPENUMPROCEXW([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("LPWSTR")] ushort* param1, [NativeTypeName("HANDLE")] IntPtr param2, [NativeTypeName("ULONG_PTR")] nuint param3); } diff --git a/sources/Interop/User32/um/WinUser/RAWINPUT.cs b/sources/Interop/User32/um/WinUser/RAWINPUT.cs index 9da33e7429..1382021540 100644 --- a/sources/Interop/User32/um/WinUser/RAWINPUT.cs +++ b/sources/Interop/User32/um/WinUser/RAWINPUT.cs @@ -11,7 +11,7 @@ public partial struct RAWINPUT { public RAWINPUTHEADER header; - [NativeTypeName("union (anonymous union at um/WinUser.h:15057:5)")] + [NativeTypeName("union (anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/WinUser.h:15057:5)")] public _data_e__Union data; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/User32/um/WinUser/RAWINPUTHEADER.cs b/sources/Interop/User32/um/WinUser/RAWINPUTHEADER.cs index c8de8fccab..4cd1ced60b 100644 --- a/sources/Interop/User32/um/WinUser/RAWINPUTHEADER.cs +++ b/sources/Interop/User32/um/WinUser/RAWINPUTHEADER.cs @@ -19,6 +19,6 @@ public partial struct RAWINPUTHEADER public IntPtr hDevice; [NativeTypeName("WPARAM")] - public UIntPtr wParam; + public nuint wParam; } } diff --git a/sources/Interop/User32/um/WinUser/RAWMOUSE.cs b/sources/Interop/User32/um/WinUser/RAWMOUSE.cs index da0f6dfa08..ca40647290 100644 --- a/sources/Interop/User32/um/WinUser/RAWMOUSE.cs +++ b/sources/Interop/User32/um/WinUser/RAWMOUSE.cs @@ -12,7 +12,7 @@ public partial struct RAWMOUSE [NativeTypeName("USHORT")] public ushort usFlags; - [NativeTypeName("tagRAWMOUSE::(anonymous union at um/WinUser.h:14899:5)")] + [NativeTypeName("tagRAWMOUSE::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/WinUser.h:14899:5)")] public _Anonymous_e__Union Anonymous; [NativeTypeName("ULONG")] @@ -35,7 +35,7 @@ public partial struct _Anonymous_e__Union public uint ulButtons; [FieldOffset(0)] - [NativeTypeName("tagRAWMOUSE::(anonymous struct at um/WinUser.h:14901:9)")] + [NativeTypeName("tagRAWMOUSE::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/WinUser.h:14901:9)")] public _Anonymous_e__Struct Anonymous; public partial struct _Anonymous_e__Struct diff --git a/sources/Interop/User32/um/WinUser/RID_DEVICE_INFO.cs b/sources/Interop/User32/um/WinUser/RID_DEVICE_INFO.cs index ec930d6655..c9e72378cb 100644 --- a/sources/Interop/User32/um/WinUser/RID_DEVICE_INFO.cs +++ b/sources/Interop/User32/um/WinUser/RID_DEVICE_INFO.cs @@ -15,7 +15,7 @@ public partial struct RID_DEVICE_INFO [NativeTypeName("DWORD")] public uint dwType; - [NativeTypeName("tagRID_DEVICE_INFO::(anonymous union at um/WinUser.h:15139:5)")] + [NativeTypeName("tagRID_DEVICE_INFO::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/WinUser.h:15139:5)")] public _Anonymous_e__Union Anonymous; [StructLayout(LayoutKind.Explicit)] diff --git a/sources/Interop/User32/um/WinUser/SENDASYNCPROC.cs b/sources/Interop/User32/um/WinUser/SENDASYNCPROC.cs index f9179ab8c4..81bf9dd05e 100644 --- a/sources/Interop/User32/um/WinUser/SENDASYNCPROC.cs +++ b/sources/Interop/User32/um/WinUser/SENDASYNCPROC.cs @@ -9,5 +9,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public delegate void SENDASYNCPROC([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("UINT")] uint param1, [NativeTypeName("ULONG_PTR")] UIntPtr param2, [NativeTypeName("LRESULT")] IntPtr param3); + public delegate void SENDASYNCPROC([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("UINT")] uint param1, [NativeTypeName("ULONG_PTR")] nuint param2, [NativeTypeName("LRESULT")] nint param3); } diff --git a/sources/Interop/User32/um/WinUser/TIMERPROC.cs b/sources/Interop/User32/um/WinUser/TIMERPROC.cs index b64715e750..a8658e22a7 100644 --- a/sources/Interop/User32/um/WinUser/TIMERPROC.cs +++ b/sources/Interop/User32/um/WinUser/TIMERPROC.cs @@ -9,5 +9,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public delegate void TIMERPROC([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("UINT")] uint param1, [NativeTypeName("UINT_PTR")] UIntPtr param2, [NativeTypeName("DWORD")] uint param3); + public delegate void TIMERPROC([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("UINT")] uint param1, [NativeTypeName("UINT_PTR")] nuint param2, [NativeTypeName("DWORD")] uint param3); } diff --git a/sources/Interop/User32/um/WinUser/TOUCHINPUT.cs b/sources/Interop/User32/um/WinUser/TOUCHINPUT.cs index 248d2cb3a4..e94bb7e10d 100644 --- a/sources/Interop/User32/um/WinUser/TOUCHINPUT.cs +++ b/sources/Interop/User32/um/WinUser/TOUCHINPUT.cs @@ -31,7 +31,7 @@ public partial struct TOUCHINPUT public uint dwTime; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwExtraInfo; + public nuint dwExtraInfo; [NativeTypeName("DWORD")] public uint cxContact; diff --git a/sources/Interop/User32/um/WinUser/User32.cs b/sources/Interop/User32/um/WinUser/User32.cs index a0be1a41b0..79c3a98cab 100644 --- a/sources/Interop/User32/um/WinUser/User32.cs +++ b/sources/Interop/User32/um/WinUser/User32.cs @@ -91,15 +91,15 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumDesktopsA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumDesktopsA([NativeTypeName("HWINSTA")] IntPtr hwinsta, [NativeTypeName("DESKTOPENUMPROCA")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumDesktopsA([NativeTypeName("HWINSTA")] IntPtr hwinsta, [NativeTypeName("DESKTOPENUMPROCA")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumDesktopsW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumDesktopsW([NativeTypeName("HWINSTA")] IntPtr hwinsta, [NativeTypeName("DESKTOPENUMPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumDesktopsW([NativeTypeName("HWINSTA")] IntPtr hwinsta, [NativeTypeName("DESKTOPENUMPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumDesktopWindows", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumDesktopWindows([NativeTypeName("HDESK")] IntPtr hDesktop, [NativeTypeName("WNDENUMPROC")] IntPtr lpfn, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumDesktopWindows([NativeTypeName("HDESK")] IntPtr hDesktop, [NativeTypeName("WNDENUMPROC")] IntPtr lpfn, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SwitchDesktop", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -135,11 +135,11 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumWindowStationsA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumWindowStationsA([NativeTypeName("WINSTAENUMPROCA")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumWindowStationsA([NativeTypeName("WINSTAENUMPROCA")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumWindowStationsW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumWindowStationsW([NativeTypeName("WINSTAENUMPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumWindowStationsW([NativeTypeName("WINSTAENUMPROCW")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CloseWindowStation", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -226,11 +226,11 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DispatchMessageA", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr DispatchMessageA([NativeTypeName("const MSG *")] MSG* lpMsg); + public static extern nint DispatchMessageA([NativeTypeName("const MSG *")] MSG* lpMsg); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DispatchMessageW", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr DispatchMessageW([NativeTypeName("const MSG *")] MSG* lpMsg); + public static extern nint DispatchMessageW([NativeTypeName("const MSG *")] MSG* lpMsg); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetMessageQueue", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -270,7 +270,7 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetMessageExtraInfo", ExactSpelling = true)] [return: NativeTypeName("LPARAM")] - public static extern IntPtr GetMessageExtraInfo(); + public static extern nint GetMessageExtraInfo(); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetUnpredictedMessagePos", ExactSpelling = true)] [return: NativeTypeName("DWORD")] @@ -282,55 +282,55 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetMessageExtraInfo", ExactSpelling = true)] [return: NativeTypeName("LPARAM")] - public static extern IntPtr SetMessageExtraInfo([NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint SetMessageExtraInfo([NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SendMessageA", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr SendMessageA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint SendMessageA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SendMessageW", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr SendMessageW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint SendMessageW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SendMessageTimeoutA", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr SendMessageTimeoutA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam, [NativeTypeName("UINT")] uint fuFlags, [NativeTypeName("UINT")] uint uTimeout, [NativeTypeName("PDWORD_PTR")] UIntPtr* lpdwResult); + public static extern nint SendMessageTimeoutA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam, [NativeTypeName("UINT")] uint fuFlags, [NativeTypeName("UINT")] uint uTimeout, [NativeTypeName("PDWORD_PTR")] nuint* lpdwResult); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SendMessageTimeoutW", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr SendMessageTimeoutW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam, [NativeTypeName("UINT")] uint fuFlags, [NativeTypeName("UINT")] uint uTimeout, [NativeTypeName("PDWORD_PTR")] UIntPtr* lpdwResult); + public static extern nint SendMessageTimeoutW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam, [NativeTypeName("UINT")] uint fuFlags, [NativeTypeName("UINT")] uint uTimeout, [NativeTypeName("PDWORD_PTR")] nuint* lpdwResult); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SendNotifyMessageA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SendNotifyMessageA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int SendNotifyMessageA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SendNotifyMessageW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SendNotifyMessageW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int SendNotifyMessageW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SendMessageCallbackA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SendMessageCallbackA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam, [NativeTypeName("SENDASYNCPROC")] IntPtr lpResultCallBack, [NativeTypeName("ULONG_PTR")] UIntPtr dwData); + public static extern int SendMessageCallbackA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam, [NativeTypeName("SENDASYNCPROC")] IntPtr lpResultCallBack, [NativeTypeName("ULONG_PTR")] nuint dwData); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SendMessageCallbackW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int SendMessageCallbackW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam, [NativeTypeName("SENDASYNCPROC")] IntPtr lpResultCallBack, [NativeTypeName("ULONG_PTR")] UIntPtr dwData); + public static extern int SendMessageCallbackW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam, [NativeTypeName("SENDASYNCPROC")] IntPtr lpResultCallBack, [NativeTypeName("ULONG_PTR")] nuint dwData); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "BroadcastSystemMessageExA", ExactSpelling = true)] [return: NativeTypeName("long")] - public static extern int BroadcastSystemMessageExA([NativeTypeName("DWORD")] uint flags, [NativeTypeName("LPDWORD")] uint* lpInfo, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam, [NativeTypeName("PBSMINFO")] BSMINFO* pbsmInfo); + public static extern int BroadcastSystemMessageExA([NativeTypeName("DWORD")] uint flags, [NativeTypeName("LPDWORD")] uint* lpInfo, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam, [NativeTypeName("PBSMINFO")] BSMINFO* pbsmInfo); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "BroadcastSystemMessageExW", ExactSpelling = true)] [return: NativeTypeName("long")] - public static extern int BroadcastSystemMessageExW([NativeTypeName("DWORD")] uint flags, [NativeTypeName("LPDWORD")] uint* lpInfo, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam, [NativeTypeName("PBSMINFO")] BSMINFO* pbsmInfo); + public static extern int BroadcastSystemMessageExW([NativeTypeName("DWORD")] uint flags, [NativeTypeName("LPDWORD")] uint* lpInfo, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam, [NativeTypeName("PBSMINFO")] BSMINFO* pbsmInfo); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "BroadcastSystemMessageA", ExactSpelling = true)] [return: NativeTypeName("long")] - public static extern int BroadcastSystemMessageA([NativeTypeName("DWORD")] uint flags, [NativeTypeName("LPDWORD")] uint* lpInfo, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int BroadcastSystemMessageA([NativeTypeName("DWORD")] uint flags, [NativeTypeName("LPDWORD")] uint* lpInfo, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "BroadcastSystemMessageW", ExactSpelling = true)] [return: NativeTypeName("long")] - public static extern int BroadcastSystemMessageW([NativeTypeName("DWORD")] uint flags, [NativeTypeName("LPDWORD")] uint* lpInfo, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int BroadcastSystemMessageW([NativeTypeName("DWORD")] uint flags, [NativeTypeName("LPDWORD")] uint* lpInfo, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "RegisterDeviceNotificationA", ExactSpelling = true)] [return: NativeTypeName("HDEVNOTIFY")] @@ -362,19 +362,19 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "PostMessageA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int PostMessageA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int PostMessageA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "PostMessageW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int PostMessageW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int PostMessageW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "PostThreadMessageA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int PostThreadMessageA([NativeTypeName("DWORD")] uint idThread, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int PostThreadMessageA([NativeTypeName("DWORD")] uint idThread, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "PostThreadMessageW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int PostThreadMessageW([NativeTypeName("DWORD")] uint idThread, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int PostThreadMessageW([NativeTypeName("DWORD")] uint idThread, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AttachThreadInput", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -382,7 +382,7 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ReplyMessage", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int ReplyMessage([NativeTypeName("LRESULT")] IntPtr lResult); + public static extern int ReplyMessage([NativeTypeName("LRESULT")] nint lResult); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "WaitMessage", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -394,22 +394,22 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DefWindowProcA", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr DefWindowProcA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint DefWindowProcA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DefWindowProcW", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr DefWindowProcW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint DefWindowProcW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "PostQuitMessage", ExactSpelling = true)] public static extern void PostQuitMessage(int nExitCode); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CallWindowProcA", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr CallWindowProcA([NativeTypeName("WNDPROC")] IntPtr lpPrevWndFunc, [NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint CallWindowProcA([NativeTypeName("WNDPROC")] IntPtr lpPrevWndFunc, [NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CallWindowProcW", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr CallWindowProcW([NativeTypeName("WNDPROC")] IntPtr lpPrevWndFunc, [NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint CallWindowProcW([NativeTypeName("WNDPROC")] IntPtr lpPrevWndFunc, [NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "InSendMessage", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -601,39 +601,39 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateDialogParamA", ExactSpelling = true)] [return: NativeTypeName("HWND")] - public static extern IntPtr CreateDialogParamA([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCSTR")] sbyte* lpTemplateName, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] IntPtr dwInitParam); + public static extern IntPtr CreateDialogParamA([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCSTR")] sbyte* lpTemplateName, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] nint dwInitParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateDialogParamW", ExactSpelling = true)] [return: NativeTypeName("HWND")] - public static extern IntPtr CreateDialogParamW([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCWSTR")] ushort* lpTemplateName, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] IntPtr dwInitParam); + public static extern IntPtr CreateDialogParamW([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCWSTR")] ushort* lpTemplateName, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] nint dwInitParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateDialogIndirectParamA", ExactSpelling = true)] [return: NativeTypeName("HWND")] - public static extern IntPtr CreateDialogIndirectParamA([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCDLGTEMPLATEA")] DLGTEMPLATE* lpTemplate, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] IntPtr dwInitParam); + public static extern IntPtr CreateDialogIndirectParamA([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCDLGTEMPLATEA")] DLGTEMPLATE* lpTemplate, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] nint dwInitParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateDialogIndirectParamW", ExactSpelling = true)] [return: NativeTypeName("HWND")] - public static extern IntPtr CreateDialogIndirectParamW([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCDLGTEMPLATEW")] DLGTEMPLATE* lpTemplate, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] IntPtr dwInitParam); + public static extern IntPtr CreateDialogIndirectParamW([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCDLGTEMPLATEW")] DLGTEMPLATE* lpTemplate, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] nint dwInitParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DialogBoxParamA", ExactSpelling = true)] [return: NativeTypeName("INT_PTR")] - public static extern IntPtr DialogBoxParamA([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCSTR")] sbyte* lpTemplateName, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] IntPtr dwInitParam); + public static extern nint DialogBoxParamA([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCSTR")] sbyte* lpTemplateName, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] nint dwInitParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DialogBoxParamW", ExactSpelling = true)] [return: NativeTypeName("INT_PTR")] - public static extern IntPtr DialogBoxParamW([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCWSTR")] ushort* lpTemplateName, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] IntPtr dwInitParam); + public static extern nint DialogBoxParamW([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCWSTR")] ushort* lpTemplateName, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] nint dwInitParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DialogBoxIndirectParamA", ExactSpelling = true)] [return: NativeTypeName("INT_PTR")] - public static extern IntPtr DialogBoxIndirectParamA([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCDLGTEMPLATEA")] DLGTEMPLATE* hDialogTemplate, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] IntPtr dwInitParam); + public static extern nint DialogBoxIndirectParamA([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCDLGTEMPLATEA")] DLGTEMPLATE* hDialogTemplate, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] nint dwInitParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DialogBoxIndirectParamW", ExactSpelling = true)] [return: NativeTypeName("INT_PTR")] - public static extern IntPtr DialogBoxIndirectParamW([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCDLGTEMPLATEW")] DLGTEMPLATE* hDialogTemplate, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] IntPtr dwInitParam); + public static extern nint DialogBoxIndirectParamW([NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPCDLGTEMPLATEW")] DLGTEMPLATE* hDialogTemplate, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("DLGPROC")] IntPtr lpDialogFunc, [NativeTypeName("LPARAM")] nint dwInitParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EndDialog", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EndDialog([NativeTypeName("HWND")] IntPtr hDlg, [NativeTypeName("INT_PTR")] IntPtr nResult); + public static extern int EndDialog([NativeTypeName("HWND")] IntPtr hDlg, [NativeTypeName("INT_PTR")] nint nResult); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetDlgItem", ExactSpelling = true)] [return: NativeTypeName("HWND")] @@ -677,11 +677,11 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SendDlgItemMessageA", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr SendDlgItemMessageA([NativeTypeName("HWND")] IntPtr hDlg, int nIDDlgItem, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint SendDlgItemMessageA([NativeTypeName("HWND")] IntPtr hDlg, int nIDDlgItem, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SendDlgItemMessageW", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr SendDlgItemMessageW([NativeTypeName("HWND")] IntPtr hDlg, int nIDDlgItem, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint SendDlgItemMessageW([NativeTypeName("HWND")] IntPtr hDlg, int nIDDlgItem, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetNextDlgGroupItem", ExactSpelling = true)] [return: NativeTypeName("HWND")] @@ -700,11 +700,11 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DefDlgProcA", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr DefDlgProcA([NativeTypeName("HWND")] IntPtr hDlg, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint DefDlgProcA([NativeTypeName("HWND")] IntPtr hDlg, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DefDlgProcW", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr DefDlgProcW([NativeTypeName("HWND")] IntPtr hDlg, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint DefDlgProcW([NativeTypeName("HWND")] IntPtr hDlg, [NativeTypeName("UINT")] uint Msg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetDialogControlDpiChangeBehavior", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -1003,10 +1003,10 @@ public static unsafe partial class User32 public static extern short VkKeyScanExW([NativeTypeName("WCHAR")] ushort ch, [NativeTypeName("HKL")] IntPtr dwhkl); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "keybd_event", ExactSpelling = true)] - public static extern void keybd_event([NativeTypeName("BYTE")] byte bVk, [NativeTypeName("BYTE")] byte bScan, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("ULONG_PTR")] UIntPtr dwExtraInfo); + public static extern void keybd_event([NativeTypeName("BYTE")] byte bVk, [NativeTypeName("BYTE")] byte bScan, [NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("ULONG_PTR")] nuint dwExtraInfo); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "mouse_event", ExactSpelling = true)] - public static extern void mouse_event([NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("DWORD")] uint dx, [NativeTypeName("DWORD")] uint dy, [NativeTypeName("DWORD")] uint dwData, [NativeTypeName("ULONG_PTR")] UIntPtr dwExtraInfo); + public static extern void mouse_event([NativeTypeName("DWORD")] uint dwFlags, [NativeTypeName("DWORD")] uint dx, [NativeTypeName("DWORD")] uint dy, [NativeTypeName("DWORD")] uint dwData, [NativeTypeName("ULONG_PTR")] nuint dwExtraInfo); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SendInput", ExactSpelling = true)] [return: NativeTypeName("UINT")] @@ -1153,7 +1153,7 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "PackTouchHitTestingProximityEvaluation", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr PackTouchHitTestingProximityEvaluation([NativeTypeName("const TOUCH_HIT_TESTING_INPUT *")] TOUCH_HIT_TESTING_INPUT* pHitTestingInput, [NativeTypeName("const TOUCH_HIT_TESTING_PROXIMITY_EVALUATION *")] TOUCH_HIT_TESTING_PROXIMITY_EVALUATION* pProximityEval); + public static extern nint PackTouchHitTestingProximityEvaluation([NativeTypeName("const TOUCH_HIT_TESTING_INPUT *")] TOUCH_HIT_TESTING_INPUT* pHitTestingInput, [NativeTypeName("const TOUCH_HIT_TESTING_PROXIMITY_EVALUATION *")] TOUCH_HIT_TESTING_PROXIMITY_EVALUATION* pProximityEval); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetWindowFeedbackSetting", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -1217,15 +1217,15 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetTimer", ExactSpelling = true)] [return: NativeTypeName("UINT_PTR")] - public static extern UIntPtr SetTimer([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT_PTR")] UIntPtr nIDEvent, [NativeTypeName("UINT")] uint uElapse, [NativeTypeName("TIMERPROC")] IntPtr lpTimerFunc); + public static extern nuint SetTimer([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT_PTR")] nuint nIDEvent, [NativeTypeName("UINT")] uint uElapse, [NativeTypeName("TIMERPROC")] IntPtr lpTimerFunc); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "SetCoalescableTimer", ExactSpelling = true)] [return: NativeTypeName("UINT_PTR")] - public static extern UIntPtr SetCoalescableTimer([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT_PTR")] UIntPtr nIDEvent, [NativeTypeName("UINT")] uint uElapse, [NativeTypeName("TIMERPROC")] IntPtr lpTimerFunc, [NativeTypeName("ULONG")] uint uToleranceDelay); + public static extern nuint SetCoalescableTimer([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT_PTR")] nuint nIDEvent, [NativeTypeName("UINT")] uint uElapse, [NativeTypeName("TIMERPROC")] IntPtr lpTimerFunc, [NativeTypeName("ULONG")] uint uToleranceDelay); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "KillTimer", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int KillTimer([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT_PTR")] UIntPtr uIDEvent); + public static extern int KillTimer([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT_PTR")] nuint uIDEvent); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "IsWindowUnicode", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -1364,27 +1364,27 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "InsertMenuA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int InsertMenuA([NativeTypeName("HMENU")] IntPtr hMenu, [NativeTypeName("UINT")] uint uPosition, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] UIntPtr uIDNewItem, [NativeTypeName("LPCSTR")] sbyte* lpNewItem); + public static extern int InsertMenuA([NativeTypeName("HMENU")] IntPtr hMenu, [NativeTypeName("UINT")] uint uPosition, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] nuint uIDNewItem, [NativeTypeName("LPCSTR")] sbyte* lpNewItem); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "InsertMenuW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int InsertMenuW([NativeTypeName("HMENU")] IntPtr hMenu, [NativeTypeName("UINT")] uint uPosition, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] UIntPtr uIDNewItem, [NativeTypeName("LPCWSTR")] ushort* lpNewItem); + public static extern int InsertMenuW([NativeTypeName("HMENU")] IntPtr hMenu, [NativeTypeName("UINT")] uint uPosition, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] nuint uIDNewItem, [NativeTypeName("LPCWSTR")] ushort* lpNewItem); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AppendMenuA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int AppendMenuA([NativeTypeName("HMENU")] IntPtr hMenu, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] UIntPtr uIDNewItem, [NativeTypeName("LPCSTR")] sbyte* lpNewItem); + public static extern int AppendMenuA([NativeTypeName("HMENU")] IntPtr hMenu, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] nuint uIDNewItem, [NativeTypeName("LPCSTR")] sbyte* lpNewItem); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "AppendMenuW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int AppendMenuW([NativeTypeName("HMENU")] IntPtr hMenu, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] UIntPtr uIDNewItem, [NativeTypeName("LPCWSTR")] ushort* lpNewItem); + public static extern int AppendMenuW([NativeTypeName("HMENU")] IntPtr hMenu, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] nuint uIDNewItem, [NativeTypeName("LPCWSTR")] ushort* lpNewItem); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ModifyMenuA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int ModifyMenuA([NativeTypeName("HMENU")] IntPtr hMnu, [NativeTypeName("UINT")] uint uPosition, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] UIntPtr uIDNewItem, [NativeTypeName("LPCSTR")] sbyte* lpNewItem); + public static extern int ModifyMenuA([NativeTypeName("HMENU")] IntPtr hMnu, [NativeTypeName("UINT")] uint uPosition, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] nuint uIDNewItem, [NativeTypeName("LPCSTR")] sbyte* lpNewItem); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "ModifyMenuW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int ModifyMenuW([NativeTypeName("HMENU")] IntPtr hMnu, [NativeTypeName("UINT")] uint uPosition, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] UIntPtr uIDNewItem, [NativeTypeName("LPCWSTR")] ushort* lpNewItem); + public static extern int ModifyMenuW([NativeTypeName("HMENU")] IntPtr hMnu, [NativeTypeName("UINT")] uint uPosition, [NativeTypeName("UINT")] uint uFlags, [NativeTypeName("UINT_PTR")] nuint uIDNewItem, [NativeTypeName("LPCWSTR")] ushort* lpNewItem); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "RemoveMenu", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -1467,7 +1467,7 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DragObject", ExactSpelling = true)] [return: NativeTypeName("DWORD")] - public static extern uint DragObject([NativeTypeName("HWND")] IntPtr hwndParent, [NativeTypeName("HWND")] IntPtr hwndFrom, [NativeTypeName("UINT")] uint fmt, [NativeTypeName("ULONG_PTR")] UIntPtr data, [NativeTypeName("HCURSOR")] IntPtr hcur); + public static extern uint DragObject([NativeTypeName("HWND")] IntPtr hwndParent, [NativeTypeName("HWND")] IntPtr hwndFrom, [NativeTypeName("UINT")] uint fmt, [NativeTypeName("ULONG_PTR")] nuint data, [NativeTypeName("HCURSOR")] IntPtr hcur); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DragDetect", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -1491,19 +1491,19 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GrayStringA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int GrayStringA([NativeTypeName("HDC")] IntPtr hDC, [NativeTypeName("HBRUSH")] IntPtr hBrush, [NativeTypeName("GRAYSTRINGPROC")] IntPtr lpOutputFunc, [NativeTypeName("LPARAM")] IntPtr lpData, int nCount, int X, int Y, int nWidth, int nHeight); + public static extern int GrayStringA([NativeTypeName("HDC")] IntPtr hDC, [NativeTypeName("HBRUSH")] IntPtr hBrush, [NativeTypeName("GRAYSTRINGPROC")] IntPtr lpOutputFunc, [NativeTypeName("LPARAM")] nint lpData, int nCount, int X, int Y, int nWidth, int nHeight); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GrayStringW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int GrayStringW([NativeTypeName("HDC")] IntPtr hDC, [NativeTypeName("HBRUSH")] IntPtr hBrush, [NativeTypeName("GRAYSTRINGPROC")] IntPtr lpOutputFunc, [NativeTypeName("LPARAM")] IntPtr lpData, int nCount, int X, int Y, int nWidth, int nHeight); + public static extern int GrayStringW([NativeTypeName("HDC")] IntPtr hDC, [NativeTypeName("HBRUSH")] IntPtr hBrush, [NativeTypeName("GRAYSTRINGPROC")] IntPtr lpOutputFunc, [NativeTypeName("LPARAM")] nint lpData, int nCount, int X, int Y, int nWidth, int nHeight); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DrawStateA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int DrawStateA([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("HBRUSH")] IntPtr hbrFore, [NativeTypeName("DRAWSTATEPROC")] IntPtr qfnCallBack, [NativeTypeName("LPARAM")] IntPtr lData, [NativeTypeName("WPARAM")] UIntPtr wData, int x, int y, int cx, int cy, [NativeTypeName("UINT")] uint uFlags); + public static extern int DrawStateA([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("HBRUSH")] IntPtr hbrFore, [NativeTypeName("DRAWSTATEPROC")] IntPtr qfnCallBack, [NativeTypeName("LPARAM")] nint lData, [NativeTypeName("WPARAM")] nuint wData, int x, int y, int cx, int cy, [NativeTypeName("UINT")] uint uFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DrawStateW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int DrawStateW([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("HBRUSH")] IntPtr hbrFore, [NativeTypeName("DRAWSTATEPROC")] IntPtr qfnCallBack, [NativeTypeName("LPARAM")] IntPtr lData, [NativeTypeName("WPARAM")] UIntPtr wData, int x, int y, int cx, int cy, [NativeTypeName("UINT")] uint uFlags); + public static extern int DrawStateW([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("HBRUSH")] IntPtr hbrFore, [NativeTypeName("DRAWSTATEPROC")] IntPtr qfnCallBack, [NativeTypeName("LPARAM")] nint lData, [NativeTypeName("WPARAM")] nuint wData, int x, int y, int cx, int cy, [NativeTypeName("UINT")] uint uFlags); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "TabbedTextOutA", ExactSpelling = true)] [return: NativeTypeName("LONG")] @@ -1680,10 +1680,10 @@ public static unsafe partial class User32 public static extern IntPtr RemovePropW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("LPCWSTR")] ushort* lpString); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumPropsExA", ExactSpelling = true)] - public static extern int EnumPropsExA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("PROPENUMPROCEXA")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumPropsExA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("PROPENUMPROCEXA")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumPropsExW", ExactSpelling = true)] - public static extern int EnumPropsExW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("PROPENUMPROCEXW")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumPropsExW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("PROPENUMPROCEXW")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumPropsA", ExactSpelling = true)] public static extern int EnumPropsA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("PROPENUMPROCA")] IntPtr lpEnumFunc); @@ -2019,7 +2019,7 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumChildWindows", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumChildWindows([NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("WNDENUMPROC")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumChildWindows([NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("WNDENUMPROC")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "FindWindowA", ExactSpelling = true)] [return: NativeTypeName("HWND")] @@ -2051,11 +2051,11 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumWindows", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumWindows([NativeTypeName("WNDENUMPROC")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumWindows([NativeTypeName("WNDENUMPROC")] IntPtr lpEnumFunc, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumThreadWindows", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumThreadWindows([NativeTypeName("DWORD")] uint dwThreadId, [NativeTypeName("WNDENUMPROC")] IntPtr lpfn, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern int EnumThreadWindows([NativeTypeName("DWORD")] uint dwThreadId, [NativeTypeName("WNDENUMPROC")] IntPtr lpfn, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetClassNameA", ExactSpelling = true)] public static extern int GetClassNameA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("LPSTR")] sbyte* lpClassName, int nMaxCount); @@ -2109,7 +2109,7 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CallNextHookEx", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr CallNextHookEx([NativeTypeName("HHOOK")] IntPtr hhk, int nCode, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint CallNextHookEx([NativeTypeName("HHOOK")] IntPtr hhk, int nCode, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CheckMenuRadioItem", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -2274,19 +2274,19 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DefFrameProcA", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr DefFrameProcA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("HWND")] IntPtr hWndMDIClient, [NativeTypeName("UINT")] uint uMsg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint DefFrameProcA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("HWND")] IntPtr hWndMDIClient, [NativeTypeName("UINT")] uint uMsg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DefFrameProcW", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr DefFrameProcW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("HWND")] IntPtr hWndMDIClient, [NativeTypeName("UINT")] uint uMsg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint DefFrameProcW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("HWND")] IntPtr hWndMDIClient, [NativeTypeName("UINT")] uint uMsg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DefMDIChildProcA", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr DefMDIChildProcA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint uMsg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint DefMDIChildProcA([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint uMsg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DefMDIChildProcW", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr DefMDIChildProcW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint uMsg, [NativeTypeName("WPARAM")] UIntPtr wParam, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern nint DefMDIChildProcW([NativeTypeName("HWND")] IntPtr hWnd, [NativeTypeName("UINT")] uint uMsg, [NativeTypeName("WPARAM")] nuint wParam, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "TranslateMDISysAccel", ExactSpelling = true)] [return: NativeTypeName("BOOL")] @@ -2298,11 +2298,11 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateMDIWindowA", ExactSpelling = true)] [return: NativeTypeName("HWND")] - public static extern IntPtr CreateMDIWindowA([NativeTypeName("LPCSTR")] sbyte* lpClassName, [NativeTypeName("LPCSTR")] sbyte* lpWindowName, [NativeTypeName("DWORD")] uint dwStyle, int X, int Y, int nWidth, int nHeight, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern IntPtr CreateMDIWindowA([NativeTypeName("LPCSTR")] sbyte* lpClassName, [NativeTypeName("LPCSTR")] sbyte* lpWindowName, [NativeTypeName("DWORD")] uint dwStyle, int X, int Y, int nWidth, int nHeight, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "CreateMDIWindowW", ExactSpelling = true)] [return: NativeTypeName("HWND")] - public static extern IntPtr CreateMDIWindowW([NativeTypeName("LPCWSTR")] ushort* lpClassName, [NativeTypeName("LPCWSTR")] ushort* lpWindowName, [NativeTypeName("DWORD")] uint dwStyle, int X, int Y, int nWidth, int nHeight, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPARAM")] IntPtr lParam); + public static extern IntPtr CreateMDIWindowW([NativeTypeName("LPCWSTR")] ushort* lpClassName, [NativeTypeName("LPCWSTR")] ushort* lpWindowName, [NativeTypeName("DWORD")] uint dwStyle, int X, int Y, int nWidth, int nHeight, [NativeTypeName("HWND")] IntPtr hWndParent, [NativeTypeName("HINSTANCE")] IntPtr hInstance, [NativeTypeName("LPARAM")] nint lParam); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "TileWindows", ExactSpelling = true)] [return: NativeTypeName("WORD")] @@ -2314,11 +2314,11 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "WinHelpA", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int WinHelpA([NativeTypeName("HWND")] IntPtr hWndMain, [NativeTypeName("LPCSTR")] sbyte* lpszHelp, [NativeTypeName("UINT")] uint uCommand, [NativeTypeName("ULONG_PTR")] UIntPtr dwData); + public static extern int WinHelpA([NativeTypeName("HWND")] IntPtr hWndMain, [NativeTypeName("LPCSTR")] sbyte* lpszHelp, [NativeTypeName("UINT")] uint uCommand, [NativeTypeName("ULONG_PTR")] nuint dwData); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "WinHelpW", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int WinHelpW([NativeTypeName("HWND")] IntPtr hWndMain, [NativeTypeName("LPCWSTR")] ushort* lpszHelp, [NativeTypeName("UINT")] uint uCommand, [NativeTypeName("ULONG_PTR")] UIntPtr dwData); + public static extern int WinHelpW([NativeTypeName("HWND")] IntPtr hWndMain, [NativeTypeName("LPCWSTR")] ushort* lpszHelp, [NativeTypeName("UINT")] uint uCommand, [NativeTypeName("ULONG_PTR")] nuint dwData); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetGuiResources", ExactSpelling = true)] [return: NativeTypeName("DWORD")] @@ -2435,7 +2435,7 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "EnumDisplayMonitors", ExactSpelling = true)] [return: NativeTypeName("BOOL")] - public static extern int EnumDisplayMonitors([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPCRECT")] RECT* lprcClip, [NativeTypeName("MONITORENUMPROC")] IntPtr lpfnEnum, [NativeTypeName("LPARAM")] IntPtr dwData); + public static extern int EnumDisplayMonitors([NativeTypeName("HDC")] IntPtr hdc, [NativeTypeName("LPCRECT")] RECT* lprcClip, [NativeTypeName("MONITORENUMPROC")] IntPtr lpfnEnum, [NativeTypeName("LPARAM")] nint dwData); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "NotifyWinEvent", ExactSpelling = true)] public static extern void NotifyWinEvent([NativeTypeName("DWORD")] uint @event, [NativeTypeName("HWND")] IntPtr hwnd, [NativeTypeName("LONG")] int idObject, [NativeTypeName("LONG")] int idChild); @@ -2630,7 +2630,7 @@ public static unsafe partial class User32 [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "DefRawInputProc", ExactSpelling = true)] [return: NativeTypeName("LRESULT")] - public static extern IntPtr DefRawInputProc([NativeTypeName("PRAWINPUT *")] RAWINPUT** paRawInput, [NativeTypeName("INT")] int nInput, [NativeTypeName("UINT")] uint cbSizeHeader); + public static extern nint DefRawInputProc([NativeTypeName("PRAWINPUT *")] RAWINPUT** paRawInput, [NativeTypeName("INT")] int nInput, [NativeTypeName("UINT")] uint cbSizeHeader); [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "GetPointerDevices", ExactSpelling = true)] [return: NativeTypeName("BOOL")] diff --git a/sources/Interop/User32/um/WinUser/WNDENUMPROC.cs b/sources/Interop/User32/um/WinUser/WNDENUMPROC.cs index dea2237b29..1097be6319 100644 --- a/sources/Interop/User32/um/WinUser/WNDENUMPROC.cs +++ b/sources/Interop/User32/um/WinUser/WNDENUMPROC.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOL")] - public delegate int WNDENUMPROC([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("LPARAM")] IntPtr param1); + public delegate int WNDENUMPROC([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("LPARAM")] nint param1); } diff --git a/sources/Interop/User32/um/WinUser/WNDPROC.cs b/sources/Interop/User32/um/WinUser/WNDPROC.cs index b76aeb74e9..356d9c9d93 100644 --- a/sources/Interop/User32/um/WinUser/WNDPROC.cs +++ b/sources/Interop/User32/um/WinUser/WNDPROC.cs @@ -10,5 +10,5 @@ namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("LRESULT")] - public delegate IntPtr WNDPROC([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("UINT")] uint param1, [NativeTypeName("WPARAM")] UIntPtr param2, [NativeTypeName("LPARAM")] IntPtr param3); + public delegate nint WNDPROC([NativeTypeName("HWND")] IntPtr param0, [NativeTypeName("UINT")] uint param1, [NativeTypeName("WPARAM")] nuint param2, [NativeTypeName("LPARAM")] nint param3); } diff --git a/sources/Interop/WinCodec/TerraFX.Interop.WinCodec.csproj b/sources/Interop/WinCodec/TerraFX.Interop.WinCodec.csproj index 8b471048c2..5ec17b7313 100644 --- a/sources/Interop/WinCodec/TerraFX.Interop.WinCodec.csproj +++ b/sources/Interop/WinCodec/TerraFX.Interop.WinCodec.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/WinCodec/um/wincodec/IWICImagingFactory.cs b/sources/Interop/WinCodec/um/wincodec/IWICImagingFactory.cs index 4bcb76cb73..ac074b46c3 100644 --- a/sources/Interop/WinCodec/um/wincodec/IWICImagingFactory.cs +++ b/sources/Interop/WinCodec/um/wincodec/IWICImagingFactory.cs @@ -36,7 +36,7 @@ public unsafe partial struct IWICImagingFactory [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateDecoderFromFileHandle(IWICImagingFactory* pThis, [NativeTypeName("ULONG_PTR")] UIntPtr hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder); + public delegate int _CreateDecoderFromFileHandle(IWICImagingFactory* pThis, [NativeTypeName("ULONG_PTR")] nuint hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -157,7 +157,7 @@ public int CreateDecoderFromStream([NativeTypeName("IStream *")] IStream* pIStre } [return: NativeTypeName("HRESULT")] - public int CreateDecoderFromFileHandle([NativeTypeName("ULONG_PTR")] UIntPtr hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder) + public int CreateDecoderFromFileHandle([NativeTypeName("ULONG_PTR")] nuint hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder) { return Marshal.GetDelegateForFunctionPointer<_CreateDecoderFromFileHandle>(lpVtbl->CreateDecoderFromFileHandle)((IWICImagingFactory*)Unsafe.AsPointer(ref this), hFile, pguidVendor, metadataOptions, ppIDecoder); } diff --git a/sources/Interop/WinCodec/um/wincodec/IWICImagingFactory2.cs b/sources/Interop/WinCodec/um/wincodec/IWICImagingFactory2.cs index b477689b54..35ef0edb25 100644 --- a/sources/Interop/WinCodec/um/wincodec/IWICImagingFactory2.cs +++ b/sources/Interop/WinCodec/um/wincodec/IWICImagingFactory2.cs @@ -36,7 +36,7 @@ public unsafe partial struct IWICImagingFactory2 [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateDecoderFromFileHandle(IWICImagingFactory2* pThis, [NativeTypeName("ULONG_PTR")] UIntPtr hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder); + public delegate int _CreateDecoderFromFileHandle(IWICImagingFactory2* pThis, [NativeTypeName("ULONG_PTR")] nuint hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -161,7 +161,7 @@ public int CreateDecoderFromStream([NativeTypeName("IStream *")] IStream* pIStre } [return: NativeTypeName("HRESULT")] - public int CreateDecoderFromFileHandle([NativeTypeName("ULONG_PTR")] UIntPtr hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder) + public int CreateDecoderFromFileHandle([NativeTypeName("ULONG_PTR")] nuint hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder) { return Marshal.GetDelegateForFunctionPointer<_CreateDecoderFromFileHandle>(lpVtbl->CreateDecoderFromFileHandle)((IWICImagingFactory2*)Unsafe.AsPointer(ref this), hFile, pguidVendor, metadataOptions, ppIDecoder); } diff --git a/sources/Interop/WinCodec/um/wincodecsdk/IWICComponentFactory.cs b/sources/Interop/WinCodec/um/wincodecsdk/IWICComponentFactory.cs index 5700f928df..905adcd620 100644 --- a/sources/Interop/WinCodec/um/wincodecsdk/IWICComponentFactory.cs +++ b/sources/Interop/WinCodec/um/wincodecsdk/IWICComponentFactory.cs @@ -36,7 +36,7 @@ public unsafe partial struct IWICComponentFactory [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] - public delegate int _CreateDecoderFromFileHandle(IWICComponentFactory* pThis, [NativeTypeName("ULONG_PTR")] UIntPtr hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder); + public delegate int _CreateDecoderFromFileHandle(IWICComponentFactory* pThis, [NativeTypeName("ULONG_PTR")] nuint hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder); [UnmanagedFunctionPointer(CallingConvention.StdCall)] [return: NativeTypeName("HRESULT")] @@ -185,7 +185,7 @@ public int CreateDecoderFromStream([NativeTypeName("IStream *")] IStream* pIStre } [return: NativeTypeName("HRESULT")] - public int CreateDecoderFromFileHandle([NativeTypeName("ULONG_PTR")] UIntPtr hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder) + public int CreateDecoderFromFileHandle([NativeTypeName("ULONG_PTR")] nuint hFile, [NativeTypeName("const GUID *")] Guid* pguidVendor, WICDecodeOptions metadataOptions, [NativeTypeName("IWICBitmapDecoder **")] IWICBitmapDecoder** ppIDecoder) { return Marshal.GetDelegateForFunctionPointer<_CreateDecoderFromFileHandle>(lpVtbl->CreateDecoderFromFileHandle)((IWICComponentFactory*)Unsafe.AsPointer(ref this), hFile, pguidVendor, metadataOptions, ppIDecoder); } diff --git a/sources/Interop/WinTrust/TerraFX.Interop.WinTrust.csproj b/sources/Interop/WinTrust/TerraFX.Interop.WinTrust.csproj index a2a7e4bb0f..121b949297 100644 --- a/sources/Interop/WinTrust/TerraFX.Interop.WinTrust.csproj +++ b/sources/Interop/WinTrust/TerraFX.Interop.WinTrust.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/WinTrust/WinTrust.cs b/sources/Interop/WinTrust/WinTrust.cs deleted file mode 100644 index 92c45a6f44..0000000000 --- a/sources/Interop/WinTrust/WinTrust.cs +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. - -namespace TerraFX.Interop -{ - public static unsafe partial class WinTrust - { - private const string LibraryPath = "wintrust"; - } -} diff --git a/sources/Interop/WinTrust/um/SoftPub/DRIVER_VER_INFO.cs b/sources/Interop/WinTrust/um/SoftPub/DRIVER_VER_INFO.cs index 02d7f3b936..e327566f01 100644 --- a/sources/Interop/WinTrust/um/SoftPub/DRIVER_VER_INFO.cs +++ b/sources/Interop/WinTrust/um/SoftPub/DRIVER_VER_INFO.cs @@ -3,8 +3,6 @@ // Ported from um/SoftPub.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct DRIVER_VER_INFO @@ -13,10 +11,10 @@ public unsafe partial struct DRIVER_VER_INFO public uint cbStruct; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwReserved1; + public nuint dwReserved1; [NativeTypeName("ULONG_PTR")] - public UIntPtr dwReserved2; + public nuint dwReserved2; [NativeTypeName("DWORD")] public uint dwPlatform; diff --git a/sources/Interop/WinTrust/um/SoftPub/WTD_GENERIC_CHAIN_POLICY_DATA.cs b/sources/Interop/WinTrust/um/SoftPub/WTD_GENERIC_CHAIN_POLICY_DATA.cs index b2a976f69f..d270d4470f 100644 --- a/sources/Interop/WinTrust/um/SoftPub/WTD_GENERIC_CHAIN_POLICY_DATA.cs +++ b/sources/Interop/WinTrust/um/SoftPub/WTD_GENERIC_CHAIN_POLICY_DATA.cs @@ -20,7 +20,7 @@ public unsafe partial struct WTD_GENERIC_CHAIN_POLICY_DATA public WTD_GENERIC_CHAIN_POLICY_CREATE_INFO* pCounterSignerChainInfo; [NativeTypeName("PFN_WTD_GENERIC_CHAIN_POLICY_CALLBACK")] - public IntPtr* pfnPolicyCallback; + public IntPtr pfnPolicyCallback; [NativeTypeName("void *")] public void* pvPolicyArg; diff --git a/sources/Interop/WinTrust/um/WinTrust/CRYPT_PROVIDER_FUNCTIONS.cs b/sources/Interop/WinTrust/um/WinTrust/CRYPT_PROVIDER_FUNCTIONS.cs index bbc0db95da..e50c85733f 100644 --- a/sources/Interop/WinTrust/um/WinTrust/CRYPT_PROVIDER_FUNCTIONS.cs +++ b/sources/Interop/WinTrust/um/WinTrust/CRYPT_PROVIDER_FUNCTIONS.cs @@ -13,48 +13,48 @@ public unsafe partial struct CRYPT_PROVIDER_FUNCTIONS public uint cbStruct; [NativeTypeName("PFN_CPD_MEM_ALLOC")] - public IntPtr* pfnAlloc; + public IntPtr pfnAlloc; [NativeTypeName("PFN_CPD_MEM_FREE")] - public IntPtr* pfnFree; + public IntPtr pfnFree; [NativeTypeName("PFN_CPD_ADD_STORE")] - public IntPtr* pfnAddStore2Chain; + public IntPtr pfnAddStore2Chain; [NativeTypeName("PFN_CPD_ADD_SGNR")] - public IntPtr* pfnAddSgnr2Chain; + public IntPtr pfnAddSgnr2Chain; [NativeTypeName("PFN_CPD_ADD_CERT")] - public IntPtr* pfnAddCert2Chain; + public IntPtr pfnAddCert2Chain; [NativeTypeName("PFN_CPD_ADD_PRIVDATA")] - public IntPtr* pfnAddPrivData2Chain; + public IntPtr pfnAddPrivData2Chain; [NativeTypeName("PFN_PROVIDER_INIT_CALL")] - public IntPtr* pfnInitialize; + public IntPtr pfnInitialize; [NativeTypeName("PFN_PROVIDER_OBJTRUST_CALL")] - public IntPtr* pfnObjectTrust; + public IntPtr pfnObjectTrust; [NativeTypeName("PFN_PROVIDER_SIGTRUST_CALL")] - public IntPtr* pfnSignatureTrust; + public IntPtr pfnSignatureTrust; [NativeTypeName("PFN_PROVIDER_CERTTRUST_CALL")] - public IntPtr* pfnCertificateTrust; + public IntPtr pfnCertificateTrust; [NativeTypeName("PFN_PROVIDER_FINALPOLICY_CALL")] - public IntPtr* pfnFinalPolicy; + public IntPtr pfnFinalPolicy; [NativeTypeName("PFN_PROVIDER_CERTCHKPOLICY_CALL")] - public IntPtr* pfnCertCheckPolicy; + public IntPtr pfnCertCheckPolicy; [NativeTypeName("PFN_PROVIDER_TESTFINALPOLICY_CALL")] - public IntPtr* pfnTestFinalPolicy; + public IntPtr pfnTestFinalPolicy; [NativeTypeName("struct _CRYPT_PROVUI_FUNCS *")] public CRYPT_PROVUI_FUNCS* psUIpfns; [NativeTypeName("PFN_PROVIDER_CLEANUP_CALL")] - public IntPtr* pfnCleanupPolicy; + public IntPtr pfnCleanupPolicy; } } diff --git a/sources/Interop/WinTrust/um/WinTrust/CRYPT_PROVUI_FUNCS.cs b/sources/Interop/WinTrust/um/WinTrust/CRYPT_PROVUI_FUNCS.cs index 50759cdd51..19cce55043 100644 --- a/sources/Interop/WinTrust/um/WinTrust/CRYPT_PROVUI_FUNCS.cs +++ b/sources/Interop/WinTrust/um/WinTrust/CRYPT_PROVUI_FUNCS.cs @@ -16,15 +16,15 @@ public unsafe partial struct CRYPT_PROVUI_FUNCS public CRYPT_PROVUI_DATA* psUIData; [NativeTypeName("PFN_PROVUI_CALL")] - public IntPtr* pfnOnMoreInfoClick; + public IntPtr pfnOnMoreInfoClick; [NativeTypeName("PFN_PROVUI_CALL")] - public IntPtr* pfnOnMoreInfoClickDefault; + public IntPtr pfnOnMoreInfoClickDefault; [NativeTypeName("PFN_PROVUI_CALL")] - public IntPtr* pfnOnAdvancedClick; + public IntPtr pfnOnAdvancedClick; [NativeTypeName("PFN_PROVUI_CALL")] - public IntPtr* pfnOnAdvancedClickDefault; + public IntPtr pfnOnAdvancedClickDefault; } } diff --git a/sources/Interop/WinTrust/um/WinTrust/WinTrust.cs b/sources/Interop/WinTrust/um/WinTrust/WinTrust.cs index 5bdd25f5b5..a35f600ec1 100644 --- a/sources/Interop/WinTrust/um/WinTrust/WinTrust.cs +++ b/sources/Interop/WinTrust/um/WinTrust/WinTrust.cs @@ -10,6 +10,8 @@ namespace TerraFX.Interop { public static unsafe partial class WinTrust { + private const string LibraryPath = "wintrust"; + [DllImport(LibraryPath, CallingConvention = CallingConvention.Winapi, EntryPoint = "WinVerifyTrust", ExactSpelling = true)] [return: NativeTypeName("LONG")] public static extern int WinVerifyTrust([NativeTypeName("HWND")] IntPtr hwnd, [NativeTypeName("GUID *")] Guid* pgActionID, [NativeTypeName("LPVOID")] void* pWVTData); diff --git a/sources/Interop/Windows/TerraFX.Interop.Windows.csproj b/sources/Interop/Windows/TerraFX.Interop.Windows.csproj index 9f5ef288bc..86e1124436 100644 --- a/sources/Interop/Windows/TerraFX.Interop.Windows.csproj +++ b/sources/Interop/Windows/TerraFX.Interop.Windows.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/sources/Interop/Windows/shared/devpropdef/DEVPROPCOMPKEY.cs b/sources/Interop/Windows/shared/devpropdef/DEVPROPCOMPKEY.cs index 01d994dd63..b64c29b884 100644 --- a/sources/Interop/Windows/shared/devpropdef/DEVPROPCOMPKEY.cs +++ b/sources/Interop/Windows/shared/devpropdef/DEVPROPCOMPKEY.cs @@ -1,6 +1,6 @@ // Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. -// Ported from um/devpropdef.h in the Windows SDK for Windows 10.0.18362.0 +// Ported from shared/devpropdef.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. namespace TerraFX.Interop diff --git a/sources/Interop/Windows/shared/devpropdef/DEVPROPERTY.cs b/sources/Interop/Windows/shared/devpropdef/DEVPROPERTY.cs index e74dd11dea..4b6ac77a71 100644 --- a/sources/Interop/Windows/shared/devpropdef/DEVPROPERTY.cs +++ b/sources/Interop/Windows/shared/devpropdef/DEVPROPERTY.cs @@ -1,6 +1,6 @@ // Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. -// Ported from um/devpropdef.h in the Windows SDK for Windows 10.0.18362.0 +// Ported from shared/devpropdef.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. namespace TerraFX.Interop diff --git a/sources/Interop/Windows/shared/devpropdef/DEVPROPKEY.cs b/sources/Interop/Windows/shared/devpropdef/DEVPROPKEY.cs index 8246f8257b..dd12d51c4b 100644 --- a/sources/Interop/Windows/shared/devpropdef/DEVPROPKEY.cs +++ b/sources/Interop/Windows/shared/devpropdef/DEVPROPKEY.cs @@ -1,6 +1,6 @@ // Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. -// Ported from um/devpropdef.h in the Windows SDK for Windows 10.0.18362.0 +// Ported from shared/devpropdef.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. using System; diff --git a/sources/Interop/Windows/shared/devpropdef/DEVPROPSTORE.cs b/sources/Interop/Windows/shared/devpropdef/DEVPROPSTORE.cs index 6a91590d1e..4a215c89d2 100644 --- a/sources/Interop/Windows/shared/devpropdef/DEVPROPSTORE.cs +++ b/sources/Interop/Windows/shared/devpropdef/DEVPROPSTORE.cs @@ -1,6 +1,6 @@ // Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. -// Ported from um/devpropdef.h in the Windows SDK for Windows 10.0.18362.0 +// Ported from shared/devpropdef.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. namespace TerraFX.Interop diff --git a/sources/Interop/Windows/shared/hidclass/Windows.Manual.cs b/sources/Interop/Windows/shared/hidclass/Windows.Manual.cs index 2edaa51794..0dd0f3116c 100644 --- a/sources/Interop/Windows/shared/hidclass/Windows.Manual.cs +++ b/sources/Interop/Windows/shared/hidclass/Windows.Manual.cs @@ -14,9 +14,9 @@ public static unsafe partial class Windows public static readonly Guid GUID_DEVINTERFACE_HID = new Guid(0x4D1E55B2, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30); - public static readonly Guid GUID_HID_INTERFACE_NOTIFY = new Guid(0x2c4e2e88, 0x25e6, 0x4c33, 0x88, 0x2f, 0x3d, 0x82, 0xe6, 0x07, 0x36, 0x81); + public static readonly Guid GUID_HID_INTERFACE_NOTIFY = new Guid(0x2C4E2E88, 0x25E6, 0x4C33, 0x88, 0x2F, 0x3D, 0x82, 0xE6, 0x07, 0x36, 0x81); - public static readonly Guid GUID_HID_INTERFACE_HIDPARSE = new Guid(0xf5c315a5, 0x69ac, 0x4bc2, 0x92, 0x79, 0xd0, 0xb6, 0x45, 0x76, 0xf4, 0x4b); + public static readonly Guid GUID_HID_INTERFACE_HIDPARSE = new Guid(0xF5C315A5, 0x69AC, 0x4BC2, 0x92, 0x79, 0xD0, 0xB6, 0x45, 0x76, 0xF4, 0x4B); public static readonly Guid GUID_CLASS_INPUT = GUID_DEVINTERFACE_HID; diff --git a/sources/Interop/Windows/um/minwinbase/CREATE_PROCESS_DEBUG_INFO.cs b/sources/Interop/Windows/um/minwinbase/CREATE_PROCESS_DEBUG_INFO.cs index 0f398e3f08..133e898aa3 100644 --- a/sources/Interop/Windows/um/minwinbase/CREATE_PROCESS_DEBUG_INFO.cs +++ b/sources/Interop/Windows/um/minwinbase/CREATE_PROCESS_DEBUG_INFO.cs @@ -31,7 +31,7 @@ public unsafe partial struct CREATE_PROCESS_DEBUG_INFO public void* lpThreadLocalBase; [NativeTypeName("LPTHREAD_START_ROUTINE")] - public IntPtr* lpStartAddress; + public IntPtr lpStartAddress; [NativeTypeName("LPVOID")] public void* lpImageName; diff --git a/sources/Interop/Windows/um/minwinbase/CREATE_THREAD_DEBUG_INFO.cs b/sources/Interop/Windows/um/minwinbase/CREATE_THREAD_DEBUG_INFO.cs index 6253d22fca..37dbd088f1 100644 --- a/sources/Interop/Windows/um/minwinbase/CREATE_THREAD_DEBUG_INFO.cs +++ b/sources/Interop/Windows/um/minwinbase/CREATE_THREAD_DEBUG_INFO.cs @@ -16,6 +16,6 @@ public unsafe partial struct CREATE_THREAD_DEBUG_INFO public void* lpThreadLocalBase; [NativeTypeName("LPTHREAD_START_ROUTINE")] - public IntPtr* lpStartAddress; + public IntPtr lpStartAddress; } } diff --git a/sources/Interop/Windows/um/minwinbase/OVERLAPPED.cs b/sources/Interop/Windows/um/minwinbase/OVERLAPPED.cs index b6601800d3..b9ef62743e 100644 --- a/sources/Interop/Windows/um/minwinbase/OVERLAPPED.cs +++ b/sources/Interop/Windows/um/minwinbase/OVERLAPPED.cs @@ -11,10 +11,10 @@ namespace TerraFX.Interop public partial struct OVERLAPPED { [NativeTypeName("ULONG_PTR")] - public UIntPtr Internal; + public nuint Internal; [NativeTypeName("ULONG_PTR")] - public UIntPtr InternalHigh; + public nuint InternalHigh; [NativeTypeName("_OVERLAPPED::(anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/minwinbase.h:55:5)")] public _Anonymous_e__Union1 Anonymous; diff --git a/sources/Interop/Windows/um/minwinbase/OVERLAPPED_ENTRY.cs b/sources/Interop/Windows/um/minwinbase/OVERLAPPED_ENTRY.cs index 3a3aceebba..b8bab7e928 100644 --- a/sources/Interop/Windows/um/minwinbase/OVERLAPPED_ENTRY.cs +++ b/sources/Interop/Windows/um/minwinbase/OVERLAPPED_ENTRY.cs @@ -3,20 +3,18 @@ // Ported from um/minwinbase.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct OVERLAPPED_ENTRY { [NativeTypeName("ULONG_PTR")] - public UIntPtr lpCompletionKey; + public nuint lpCompletionKey; [NativeTypeName("LPOVERLAPPED")] public OVERLAPPED* lpOverlapped; [NativeTypeName("ULONG_PTR")] - public UIntPtr Internal; + public nuint Internal; [NativeTypeName("DWORD")] public uint dwNumberOfBytesTransferred; diff --git a/sources/Interop/Windows/um/objidlbase/RPCOLEMESSAGE.cs b/sources/Interop/Windows/um/objidlbase/RPCOLEMESSAGE.cs index f38a0f7ca0..6bca2e465b 100644 --- a/sources/Interop/Windows/um/objidlbase/RPCOLEMESSAGE.cs +++ b/sources/Interop/Windows/um/objidlbase/RPCOLEMESSAGE.cs @@ -31,7 +31,7 @@ public unsafe partial struct RPCOLEMESSAGE [NativeTypeName("ULONG")] public uint rpcFlags; - public unsafe partial struct _reserved2_e__FixedBuffer + public partial struct _reserved2_e__FixedBuffer { internal IntPtr e0; internal IntPtr e1; diff --git a/sources/Interop/Windows/um/winnt/ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION.cs b/sources/Interop/Windows/um/winnt/ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION.cs index d95079a5d1..be48f7abee 100644 --- a/sources/Interop/Windows/um/winnt/ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION.cs +++ b/sources/Interop/Windows/um/winnt/ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION.cs @@ -5,12 +5,12 @@ namespace TerraFX.Interop { - public unsafe partial struct ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION + public partial struct ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION { [NativeTypeName("DWORD")] public uint ElementCount; [NativeTypeName("COMPATIBILITY_CONTEXT_ELEMENT []")] - public COMPATIBILITY_CONTEXT_ELEMENT* Elements; + public COMPATIBILITY_CONTEXT_ELEMENT Elements; } } diff --git a/sources/Interop/Windows/um/winnt/CFG_CALL_TARGET_INFO.cs b/sources/Interop/Windows/um/winnt/CFG_CALL_TARGET_INFO.cs index 99e716cee3..33bd40bfd5 100644 --- a/sources/Interop/Windows/um/winnt/CFG_CALL_TARGET_INFO.cs +++ b/sources/Interop/Windows/um/winnt/CFG_CALL_TARGET_INFO.cs @@ -3,16 +3,14 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct CFG_CALL_TARGET_INFO { [NativeTypeName("ULONG_PTR")] - public UIntPtr Offset; + public nuint Offset; [NativeTypeName("ULONG_PTR")] - public UIntPtr Flags; + public nuint Flags; } } diff --git a/sources/Interop/Windows/um/winnt/EVENTSFORLOGFILE.cs b/sources/Interop/Windows/um/winnt/EVENTSFORLOGFILE.cs index bbc0647bf2..f6f4430940 100644 --- a/sources/Interop/Windows/um/winnt/EVENTSFORLOGFILE.cs +++ b/sources/Interop/Windows/um/winnt/EVENTSFORLOGFILE.cs @@ -17,6 +17,6 @@ public unsafe partial struct EVENTSFORLOGFILE public uint ulNumRecords; [NativeTypeName("EVENTLOGRECORD []")] - public EVENTLOGRECORD* pEventLogRecords; + public EVENTLOGRECORD pEventLogRecords; } } diff --git a/sources/Interop/Windows/um/winnt/EXCEPTION_RECORD.cs b/sources/Interop/Windows/um/winnt/EXCEPTION_RECORD.cs index d2424bef18..f265b8a772 100644 --- a/sources/Interop/Windows/um/winnt/EXCEPTION_RECORD.cs +++ b/sources/Interop/Windows/um/winnt/EXCEPTION_RECORD.cs @@ -30,25 +30,25 @@ public unsafe partial struct EXCEPTION_RECORD public partial struct _ExceptionInformation_e__FixedBuffer { - internal UIntPtr e0; - internal UIntPtr e1; - internal UIntPtr e2; - internal UIntPtr e3; - internal UIntPtr e4; - internal UIntPtr e5; - internal UIntPtr e6; - internal UIntPtr e7; - internal UIntPtr e8; - internal UIntPtr e9; - internal UIntPtr e10; - internal UIntPtr e11; - internal UIntPtr e12; - internal UIntPtr e13; - internal UIntPtr e14; - - public ref UIntPtr this[int index] => ref AsSpan()[index]; - - public Span AsSpan() => MemoryMarshal.CreateSpan(ref e0, 15); + internal nuint e0; + internal nuint e1; + internal nuint e2; + internal nuint e3; + internal nuint e4; + internal nuint e5; + internal nuint e6; + internal nuint e7; + internal nuint e8; + internal nuint e9; + internal nuint e10; + internal nuint e11; + internal nuint e12; + internal nuint e13; + internal nuint e14; + + public ref nuint this[int index] => ref AsSpan()[index]; + + public Span AsSpan() => MemoryMarshal.CreateSpan(ref e0, 15); } } } diff --git a/sources/Interop/Windows/um/winnt/GROUP_AFFINITY.cs b/sources/Interop/Windows/um/winnt/GROUP_AFFINITY.cs index 4933d74eba..9d9d5985d9 100644 --- a/sources/Interop/Windows/um/winnt/GROUP_AFFINITY.cs +++ b/sources/Interop/Windows/um/winnt/GROUP_AFFINITY.cs @@ -3,14 +3,12 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct GROUP_AFFINITY { [NativeTypeName("KAFFINITY")] - public UIntPtr Mask; + public nuint Mask; [NativeTypeName("WORD")] public ushort Group; diff --git a/sources/Interop/Windows/um/winnt/IMAGE_POLICY_METADATA.cs b/sources/Interop/Windows/um/winnt/IMAGE_POLICY_METADATA.cs index a2e50f6ed7..792369439d 100644 --- a/sources/Interop/Windows/um/winnt/IMAGE_POLICY_METADATA.cs +++ b/sources/Interop/Windows/um/winnt/IMAGE_POLICY_METADATA.cs @@ -17,6 +17,6 @@ public unsafe partial struct IMAGE_POLICY_METADATA public ulong ApplicationId; [NativeTypeName("IMAGE_POLICY_ENTRY []")] - public IMAGE_POLICY_ENTRY* Policies; + public IMAGE_POLICY_ENTRY Policies; } } diff --git a/sources/Interop/Windows/um/winnt/JOBOBJECT_BASIC_LIMIT_INFORMATION.cs b/sources/Interop/Windows/um/winnt/JOBOBJECT_BASIC_LIMIT_INFORMATION.cs index 57a431ad1e..7baea6fb45 100644 --- a/sources/Interop/Windows/um/winnt/JOBOBJECT_BASIC_LIMIT_INFORMATION.cs +++ b/sources/Interop/Windows/um/winnt/JOBOBJECT_BASIC_LIMIT_INFORMATION.cs @@ -3,8 +3,6 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct JOBOBJECT_BASIC_LIMIT_INFORMATION @@ -17,16 +15,16 @@ public partial struct JOBOBJECT_BASIC_LIMIT_INFORMATION public uint LimitFlags; [NativeTypeName("SIZE_T")] - public UIntPtr MinimumWorkingSetSize; + public nuint MinimumWorkingSetSize; [NativeTypeName("SIZE_T")] - public UIntPtr MaximumWorkingSetSize; + public nuint MaximumWorkingSetSize; [NativeTypeName("DWORD")] public uint ActiveProcessLimit; [NativeTypeName("ULONG_PTR")] - public UIntPtr Affinity; + public nuint Affinity; [NativeTypeName("DWORD")] public uint PriorityClass; diff --git a/sources/Interop/Windows/um/winnt/JOBOBJECT_BASIC_PROCESS_ID_LIST.cs b/sources/Interop/Windows/um/winnt/JOBOBJECT_BASIC_PROCESS_ID_LIST.cs index c2b2969841..0a69eb8918 100644 --- a/sources/Interop/Windows/um/winnt/JOBOBJECT_BASIC_PROCESS_ID_LIST.cs +++ b/sources/Interop/Windows/um/winnt/JOBOBJECT_BASIC_PROCESS_ID_LIST.cs @@ -21,11 +21,11 @@ public partial struct JOBOBJECT_BASIC_PROCESS_ID_LIST public partial struct _ProcessIdList_e__FixedBuffer { - internal UIntPtr e0; + internal nuint e0; - public ref UIntPtr this[int index] => ref AsSpan(int.MaxValue)[index]; + public ref nuint this[int index] => ref AsSpan(int.MaxValue)[index]; - public Span AsSpan(int length) => MemoryMarshal.CreateSpan(ref e0, length); + public Span AsSpan(int length) => MemoryMarshal.CreateSpan(ref e0, length); } } } diff --git a/sources/Interop/Windows/um/winnt/JOBOBJECT_EXTENDED_LIMIT_INFORMATION.cs b/sources/Interop/Windows/um/winnt/JOBOBJECT_EXTENDED_LIMIT_INFORMATION.cs index 4811969c79..b527e2b8e6 100644 --- a/sources/Interop/Windows/um/winnt/JOBOBJECT_EXTENDED_LIMIT_INFORMATION.cs +++ b/sources/Interop/Windows/um/winnt/JOBOBJECT_EXTENDED_LIMIT_INFORMATION.cs @@ -3,8 +3,6 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION @@ -14,15 +12,15 @@ public partial struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION public IO_COUNTERS IoInfo; [NativeTypeName("SIZE_T")] - public UIntPtr ProcessMemoryLimit; + public nuint ProcessMemoryLimit; [NativeTypeName("SIZE_T")] - public UIntPtr JobMemoryLimit; + public nuint JobMemoryLimit; [NativeTypeName("SIZE_T")] - public UIntPtr PeakProcessMemoryUsed; + public nuint PeakProcessMemoryUsed; [NativeTypeName("SIZE_T")] - public UIntPtr PeakJobMemoryUsed; + public nuint PeakJobMemoryUsed; } } diff --git a/sources/Interop/Windows/um/winnt/JOBOBJECT_IO_ATTRIBUTION_STATS.cs b/sources/Interop/Windows/um/winnt/JOBOBJECT_IO_ATTRIBUTION_STATS.cs index 33d8803802..6caac5ba9c 100644 --- a/sources/Interop/Windows/um/winnt/JOBOBJECT_IO_ATTRIBUTION_STATS.cs +++ b/sources/Interop/Windows/um/winnt/JOBOBJECT_IO_ATTRIBUTION_STATS.cs @@ -3,14 +3,12 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct JOBOBJECT_IO_ATTRIBUTION_STATS { [NativeTypeName("ULONG_PTR")] - public UIntPtr IoCount; + public nuint IoCount; [NativeTypeName("ULONGLONG")] public ulong TotalNonOverlappedQueueTime; diff --git a/sources/Interop/Windows/um/winnt/MEMORY_BASIC_INFORMATION.cs b/sources/Interop/Windows/um/winnt/MEMORY_BASIC_INFORMATION.cs index 1d32b35b86..5370570cd9 100644 --- a/sources/Interop/Windows/um/winnt/MEMORY_BASIC_INFORMATION.cs +++ b/sources/Interop/Windows/um/winnt/MEMORY_BASIC_INFORMATION.cs @@ -3,8 +3,6 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct MEMORY_BASIC_INFORMATION @@ -19,7 +17,7 @@ public unsafe partial struct MEMORY_BASIC_INFORMATION public uint AllocationProtect; [NativeTypeName("SIZE_T")] - public UIntPtr RegionSize; + public nuint RegionSize; [NativeTypeName("DWORD")] public uint State; diff --git a/sources/Interop/Windows/um/winnt/MEM_ADDRESS_REQUIREMENTS.cs b/sources/Interop/Windows/um/winnt/MEM_ADDRESS_REQUIREMENTS.cs index 0a2c5e7072..0f41dd6f01 100644 --- a/sources/Interop/Windows/um/winnt/MEM_ADDRESS_REQUIREMENTS.cs +++ b/sources/Interop/Windows/um/winnt/MEM_ADDRESS_REQUIREMENTS.cs @@ -3,8 +3,6 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct MEM_ADDRESS_REQUIREMENTS @@ -16,6 +14,6 @@ public unsafe partial struct MEM_ADDRESS_REQUIREMENTS public void* HighestEndingAddress; [NativeTypeName("SIZE_T")] - public UIntPtr Alignment; + public nuint Alignment; } } diff --git a/sources/Interop/Windows/um/winnt/MEM_EXTENDED_PARAMETER.cs b/sources/Interop/Windows/um/winnt/MEM_EXTENDED_PARAMETER.cs index fb13df9744..382a9f3c90 100644 --- a/sources/Interop/Windows/um/winnt/MEM_EXTENDED_PARAMETER.cs +++ b/sources/Interop/Windows/um/winnt/MEM_EXTENDED_PARAMETER.cs @@ -62,7 +62,7 @@ public unsafe partial struct _Anonymous_e__Union2 [FieldOffset(0)] [NativeTypeName("SIZE_T")] - public UIntPtr Size; + public nuint Size; [FieldOffset(0)] [NativeTypeName("HANDLE")] diff --git a/sources/Interop/Windows/um/winnt/NV_MEMORY_RANGE.cs b/sources/Interop/Windows/um/winnt/NV_MEMORY_RANGE.cs index 475d1e867c..6b3374fcec 100644 --- a/sources/Interop/Windows/um/winnt/NV_MEMORY_RANGE.cs +++ b/sources/Interop/Windows/um/winnt/NV_MEMORY_RANGE.cs @@ -3,8 +3,6 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct NV_MEMORY_RANGE @@ -13,6 +11,6 @@ public unsafe partial struct NV_MEMORY_RANGE public void* BaseAddress; [NativeTypeName("SIZE_T")] - public UIntPtr Length; + public nuint Length; } } diff --git a/sources/Interop/Windows/um/winnt/PACKEDEVENTINFO.cs b/sources/Interop/Windows/um/winnt/PACKEDEVENTINFO.cs index a78c94f03e..98f1aac83e 100644 --- a/sources/Interop/Windows/um/winnt/PACKEDEVENTINFO.cs +++ b/sources/Interop/Windows/um/winnt/PACKEDEVENTINFO.cs @@ -5,7 +5,7 @@ namespace TerraFX.Interop { - public unsafe partial struct PACKEDEVENTINFO + public partial struct PACKEDEVENTINFO { [NativeTypeName("DWORD")] public uint ulSize; @@ -14,6 +14,6 @@ public unsafe partial struct PACKEDEVENTINFO public uint ulNumEventsForLogFile; [NativeTypeName("DWORD []")] - public uint* ulOffsets; + public uint ulOffsets; } } diff --git a/sources/Interop/Windows/um/winnt/PAPCFUNC.cs b/sources/Interop/Windows/um/winnt/PAPCFUNC.cs index af8608565f..8bd05b4162 100644 --- a/sources/Interop/Windows/um/winnt/PAPCFUNC.cs +++ b/sources/Interop/Windows/um/winnt/PAPCFUNC.cs @@ -3,11 +3,10 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] - public delegate void PAPCFUNC([NativeTypeName("ULONG_PTR")] UIntPtr Parameter); + public delegate void PAPCFUNC([NativeTypeName("ULONG_PTR")] nuint Parameter); } diff --git a/sources/Interop/Windows/um/winnt/PROCESSOR_GROUP_INFO.cs b/sources/Interop/Windows/um/winnt/PROCESSOR_GROUP_INFO.cs index 5a8937946f..622d0f44a1 100644 --- a/sources/Interop/Windows/um/winnt/PROCESSOR_GROUP_INFO.cs +++ b/sources/Interop/Windows/um/winnt/PROCESSOR_GROUP_INFO.cs @@ -3,8 +3,6 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public unsafe partial struct PROCESSOR_GROUP_INFO @@ -19,6 +17,6 @@ public unsafe partial struct PROCESSOR_GROUP_INFO public fixed byte Reserved[38]; [NativeTypeName("KAFFINITY")] - public UIntPtr ActiveProcessorMask; + public nuint ActiveProcessorMask; } } diff --git a/sources/Interop/Windows/um/winnt/PRTL_UMS_SCHEDULER_ENTRY_POINT.cs b/sources/Interop/Windows/um/winnt/PRTL_UMS_SCHEDULER_ENTRY_POINT.cs index e5bc81238e..9f26e5854e 100644 --- a/sources/Interop/Windows/um/winnt/PRTL_UMS_SCHEDULER_ENTRY_POINT.cs +++ b/sources/Interop/Windows/um/winnt/PRTL_UMS_SCHEDULER_ENTRY_POINT.cs @@ -3,7 +3,6 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop diff --git a/sources/Interop/Windows/um/winnt/PSECURE_MEMORY_CACHE_CALLBACK.cs b/sources/Interop/Windows/um/winnt/PSECURE_MEMORY_CACHE_CALLBACK.cs index 70d8d0d45a..b6411b3cb9 100644 --- a/sources/Interop/Windows/um/winnt/PSECURE_MEMORY_CACHE_CALLBACK.cs +++ b/sources/Interop/Windows/um/winnt/PSECURE_MEMORY_CACHE_CALLBACK.cs @@ -3,12 +3,11 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop { [UnmanagedFunctionPointer(CallingConvention.Winapi)] [return: NativeTypeName("BOOLEAN")] - public unsafe delegate byte PSECURE_MEMORY_CACHE_CALLBACK([NativeTypeName("PVOID")] void* Addr, [NativeTypeName("SIZE_T")] UIntPtr Range); + public unsafe delegate byte PSECURE_MEMORY_CACHE_CALLBACK([NativeTypeName("PVOID")] void* Addr, [NativeTypeName("SIZE_T")] nuint Range); } diff --git a/sources/Interop/Windows/um/winnt/QUOTA_LIMITS.cs b/sources/Interop/Windows/um/winnt/QUOTA_LIMITS.cs index 2e7f6fd2b8..8c68f97e42 100644 --- a/sources/Interop/Windows/um/winnt/QUOTA_LIMITS.cs +++ b/sources/Interop/Windows/um/winnt/QUOTA_LIMITS.cs @@ -3,26 +3,24 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct QUOTA_LIMITS { [NativeTypeName("SIZE_T")] - public UIntPtr PagedPoolLimit; + public nuint PagedPoolLimit; [NativeTypeName("SIZE_T")] - public UIntPtr NonPagedPoolLimit; + public nuint NonPagedPoolLimit; [NativeTypeName("SIZE_T")] - public UIntPtr MinimumWorkingSetSize; + public nuint MinimumWorkingSetSize; [NativeTypeName("SIZE_T")] - public UIntPtr MaximumWorkingSetSize; + public nuint MaximumWorkingSetSize; [NativeTypeName("SIZE_T")] - public UIntPtr PagefileLimit; + public nuint PagefileLimit; public LARGE_INTEGER TimeLimit; } diff --git a/sources/Interop/Windows/um/winnt/QUOTA_LIMITS_EX.cs b/sources/Interop/Windows/um/winnt/QUOTA_LIMITS_EX.cs index 7e00cd4748..6a3145cf99 100644 --- a/sources/Interop/Windows/um/winnt/QUOTA_LIMITS_EX.cs +++ b/sources/Interop/Windows/um/winnt/QUOTA_LIMITS_EX.cs @@ -3,40 +3,38 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct QUOTA_LIMITS_EX { [NativeTypeName("SIZE_T")] - public UIntPtr PagedPoolLimit; + public nuint PagedPoolLimit; [NativeTypeName("SIZE_T")] - public UIntPtr NonPagedPoolLimit; + public nuint NonPagedPoolLimit; [NativeTypeName("SIZE_T")] - public UIntPtr MinimumWorkingSetSize; + public nuint MinimumWorkingSetSize; [NativeTypeName("SIZE_T")] - public UIntPtr MaximumWorkingSetSize; + public nuint MaximumWorkingSetSize; [NativeTypeName("SIZE_T")] - public UIntPtr PagefileLimit; + public nuint PagefileLimit; public LARGE_INTEGER TimeLimit; [NativeTypeName("SIZE_T")] - public UIntPtr WorkingSetLimit; + public nuint WorkingSetLimit; [NativeTypeName("SIZE_T")] - public UIntPtr Reserved2; + public nuint Reserved2; [NativeTypeName("SIZE_T")] - public UIntPtr Reserved3; + public nuint Reserved3; [NativeTypeName("SIZE_T")] - public UIntPtr Reserved4; + public nuint Reserved4; [NativeTypeName("DWORD")] public uint Flags; diff --git a/sources/Interop/Windows/um/winnt/RESOURCEMANAGER_COMPLETION_INFORMATION.cs b/sources/Interop/Windows/um/winnt/RESOURCEMANAGER_COMPLETION_INFORMATION.cs index a5b3ea79c7..0a87c401af 100644 --- a/sources/Interop/Windows/um/winnt/RESOURCEMANAGER_COMPLETION_INFORMATION.cs +++ b/sources/Interop/Windows/um/winnt/RESOURCEMANAGER_COMPLETION_INFORMATION.cs @@ -13,6 +13,6 @@ public partial struct RESOURCEMANAGER_COMPLETION_INFORMATION public IntPtr IoCompletionPortHandle; [NativeTypeName("ULONG_PTR")] - public UIntPtr CompletionKey; + public nuint CompletionKey; } } diff --git a/sources/Interop/Windows/um/winnt/RTL_BARRIER.cs b/sources/Interop/Windows/um/winnt/RTL_BARRIER.cs index dddf567ccb..6c510b51b2 100644 --- a/sources/Interop/Windows/um/winnt/RTL_BARRIER.cs +++ b/sources/Interop/Windows/um/winnt/RTL_BARRIER.cs @@ -27,12 +27,12 @@ public partial struct RTL_BARRIER public partial struct _Reserved3_e__FixedBuffer { - internal UIntPtr e0; - internal UIntPtr e1; + internal nuint e0; + internal nuint e1; - public ref UIntPtr this[int index] => ref AsSpan()[index]; + public ref nuint this[int index] => ref AsSpan()[index]; - public Span AsSpan() => MemoryMarshal.CreateSpan(ref e0, 2); + public Span AsSpan() => MemoryMarshal.CreateSpan(ref e0, 2); } } } diff --git a/sources/Interop/Windows/um/winnt/RTL_CRITICAL_SECTION.cs b/sources/Interop/Windows/um/winnt/RTL_CRITICAL_SECTION.cs index 532996c028..b3c9eb7151 100644 --- a/sources/Interop/Windows/um/winnt/RTL_CRITICAL_SECTION.cs +++ b/sources/Interop/Windows/um/winnt/RTL_CRITICAL_SECTION.cs @@ -25,6 +25,6 @@ public unsafe partial struct RTL_CRITICAL_SECTION public IntPtr LockSemaphore; [NativeTypeName("ULONG_PTR")] - public UIntPtr SpinCount; + public nuint SpinCount; } } diff --git a/sources/Interop/Windows/um/winnt/SID_AND_ATTRIBUTES_HASH.cs b/sources/Interop/Windows/um/winnt/SID_AND_ATTRIBUTES_HASH.cs index 155d434767..ddb967ea02 100644 --- a/sources/Interop/Windows/um/winnt/SID_AND_ATTRIBUTES_HASH.cs +++ b/sources/Interop/Windows/um/winnt/SID_AND_ATTRIBUTES_HASH.cs @@ -21,42 +21,42 @@ public unsafe partial struct SID_AND_ATTRIBUTES_HASH public partial struct _Hash_e__FixedBuffer { - internal UIntPtr e0; - internal UIntPtr e1; - internal UIntPtr e2; - internal UIntPtr e3; - internal UIntPtr e4; - internal UIntPtr e5; - internal UIntPtr e6; - internal UIntPtr e7; - internal UIntPtr e8; - internal UIntPtr e9; - internal UIntPtr e10; - internal UIntPtr e11; - internal UIntPtr e12; - internal UIntPtr e13; - internal UIntPtr e14; - internal UIntPtr e15; - internal UIntPtr e16; - internal UIntPtr e17; - internal UIntPtr e18; - internal UIntPtr e19; - internal UIntPtr e20; - internal UIntPtr e21; - internal UIntPtr e22; - internal UIntPtr e23; - internal UIntPtr e24; - internal UIntPtr e25; - internal UIntPtr e26; - internal UIntPtr e27; - internal UIntPtr e28; - internal UIntPtr e29; - internal UIntPtr e30; - internal UIntPtr e31; - - public ref UIntPtr this[int index] => ref AsSpan()[index]; - - public Span AsSpan() => MemoryMarshal.CreateSpan(ref e0, 32); + internal nuint e0; + internal nuint e1; + internal nuint e2; + internal nuint e3; + internal nuint e4; + internal nuint e5; + internal nuint e6; + internal nuint e7; + internal nuint e8; + internal nuint e9; + internal nuint e10; + internal nuint e11; + internal nuint e12; + internal nuint e13; + internal nuint e14; + internal nuint e15; + internal nuint e16; + internal nuint e17; + internal nuint e18; + internal nuint e19; + internal nuint e20; + internal nuint e21; + internal nuint e22; + internal nuint e23; + internal nuint e24; + internal nuint e25; + internal nuint e26; + internal nuint e27; + internal nuint e28; + internal nuint e29; + internal nuint e30; + internal nuint e31; + + public ref nuint this[int index] => ref AsSpan()[index]; + + public Span AsSpan() => MemoryMarshal.CreateSpan(ref e0, 32); } } } diff --git a/sources/Interop/Windows/um/winnt/SYSTEM_LOGICAL_PROCESSOR_INFORMATION.cs b/sources/Interop/Windows/um/winnt/SYSTEM_LOGICAL_PROCESSOR_INFORMATION.cs index 9444c73cf1..c18a727405 100644 --- a/sources/Interop/Windows/um/winnt/SYSTEM_LOGICAL_PROCESSOR_INFORMATION.cs +++ b/sources/Interop/Windows/um/winnt/SYSTEM_LOGICAL_PROCESSOR_INFORMATION.cs @@ -3,7 +3,6 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; using System.Runtime.InteropServices; namespace TerraFX.Interop @@ -11,7 +10,7 @@ namespace TerraFX.Interop public partial struct SYSTEM_LOGICAL_PROCESSOR_INFORMATION { [NativeTypeName("ULONG_PTR")] - public UIntPtr ProcessorMask; + public nuint ProcessorMask; public LOGICAL_PROCESSOR_RELATIONSHIP Relationship; diff --git a/sources/Interop/Windows/um/winnt/TP_CALLBACK_ENVIRON_V3.cs b/sources/Interop/Windows/um/winnt/TP_CALLBACK_ENVIRON_V3.cs index f80c30ebb8..3c281196ba 100644 --- a/sources/Interop/Windows/um/winnt/TP_CALLBACK_ENVIRON_V3.cs +++ b/sources/Interop/Windows/um/winnt/TP_CALLBACK_ENVIRON_V3.cs @@ -20,7 +20,7 @@ public unsafe partial struct TP_CALLBACK_ENVIRON_V3 public IntPtr CleanupGroup; [NativeTypeName("PTP_CLEANUP_GROUP_CANCEL_CALLBACK")] - public IntPtr* CleanupGroupCancelCallback; + public IntPtr CleanupGroupCancelCallback; [NativeTypeName("PVOID")] public void* RaceDll; @@ -29,7 +29,7 @@ public unsafe partial struct TP_CALLBACK_ENVIRON_V3 public IntPtr ActivationContext; [NativeTypeName("PTP_SIMPLE_CALLBACK")] - public IntPtr* FinalizationCallback; + public IntPtr FinalizationCallback; [NativeTypeName("union (anonymous union at C:/Program Files (x86)/Windows Kits/10/Include/10.0.18362.0/um/winnt.h:22408:5)")] public _u_e__Union u; diff --git a/sources/Interop/Windows/um/winnt/TP_POOL_STACK_INFORMATION.cs b/sources/Interop/Windows/um/winnt/TP_POOL_STACK_INFORMATION.cs index 6cda833ade..d89c9c0ac3 100644 --- a/sources/Interop/Windows/um/winnt/TP_POOL_STACK_INFORMATION.cs +++ b/sources/Interop/Windows/um/winnt/TP_POOL_STACK_INFORMATION.cs @@ -3,16 +3,14 @@ // Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 // Original source is Copyright © Microsoft. All rights reserved. -using System; - namespace TerraFX.Interop { public partial struct TP_POOL_STACK_INFORMATION { [NativeTypeName("SIZE_T")] - public UIntPtr StackReserve; + public nuint StackReserve; [NativeTypeName("SIZE_T")] - public UIntPtr StackCommit; + public nuint StackCommit; } } diff --git a/sources/Interop/Windows/um/winnt/Windows.Manual.cs b/sources/Interop/Windows/um/winnt/Windows.Manual.cs index 37e891fd89..b1fa509403 100644 --- a/sources/Interop/Windows/um/winnt/Windows.Manual.cs +++ b/sources/Interop/Windows/um/winnt/Windows.Manual.cs @@ -5885,6 +5885,423 @@ public static partial class Windows public const int ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES = 12; + public static readonly Guid GUID_MAX_POWER_SAVINGS = new Guid(0xA1841308, 0x3541, 0x4FAB, 0xBC, 0x81, 0xF7, 0x15, 0x56, 0xF2, 0x0B, 0x4A); + + public static readonly Guid GUID_MIN_POWER_SAVINGS = new Guid(0x8C5E7FDA, 0xE8BF, 0x4A96, 0x9A, 0x85, 0xA6, 0xE2, 0x3A, 0x8C, 0x63, 0x5C); + + public static readonly Guid GUID_TYPICAL_POWER_SAVINGS = new Guid(0x381B4222, 0xF694, 0x41F0, 0x96, 0x85, 0xFF, 0x5B, 0xB2, 0x60, 0xDF, 0x2E); + + public static readonly Guid NO_SUBGROUP_GUID = new Guid(0xFEA3413E, 0x7E05, 0x4911, 0x9A, 0x71, 0x70, 0x03, 0x31, 0xF1, 0xC2, 0x94); + + public static readonly Guid ALL_POWERSCHEMES_GUID = new Guid(0x68A1E95E, 0x13EA, 0x41E1, 0x80, 0x11, 0x0C, 0x49, 0x6C, 0xA4, 0x90, 0xB0); + + public static readonly Guid GUID_POWERSCHEME_PERSONALITY = new Guid(0x245D8541, 0x3943, 0x4422, 0xB0, 0x25, 0x13, 0xA7, 0x84, 0xF6, 0x79, 0xB7); + + public static readonly Guid GUID_ACTIVE_POWERSCHEME = new Guid(0x31F9F286, 0x5084, 0x42FE, 0xB7, 0x20, 0x2B, 0x02, 0x64, 0x99, 0x37, 0x63); + + public static readonly Guid GUID_IDLE_RESILIENCY_SUBGROUP = new Guid(0x2E601130, 0x5351, 0x4D9D, 0x8E, 0x04, 0x25, 0x29, 0x66, 0xBA, 0xD0, 0x54); + + public static readonly Guid GUID_IDLE_RESILIENCY_PERIOD = new Guid(0xC42B79AA, 0xAA3A, 0x484B, 0xA9, 0x8F, 0x2C, 0xF3, 0x2A, 0xA9, 0x0A, 0x28); + + public static readonly Guid GUID_DEEP_SLEEP_ENABLED = new Guid(0xD502F7EE, 0x1DC7, 0x4EFD, 0xA5, 0x5D, 0xF0, 0x4B, 0x6F, 0x5C, 0x05, 0x45); + + public static readonly Guid GUID_DEEP_SLEEP_PLATFORM_STATE = new Guid(0xD23F2FB8, 0x9536, 0x4038, 0x9C, 0x94, 0x1C, 0xE0, 0x2E, 0x5C, 0x21, 0x52); + + public static readonly Guid GUID_DISK_COALESCING_POWERDOWN_TIMEOUT = new Guid(0xC36F0EB4, 0x2988, 0x4A70, 0x8E, 0xEE, 0x08, 0x84, 0xFC, 0x2C, 0x24, 0x33); + + public static readonly Guid GUID_EXECUTION_REQUIRED_REQUEST_TIMEOUT = new Guid(0x3166BC41, 0x7E98, 0x4E03, 0xB3, 0x4E, 0xEC, 0x0F, 0x5F, 0x2B, 0x21, 0x8E); + + public static readonly Guid GUID_VIDEO_SUBGROUP = new Guid(0x7516B95F, 0xF776, 0x4464, 0x8C, 0x53, 0x06, 0x16, 0x7F, 0x40, 0xCC, 0x99); + + public static readonly Guid GUID_VIDEO_POWERDOWN_TIMEOUT = new Guid(0x3C0BC021, 0xC8A8, 0x4E07, 0xA9, 0x73, 0x6B, 0x14, 0xCB, 0xCB, 0x2B, 0x7E); + + public static readonly Guid GUID_VIDEO_ANNOYANCE_TIMEOUT = new Guid(0x82DBCF2D, 0xCD67, 0x40C5, 0xBF, 0xDC, 0x9F, 0x1A, 0x5C, 0xCD, 0x46, 0x63); + + public static readonly Guid GUID_VIDEO_ADAPTIVE_PERCENT_INCREASE = new Guid(0xEED904DF, 0xB142, 0x4183, 0xB1, 0x0B, 0x5A, 0x11, 0x97, 0xA3, 0x78, 0x64); + + public static readonly Guid GUID_VIDEO_DIM_TIMEOUT = new Guid(0x17AAA29B, 0x8B43, 0x4B94, 0xAA, 0xFE, 0x35, 0xF6, 0x4D, 0xAA, 0xF1, 0xEE); + + public static readonly Guid GUID_VIDEO_ADAPTIVE_POWERDOWN = new Guid(0x90959D22, 0xD6A1, 0x49B9, 0xAF, 0x93, 0xBC, 0xE8, 0x85, 0xAD, 0x33, 0x5B); + + public static readonly Guid GUID_MONITOR_POWER_ON = new Guid(0x02731015, 0x4510, 0x4526, 0x99, 0xE6, 0xE5, 0xA1, 0x7E, 0xBD, 0x1A, 0xEA); + + public static readonly Guid GUID_DEVICE_POWER_POLICY_VIDEO_BRIGHTNESS = new Guid(0xADED5E82, 0xB909, 0x4619, 0x99, 0x49, 0xF5, 0xD7, 0x1D, 0xAC, 0x0B, 0xCB); + + public static readonly Guid GUID_DEVICE_POWER_POLICY_VIDEO_DIM_BRIGHTNESS = new Guid(0xF1FBFDE2, 0xA960, 0x4165, 0x9F, 0x88, 0x50, 0x66, 0x79, 0x11, 0xCE, 0x96); + + public static readonly Guid GUID_VIDEO_CURRENT_MONITOR_BRIGHTNESS = new Guid(0x8FFEE2C6, 0x2D01, 0x46BE, 0xAD, 0xB9, 0x39, 0x8A, 0xDD, 0xC5, 0xB4, 0xFF); + + public static readonly Guid GUID_VIDEO_ADAPTIVE_DISPLAY_BRIGHTNESS = new Guid(0xFBD9AA66, 0x9553, 0x4097, 0xBA, 0x44, 0xED, 0x6E, 0x9D, 0x65, 0xEA, 0xB8); + + public static readonly Guid GUID_CONSOLE_DISPLAY_STATE = new Guid(0x6FE69556, 0x704A, 0x47A0, 0x8F, 0x24, 0xC2, 0x8D, 0x93, 0x6F, 0xDA, 0x47); + + public static readonly Guid GUID_ALLOW_DISPLAY_REQUIRED = new Guid(0xA9CEB8DA, 0xCD46, 0x44FB, 0xA9, 0x8B, 0x02, 0xAF, 0x69, 0xDE, 0x46, 0x23); + + public static readonly Guid GUID_VIDEO_CONSOLE_LOCK_TIMEOUT = new Guid(0x8EC4B3A5, 0x6868, 0x48C2, 0xBE, 0x75, 0x4F, 0x30, 0x44, 0xBE, 0x88, 0xA7); + + public static readonly Guid GUID_ADVANCED_COLOR_QUALITY_BIAS = new Guid(0x684C3E69, 0xA4F7, 0x4014, 0x87, 0x54, 0xD4, 0x51, 0x79, 0xA5, 0x61, 0x67); + + public static readonly Guid GUID_ADAPTIVE_POWER_BEHAVIOR_SUBGROUP = new Guid(0x8619B916, 0xE004, 0x4DD8, 0x9B, 0x66, 0xDA, 0xE8, 0x6F, 0x80, 0x66, 0x98); + + public static readonly Guid GUID_NON_ADAPTIVE_INPUT_TIMEOUT = new Guid(0x5ADBBFBC, 0x074E, 0x4DA1, 0xBA, 0x38, 0xDB, 0x8B, 0x36, 0xB2, 0xC8, 0xF3); + + public static readonly Guid GUID_ADAPTIVE_INPUT_CONTROLLER_STATE = new Guid(0x0E98FAE9, 0xF45A, 0x4DE1, 0xA7, 0x57, 0x60, 0x31, 0xF1, 0x97, 0xF6, 0xEA); + + public static readonly Guid GUID_DISK_SUBGROUP = new Guid(0x0012EE47, 0x9041, 0x4B5D, 0x9B, 0x77, 0x53, 0x5F, 0xBA, 0x8B, 0x14, 0x42); + + public static readonly Guid GUID_DISK_MAX_POWER = new Guid(0x51DEA550, 0xBB38, 0x4BC4, 0x99, 0x1B, 0xEA, 0xCF, 0x37, 0xBE, 0x5E, 0xC8); + + public static readonly Guid GUID_DISK_POWERDOWN_TIMEOUT = new Guid(0x6738E2C4, 0xE8A5, 0x4A42, 0xB1, 0x6A, 0xE0, 0x40, 0xE7, 0x69, 0x75, 0x6E); + + public static readonly Guid GUID_DISK_IDLE_TIMEOUT = new Guid(0x58E39BA8, 0xB8E6, 0x4EF6, 0x90, 0xD0, 0x89, 0xAE, 0x32, 0xB2, 0x58, 0xD6); + + public static readonly Guid GUID_DISK_BURST_IGNORE_THRESHOLD = new Guid(0x80E3C60E, 0xBB94, 0x4AD8, 0xBB, 0xE0, 0x0D, 0x31, 0x95, 0xEF, 0xC6, 0x63); + + public static readonly Guid GUID_DISK_ADAPTIVE_POWERDOWN = new Guid(0x396A32E1, 0x499A, 0x40B2, 0x91, 0x24, 0xA9, 0x6A, 0xFE, 0x70, 0x76, 0x67); + + public static readonly Guid GUID_SLEEP_SUBGROUP = new Guid(0x238C9FA8, 0x0AAD, 0x41ED, 0x83, 0xF4, 0x97, 0xBE, 0x24, 0x2C, 0x8F, 0x20); + + public static readonly Guid GUID_SLEEP_IDLE_THRESHOLD = new Guid(0x81CD32E0, 0x7833, 0x44F3, 0x87, 0x37, 0x70, 0x81, 0xF3, 0x8D, 0x1F, 0x70); + + public static readonly Guid GUID_STANDBY_TIMEOUT = new Guid(0x29F6C1DB, 0x86DA, 0x48C5, 0x9F, 0xDB, 0xF2, 0xB6, 0x7B, 0x1F, 0x44, 0xDA); + + public static readonly Guid GUID_UNATTEND_SLEEP_TIMEOUT = new Guid(0x7BC4A2F9, 0xD8FC, 0x4469, 0xB0, 0x7B, 0x33, 0xEB, 0x78, 0x5A, 0xAC, 0xA0); + + public static readonly Guid GUID_HIBERNATE_TIMEOUT = new Guid(0x9D7815A6, 0x7EE4, 0x497E, 0x88, 0x88, 0x51, 0x5A, 0x05, 0xF0, 0x23, 0x64); + + public static readonly Guid GUID_HIBERNATE_FASTS4_POLICY = new Guid(0x94AC6D29, 0x73CE, 0x41A6, 0x80, 0x9F, 0x63, 0x63, 0xBA, 0x21, 0xB4, 0x7E); + + public static readonly Guid GUID_CRITICAL_POWER_TRANSITION = new Guid(0xB7A27025, 0xE569, 0x46C2, 0xA5, 0x04, 0x2B, 0x96, 0xCA, 0xD2, 0x25, 0xA1); + + public static readonly Guid GUID_SYSTEM_AWAYMODE = new Guid(0x98A7F580, 0x01F7, 0x48AA, 0x9C, 0x0F, 0x44, 0x35, 0x2C, 0x29, 0xE5, 0xC0); + + public static readonly Guid GUID_ALLOW_AWAYMODE = new Guid(0x25DFA149, 0x5DD1, 0x4736, 0xB5, 0xAB, 0xE8, 0xA3, 0x7B, 0x5B, 0x81, 0x87); + + public static readonly Guid GUID_USER_PRESENCE_PREDICTION = new Guid(0x82011705, 0xFB95, 0x4D46, 0x8D, 0x35, 0x40, 0x42, 0xB1, 0xD2, 0x0D, 0xEF); + + public static readonly Guid GUID_STANDBY_BUDGET_GRACE_PERIOD = new Guid(0x60C07FE1, 0x0556, 0x45CF, 0x99, 0x03, 0xD5, 0x6E, 0x32, 0x21, 0x02, 0x42); + + public static readonly Guid GUID_STANDBY_BUDGET_PERCENT = new Guid(0x9FE527BE, 0x1B70, 0x48DA, 0x93, 0x0D, 0x7B, 0xCF, 0x17, 0xB4, 0x49, 0x90); + + public static readonly Guid GUID_STANDBY_RESERVE_GRACE_PERIOD = new Guid(0xC763EE92, 0x71E8, 0x4127, 0x84, 0xEB, 0xF6, 0xED, 0x04, 0x3A, 0x3E, 0x3D); + + public static readonly Guid GUID_STANDBY_RESERVE_TIME = new Guid(0x468FE7E5, 0x1158, 0x46EC, 0x88, 0xBC, 0x5B, 0x96, 0xC9, 0xE4, 0x4F, 0xD0); + + public static readonly Guid GUID_STANDBY_RESET_PERCENT = new Guid(0x49CB11A5, 0x56E2, 0x4AFB, 0x9D, 0x38, 0x3D, 0xF4, 0x78, 0x72, 0xE2, 0x1B); + + public static readonly Guid GUID_ALLOW_STANDBY_STATES = new Guid(0xABFC2519, 0x3608, 0x4C2A, 0x94, 0xEA, 0x17, 0x1B, 0x0E, 0xD5, 0x46, 0xAB); + + public static readonly Guid GUID_ALLOW_RTC_WAKE = new Guid(0xBD3B718A, 0x0680, 0x4D9D, 0x8A, 0xB2, 0xE1, 0xD2, 0xB4, 0xAC, 0x80, 0x6D); + + public static readonly Guid GUID_LEGACY_RTC_MITIGATION = new Guid(0x1A34BDC3, 0x7E6B, 0x442E, 0xA9, 0xD0, 0x64, 0xB6, 0xEF, 0x37, 0x8E, 0x84); + + public static readonly Guid GUID_ALLOW_SYSTEM_REQUIRED = new Guid(0xA4B195F5, 0x8225, 0x47D8, 0x80, 0x12, 0x9D, 0x41, 0x36, 0x97, 0x86, 0xE2); + + public static readonly Guid GUID_POWER_SAVING_STATUS = new Guid(0xE00958C0, 0xC213, 0x4ACE, 0xAC, 0x77, 0xFE, 0xCC, 0xED, 0x2E, 0xEE, 0xA5); + + public static readonly Guid GUID_ENERGY_SAVER_SUBGROUP = new Guid(0xDE830923, 0xA562, 0x41AF, 0xA0, 0x86, 0xE3, 0xA2, 0xC6, 0xBA, 0xD2, 0xDA); + + public static readonly Guid GUID_ENERGY_SAVER_BATTERY_THRESHOLD = new Guid(0xE69653CA, 0xCF7F, 0x4F05, 0xAA, 0x73, 0xCB, 0x83, 0x3F, 0xA9, 0x0A, 0xD4); + + public static readonly Guid GUID_ENERGY_SAVER_BRIGHTNESS = new Guid(0x13D09884, 0xF74E, 0x474A, 0xA8, 0x52, 0xB6, 0xBD, 0xE8, 0xAD, 0x03, 0xA8); + + public static readonly Guid GUID_ENERGY_SAVER_POLICY = new Guid(0x5C5BB349, 0xAD29, 0x4EE2, 0x9D, 0x0B, 0x2B, 0x25, 0x27, 0x0F, 0x7A, 0x81); + + public static readonly Guid GUID_SYSTEM_BUTTON_SUBGROUP = new Guid(0x4F971E89, 0xEEBD, 0x4455, 0xA8, 0xDE, 0x9E, 0x59, 0x04, 0x0E, 0x73, 0x47); + + public static readonly Guid GUID_POWERBUTTON_ACTION = new Guid(0x7648EFA3, 0xDD9C, 0x4E3E, 0xB5, 0x66, 0x50, 0xF9, 0x29, 0x38, 0x62, 0x80); + + public static readonly Guid GUID_SLEEPBUTTON_ACTION = new Guid(0x96996BC0, 0xAD50, 0x47EC, 0x92, 0x3B, 0x6F, 0x41, 0x87, 0x4D, 0xD9, 0xEB); + + public static readonly Guid GUID_USERINTERFACEBUTTON_ACTION = new Guid(0xA7066653, 0x8D6C, 0x40A8, 0x91, 0x0E, 0xA1, 0xF5, 0x4B, 0x84, 0xC7, 0xE5); + + public static readonly Guid GUID_LIDCLOSE_ACTION = new Guid(0x5CA83367, 0x6E45, 0x459F, 0xA2, 0x7B, 0x47, 0x6B, 0x1D, 0x01, 0xC9, 0x36); + + public static readonly Guid GUID_LIDOPEN_POWERSTATE = new Guid(0x99FF10E7, 0x23B1, 0x4C07, 0xA9, 0xD1, 0x5C, 0x32, 0x06, 0xD7, 0x41, 0xB4); + + public static readonly Guid GUID_BATTERY_SUBGROUP = new Guid(0xE73A048D, 0xBF27, 0x4F12, 0x97, 0x31, 0x8B, 0x20, 0x76, 0xE8, 0x89, 0x1F); + + public static readonly Guid GUID_BATTERY_DISCHARGE_ACTION_0 = new Guid(0x637EA02F, 0xBBCB, 0x4015, 0x8E, 0x2C, 0xA1, 0xC7, 0xB9, 0xC0, 0xB5, 0x46); + + public static readonly Guid GUID_BATTERY_DISCHARGE_LEVEL_0 = new Guid(0x9A66D8D7, 0x4FF7, 0x4EF9, 0xB5, 0xA2, 0x5A, 0x32, 0x6C, 0xA2, 0xA4, 0x69); + + public static readonly Guid GUID_BATTERY_DISCHARGE_FLAGS_0 = new Guid(0x5DBB7C9F, 0x38E9, 0x40D2, 0x97, 0x49, 0x4F, 0x8A, 0x0E, 0x9F, 0x64, 0x0F); + + public static readonly Guid GUID_BATTERY_DISCHARGE_ACTION_1 = new Guid(0xD8742DCB, 0x3E6A, 0x4B3C, 0xB3, 0xFE, 0x37, 0x46, 0x23, 0xCD, 0xCF, 0x06); + + public static readonly Guid GUID_BATTERY_DISCHARGE_LEVEL_1 = new Guid(0x8183BA9A, 0xE910, 0x48DA, 0x87, 0x69, 0x14, 0xAE, 0x6D, 0xC1, 0x17, 0x0A); + + public static readonly Guid GUID_BATTERY_DISCHARGE_FLAGS_1 = new Guid(0xBCDED951, 0x187B, 0x4D05, 0xBC, 0xCC, 0xF7, 0xE5, 0x19, 0x60, 0xC2, 0x58); + + public static readonly Guid GUID_BATTERY_DISCHARGE_ACTION_2 = new Guid(0x421CBA38, 0x1A8E, 0x4881, 0xAC, 0x89, 0xE3, 0x3A, 0x8B, 0x04, 0xEC, 0xE4); + + public static readonly Guid GUID_BATTERY_DISCHARGE_LEVEL_2 = new Guid(0x07A07CA2, 0xADAF, 0x40D7, 0xB0, 0x77, 0x53, 0x3A, 0xAD, 0xED, 0x1B, 0xFA); + + public static readonly Guid GUID_BATTERY_DISCHARGE_FLAGS_2 = new Guid(0x7FD2F0C4, 0xFEB7, 0x4DA3, 0x81, 0x17, 0xE3, 0xFB, 0xED, 0xC4, 0x65, 0x82); + + public static readonly Guid GUID_BATTERY_DISCHARGE_ACTION_3 = new Guid(0x80472613, 0x9780, 0x455E, 0xB3, 0x08, 0x72, 0xD3, 0x00, 0x3C, 0xF2, 0xF8); + + public static readonly Guid GUID_BATTERY_DISCHARGE_LEVEL_3 = new Guid(0x58AFD5A6, 0xC2DD, 0x47D2, 0x9F, 0xBF, 0xEF, 0x70, 0xCC, 0x5C, 0x59, 0x65); + + public static readonly Guid GUID_BATTERY_DISCHARGE_FLAGS_3 = new Guid(0x73613CCF, 0xDBFA, 0x4279, 0x83, 0x56, 0x49, 0x35, 0xF6, 0xBF, 0x62, 0xF3); + + public static readonly Guid GUID_PROCESSOR_SETTINGS_SUBGROUP = new Guid(0x54533251, 0x82BE, 0x4824, 0x96, 0xC1, 0x47, 0xB6, 0x0B, 0x74, 0x0D, 0x00); + + public static readonly Guid GUID_PROCESSOR_THROTTLE_POLICY = new Guid(0x57027304, 0x4AF6, 0x4104, 0x92, 0x60, 0xE3, 0xD9, 0x52, 0x48, 0xFC, 0x36); + + public static readonly Guid GUID_PROCESSOR_THROTTLE_MAXIMUM = new Guid(0xBC5038F7, 0x23E0, 0x4960, 0x96, 0xDA, 0x33, 0xAB, 0xAF, 0x59, 0x35, 0xEC); + + public static readonly Guid GUID_PROCESSOR_THROTTLE_MAXIMUM_1 = new Guid(0xBC5038F7, 0x23E0, 0x4960, 0x96, 0xDA, 0x33, 0xAB, 0xAF, 0x59, 0x35, 0xED); + + public static readonly Guid GUID_PROCESSOR_THROTTLE_MINIMUM = new Guid(0x893DEE8E, 0x2BEF, 0x41E0, 0x89, 0xC6, 0xB5, 0x5D, 0x09, 0x29, 0x96, 0x4C); + + public static readonly Guid GUID_PROCESSOR_THROTTLE_MINIMUM_1 = new Guid(0x893DEE8E, 0x2BEF, 0x41E0, 0x89, 0xC6, 0xB5, 0x5D, 0x09, 0x29, 0x96, 0x4D); + + public static readonly Guid GUID_PROCESSOR_FREQUENCY_LIMIT = new Guid(0x75B0AE3F, 0xBCE0, 0x45A7, 0x8C, 0x89, 0xC9, 0x61, 0x1C, 0x25, 0xE1, 0x00); + + public static readonly Guid GUID_PROCESSOR_FREQUENCY_LIMIT_1 = new Guid(0x75B0AE3F, 0xBCE0, 0x45A7, 0x8C, 0x89, 0xC9, 0x61, 0x1C, 0x25, 0xE1, 0x01); + + public static readonly Guid GUID_PROCESSOR_ALLOW_THROTTLING = new Guid(0x3B04D4FD, 0x1CC7, 0x4F23, 0xAB, 0x1C, 0xD1, 0x33, 0x78, 0x19, 0xC4, 0xBB); + + public static readonly Guid GUID_PROCESSOR_IDLESTATE_POLICY = new Guid(0x68F262A7, 0xF621, 0x4069, 0xB9, 0xA5, 0x48, 0x74, 0x16, 0x9B, 0xE2, 0x3C); + + public static readonly Guid GUID_PROCESSOR_PERFSTATE_POLICY = new Guid(0xBBDC3814, 0x18E9, 0x4463, 0x8A, 0x55, 0xD1, 0x97, 0x32, 0x7C, 0x45, 0xC0); + + public static readonly Guid GUID_PROCESSOR_PERF_INCREASE_THRESHOLD = new Guid(0x06CADF0E, 0x64ED, 0x448A, 0x89, 0x27, 0xCE, 0x7B, 0xF9, 0x0E, 0xB3, 0x5D); + + public static readonly Guid GUID_PROCESSOR_PERF_INCREASE_THRESHOLD_1 = new Guid(0x06CADF0E, 0x64ED, 0x448A, 0x89, 0x27, 0xCE, 0x7B, 0xF9, 0x0E, 0xB3, 0x5E); + + public static readonly Guid GUID_PROCESSOR_PERF_DECREASE_THRESHOLD = new Guid(0x12A0AB44, 0xFE28, 0x4FA9, 0xB3, 0xBD, 0x4B, 0x64, 0xF4, 0x49, 0x60, 0xA6); + + public static readonly Guid GUID_PROCESSOR_PERF_DECREASE_THRESHOLD_1 = new Guid(0x12A0AB44, 0xFE28, 0x4FA9, 0xB3, 0xBD, 0x4B, 0x64, 0xF4, 0x49, 0x60, 0xA7); + + public static readonly Guid GUID_PROCESSOR_PERF_INCREASE_POLICY = new Guid(0x465E1F50, 0xB610, 0x473A, 0xAB, 0x58, 0x00, 0xD1, 0x07, 0x7D, 0xC4, 0x18); + + public static readonly Guid GUID_PROCESSOR_PERF_INCREASE_POLICY_1 = new Guid(0x465E1F50, 0xB610, 0x473A, 0xAB, 0x58, 0x00, 0xD1, 0x07, 0x7D, 0xC4, 0x19); + + public static readonly Guid GUID_PROCESSOR_PERF_DECREASE_POLICY = new Guid(0x40FBEFC7, 0x2E9D, 0x4D25, 0xA1, 0x85, 0x0C, 0xFD, 0x85, 0x74, 0xBA, 0xC6); + + public static readonly Guid GUID_PROCESSOR_PERF_DECREASE_POLICY_1 = new Guid(0x40FBEFC7, 0x2E9D, 0x4D25, 0xA1, 0x85, 0x0C, 0xFD, 0x85, 0x74, 0xBA, 0xC7); + + public static readonly Guid GUID_PROCESSOR_PERF_INCREASE_TIME = new Guid(0x984CF492, 0x3BED, 0x4488, 0xA8, 0xF9, 0x42, 0x86, 0xC9, 0x7B, 0xF5, 0xAA); + + public static readonly Guid GUID_PROCESSOR_PERF_INCREASE_TIME_1 = new Guid(0x984CF492, 0x3BED, 0x4488, 0xA8, 0xF9, 0x42, 0x86, 0xC9, 0x7B, 0xF5, 0xAB); + + public static readonly Guid GUID_PROCESSOR_PERF_DECREASE_TIME = new Guid(0xD8EDEB9B, 0x95CF, 0x4F95, 0xA7, 0x3C, 0xB0, 0x61, 0x97, 0x36, 0x93, 0xC8); + + public static readonly Guid GUID_PROCESSOR_PERF_DECREASE_TIME_1 = new Guid(0xD8EDEB9B, 0x95CF, 0x4F95, 0xA7, 0x3C, 0xB0, 0x61, 0x97, 0x36, 0x93, 0xC9); + + public static readonly Guid GUID_PROCESSOR_PERF_TIME_CHECK = new Guid(0x4D2B0152, 0x7D5C, 0x498B, 0x88, 0xE2, 0x34, 0x34, 0x53, 0x92, 0xA2, 0xC5); + + public static readonly Guid GUID_PROCESSOR_PERF_BOOST_POLICY = new Guid(0x45BCC044, 0xD885, 0x43E2, 0x86, 0x05, 0xEE, 0x0E, 0xC6, 0xE9, 0x6B, 0x59); + + public static readonly Guid GUID_PROCESSOR_PERF_BOOST_MODE = new Guid(0xBE337238, 0x0D82, 0x4146, 0xA9, 0x60, 0x4F, 0x37, 0x49, 0xD4, 0x70, 0xC7); + + public static readonly Guid GUID_PROCESSOR_PERF_AUTONOMOUS_MODE = new Guid(0x8BAA4A8A, 0x14C6, 0x4451, 0x8E, 0x8B, 0x14, 0xBD, 0xBD, 0x19, 0x75, 0x37); + + public static readonly Guid GUID_PROCESSOR_PERF_ENERGY_PERFORMANCE_PREFERENCE = new Guid(0x36687F9E, 0xE3A5, 0x4DBF, 0xB1, 0xDC, 0x15, 0xEB, 0x38, 0x1C, 0x68, 0x63); + + public static readonly Guid GUID_PROCESSOR_PERF_ENERGY_PERFORMANCE_PREFERENCE_1 = new Guid(0x36687F9E, 0xE3A5, 0x4DBF, 0xB1, 0xDC, 0x15, 0xEB, 0x38, 0x1C, 0x68, 0x64); + + public static readonly Guid GUID_PROCESSOR_PERF_AUTONOMOUS_ACTIVITY_WINDOW = new Guid(0xCFEDA3D0, 0x7697, 0x4566, 0xA9, 0x22, 0xA9, 0x08, 0x6C, 0xD4, 0x9D, 0xFA); + + public static readonly Guid GUID_PROCESSOR_DUTY_CYCLING = new Guid(0x4E4450B3, 0x6179, 0x4E91, 0xB8, 0xF1, 0x5B, 0xB9, 0x93, 0x8F, 0x81, 0xA1); + + public static readonly Guid GUID_PROCESSOR_IDLE_ALLOW_SCALING = new Guid(0x6C2993B0, 0x8F48, 0x481F, 0xBC, 0xC6, 0x00, 0xDD, 0x27, 0x42, 0xAA, 0x06); + + public static readonly Guid GUID_PROCESSOR_IDLE_DISABLE = new Guid(0x5D76A2CA, 0xE8C0, 0x402F, 0xA1, 0x33, 0x21, 0x58, 0x49, 0x2D, 0x58, 0xAD); + + public static readonly Guid GUID_PROCESSOR_IDLE_STATE_MAXIMUM = new Guid(0x9943E905, 0x9A30, 0x4EC1, 0x9B, 0x99, 0x44, 0xDD, 0x3B, 0x76, 0xF7, 0xA2); + + public static readonly Guid GUID_PROCESSOR_IDLE_TIME_CHECK = new Guid(0xC4581C31, 0x89AB, 0x4597, 0x8E, 0x2B, 0x9C, 0x9C, 0xAB, 0x44, 0x0E, 0x6B); + + public static readonly Guid GUID_PROCESSOR_IDLE_DEMOTE_THRESHOLD = new Guid(0x4B92D758, 0x5A24, 0x4851, 0xA4, 0x70, 0x81, 0x5D, 0x78, 0xAE, 0xE1, 0x19); + + public static readonly Guid GUID_PROCESSOR_IDLE_PROMOTE_THRESHOLD = new Guid(0x7B224883, 0xB3CC, 0x4D79, 0x81, 0x9F, 0x83, 0x74, 0x15, 0x2C, 0xBE, 0x7C); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_INCREASE_THRESHOLD = new Guid(0xDF142941, 0x20F3, 0x4EDF, 0x9A, 0x4A, 0x9C, 0x83, 0xD3, 0xD7, 0x17, 0xD1); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_DECREASE_THRESHOLD = new Guid(0x68DD2F27, 0xA4CE, 0x4E11, 0x84, 0x87, 0x37, 0x94, 0xE4, 0x13, 0x5D, 0xFA); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_INCREASE_POLICY = new Guid(0xC7BE0679, 0x2817, 0x4D69, 0x9D, 0x02, 0x51, 0x9A, 0x53, 0x7E, 0xD0, 0xC6); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_DECREASE_POLICY = new Guid(0x71021B41, 0xC749, 0x4D21, 0xBE, 0x74, 0xA0, 0x0F, 0x33, 0x5D, 0x58, 0x2B); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_MAX_CORES = new Guid(0xEA062031, 0x0E34, 0x4FF1, 0x9B, 0x6D, 0xEB, 0x10, 0x59, 0x33, 0x40, 0x28); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_MAX_CORES_1 = new Guid(0xEA062031, 0x0E34, 0x4FF1, 0x9B, 0x6D, 0xEB, 0x10, 0x59, 0x33, 0x40, 0x29); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_MIN_CORES = new Guid(0x0CC5B647, 0xC1DF, 0x4637, 0x89, 0x1A, 0xDE, 0xC3, 0x5C, 0x31, 0x85, 0x83); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_MIN_CORES_1 = new Guid(0x0CC5B647, 0xC1DF, 0x4637, 0x89, 0x1A, 0xDE, 0xC3, 0x5C, 0x31, 0x85, 0x84); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_INCREASE_TIME = new Guid(0x2DDD5A84, 0x5A71, 0x437E, 0x91, 0x2A, 0xDB, 0x0B, 0x8C, 0x78, 0x87, 0x32); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_DECREASE_TIME = new Guid(0xDFD10D17, 0xD5EB, 0x45DD, 0x87, 0x7A, 0x9A, 0x34, 0xDD, 0xD1, 0x5C, 0x82); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_AFFINITY_HISTORY_DECREASE_FACTOR = new Guid(0x8F7B45E3, 0xC393, 0x480A, 0x87, 0x8C, 0xF6, 0x7A, 0xC3, 0xD0, 0x70, 0x82); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_AFFINITY_HISTORY_THRESHOLD = new Guid(0x5B33697B, 0xE89D, 0x4D38, 0xAA, 0x46, 0x9E, 0x7D, 0xFB, 0x7C, 0xD2, 0xF9); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_AFFINITY_WEIGHTING = new Guid(0xE70867F1, 0xFA2F, 0x4F4E, 0xAE, 0xA1, 0x4D, 0x8A, 0x0B, 0xA2, 0x3B, 0x20); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_OVER_UTILIZATION_HISTORY_DECREASE_FACTOR = new Guid(0x1299023C, 0xBC28, 0x4F0A, 0x81, 0xEC, 0xD3, 0x29, 0x5A, 0x8D, 0x81, 0x5D); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_OVER_UTILIZATION_HISTORY_THRESHOLD = new Guid(0x9AC18E92, 0xAA3C, 0x4E27, 0xB3, 0x07, 0x01, 0xAE, 0x37, 0x30, 0x71, 0x29); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_OVER_UTILIZATION_WEIGHTING = new Guid(0x8809C2D8, 0xB155, 0x42D4, 0xBC, 0xDA, 0x0D, 0x34, 0x56, 0x51, 0xB1, 0xDB); + + public static readonly Guid GUID_PROCESSOR_CORE_PARKING_OVER_UTILIZATION_THRESHOLD = new Guid(0x943C8CB6, 0x6F93, 0x4227, 0xAD, 0x87, 0xE9, 0xA3, 0xFE, 0xEC, 0x08, 0xD1); + + public static readonly Guid GUID_PROCESSOR_PARKING_CORE_OVERRIDE = new Guid(0xA55612AA, 0xF624, 0x42C6, 0xA4, 0x43, 0x73, 0x97, 0xD0, 0x64, 0xC0, 0x4F); + + public static readonly Guid GUID_PROCESSOR_PARKING_PERF_STATE = new Guid(0x447235C7, 0x6A8D, 0x4CC0, 0x8E, 0x24, 0x9E, 0xAF, 0x70, 0xB9, 0x6E, 0x2B); + + public static readonly Guid GUID_PROCESSOR_PARKING_PERF_STATE_1 = new Guid(0x447235C7, 0x6A8D, 0x4CC0, 0x8E, 0x24, 0x9E, 0xAF, 0x70, 0xB9, 0x6E, 0x2C); + + public static readonly Guid GUID_PROCESSOR_PARKING_CONCURRENCY_THRESHOLD = new Guid(0x2430AB6F, 0xA520, 0x44A2, 0x96, 0x01, 0xF7, 0xF2, 0x3B, 0x51, 0x34, 0xB1); + + public static readonly Guid GUID_PROCESSOR_PARKING_HEADROOM_THRESHOLD = new Guid(0xF735A673, 0x2066, 0x4F80, 0xA0, 0xC5, 0xDD, 0xEE, 0x0C, 0xF1, 0xBF, 0x5D); + + public static readonly Guid GUID_PROCESSOR_PARKING_DISTRIBUTION_THRESHOLD = new Guid(0x4BDAF4E9, 0xD103, 0x46D7, 0xA5, 0xF0, 0x62, 0x80, 0x12, 0x16, 0x16, 0xEF); + + public static readonly Guid GUID_PROCESSOR_PERF_HISTORY = new Guid(0x7D24BAA7, 0x0B84, 0x480F, 0x84, 0x0C, 0x1B, 0x07, 0x43, 0xC0, 0x0F, 0x5F); + + public static readonly Guid GUID_PROCESSOR_PERF_HISTORY_1 = new Guid(0x7D24BAA7, 0x0B84, 0x480F, 0x84, 0x0C, 0x1B, 0x07, 0x43, 0xC0, 0x0F, 0x60); + + public static readonly Guid GUID_PROCESSOR_PERF_INCREASE_HISTORY = new Guid(0x99B3EF01, 0x752F, 0x46A1, 0x80, 0xFB, 0x77, 0x30, 0x01, 0x1F, 0x23, 0x54); + + public static readonly Guid GUID_PROCESSOR_PERF_DECREASE_HISTORY = new Guid(0x0300F6F8, 0xABD6, 0x45A9, 0xB7, 0x4F, 0x49, 0x08, 0x69, 0x1A, 0x40, 0xB5); + + public static readonly Guid GUID_PROCESSOR_PERF_CORE_PARKING_HISTORY = new Guid(0x77D7F282, 0x8F1A, 0x42CD, 0x85, 0x37, 0x45, 0x45, 0x0A, 0x83, 0x9B, 0xE8); + + public static readonly Guid GUID_PROCESSOR_PERF_LATENCY_HINT = new Guid(0x0822DF31, 0x9C83, 0x441C, 0xA0, 0x79, 0x0D, 0xE4, 0xCF, 0x00, 0x9C, 0x7B); + + public static readonly Guid GUID_PROCESSOR_PERF_LATENCY_HINT_PERF = new Guid(0x619B7505, 0x003B, 0x4E82, 0xB7, 0xA6, 0x4D, 0xD2, 0x9C, 0x30, 0x09, 0x71); + + public static readonly Guid GUID_PROCESSOR_PERF_LATENCY_HINT_PERF_1 = new Guid(0x619B7505, 0x003B, 0x4E82, 0xB7, 0xA6, 0x4D, 0xD2, 0x9C, 0x30, 0x09, 0x72); + + public static readonly Guid GUID_PROCESSOR_LATENCY_HINT_MIN_UNPARK = new Guid(0x616CDAA5, 0x695E, 0x4545, 0x97, 0xAD, 0x97, 0xDC, 0x2D, 0x1B, 0xDD, 0x88); + + public static readonly Guid GUID_PROCESSOR_LATENCY_HINT_MIN_UNPARK_1 = new Guid(0x616CDAA5, 0x695E, 0x4545, 0x97, 0xAD, 0x97, 0xDC, 0x2D, 0x1B, 0xDD, 0x89); + + public static readonly Guid GUID_PROCESSOR_DISTRIBUTE_UTILITY = new Guid(0xE0007330, 0xF589, 0x42ED, 0xA4, 0x01, 0x5D, 0xDB, 0x10, 0xE7, 0x85, 0xD3); + + public static readonly Guid GUID_PROCESSOR_HETEROGENEOUS_POLICY = new Guid(0x7F2F5CFA, 0xF10C, 0x4823, 0xB5, 0xE1, 0xE9, 0x3A, 0xE8, 0x5F, 0x46, 0xB5); + + public static readonly Guid GUID_PROCESSOR_HETERO_DECREASE_TIME = new Guid(0x7F2492B6, 0x60B1, 0x45E5, 0xAE, 0x55, 0x77, 0x3F, 0x8C, 0xD5, 0xCA, 0xEC); + + public static readonly Guid GUID_PROCESSOR_HETERO_INCREASE_TIME = new Guid(0x4009EFA7, 0xE72D, 0x4CBA, 0x9E, 0xDF, 0x91, 0x08, 0x4E, 0xA8, 0xCB, 0xC3); + + public static readonly Guid GUID_PROCESSOR_HETERO_DECREASE_THRESHOLD = new Guid(0xF8861C27, 0x95E7, 0x475C, 0x86, 0x5B, 0x13, 0xC0, 0xCB, 0x3F, 0x9D, 0x6B); + + public static readonly Guid GUID_PROCESSOR_HETERO_INCREASE_THRESHOLD = new Guid(0xB000397D, 0x9B0B, 0x483D, 0x98, 0xC9, 0x69, 0x2A, 0x60, 0x60, 0xCF, 0xBF); + + public static readonly Guid GUID_PROCESSOR_CLASS0_FLOOR_PERF = new Guid(0xFDDC842B, 0x8364, 0x4EDC, 0x94, 0xCF, 0xC1, 0x7F, 0x60, 0xDE, 0x1C, 0x80); + + public static readonly Guid GUID_PROCESSOR_CLASS1_INITIAL_PERF = new Guid(0x1FACFC65, 0xA930, 0x4BC5, 0x9F, 0x38, 0x50, 0x4E, 0xC0, 0x97, 0xBB, 0xC0); + + public static readonly Guid GUID_PROCESSOR_THREAD_SCHEDULING_POLICY = new Guid(0x93B8B6DC, 0x0698, 0x4D1C, 0x9E, 0xE4, 0x06, 0x44, 0xE9, 0x00, 0xC8, 0x5D); + + public static readonly Guid GUID_PROCESSOR_SHORT_THREAD_SCHEDULING_POLICY = new Guid(0xBAE08B81, 0x2D5E, 0x4688, 0xAD, 0x6A, 0x13, 0x24, 0x33, 0x56, 0x65, 0x4B); + + public static readonly Guid GUID_SYSTEM_COOLING_POLICY = new Guid(0x94D3A615, 0xA899, 0x4AC5, 0xAE, 0x2B, 0xE4, 0xD8, 0xF6, 0x34, 0x36, 0x7F); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_DISABLE_THRESHOLD = new Guid(0x38B8383D, 0xCCE0, 0x4C79, 0x9E, 0x3E, 0x56, 0xA4, 0xF1, 0x7C, 0xC4, 0x80); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_DISABLE_THRESHOLD_1 = new Guid(0x38B8383D, 0xCCE0, 0x4C79, 0x9E, 0x3E, 0x56, 0xA4, 0xF1, 0x7C, 0xC4, 0x81); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_ENABLE_THRESHOLD = new Guid(0x3D44E256, 0x7222, 0x4415, 0xA9, 0xED, 0x9C, 0x45, 0xFA, 0x3D, 0xD8, 0x30); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_ENABLE_THRESHOLD_1 = new Guid(0x3D44E256, 0x7222, 0x4415, 0xA9, 0xED, 0x9C, 0x45, 0xFA, 0x3D, 0xD8, 0x31); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_DISABLE_TIME = new Guid(0xF565999F, 0x3FB0, 0x411A, 0xA2, 0x26, 0x3F, 0x01, 0x98, 0xDE, 0xC1, 0x30); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_DISABLE_TIME_1 = new Guid(0xF565999F, 0x3FB0, 0x411A, 0xA2, 0x26, 0x3F, 0x01, 0x98, 0xDE, 0xC1, 0x31); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_ENABLE_TIME = new Guid(0x3D915188, 0x7830, 0x49AE, 0xA7, 0x9A, 0x0F, 0xB0, 0xA1, 0xE5, 0xA2, 0x00); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_ENABLE_TIME_1 = new Guid(0x3D915188, 0x7830, 0x49AE, 0xA7, 0x9A, 0x0F, 0xB0, 0xA1, 0xE5, 0xA2, 0x01); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_EPP_CEILING = new Guid(0x4427C73B, 0x9756, 0x4A5C, 0xB8, 0x4B, 0xC7, 0xBD, 0xA7, 0x9C, 0x73, 0x20); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_EPP_CEILING_1 = new Guid(0x4427C73B, 0x9756, 0x4A5C, 0xB8, 0x4B, 0xC7, 0xBD, 0xA7, 0x9C, 0x73, 0x21); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_PERF_FLOOR = new Guid(0xCE8E92EE, 0x6A86, 0x4572, 0xBF, 0xE0, 0x20, 0xC2, 0x1D, 0x03, 0xCD, 0x40); + + public static readonly Guid GUID_PROCESSOR_RESPONSIVENESS_PERF_FLOOR_1 = new Guid(0xCE8E92EE, 0x6A86, 0x4572, 0xBF, 0xE0, 0x20, 0xC2, 0x1D, 0x03, 0xCD, 0x41); + + public static readonly Guid GUID_LOCK_CONSOLE_ON_WAKE = new Guid(0x0E796BDB, 0x100D, 0x47D6, 0xA2, 0xD5, 0xF7, 0xD2, 0xDA, 0xA5, 0x1F, 0x51); + + public static readonly Guid GUID_DEVICE_IDLE_POLICY = new Guid(0x4FAAB71A, 0x92E5, 0x4726, 0xB5, 0x31, 0x22, 0x45, 0x59, 0x67, 0x2D, 0x19); + + public static readonly Guid GUID_CONNECTIVITY_IN_STANDBY = new Guid(0xF15576E8, 0x98B7, 0x4186, 0xB9, 0x44, 0xEA, 0xFA, 0x66, 0x44, 0x02, 0xD9); + + public static readonly Guid GUID_DISCONNECTED_STANDBY_MODE = new Guid(0x68AFB2D9, 0xEE95, 0x47A8, 0x8F, 0x50, 0x41, 0x15, 0x08, 0x80, 0x73, 0xB1); + + public static readonly Guid GUID_ACDC_POWER_SOURCE = new Guid(0x5D3E9A59, 0xE9D5, 0x4B00, 0xA6, 0xBD, 0xFF, 0x34, 0xFF, 0x51, 0x65, 0x48); + + public static readonly Guid GUID_LIDSWITCH_STATE_CHANGE = new Guid(0xBA3E0F4D, 0xB817, 0x4094, 0xA2, 0xD1, 0xD5, 0x63, 0x79, 0xE6, 0xA0, 0xF3); + + public static readonly Guid GUID_BATTERY_PERCENTAGE_REMAINING = new Guid(0xA7AD8041, 0xB45A, 0x4CAE, 0x87, 0xA3, 0xEE, 0xCB, 0xB4, 0x68, 0xA9, 0xE1); + + public static readonly Guid GUID_BATTERY_COUNT = new Guid(0x7D263F15, 0xFCA4, 0x49E5, 0x85, 0x4B, 0xA9, 0xF2, 0xBF, 0xBD, 0x5C, 0x24); + + public static readonly Guid GUID_GLOBAL_USER_PRESENCE = new Guid(0x786E8A1D, 0xB427, 0x4344, 0x92, 0x07, 0x09, 0xE7, 0x0B, 0xDC, 0xBE, 0xA9); + + public static readonly Guid GUID_SESSION_DISPLAY_STATUS = new Guid(0x2B84C20E, 0xAD23, 0x4DDF, 0x93, 0xDB, 0x05, 0xFF, 0xBD, 0x7E, 0xFC, 0xA5); + + public static readonly Guid GUID_SESSION_USER_PRESENCE = new Guid(0x3C0F4548, 0xC03F, 0x4C4D, 0xB9, 0xF2, 0x23, 0x7E, 0xDE, 0x68, 0x63, 0x76); + + public static readonly Guid GUID_IDLE_BACKGROUND_TASK = new Guid(0x515C31D8, 0xF734, 0x163D, 0xA0, 0xFD, 0x11, 0xA0, 0x8C, 0x91, 0xE8, 0xF1); + + public static readonly Guid GUID_BACKGROUND_TASK_NOTIFICATION = new Guid(0xCF23F240, 0x2A54, 0x48D8, 0xB1, 0x14, 0xDE, 0x15, 0x18, 0xFF, 0x05, 0x2E); + + public static readonly Guid GUID_APPLAUNCH_BUTTON = new Guid(0x1A689231, 0x7399, 0x4E9A, 0x8F, 0x99, 0xB7, 0x1F, 0x99, 0x9D, 0xB3, 0xFA); + + public static readonly Guid GUID_PCIEXPRESS_SETTINGS_SUBGROUP = new Guid(0x501A4D13, 0x42AF, 0x4429, 0x9F, 0xD1, 0xA8, 0x21, 0x8C, 0x26, 0x8E, 0x20); + + public static readonly Guid GUID_PCIEXPRESS_ASPM_POLICY = new Guid(0xEE12F906, 0xD277, 0x404B, 0xB6, 0xDA, 0xE5, 0xFA, 0x1A, 0x57, 0x6D, 0xF5); + + public static readonly Guid GUID_ENABLE_SWITCH_FORCED_SHUTDOWN = new Guid(0x833A6B62, 0xDFA4, 0x46D1, 0x82, 0xF8, 0xE0, 0x9E, 0x34, 0xD0, 0x29, 0xD6); + + public static readonly Guid GUID_INTSTEER_SUBGROUP = new Guid(0x48672F38, 0x7A9A, 0x4BB2, 0x8B, 0xF8, 0x3D, 0x85, 0xBE, 0x19, 0xDE, 0x4E); + + public static readonly Guid GUID_INTSTEER_MODE = new Guid(0x2BFC24F9, 0x5EA2, 0x4801, 0x82, 0x13, 0x3D, 0xBA, 0xE0, 0x1A, 0xA3, 0x9D); + + public static readonly Guid GUID_INTSTEER_LOAD_PER_PROC_TRIGGER = new Guid(0x73CDE64D, 0xD720, 0x4BB2, 0xA8, 0x60, 0xC7, 0x55, 0xAF, 0xE7, 0x7E, 0xF2); + + public static readonly Guid GUID_INTSTEER_TIME_UNPARK_TRIGGER = new Guid(0xD6BA4903, 0x386F, 0x4C2C, 0x8A, 0xDB, 0x5C, 0x21, 0xB3, 0x32, 0x8D, 0x25); + + public static readonly Guid GUID_GRAPHICS_SUBGROUP = new Guid(0x5FB4938D, 0x1EE8, 0x4B0F, 0x9A, 0x3C, 0x50, 0x36, 0xB0, 0xAB, 0x99, 0x5C); + + public static readonly Guid GUID_GPU_PREFERENCE_POLICY = new Guid(0xDD848B2A, 0x8A5D, 0x4451, 0x9A, 0xE2, 0x39, 0xCD, 0x41, 0x65, 0x8F, 0x6C); + + public static readonly Guid GUID_MIXED_REALITY_MODE = new Guid(0x1E626B4E, 0xCF04, 0x4F8D, 0x9C, 0xC7, 0xC9, 0x7C, 0x5B, 0x0F, 0x23, 0x91); + + public static readonly Guid GUID_SPR_ACTIVE_SESSION_CHANGE = new Guid(0x0E24CE38, 0xC393, 0x4742, 0xBD, 0xB1, 0x74, 0x4F, 0x4B, 0x9E, 0xE0, 0x8E); + + public static readonly Guid PPM_PERFSTATE_CHANGE_GUID = new Guid(0xA5B32DDD, 0x7F39, 0x4ABC, 0xB8, 0x92, 0x90, 0x0E, 0x43, 0xB5, 0x9E, 0xBB); + + public static readonly Guid PPM_PERFSTATE_DOMAIN_CHANGE_GUID = new Guid(0x995E6B7F, 0xD653, 0x497A, 0xB9, 0x78, 0x36, 0xA3, 0x0C, 0x29, 0xBF, 0x01); + + public static readonly Guid PPM_IDLESTATE_CHANGE_GUID = new Guid(0x4838FE4F, 0xF71C, 0x4E51, 0x9E, 0xCC, 0x84, 0x30, 0xA7, 0xAC, 0x4C, 0x6C); + + public static readonly Guid PPM_PERFSTATES_DATA_GUID = new Guid(0x5708CC20, 0x7D40, 0x4BF4, 0xB4, 0xAA, 0x2B, 0x01, 0x33, 0x8D, 0x01, 0x26); + + public static readonly Guid PPM_IDLESTATES_DATA_GUID = new Guid(0xBA138E10, 0xE250, 0x4AD7, 0x86, 0x16, 0xCF, 0x1A, 0x7A, 0xD4, 0x10, 0xE7); + + public static readonly Guid PPM_IDLE_ACCOUNTING_GUID = new Guid(0xE2A26F78, 0xAE07, 0x4EE0, 0xA3, 0x0F, 0xCE, 0x54, 0xF5, 0x5A, 0x94, 0xCD); + + public static readonly Guid PPM_IDLE_ACCOUNTING_EX_GUID = new Guid(0xD67ABD39, 0x81F8, 0x4A5E, 0x81, 0x52, 0x72, 0xE3, 0x1E, 0xC9, 0x12, 0xEE); + + public static readonly Guid PPM_THERMALCONSTRAINT_GUID = new Guid(0xA852C2C8, 0x1A4C, 0x423B, 0x8C, 0x2C, 0xF3, 0x0D, 0x82, 0x93, 0x1A, 0x88); + + public static readonly Guid PPM_PERFMON_PERFSTATE_GUID = new Guid(0x7FD18652, 0x0CFE, 0x40D2, 0xB0, 0xA1, 0x0B, 0x06, 0x6A, 0x87, 0x75, 0x9E); + + public static readonly Guid PPM_THERMAL_POLICY_CHANGE_GUID = new Guid(0x48F377B8, 0x6880, 0x4C7B, 0x8B, 0xDC, 0x38, 0x01, 0x76, 0xC6, 0x65, 0x4D); + + // Line 137: #define MAX_NATURAL_ALIGNMENT sizeof(ULONGLONG) // Line 140: #define MAX_NATURAL_ALIGNMENT sizeof(DWORD) // Line 151: #define TYPE_ALIGNMENT( t ) __alignof(t) diff --git a/sources/Interop/Windows/um/winnt/Windows.cs b/sources/Interop/Windows/um/winnt/Windows.cs new file mode 100644 index 0000000000..2650ed92d6 --- /dev/null +++ b/sources/Interop/Windows/um/winnt/Windows.cs @@ -0,0 +1,16 @@ +// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information. + +// Ported from um/winnt.h in the Windows SDK for Windows 10.0.18362.0 +// Original source is Copyright © Microsoft. All rights reserved. + +namespace TerraFX.Interop +{ + public static partial class Windows + { + [return: NativeTypeName("DWORD")] + public static uint HEAP_MAKE_TAG_FLAGS([NativeTypeName("DWORD")] uint TagBase, [NativeTypeName("DWORD")] uint Tag) + { + return ((uint)((TagBase) + ((Tag) << 18))); + } + } +} diff --git a/sources/Interop/XInput/TerraFX.Interop.XInput.csproj b/sources/Interop/XInput/TerraFX.Interop.XInput.csproj index 9f5ef288bc..86e1124436 100644 --- a/sources/Interop/XInput/TerraFX.Interop.XInput.csproj +++ b/sources/Interop/XInput/TerraFX.Interop.XInput.csproj @@ -5,7 +5,7 @@ 1573;1591;$(NoWarn) TerraFX.Interop - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/D2D1/TerraFX.Interop.D2D1.UnitTests.csproj b/tests/Interop/D2D1/TerraFX.Interop.D2D1.UnitTests.csproj index 66737ccd22..390388c18f 100644 --- a/tests/Interop/D2D1/TerraFX.Interop.D2D1.UnitTests.csproj +++ b/tests/Interop/D2D1/TerraFX.Interop.D2D1.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/D3D12/TerraFX.Interop.D3D12.UnitTests.csproj b/tests/Interop/D3D12/TerraFX.Interop.D3D12.UnitTests.csproj index fd3eb5113c..c29cabf3ad 100644 --- a/tests/Interop/D3D12/TerraFX.Interop.D3D12.UnitTests.csproj +++ b/tests/Interop/D3D12/TerraFX.Interop.D3D12.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/D3DCommon/TerraFX.Interop.D3DCommon.UnitTests.csproj b/tests/Interop/D3DCommon/TerraFX.Interop.D3DCommon.UnitTests.csproj index 9306721c62..6e2941a813 100644 --- a/tests/Interop/D3DCommon/TerraFX.Interop.D3DCommon.UnitTests.csproj +++ b/tests/Interop/D3DCommon/TerraFX.Interop.D3DCommon.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/DCommon/TerraFX.Interop.DCommon.UnitTests.csproj b/tests/Interop/DCommon/TerraFX.Interop.DCommon.UnitTests.csproj index fd2195df90..80ef70a5eb 100644 --- a/tests/Interop/DCommon/TerraFX.Interop.DCommon.UnitTests.csproj +++ b/tests/Interop/DCommon/TerraFX.Interop.DCommon.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/DWrite/TerraFX.Interop.DWrite.UnitTests.csproj b/tests/Interop/DWrite/TerraFX.Interop.DWrite.UnitTests.csproj index 7f78b312c4..62934c9949 100644 --- a/tests/Interop/DWrite/TerraFX.Interop.DWrite.UnitTests.csproj +++ b/tests/Interop/DWrite/TerraFX.Interop.DWrite.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/DXGI/TerraFX.Interop.DXGI.UnitTests.csproj b/tests/Interop/DXGI/TerraFX.Interop.DXGI.UnitTests.csproj index c5966e5945..27970fbf34 100644 --- a/tests/Interop/DXGI/TerraFX.Interop.DXGI.UnitTests.csproj +++ b/tests/Interop/DXGI/TerraFX.Interop.DXGI.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/DXGIDebug/TerraFX.Interop.DXGIDebug.UnitTests.csproj b/tests/Interop/DXGIDebug/TerraFX.Interop.DXGIDebug.UnitTests.csproj index 24dd17b496..4ae8be56f3 100644 --- a/tests/Interop/DXGIDebug/TerraFX.Interop.DXGIDebug.UnitTests.csproj +++ b/tests/Interop/DXGIDebug/TerraFX.Interop.DXGIDebug.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/Gdi32/TerraFX.Interop.Gdi32.UnitTests.csproj b/tests/Interop/Gdi32/TerraFX.Interop.Gdi32.UnitTests.csproj index f174ffea41..7d6beb8ccc 100644 --- a/tests/Interop/Gdi32/TerraFX.Interop.Gdi32.UnitTests.csproj +++ b/tests/Interop/Gdi32/TerraFX.Interop.Gdi32.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/User32/TerraFX.Interop.User32.UnitTests.csproj b/tests/Interop/User32/TerraFX.Interop.User32.UnitTests.csproj index a1fe801033..efdb6c3cb6 100644 --- a/tests/Interop/User32/TerraFX.Interop.User32.UnitTests.csproj +++ b/tests/Interop/User32/TerraFX.Interop.User32.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/WinCodec/TerraFX.Interop.WinCodec.UnitTests.csproj b/tests/Interop/WinCodec/TerraFX.Interop.WinCodec.UnitTests.csproj index ccc8529006..2e1889bb8c 100644 --- a/tests/Interop/WinCodec/TerraFX.Interop.WinCodec.UnitTests.csproj +++ b/tests/Interop/WinCodec/TerraFX.Interop.WinCodec.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/Windows/TerraFX.Interop.Windows.UnitTests.csproj b/tests/Interop/Windows/TerraFX.Interop.Windows.UnitTests.csproj index 18ee8db27e..b52ccd1350 100644 --- a/tests/Interop/Windows/TerraFX.Interop.Windows.UnitTests.csproj +++ b/tests/Interop/Windows/TerraFX.Interop.Windows.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0 diff --git a/tests/Interop/XInput/TerraFX.Interop.XInput.UnitTests.csproj b/tests/Interop/XInput/TerraFX.Interop.XInput.UnitTests.csproj index fef7122c9b..41e2591907 100644 --- a/tests/Interop/XInput/TerraFX.Interop.XInput.UnitTests.csproj +++ b/tests/Interop/XInput/TerraFX.Interop.XInput.UnitTests.csproj @@ -4,7 +4,7 @@ TerraFX.Interop.UnitTests - netcoreapp3.1;netcoreapp5.0 + netcoreapp3.1;net5.0