mirror/WinDurango
1
0
Fork 0
mirror of https://github.com/WinDurango/WinDurango.git synced 2026-01-04 10:19:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

clang-format on AcpHal project.

Browse Source
This commit is contained in:
tylerjaacks
2025-11-11 19:57:31 -06:00
parent 38c3ce5f2d
commit 63fbc2038e
6 changed files with 169 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

219
dlls/AcpHal/AcpHal.h
View File

@@ -1,21 +1,28 @@
#pragma once
#include <inttypes.h>
#include "contexts.h"
#include "messages.h"
#include <cstdio>
#include <inttypes.h>
#pragma once
typedef uint64_t APU_ADDRESS;
struct ApuHeapState {
/* 0x0000 */ public: uint32_t bytesFree;
/* 0x0004 */ public: uint32_t bytesAllocated;
/* 0x0008 */ public: uint32_t bytesLost;
/* 0x000c */ public: uint32_t maximumBlockSizeAvailable;
/* 0x0010 */ public: uint32_t allocationCount;
struct ApuHeapState
{
/* 0x0000 */ public:
uint32_t bytesFree;
/* 0x0004 */ public:
uint32_t bytesAllocated;
/* 0x0008 */ public:
uint32_t bytesLost;
/* 0x000c */ public:
uint32_t maximumBlockSizeAvailable;
/* 0x0010 */ public:
uint32_t allocationCount;
};
typedef struct APU_HEAP {
void* Cached;
void* NonCached;
typedef struct APU_HEAP
{
void *Cached;
void *NonCached;
UINT32 CachedSize;
UINT32 NonCachedSize;
} APU_HEAP;
@@ -23,22 +30,23 @@ typedef struct APU_HEAP {
static const UINT32 APU_ALLOC_CACHED = 0x00000001;
static const UINT32 APU_ALLOC_NONCACHED = 0x00000002;
#define ACPE_E_NOT_INITIALIZED HRESULT(0x8AC80002)
#define ACPE_E_RESOURCE_IN_USE HRESULT(0x8AC80010)
#define ACPE_E_NOT_INITIALIZED HRESULT(0x8AC80002)
#define ACPE_E_RESOURCE_IN_USE HRESULT(0x8AC80010)
#define E_CRITICAL_SECTION_DEBUG_INFO_NOT_NULL 0x8ACA0001
struct SHAPE_CONTEXTS {
struct SHAPE_CONTEXTS
{
UINT32 numSrcContexts;
UINT32 numEqCompContexts;
UINT32 numFiltVolContexts;
UINT32 numDmaContexts;
UINT32 numXmaContexts;
UINT32 numPcmContexts;
SHAPE_SRC_CONTEXT* srcContextArray;
SHAPE_EQCOMP_CONTEXT* eqCompContextArray;
SHAPE_FILTVOL_CONTEXT* filtVolContextArray;
SHAPE_DMA_CONTEXT* dmaContextArray;
SHAPE_XMA_CONTEXT* xmaContextArray;
SHAPE_PCM_CONTEXT* pcmContextArray;
SHAPE_SRC_CONTEXT *srcContextArray;
SHAPE_EQCOMP_CONTEXT *eqCompContextArray;
SHAPE_FILTVOL_CONTEXT *filtVolContextArray;
SHAPE_DMA_CONTEXT *dmaContextArray;
SHAPE_XMA_CONTEXT *xmaContextArray;
SHAPE_PCM_CONTEXT *pcmContextArray;
APU_ADDRESS apuSrcContextArray;
APU_ADDRESS apuEqCompContextArray;
APU_ADDRESS apuFiltVolContextArray;
@@ -47,7 +55,8 @@ struct SHAPE_CONTEXTS {
APU_ADDRESS apuPcmContextArray;
};
typedef struct AcpHal_SHAPE_PCM_CONTEXT {
typedef struct AcpHal_SHAPE_PCM_CONTEXT
{
UINT32 bufferStart : 32;
UINT32 bufferLength : 21;
UINT32 reserved0 : 11;
@@ -65,10 +74,11 @@ typedef struct AcpHal_SHAPE_PCM_CONTEXT {
UINT32 reserved6 : 15;
UINT32 format : 2;
UINT32 reserved7 : 14;
UINT32 reserved[ 1 ];
UINT32 reserved[1];
} AcpHal_SHAPE_PCM_CONTEXT;
typedef struct AcpHal_SHAPE_SRC_CONTEXT {
typedef struct AcpHal_SHAPE_SRC_CONTEXT
{
UINT32 timestamp : 21;
UINT32 blocksToSkip : 2;
UINT32 internalSaturate : 1;
@@ -84,10 +94,11 @@ typedef struct AcpHal_SHAPE_SRC_CONTEXT {
UINT32 reserved1 : 7;
UINT32 samplingIncrementTarget : 21;
UINT32 reserved2 : 11;
UINT32 reserved[ 3 ];
UINT32 reserved[3];
};
typedef struct AcpHal_SHAPE_EQCOMP_CONTEXT {
typedef struct AcpHal_SHAPE_EQCOMP_CONTEXT
{
UINT32 timestamp : 21;
UINT32 reserved0 : 2;
UINT32 internalSaturate : 1;
@@ -171,7 +182,8 @@ typedef struct AcpHal_SHAPE_EQCOMP_CONTEXT {
UINT32 compGainTarget : 16;
} AcpHal_SHAPE_EQCOMP_CONTEXT;
typedef struct AcpHal_SHAPE_FILTVOL_CONTEXT {
typedef struct AcpHal_SHAPE_FILTVOL_CONTEXT
{
UINT32 timestamp : 21;
UINT32 reserved0 : 2;
UINT32 internalSaturate : 1;
@@ -193,7 +205,8 @@ typedef struct AcpHal_SHAPE_FILTVOL_CONTEXT {
UINT32 reserved4 : 8;
} AcpHal_SHAPE_FILTVOL_CONTEXT;
typedef struct AcpHal_SHAPE_DMA_CONTEXT {
typedef struct AcpHal_SHAPE_DMA_CONTEXT
{
UINT32 timestamp : 21;
UINT32 reserved0 : 3;
UINT32 mixBufPeakMag : 4;
@@ -216,7 +229,8 @@ typedef struct AcpHal_SHAPE_DMA_CONTEXT {
UINT32 reserved8 : 5;
} AcpHal_SHAPE_DMA_CONTEXT;
typedef struct AcpHal_SHAPE_XMA_CONTEXT {
typedef struct AcpHal_SHAPE_XMA_CONTEXT
{
UINT32 sizeRead0 : 12;
UINT32 numLoops : 8;
UINT32 validBuffer : 2;
@@ -249,22 +263,23 @@ typedef struct AcpHal_SHAPE_XMA_CONTEXT {
UINT32 reserved2 : 25;
UINT32 stopWhenDone : 1;
UINT32 interruptWhenDone : 1;
UINT32 reserved[ 6 ];
UINT32 reserved[6];
} AcpHal_SHAPE_XMA_CONTEXT;
typedef struct AcpHal_SHAPE_CONTEXTS {
typedef struct AcpHal_SHAPE_CONTEXTS
{
UINT32 numSrcContexts;
UINT32 numEqCompContexts;
UINT32 numFiltVolContexts;
UINT32 numDmaContexts;
UINT32 numXmaContexts;
UINT32 numPcmContexts;
AcpHal_SHAPE_SRC_CONTEXT* srcContextArray;
AcpHal_SHAPE_EQCOMP_CONTEXT* eqCompContextArray;
AcpHal_SHAPE_FILTVOL_CONTEXT* filtVolContextArray;
AcpHal_SHAPE_DMA_CONTEXT* dmaContextArray;
AcpHal_SHAPE_XMA_CONTEXT* xmaContextArray;
AcpHal_SHAPE_PCM_CONTEXT* pcmContextArray;
AcpHal_SHAPE_SRC_CONTEXT *srcContextArray;
AcpHal_SHAPE_EQCOMP_CONTEXT *eqCompContextArray;
AcpHal_SHAPE_FILTVOL_CONTEXT *filtVolContextArray;
AcpHal_SHAPE_DMA_CONTEXT *dmaContextArray;
AcpHal_SHAPE_XMA_CONTEXT *xmaContextArray;
AcpHal_SHAPE_PCM_CONTEXT *pcmContextArray;
APU_ADDRESS apuSrcContextArray;
APU_ADDRESS apuEqCompContextArray;
APU_ADDRESS apuFiltVolContextArray;
@@ -275,35 +290,35 @@ typedef struct AcpHal_SHAPE_CONTEXTS {
enum ACP_COMMAND_TYPE
{
ACP_COMMAND_TYPE_LOAD_SHAPE_FLOWGRAPH = 1,
ACP_COMMAND_TYPE_REGISTER_MESSAGE,
ACP_COMMAND_TYPE_UNREGISTER_MESSAGE,
ACP_COMMAND_TYPE_START_FLOWGRAPH,
ACP_COMMAND_TYPE_ENABLE_XMA_CONTEXT,
ACP_COMMAND_TYPE_ENABLE_XMA_CONTEXTS,
ACP_COMMAND_TYPE_DISABLE_XMA_CONTEXT,
ACP_COMMAND_TYPE_DISABLE_XMA_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_SRC_CONTEXT,
ACP_COMMAND_TYPE_UPDATE_EQCOMP_CONTEXT,
ACP_COMMAND_TYPE_UPDATE_FILTVOL_CONTEXT,
ACP_COMMAND_TYPE_UPDATE_DMA_CONTEXT,
ACP_COMMAND_TYPE_UPDATE_PCM_CONTEXT,
ACP_COMMAND_TYPE_UPDATE_XMA_CONTEXT,
ACP_COMMAND_TYPE_INCREMENT_DMA_WRITE_POINTER,
ACP_COMMAND_TYPE_INCREMENT_DMA_READ_POINTER,
ACP_COMMAND_TYPE_INCREMENT_PCM_WRITE_POINTER,
ACP_COMMAND_TYPE_LOAD_SHAPE_FLOWGRAPH = 1,
ACP_COMMAND_TYPE_REGISTER_MESSAGE,
ACP_COMMAND_TYPE_UNREGISTER_MESSAGE,
ACP_COMMAND_TYPE_START_FLOWGRAPH,
ACP_COMMAND_TYPE_ENABLE_XMA_CONTEXT,
ACP_COMMAND_TYPE_ENABLE_XMA_CONTEXTS,
ACP_COMMAND_TYPE_DISABLE_XMA_CONTEXT,
ACP_COMMAND_TYPE_DISABLE_XMA_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_SRC_CONTEXT,
ACP_COMMAND_TYPE_UPDATE_EQCOMP_CONTEXT,
ACP_COMMAND_TYPE_UPDATE_FILTVOL_CONTEXT,
ACP_COMMAND_TYPE_UPDATE_DMA_CONTEXT,
ACP_COMMAND_TYPE_UPDATE_PCM_CONTEXT,
ACP_COMMAND_TYPE_UPDATE_XMA_CONTEXT,
ACP_COMMAND_TYPE_INCREMENT_DMA_WRITE_POINTER,
ACP_COMMAND_TYPE_INCREMENT_DMA_READ_POINTER,
ACP_COMMAND_TYPE_INCREMENT_PCM_WRITE_POINTER,
ACP_COMMAND_TYPE_INCREMENT_XMA_WRITE_BUFFER_OFFSET_READ,
ACP_COMMAND_TYPE_UPDATE_XMA_READ_BUFFER,
ACP_COMMAND_TYPE_UPDATE_ALL_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_SRC_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_EQCOMP_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_FILTVOL_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_DMA_READ_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_DMA_WRITE_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_PCM_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_XMA_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_XMA_READ_BUFFER,
ACP_COMMAND_TYPE_UPDATE_ALL_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_SRC_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_EQCOMP_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_FILTVOL_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_DMA_READ_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_DMA_WRITE_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_PCM_CONTEXTS,
ACP_COMMAND_TYPE_UPDATE_XMA_CONTEXTS,
ACP_COMMAND_TYPE_COUNT = ACP_COMMAND_TYPE_UPDATE_XMA_CONTEXTS
ACP_COMMAND_TYPE_COUNT = ACP_COMMAND_TYPE_UPDATE_XMA_CONTEXTS
};
struct ACP_MESSAGE
{
@@ -312,42 +327,60 @@ struct ACP_MESSAGE
UINT32 usec; // time when this message is constructed
union // Message data
{
ACP_MESSAGE_AUDIO_FRAME_START audioFrameStart;
ACP_MESSAGE_FLOWGRAPH_COMPLETED flowgraphCompleted;
ACP_MESSAGE_AUDIO_FRAME_START audioFrameStart;
ACP_MESSAGE_FLOWGRAPH_COMPLETED flowgraphCompleted;
ACP_MESSAGE_SHAPE_COMMAND_BLOCKED shapeCommandBlocked;
ACP_MESSAGE_COMMAND_COMPLETED commandCompleted;
ACP_MESSAGE_FLOWGRAPH_TERMINATED flowgraphTerminated;
ACP_MESSAGE_ERROR error;
ACP_MESSAGE_COMMAND_COMPLETED commandCompleted;
ACP_MESSAGE_FLOWGRAPH_TERMINATED flowgraphTerminated;
ACP_MESSAGE_ERROR error;
};
};
class IAcpHal
{
public:
IAcpHal() { printf("[IAcpHal] Constructed\n"); }
virtual ~IAcpHal() { printf("[IAcpHal] Destructed\n"); }
public:
IAcpHal()
{
printf("[IAcpHal] Constructed\n");
}
virtual ~IAcpHal()
{
printf("[IAcpHal] Destructed\n");
}
// Add virtual destructor to allow safe deletion
virtual HRESULT __stdcall Connect(UINT32, UINT32) = 0;
virtual HRESULT __stdcall Disconnect() = 0;
virtual HRESULT __stdcall SubmitCommand(ACP_COMMAND_TYPE, UINT64, UINT32, const void*, APU_ADDRESS) = 0;
virtual bool __stdcall PopMessage(ACP_MESSAGE* msg) = 0;
virtual HRESULT __stdcall SubmitCommand(ACP_COMMAND_TYPE, UINT64, UINT32, const void *, APU_ADDRESS) = 0;
virtual bool __stdcall PopMessage(ACP_MESSAGE *msg) = 0;
virtual UINT32 __stdcall GetNumMessages() = 0;
virtual void __stdcall Release() = 0;
};
class AcpHal : public IAcpHal {
class AcpHal : public IAcpHal
{
ULONG m_refCount = 1;
public:
AcpHal() { printf("[AcpHal] Constructed\n"); }
~AcpHal() { printf("[AcpHal] Destructed\n"); }
public:
AcpHal()
{
printf("[AcpHal] Constructed\n");
}
~AcpHal()
{
printf("[AcpHal] Destructed\n");
}
// COM reference tracking
ULONG AddRef() { return ++m_refCount; }
ULONG AddRef()
{
return ++m_refCount;
}
ULONG ReleaseRef() {
ULONG ReleaseRef()
{
ULONG ref = --m_refCount;
if (ref == 0) {
if (ref == 0)
{
delete this;
return 0;
}
@@ -355,24 +388,36 @@ public:
}
// IAcpHal methods
HRESULT __stdcall Connect(UINT32, UINT32) override { printf("Connect()\n"); return S_OK; }
HRESULT __stdcall Disconnect() override { printf("Disconnect()\n"); return S_OK; }
HRESULT __stdcall SubmitCommand(ACP_COMMAND_TYPE, UINT64, UINT32, const void*, APU_ADDRESS) override {
HRESULT __stdcall Connect(UINT32, UINT32) override
{
printf("Connect()\n");
return S_OK;
}
HRESULT __stdcall Disconnect() override
{
printf("Disconnect()\n");
return S_OK;
}
HRESULT __stdcall SubmitCommand(ACP_COMMAND_TYPE, UINT64, UINT32, const void *, APU_ADDRESS) override
{
printf("SubmitCommand()\n");
return S_OK;
}
bool __stdcall PopMessage(ACP_MESSAGE* msg) override {
bool __stdcall PopMessage(ACP_MESSAGE *msg) override
{
printf("PopMessage()\n");
if (msg) ZeroMemory(msg, sizeof(*msg));
if (msg)
ZeroMemory(msg, sizeof(*msg));
return false;
}
UINT32 __stdcall GetNumMessages() override {
UINT32 __stdcall GetNumMessages() override
{
printf("GetNumMessages()\n");
return 0;
}
void __stdcall Release() override {
void __stdcall Release() override
{
printf("Release() called\n");
ReleaseRef(); // Properly manages reference count
}
};

26
dlls/AcpHal/contexts.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include "AcpHal.h"
struct SHAPE_EQCOMP_CONTEXT {
struct SHAPE_EQCOMP_CONTEXT
{
UINT32 timestamp : 21;
UINT32 reserved0 : 2;
UINT32 internalSaturate : 1;
@@ -84,7 +85,8 @@ struct SHAPE_EQCOMP_CONTEXT {
UINT32 compGainTarget : 16;
};
struct SHAPE_SRC_CONTEXT {
struct SHAPE_SRC_CONTEXT
{
UINT32 timestamp : 21;
UINT32 blocksToSkip : 2;
UINT32 internalSaturate : 1;
@@ -100,10 +102,11 @@ struct SHAPE_SRC_CONTEXT {
UINT32 reserved1 : 7;
UINT32 samplingIncrementTarget : 21;
UINT32 reserved2 : 11;
UINT32 reserved3[ 3 ];
UINT32 reserved3[3];
};
struct SHAPE_FILTVOL_CONTEXT {
struct SHAPE_FILTVOL_CONTEXT
{
UINT32 timestamp : 21;
UINT32 reserved0 : 2;
UINT32 internalSaturate : 1;
@@ -125,7 +128,8 @@ struct SHAPE_FILTVOL_CONTEXT {
UINT32 reserved4 : 8;
};
struct SHAPE_DMA_CONTEXT {
struct SHAPE_DMA_CONTEXT
{
UINT32 timestamp : 21;
UINT32 reserved0 : 3;
UINT32 mixBufPeakMag : 4;
@@ -148,7 +152,8 @@ struct SHAPE_DMA_CONTEXT {
UINT32 reserved8 : 5;
};
struct SHAPE_XMA_CONTEXT {
struct SHAPE_XMA_CONTEXT
{
UINT32 sizeRead0 : 12;
UINT32 numLoops : 8;
UINT32 validBuffer : 2;
@@ -181,11 +186,12 @@ struct SHAPE_XMA_CONTEXT {
UINT32 reserved3 : 25;
UINT32 stopWhenDone : 1;
UINT32 interruptWhenDone : 1;
UINT32 reserved4[ 2 ];
UINT32 reserved5[ 1 ];
UINT32 reserved4[2];
UINT32 reserved5[1];
};
struct SHAPE_PCM_CONTEXT {
struct SHAPE_PCM_CONTEXT
{
UINT32 bufferStart : 32;
UINT32 bufferLength : 21;
UINT32 reserved0 : 11;
@@ -205,5 +211,3 @@ struct SHAPE_PCM_CONTEXT {
UINT32 reserved7 : 14;
UINT32 reserved8;
};

12
dlls/AcpHal/dllmain.cpp
View File

@@ -1,15 +1,13 @@
// dllmain.cpp : Defines the entry point for the DLL application.
#include "AcpHal.h"
#include "pch.h"
#include <stdlib.h> // Add this include at the top of the file
#include <cstdio>
#include <winternl.h>
#include <corecrt_startup.h>
#include <cstdint>
#include "AcpHal.h"
#include <cstdio>
#include <stdlib.h> // Add this include at the top of the file
#include <winternl.h>
BOOL APIENTRY DllMain(HMODULE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved)
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
{
BOOL success = TRUE;
BOOL dll_custom_init_success = 0;

2
dlls/AcpHal/framework.h
View File

@@ -1,5 +1,5 @@
#pragma once
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files
#include <windows.h>

30
dlls/AcpHal/messages.h
View File

@@ -2,7 +2,7 @@
typedef uint64_t APU_ADDRESS;
struct ACP_MESSAGE_AUDIO_FRAME_START
{
UINT32 audioFrame; // Audio frame index
UINT32 audioFrame; // Audio frame index
};
// Flowgraph completed message
@@ -19,8 +19,8 @@ struct ACP_MESSAGE_FLOWGRAPH_COMPLETED
// ACP_MESSAGE_TYPE_DMA_BLOCKED
struct ACP_MESSAGE_SHAPE_COMMAND_BLOCKED
{
UINT32 contextIndex; // Index of context that was blocked
APU_ADDRESS flowgraph; // Flowgraph with blocked context
UINT32 contextIndex; // Index of context that was blocked
APU_ADDRESS flowgraph; // Flowgraph with blocked context
};
// An ACP command has completed
@@ -41,9 +41,9 @@ struct ACP_MESSAGE_COMMAND_COMPLETED
// ACP_MESSAGE_TYPE_FLOWGRAPH_TERMINATED
struct ACP_MESSAGE_FLOWGRAPH_TERMINATED
{
APU_ADDRESS flowgraph; // Flowgraph
UINT32 numCommandsCompleted; // Number of flowgraph commands completed or queued before time ran out
UINT32 reason; // Reason the flowgraph was terminated
APU_ADDRESS flowgraph; // Flowgraph
UINT32 numCommandsCompleted; // Number of flowgraph commands completed or queued before time ran out
UINT32 reason; // Reason the flowgraph was terminated
};
// Error message
@@ -53,29 +53,29 @@ struct ACP_MESSAGE_FLOWGRAPH_TERMINATED
// errorCode additionalData
// ----------------------------------- ------------------------------------------
// ACP_E_INVALID_FLOWGRAPH Flowgraph APU_ADDRESS
// The specified flowgraph is invalid. Examine the flowgraph entry headers.
// The specified flowgraph is invalid. Examine the flowgraph entry headers.
// Invalid entries will have the error bit set.
//
//
// ACP_E_INVALID_COMMAND 'commandId' from IAcpHal::SubmitCommand()
// The command submitted is invalid.
//
//
// ACP_E_MESSAGE_ALREADY_REGISTERED ACP_MESSAGE_TYPE_*
// An attempt was made to register for a message type that has already been registered.
//
//
// ACP_E_MESSAGE_NOT_REGISTERED ACP_MESSAGE_TYPE_*
// An attempt was made to unregister a message type that has not been registered.
//
//
// ACP_E_INVALID_COMMAND_TYPE ACP_COMMAND_TYPE_*
// A submitted command is not of a valid type.
//
//
// ACP_E_NOT_ALLOCATED 'commandId' from IAcpHal::SubmitCommand()
// A request was made to update a SHAPE flowgraph context that has not been allocated.
//
//
// ACP_E_XMA_PARSER_ERROR XMA context index
// The specified XMA context generated a parser error.
//
struct ACP_MESSAGE_ERROR
{
HRESULT errorCode; // Error code
UINT32 additionalData; // Additional data relevant to the error
HRESULT errorCode; // Error code
UINT32 additionalData; // Additional data relevant to the error
};

2
dlls/AcpHal/pch.h
View File

@@ -10,4 +10,4 @@
// add headers that you want to pre-compile here
#include "framework.h"
#endif //PCH_H
#endif // PCH_H