Connor McAdams : include: Don't pack XACT_RUNTIME_PARAMETERS structure.
Alexandre Julliard
julliard at winehq.org
Fri Apr 23 15:20:17 CDT 2021
Module: wine
Branch: master
Commit: a1069854cfb2de481c6be2eef16952dd48ac56e0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1069854cfb2de481c6be2eef16952dd48ac56e0
Author: Connor McAdams <cmcadams at codeweavers.com>
Date: Thu Apr 22 16:10:10 2021 -0400
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 at codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/xact3.h | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/include/xact3.h b/include/xact3.h
index 9b8f480829e..a1df1a51330 100644
--- a/include/xact3.h
+++ b/include/xact3.h
@@ -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
More information about the wine-cvs
mailing list