From 25dac703d78654a4f6524b020928c02b2825fd41 Mon Sep 17 00:00:00 2001 From: shad0wshayd3 Date: Thu, 16 May 2024 02:46:23 +0000 Subject: [PATCH] maintenance --- CommonLibF4/include/REX/W32/BASE.h | 28 +- CommonLibF4/include/REX/W32/COM.h | 2 +- CommonLibF4/include/REX/W32/D3D.h | 2 +- CommonLibF4/include/REX/W32/D3D11.h | 704 +++++++++++----------- CommonLibF4/include/REX/W32/D3D11_1.h | 100 +-- CommonLibF4/include/REX/W32/D3D11_2.h | 24 +- CommonLibF4/include/REX/W32/D3D11_3.h | 122 ++-- CommonLibF4/include/REX/W32/D3D11_4.h | 24 +- CommonLibF4/include/REX/W32/D3DCOMPILER.h | 2 +- CommonLibF4/include/REX/W32/DINPUT.h | 150 ++--- CommonLibF4/include/REX/W32/DXGI.h | 76 +-- CommonLibF4/include/REX/W32/DXGI_2.h | 98 +-- CommonLibF4/include/REX/W32/DXGI_3.h | 30 +- CommonLibF4/include/REX/W32/DXGI_4.h | 10 +- CommonLibF4/include/REX/W32/DXGI_6.h | 48 +- CommonLibF4/include/REX/W32/KERNEL32.h | 292 ++++----- CommonLibF4/include/REX/W32/USER32.h | 16 +- CommonLibF4/include/REX/W32/VERSION.h | 8 +- CommonLibF4/include/REX/W32/XINPUT.h | 28 +- CommonLibF4/src/REL/Relocation.cpp | 9 +- CommonLibF4/src/REX/W32/KERNEL32.cpp | 4 +- 21 files changed, 887 insertions(+), 890 deletions(-) diff --git a/CommonLibF4/include/REX/W32/BASE.h b/CommonLibF4/include/REX/W32/BASE.h index 38464472..c6334f0b 100644 --- a/CommonLibF4/include/REX/W32/BASE.h +++ b/CommonLibF4/include/REX/W32/BASE.h @@ -31,7 +31,7 @@ namespace REX::W32 using NTSTATUS = std::int32_t; // general constants - inline const auto INVALID_HANDLE_VALUE{ reinterpret_cast(static_cast(-1)) }; + inline const auto INVALID_HANDLE_VALUE{ reinterpret_cast(static_cast(-1)) }; inline constexpr auto MAX_PATH{ 260u }; } @@ -77,10 +77,10 @@ namespace REX::W32 return !(a_lhs == a_rhs); } - std::uint32_t data1{}; // 00 - std::uint16_t data2{}; // 04 - std::uint16_t data3{}; // 08 - std::uint8_t data4[8]{}; // 10 + std::uint32_t data1{}; // 00 + std::uint16_t data2{}; // 04 + std::uint16_t data3{}; // 08 + std::uint8_t data4[8]{}; // 10 }; static_assert(sizeof(GUID) == 0x10); @@ -136,20 +136,20 @@ namespace REX::W32 { struct CRITICAL_SECTION { - void* debugInfo; // 00 - std::int32_t lockCount; // 08 - std::int32_t recursionCount; // 0C - HANDLE owningThread; // 10 - HANDLE lockSemaphore; // 18 - std::uintptr_t spinCount; // 20 + void* debugInfo; // 00 + std::int32_t lockCount; // 08 + std::int32_t recursionCount; // 0C + HANDLE owningThread; // 10 + HANDLE lockSemaphore; // 18 + std::uintptr_t spinCount; // 20 }; static_assert(sizeof(CRITICAL_SECTION) == 0x28); struct SECURITY_ATTRIBUTES { - std::uint32_t length; // 00 - void* securityDescriptor; // 04 - BOOL inheritHandle; // 0C + std::uint32_t length; // 00 + void* securityDescriptor; // 04 + BOOL inheritHandle; // 0C }; static_assert(sizeof(SECURITY_ATTRIBUTES) == 0x18); diff --git a/CommonLibF4/include/REX/W32/COM.h b/CommonLibF4/include/REX/W32/COM.h index e5a74c47..64b72a38 100644 --- a/CommonLibF4/include/REX/W32/COM.h +++ b/CommonLibF4/include/REX/W32/COM.h @@ -7,7 +7,7 @@ namespace REX::W32 struct __declspec(novtable, uuid("00000000-0000-0000-c000-000000000046")) IUnknown { - virtual HRESULT QueryInterface(const IID& a_iid, void** a_object) = 0; + virtual HRESULT QueryInterface(const IID& a_iid, void** a_object) = 0; virtual std::uint32_t AddRef() = 0; virtual std::uint32_t Release() = 0; diff --git a/CommonLibF4/include/REX/W32/D3D.h b/CommonLibF4/include/REX/W32/D3D.h index 03a353c5..3862f9f2 100644 --- a/CommonLibF4/include/REX/W32/D3D.h +++ b/CommonLibF4/include/REX/W32/D3D.h @@ -710,7 +710,7 @@ namespace REX::W32 struct __declspec(novtable, uuid("8BA5FB08-5195-40e2-AC58-0D989C3A0102")) ID3DBlob : public IUnknown { - virtual void* GetBufferPointer(void) = 0; + virtual void* GetBufferPointer(void) = 0; virtual std::size_t GetBufferSize(void) = 0; }; diff --git a/CommonLibF4/include/REX/W32/D3D11.h b/CommonLibF4/include/REX/W32/D3D11.h index c543fe0b..aa16dd59 100644 --- a/CommonLibF4/include/REX/W32/D3D11.h +++ b/CommonLibF4/include/REX/W32/D3D11.h @@ -1278,7 +1278,7 @@ namespace REX::W32 struct D3D11_BUFFER_DESC { std::uint32_t byteWidth; - D3D11_USAGE usage; + D3D11_USAGE usage; std::uint32_t bindFlags; std::uint32_t cpuAccessFlags; std::uint32_t miscFlags; @@ -1336,7 +1336,7 @@ namespace REX::W32 std::uint32_t baseConstantBufferOffset; std::uint32_t baseTexture; std::uint32_t baseSampler; - BOOL created; + BOOL created; }; struct D3D11_COUNTER_DESC @@ -1349,7 +1349,7 @@ namespace REX::W32 { D3D11_COUNTER lastDeviceDependentCounter; std::uint32_t numSimultaneousCounters; - std::uint8_t numDetectableParallelUnits; + std::uint8_t numDetectableParallelUnits; }; struct D3D11_DRAW_INSTANCED_INDIRECT_ARGS @@ -1365,7 +1365,7 @@ namespace REX::W32 std::uint32_t indexCountPerInstance; std::uint32_t instanceCount; std::uint32_t startIndexLocation; - std::int32_t baseVertexLocation; + std::int32_t baseVertexLocation; std::uint32_t startInstanceLocation; }; @@ -1378,18 +1378,18 @@ namespace REX::W32 struct D3D11_INPUT_ELEMENT_DESC { - const char* semanticName; - std::uint32_t semanticIndex; - DXGI_FORMAT format; - std::uint32_t inputSlot; - std::uint32_t alignedByteOffset; + const char* semanticName; + std::uint32_t semanticIndex; + DXGI_FORMAT format; + std::uint32_t inputSlot; + std::uint32_t alignedByteOffset; D3D11_INPUT_CLASSIFICATION inputSlotClass; - std::uint32_t instanceDataStepRate; + std::uint32_t instanceDataStepRate; }; struct D3D11_MAPPED_SUBRESOURCE { - void* data; + void* data; std::uint32_t rowPitch; std::uint32_t depthPitch; }; @@ -1418,12 +1418,12 @@ namespace REX::W32 struct D3D11_QUERY_DATA_TIMESTAMP_DISJOINT { std::uint64_t frequency; - BOOL disjoint; + BOOL disjoint; }; struct D3D11_QUERY_DESC { - D3D11_QUERY query; + D3D11_QUERY query; std::uint32_t miscFlags; }; @@ -1431,62 +1431,62 @@ namespace REX::W32 { D3D11_FILL_MODE fillMode; D3D11_CULL_MODE cullMode; - BOOL frontCounterClockwise; - std::int32_t depthBias; - float depthBiasClamp; - float slopeScaledDepthBias; - BOOL depthClipEnable; - BOOL scissorEnable; - BOOL multisampleEnable; - BOOL antialiasedLineEnable; + BOOL frontCounterClockwise; + std::int32_t depthBias; + float depthBiasClamp; + float slopeScaledDepthBias; + BOOL depthClipEnable; + BOOL scissorEnable; + BOOL multisampleEnable; + BOOL antialiasedLineEnable; }; struct D3D11_RENDER_TARGET_BLEND_DESC { - BOOL blendEnable; - D3D11_BLEND srcBlend; - D3D11_BLEND destBlend; + BOOL blendEnable; + D3D11_BLEND srcBlend; + D3D11_BLEND destBlend; D3D11_BLEND_OP blendOp; - D3D11_BLEND srcBlendAlpha; - D3D11_BLEND destBlendAlpha; + D3D11_BLEND srcBlendAlpha; + D3D11_BLEND destBlendAlpha; D3D11_BLEND_OP blendOpAlpha; - std::uint8_t renderTargetWriteMask; + std::uint8_t renderTargetWriteMask; }; struct D3D11_BLEND_DESC { - BOOL alphaToCoverageEnable; - BOOL independentBlendEnable; + BOOL alphaToCoverageEnable; + BOOL independentBlendEnable; D3D11_RENDER_TARGET_BLEND_DESC renderTarget[8]; }; struct D3D11_SO_DECLARATION_ENTRY { std::uint32_t stream; - const char* semanticName; + const char* semanticName; std::uint32_t semanticIndex; - std::uint8_t startComponent; - std::uint8_t componentCount; - std::uint8_t outputSlot; + std::uint8_t startComponent; + std::uint8_t componentCount; + std::uint8_t outputSlot; }; struct D3D11_SAMPLER_DESC { - D3D11_FILTER filter; + D3D11_FILTER filter; D3D11_TEXTURE_ADDRESS_MODE addressU; D3D11_TEXTURE_ADDRESS_MODE addressV; D3D11_TEXTURE_ADDRESS_MODE addressW; - float mipLODBias; - std::uint32_t maxAnisotropy; - D3D11_COMPARISON_FUNC comparisonFunc; - float borderColor[4]; - float minLOD; - float maxLOD; + float mipLODBias; + std::uint32_t maxAnisotropy; + D3D11_COMPARISON_FUNC comparisonFunc; + float borderColor[4]; + float minLOD; + float maxLOD; }; struct D3D11_SUBRESOURCE_DATA { - const void* sysMem; + const void* sysMem; std::uint32_t sysMemPitch; std::uint32_t sysMemSlicePitch; }; @@ -1683,36 +1683,36 @@ namespace REX::W32 struct D3D11_DEPTH_STENCILOP_DESC { - D3D11_STENCIL_OP stencilFailOp; - D3D11_STENCIL_OP stencilDepthFailOp; - D3D11_STENCIL_OP stencilPassOp; + D3D11_STENCIL_OP stencilFailOp; + D3D11_STENCIL_OP stencilDepthFailOp; + D3D11_STENCIL_OP stencilPassOp; D3D11_COMPARISON_FUNC stencilFunc; }; struct D3D11_DEPTH_STENCIL_DESC { - BOOL depthEnable; - D3D11_DEPTH_WRITE_MASK depthWriteMask; - D3D11_COMPARISON_FUNC depthFunc; - BOOL stencilEnable; - std::uint8_t stencilReadMask; - std::uint8_t stencilWriteMask; + BOOL depthEnable; + D3D11_DEPTH_WRITE_MASK depthWriteMask; + D3D11_COMPARISON_FUNC depthFunc; + BOOL stencilEnable; + std::uint8_t stencilReadMask; + std::uint8_t stencilWriteMask; D3D11_DEPTH_STENCILOP_DESC frontFace; D3D11_DEPTH_STENCILOP_DESC backFace; }; struct D3D11_DEPTH_STENCIL_VIEW_DESC { - DXGI_FORMAT format; + DXGI_FORMAT format; D3D11_DSV_DIMENSION viewDimension; - std::uint32_t flags; + std::uint32_t flags; union { - D3D11_TEX1D_DSV texture1D; - D3D11_TEX1D_ARRAY_DSV texture1DArray; - D3D11_TEX2D_DSV texture2D; - D3D11_TEX2D_ARRAY_DSV texture2DArray; - D3D11_TEX2DMS_DSV texture2DMS; + D3D11_TEX1D_DSV texture1D; + D3D11_TEX1D_ARRAY_DSV texture1DArray; + D3D11_TEX2D_DSV texture2D; + D3D11_TEX2D_ARRAY_DSV texture2DArray; + D3D11_TEX2DMS_DSV texture2DMS; D3D11_TEX2DMS_ARRAY_DSV texture2DMSArray; }; }; @@ -1724,47 +1724,47 @@ namespace REX::W32 struct D3D11_AUTHENTICATED_CONFIGURE_OUTPUT { - D3D11_OMAC omac; - GUID configureType; - HANDLE channel; + D3D11_OMAC omac; + GUID configureType; + HANDLE channel; std::uint32_t sequenceNumber; - HRESULT returnCode; + HRESULT returnCode; }; struct D3D11_RENDER_TARGET_VIEW_DESC { - DXGI_FORMAT format; + DXGI_FORMAT format; D3D11_RTV_DIMENSION viewDimension; union { - D3D11_BUFFER_RTV buffer; - D3D11_TEX1D_RTV texture1D; - D3D11_TEX1D_ARRAY_RTV texture1DArray; - D3D11_TEX2D_RTV texture2D; - D3D11_TEX2D_ARRAY_RTV texture2DArray; - D3D11_TEX2DMS_RTV texture2DMS; + D3D11_BUFFER_RTV buffer; + D3D11_TEX1D_RTV texture1D; + D3D11_TEX1D_ARRAY_RTV texture1DArray; + D3D11_TEX2D_RTV texture2D; + D3D11_TEX2D_ARRAY_RTV texture2DArray; + D3D11_TEX2DMS_RTV texture2DMS; D3D11_TEX2DMS_ARRAY_RTV texture2DMSArray; - D3D11_TEX3D_RTV texture3D; + D3D11_TEX3D_RTV texture3D; }; }; struct D3D11_SHADER_RESOURCE_VIEW_DESC { - DXGI_FORMAT format; + DXGI_FORMAT format; D3D11_SRV_DIMENSION viewDimension; union { - D3D11_BUFFER_SRV buffer; - D3D11_TEX1D_SRV texture1D; - D3D11_TEX1D_ARRAY_SRV texture1DArray; - D3D11_TEX2D_SRV texture2D; - D3D11_TEX2D_ARRAY_SRV texture2DArray; - D3D11_TEX2DMS_SRV texture2DMS; + D3D11_BUFFER_SRV buffer; + D3D11_TEX1D_SRV texture1D; + D3D11_TEX1D_ARRAY_SRV texture1DArray; + D3D11_TEX2D_SRV texture2D; + D3D11_TEX2D_ARRAY_SRV texture2DArray; + D3D11_TEX2DMS_SRV texture2DMS; D3D11_TEX2DMS_ARRAY_SRV texture2DMSArray; - D3D11_TEX3D_SRV texture3D; - D3D11_TEXCUBE_SRV textureCube; + D3D11_TEX3D_SRV texture3D; + D3D11_TEXCUBE_SRV textureCube; D3D11_TEXCUBE_ARRAY_SRV textureCubeArray; - D3D11_BUFFEREX_SRV bufferEx; + D3D11_BUFFEREX_SRV bufferEx; }; }; @@ -1773,8 +1773,8 @@ namespace REX::W32 std::uint32_t width; std::uint32_t mipLevels; std::uint32_t arraySize; - DXGI_FORMAT format; - D3D11_USAGE usage; + DXGI_FORMAT format; + D3D11_USAGE usage; std::uint32_t bindFlags; std::uint32_t cpuAccessFlags; std::uint32_t miscFlags; @@ -1782,16 +1782,16 @@ namespace REX::W32 struct D3D11_TEXTURE2D_DESC { - std::uint32_t width; - std::uint32_t height; - std::uint32_t mipLevels; - std::uint32_t arraySize; - DXGI_FORMAT format; + std::uint32_t width; + std::uint32_t height; + std::uint32_t mipLevels; + std::uint32_t arraySize; + DXGI_FORMAT format; DXGI_SAMPLE_DESC sampleDesc; - D3D11_USAGE usage; - std::uint32_t bindFlags; - std::uint32_t cpuAccessFlags; - std::uint32_t miscFlags; + D3D11_USAGE usage; + std::uint32_t bindFlags; + std::uint32_t cpuAccessFlags; + std::uint32_t miscFlags; }; struct D3D11_TEXTURE3D_DESC @@ -1800,8 +1800,8 @@ namespace REX::W32 std::uint32_t height; std::uint32_t depth; std::uint32_t mipLevels; - DXGI_FORMAT format; - D3D11_USAGE usage; + DXGI_FORMAT format; + D3D11_USAGE usage; std::uint32_t bindFlags; std::uint32_t cpuAccessFlags; std::uint32_t miscFlags; @@ -1809,16 +1809,16 @@ namespace REX::W32 struct D3D11_UNORDERED_ACCESS_VIEW_DESC { - DXGI_FORMAT format; + DXGI_FORMAT format; D3D11_UAV_DIMENSION viewDimension; union { - D3D11_BUFFER_UAV buffer; - D3D11_TEX1D_UAV texture1D; + D3D11_BUFFER_UAV buffer; + D3D11_TEX1D_UAV texture1D; D3D11_TEX1D_ARRAY_UAV texture1DArray; - D3D11_TEX2D_UAV texture2D; + D3D11_TEX2D_UAV texture2D; D3D11_TEX2D_ARRAY_UAV texture2DArray; - D3D11_TEX3D_UAV texture3D; + D3D11_TEX3D_UAV texture3D; }; }; @@ -1843,7 +1843,7 @@ namespace REX::W32 union { D3D11_VIDEO_COLOR_YCbCrA ycbcr; - D3D11_VIDEO_COLOR_RGBA rgba; + D3D11_VIDEO_COLOR_RGBA rgba; }; }; @@ -1858,26 +1858,26 @@ namespace REX::W32 struct D3D11_VIDEO_DECODER_BUFFER_DESC { D3D11_VIDEO_DECODER_BUFFER_TYPE bufferType; - std::uint32_t bufferIndex; - std::uint32_t dataOffset; - std::uint32_t dataSize; - std::uint32_t firstMBAddress; - std::uint32_t numMBsInBuffer; - std::uint32_t width; - std::uint32_t height; - std::uint32_t stride; - std::uint32_t reservedBits; - void* iv; - std::uint32_t ivSize; - BOOL partialEncryption; - D3D11_ENCRYPTED_BLOCK_INFO encryptedBlockInfo; + std::uint32_t bufferIndex; + std::uint32_t dataOffset; + std::uint32_t dataSize; + std::uint32_t firstMBAddress; + std::uint32_t numMBsInBuffer; + std::uint32_t width; + std::uint32_t height; + std::uint32_t stride; + std::uint32_t reservedBits; + void* iv; + std::uint32_t ivSize; + BOOL partialEncryption; + D3D11_ENCRYPTED_BLOCK_INFO encryptedBlockInfo; }; struct D3D11_VIDEO_DECODER_CONFIG { - GUID guidConfigBitstreamEncryption; - GUID guidConfigMBControlEncryption; - GUID guidConfigResidDiffEncryption; + GUID guidConfigBitstreamEncryption; + GUID guidConfigMBControlEncryption; + GUID guidConfigResidDiffEncryption; std::uint32_t configBitstreamRaw; std::uint32_t configMBControlRasterOrder; std::uint32_t configResidDiffHost; @@ -1896,26 +1896,26 @@ namespace REX::W32 struct D3D11_VIDEO_DECODER_DESC { - GUID guid; + GUID guid; std::uint32_t sampleWidth; std::uint32_t sampleHeight; - DXGI_FORMAT outputFormat; + DXGI_FORMAT outputFormat; }; struct D3D11_VIDEO_DECODER_EXTENSION { - std::uint32_t function; - void* privateInputData; - std::uint32_t privateInputDataSize; - void* privateOutputData; - std::uint32_t privateOutputDataSize; - std::uint32_t resourceCount; + std::uint32_t function; + void* privateInputData; + std::uint32_t privateInputDataSize; + void* privateOutputData; + std::uint32_t privateOutputDataSize; + std::uint32_t resourceCount; ID3D11Resource** resourceList; }; struct D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC { - GUID decodeProfile; + GUID decodeProfile; D3D11_VDOV_DIMENSION viewDimension; union { @@ -1949,20 +1949,20 @@ namespace REX::W32 struct D3D11_VIDEO_PROCESSOR_CONTENT_DESC { D3D11_VIDEO_FRAME_FORMAT inputFrameFormat; - DXGI_RATIONAL inputFrameRate; - std::uint32_t inputWidth; - std::uint32_t inputHeight; - DXGI_RATIONAL outputFrameRate; - std::uint32_t outputWidth; - std::uint32_t outputHeight; - D3D11_VIDEO_USAGE usage; + DXGI_RATIONAL inputFrameRate; + std::uint32_t inputWidth; + std::uint32_t inputHeight; + DXGI_RATIONAL outputFrameRate; + std::uint32_t outputWidth; + std::uint32_t outputHeight; + D3D11_VIDEO_USAGE usage; }; struct D3D11_VIDEO_PROCESSOR_CUSTOM_RATE { DXGI_RATIONAL customRate; std::uint32_t outputFrames; - BOOL inputInterlaced; + BOOL inputInterlaced; std::uint32_t inputFramesOrFields; }; @@ -1971,12 +1971,12 @@ namespace REX::W32 std::int32_t min; std::int32_t max; std::int32_t def; - float mult; + float mult; }; struct D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC { - std::uint32_t fourCC; + std::uint32_t fourCC; D3D11_VPIV_DIMENSION viewDimension; union { @@ -1989,7 +1989,7 @@ namespace REX::W32 D3D11_VPOV_DIMENSION viewDimension; union { - D3D11_TEX2D_VPOV texture2D; + D3D11_TEX2D_VPOV texture2D; D3D11_TEX2D_ARRAY_VPOV texture2DArray; }; }; @@ -2005,16 +2005,16 @@ namespace REX::W32 struct D3D11_VIDEO_PROCESSOR_STREAM { - BOOL enable; - std::uint32_t outputIndex; - std::uint32_t inputFrameOrField; - std::uint32_t pastFrames; - std::uint32_t futureFrames; + BOOL enable; + std::uint32_t outputIndex; + std::uint32_t inputFrameOrField; + std::uint32_t pastFrames; + std::uint32_t futureFrames; ID3D11VideoProcessorInputView** pastSurfaces; - ID3D11VideoProcessorInputView* inputSurface; + ID3D11VideoProcessorInputView* inputSurface; ID3D11VideoProcessorInputView** futureSurfaces; ID3D11VideoProcessorInputView** pastSurfacesRight; - ID3D11VideoProcessorInputView* inputSurfaceRight; + ID3D11VideoProcessorInputView* inputSurfaceRight; ID3D11VideoProcessorInputView** futureSurfacesRight; }; @@ -2045,52 +2045,52 @@ namespace REX::W32 struct __declspec(novtable, uuid("db6f6ddb-ac77-4e88-8253-819df9bbf140")) ID3D11Device : public IUnknown { - virtual HRESULT CreateBuffer(const D3D11_BUFFER_DESC* a_desc, const D3D11_SUBRESOURCE_DATA* a_initialData, ID3D11Buffer** a_buffer) = 0; - virtual HRESULT CreateTexture1D(const D3D11_TEXTURE1D_DESC* a_desc, const D3D11_SUBRESOURCE_DATA* a_initialData, ID3D11Texture1D** a_texture1D) = 0; - virtual HRESULT CreateTexture2D(const D3D11_TEXTURE2D_DESC* a_desc, const D3D11_SUBRESOURCE_DATA* a_initialData, ID3D11Texture2D** a_texture2D) = 0; - virtual HRESULT CreateTexture3D(const D3D11_TEXTURE3D_DESC* a_desc, const D3D11_SUBRESOURCE_DATA* a_initialData, ID3D11Texture3D** a_texture3D) = 0; - virtual HRESULT CreateShaderResourceView(ID3D11Resource* a_resource, const D3D11_SHADER_RESOURCE_VIEW_DESC* a_desc, ID3D11ShaderResourceView** a_srView) = 0; - virtual HRESULT CreateUnorderedAccessView(ID3D11Resource* a_resource, const D3D11_UNORDERED_ACCESS_VIEW_DESC* a_desc, ID3D11UnorderedAccessView** a_uaView) = 0; - virtual HRESULT CreateRenderTargetView(ID3D11Resource* a_resource, const D3D11_RENDER_TARGET_VIEW_DESC* a_desc, ID3D11RenderTargetView** a_rtView) = 0; - virtual HRESULT CreateDepthStencilView(ID3D11Resource* a_resource, const D3D11_DEPTH_STENCIL_VIEW_DESC* a_desc, ID3D11DepthStencilView** a_dsView) = 0; - virtual HRESULT CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* a_desc, std::uint32_t a_numElements, const void* a_shaderBytecodeWithInputSignature, std::size_t a_bytecodeLength, ID3D11InputLayout** a_inputLayout) = 0; - virtual HRESULT CreateVertexShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11VertexShader** a_vertexShader) = 0; - virtual HRESULT CreateGeometryShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11GeometryShader** a_geometryShader) = 0; - virtual HRESULT CreateGeometryShaderWithStreamOutput(const void* a_shaderBytecode, std::size_t a_bytecodeLength, const D3D11_SO_DECLARATION_ENTRY* a_soDeclaration, std::uint32_t a_numEntries, const std::uint32_t* a_bufferStrides, std::uint32_t a_numStrides, std::uint32_t a_rasterizedStream, ID3D11ClassLinkage* a_classLinkage, ID3D11GeometryShader** a_geometryShader) = 0; - virtual HRESULT CreatePixelShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11PixelShader** a_pixelShader) = 0; - virtual HRESULT CreateHullShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11HullShader** a_hullShader) = 0; - virtual HRESULT CreateDomainShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11DomainShader** a_domainShader) = 0; - virtual HRESULT CreateComputeShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11ComputeShader** a_computeShader) = 0; - virtual HRESULT CreateClassLinkage(ID3D11ClassLinkage** a_classLinkage) = 0; - virtual HRESULT CreateBlendState(const D3D11_BLEND_DESC* a_blendStateDesc, ID3D11BlendState** a_blendState) = 0; - virtual HRESULT CreateDepthStencilState(const D3D11_DEPTH_STENCIL_DESC* a_depthStencilDesc, ID3D11DepthStencilState** a_depthStencilState) = 0; - virtual HRESULT CreateRasterizerState(const D3D11_RASTERIZER_DESC* a_rasterizerDesc, ID3D11RasterizerState** a_rasterizerState) = 0; - virtual HRESULT CreateSamplerState(const D3D11_SAMPLER_DESC* a_samplerDesc, ID3D11SamplerState** a_samplerState) = 0; - virtual HRESULT CreateQuery(const D3D11_QUERY_DESC* a_queryDesc, ID3D11Query** a_query) = 0; - virtual HRESULT CreatePredicate(const D3D11_QUERY_DESC* a_predicateDesc, ID3D11Predicate** a_predicate) = 0; - virtual HRESULT CreateCounter(const D3D11_COUNTER_DESC* a_counterDesc, ID3D11Counter** a_counter) = 0; - virtual HRESULT CreateDeferredContext(std::uint32_t a_contextFlags, ID3D11DeviceContext** a_deferredContext) = 0; - virtual HRESULT OpenSharedResource(HANDLE a_resourceHandle, const IID& a_returnedInterface, void** a_resource) = 0; - virtual HRESULT CheckFormatSupport(DXGI_FORMAT a_format, std::uint32_t* a_formatSupport) = 0; - virtual HRESULT CheckMultisampleQualityLevels(DXGI_FORMAT a_format, std::uint32_t a_sampleCount, std::uint32_t* a_numQualityLevels) = 0; - virtual void CheckCounterInfo(D3D11_COUNTER_INFO* a_counterInfo) = 0; - virtual HRESULT CheckCounter(const D3D11_COUNTER_DESC* a_desc, D3D11_COUNTER_TYPE* a_type, std::uint32_t* a_activeCounters, char* a_name, std::uint32_t* a_nameLength, char* a_units, std::uint32_t* a_unitsLength, char* a_description, std::uint32_t* a_descriptionLength) = 0; - virtual HRESULT CheckFeatureSupport(D3D11_FEATURE a_feature, void* a_featureSupportData, std::uint32_t a_featureSupportDataSize) = 0; - virtual HRESULT GetPrivateData(const GUID& a_guid, std::uint32_t* a_dataSize, void* a_data) = 0; - virtual HRESULT SetPrivateData(const GUID& a_guid, std::uint32_t a_dataSize, const void* a_data) = 0; - virtual HRESULT SetPrivateDataInterface(const GUID& a_guid, const IUnknown* a_data) = 0; + virtual HRESULT CreateBuffer(const D3D11_BUFFER_DESC* a_desc, const D3D11_SUBRESOURCE_DATA* a_initialData, ID3D11Buffer** a_buffer) = 0; + virtual HRESULT CreateTexture1D(const D3D11_TEXTURE1D_DESC* a_desc, const D3D11_SUBRESOURCE_DATA* a_initialData, ID3D11Texture1D** a_texture1D) = 0; + virtual HRESULT CreateTexture2D(const D3D11_TEXTURE2D_DESC* a_desc, const D3D11_SUBRESOURCE_DATA* a_initialData, ID3D11Texture2D** a_texture2D) = 0; + virtual HRESULT CreateTexture3D(const D3D11_TEXTURE3D_DESC* a_desc, const D3D11_SUBRESOURCE_DATA* a_initialData, ID3D11Texture3D** a_texture3D) = 0; + virtual HRESULT CreateShaderResourceView(ID3D11Resource* a_resource, const D3D11_SHADER_RESOURCE_VIEW_DESC* a_desc, ID3D11ShaderResourceView** a_srView) = 0; + virtual HRESULT CreateUnorderedAccessView(ID3D11Resource* a_resource, const D3D11_UNORDERED_ACCESS_VIEW_DESC* a_desc, ID3D11UnorderedAccessView** a_uaView) = 0; + virtual HRESULT CreateRenderTargetView(ID3D11Resource* a_resource, const D3D11_RENDER_TARGET_VIEW_DESC* a_desc, ID3D11RenderTargetView** a_rtView) = 0; + virtual HRESULT CreateDepthStencilView(ID3D11Resource* a_resource, const D3D11_DEPTH_STENCIL_VIEW_DESC* a_desc, ID3D11DepthStencilView** a_dsView) = 0; + virtual HRESULT CreateInputLayout(const D3D11_INPUT_ELEMENT_DESC* a_desc, std::uint32_t a_numElements, const void* a_shaderBytecodeWithInputSignature, std::size_t a_bytecodeLength, ID3D11InputLayout** a_inputLayout) = 0; + virtual HRESULT CreateVertexShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11VertexShader** a_vertexShader) = 0; + virtual HRESULT CreateGeometryShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11GeometryShader** a_geometryShader) = 0; + virtual HRESULT CreateGeometryShaderWithStreamOutput(const void* a_shaderBytecode, std::size_t a_bytecodeLength, const D3D11_SO_DECLARATION_ENTRY* a_soDeclaration, std::uint32_t a_numEntries, const std::uint32_t* a_bufferStrides, std::uint32_t a_numStrides, std::uint32_t a_rasterizedStream, ID3D11ClassLinkage* a_classLinkage, ID3D11GeometryShader** a_geometryShader) = 0; + virtual HRESULT CreatePixelShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11PixelShader** a_pixelShader) = 0; + virtual HRESULT CreateHullShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11HullShader** a_hullShader) = 0; + virtual HRESULT CreateDomainShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11DomainShader** a_domainShader) = 0; + virtual HRESULT CreateComputeShader(const void* a_shaderBytecode, std::size_t a_bytecodeLength, ID3D11ClassLinkage* a_classLinkage, ID3D11ComputeShader** a_computeShader) = 0; + virtual HRESULT CreateClassLinkage(ID3D11ClassLinkage** a_classLinkage) = 0; + virtual HRESULT CreateBlendState(const D3D11_BLEND_DESC* a_blendStateDesc, ID3D11BlendState** a_blendState) = 0; + virtual HRESULT CreateDepthStencilState(const D3D11_DEPTH_STENCIL_DESC* a_depthStencilDesc, ID3D11DepthStencilState** a_depthStencilState) = 0; + virtual HRESULT CreateRasterizerState(const D3D11_RASTERIZER_DESC* a_rasterizerDesc, ID3D11RasterizerState** a_rasterizerState) = 0; + virtual HRESULT CreateSamplerState(const D3D11_SAMPLER_DESC* a_samplerDesc, ID3D11SamplerState** a_samplerState) = 0; + virtual HRESULT CreateQuery(const D3D11_QUERY_DESC* a_queryDesc, ID3D11Query** a_query) = 0; + virtual HRESULT CreatePredicate(const D3D11_QUERY_DESC* a_predicateDesc, ID3D11Predicate** a_predicate) = 0; + virtual HRESULT CreateCounter(const D3D11_COUNTER_DESC* a_counterDesc, ID3D11Counter** a_counter) = 0; + virtual HRESULT CreateDeferredContext(std::uint32_t a_contextFlags, ID3D11DeviceContext** a_deferredContext) = 0; + virtual HRESULT OpenSharedResource(HANDLE a_resourceHandle, const IID& a_returnedInterface, void** a_resource) = 0; + virtual HRESULT CheckFormatSupport(DXGI_FORMAT a_format, std::uint32_t* a_formatSupport) = 0; + virtual HRESULT CheckMultisampleQualityLevels(DXGI_FORMAT a_format, std::uint32_t a_sampleCount, std::uint32_t* a_numQualityLevels) = 0; + virtual void CheckCounterInfo(D3D11_COUNTER_INFO* a_counterInfo) = 0; + virtual HRESULT CheckCounter(const D3D11_COUNTER_DESC* a_desc, D3D11_COUNTER_TYPE* a_type, std::uint32_t* a_activeCounters, char* a_name, std::uint32_t* a_nameLength, char* a_units, std::uint32_t* a_unitsLength, char* a_description, std::uint32_t* a_descriptionLength) = 0; + virtual HRESULT CheckFeatureSupport(D3D11_FEATURE a_feature, void* a_featureSupportData, std::uint32_t a_featureSupportDataSize) = 0; + virtual HRESULT GetPrivateData(const GUID& a_guid, std::uint32_t* a_dataSize, void* a_data) = 0; + virtual HRESULT SetPrivateData(const GUID& a_guid, std::uint32_t a_dataSize, const void* a_data) = 0; + virtual HRESULT SetPrivateDataInterface(const GUID& a_guid, const IUnknown* a_data) = 0; virtual D3D_FEATURE_LEVEL GetFeatureLevel(void) = 0; - virtual std::uint32_t GetCreationFlags(void) = 0; - virtual HRESULT GetDeviceRemovedReason(void) = 0; - virtual void GetImmediateContext(ID3D11DeviceContext** a_immediateContext) = 0; - virtual HRESULT SetExceptionMode(std::uint32_t a_raiseFlags) = 0; - virtual std::uint32_t GetExceptionMode(void) = 0; + virtual std::uint32_t GetCreationFlags(void) = 0; + virtual HRESULT GetDeviceRemovedReason(void) = 0; + virtual void GetImmediateContext(ID3D11DeviceContext** a_immediateContext) = 0; + virtual HRESULT SetExceptionMode(std::uint32_t a_raiseFlags) = 0; + virtual std::uint32_t GetExceptionMode(void) = 0; }; struct __declspec(novtable, uuid("1841e5c8-16b0-489b-bcc8-44cfb0d5deae")) ID3D11DeviceChild : public IUnknown { - virtual void GetDevice(ID3D11Device** a_device) = 0; + virtual void GetDevice(ID3D11Device** a_device) = 0; virtual HRESULT GetPrivateData(const GUID& a_guid, std::uint32_t* a_dataSize, void* a_data) = 0; virtual HRESULT SetPrivateData(const GUID& a_guid, std::uint32_t a_dataSize, const void* a_data) = 0; virtual HRESULT SetPrivateDataInterface(const GUID& a_guid, const IUnknown* a_data) = 0; @@ -2099,114 +2099,114 @@ namespace REX::W32 struct __declspec(novtable, uuid("c0bfa96c-e089-44fb-8eaf-26f8796190da")) ID3D11DeviceContext : public ID3D11DeviceChild { - virtual void VSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; - virtual void PSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; - virtual void PSSetShader(ID3D11PixelShader* a_pixelShader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; - virtual void PSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; - virtual void VSSetShader(ID3D11VertexShader* a_vertexShader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; - virtual void DrawIndexed(std::uint32_t IndexCount, std::uint32_t a_startIndexLocation, std::int32_t a_baseVertexLocation) = 0; - virtual void Draw(std::uint32_t a_vertexCount, std::uint32_t a_startVertexLocation) = 0; - virtual HRESULT Map(ID3D11Resource* a_resource, std::uint32_t a_subResource, D3D11_MAP a_mapType, std::uint32_t a_mapFlags, D3D11_MAPPED_SUBRESOURCE* a_mappedResource) = 0; - virtual void Unmap(ID3D11Resource* a_resource, std::uint32_t a_subResource) = 0; - virtual void PSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; - virtual void IASetInputLayout(ID3D11InputLayout* a_inputLayout) = 0; - virtual void IASetVertexBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_vertexBuffers, const std::uint32_t* a_strides, const std::uint32_t* a_offsets) = 0; - virtual void IASetIndexBuffer(ID3D11Buffer* a_indexBuffer, DXGI_FORMAT a_format, std::uint32_t a_offset) = 0; - virtual void DrawIndexedInstanced(std::uint32_t a_indexCountPerInstance, std::uint32_t a_instanceCount, std::uint32_t a_startIndexLocation, std::int32_t a_baseVertexLocation, std::uint32_t a_startInstanceLocation) = 0; - virtual void DrawInstanced(std::uint32_t a_vertexCountPerInstance, std::uint32_t a_instanceCount, std::uint32_t a_startVertexLocation, std::uint32_t a_startInstanceLocation) = 0; - virtual void GSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; - virtual void GSSetShader(ID3D11GeometryShader* a_shader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; - virtual void IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY a_topology) = 0; - virtual void VSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; - virtual void VSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; - virtual void Begin(ID3D11Asynchronous* a_async) = 0; - virtual void End(ID3D11Asynchronous* a_async) = 0; - virtual HRESULT GetData(ID3D11Asynchronous* a_async, void* a_data, std::uint32_t a_dataSize, std::uint32_t a_getDataFlags) = 0; - virtual void SetPredication(ID3D11Predicate* a_predicate, BOOL a_predicateValue) = 0; - virtual void GSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; - virtual void GSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; - virtual void OMSetRenderTargets(std::uint32_t a_numViews, ID3D11RenderTargetView* const* a_renderTargetViews, ID3D11DepthStencilView* a_depthStencilView) = 0; - virtual void OMSetRenderTargetsAndUnorderedAccessViews(std::uint32_t a_numRTVs, ID3D11RenderTargetView* const* a_renderTargetViews, ID3D11DepthStencilView* a_depthStencilView, std::uint32_t a_uavStartSlot, std::uint32_t a_numUAVs, ID3D11UnorderedAccessView* const* a_unorderedAccessViews, const std::uint32_t* a_uavInitialCounts) = 0; - virtual void OMSetBlendState(ID3D11BlendState* a_blendState, const float a_blendFactor[4], std::uint32_t a_sampleMask) = 0; - virtual void OMSetDepthStencilState(ID3D11DepthStencilState* a_depthStencilState, std::uint32_t a_stencilRef) = 0; - virtual void SOSetTargets(std::uint32_t a_numBuffers, ID3D11Buffer* const* a_soTargets, const std::uint32_t* a_offsets) = 0; - virtual void DrawAuto(void) = 0; - virtual void DrawIndexedInstancedIndirect(ID3D11Buffer* a_bufferForArgs, std::uint32_t a_alignedByteOffsetForArgs) = 0; - virtual void DrawInstancedIndirect(ID3D11Buffer* a_bufferForArgs, std::uint32_t a_alignedByteOffsetForArgs) = 0; - virtual void Dispatch(std::uint32_t a_threadGroupCountX, std::uint32_t a_threadGroupCountY, std::uint32_t a_threadGroupCountZ) = 0; - virtual void DispatchIndirect(ID3D11Buffer* a_bufferForArgs, std::uint32_t a_alignedByteOffsetForArgs) = 0; - virtual void RSSetState(ID3D11RasterizerState* a_rasterizerState) = 0; - virtual void RSSetViewports(std::uint32_t a_numViewports, const D3D11_VIEWPORT* a_viewports) = 0; - virtual void RSSetScissorRects(std::uint32_t a_numRects, const D3D11_RECT* a_rects) = 0; - virtual void CopySubresourceRegion(ID3D11Resource* a_dstResource, std::uint32_t a_dstSubresource, std::uint32_t a_dstX, std::uint32_t a_dstY, std::uint32_t a_dstZ, ID3D11Resource* a_srcResource, std::uint32_t a_srcSubresource, const D3D11_BOX* a_srcBox) = 0; - virtual void CopyResource(ID3D11Resource* a_dstResource, ID3D11Resource* a_srcResource) = 0; - virtual void UpdateSubresource(ID3D11Resource* a_dstResource, std::uint32_t a_dstSubresource, const D3D11_BOX* a_dstBox, const void* a_srcData, std::uint32_t a_srcRowPitch, std::uint32_t a_srcDepthPitch) = 0; - virtual void CopyStructureCount(ID3D11Buffer* a_dstBuffer, std::uint32_t a_dstAlignedByteOffset, ID3D11UnorderedAccessView* a_srcView) = 0; - virtual void ClearRenderTargetView(ID3D11RenderTargetView* a_renderTargetView, const float a_colorRGBA[4]) = 0; - virtual void ClearUnorderedAccessViewUint(ID3D11UnorderedAccessView* a_unorderedAccessView, const std::uint32_t a_values[4]) = 0; - virtual void ClearUnorderedAccessViewFloat(ID3D11UnorderedAccessView* a_unorderedAccessView, const float a_values[4]) = 0; - virtual void ClearDepthStencilView(ID3D11DepthStencilView* a_depthStencilView, std::uint32_t a_clearFlags, float a_depth, std::uint8_t a_stencil) = 0; - virtual void GenerateMips(ID3D11ShaderResourceView* a_shaderResourceView) = 0; - virtual void SetResourceMinLOD(ID3D11Resource* a_resource, float a_minLOD) = 0; - virtual float GetResourceMinLOD(ID3D11Resource* a_resource) = 0; - virtual void ResolveSubresource(ID3D11Resource* a_dstResource, std::uint32_t a_dstSubresource, ID3D11Resource* a_srcResource, std::uint32_t a_srcSubresource, DXGI_FORMAT a_format) = 0; - virtual void ExecuteCommandList(ID3D11CommandList* a_commandList, BOOL a_restoreContextState) = 0; - virtual void HSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; - virtual void HSSetShader(ID3D11HullShader* a_hullShader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; - virtual void HSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; - virtual void HSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; - virtual void DSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; - virtual void DSSetShader(ID3D11DomainShader* a_domainShader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; - virtual void DSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; - virtual void DSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; - virtual void CSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; - virtual void CSSetUnorderedAccessViews(std::uint32_t a_startSlot, std::uint32_t a_numUAVs, ID3D11UnorderedAccessView* const* a_unorderedAccessViews, const std::uint32_t* a_uavInitialCounts) = 0; - virtual void CSSetShader(ID3D11ComputeShader* a_computeShader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; - virtual void CSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; - virtual void CSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; - virtual void VSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; - virtual void PSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; - virtual void PSGetShader(ID3D11PixelShader** a_pixelShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; - virtual void PSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; - virtual void VSGetShader(ID3D11VertexShader** a_vertexShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; - virtual void PSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; - virtual void IAGetInputLayout(ID3D11InputLayout** a_inputLayout) = 0; - virtual void IAGetVertexBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_vertexBuffers, std::uint32_t* a_strides, std::uint32_t* a_offsets) = 0; - virtual void IAGetIndexBuffer(ID3D11Buffer** a_indexBuffer, DXGI_FORMAT* a_format, std::uint32_t* a_offset) = 0; - virtual void GSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; - virtual void GSGetShader(ID3D11GeometryShader** a_geometryShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; - virtual void IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* a_topology) = 0; - virtual void VSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; - virtual void VSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; - virtual void GetPredication(ID3D11Predicate** a_predicate, BOOL* a_predicateValue) = 0; - virtual void GSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; - virtual void GSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; - virtual void OMGetRenderTargets(std::uint32_t a_numViews, ID3D11RenderTargetView** a_renderTargetViews, ID3D11DepthStencilView** a_depthStencilView) = 0; - virtual void OMGetRenderTargetsAndUnorderedAccessViews(std::uint32_t a_numRTVs, ID3D11RenderTargetView** a_renderTargetViews, ID3D11DepthStencilView** a_depthStencilView, std::uint32_t a_uavStartSlot, std::uint32_t a_numUAVs, ID3D11UnorderedAccessView** a_unorderedAccessViews) = 0; - virtual void OMGetBlendState(ID3D11BlendState** a_blendState, float a_blendFactor[4], std::uint32_t* a_sampleMask) = 0; - virtual void OMGetDepthStencilState(ID3D11DepthStencilState** a_depthStencilState, std::uint32_t* a_stencilRef) = 0; - virtual void SOGetTargets(std::uint32_t a_numBuffers, ID3D11Buffer** a_soTargets) = 0; - virtual void RSGetState(ID3D11RasterizerState** a_rasterizerState) = 0; - virtual void RSGetViewports(std::uint32_t* a_numViewports, D3D11_VIEWPORT* a_viewports) = 0; - virtual void RSGetScissorRects(std::uint32_t* a_numRects, D3D11_RECT* a_rects) = 0; - virtual void HSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; - virtual void HSGetShader(ID3D11HullShader** a_hullShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; - virtual void HSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; - virtual void HSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; - virtual void DSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; - virtual void DSGetShader(ID3D11DomainShader** a_domainShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; - virtual void DSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; - virtual void DSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; - virtual void CSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; - virtual void CSGetUnorderedAccessViews(std::uint32_t a_startSlot, std::uint32_t a_numUAVs, ID3D11UnorderedAccessView** a_unorderedAccessViews) = 0; - virtual void CSGetShader(ID3D11ComputeShader** a_computeShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; - virtual void CSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; - virtual void CSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; - virtual void ClearState(void) = 0; - virtual void Flush(void) = 0; + virtual void VSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; + virtual void PSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; + virtual void PSSetShader(ID3D11PixelShader* a_pixelShader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; + virtual void PSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; + virtual void VSSetShader(ID3D11VertexShader* a_vertexShader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; + virtual void DrawIndexed(std::uint32_t IndexCount, std::uint32_t a_startIndexLocation, std::int32_t a_baseVertexLocation) = 0; + virtual void Draw(std::uint32_t a_vertexCount, std::uint32_t a_startVertexLocation) = 0; + virtual HRESULT Map(ID3D11Resource* a_resource, std::uint32_t a_subResource, D3D11_MAP a_mapType, std::uint32_t a_mapFlags, D3D11_MAPPED_SUBRESOURCE* a_mappedResource) = 0; + virtual void Unmap(ID3D11Resource* a_resource, std::uint32_t a_subResource) = 0; + virtual void PSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; + virtual void IASetInputLayout(ID3D11InputLayout* a_inputLayout) = 0; + virtual void IASetVertexBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_vertexBuffers, const std::uint32_t* a_strides, const std::uint32_t* a_offsets) = 0; + virtual void IASetIndexBuffer(ID3D11Buffer* a_indexBuffer, DXGI_FORMAT a_format, std::uint32_t a_offset) = 0; + virtual void DrawIndexedInstanced(std::uint32_t a_indexCountPerInstance, std::uint32_t a_instanceCount, std::uint32_t a_startIndexLocation, std::int32_t a_baseVertexLocation, std::uint32_t a_startInstanceLocation) = 0; + virtual void DrawInstanced(std::uint32_t a_vertexCountPerInstance, std::uint32_t a_instanceCount, std::uint32_t a_startVertexLocation, std::uint32_t a_startInstanceLocation) = 0; + virtual void GSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; + virtual void GSSetShader(ID3D11GeometryShader* a_shader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; + virtual void IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY a_topology) = 0; + virtual void VSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; + virtual void VSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; + virtual void Begin(ID3D11Asynchronous* a_async) = 0; + virtual void End(ID3D11Asynchronous* a_async) = 0; + virtual HRESULT GetData(ID3D11Asynchronous* a_async, void* a_data, std::uint32_t a_dataSize, std::uint32_t a_getDataFlags) = 0; + virtual void SetPredication(ID3D11Predicate* a_predicate, BOOL a_predicateValue) = 0; + virtual void GSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; + virtual void GSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; + virtual void OMSetRenderTargets(std::uint32_t a_numViews, ID3D11RenderTargetView* const* a_renderTargetViews, ID3D11DepthStencilView* a_depthStencilView) = 0; + virtual void OMSetRenderTargetsAndUnorderedAccessViews(std::uint32_t a_numRTVs, ID3D11RenderTargetView* const* a_renderTargetViews, ID3D11DepthStencilView* a_depthStencilView, std::uint32_t a_uavStartSlot, std::uint32_t a_numUAVs, ID3D11UnorderedAccessView* const* a_unorderedAccessViews, const std::uint32_t* a_uavInitialCounts) = 0; + virtual void OMSetBlendState(ID3D11BlendState* a_blendState, const float a_blendFactor[4], std::uint32_t a_sampleMask) = 0; + virtual void OMSetDepthStencilState(ID3D11DepthStencilState* a_depthStencilState, std::uint32_t a_stencilRef) = 0; + virtual void SOSetTargets(std::uint32_t a_numBuffers, ID3D11Buffer* const* a_soTargets, const std::uint32_t* a_offsets) = 0; + virtual void DrawAuto(void) = 0; + virtual void DrawIndexedInstancedIndirect(ID3D11Buffer* a_bufferForArgs, std::uint32_t a_alignedByteOffsetForArgs) = 0; + virtual void DrawInstancedIndirect(ID3D11Buffer* a_bufferForArgs, std::uint32_t a_alignedByteOffsetForArgs) = 0; + virtual void Dispatch(std::uint32_t a_threadGroupCountX, std::uint32_t a_threadGroupCountY, std::uint32_t a_threadGroupCountZ) = 0; + virtual void DispatchIndirect(ID3D11Buffer* a_bufferForArgs, std::uint32_t a_alignedByteOffsetForArgs) = 0; + virtual void RSSetState(ID3D11RasterizerState* a_rasterizerState) = 0; + virtual void RSSetViewports(std::uint32_t a_numViewports, const D3D11_VIEWPORT* a_viewports) = 0; + virtual void RSSetScissorRects(std::uint32_t a_numRects, const D3D11_RECT* a_rects) = 0; + virtual void CopySubresourceRegion(ID3D11Resource* a_dstResource, std::uint32_t a_dstSubresource, std::uint32_t a_dstX, std::uint32_t a_dstY, std::uint32_t a_dstZ, ID3D11Resource* a_srcResource, std::uint32_t a_srcSubresource, const D3D11_BOX* a_srcBox) = 0; + virtual void CopyResource(ID3D11Resource* a_dstResource, ID3D11Resource* a_srcResource) = 0; + virtual void UpdateSubresource(ID3D11Resource* a_dstResource, std::uint32_t a_dstSubresource, const D3D11_BOX* a_dstBox, const void* a_srcData, std::uint32_t a_srcRowPitch, std::uint32_t a_srcDepthPitch) = 0; + virtual void CopyStructureCount(ID3D11Buffer* a_dstBuffer, std::uint32_t a_dstAlignedByteOffset, ID3D11UnorderedAccessView* a_srcView) = 0; + virtual void ClearRenderTargetView(ID3D11RenderTargetView* a_renderTargetView, const float a_colorRGBA[4]) = 0; + virtual void ClearUnorderedAccessViewUint(ID3D11UnorderedAccessView* a_unorderedAccessView, const std::uint32_t a_values[4]) = 0; + virtual void ClearUnorderedAccessViewFloat(ID3D11UnorderedAccessView* a_unorderedAccessView, const float a_values[4]) = 0; + virtual void ClearDepthStencilView(ID3D11DepthStencilView* a_depthStencilView, std::uint32_t a_clearFlags, float a_depth, std::uint8_t a_stencil) = 0; + virtual void GenerateMips(ID3D11ShaderResourceView* a_shaderResourceView) = 0; + virtual void SetResourceMinLOD(ID3D11Resource* a_resource, float a_minLOD) = 0; + virtual float GetResourceMinLOD(ID3D11Resource* a_resource) = 0; + virtual void ResolveSubresource(ID3D11Resource* a_dstResource, std::uint32_t a_dstSubresource, ID3D11Resource* a_srcResource, std::uint32_t a_srcSubresource, DXGI_FORMAT a_format) = 0; + virtual void ExecuteCommandList(ID3D11CommandList* a_commandList, BOOL a_restoreContextState) = 0; + virtual void HSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; + virtual void HSSetShader(ID3D11HullShader* a_hullShader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; + virtual void HSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; + virtual void HSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; + virtual void DSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; + virtual void DSSetShader(ID3D11DomainShader* a_domainShader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; + virtual void DSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; + virtual void DSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; + virtual void CSSetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView* const* a_shaderResourceViews) = 0; + virtual void CSSetUnorderedAccessViews(std::uint32_t a_startSlot, std::uint32_t a_numUAVs, ID3D11UnorderedAccessView* const* a_unorderedAccessViews, const std::uint32_t* a_uavInitialCounts) = 0; + virtual void CSSetShader(ID3D11ComputeShader* a_computeShader, ID3D11ClassInstance* const* a_classInstances, std::uint32_t a_numClassInstances) = 0; + virtual void CSSetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState* const* a_samplers) = 0; + virtual void CSSetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer* const* a_constantBuffers) = 0; + virtual void VSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; + virtual void PSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; + virtual void PSGetShader(ID3D11PixelShader** a_pixelShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; + virtual void PSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; + virtual void VSGetShader(ID3D11VertexShader** a_vertexShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; + virtual void PSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; + virtual void IAGetInputLayout(ID3D11InputLayout** a_inputLayout) = 0; + virtual void IAGetVertexBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_vertexBuffers, std::uint32_t* a_strides, std::uint32_t* a_offsets) = 0; + virtual void IAGetIndexBuffer(ID3D11Buffer** a_indexBuffer, DXGI_FORMAT* a_format, std::uint32_t* a_offset) = 0; + virtual void GSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; + virtual void GSGetShader(ID3D11GeometryShader** a_geometryShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; + virtual void IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* a_topology) = 0; + virtual void VSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; + virtual void VSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; + virtual void GetPredication(ID3D11Predicate** a_predicate, BOOL* a_predicateValue) = 0; + virtual void GSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; + virtual void GSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; + virtual void OMGetRenderTargets(std::uint32_t a_numViews, ID3D11RenderTargetView** a_renderTargetViews, ID3D11DepthStencilView** a_depthStencilView) = 0; + virtual void OMGetRenderTargetsAndUnorderedAccessViews(std::uint32_t a_numRTVs, ID3D11RenderTargetView** a_renderTargetViews, ID3D11DepthStencilView** a_depthStencilView, std::uint32_t a_uavStartSlot, std::uint32_t a_numUAVs, ID3D11UnorderedAccessView** a_unorderedAccessViews) = 0; + virtual void OMGetBlendState(ID3D11BlendState** a_blendState, float a_blendFactor[4], std::uint32_t* a_sampleMask) = 0; + virtual void OMGetDepthStencilState(ID3D11DepthStencilState** a_depthStencilState, std::uint32_t* a_stencilRef) = 0; + virtual void SOGetTargets(std::uint32_t a_numBuffers, ID3D11Buffer** a_soTargets) = 0; + virtual void RSGetState(ID3D11RasterizerState** a_rasterizerState) = 0; + virtual void RSGetViewports(std::uint32_t* a_numViewports, D3D11_VIEWPORT* a_viewports) = 0; + virtual void RSGetScissorRects(std::uint32_t* a_numRects, D3D11_RECT* a_rects) = 0; + virtual void HSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; + virtual void HSGetShader(ID3D11HullShader** a_hullShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; + virtual void HSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; + virtual void HSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; + virtual void DSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; + virtual void DSGetShader(ID3D11DomainShader** a_domainShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; + virtual void DSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; + virtual void DSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; + virtual void CSGetShaderResources(std::uint32_t a_startSlot, std::uint32_t a_numViews, ID3D11ShaderResourceView** a_shaderResourceViews) = 0; + virtual void CSGetUnorderedAccessViews(std::uint32_t a_startSlot, std::uint32_t a_numUAVs, ID3D11UnorderedAccessView** a_unorderedAccessViews) = 0; + virtual void CSGetShader(ID3D11ComputeShader** a_computeShader, ID3D11ClassInstance** a_classInstances, std::uint32_t* a_numClassInstances) = 0; + virtual void CSGetSamplers(std::uint32_t a_startSlot, std::uint32_t a_numSamplers, ID3D11SamplerState** a_samplers) = 0; + virtual void CSGetConstantBuffers(std::uint32_t a_startSlot, std::uint32_t a_numBuffers, ID3D11Buffer** a_constantBuffers) = 0; + virtual void ClearState(void) = 0; + virtual void Flush(void) = 0; virtual D3D11_DEVICE_CONTEXT_TYPE GetType(void) = 0; - virtual std::uint32_t GetContextFlags(void) = 0; - virtual HRESULT FinishCommandList(BOOL a_restoreDeferredContextState, ID3D11CommandList** a_commandList) = 0; + virtual std::uint32_t GetContextFlags(void) = 0; + virtual HRESULT FinishCommandList(BOOL a_restoreDeferredContextState, ID3D11CommandList** a_commandList) = 0; }; struct __declspec(novtable, uuid("4b35d0cd-1e15-4258-9c98-1b1333f6dd3b")) @@ -2220,7 +2220,7 @@ namespace REX::W32 { virtual HRESULT GetCertificateSize(std::uint32_t* a_certificateSize) = 0; virtual HRESULT GetCertificate(std::uint32_t a_certificateSize, std::uint8_t* a_certificate) = 0; - virtual void GetChannelHandle(HANDLE* a_channelHandle) = 0; + virtual void GetChannelHandle(HANDLE* a_channelHandle) = 0; }; struct __declspec(novtable, uuid("75b68faa-347d-4159-8f45-a0640f01cd9a")) @@ -2264,11 +2264,11 @@ namespace REX::W32 struct __declspec(novtable, uuid("9B32F9AD-BDCC-40a6-A39D-D5C865845720")) ID3D11CryptoSession : public ID3D11DeviceChild { - virtual void GetCryptoType(GUID* a_cryptoType) = 0; - virtual void GetDecoderProfile(GUID* a_decoderProfile) = 0; + virtual void GetCryptoType(GUID* a_cryptoType) = 0; + virtual void GetDecoderProfile(GUID* a_decoderProfile) = 0; virtual HRESULT GetCertificateSize(std::uint32_t* a_certificateSize) = 0; virtual HRESULT GetCertificate(std::uint32_t a_certificateSize, std::uint8_t* a_certificate) = 0; - virtual void GetCryptoSessionHandle(HANDLE* a_cryptoSessionHandle) = 0; + virtual void GetCryptoSessionHandle(HANDLE* a_cryptoSessionHandle) = 0; }; struct __declspec(novtable, uuid("03823efb-8d8f-4e1c-9aa2-f64bb2cbfdf1")) @@ -2306,8 +2306,8 @@ namespace REX::W32 struct __declspec(novtable, uuid("dc8e63f3-d12b-4952-b47b-5e45026a862d")) ID3D11Resource : public ID3D11DeviceChild { - virtual void GetType(D3D11_RESOURCE_DIMENSION* a_resourceDimension) = 0; - virtual void SetEvictionPriority(std::uint32_t a_evictionPriority) = 0; + virtual void GetType(D3D11_RESOURCE_DIMENSION* a_resourceDimension) = 0; + virtual void SetEvictionPriority(std::uint32_t a_evictionPriority) = 0; virtual std::uint32_t GetEvictionPriority(void) = 0; }; @@ -2394,58 +2394,58 @@ namespace REX::W32 virtual HRESULT DecoderEndFrame(ID3D11VideoDecoder* a_decoder) = 0; virtual HRESULT SubmitDecoderBuffers(ID3D11VideoDecoder* a_decoder, std::uint32_t a_numBuffers, const D3D11_VIDEO_DECODER_BUFFER_DESC* a_bufferDesc) = 0; virtual HRESULT DecoderExtension(ID3D11VideoDecoder* a_decoder, const D3D11_VIDEO_DECODER_EXTENSION* a_extensionData) = 0; - virtual void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* a_videoProcessor, BOOL a_enable, const RECT* a_rect) = 0; - virtual void VideoProcessorSetOutputBackgroundColor(ID3D11VideoProcessor* a_videoProcessor, BOOL a_bYCbCr, const D3D11_VIDEO_COLOR* a_color) = 0; - virtual void VideoProcessorSetOutputColorSpace(ID3D11VideoProcessor* a_videoProcessor, const D3D11_VIDEO_PROCESSOR_COLOR_SPACE* a_colorSpace) = 0; - virtual void VideoProcessorSetOutputAlphaFillMode(ID3D11VideoProcessor* a_videoProcessor, D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE a_alphaFillMode, std::uint32_t a_streamIndex) = 0; - virtual void VideoProcessorSetOutputConstriction(ID3D11VideoProcessor* a_videoProcessor, BOOL a_enable, SIZE a_size) = 0; - virtual void VideoProcessorSetOutputStereoMode(ID3D11VideoProcessor* a_videoProcessor, BOOL a_enable) = 0; + virtual void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* a_videoProcessor, BOOL a_enable, const RECT* a_rect) = 0; + virtual void VideoProcessorSetOutputBackgroundColor(ID3D11VideoProcessor* a_videoProcessor, BOOL a_bYCbCr, const D3D11_VIDEO_COLOR* a_color) = 0; + virtual void VideoProcessorSetOutputColorSpace(ID3D11VideoProcessor* a_videoProcessor, const D3D11_VIDEO_PROCESSOR_COLOR_SPACE* a_colorSpace) = 0; + virtual void VideoProcessorSetOutputAlphaFillMode(ID3D11VideoProcessor* a_videoProcessor, D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE a_alphaFillMode, std::uint32_t a_streamIndex) = 0; + virtual void VideoProcessorSetOutputConstriction(ID3D11VideoProcessor* a_videoProcessor, BOOL a_enable, SIZE a_size) = 0; + virtual void VideoProcessorSetOutputStereoMode(ID3D11VideoProcessor* a_videoProcessor, BOOL a_enable) = 0; virtual HRESULT VideoProcessorSetOutputExtension(ID3D11VideoProcessor* a_videoProcessor, const GUID* a_extensionGuid, std::uint32_t a_dataSize, void* a_data) = 0; - virtual void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* a_videoProcessor, BOOL* a_enabled, RECT* a_rect) = 0; - virtual void VideoProcessorGetOutputBackgroundColor(ID3D11VideoProcessor* a_videoProcessor, BOOL* a_bYCbCr, D3D11_VIDEO_COLOR* a_color) = 0; - virtual void VideoProcessorGetOutputColorSpace(ID3D11VideoProcessor* a_videoProcessor, D3D11_VIDEO_PROCESSOR_COLOR_SPACE* a_colorSpace) = 0; - virtual void VideoProcessorGetOutputAlphaFillMode(ID3D11VideoProcessor* a_videoProcessor, D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE* a_alphaFillMode, std::uint32_t* a_streamIndex) = 0; - virtual void VideoProcessorGetOutputConstriction(ID3D11VideoProcessor* a_videoProcessor, BOOL* a_enabled, SIZE* a_size) = 0; - virtual void VideoProcessorGetOutputStereoMode(ID3D11VideoProcessor* a_videoProcessor, BOOL* a_enabled) = 0; + virtual void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* a_videoProcessor, BOOL* a_enabled, RECT* a_rect) = 0; + virtual void VideoProcessorGetOutputBackgroundColor(ID3D11VideoProcessor* a_videoProcessor, BOOL* a_bYCbCr, D3D11_VIDEO_COLOR* a_color) = 0; + virtual void VideoProcessorGetOutputColorSpace(ID3D11VideoProcessor* a_videoProcessor, D3D11_VIDEO_PROCESSOR_COLOR_SPACE* a_colorSpace) = 0; + virtual void VideoProcessorGetOutputAlphaFillMode(ID3D11VideoProcessor* a_videoProcessor, D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE* a_alphaFillMode, std::uint32_t* a_streamIndex) = 0; + virtual void VideoProcessorGetOutputConstriction(ID3D11VideoProcessor* a_videoProcessor, BOOL* a_enabled, SIZE* a_size) = 0; + virtual void VideoProcessorGetOutputStereoMode(ID3D11VideoProcessor* a_videoProcessor, BOOL* a_enabled) = 0; virtual HRESULT VideoProcessorGetOutputExtension(ID3D11VideoProcessor* a_videoProcessor, const GUID* a_extensionGuid, std::uint32_t a_dataSize, void* a_data) = 0; - virtual void VideoProcessorSetStreamFrameFormat(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_FRAME_FORMAT a_frameFormat) = 0; - virtual void VideoProcessorSetStreamColorSpace(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, const D3D11_VIDEO_PROCESSOR_COLOR_SPACE* a_colorSpace) = 0; - virtual void VideoProcessorSetStreamOutputRate(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_PROCESSOR_OUTPUT_RATE a_outputRate, BOOL a_repeatFrame, const DXGI_RATIONAL* a_customRate) = 0; - virtual void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, const RECT* a_rect) = 0; - virtual void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, const RECT* a_rect) = 0; - virtual void VideoProcessorSetStreamAlpha(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, float a_alpha) = 0; - virtual void VideoProcessorSetStreamPalette(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, std::uint32_t a_count, const std::uint32_t* a_entries) = 0; - virtual void VideoProcessorSetStreamPixelAspectRatio(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, const DXGI_RATIONAL* a_sourceAspectRatio, const DXGI_RATIONAL* a_destinationAspectRatio) = 0; - virtual void VideoProcessorSetStreamLumaKey(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t StreamIndex, BOOL a_enable, float a_lower, float a_upper) = 0; - virtual void VideoProcessorSetStreamStereoFormat(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, D3D11_VIDEO_PROCESSOR_STEREO_FORMAT a_format, BOOL a_leftViewFrame0, BOOL a_baseViewFrame0, D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE a_flipMode, std::int32_t a_monoOffset) = 0; - virtual void VideoProcessorSetStreamAutoProcessingMode(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable) = 0; - virtual void VideoProcessorSetStreamFilter(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_PROCESSOR_FILTER a_filter, BOOL a_enable, std::int32_t a_level) = 0; + virtual void VideoProcessorSetStreamFrameFormat(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_FRAME_FORMAT a_frameFormat) = 0; + virtual void VideoProcessorSetStreamColorSpace(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, const D3D11_VIDEO_PROCESSOR_COLOR_SPACE* a_colorSpace) = 0; + virtual void VideoProcessorSetStreamOutputRate(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_PROCESSOR_OUTPUT_RATE a_outputRate, BOOL a_repeatFrame, const DXGI_RATIONAL* a_customRate) = 0; + virtual void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, const RECT* a_rect) = 0; + virtual void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, const RECT* a_rect) = 0; + virtual void VideoProcessorSetStreamAlpha(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, float a_alpha) = 0; + virtual void VideoProcessorSetStreamPalette(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, std::uint32_t a_count, const std::uint32_t* a_entries) = 0; + virtual void VideoProcessorSetStreamPixelAspectRatio(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, const DXGI_RATIONAL* a_sourceAspectRatio, const DXGI_RATIONAL* a_destinationAspectRatio) = 0; + virtual void VideoProcessorSetStreamLumaKey(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t StreamIndex, BOOL a_enable, float a_lower, float a_upper) = 0; + virtual void VideoProcessorSetStreamStereoFormat(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, D3D11_VIDEO_PROCESSOR_STEREO_FORMAT a_format, BOOL a_leftViewFrame0, BOOL a_baseViewFrame0, D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE a_flipMode, std::int32_t a_monoOffset) = 0; + virtual void VideoProcessorSetStreamAutoProcessingMode(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable) = 0; + virtual void VideoProcessorSetStreamFilter(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_PROCESSOR_FILTER a_filter, BOOL a_enable, std::int32_t a_level) = 0; virtual HRESULT VideoProcessorSetStreamExtension(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, const GUID* a_extensionGuid, std::uint32_t a_dataSize, void* a_data) = 0; - virtual void VideoProcessorGetStreamFrameFormat(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_FRAME_FORMAT* a_frameFormat) = 0; - virtual void VideoProcessorGetStreamColorSpace(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_PROCESSOR_COLOR_SPACE* a_colorSpace) = 0; - virtual void VideoProcessorGetStreamOutputRate(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_PROCESSOR_OUTPUT_RATE* a_outputRate, BOOL* a_repeatFrame, DXGI_RATIONAL* a_customRate) = 0; - virtual void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled, RECT* a_rect) = 0; - virtual void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled, RECT* a_rect) = 0; - virtual void VideoProcessorGetStreamAlpha(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled, float* a_alpha) = 0; - virtual void VideoProcessorGetStreamPalette(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, std::uint32_t a_count, std::uint32_t* a_entries) = 0; - virtual void VideoProcessorGetStreamPixelAspectRatio(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled, DXGI_RATIONAL* a_sourceAspectRatio, DXGI_RATIONAL* a_destinationAspectRatio) = 0; - virtual void VideoProcessorGetStreamLumaKey(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled, float* a_lower, float* a_upper) = 0; - virtual void VideoProcessorGetStreamStereoFormat(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enable, D3D11_VIDEO_PROCESSOR_STEREO_FORMAT* a_format, BOOL* a_leftViewFrame0, BOOL* a_baseViewFrame0, D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE* a_flipMode, std::int32_t* a_monoOffset) = 0; - virtual void VideoProcessorGetStreamAutoProcessingMode(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled) = 0; - virtual void VideoProcessorGetStreamFilter(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_PROCESSOR_FILTER a_filter, BOOL* a_enabled, std::int32_t* a_level) = 0; + virtual void VideoProcessorGetStreamFrameFormat(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_FRAME_FORMAT* a_frameFormat) = 0; + virtual void VideoProcessorGetStreamColorSpace(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_PROCESSOR_COLOR_SPACE* a_colorSpace) = 0; + virtual void VideoProcessorGetStreamOutputRate(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_PROCESSOR_OUTPUT_RATE* a_outputRate, BOOL* a_repeatFrame, DXGI_RATIONAL* a_customRate) = 0; + virtual void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled, RECT* a_rect) = 0; + virtual void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled, RECT* a_rect) = 0; + virtual void VideoProcessorGetStreamAlpha(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled, float* a_alpha) = 0; + virtual void VideoProcessorGetStreamPalette(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, std::uint32_t a_count, std::uint32_t* a_entries) = 0; + virtual void VideoProcessorGetStreamPixelAspectRatio(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled, DXGI_RATIONAL* a_sourceAspectRatio, DXGI_RATIONAL* a_destinationAspectRatio) = 0; + virtual void VideoProcessorGetStreamLumaKey(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled, float* a_lower, float* a_upper) = 0; + virtual void VideoProcessorGetStreamStereoFormat(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enable, D3D11_VIDEO_PROCESSOR_STEREO_FORMAT* a_format, BOOL* a_leftViewFrame0, BOOL* a_baseViewFrame0, D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE* a_flipMode, std::int32_t* a_monoOffset) = 0; + virtual void VideoProcessorGetStreamAutoProcessingMode(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enabled) = 0; + virtual void VideoProcessorGetStreamFilter(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, D3D11_VIDEO_PROCESSOR_FILTER a_filter, BOOL* a_enabled, std::int32_t* a_level) = 0; virtual HRESULT VideoProcessorGetStreamExtension(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, const GUID* a_extensionGuid, std::uint32_t a_dataSize, void* a_data) = 0; virtual HRESULT VideoProcessorBlt(ID3D11VideoProcessor* a_videoProcessor, ID3D11VideoProcessorOutputView* a_view, std::uint32_t a_outputFrame, std::uint32_t a_streamCount, const D3D11_VIDEO_PROCESSOR_STREAM* a_streams) = 0; virtual HRESULT NegotiateCryptoSessionKeyExchange(ID3D11CryptoSession* a_cryptoSession, std::uint32_t a_dataSize, void* a_data) = 0; - virtual void EncryptionBlt(ID3D11CryptoSession* a_cryptoSession, ID3D11Texture2D* a_srcSurface, ID3D11Texture2D* a_dstSurface, std::uint32_t a_ivSize, void* a_iv) = 0; - virtual void DecryptionBlt(ID3D11CryptoSession* a_cryptoSession, ID3D11Texture2D* a_srcSurface, ID3D11Texture2D* a_dstSurface, D3D11_ENCRYPTED_BLOCK_INFO* a_encryptedBlockInfo, std::uint32_t a_contentKeySize, const void* a_contentKey, std::uint32_t a_ivSize, void* a_iv) = 0; - virtual void StartSessionKeyRefresh(ID3D11CryptoSession* a_cryptoSession, std::uint32_t a_randomNumberSize, void* a_randomNumber) = 0; - virtual void FinishSessionKeyRefresh(ID3D11CryptoSession* a_cryptoSession) = 0; + virtual void EncryptionBlt(ID3D11CryptoSession* a_cryptoSession, ID3D11Texture2D* a_srcSurface, ID3D11Texture2D* a_dstSurface, std::uint32_t a_ivSize, void* a_iv) = 0; + virtual void DecryptionBlt(ID3D11CryptoSession* a_cryptoSession, ID3D11Texture2D* a_srcSurface, ID3D11Texture2D* a_dstSurface, D3D11_ENCRYPTED_BLOCK_INFO* a_encryptedBlockInfo, std::uint32_t a_contentKeySize, const void* a_contentKey, std::uint32_t a_ivSize, void* a_iv) = 0; + virtual void StartSessionKeyRefresh(ID3D11CryptoSession* a_cryptoSession, std::uint32_t a_randomNumberSize, void* a_randomNumber) = 0; + virtual void FinishSessionKeyRefresh(ID3D11CryptoSession* a_cryptoSession) = 0; virtual HRESULT GetEncryptionBltKey(ID3D11CryptoSession* a_cryptoSession, std::uint32_t a_keySize, void* a_readbackKey) = 0; virtual HRESULT NegotiateAuthenticatedChannelKeyExchange(ID3D11AuthenticatedChannel* a_channel, std::uint32_t a_dataSize, void* a_data) = 0; virtual HRESULT QueryAuthenticatedChannel(ID3D11AuthenticatedChannel* a_channel, std::uint32_t a_inputSize, const void* a_input, std::uint32_t a_outputSize, void* a_output) = 0; virtual HRESULT ConfigureAuthenticatedChannel(ID3D11AuthenticatedChannel* a_channel, std::uint32_t a_inputSize, const void* a_input, D3D11_AUTHENTICATED_CONFIGURE_OUTPUT* a_output) = 0; - virtual void VideoProcessorSetStreamRotation(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, D3D11_VIDEO_PROCESSOR_ROTATION a_rotation) = 0; - virtual void VideoProcessorGetStreamRotation(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enable, D3D11_VIDEO_PROCESSOR_ROTATION* a_rotation) = 0; + virtual void VideoProcessorSetStreamRotation(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, D3D11_VIDEO_PROCESSOR_ROTATION a_rotation) = 0; + virtual void VideoProcessorGetStreamRotation(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enable, D3D11_VIDEO_PROCESSOR_ROTATION* a_rotation) = 0; }; struct __declspec(novtable, uuid("3C9C5B51-995D-48d1-9B8D-FA5CAEDED65C")) @@ -2464,23 +2464,23 @@ namespace REX::W32 struct __declspec(novtable, uuid("10EC4D5B-975A-4689-B9E4-D0AAC30FE333")) ID3D11VideoDevice : public IUnknown { - virtual HRESULT CreateVideoDecoder(const D3D11_VIDEO_DECODER_DESC* a_videoDesc, const D3D11_VIDEO_DECODER_CONFIG* a_config, ID3D11VideoDecoder** a_decoder) = 0; - virtual HRESULT CreateVideoProcessor(ID3D11VideoProcessorEnumerator* a_enum, std::uint32_t a_rateConversionIndex, ID3D11VideoProcessor** a_videoProcessor) = 0; - virtual HRESULT CreateAuthenticatedChannel(D3D11_AUTHENTICATED_CHANNEL_TYPE a_channelType, ID3D11AuthenticatedChannel** a_authenticatedChannel) = 0; - virtual HRESULT CreateCryptoSession(const GUID* a_cryptoType, const GUID* a_decoderProfile, const GUID* a_keyExchangeType, ID3D11CryptoSession** a_cryptoSession) = 0; - virtual HRESULT CreateVideoDecoderOutputView(ID3D11Resource* a_resource, const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC* a_desc, ID3D11VideoDecoderOutputView** a_dvovView) = 0; - virtual HRESULT CreateVideoProcessorInputView(ID3D11Resource* a_resource, ID3D11VideoProcessorEnumerator* a_enum, const D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC* a_desc, ID3D11VideoProcessorInputView** a_vpiView) = 0; - virtual HRESULT CreateVideoProcessorOutputView(ID3D11Resource* a_resource, ID3D11VideoProcessorEnumerator* a_enum, const D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC* a_desc, ID3D11VideoProcessorOutputView** a_vpoView) = 0; - virtual HRESULT CreateVideoProcessorEnumerator(const D3D11_VIDEO_PROCESSOR_CONTENT_DESC* a_desc, ID3D11VideoProcessorEnumerator** a_enum) = 0; + virtual HRESULT CreateVideoDecoder(const D3D11_VIDEO_DECODER_DESC* a_videoDesc, const D3D11_VIDEO_DECODER_CONFIG* a_config, ID3D11VideoDecoder** a_decoder) = 0; + virtual HRESULT CreateVideoProcessor(ID3D11VideoProcessorEnumerator* a_enum, std::uint32_t a_rateConversionIndex, ID3D11VideoProcessor** a_videoProcessor) = 0; + virtual HRESULT CreateAuthenticatedChannel(D3D11_AUTHENTICATED_CHANNEL_TYPE a_channelType, ID3D11AuthenticatedChannel** a_authenticatedChannel) = 0; + virtual HRESULT CreateCryptoSession(const GUID* a_cryptoType, const GUID* a_decoderProfile, const GUID* a_keyExchangeType, ID3D11CryptoSession** a_cryptoSession) = 0; + virtual HRESULT CreateVideoDecoderOutputView(ID3D11Resource* a_resource, const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC* a_desc, ID3D11VideoDecoderOutputView** a_dvovView) = 0; + virtual HRESULT CreateVideoProcessorInputView(ID3D11Resource* a_resource, ID3D11VideoProcessorEnumerator* a_enum, const D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC* a_desc, ID3D11VideoProcessorInputView** a_vpiView) = 0; + virtual HRESULT CreateVideoProcessorOutputView(ID3D11Resource* a_resource, ID3D11VideoProcessorEnumerator* a_enum, const D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC* a_desc, ID3D11VideoProcessorOutputView** a_vpoView) = 0; + virtual HRESULT CreateVideoProcessorEnumerator(const D3D11_VIDEO_PROCESSOR_CONTENT_DESC* a_desc, ID3D11VideoProcessorEnumerator** a_enum) = 0; virtual std::uint32_t GetVideoDecoderProfileCount(void) = 0; - virtual HRESULT GetVideoDecoderProfile(std::uint32_t a_index, GUID* a_decoderProfile) = 0; - virtual HRESULT CheckVideoDecoderFormat(const GUID* a_decoderProfile, DXGI_FORMAT a_format, BOOL* a_supported) = 0; - virtual HRESULT GetVideoDecoderConfigCount(const D3D11_VIDEO_DECODER_DESC* a_desc, std::uint32_t* a_count) = 0; - virtual HRESULT GetVideoDecoderConfig(const D3D11_VIDEO_DECODER_DESC* a_desc, std::uint32_t a_index, D3D11_VIDEO_DECODER_CONFIG* a_config) = 0; - virtual HRESULT GetContentProtectionCaps(const GUID* a_cryptoType, const GUID* a_decoderProfile, D3D11_VIDEO_CONTENT_PROTECTION_CAPS* a_caps) = 0; - virtual HRESULT CheckCryptoKeyExchange(const GUID* a_cryptoType, const GUID* a_decoderProfile, std::uint32_t a_index, GUID* a_keyExchangeType) = 0; - virtual HRESULT SetPrivateData(const GUID& a_guid, std::uint32_t a_dataSize, const void* a_data) = 0; - virtual HRESULT SetPrivateDataInterface(const GUID& a_guid, const IUnknown* a_data) = 0; + virtual HRESULT GetVideoDecoderProfile(std::uint32_t a_index, GUID* a_decoderProfile) = 0; + virtual HRESULT CheckVideoDecoderFormat(const GUID* a_decoderProfile, DXGI_FORMAT a_format, BOOL* a_supported) = 0; + virtual HRESULT GetVideoDecoderConfigCount(const D3D11_VIDEO_DECODER_DESC* a_desc, std::uint32_t* a_count) = 0; + virtual HRESULT GetVideoDecoderConfig(const D3D11_VIDEO_DECODER_DESC* a_desc, std::uint32_t a_index, D3D11_VIDEO_DECODER_CONFIG* a_config) = 0; + virtual HRESULT GetContentProtectionCaps(const GUID* a_cryptoType, const GUID* a_decoderProfile, D3D11_VIDEO_CONTENT_PROTECTION_CAPS* a_caps) = 0; + virtual HRESULT CheckCryptoKeyExchange(const GUID* a_cryptoType, const GUID* a_decoderProfile, std::uint32_t a_index, GUID* a_keyExchangeType) = 0; + virtual HRESULT SetPrivateData(const GUID& a_guid, std::uint32_t a_dataSize, const void* a_data) = 0; + virtual HRESULT SetPrivateDataInterface(const GUID& a_guid, const IUnknown* a_data) = 0; }; struct __declspec(novtable, uuid("1D7B0652-185F-41c6-85CE-0C5BE3D4AE6C")) diff --git a/CommonLibF4/include/REX/W32/D3D11_1.h b/CommonLibF4/include/REX/W32/D3D11_1.h index db1a789d..44c02006 100644 --- a/CommonLibF4/include/REX/W32/D3D11_1.h +++ b/CommonLibF4/include/REX/W32/D3D11_1.h @@ -81,17 +81,17 @@ namespace REX::W32 struct D3D11_KEY_EXCHANGE_HW_PROTECTION_DATA { - std::uint32_t hwProtectionFunctionID; - D3D11_KEY_EXCHANGE_HW_PROTECTION_INPUT_DATA* inputData; + std::uint32_t hwProtectionFunctionID; + D3D11_KEY_EXCHANGE_HW_PROTECTION_INPUT_DATA* inputData; D3D11_KEY_EXCHANGE_HW_PROTECTION_OUTPUT_DATA* outputData; - HRESULT status; + HRESULT status; }; struct D3D11_KEY_EXCHANGE_HW_PROTECTION_INPUT_DATA { std::uint32_t privateDataSize; std::uint32_t hwProtectionDataSize; - std::uint8_t input[4]; + std::uint8_t input[4]; }; struct D3D11_KEY_EXCHANGE_HW_PROTECTION_OUTPUT_DATA @@ -101,57 +101,57 @@ namespace REX::W32 std::uint32_t hwProtectionDataSize; std::uint64_t transportTime; std::uint64_t executionTime; - std::uint8_t output[4]; + std::uint8_t output[4]; }; struct D3D11_RASTERIZER_DESC1 { D3D11_FILL_MODE fillMode; D3D11_CULL_MODE cullMode; - BOOL frontCounterClockwise; - std::int32_t depthBias; - float depthBiasClamp; - float slopeScaledDepthBias; - BOOL depthClipEnable; - BOOL scissorEnable; - BOOL multisampleEnable; - BOOL antialiasedLineEnable; - std::uint32_t forcedSampleCount; + BOOL frontCounterClockwise; + std::int32_t depthBias; + float depthBiasClamp; + float slopeScaledDepthBias; + BOOL depthClipEnable; + BOOL scissorEnable; + BOOL multisampleEnable; + BOOL antialiasedLineEnable; + std::uint32_t forcedSampleCount; }; struct D3D11_RENDER_TARGET_BLEND_DESC1 { - BOOL blendEnable; - BOOL logicOpEnable; - D3D11_BLEND srcBlend; - D3D11_BLEND destBlend; + BOOL blendEnable; + BOOL logicOpEnable; + D3D11_BLEND srcBlend; + D3D11_BLEND destBlend; D3D11_BLEND_OP blendOp; - D3D11_BLEND srcBlendAlpha; - D3D11_BLEND destBlendAlpha; + D3D11_BLEND srcBlendAlpha; + D3D11_BLEND destBlendAlpha; D3D11_BLEND_OP blendOpAlpha; D3D11_LOGIC_OP logicOp; - std::uint8_t renderTargetWriteMask; + std::uint8_t renderTargetWriteMask; }; struct D3D11_VIDEO_DECODER_BEGIN_FRAME_CRYPTO_SESSION { ID3D11CryptoSession* cryptoSession; - std::uint32_t blobSize; - void* blob; - GUID* keyInfoId; - std::uint32_t privateDataSize; - void* privateData; + std::uint32_t blobSize; + void* blob; + GUID* keyInfoId; + std::uint32_t privateDataSize; + void* privateData; }; struct D3D11_VIDEO_DECODER_BUFFER_DESC1 { - D3D11_VIDEO_DECODER_BUFFER_TYPE bufferType; - std::uint32_t dataOffset; - std::uint32_t dataSize; - void* iv; - std::uint32_t ivSize; + D3D11_VIDEO_DECODER_BUFFER_TYPE bufferType; + std::uint32_t dataOffset; + std::uint32_t dataSize; + void* iv; + std::uint32_t ivSize; D3D11_VIDEO_DECODER_SUB_SAMPLE_MAPPING_BLOCK* subSampleMappingBlock; - std::uint32_t subSampleMappingCount; + std::uint32_t subSampleMappingCount; }; struct D3D11_VIDEO_DECODER_SUB_SAMPLE_MAPPING_BLOCK @@ -162,24 +162,24 @@ namespace REX::W32 struct D3D11_VIDEO_PROCESSOR_STREAM_BEHAVIOR_HINT { - BOOL enable; + BOOL enable; std::uint32_t width; std::uint32_t height; - DXGI_FORMAT format; + DXGI_FORMAT format; }; struct D3D11_VIDEO_SAMPLE_DESC { - std::uint32_t width; - std::uint32_t height; - DXGI_FORMAT format; + std::uint32_t width; + std::uint32_t height; + DXGI_FORMAT format; DXGI_COLOR_SPACE_TYPE colorSpace; }; struct D3D11_BLEND_DESC1 { - BOOL alphaToCoverageEnable; - BOOL independentBlendEnable; + BOOL alphaToCoverageEnable; + BOOL independentBlendEnable; D3D11_RENDER_TARGET_BLEND_DESC1 renderTarget[8]; }; } @@ -195,8 +195,8 @@ namespace REX::W32 { virtual std::int32_t BeginEvent(const wchar_t* a_name) = 0; virtual std::int32_t EndEvent(void) = 0; - virtual void SetMarker(const wchar_t* a_name) = 0; - virtual BOOL GetStatus(void) = 0; + virtual void SetMarker(const wchar_t* a_name) = 0; + virtual BOOL GetStatus(void) = 0; }; struct __declspec(novtable, uuid("cc86fabe-da55-401d-85e7-e3c9de2877e9")) @@ -208,7 +208,7 @@ namespace REX::W32 struct __declspec(novtable, uuid("a04bfb29-08ef-43d6-a49c-a9bdbdcbe686")) ID3D11Device1 : public ID3D11Device { - virtual void GetImmediateContext1(ID3D11DeviceContext1** a_immediateContext) = 0; + virtual void GetImmediateContext1(ID3D11DeviceContext1** a_immediateContext) = 0; virtual HRESULT CreateDeferredContext1(std::uint32_t a_contextFlags, ID3D11DeviceContext1** a_deferredContext) = 0; virtual HRESULT CreateBlendState1(const D3D11_BLEND_DESC1* a_blendStateDesc, ID3D11BlendState1** a_blendState) = 0; virtual HRESULT CreateRasterizerState1(const D3D11_RASTERIZER_DESC1* a_rasterizerDesc, ID3D11RasterizerState1** a_rasterizerState) = 0; @@ -255,14 +255,14 @@ namespace REX::W32 virtual HRESULT CheckCryptoSessionStatus(ID3D11CryptoSession* a_cryptoSession, D3D11_CRYPTO_SESSION_STATUS* a_status) = 0; virtual HRESULT DecoderEnableDownsampling(ID3D11VideoDecoder* a_decoder, DXGI_COLOR_SPACE_TYPE a_inputColorSpace, const D3D11_VIDEO_SAMPLE_DESC* a_outputDesc, std::uint32_t a_referenceFrameCount) = 0; virtual HRESULT DecoderUpdateDownsampling(ID3D11VideoDecoder* a_decoder, const D3D11_VIDEO_SAMPLE_DESC* a_outputDesc) = 0; - virtual void VideoProcessorSetOutputColorSpace1(ID3D11VideoProcessor* a_videoProcessor, DXGI_COLOR_SPACE_TYPE a_colorSpace) = 0; - virtual void VideoProcessorSetOutputShaderUsage(ID3D11VideoProcessor* a_videoProcessor, BOOL a_shaderUsage) = 0; - virtual void VideoProcessorGetOutputColorSpace1(ID3D11VideoProcessor* a_videoProcessor, DXGI_COLOR_SPACE_TYPE* a_colorSpace) = 0; - virtual void VideoProcessorGetOutputShaderUsage(ID3D11VideoProcessor* a_videoProcessor, BOOL* a_shaderUsage) = 0; - virtual void VideoProcessorSetStreamColorSpace1(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, DXGI_COLOR_SPACE_TYPE a_colorSpace) = 0; - virtual void VideoProcessorSetStreamMirror(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, BOOL a_flipHorizontal, BOOL a_flipVertical) = 0; - virtual void VideoProcessorGetStreamColorSpace1(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, DXGI_COLOR_SPACE_TYPE* a_colorSpace) = 0; - virtual void VideoProcessorGetStreamMirror(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enable, BOOL* a_flipHorizontal, BOOL* a_flipVertical) = 0; + virtual void VideoProcessorSetOutputColorSpace1(ID3D11VideoProcessor* a_videoProcessor, DXGI_COLOR_SPACE_TYPE a_colorSpace) = 0; + virtual void VideoProcessorSetOutputShaderUsage(ID3D11VideoProcessor* a_videoProcessor, BOOL a_shaderUsage) = 0; + virtual void VideoProcessorGetOutputColorSpace1(ID3D11VideoProcessor* a_videoProcessor, DXGI_COLOR_SPACE_TYPE* a_colorSpace) = 0; + virtual void VideoProcessorGetOutputShaderUsage(ID3D11VideoProcessor* a_videoProcessor, BOOL* a_shaderUsage) = 0; + virtual void VideoProcessorSetStreamColorSpace1(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, DXGI_COLOR_SPACE_TYPE a_colorSpace) = 0; + virtual void VideoProcessorSetStreamMirror(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL a_enable, BOOL a_flipHorizontal, BOOL a_flipVertical) = 0; + virtual void VideoProcessorGetStreamColorSpace1(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, DXGI_COLOR_SPACE_TYPE* a_colorSpace) = 0; + virtual void VideoProcessorGetStreamMirror(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_streamIndex, BOOL* a_enable, BOOL* a_flipHorizontal, BOOL* a_flipVertical) = 0; virtual HRESULT VideoProcessorGetBehaviorHints(ID3D11VideoProcessor* a_videoProcessor, std::uint32_t a_outputWidth, std::uint32_t a_outputHeight, DXGI_FORMAT a_outputFormat, std::uint32_t a_streamCount, const D3D11_VIDEO_PROCESSOR_STREAM_BEHAVIOR_HINT* a_streams, std::uint32_t* a_behaviorHints) = 0; }; diff --git a/CommonLibF4/include/REX/W32/D3D11_2.h b/CommonLibF4/include/REX/W32/D3D11_2.h index 084532a3..81aa0674 100644 --- a/CommonLibF4/include/REX/W32/D3D11_2.h +++ b/CommonLibF4/include/REX/W32/D3D11_2.h @@ -39,8 +39,8 @@ namespace REX::W32 { struct D3D11_PACKED_MIP_DESC { - std::uint8_t numStandardMips; - std::uint8_t numPackedMips; + std::uint8_t numStandardMips; + std::uint8_t numPackedMips; std::uint32_t numTilesForPackedMips; std::uint32_t startTileIndexInOverallResource; }; @@ -64,7 +64,7 @@ namespace REX::W32 struct D3D11_TILE_REGION_SIZE { std::uint32_t numTiles; - BOOL bUseBox; + BOOL bUseBox; std::uint32_t width; std::uint16_t height; std::uint16_t depth; @@ -83,9 +83,9 @@ namespace REX::W32 struct __declspec(novtable, uuid("9d06dffa-d1e5-4d07-83a8-1bb123f2f841")) ID3D11Device2 : public ID3D11Device1 { - virtual void GetImmediateContext2(ID3D11DeviceContext2** a_immediateContext) = 0; + virtual void GetImmediateContext2(ID3D11DeviceContext2** a_immediateContext) = 0; virtual HRESULT CreateDeferredContext2(std::uint32_t a_contextFlags, ID3D11DeviceContext2** a_deferredContext) = 0; - virtual void GetResourceTiling(ID3D11Resource* a_tiledResource, std::uint32_t* a_numTilesForEntireResource, D3D11_PACKED_MIP_DESC* a_packedMipDesc, D3D11_TILE_SHAPE* a_standardTileShapeForNonPackedMips, std::uint32_t* a_numSubresourceTilings, std::uint32_t a_firstSubResourceTilingToGet, D3D11_SUBRESOURCE_TILING* a_subResourceTilingsForNonPackedMips) = 0; + virtual void GetResourceTiling(ID3D11Resource* a_tiledResource, std::uint32_t* a_numTilesForEntireResource, D3D11_PACKED_MIP_DESC* a_packedMipDesc, D3D11_TILE_SHAPE* a_standardTileShapeForNonPackedMips, std::uint32_t* a_numSubresourceTilings, std::uint32_t a_firstSubResourceTilingToGet, D3D11_SUBRESOURCE_TILING* a_subResourceTilingsForNonPackedMips) = 0; virtual HRESULT CheckMultisampleQualityLevels1(DXGI_FORMAT a_format, std::uint32_t a_sampleCount, std::uint32_t a_flags, std::uint32_t* a_numQualityLevels) = 0; }; @@ -94,14 +94,14 @@ namespace REX::W32 { virtual HRESULT UpdateTileMappings(ID3D11Resource* a_tiledResource, std::uint32_t numTiledResourceRegions, const D3D11_TILED_RESOURCE_COORDINATE* a_tiledResourceRegionStartCoordinates, const D3D11_TILE_REGION_SIZE* a_tiledResourceRegionSizes, ID3D11Buffer* a_tilePool, std::uint32_t a_numRanges, const std::uint32_t* a_rangeFlags, const std::uint32_t* a_tilePoolStartOffsets, const std::uint32_t* a_rangeTileCounts, std::uint32_t a_flags) = 0; virtual HRESULT CopyTileMappings(ID3D11Resource* a_destTiledResource, const D3D11_TILED_RESOURCE_COORDINATE* a_destRegionStartCoordinate, ID3D11Resource* a_sourceTiledResource, const D3D11_TILED_RESOURCE_COORDINATE* a_sourceRegionStartCoordinate, const D3D11_TILE_REGION_SIZE* a_tileRegionSize, std::uint32_t a_flags) = 0; - virtual void CopyTiles(ID3D11Resource* a_tiledResource, const D3D11_TILED_RESOURCE_COORDINATE* a_tileRegionStartCoordinate, const D3D11_TILE_REGION_SIZE* a_tileRegionSize, ID3D11Buffer* a_buffer, std::uint64_t a_bufferStartOffsetInBytes, std::uint32_t a_flags) = 0; - virtual void UpdateTiles(ID3D11Resource* a_destTiledResource, const D3D11_TILED_RESOURCE_COORDINATE* a_destTileRegionStartCoordinate, const D3D11_TILE_REGION_SIZE* a_destTileRegionSize, const void* a_sourceTileData, std::uint32_t a_flags) = 0; + virtual void CopyTiles(ID3D11Resource* a_tiledResource, const D3D11_TILED_RESOURCE_COORDINATE* a_tileRegionStartCoordinate, const D3D11_TILE_REGION_SIZE* a_tileRegionSize, ID3D11Buffer* a_buffer, std::uint64_t a_bufferStartOffsetInBytes, std::uint32_t a_flags) = 0; + virtual void UpdateTiles(ID3D11Resource* a_destTiledResource, const D3D11_TILED_RESOURCE_COORDINATE* a_destTileRegionStartCoordinate, const D3D11_TILE_REGION_SIZE* a_destTileRegionSize, const void* a_sourceTileData, std::uint32_t a_flags) = 0; virtual HRESULT ResizeTilePool(ID3D11Buffer* a_tilePool, std::uint64_t a_newSizeInBytes) = 0; - virtual void TiledResourceBarrier(ID3D11DeviceChild* a_tiledResourceOrViewAccessBeforeBarrier, ID3D11DeviceChild* a_tiledResourceOrViewAccessAfterBarrier) = 0; - virtual BOOL IsAnnotationEnabled(void) = 0; - virtual void SetMarkerInt(const wchar_t* a_label, std::int32_t a_data) = 0; - virtual void BeginEventInt(const wchar_t* a_label, std::int32_t a_data) = 0; - virtual void EndEvent(void) = 0; + virtual void TiledResourceBarrier(ID3D11DeviceChild* a_tiledResourceOrViewAccessBeforeBarrier, ID3D11DeviceChild* a_tiledResourceOrViewAccessAfterBarrier) = 0; + virtual BOOL IsAnnotationEnabled(void) = 0; + virtual void SetMarkerInt(const wchar_t* a_label, std::int32_t a_data) = 0; + virtual void BeginEventInt(const wchar_t* a_label, std::int32_t a_data) = 0; + virtual void EndEvent(void) = 0; }; } diff --git a/CommonLibF4/include/REX/W32/D3D11_3.h b/CommonLibF4/include/REX/W32/D3D11_3.h index aa066d95..fee4bae4 100644 --- a/CommonLibF4/include/REX/W32/D3D11_3.h +++ b/CommonLibF4/include/REX/W32/D3D11_3.h @@ -98,105 +98,105 @@ namespace REX::W32 struct D3D11_QUERY_DESC1 { - D3D11_QUERY query; - std::uint32_t miscFlags; + D3D11_QUERY query; + std::uint32_t miscFlags; D3D11_CONTEXT_TYPE contextType; }; struct D3D11_RASTERIZER_DESC2 { - D3D11_FILL_MODE fillMode; - D3D11_CULL_MODE cullMode; - BOOL frontCounterClockwise; - std::int32_t depthBias; - float depthBiasClamp; - float slopeScaledDepthBias; - BOOL depthClipEnable; - BOOL scissorEnable; - BOOL multisampleEnable; - BOOL antialiasedLineEnable; - std::uint32_t forcedSampleCount; + D3D11_FILL_MODE fillMode; + D3D11_CULL_MODE cullMode; + BOOL frontCounterClockwise; + std::int32_t depthBias; + float depthBiasClamp; + float slopeScaledDepthBias; + BOOL depthClipEnable; + BOOL scissorEnable; + BOOL multisampleEnable; + BOOL antialiasedLineEnable; + std::uint32_t forcedSampleCount; D3D11_CONSERVATIVE_RASTERIZATION_MODE conservativeRaster; }; struct D3D11_RENDER_TARGET_VIEW_DESC1 { - DXGI_FORMAT format; + DXGI_FORMAT format; D3D11_RTV_DIMENSION viewDimension; union { - D3D11_BUFFER_RTV buffer; - D3D11_TEX1D_RTV texture1D; - D3D11_TEX1D_ARRAY_RTV texture1DArray; - D3D11_TEX2D_RTV1 texture2D; - D3D11_TEX2D_ARRAY_RTV1 texture2DArray; - D3D11_TEX2DMS_RTV texture2DMS; + D3D11_BUFFER_RTV buffer; + D3D11_TEX1D_RTV texture1D; + D3D11_TEX1D_ARRAY_RTV texture1DArray; + D3D11_TEX2D_RTV1 texture2D; + D3D11_TEX2D_ARRAY_RTV1 texture2DArray; + D3D11_TEX2DMS_RTV texture2DMS; D3D11_TEX2DMS_ARRAY_RTV texture2DMSArray; - D3D11_TEX3D_RTV texture3D; + D3D11_TEX3D_RTV texture3D; }; }; struct D3D11_TEXTURE2D_DESC1 { - std::uint32_t width; - std::uint32_t height; - std::uint32_t mipLevels; - std::uint32_t arraySize; - DXGI_FORMAT format; - DXGI_SAMPLE_DESC sampleDesc; - D3D11_USAGE usage; - std::uint32_t bindFlags; - std::uint32_t cpuAccessFlags; - std::uint32_t miscFlags; + std::uint32_t width; + std::uint32_t height; + std::uint32_t mipLevels; + std::uint32_t arraySize; + DXGI_FORMAT format; + DXGI_SAMPLE_DESC sampleDesc; + D3D11_USAGE usage; + std::uint32_t bindFlags; + std::uint32_t cpuAccessFlags; + std::uint32_t miscFlags; D3D11_TEXTURE_LAYOUT textureLayout; }; struct D3D11_TEXTURE3D_DESC1 { - std::uint32_t width; - std::uint32_t height; - std::uint32_t depth; - std::uint32_t mipLevels; - DXGI_FORMAT format; - D3D11_USAGE usage; - std::uint32_t bindFlags; - std::uint32_t cpuAccessFlags; - std::uint32_t miscFlags; + std::uint32_t width; + std::uint32_t height; + std::uint32_t depth; + std::uint32_t mipLevels; + DXGI_FORMAT format; + D3D11_USAGE usage; + std::uint32_t bindFlags; + std::uint32_t cpuAccessFlags; + std::uint32_t miscFlags; D3D11_TEXTURE_LAYOUT textureLayout; }; struct D3D11_SHADER_RESOURCE_VIEW_DESC1 { - DXGI_FORMAT format; + DXGI_FORMAT format; D3D11_SRV_DIMENSION viewDimension; union { - D3D11_BUFFER_SRV buffer; - D3D11_TEX1D_SRV texture1D; - D3D11_TEX1D_ARRAY_SRV texture1DArray; - D3D11_TEX2D_SRV1 texture2D; - D3D11_TEX2D_ARRAY_SRV1 texture2DArray; - D3D11_TEX2DMS_SRV texture2DMS; + D3D11_BUFFER_SRV buffer; + D3D11_TEX1D_SRV texture1D; + D3D11_TEX1D_ARRAY_SRV texture1DArray; + D3D11_TEX2D_SRV1 texture2D; + D3D11_TEX2D_ARRAY_SRV1 texture2DArray; + D3D11_TEX2DMS_SRV texture2DMS; D3D11_TEX2DMS_ARRAY_SRV texture2DMSArray; - D3D11_TEX3D_SRV texture3D; - D3D11_TEXCUBE_SRV textureCube; + D3D11_TEX3D_SRV texture3D; + D3D11_TEXCUBE_SRV textureCube; D3D11_TEXCUBE_ARRAY_SRV textureCubeArray; - D3D11_BUFFEREX_SRV bufferEx; + D3D11_BUFFEREX_SRV bufferEx; }; }; struct D3D11_UNORDERED_ACCESS_VIEW_DESC1 { - DXGI_FORMAT format; + DXGI_FORMAT format; D3D11_UAV_DIMENSION viewDimension; union { - D3D11_BUFFER_UAV buffer; - D3D11_TEX1D_UAV texture1D; - D3D11_TEX1D_ARRAY_UAV texture1DArray; - D3D11_TEX2D_UAV1 texture2D; + D3D11_BUFFER_UAV buffer; + D3D11_TEX1D_UAV texture1D; + D3D11_TEX1D_ARRAY_UAV texture1DArray; + D3D11_TEX2D_UAV1 texture2D; D3D11_TEX2D_ARRAY_UAV1 texture2DArray; - D3D11_TEX3D_UAV texture3D; + D3D11_TEX3D_UAV texture3D; }; }; } @@ -213,10 +213,10 @@ namespace REX::W32 virtual HRESULT CreateUnorderedAccessView1(ID3D11Resource* a_resource, const D3D11_UNORDERED_ACCESS_VIEW_DESC1* a_desc1, ID3D11UnorderedAccessView1** a_uaView1) = 0; virtual HRESULT CreateRenderTargetView1(ID3D11Resource* a_resource, const D3D11_RENDER_TARGET_VIEW_DESC1* a_desc1, ID3D11RenderTargetView1** a_rtView1) = 0; virtual HRESULT CreateQuery1(const D3D11_QUERY_DESC1* a_queryDesc1, ID3D11Query1** a_query1) = 0; - virtual void GetImmediateContext3(ID3D11DeviceContext3** a_immediateContext) = 0; + virtual void GetImmediateContext3(ID3D11DeviceContext3** a_immediateContext) = 0; virtual HRESULT CreateDeferredContext3(std::uint32_t a_contextFlags, ID3D11DeviceContext3** a_deferredContext) = 0; - virtual void WriteToSubresource(ID3D11Resource* a_dstResource, std::uint32_t a_dstSubresource, const D3D11_BOX* a_dstBox, const void* a_srcData, std::uint32_t a_srcRowPitch, std::uint32_t a_srcDepthPitch) = 0; - virtual void ReadFromSubresource(void* a_dstData, std::uint32_t a_dstRowPitch, std::uint32_t a_dstDepthPitch, ID3D11Resource* a_srcResource, std::uint32_t a_srcSubresource, const D3D11_BOX* a_srcBox) = 0; + virtual void WriteToSubresource(ID3D11Resource* a_dstResource, std::uint32_t a_dstSubresource, const D3D11_BOX* a_dstBox, const void* a_srcData, std::uint32_t a_srcRowPitch, std::uint32_t a_srcDepthPitch) = 0; + virtual void ReadFromSubresource(void* a_dstData, std::uint32_t a_dstRowPitch, std::uint32_t a_dstDepthPitch, ID3D11Resource* a_srcResource, std::uint32_t a_srcSubresource, const D3D11_BOX* a_srcBox) = 0; }; struct __declspec(novtable, uuid("b4e3c01d-e79e-4637-91b2-510e9f4c9b8f")) @@ -237,9 +237,9 @@ namespace REX::W32 struct __declspec(novtable, uuid("affde9d1-1df7-4bb7-8a34-0f46251dab80")) ID3D11Fence : public ID3D11DeviceChild { - virtual HRESULT CreateSharedHandle(const SECURITY_ATTRIBUTES* a_attributes, std::uint32_t a_access, const wchar_t* a_name, HANDLE* a_handle) = 0; + virtual HRESULT CreateSharedHandle(const SECURITY_ATTRIBUTES* a_attributes, std::uint32_t a_access, const wchar_t* a_name, HANDLE* a_handle) = 0; virtual std::uint64_t GetCompletedValue(void) = 0; - virtual HRESULT SetEventOnCompletion(std::uint64_t a_value, HANDLE a_event) = 0; + virtual HRESULT SetEventOnCompletion(std::uint64_t a_value, HANDLE a_event) = 0; }; struct __declspec(novtable, uuid("631b4766-36dc-461d-8db6-c47e13e60916")) diff --git a/CommonLibF4/include/REX/W32/D3D11_4.h b/CommonLibF4/include/REX/W32/D3D11_4.h index f8034dd2..bce409c6 100644 --- a/CommonLibF4/include/REX/W32/D3D11_4.h +++ b/CommonLibF4/include/REX/W32/D3D11_4.h @@ -58,23 +58,23 @@ namespace REX::W32 struct D3D11_FEATURE_DATA_VIDEO_DECODER_HISTOGRAM { - D3D11_VIDEO_DECODER_DESC decoderDesc; + D3D11_VIDEO_DECODER_DESC decoderDesc; D3D11_VIDEO_DECODER_HISTOGRAM_COMPONENT_FLAGS components; - std::uint32_t binCount; - std::uint32_t counterBitDepth; + std::uint32_t binCount; + std::uint32_t counterBitDepth; }; struct D3D11_VIDEO_DECODER_BUFFER_DESC2 { - D3D11_VIDEO_DECODER_BUFFER_TYPE bufferType; - std::uint32_t dataOffset; - std::uint32_t dataSize; - void* iv; - std::uint32_t ivSize; + D3D11_VIDEO_DECODER_BUFFER_TYPE bufferType; + std::uint32_t dataOffset; + std::uint32_t dataSize; + void* iv; + std::uint32_t ivSize; D3D11_VIDEO_DECODER_SUB_SAMPLE_MAPPING_BLOCK* subSampleMappingBlock; - std::uint32_t subSampleMappingCount; - std::uint32_t cBlocksStripeEncrypted; - std::uint32_t cBlocksStripeClear; + std::uint32_t subSampleMappingCount; + std::uint32_t cBlocksStripeEncrypted; + std::uint32_t cBlocksStripeClear; }; } @@ -84,7 +84,7 @@ namespace REX::W32 ID3D11Device4 : public ID3D11Device3 { virtual HRESULT RegisterDeviceRemovedEvent(HANDLE a_event, std::uint32_t* a_cookie) = 0; - virtual void UnregisterDeviceRemoved(std::uint32_t a_cookie) = 0; + virtual void UnregisterDeviceRemoved(std::uint32_t a_cookie) = 0; }; struct __declspec(novtable, uuid("8ffde202-a0e7-45df-9e01-e837801b5ea0")) diff --git a/CommonLibF4/include/REX/W32/D3DCOMPILER.h b/CommonLibF4/include/REX/W32/D3DCOMPILER.h index 0cca3be7..a87b44d1 100644 --- a/CommonLibF4/include/REX/W32/D3DCOMPILER.h +++ b/CommonLibF4/include/REX/W32/D3DCOMPILER.h @@ -119,7 +119,7 @@ namespace REX::W32 namespace REX::W32 { - inline const auto D3D_COMPILE_STANDARD_FILE_INCLUDE{ reinterpret_cast(static_cast(1)) }; + inline const auto D3D_COMPILE_STANDARD_FILE_INCLUDE{ reinterpret_cast(static_cast(1)) }; inline constexpr auto D3D_COMPRESS_SHADER_KEEP_ALL_PARTS{ 0x00000001u }; inline constexpr auto D3D_GET_INST_OFFSETS_INCLUDE_NON_EXECUTABLE{ 0x00000001u }; } diff --git a/CommonLibF4/include/REX/W32/DINPUT.h b/CommonLibF4/include/REX/W32/DINPUT.h index 85f4e539..ac863c90 100644 --- a/CommonLibF4/include/REX/W32/DINPUT.h +++ b/CommonLibF4/include/REX/W32/DINPUT.h @@ -184,14 +184,14 @@ namespace REX::W32 struct DIACTIONA { std::uintptr_t appData; - std::uint32_t semantic; - std::uint32_t flags; + std::uint32_t semantic; + std::uint32_t flags; union { - const char* actionName; + const char* actionName; std::uint32_t resIdString; }; - GUID guidInstance; + GUID guidInstance; std::uint32_t objID; std::uint32_t how; }; @@ -202,50 +202,50 @@ namespace REX::W32 std::uint32_t actionSize; std::uint32_t dataSize; std::uint32_t numActions; - DIACTIONA* action; - GUID guidActionMap; + DIACTIONA* action; + GUID guidActionMap; std::uint32_t genre; std::uint32_t bufferSize; - std::int32_t axisMin; - std::int32_t axisMax; - HINSTANCE instString; - FILETIME timeStamp; + std::int32_t axisMin; + std::int32_t axisMax; + HINSTANCE instString; + FILETIME timeStamp; std::uint32_t crc; - char actionMap[MAX_PATH]; + char actionMap[MAX_PATH]; }; struct DICOLORSET { std::uint32_t size; - D3DCOLOR textFore; - D3DCOLOR textHighlight; - D3DCOLOR calloutLine; - D3DCOLOR calloutHighlight; - D3DCOLOR border; - D3DCOLOR controlFill; - D3DCOLOR highlightFill; - D3DCOLOR areaFill; + D3DCOLOR textFore; + D3DCOLOR textHighlight; + D3DCOLOR calloutLine; + D3DCOLOR calloutHighlight; + D3DCOLOR border; + D3DCOLOR controlFill; + D3DCOLOR highlightFill; + D3DCOLOR areaFill; }; struct DICONFIGUREDEVICESPARAMSA { - std::uint32_t size; - std::uint32_t users; - char* userNames; - std::uint32_t formatsSize; + std::uint32_t size; + std::uint32_t users; + char* userNames; + std::uint32_t formatsSize; DIACTIONFORMATA* formats; - HWND hwnd; - DICOLORSET dics; - IUnknown* unkDDSTarget; + HWND hwnd; + DICOLORSET dics; + IUnknown* unkDDSTarget; }; struct DIDATAFORMAT { - std::uint32_t size; - std::uint32_t objSize; - std::uint32_t flags; - std::uint32_t dataSize; - std::uint32_t numObjs; + std::uint32_t size; + std::uint32_t objSize; + std::uint32_t flags; + std::uint32_t dataSize; + std::uint32_t numObjs; DIOBJECTDATAFORMAT* odf; }; @@ -266,39 +266,39 @@ namespace REX::W32 struct DIDEVICEIMAGEINFOA { - char imagePath[MAX_PATH]; + char imagePath[MAX_PATH]; std::uint32_t flags; std::uint32_t viewID; - RECT overlay; + RECT overlay; std::uint32_t objID; std::uint32_t validPts; - POINT calloutLine[5]; - RECT calloutRect; + POINT calloutLine[5]; + RECT calloutRect; std::uint32_t textAlign; }; struct DIDEVICEIMAGEINFOHEADERA { - std::uint32_t size; - std::uint32_t sizeImageInfo; - std::uint32_t views; - std::uint32_t buttons; - std::uint32_t axes; - std::uint32_t povs; - std::uint32_t bufferSize; - std::uint32_t bufferUsed; + std::uint32_t size; + std::uint32_t sizeImageInfo; + std::uint32_t views; + std::uint32_t buttons; + std::uint32_t axes; + std::uint32_t povs; + std::uint32_t bufferSize; + std::uint32_t bufferUsed; DIDEVICEIMAGEINFOA* imageInfoArray; }; struct DIDEVICEINSTANCEA { std::uint32_t size; - GUID guidInstance; - GUID guidProduct; + GUID guidInstance; + GUID guidProduct; std::uint32_t devType; - char instanceName[MAX_PATH]; - char productName[MAX_PATH]; - GUID guidFFDriver; + char instanceName[MAX_PATH]; + char productName[MAX_PATH]; + GUID guidFFDriver; // DIRECTINPUT_VERSION >= 0x0500 std::uint16_t usagePage; @@ -307,21 +307,21 @@ namespace REX::W32 struct DIDEVICEOBJECTDATA { - std::uint32_t ofs; - std::uint32_t data; - std::uint32_t timeStamp; - std::uint32_t sequence; + std::uint32_t ofs; + std::uint32_t data; + std::uint32_t timeStamp; + std::uint32_t sequence; std::uintptr_t appData; }; struct DIDEVICEOBJECTINSTANCEA { std::uint32_t size; - GUID guidType; + GUID guidType; std::uint32_t ofs; std::uint32_t type; std::uint32_t flags; - char name[MAX_PATH]; + char name[MAX_PATH]; // DIRECTINPUT_VERSION >= 0x0500 std::uint32_t ffMaxForce; @@ -337,20 +337,20 @@ namespace REX::W32 struct DIEFFECT { - std::uint32_t size; - std::uint32_t flags; - std::uint32_t duration; - std::uint32_t samplePeriod; - std::uint32_t gain; - std::uint32_t triggerButton; - std::uint32_t triggerRepeatInterval; - std::uint32_t axesSize; + std::uint32_t size; + std::uint32_t flags; + std::uint32_t duration; + std::uint32_t samplePeriod; + std::uint32_t gain; + std::uint32_t triggerButton; + std::uint32_t triggerRepeatInterval; + std::uint32_t axesSize; std::uint32_t* axes; - std::int32_t* direction; - DIENVELOPE* envelope; - std::uint32_t typeSpecificParamsSize; - void* typeSpecificParams; - std::uint32_t startDelay; + std::int32_t* direction; + DIENVELOPE* envelope; + std::uint32_t typeSpecificParamsSize; + void* typeSpecificParams; + std::uint32_t startDelay; }; struct DIENVELOPE @@ -365,29 +365,29 @@ namespace REX::W32 struct DIEFFECTINFOA { std::uint32_t size; - GUID guid; + GUID guid; std::uint32_t effectType; std::uint32_t staticParams; std::uint32_t dynamicParams; - char name[MAX_PATH]; + char name[MAX_PATH]; }; struct DIEFFESCAPE { std::uint32_t size; std::uint32_t command; - void* inBuffer; + void* inBuffer; std::uint32_t inBufferSize; - void* outBuffer; + void* outBuffer; std::uint32_t outBufferSize; }; struct DIFILEEFFECT { - std::uint32_t size; - GUID guidEffect; + std::uint32_t size; + GUID guidEffect; const DIEFFECT* effect; - char friendlyName[MAX_PATH]; + char friendlyName[MAX_PATH]; }; struct DIMOUSESTATE2 @@ -400,7 +400,7 @@ namespace REX::W32 struct DIOBJECTDATAFORMAT { - const GUID* guid; + const GUID* guid; std::uint32_t ofs; std::uint32_t type; std::uint32_t flags; diff --git a/CommonLibF4/include/REX/W32/DXGI.h b/CommonLibF4/include/REX/W32/DXGI.h index 022ebcfc..14595fe5 100644 --- a/CommonLibF4/include/REX/W32/DXGI.h +++ b/CommonLibF4/include/REX/W32/DXGI.h @@ -261,7 +261,7 @@ namespace REX::W32 struct LUID { std::uint32_t lo; - std::int32_t hi; + std::int32_t hi; }; } @@ -269,28 +269,28 @@ namespace REX::W32 { struct DXGI_ADAPTER_DESC { - wchar_t description[128]; + wchar_t description[128]; std::uint32_t vendorId; std::uint32_t deviceId; std::uint32_t subSysId; std::uint32_t revision; - std::size_t dedicatedVideoMemory; - std::size_t dedicatedSystemMemory; - std::size_t sharedSystemMemory; - LUID adapterLuid; + std::size_t dedicatedVideoMemory; + std::size_t dedicatedSystemMemory; + std::size_t sharedSystemMemory; + LUID adapterLuid; }; struct DXGI_ADAPTER_DESC1 { - wchar_t description[128]; + wchar_t description[128]; std::uint32_t vendorId; std::uint32_t deviceId; std::uint32_t subSysId; std::uint32_t revision; - std::size_t dedicatedVideoMemory; - std::size_t dedicatedSystemMemory; - std::size_t sharedSystemMemory; - LUID adapterLuid; + std::size_t dedicatedVideoMemory; + std::size_t dedicatedSystemMemory; + std::size_t sharedSystemMemory; + LUID adapterLuid; std::uint32_t flags; }; @@ -305,8 +305,8 @@ namespace REX::W32 std::uint32_t presentCount; std::uint32_t presentRefreshCount; std::uint32_t syncRefreshCount; - std::int64_t syncQPCTime; - std::int64_t syncGPUTime; + std::int64_t syncQPCTime; + std::int64_t syncGPUTime; }; struct DXGI_RGB @@ -325,16 +325,16 @@ namespace REX::W32 struct DXGI_GAMMA_CONTROL_CAPABILITIES { - BOOL scaleAndOffsetSupported; - float maxConvertedValue; - float minConvertedValue; + BOOL scaleAndOffsetSupported; + float maxConvertedValue; + float minConvertedValue; std::uint32_t numGammaControlPoints; - float controlPointPositions[1025]; + float controlPointPositions[1025]; }; struct DXGI_MAPPED_RECT { - std::int32_t pitch; + std::int32_t pitch; std::uint8_t* bits; }; @@ -346,21 +346,21 @@ namespace REX::W32 struct DXGI_MODE_DESC { - std::uint32_t width; - std::uint32_t height; - DXGI_RATIONAL refreshRate; - DXGI_FORMAT format; + std::uint32_t width; + std::uint32_t height; + DXGI_RATIONAL refreshRate; + DXGI_FORMAT format; DXGI_MODE_SCANLINE_ORDER scanlineOrdering; - DXGI_MODE_SCALING scaling; + DXGI_MODE_SCALING scaling; }; struct DXGI_OUTPUT_DESC { - wchar_t deviceName[32]; - RECT desktopCoordinates; - BOOL attachedToDesktop; + wchar_t deviceName[32]; + RECT desktopCoordinates; + BOOL attachedToDesktop; DXGI_MODE_ROTATION rotation; - HMONITOR monitor; + HMONITOR monitor; }; struct DXGI_SAMPLE_DESC @@ -376,22 +376,22 @@ namespace REX::W32 struct DXGI_SURFACE_DESC { - std::uint32_t width; - std::uint32_t height; - DXGI_FORMAT format; + std::uint32_t width; + std::uint32_t height; + DXGI_FORMAT format; DXGI_SAMPLE_DESC sampleDesc; }; struct DXGI_SWAP_CHAIN_DESC { - DXGI_MODE_DESC bufferDesc; + DXGI_MODE_DESC bufferDesc; DXGI_SAMPLE_DESC sampleDesc; - DXGI_USAGE bufferUsage; - std::uint32_t bufferCount; - HWND outputWindow; - BOOL windowed; + DXGI_USAGE bufferUsage; + std::uint32_t bufferCount; + HWND outputWindow; + BOOL windowed; DXGI_SWAP_EFFECT swapEffect; - std::uint32_t flags; + std::uint32_t flags; }; } @@ -465,7 +465,7 @@ namespace REX::W32 virtual HRESULT FindClosestMatchingMode(const DXGI_MODE_DESC* a_modeToMatch, DXGI_MODE_DESC* a_closestMatch, IUnknown* a_concernedDevice) = 0; virtual HRESULT WaitForVBlank(void) = 0; virtual HRESULT TakeOwnership(IUnknown* a_device, BOOL a_exclusive) = 0; - virtual void ReleaseOwnership(void) = 0; + virtual void ReleaseOwnership(void) = 0; virtual HRESULT GetGammaControlCapabilities(DXGI_GAMMA_CONTROL_CAPABILITIES* a_gammaCaps) = 0; virtual HRESULT SetGammaControl(const DXGI_GAMMA_CONTROL* a_array) = 0; virtual HRESULT GetGammaControl(DXGI_GAMMA_CONTROL* a_array) = 0; @@ -503,7 +503,7 @@ namespace REX::W32 IDXGIFactory1 : public IDXGIFactory { virtual HRESULT EnumAdapters1(std::uint32_t a_adapterSize, IDXGIAdapter1** a_adapter) = 0; - virtual BOOL IsCurrent(void) = 0; + virtual BOOL IsCurrent(void) = 0; }; struct __declspec(novtable, uuid("54ec77fa-1377-44e6-8c32-88fd5f44c84c")) diff --git a/CommonLibF4/include/REX/W32/DXGI_2.h b/CommonLibF4/include/REX/W32/DXGI_2.h index aca5932d..e3c58e7c 100644 --- a/CommonLibF4/include/REX/W32/DXGI_2.h +++ b/CommonLibF4/include/REX/W32/DXGI_2.h @@ -70,60 +70,60 @@ namespace REX::W32 { struct DXGI_ADAPTER_DESC2 { - wchar_t description[128]; - std::uint32_t vendorID; - std::uint32_t deviceID; - std::uint32_t subSysID; - std::uint32_t revision; - std::size_t dedicatedVideoMemory; - std::size_t dedicatedSystemMemory; - std::size_t sharedSystemMemory; - LUID adapterLUID; - std::uint32_t flags; + wchar_t description[128]; + std::uint32_t vendorID; + std::uint32_t deviceID; + std::uint32_t subSysID; + std::uint32_t revision; + std::size_t dedicatedVideoMemory; + std::size_t dedicatedSystemMemory; + std::size_t sharedSystemMemory; + LUID adapterLUID; + std::uint32_t flags; DXGI_GRAPHICS_PREEMPTION_GRANULARITY graphicsPreemptionGranularity; - DXGI_COMPUTE_PREEMPTION_GRANULARITY computePreemptionGranularity; + DXGI_COMPUTE_PREEMPTION_GRANULARITY computePreemptionGranularity; }; struct DXGI_MODE_DESC1 { - std::uint32_t width; - std::uint32_t height; - DXGI_RATIONAL refreshRate; - DXGI_FORMAT format; + std::uint32_t width; + std::uint32_t height; + DXGI_RATIONAL refreshRate; + DXGI_FORMAT format; DXGI_MODE_SCANLINE_ORDER scanlineOrdering; - DXGI_MODE_SCALING scaling; - BOOL stereo; + DXGI_MODE_SCALING scaling; + BOOL stereo; }; struct DXGI_OUTDUPL_DESC { - DXGI_MODE_DESC modeDesc; + DXGI_MODE_DESC modeDesc; DXGI_MODE_ROTATION rotation; - BOOL desktopImageInSystemMemory; + BOOL desktopImageInSystemMemory; }; struct DXGI_OUTDUPL_POINTER_POSITION { POINT position; - BOOL visible; + BOOL visible; }; struct DXGI_OUTDUPL_FRAME_INFO { - std::int64_t lastPresentTime; - std::int64_t lastMouseUpdateTime; - std::uint32_t accumulatedFrames; - BOOL rectsCoalesced; - BOOL protectedContentMaskedOut; + std::int64_t lastPresentTime; + std::int64_t lastMouseUpdateTime; + std::uint32_t accumulatedFrames; + BOOL rectsCoalesced; + BOOL protectedContentMaskedOut; DXGI_OUTDUPL_POINTER_POSITION pointerPosition; - std::uint32_t totalMetadataBufferSize; - std::uint32_t pointerShapeBufferSize; + std::uint32_t totalMetadataBufferSize; + std::uint32_t pointerShapeBufferSize; }; struct DXGI_OUTDUPL_MOVE_RECT { POINT sourcePoint; - RECT destinationRect; + RECT destinationRect; }; struct DXGI_OUTDUPL_POINTER_SHAPE_INFO @@ -132,38 +132,38 @@ namespace REX::W32 std::uint32_t width; std::uint32_t height; std::uint32_t pitch; - POINT hotSpot; + POINT hotSpot; }; struct DXGI_PRESENT_PARAMETERS { std::uint32_t dirtyRectsCount; - RECT* dirtyRects; - RECT* scrollRect; - POINT* scrollOffset; + RECT* dirtyRects; + RECT* scrollRect; + POINT* scrollOffset; }; struct DXGI_SWAP_CHAIN_DESC1 { - std::uint32_t width; - std::uint32_t height; - DXGI_FORMAT format; - BOOL stereo; + std::uint32_t width; + std::uint32_t height; + DXGI_FORMAT format; + BOOL stereo; DXGI_SAMPLE_DESC sampleDesc; - DXGI_USAGE bufferUsage; - std::uint32_t bufferCount; - DXGI_SCALING scaling; + DXGI_USAGE bufferUsage; + std::uint32_t bufferCount; + DXGI_SCALING scaling; DXGI_SWAP_EFFECT swapEffect; - DXGI_ALPHA_MODE alphaMode; - std::uint32_t flags; + DXGI_ALPHA_MODE alphaMode; + std::uint32_t flags; }; struct DXGI_SWAP_CHAIN_FULLSCREEN_DESC { - DXGI_RATIONAL refreshRate; + DXGI_RATIONAL refreshRate; DXGI_MODE_SCANLINE_ORDER scanlineOrdering; - DXGI_MODE_SCALING scaling; - BOOL windowed; + DXGI_MODE_SCALING scaling; + BOOL windowed; }; } @@ -193,16 +193,16 @@ namespace REX::W32 struct __declspec(novtable, uuid("50C83A1C-E072-4C48-87B0-3630FA36A6D0")) IDXGIFactory2 : public IDXGIFactory1 { - virtual BOOL IsWindowedStereoEnabled(void) = 0; + virtual BOOL IsWindowedStereoEnabled(void) = 0; virtual HRESULT CreateSwapChainForHwnd(IUnknown* a_device, HWND a_wnd, const DXGI_SWAP_CHAIN_DESC1* a_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC* a_fullscreenDesc, IDXGIOutput* a_restrictToOutput, IDXGISwapChain1** a_swapChain) = 0; virtual HRESULT CreateSwapChainForCoreWindow(IUnknown* a_device, IUnknown* a_window, const DXGI_SWAP_CHAIN_DESC1* a_desc, IDXGIOutput* a_restrictToOutput, IDXGISwapChain1** a_swapChain) = 0; virtual HRESULT GetSharedResourceAdapterLuid(HANDLE a_resource, LUID* a_luid) = 0; virtual HRESULT RegisterStereoStatusWindow(HWND a_wnd, std::uint32_t a_msg, std::uint32_t* a_cookie) = 0; virtual HRESULT RegisterStereoStatusEvent(HANDLE a_event, std::uint32_t* a_cookie) = 0; - virtual void UnregisterStereoStatus(std::uint32_t a_cookie) = 0; + virtual void UnregisterStereoStatus(std::uint32_t a_cookie) = 0; virtual HRESULT RegisterOcclusionStatusWindow(HWND a_wnd, std::uint32_t a_msg, std::uint32_t* a_cookie) = 0; virtual HRESULT RegisterOcclusionStatusEvent(HANDLE a_event, std::uint32_t* a_cookie) = 0; - virtual void UnregisterOcclusionStatus(std::uint32_t dwCookie) = 0; + virtual void UnregisterOcclusionStatus(std::uint32_t dwCookie) = 0; virtual HRESULT CreateSwapChainForComposition(IUnknown* a_device, const DXGI_SWAP_CHAIN_DESC1* a_desc, IDXGIOutput* a_restrictToOutput, IDXGISwapChain1** a_swapChain) = 0; }; @@ -218,7 +218,7 @@ namespace REX::W32 struct __declspec(novtable, uuid("191CFAC3-A341-470D-B26E-A864F428319C")) IDXGIOutputDuplication : public IDXGIObject { - virtual void GetDesc(DXGI_OUTDUPL_DESC* a_desc) = 0; + virtual void GetDesc(DXGI_OUTDUPL_DESC* a_desc) = 0; virtual HRESULT AcquireNextFrame(std::uint32_t a_timeoutInMilliseconds, DXGI_OUTDUPL_FRAME_INFO* a_frameInfo, IDXGIResource** a_desktopResource) = 0; virtual HRESULT GetFrameDirtyRects(std::uint32_t a_dirtyRectsBufferSize, RECT* a_dirtyRectsBuffer, std::uint32_t* a_dirtyRectsBufferSizeRequired) = 0; virtual HRESULT GetFrameMoveRects(std::uint32_t a_moveRectsBufferSize, DXGI_OUTDUPL_MOVE_RECT* a_moveRectBuffer, std::uint32_t* a_moveRectsBufferSizeRequired) = 0; @@ -249,7 +249,7 @@ namespace REX::W32 virtual HRESULT GetHwnd(HWND* a_wnd) = 0; virtual HRESULT GetCoreWindow(const IID& a_iid, void** a_unk) = 0; virtual HRESULT Present1(std::uint32_t a_syncInterval, std::uint32_t a_presentFlags, const DXGI_PRESENT_PARAMETERS* a_presentParameters) = 0; - virtual BOOL IsTemporaryMonoSupported(void) = 0; + virtual BOOL IsTemporaryMonoSupported(void) = 0; virtual HRESULT GetRestrictToOutput(IDXGIOutput** a_restrictToOutput) = 0; virtual HRESULT SetBackgroundColor(const DXGI_RGBA* a_color) = 0; virtual HRESULT GetBackgroundColor(DXGI_RGBA* a_color) = 0; diff --git a/CommonLibF4/include/REX/W32/DXGI_3.h b/CommonLibF4/include/REX/W32/DXGI_3.h index 04333f6d..2f47affe 100644 --- a/CommonLibF4/include/REX/W32/DXGI_3.h +++ b/CommonLibF4/include/REX/W32/DXGI_3.h @@ -47,13 +47,13 @@ namespace REX::W32 struct DXGI_FRAME_STATISTICS_MEDIA { - std::uint32_t presentCount; - std::uint32_t presentRefreshCount; - std::uint32_t syncRefreshCount; - std::int64_t syncQPCTime; - std::int64_t syncGPUTime; + std::uint32_t presentCount; + std::uint32_t presentRefreshCount; + std::uint32_t syncRefreshCount; + std::int64_t syncQPCTime; + std::int64_t syncGPUTime; DXGI_FRAME_PRESENTATION_MODE compositionMode; - std::uint32_t approvedPresentDuration; + std::uint32_t approvedPresentDuration; }; struct DXGI_MATRIX_3X2_F @@ -72,14 +72,14 @@ namespace REX::W32 struct __declspec(novtable, uuid("2633066B-4514-4C7A-8FD8-12EA98059D18")) IDXGIDecodeSwapChain : public IUnknown { - virtual HRESULT PresentBuffer(std::uint32_t a_bufferToPresent, std::uint32_t a_syncInterval, std::uint32_t a_flags) = 0; - virtual HRESULT SetSourceRect(const RECT* a_rect) = 0; - virtual HRESULT SetTargetRect(const RECT* a_rect) = 0; - virtual HRESULT SetDestSize(std::uint32_t a_width, std::uint32_t a_height) = 0; - virtual HRESULT GetSourceRect(RECT* a_rect) = 0; - virtual HRESULT GetTargetRect(RECT* a_rect) = 0; - virtual HRESULT GetDestSize(std::uint32_t* a_width, std::uint32_t* a_height) = 0; - virtual HRESULT SetColorSpace(DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS a_colorSpace) = 0; + virtual HRESULT PresentBuffer(std::uint32_t a_bufferToPresent, std::uint32_t a_syncInterval, std::uint32_t a_flags) = 0; + virtual HRESULT SetSourceRect(const RECT* a_rect) = 0; + virtual HRESULT SetTargetRect(const RECT* a_rect) = 0; + virtual HRESULT SetDestSize(std::uint32_t a_width, std::uint32_t a_height) = 0; + virtual HRESULT GetSourceRect(RECT* a_rect) = 0; + virtual HRESULT GetTargetRect(RECT* a_rect) = 0; + virtual HRESULT GetDestSize(std::uint32_t* a_width, std::uint32_t* a_height) = 0; + virtual HRESULT SetColorSpace(DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS a_colorSpace) = 0; virtual DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS GetColorSpace(void) = 0; }; @@ -121,7 +121,7 @@ namespace REX::W32 virtual HRESULT GetSourceSize(std::uint32_t* a_width, std::uint32_t* a_height) = 0; virtual HRESULT SetMaximumFrameLatency(std::uint32_t a_maxLatency) = 0; virtual HRESULT GetMaximumFrameLatency(std::uint32_t* a_maxLatency) = 0; - virtual HANDLE GetFrameLatencyWaitableObject(void) = 0; + virtual HANDLE GetFrameLatencyWaitableObject(void) = 0; virtual HRESULT SetMatrixTransform(const DXGI_MATRIX_3X2_F* a_matrix) = 0; virtual HRESULT GetMatrixTransform(DXGI_MATRIX_3X2_F* a_matrix) = 0; }; diff --git a/CommonLibF4/include/REX/W32/DXGI_4.h b/CommonLibF4/include/REX/W32/DXGI_4.h index 5e60b973..7e3c1629 100644 --- a/CommonLibF4/include/REX/W32/DXGI_4.h +++ b/CommonLibF4/include/REX/W32/DXGI_4.h @@ -47,11 +47,11 @@ namespace REX::W32 IDXGIAdapter3 : public IDXGIAdapter2 { virtual HRESULT RegisterHardwareContentProtectionTeardownStatusEvent(HANDLE a_event, std::uint32_t* a_cookie) = 0; - virtual void UnregisterHardwareContentProtectionTeardownStatus(std::uint32_t a_cookie) = 0; + virtual void UnregisterHardwareContentProtectionTeardownStatus(std::uint32_t a_cookie) = 0; virtual HRESULT QueryVideoMemoryInfo(std::uint32_t a_nodeIndex, DXGI_MEMORY_SEGMENT_GROUP a_memorySegmentGroup, DXGI_QUERY_VIDEO_MEMORY_INFO* a_videoMemoryInfo) = 0; virtual HRESULT SetVideoMemoryReservation(std::uint32_t a_nodeIndex, DXGI_MEMORY_SEGMENT_GROUP a_memorySegmentGroup, std::uint64_t a_reservation) = 0; virtual HRESULT RegisterVideoMemoryBudgetChangeNotificationEvent(HANDLE a_event, std::uint32_t* a_cookie) = 0; - virtual void UnregisterVideoMemoryBudgetChangeNotification(std::uint32_t a_cookie) = 0; + virtual void UnregisterVideoMemoryBudgetChangeNotification(std::uint32_t a_cookie) = 0; }; struct __declspec(novtable, uuid("1BC6EA02-EF36-464F-BF0C-21CA39E5168A")) @@ -71,9 +71,9 @@ namespace REX::W32 IDXGISwapChain3 : public IDXGISwapChain2 { virtual std::uint32_t GetCurrentBackBufferIndex(void) = 0; - virtual HRESULT CheckColorSpaceSupport(DXGI_COLOR_SPACE_TYPE a_colorSpace, std::uint32_t* a_colorSpaceSupport) = 0; - virtual HRESULT SetColorSpace1(DXGI_COLOR_SPACE_TYPE a_colorSpace) = 0; - virtual HRESULT ResizeBuffers1(std::uint32_t a_bufferCount, std::uint32_t a_width, std::uint32_t a_height, DXGI_FORMAT a_format, std::uint32_t a_swapChainFlags, const std::uint32_t* a_creationNodeMask, IUnknown* const* a_presentQueue) = 0; + virtual HRESULT CheckColorSpaceSupport(DXGI_COLOR_SPACE_TYPE a_colorSpace, std::uint32_t* a_colorSpaceSupport) = 0; + virtual HRESULT SetColorSpace1(DXGI_COLOR_SPACE_TYPE a_colorSpace) = 0; + virtual HRESULT ResizeBuffers1(std::uint32_t a_bufferCount, std::uint32_t a_width, std::uint32_t a_height, DXGI_FORMAT a_format, std::uint32_t a_swapChainFlags, const std::uint32_t* a_creationNodeMask, IUnknown* const* a_presentQueue) = 0; }; } diff --git a/CommonLibF4/include/REX/W32/DXGI_6.h b/CommonLibF4/include/REX/W32/DXGI_6.h index 1d291599..c56917d2 100644 --- a/CommonLibF4/include/REX/W32/DXGI_6.h +++ b/CommonLibF4/include/REX/W32/DXGI_6.h @@ -43,36 +43,36 @@ namespace REX::W32 { struct DXGI_ADAPTER_DESC3 { - wchar_t description[128]; - std::uint32_t vendorID; - std::uint32_t deviceID; - std::uint32_t subSysID; - std::uint32_t revision; - std::size_t dedicatedVideoMemory; - std::size_t dedicatedSystemMemory; - std::size_t sharedSystemMemory; - LUID adapterLUID; - DXGI_ADAPTER_FLAG3 flags; + wchar_t description[128]; + std::uint32_t vendorID; + std::uint32_t deviceID; + std::uint32_t subSysID; + std::uint32_t revision; + std::size_t dedicatedVideoMemory; + std::size_t dedicatedSystemMemory; + std::size_t sharedSystemMemory; + LUID adapterLUID; + DXGI_ADAPTER_FLAG3 flags; DXGI_GRAPHICS_PREEMPTION_GRANULARITY graphicsPreemptionGranularity; - DXGI_COMPUTE_PREEMPTION_GRANULARITY computePreemptionGranularity; + DXGI_COMPUTE_PREEMPTION_GRANULARITY computePreemptionGranularity; }; struct DXGI_OUTPUT_DESC1 { - wchar_t deviceName[32]; - RECT desktopCoordinates; - BOOL attachedToDesktop; - DXGI_MODE_ROTATION rotation; - HMONITOR monitor; - std::uint32_t bitsPerColor; + wchar_t deviceName[32]; + RECT desktopCoordinates; + BOOL attachedToDesktop; + DXGI_MODE_ROTATION rotation; + HMONITOR monitor; + std::uint32_t bitsPerColor; DXGI_COLOR_SPACE_TYPE colorSpace; - float redPrimary[2]; - float greenPrimary[2]; - float bluePrimary[2]; - float whitePoint[2]; - float minLuminance; - float maxLuminance; - float maxFullFrameLuminance; + float redPrimary[2]; + float greenPrimary[2]; + float bluePrimary[2]; + float whitePoint[2]; + float minLuminance; + float maxLuminance; + float maxFullFrameLuminance; }; } diff --git a/CommonLibF4/include/REX/W32/KERNEL32.h b/CommonLibF4/include/REX/W32/KERNEL32.h index 86c7ad9d..38b36a38 100644 --- a/CommonLibF4/include/REX/W32/KERNEL32.h +++ b/CommonLibF4/include/REX/W32/KERNEL32.h @@ -174,7 +174,7 @@ namespace REX::W32 std::uint16_t oemid; std::uint16_t oeminfo; std::uint16_t res2[10]; - std::int32_t lfanew; + std::int32_t lfanew; }; static_assert(sizeof(IMAGE_DOS_HEADER) == 0x40); @@ -193,7 +193,7 @@ namespace REX::W32 struct IMAGE_IMPORT_BY_NAME { std::uint16_t hint; - char name[1]; + char name[1]; }; static_assert(sizeof(IMAGE_IMPORT_BY_NAME) == 0x4); @@ -214,43 +214,43 @@ namespace REX::W32 struct IMAGE_OPTIONAL_HEADER64 { - std::uint16_t magic; - std::uint8_t linkerVersionMajor; - std::uint8_t linkerVersionMinor; - std::uint32_t codeSize; - std::uint32_t initializedDataSize; - std::uint32_t uninitializedDataSize; - std::uint32_t entryPointAddress; - std::uint32_t codeBase; - std::uint64_t imageBase; - std::uint32_t sectionAlignment; - std::uint32_t fileAlignment; - std::uint16_t osVersionMajor; - std::uint16_t osVersionMinor; - std::uint16_t imageVersionMajor; - std::uint16_t imageVersionMinor; - std::uint16_t subsystemVersionMajor; - std::uint16_t subsystemVersionMinor; - std::uint32_t win32Version; - std::uint32_t imageSize; - std::uint32_t headersSize; - std::uint32_t checksum; - std::uint16_t subsystem; - std::uint16_t dllCharacteristics; - std::uint64_t stackReserveSize; - std::uint64_t stackCommitSize; - std::uint64_t heapReserveSize; - std::uint64_t heapCommitSize; - std::uint32_t loaderFlags; - std::uint32_t rvaAndSizesCount; + std::uint16_t magic; + std::uint8_t linkerVersionMajor; + std::uint8_t linkerVersionMinor; + std::uint32_t codeSize; + std::uint32_t initializedDataSize; + std::uint32_t uninitializedDataSize; + std::uint32_t entryPointAddress; + std::uint32_t codeBase; + std::uint64_t imageBase; + std::uint32_t sectionAlignment; + std::uint32_t fileAlignment; + std::uint16_t osVersionMajor; + std::uint16_t osVersionMinor; + std::uint16_t imageVersionMajor; + std::uint16_t imageVersionMinor; + std::uint16_t subsystemVersionMajor; + std::uint16_t subsystemVersionMinor; + std::uint32_t win32Version; + std::uint32_t imageSize; + std::uint32_t headersSize; + std::uint32_t checksum; + std::uint16_t subsystem; + std::uint16_t dllCharacteristics; + std::uint64_t stackReserveSize; + std::uint64_t stackCommitSize; + std::uint64_t heapReserveSize; + std::uint64_t heapCommitSize; + std::uint32_t loaderFlags; + std::uint32_t rvaAndSizesCount; IMAGE_DATA_DIRECTORY dataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; }; static_assert(sizeof(IMAGE_OPTIONAL_HEADER64) == 0xF0); struct IMAGE_NT_HEADERS64 { - std::uint32_t signature; - IMAGE_FILE_HEADER fileHeader; + std::uint32_t signature; + IMAGE_FILE_HEADER fileHeader; IMAGE_OPTIONAL_HEADER64 optionalHeader; }; static_assert(sizeof(IMAGE_NT_HEADERS64) == 0x108); @@ -288,11 +288,11 @@ namespace REX::W32 struct MEMORY_BASIC_INFORMATION { - void* baseAddress; - void* allocationBase; + void* baseAddress; + void* allocationBase; std::uint32_t allocationProtect; std::uint16_t partitionID; - std::size_t regionSize; + std::size_t regionSize; std::uint32_t state; std::uint32_t protect; std::uint32_t type; @@ -305,14 +305,14 @@ namespace REX::W32 std::uint32_t nlsVersion; std::uint32_t definedVersion; std::uint32_t effectiveID; - GUID guidCustomVersion; + GUID guidCustomVersion; }; static_assert(sizeof(NLSVERSIONINFO) == 0x20); struct PROCESS_INFORMATION { - void* process; - void* thread; + void* process; + void* thread; std::uint32_t processID; std::uint32_t threadID; }; @@ -321,9 +321,9 @@ namespace REX::W32 struct STARTUPINFOA { std::uint32_t size; - char* reserved0; - char* desktop; - char* title; + char* reserved0; + char* desktop; + char* title; std::uint32_t x; std::uint32_t y; std::uint32_t xSize; @@ -335,18 +335,18 @@ namespace REX::W32 std::uint16_t showWindow; std::uint16_t reserved1; std::uint8_t* reserved2; - void* stdIn; - void* stdOut; - void* stdErr; + void* stdIn; + void* stdOut; + void* stdErr; }; static_assert(sizeof(STARTUPINFOA) == 0x68); struct STARTUPINFOW { std::uint32_t size; - wchar_t* reserved0; - wchar_t* desktop; - wchar_t* title; + wchar_t* reserved0; + wchar_t* desktop; + wchar_t* title; std::uint32_t x; std::uint32_t y; std::uint32_t xSize; @@ -358,9 +358,9 @@ namespace REX::W32 std::uint16_t showWindow; std::uint16_t reserved1; std::uint8_t* reserved2; - void* stdIn; - void* stdOut; - void* stdErr; + void* stdIn; + void* stdOut; + void* stdErr; }; static_assert(sizeof(STARTUPINFOW) == 0x68); @@ -375,45 +375,45 @@ namespace REX::W32 std::uint16_t reserved; }; }; - std::uint32_t pageSize; - void* appAddressMin; - void* appAddressMax; + std::uint32_t pageSize; + void* appAddressMin; + void* appAddressMax; std::uintptr_t processorActiveMask; - std::uint32_t processorCount; - std::uint32_t processorType; - std::uint32_t allocationGranularity; - std::uint16_t processorLevel; - std::uint16_t processorRevision; + std::uint32_t processorCount; + std::uint32_t processorType; + std::uint32_t allocationGranularity; + std::uint16_t processorLevel; + std::uint16_t processorRevision; }; static_assert(sizeof(SYSTEM_INFO) == 0x30); struct WIN32_FIND_DATAA { std::uint32_t fileAttributes; - FILETIME creationTime; - FILETIME lastAccessTime; - FILETIME lastWriteTime; + FILETIME creationTime; + FILETIME lastAccessTime; + FILETIME lastWriteTime; std::uint32_t fileSizeHi; std::uint32_t fileSizeLo; std::uint32_t reserved0; std::uint32_t reserved1; - char fileName[MAX_PATH]; - char fileNameAlt[14]; + char fileName[MAX_PATH]; + char fileNameAlt[14]; }; static_assert(sizeof(WIN32_FIND_DATAA) == 0x140); struct WIN32_FIND_DATAW { std::uint32_t fileAttributes; - FILETIME creationTime; - FILETIME lastAccessTime; - FILETIME lastWriteTime; + FILETIME creationTime; + FILETIME lastAccessTime; + FILETIME lastWriteTime; std::uint32_t fileSizeHi; std::uint32_t fileSizeLo; std::uint32_t reserved0; std::uint32_t reserved1; - wchar_t fileName[MAX_PATH]; - wchar_t fileNameAlt[14]; + wchar_t fileName[MAX_PATH]; + wchar_t fileNameAlt[14]; }; static_assert(sizeof(WIN32_FIND_DATAW) == 0x250); } @@ -425,82 +425,82 @@ namespace REX::W32 namespace REX::W32 { - bool CloseHandle(HANDLE a_handle) noexcept; - HANDLE CreateFileMappingA(HANDLE a_file, SECURITY_ATTRIBUTES* a_attributes, std::uint32_t a_protect, std::uint32_t a_maxSizeHigh, std::uint32_t a_maxSizeLow, const char* a_name) noexcept; - HANDLE CreateFileMappingW(HANDLE a_file, SECURITY_ATTRIBUTES* a_attributes, std::uint32_t a_protect, std::uint32_t a_maxSizeHigh, std::uint32_t a_maxSizeLow, const wchar_t* a_name) noexcept; - bool CreateProcessA(const char* a_name, char* a_cmd, SECURITY_ATTRIBUTES* a_procAttr, SECURITY_ATTRIBUTES* a_threadAttr, bool a_inheritHandles, std::uint32_t a_flags, void* a_env, const char* a_curDir, STARTUPINFOA* a_startInfo, PROCESS_INFORMATION* a_procInfo) noexcept; - bool CreateProcessW(const wchar_t* a_name, wchar_t* a_cmd, SECURITY_ATTRIBUTES* a_procAttr, SECURITY_ATTRIBUTES* a_threadAttr, bool a_inheritHandles, std::uint32_t a_flags, void* a_env, const wchar_t* a_curDir, STARTUPINFOW* a_startInfo, PROCESS_INFORMATION* a_procInfo) noexcept; - HANDLE CreateRemoteThread(HANDLE a_process, SECURITY_ATTRIBUTES* a_threadAttr, std::size_t a_stackSize, THREAD_START_ROUTINE* a_startAddr, void* a_param, std::uint32_t a_flags, std::uint32_t* a_threadID) noexcept; - HANDLE CreateSemaphoreA(SECURITY_ATTRIBUTES* a_semaphoreAttr, std::int32_t a_initCount, std::int32_t a_maxCount, const char* a_name); - HANDLE CreateThread(SECURITY_ATTRIBUTES* a_threadAttr, std::size_t a_stackSize, THREAD_START_ROUTINE* a_startAddr, void* a_param, std::uint32_t a_flags, std::uint32_t* a_threadID) noexcept; - void DeleteCriticalSection(CRITICAL_SECTION* a_criticalSection); - void EnterCriticalSection(CRITICAL_SECTION* a_criticalSection); - std::uint32_t ExpandEnvironmentStrings(const char* a_src, char* a_dst, std::uint32_t a_dstLen) noexcept; - std::uint32_t ExpandEnvironmentStrings(const wchar_t* a_src, wchar_t* a_dst, std::uint32_t a_dstLen) noexcept; - bool FindClose(HANDLE a_file) noexcept; - HANDLE FindFirstFileA(const char* a_name, WIN32_FIND_DATAA* a_data) noexcept; - HANDLE FindFirstFileW(const wchar_t* a_name, WIN32_FIND_DATAW* a_data) noexcept; - bool FindNextFileA(HANDLE a_file, WIN32_FIND_DATAA* a_data) noexcept; - bool FindNextFileW(HANDLE a_file, WIN32_FIND_DATAW* a_data) noexcept; - bool FlushInstructionCache(HANDLE a_process, const void* a_baseAddr, std::size_t a_size) noexcept; - bool FreeLibrary(HMODULE a_module) noexcept; - HMODULE GetCurrentModule() noexcept; - HANDLE GetCurrentProcess() noexcept; - std::uint32_t GetCurrentThreadId() noexcept; - std::uint32_t GetEnvironmentVariableA(const char* a_name, char* a_buf, std::uint32_t a_bufLen) noexcept; - std::uint32_t GetEnvironmentVariableW(const wchar_t* a_name, wchar_t* a_buf, std::uint32_t a_bufLen) noexcept; - std::uint32_t GetLastError() noexcept; - std::uint32_t GetModuleFileNameA(HMODULE a_module, char* a_name, std::uint32_t a_nameLen) noexcept; - std::uint32_t GetModuleFileNameW(HMODULE a_module, wchar_t* a_name, std::uint32_t a_nameLen) noexcept; - HMODULE GetModuleHandleA(const char* a_name) noexcept; - HMODULE GetModuleHandleW(const wchar_t* a_name) noexcept; - std::uint32_t GetPrivateProfileStringA(const char* a_app, const char* a_key, const char* a_default, char* a_buf, std::uint32_t a_bufLen, const char* a_name) noexcept; - std::uint32_t GetPrivateProfileStringW(const wchar_t* a_app, const wchar_t* a_key, const wchar_t* a_default, wchar_t* a_buf, std::uint32_t a_bufLen, const wchar_t* a_name) noexcept; - void* GetProcAddress(HMODULE a_module, const char* a_name) noexcept; - void GetSystemInfo(SYSTEM_INFO* a_info) noexcept; - bool IMAGE_SNAP_BY_ORDINAL64(std::uint64_t a_ordinal) noexcept; + bool CloseHandle(HANDLE a_handle) noexcept; + HANDLE CreateFileMappingA(HANDLE a_file, SECURITY_ATTRIBUTES* a_attributes, std::uint32_t a_protect, std::uint32_t a_maxSizeHigh, std::uint32_t a_maxSizeLow, const char* a_name) noexcept; + HANDLE CreateFileMappingW(HANDLE a_file, SECURITY_ATTRIBUTES* a_attributes, std::uint32_t a_protect, std::uint32_t a_maxSizeHigh, std::uint32_t a_maxSizeLow, const wchar_t* a_name) noexcept; + bool CreateProcessA(const char* a_name, char* a_cmd, SECURITY_ATTRIBUTES* a_procAttr, SECURITY_ATTRIBUTES* a_threadAttr, bool a_inheritHandles, std::uint32_t a_flags, void* a_env, const char* a_curDir, STARTUPINFOA* a_startInfo, PROCESS_INFORMATION* a_procInfo) noexcept; + bool CreateProcessW(const wchar_t* a_name, wchar_t* a_cmd, SECURITY_ATTRIBUTES* a_procAttr, SECURITY_ATTRIBUTES* a_threadAttr, bool a_inheritHandles, std::uint32_t a_flags, void* a_env, const wchar_t* a_curDir, STARTUPINFOW* a_startInfo, PROCESS_INFORMATION* a_procInfo) noexcept; + HANDLE CreateRemoteThread(HANDLE a_process, SECURITY_ATTRIBUTES* a_threadAttr, std::size_t a_stackSize, THREAD_START_ROUTINE* a_startAddr, void* a_param, std::uint32_t a_flags, std::uint32_t* a_threadID) noexcept; + HANDLE CreateSemaphoreA(SECURITY_ATTRIBUTES* a_semaphoreAttr, std::int32_t a_initCount, std::int32_t a_maxCount, const char* a_name); + HANDLE CreateThread(SECURITY_ATTRIBUTES* a_threadAttr, std::size_t a_stackSize, THREAD_START_ROUTINE* a_startAddr, void* a_param, std::uint32_t a_flags, std::uint32_t* a_threadID) noexcept; + void DeleteCriticalSection(CRITICAL_SECTION* a_criticalSection); + void EnterCriticalSection(CRITICAL_SECTION* a_criticalSection); + std::uint32_t ExpandEnvironmentStrings(const char* a_src, char* a_dst, std::uint32_t a_dstLen) noexcept; + std::uint32_t ExpandEnvironmentStrings(const wchar_t* a_src, wchar_t* a_dst, std::uint32_t a_dstLen) noexcept; + bool FindClose(HANDLE a_file) noexcept; + HANDLE FindFirstFileA(const char* a_name, WIN32_FIND_DATAA* a_data) noexcept; + HANDLE FindFirstFileW(const wchar_t* a_name, WIN32_FIND_DATAW* a_data) noexcept; + bool FindNextFileA(HANDLE a_file, WIN32_FIND_DATAA* a_data) noexcept; + bool FindNextFileW(HANDLE a_file, WIN32_FIND_DATAW* a_data) noexcept; + bool FlushInstructionCache(HANDLE a_process, const void* a_baseAddr, std::size_t a_size) noexcept; + bool FreeLibrary(HMODULE a_module) noexcept; + HMODULE GetCurrentModule() noexcept; + HANDLE GetCurrentProcess() noexcept; + std::uint32_t GetCurrentThreadId() noexcept; + std::uint32_t GetEnvironmentVariableA(const char* a_name, char* a_buf, std::uint32_t a_bufLen) noexcept; + std::uint32_t GetEnvironmentVariableW(const wchar_t* a_name, wchar_t* a_buf, std::uint32_t a_bufLen) noexcept; + std::uint32_t GetLastError() noexcept; + std::uint32_t GetModuleFileNameA(HMODULE a_module, char* a_name, std::uint32_t a_nameLen) noexcept; + std::uint32_t GetModuleFileNameW(HMODULE a_module, wchar_t* a_name, std::uint32_t a_nameLen) noexcept; + HMODULE GetModuleHandleA(const char* a_name) noexcept; + HMODULE GetModuleHandleW(const wchar_t* a_name) noexcept; + std::uint32_t GetPrivateProfileStringA(const char* a_app, const char* a_key, const char* a_default, char* a_buf, std::uint32_t a_bufLen, const char* a_name) noexcept; + std::uint32_t GetPrivateProfileStringW(const wchar_t* a_app, const wchar_t* a_key, const wchar_t* a_default, wchar_t* a_buf, std::uint32_t a_bufLen, const wchar_t* a_name) noexcept; + void* GetProcAddress(HMODULE a_module, const char* a_name) noexcept; + void GetSystemInfo(SYSTEM_INFO* a_info) noexcept; + bool IMAGE_SNAP_BY_ORDINAL64(std::uint64_t a_ordinal) noexcept; IMAGE_SECTION_HEADER* IMAGE_FIRST_SECTION(const IMAGE_NT_HEADERS64* a_header) noexcept; - bool InitializeCriticalSectionAndSpinCount(CRITICAL_SECTION* a_criticalSection, std::uint32_t a_spinCount); - std::uint32_t InterlockedCompareExchange(volatile std::uint32_t* a_target, std::uint32_t a_value, std::uint32_t a_compare) noexcept; - std::uint64_t InterlockedCompareExchange64(volatile std::uint64_t* a_target, std::uint64_t a_value, std::uint64_t a_compare) noexcept; - std::uint32_t InterlockedDecrement(volatile std::uint32_t* a_target) noexcept; - std::uint64_t InterlockedDecrement64(volatile std::uint64_t* a_target) noexcept; - std::uint32_t InterlockedExchange(volatile std::uint32_t* a_target, std::uint32_t a_value) noexcept; - std::uint64_t InterlockedExchange64(volatile std::uint64_t* a_target, std::uint64_t a_value) noexcept; - std::uint32_t InterlockedIncrement(volatile std::uint32_t* a_target) noexcept; - std::uint64_t InterlockedIncrement64(volatile std::uint64_t* a_target) noexcept; - bool IsDebuggerPresent() noexcept; - std::int32_t LCMapStringEx(const wchar_t* a_locale, std::uint32_t a_flags, const wchar_t* a_src, std::int32_t a_srcLen, wchar_t* a_dst, std::int32_t a_dstLen, NLSVERSIONINFO* a_info, void* a_reserved, std::intptr_t a_sortHandle) noexcept; - void LeaveCriticalSection(CRITICAL_SECTION* a_criticalSection); - HMODULE LoadLibraryA(const char* a_name) noexcept; - HMODULE LoadLibraryW(const wchar_t* a_name) noexcept; - void* MapViewOfFile(HANDLE a_object, std::uint32_t a_desiredAccess, std::uint32_t a_fileOffsetHi, std::uint32_t a_fileOffsetLo, std::size_t a_numBytes) noexcept; - void* MapViewOfFileEx(HANDLE a_object, std::uint32_t a_desiredAccess, std::uint32_t a_fileOffsetHi, std::uint32_t a_fileOffsetLo, std::size_t a_numBytes, void* a_baseAddr) noexcept; - std::int32_t MultiByteToWideChar(std::uint32_t a_codePage, std::uint32_t a_flags, const char* a_src, std::int32_t a_srcLen, wchar_t* a_dst, std::int32_t a_dstLen) noexcept; - HANDLE OpenFileMappingA(std::uint32_t a_desiredAccess, bool a_inheritHandle, const char* a_name) noexcept; - HANDLE OpenFileMappingW(std::uint32_t a_desiredAccess, bool a_inheritHandle, const wchar_t* a_name) noexcept; - void OutputDebugStringA(const char* a_str) noexcept; - void OutputDebugStringW(const wchar_t* a_str) noexcept; - bool QueryPerformanceCounter(std::int64_t* a_counter) noexcept; - bool QueryPerformanceFrequency(std::int64_t* a_frequency) noexcept; - std::uint32_t ResumeThread(HANDLE a_handle) noexcept; - bool SetEnvironmentVariableA(const char* a_name, const char* a_value) noexcept; - bool SetEnvironmentVariableW(const wchar_t* a_name, const wchar_t* a_value) noexcept; - void Sleep(std::uint32_t a_milliseconds) noexcept; - bool TerminateProcess(HANDLE a_process, std::uint32_t a_exitCode) noexcept; - void* TlsGetValue(std::uint32_t a_index) noexcept; - bool TlsSetValue(std::uint32_t a_index, void* a_value) noexcept; - bool UnmapViewOfFile(const void* a_baseAddress) noexcept; - void* VirtualAlloc(void* a_address, std::size_t a_size, std::uint32_t a_type, std::uint32_t a_protect) noexcept; - void* VirtualAllocEx(HANDLE a_process, void* a_address, std::size_t a_size, std::uint32_t a_type, std::uint32_t a_protect) noexcept; - bool VirtualFree(void* a_address, std::size_t a_size, std::uint32_t a_type) noexcept; - bool VirtualFreeEx(HANDLE a_process, void* a_address, std::size_t a_size, std::uint32_t a_type) noexcept; - bool VirtualProtect(void* a_address, std::size_t a_size, std::uint32_t a_newProtect, std::uint32_t* a_oldProtect) noexcept; - bool VirtualProtectEx(HANDLE a_process, void* a_address, std::size_t a_size, std::uint32_t a_newProtect, std::uint32_t* a_oldProtect) noexcept; - std::size_t VirtualQuery(const void* a_address, MEMORY_BASIC_INFORMATION* a_buf, std::size_t a_bufLen) noexcept; - std::size_t VirtualQueryEx(HANDLE a_process, const void* a_address, MEMORY_BASIC_INFORMATION* a_buf, std::size_t a_bufLen) noexcept; - std::uint32_t WaitForSingleObject(HANDLE a_handle, std::uint32_t a_milliseconds) noexcept; - std::uint32_t WaitForSingleObjectEx(HANDLE a_handle, std::uint32_t a_milliseconds, bool a_alertable) noexcept; - std::int32_t WideCharToMultiByte(std::uint32_t a_codePage, std::uint32_t a_flags, const wchar_t* a_src, std::int32_t a_srcLen, char* a_dst, std::int32_t a_dstLen, const char* a_default, std::int32_t* a_defaultLen); - bool WriteProcessMemory(HANDLE a_process, void* a_address, const void* a_buf, std::size_t a_bufLen, std::size_t* a_bufWritten) noexcept; + bool InitializeCriticalSectionAndSpinCount(CRITICAL_SECTION* a_criticalSection, std::uint32_t a_spinCount); + std::uint32_t InterlockedCompareExchange(volatile std::uint32_t* a_target, std::uint32_t a_value, std::uint32_t a_compare) noexcept; + std::uint64_t InterlockedCompareExchange64(volatile std::uint64_t* a_target, std::uint64_t a_value, std::uint64_t a_compare) noexcept; + std::uint32_t InterlockedDecrement(volatile std::uint32_t* a_target) noexcept; + std::uint64_t InterlockedDecrement64(volatile std::uint64_t* a_target) noexcept; + std::uint32_t InterlockedExchange(volatile std::uint32_t* a_target, std::uint32_t a_value) noexcept; + std::uint64_t InterlockedExchange64(volatile std::uint64_t* a_target, std::uint64_t a_value) noexcept; + std::uint32_t InterlockedIncrement(volatile std::uint32_t* a_target) noexcept; + std::uint64_t InterlockedIncrement64(volatile std::uint64_t* a_target) noexcept; + bool IsDebuggerPresent() noexcept; + std::int32_t LCMapStringEx(const wchar_t* a_locale, std::uint32_t a_flags, const wchar_t* a_src, std::int32_t a_srcLen, wchar_t* a_dst, std::int32_t a_dstLen, NLSVERSIONINFO* a_info, void* a_reserved, std::intptr_t a_sortHandle) noexcept; + void LeaveCriticalSection(CRITICAL_SECTION* a_criticalSection); + HMODULE LoadLibraryA(const char* a_name) noexcept; + HMODULE LoadLibraryW(const wchar_t* a_name) noexcept; + void* MapViewOfFile(HANDLE a_object, std::uint32_t a_desiredAccess, std::uint32_t a_fileOffsetHi, std::uint32_t a_fileOffsetLo, std::size_t a_numBytes) noexcept; + void* MapViewOfFileEx(HANDLE a_object, std::uint32_t a_desiredAccess, std::uint32_t a_fileOffsetHi, std::uint32_t a_fileOffsetLo, std::size_t a_numBytes, void* a_baseAddr) noexcept; + std::int32_t MultiByteToWideChar(std::uint32_t a_codePage, std::uint32_t a_flags, const char* a_src, std::int32_t a_srcLen, wchar_t* a_dst, std::int32_t a_dstLen) noexcept; + HANDLE OpenFileMappingA(std::uint32_t a_desiredAccess, bool a_inheritHandle, const char* a_name) noexcept; + HANDLE OpenFileMappingW(std::uint32_t a_desiredAccess, bool a_inheritHandle, const wchar_t* a_name) noexcept; + void OutputDebugStringA(const char* a_str) noexcept; + void OutputDebugStringW(const wchar_t* a_str) noexcept; + bool QueryPerformanceCounter(std::int64_t* a_counter) noexcept; + bool QueryPerformanceFrequency(std::int64_t* a_frequency) noexcept; + std::uint32_t ResumeThread(HANDLE a_handle) noexcept; + bool SetEnvironmentVariableA(const char* a_name, const char* a_value) noexcept; + bool SetEnvironmentVariableW(const wchar_t* a_name, const wchar_t* a_value) noexcept; + void Sleep(std::uint32_t a_milliseconds) noexcept; + bool TerminateProcess(HANDLE a_process, std::uint32_t a_exitCode) noexcept; + void* TlsGetValue(std::uint32_t a_index) noexcept; + bool TlsSetValue(std::uint32_t a_index, void* a_value) noexcept; + bool UnmapViewOfFile(const void* a_baseAddress) noexcept; + void* VirtualAlloc(void* a_address, std::size_t a_size, std::uint32_t a_type, std::uint32_t a_protect) noexcept; + void* VirtualAllocEx(HANDLE a_process, void* a_address, std::size_t a_size, std::uint32_t a_type, std::uint32_t a_protect) noexcept; + bool VirtualFree(void* a_address, std::size_t a_size, std::uint32_t a_type) noexcept; + bool VirtualFreeEx(HANDLE a_process, void* a_address, std::size_t a_size, std::uint32_t a_type) noexcept; + bool VirtualProtect(void* a_address, std::size_t a_size, std::uint32_t a_newProtect, std::uint32_t* a_oldProtect) noexcept; + bool VirtualProtectEx(HANDLE a_process, void* a_address, std::size_t a_size, std::uint32_t a_newProtect, std::uint32_t* a_oldProtect) noexcept; + std::size_t VirtualQuery(const void* a_address, MEMORY_BASIC_INFORMATION* a_buf, std::size_t a_bufLen) noexcept; + std::size_t VirtualQueryEx(HANDLE a_process, const void* a_address, MEMORY_BASIC_INFORMATION* a_buf, std::size_t a_bufLen) noexcept; + std::uint32_t WaitForSingleObject(HANDLE a_handle, std::uint32_t a_milliseconds) noexcept; + std::uint32_t WaitForSingleObjectEx(HANDLE a_handle, std::uint32_t a_milliseconds, bool a_alertable) noexcept; + std::int32_t WideCharToMultiByte(std::uint32_t a_codePage, std::uint32_t a_flags, const wchar_t* a_src, std::int32_t a_srcLen, char* a_dst, std::int32_t a_dstLen, const char* a_default, std::int32_t* a_defaultLen); + bool WriteProcessMemory(HANDLE a_process, void* a_address, const void* a_buf, std::size_t a_bufLen, std::size_t* a_bufWritten) noexcept; } diff --git a/CommonLibF4/include/REX/W32/USER32.h b/CommonLibF4/include/REX/W32/USER32.h index f3325fa0..ea624023 100644 --- a/CommonLibF4/include/REX/W32/USER32.h +++ b/CommonLibF4/include/REX/W32/USER32.h @@ -281,13 +281,13 @@ namespace REX::W32 namespace REX::W32 { - bool GetClientRect(HWND a_wnd, RECT* a_rect) noexcept; - std::int32_t GetKeyNameTextA(std::int32_t a_param, char* a_buf, std::int32_t a_bufLen) noexcept; - std::int32_t GetKeyNameTextW(std::int32_t a_param, wchar_t* a_buf, std::int32_t a_bufLen) noexcept; - std::int16_t GetKeyState(std::int32_t a_key) noexcept; - bool GetWindowRect(HWND a_wnd, RECT* a_rect) noexcept; - std::int32_t MessageBoxA(HWND a_wnd, const char* a_text, const char* a_caption, std::uint32_t a_type) noexcept; - std::int32_t MessageBoxW(HWND a_wnd, const wchar_t* a_text, const wchar_t* a_caption, std::uint32_t a_type) noexcept; + bool GetClientRect(HWND a_wnd, RECT* a_rect) noexcept; + std::int32_t GetKeyNameTextA(std::int32_t a_param, char* a_buf, std::int32_t a_bufLen) noexcept; + std::int32_t GetKeyNameTextW(std::int32_t a_param, wchar_t* a_buf, std::int32_t a_bufLen) noexcept; + std::int16_t GetKeyState(std::int32_t a_key) noexcept; + bool GetWindowRect(HWND a_wnd, RECT* a_rect) noexcept; + std::int32_t MessageBoxA(HWND a_wnd, const char* a_text, const char* a_caption, std::uint32_t a_type) noexcept; + std::int32_t MessageBoxW(HWND a_wnd, const wchar_t* a_text, const wchar_t* a_caption, std::uint32_t a_type) noexcept; std::intptr_t SetWindowLongPtrA(HWND a_wnd, std::int32_t a_index, std::intptr_t a_newPtr) noexcept; - std::int32_t ShowCursor(bool a_show) noexcept; + std::int32_t ShowCursor(bool a_show) noexcept; } diff --git a/CommonLibF4/include/REX/W32/VERSION.h b/CommonLibF4/include/REX/W32/VERSION.h index 25c72d90..ae626a6e 100644 --- a/CommonLibF4/include/REX/W32/VERSION.h +++ b/CommonLibF4/include/REX/W32/VERSION.h @@ -2,12 +2,12 @@ namespace REX::W32 { - bool GetFileVersionInfoA(const char* a_name, std::uint32_t a_handle, std::uint32_t a_dataLen, void* a_data) noexcept; + bool GetFileVersionInfoA(const char* a_name, std::uint32_t a_handle, std::uint32_t a_dataLen, void* a_data) noexcept; std::uint32_t GetFileVersionInfoSizeA(const char* a_name, std::uint32_t* a_handle) noexcept; //std::uint32_t GetFileVersionInfoSizeExA(std::uint32_t a_flags, const char* a_name, std::uint32_t* a_handle) noexcept; std::uint32_t GetFileVersionInfoSizeExW(std::uint32_t a_flags, const wchar_t* a_name, std::uint32_t* a_handle) noexcept; std::uint32_t GetFileVersionInfoSizeW(const wchar_t* a_name, std::uint32_t* a_handle) noexcept; - bool GetFileVersionInfoW(const wchar_t* a_name, std::uint32_t a_handle, std::uint32_t a_dataLen, void* a_data) noexcept; - bool VerQueryValueA(const void* a_block, const char* a_subBlock, void** a_buf, std::uint32_t* a_bufLen) noexcept; - bool VerQueryValueW(const void* a_block, const wchar_t* a_subBlock, void** a_buf, std::uint32_t* a_bufLen) noexcept; + bool GetFileVersionInfoW(const wchar_t* a_name, std::uint32_t a_handle, std::uint32_t a_dataLen, void* a_data) noexcept; + bool VerQueryValueA(const void* a_block, const char* a_subBlock, void** a_buf, std::uint32_t* a_bufLen) noexcept; + bool VerQueryValueW(const void* a_block, const wchar_t* a_subBlock, void** a_buf, std::uint32_t* a_bufLen) noexcept; } diff --git a/CommonLibF4/include/REX/W32/XINPUT.h b/CommonLibF4/include/REX/W32/XINPUT.h index 071a97aa..54f3b5c4 100644 --- a/CommonLibF4/include/REX/W32/XINPUT.h +++ b/CommonLibF4/include/REX/W32/XINPUT.h @@ -4,7 +4,7 @@ namespace REX::W32 { inline constexpr std::uint16_t XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE{ 7849 }; inline constexpr std::uint16_t XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE{ 8689 }; - inline constexpr std::uint8_t XINPUT_GAMEPAD_TRIGGER_THRESHOLD{ 30 }; + inline constexpr std::uint8_t XINPUT_GAMEPAD_TRIGGER_THRESHOLD{ 30 }; } namespace REX::W32 @@ -40,12 +40,12 @@ namespace REX::W32 struct XINPUT_GAMEPAD { std::uint16_t buttons; - std::uint8_t leftTrigger; - std::uint8_t rightTrigger; - std::int16_t thumbLX; - std::int16_t thumbLY; - std::int16_t thumbRX; - std::int16_t thumbRY; + std::uint8_t leftTrigger; + std::uint8_t rightTrigger; + std::int16_t thumbLX; + std::int16_t thumbLY; + std::int16_t thumbRX; + std::int16_t thumbRY; }; struct XINPUT_KEYSTROKE @@ -53,13 +53,13 @@ namespace REX::W32 std::uint16_t virtualKey; std::uint16_t unicode; std::uint16_t flags; - std::uint8_t userIndex; - std::uint8_t hidCode; + std::uint8_t userIndex; + std::uint8_t hidCode; }; struct XINPUT_STATE { - std::uint32_t packetNumber; + std::uint32_t packetNumber; XINPUT_GAMEPAD gamepad; }; @@ -71,10 +71,10 @@ namespace REX::W32 struct XINPUT_CAPABILITIES { - std::uint8_t type; - std::uint8_t subType; - std::uint16_t flags; - XINPUT_GAMEPAD gamepad; + std::uint8_t type; + std::uint8_t subType; + std::uint16_t flags; + XINPUT_GAMEPAD gamepad; XINPUT_VIBRATION vibration; }; } diff --git a/CommonLibF4/src/REL/Relocation.cpp b/CommonLibF4/src/REL/Relocation.cpp index 741389d6..d51bc5fc 100644 --- a/CommonLibF4/src/REL/Relocation.cpp +++ b/CommonLibF4/src/REL/Relocation.cpp @@ -37,8 +37,7 @@ namespace REL if (!REX::W32::NT_SUCCESS(REX::W32::BCryptHashData( hash, reinterpret_cast(const_cast(a_data.data())), // does not modify contents of buffer - static_cast(a_data.size())))) - { + static_cast(a_data.size())))) { log::error("failed to hash data"); return std::nullopt; } @@ -50,8 +49,7 @@ namespace REL REX::W32::BCRYPT_HASH_LENGTH, reinterpret_cast(&hashLen), sizeof(hashLen), - &discard))) - { + &discard))) { log::error("failed to get property"); return std::nullopt; } @@ -60,8 +58,7 @@ namespace REL if (!REX::W32::NT_SUCCESS(REX::W32::BCryptFinishHash( hash, buffer.data(), - static_cast(buffer.size())))) - { + static_cast(buffer.size())))) { log::error("failed to finish hash"); return std::nullopt; } diff --git a/CommonLibF4/src/REX/W32/KERNEL32.cpp b/CommonLibF4/src/REX/W32/KERNEL32.cpp index 53b352ea..cc480867 100644 --- a/CommonLibF4/src/REX/W32/KERNEL32.cpp +++ b/CommonLibF4/src/REX/W32/KERNEL32.cpp @@ -245,8 +245,8 @@ namespace REX::W32 IMAGE_SECTION_HEADER* IMAGE_FIRST_SECTION(const IMAGE_NT_HEADERS64* a_header) noexcept { constexpr auto opt = __builtin_offsetof(IMAGE_NT_HEADERS64, optionalHeader); - const auto optSize = a_header->fileHeader.optionalHeaderSize; - const auto section = reinterpret_cast(a_header) + opt + optSize; + const auto optSize = a_header->fileHeader.optionalHeaderSize; + const auto section = reinterpret_cast(a_header) + opt + optSize; return reinterpret_cast(section); }