include: Don't pack XACT_RUNTIME_PARAMETERS structure.
Move the XACT_RUNTIME_PARAMETERS structure definition outside of the packing directive that the other structures are placed within. It isn't packed in Windows, and was included with the others by mistake. Signed-off-by: Connor McAdams <cmcadams@codeweavers.com> Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
1cdd046dae
commit
a1069854cf
|
@ -354,23 +354,6 @@ typedef struct XACT_NOTIFICATION_CUE
|
|||
} XACT_NOTIFICATION_CUE, *LPXACT_NOTIFICATION_CUE;
|
||||
typedef const XACT_NOTIFICATION_CUE *LPCXACT_NOTIFICATION_CUE;
|
||||
|
||||
typedef struct XACT_WAVE_PROPERTIES
|
||||
{
|
||||
char friendlyName[WAVEBANK_ENTRYNAME_LENGTH];
|
||||
WAVEBANKMINIWAVEFORMAT format;
|
||||
DWORD durationInSamples;
|
||||
WAVEBANKSAMPLEREGION loopRegion;
|
||||
BOOL streaming;
|
||||
} XACT_WAVE_PROPERTIES, *LPXACT_WAVE_PROPERTIES;
|
||||
typedef const XACT_WAVE_PROPERTIES *LPCXACT_WAVE_PROPERTIES;
|
||||
|
||||
typedef struct XACT_WAVE_INSTANCE_PROPERTIES
|
||||
{
|
||||
XACT_WAVE_PROPERTIES properties;
|
||||
BOOL backgroundMusic;
|
||||
} XACT_WAVE_INSTANCE_PROPERTIES, *LPXACT_WAVE_INSTANCE_PROPERTIES;
|
||||
typedef const XACT_WAVE_INSTANCE_PROPERTIES *LPCXACT_WAVE_INSTANCE_PROPERTIES;
|
||||
|
||||
typedef struct XACT_NOTIFICATION_MARKER
|
||||
{
|
||||
XACTINDEX cueIndex;
|
||||
|
@ -442,6 +425,25 @@ typedef void (__stdcall *XACT_NOTIFICATION_CALLBACK)(
|
|||
const XACT_NOTIFICATION *pNotification
|
||||
);
|
||||
|
||||
#include <poppack.h>
|
||||
|
||||
typedef struct XACT_WAVE_PROPERTIES
|
||||
{
|
||||
char friendlyName[WAVEBANK_ENTRYNAME_LENGTH];
|
||||
WAVEBANKMINIWAVEFORMAT format;
|
||||
DWORD durationInSamples;
|
||||
WAVEBANKSAMPLEREGION loopRegion;
|
||||
BOOL streaming;
|
||||
} XACT_WAVE_PROPERTIES, *LPXACT_WAVE_PROPERTIES;
|
||||
typedef const XACT_WAVE_PROPERTIES *LPCXACT_WAVE_PROPERTIES;
|
||||
|
||||
typedef struct XACT_WAVE_INSTANCE_PROPERTIES
|
||||
{
|
||||
XACT_WAVE_PROPERTIES properties;
|
||||
BOOL backgroundMusic;
|
||||
} XACT_WAVE_INSTANCE_PROPERTIES, *LPXACT_WAVE_INSTANCE_PROPERTIES;
|
||||
typedef const XACT_WAVE_INSTANCE_PROPERTIES *LPCXACT_WAVE_INSTANCE_PROPERTIES;
|
||||
|
||||
typedef struct XACT_RUNTIME_PARAMETERS
|
||||
{
|
||||
DWORD lookAheadTime;
|
||||
|
@ -457,8 +459,6 @@ typedef struct XACT_RUNTIME_PARAMETERS
|
|||
} XACT_RUNTIME_PARAMETERS, *LPXACT_RUNTIME_PARAMETERS;
|
||||
typedef const XACT_RUNTIME_PARAMETERS *LPCXACT_RUNTIME_PARAMETERS;
|
||||
|
||||
#include <poppack.h>
|
||||
|
||||
#define XACT_FLAG_CUE_STOP_RELEASE XACT_FLAG_STOP_RELEASE
|
||||
#define XACT_FLAG_CUE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE
|
||||
|
||||
|
|
Loading…
Reference in New Issue