[PATCH] xactengine: Fix long types warnings.
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Tue Feb 1 23:28:23 CST 2022
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
dlls/xactengine2_0/Makefile.in | 2 +-
dlls/xactengine2_4/Makefile.in | 2 +-
dlls/xactengine2_7/Makefile.in | 2 +-
dlls/xactengine2_9/Makefile.in | 2 +-
dlls/xactengine3_0/Makefile.in | 2 +-
dlls/xactengine3_1/Makefile.in | 2 +-
dlls/xactengine3_2/Makefile.in | 2 +-
dlls/xactengine3_3/Makefile.in | 2 +-
dlls/xactengine3_4/Makefile.in | 2 +-
dlls/xactengine3_5/Makefile.in | 2 +-
dlls/xactengine3_6/Makefile.in | 2 +-
dlls/xactengine3_7/Makefile.in | 2 +-
dlls/xactengine3_7/xact_dll.c | 44 +++++++++++++++++-----------------
13 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/dlls/xactengine2_0/Makefile.in b/dlls/xactengine2_0/Makefile.in
index 1fe077c95a3..5c4b635b060 100644
--- a/dlls/xactengine2_0/Makefile.in
+++ b/dlls/xactengine2_0/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine2_0.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0200
+EXTRADEFS = -DXACT3_VER=0x0200
PARENTSRC = ../xactengine3_7
C_SRCS = \
diff --git a/dlls/xactengine2_4/Makefile.in b/dlls/xactengine2_4/Makefile.in
index 78e78146311..2b5fd547b61 100644
--- a/dlls/xactengine2_4/Makefile.in
+++ b/dlls/xactengine2_4/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine2_4.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0204
+EXTRADEFS = -DXACT3_VER=0x0204
PARENTSRC = ../xactengine3_7
C_SRCS = \
diff --git a/dlls/xactengine2_7/Makefile.in b/dlls/xactengine2_7/Makefile.in
index 445ba17f6ae..6861555b23b 100644
--- a/dlls/xactengine2_7/Makefile.in
+++ b/dlls/xactengine2_7/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine2_7.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0207
+EXTRADEFS = -DXACT3_VER=0x0207
PARENTSRC = ../xactengine3_7
C_SRCS = \
diff --git a/dlls/xactengine2_9/Makefile.in b/dlls/xactengine2_9/Makefile.in
index 0f8e137ffba..e5f8c83e962 100644
--- a/dlls/xactengine2_9/Makefile.in
+++ b/dlls/xactengine2_9/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine2_9.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0209
+EXTRADEFS = -DXACT3_VER=0x0209
PARENTSRC = ../xactengine3_7
C_SRCS = \
diff --git a/dlls/xactengine3_0/Makefile.in b/dlls/xactengine3_0/Makefile.in
index 60673ff8101..10259e44ee0 100644
--- a/dlls/xactengine3_0/Makefile.in
+++ b/dlls/xactengine3_0/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine3_0.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0300
+EXTRADEFS = -DXACT3_VER=0x0300
PARENTSRC = ../xactengine3_7
C_SRCS = \
diff --git a/dlls/xactengine3_1/Makefile.in b/dlls/xactengine3_1/Makefile.in
index f812bea5c9b..3105c3443bd 100644
--- a/dlls/xactengine3_1/Makefile.in
+++ b/dlls/xactengine3_1/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine3_1.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0301
+EXTRADEFS = -DXACT3_VER=0x0301
PARENTSRC = ../xactengine3_7
C_SRCS = \
diff --git a/dlls/xactengine3_2/Makefile.in b/dlls/xactengine3_2/Makefile.in
index bde069efe30..92481ba1e26 100644
--- a/dlls/xactengine3_2/Makefile.in
+++ b/dlls/xactengine3_2/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine3_2.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0302
+EXTRADEFS = -DXACT3_VER=0x0302
PARENTSRC = ../xactengine3_7
C_SRCS = \
diff --git a/dlls/xactengine3_3/Makefile.in b/dlls/xactengine3_3/Makefile.in
index 1bdfc72b1b7..1963f033557 100644
--- a/dlls/xactengine3_3/Makefile.in
+++ b/dlls/xactengine3_3/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine3_3.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0303
+EXTRADEFS = -DXACT3_VER=0x0303
PARENTSRC = ../xactengine3_7
C_SRCS = \
diff --git a/dlls/xactengine3_4/Makefile.in b/dlls/xactengine3_4/Makefile.in
index 5987dc0df78..5d639c4e7ad 100644
--- a/dlls/xactengine3_4/Makefile.in
+++ b/dlls/xactengine3_4/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine3_4.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0304
+EXTRADEFS = -DXACT3_VER=0x0304
PARENTSRC = ../xactengine3_7
C_SRCS = \
diff --git a/dlls/xactengine3_5/Makefile.in b/dlls/xactengine3_5/Makefile.in
index 5a95ceb9e30..47731dd7017 100644
--- a/dlls/xactengine3_5/Makefile.in
+++ b/dlls/xactengine3_5/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine3_5.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0305
+EXTRADEFS = -DXACT3_VER=0x0305
PARENTSRC = ../xactengine3_7
C_SRCS = \
diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in
index dfca6ac31d4..b0e235ecd08 100644
--- a/dlls/xactengine3_6/Makefile.in
+++ b/dlls/xactengine3_6/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine3_6.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0306
+EXTRADEFS = -DXACT3_VER=0x0306
PARENTSRC = ../xactengine3_7
C_SRCS = \
diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in
index 18ef2a683e8..128a41cf59a 100644
--- a/dlls/xactengine3_7/Makefile.in
+++ b/dlls/xactengine3_7/Makefile.in
@@ -1,7 +1,7 @@
MODULE = xactengine3_7.dll
IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid
EXTRAINCL = $(FAUDIO_PE_CFLAGS)
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0307
+EXTRADEFS = -DXACT3_VER=0x0307
C_SRCS = \
xact_dll.c
diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c
index 18608037ffb..98c3cf8f076 100644
--- a/dlls/xactengine3_7/xact_dll.c
+++ b/dlls/xactengine3_7/xact_dll.c
@@ -75,7 +75,7 @@ static HRESULT WINAPI IXACT3CueImpl_Stop(IXACT3Cue *iface, DWORD dwFlags)
{
XACT3CueImpl *This = impl_from_IXACT3Cue(iface);
- TRACE("(%p)->(%u)\n", iface, dwFlags);
+ TRACE("(%p)->(%lu)\n", iface, dwFlags);
return FACTCue_Stop(This->fact_cue, dwFlags);
}
@@ -86,7 +86,7 @@ static HRESULT WINAPI IXACT3CueImpl_GetState(IXACT3Cue *iface, DWORD *pdwState)
TRACE("(%p)->(%p)\n", iface, pdwState);
- return FACTCue_GetState(This->fact_cue, pdwState);
+ return FACTCue_GetState(This->fact_cue, (uint32_t *)pdwState);
}
static HRESULT WINAPI IXACT3CueImpl_Destroy(IXACT3Cue *iface)
@@ -108,7 +108,7 @@ static HRESULT WINAPI IXACT3CueImpl_Destroy(IXACT3Cue *iface)
static HRESULT WINAPI IXACT3CueImpl_GetChannelMap(IXACT3Cue *iface,
XACTCHANNELMAP *map, DWORD size, DWORD *needed_size)
{
- FIXME("(%p)->(%p, %u, %p)\n", iface, map, size, needed_size);
+ FIXME("(%p)->(%p, %lu, %p)\n", iface, map, size, needed_size);
return E_NOTIMPL;
}
@@ -306,7 +306,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface,
FACTCue *fcue;
UINT ret;
- TRACE("(%p)->(%u, 0x%x, %u, %p)\n", This, nCueIndex, dwFlags, timeOffset,
+ TRACE("(%p)->(%u, 0x%lx, %lu, %p)\n", This, nCueIndex, dwFlags, timeOffset,
ppCue);
ret = FACTSoundBank_Prepare(This->fact_soundbank, nCueIndex, dwFlags,
@@ -343,7 +343,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface,
FACTCue *fcue;
HRESULT hr;
- TRACE("(%p)->(%u, 0x%x, %u, %p)\n", This, nCueIndex, dwFlags, timeOffset,
+ TRACE("(%p)->(%u, 0x%lx, %lu, %p)\n", This, nCueIndex, dwFlags, timeOffset,
ppCue);
/* If the application doesn't want a handle, don't generate one at all.
@@ -380,7 +380,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Stop(IXACT3SoundBank *iface,
{
XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface);
- TRACE("(%p)->(%u)\n", This, dwFlags);
+ TRACE("(%p)->(%lu)\n", This, dwFlags);
return FACTSoundBank_Stop(This->fact_soundbank, nCueIndex, dwFlags);
}
@@ -404,7 +404,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_GetState(IXACT3SoundBank *iface,
TRACE("(%p)->(%p)\n", This, pdwState);
- return FACTSoundBank_GetState(This->fact_soundbank, pdwState);
+ return FACTSoundBank_GetState(This->fact_soundbank, (uint32_t *)pdwState);
}
static const IXACT3SoundBankVtbl XACT3SoundBank_Vtbl =
@@ -459,7 +459,7 @@ static HRESULT WINAPI IXACT3WaveImpl_Stop(IXACT3Wave *iface, DWORD dwFlags)
{
XACT3WaveImpl *This = impl_from_IXACT3Wave(iface);
- TRACE("(%p)->(0x%x)\n", This, dwFlags);
+ TRACE("(%p)->(0x%lx)\n", This, dwFlags);
return FACTWave_Stop(This->fact_wave, dwFlags);
}
@@ -479,7 +479,7 @@ static HRESULT WINAPI IXACT3WaveImpl_GetState(IXACT3Wave *iface, DWORD *pdwState
TRACE("(%p)->(%p)\n", This, pdwState);
- return FACTWave_GetState(This->fact_wave, pdwState);
+ return FACTWave_GetState(This->fact_wave, (uint32_t *)pdwState);
}
static HRESULT WINAPI IXACT3WaveImpl_SetPitch(IXACT3Wave *iface, XACTPITCH pitch)
@@ -604,7 +604,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface,
FACTWave *fwave;
UINT ret;
- TRACE("(%p)->(0x%x, %u, 0x%x, %u, %p)\n", This, nWaveIndex, dwFlags,
+ TRACE("(%p)->(0x%x, %lu, 0x%lx, %u, %p)\n", This, nWaveIndex, dwFlags,
dwPlayOffset, nLoopCount, ppWave);
ret = FACTWaveBank_Prepare(This->fact_wavebank, nWaveIndex, dwFlags,
@@ -641,7 +641,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface,
FACTWave *fwave;
HRESULT hr;
- TRACE("(%p)->(0x%x, %u, 0x%x, %u, %p)\n", This, nWaveIndex, dwFlags, dwPlayOffset,
+ TRACE("(%p)->(0x%x, %lu, 0x%lx, %u, %p)\n", This, nWaveIndex, dwFlags, dwPlayOffset,
nLoopCount, ppWave);
/* If the application doesn't want a handle, don't generate one at all.
@@ -678,7 +678,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Stop(IXACT3WaveBank *iface,
{
XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface);
- TRACE("(%p)->(%u, %u)\n", This, nWaveIndex, dwFlags);
+ TRACE("(%p)->(%u, %lu)\n", This, nWaveIndex, dwFlags);
return FACTWaveBank_Stop(This->fact_wavebank, nWaveIndex, dwFlags);
}
@@ -692,7 +692,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_GetState(IXACT3WaveBank *iface,
TRACE("(%p)->(%p)\n", This, pdwState);
- return FACTWaveBank_GetState(This->fact_wavebank, pdwState);
+ return FACTWaveBank_GetState(This->fact_wavebank, (uint32_t *)pdwState);
}
static const IXACT3WaveBankVtbl XACT3WaveBank_Vtbl =
@@ -733,7 +733,7 @@ static int32_t FACTCALL wrap_readfile(
{
wrap_readfile_struct *wrap = (wrap_readfile_struct*) hFile;
return wrap->engine->pReadFile(wrap->file, lpBuffer, nNumberOfBytesRead,
- lpNumberOfBytesRead, (LPOVERLAPPED)lpOverlapped);
+ (DWORD *)lpNumberOfBytesRead, (LPOVERLAPPED)lpOverlapped);
}
static int32_t FACTCALL wrap_getoverlappedresult(
@@ -744,7 +744,7 @@ static int32_t FACTCALL wrap_getoverlappedresult(
{
wrap_readfile_struct *wrap = (wrap_readfile_struct*) hFile;
return wrap->engine->pGetOverlappedResult(wrap->file, (LPOVERLAPPED)lpOverlapped,
- lpNumberOfBytesTransferred, bWait);
+ (DWORD *)lpNumberOfBytesTransferred, bWait);
}
static inline XACT3EngineImpl *impl_from_IXACT3Engine(IXACT3Engine *iface)
@@ -780,7 +780,7 @@ static ULONG WINAPI IXACT3EngineImpl_AddRef(IXACT3Engine *iface)
{
XACT3EngineImpl *This = impl_from_IXACT3Engine(iface);
ULONG ref = FACTAudioEngine_AddRef(This->fact_engine);
- TRACE("(%p)->(): Refcount now %u\n", This, ref);
+ TRACE("(%p)->(): Refcount now %lu\n", This, ref);
return ref;
}
@@ -789,7 +789,7 @@ static ULONG WINAPI IXACT3EngineImpl_Release(IXACT3Engine *iface)
XACT3EngineImpl *This = impl_from_IXACT3Engine(iface);
ULONG ref = FACTAudioEngine_Release(This->fact_engine);
- TRACE("(%p)->(): Refcount now %u\n", This, ref);
+ TRACE("(%p)->(): Refcount now %lu\n", This, ref);
if (!ref)
HeapFree(GetProcessHeap(), 0, This);
@@ -936,7 +936,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface,
FACTSoundBank *fsb;
UINT ret;
- TRACE("(%p)->(%p, %u, 0x%x, 0x%x, %p): stub!\n", This, pvBuffer, dwSize, dwFlags,
+ TRACE("(%p)->(%p, %lu, 0x%lx, 0x%lx, %p): stub!\n", This, pvBuffer, dwSize, dwFlags,
dwAllocAttributes, ppSoundBank);
ret = FACTAudioEngine_CreateSoundBank(This->fact_engine, pvBuffer, dwSize,
@@ -973,7 +973,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac
FACTWaveBank *fwb;
UINT ret;
- TRACE("(%p)->(%p, %u, 0x%x, 0x%x, %p)\n", This, pvBuffer, dwSize, dwFlags,
+ TRACE("(%p)->(%p, %lu, 0x%lx, 0x%lx, %p)\n", This, pvBuffer, dwSize, dwFlags,
dwAllocAttributes, ppWaveBank);
ret = FACTAudioEngine_CreateInMemoryWaveBank(This->fact_engine, pvBuffer,
@@ -1082,7 +1082,7 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface,
FACTWave *fwave = NULL;
UINT ret;
- TRACE("(%p)->(0x%08x, %s, %d, %d, %d, %d, %p)\n", This, dwFlags, debugstr_a(szWavePath),
+ TRACE("(%p)->(0x%08lx, %s, %d, %ld, %ld, %d, %p)\n", This, dwFlags, debugstr_a(szWavePath),
wStreamingPacketSize, dwAlignment, dwPlayOffset, nLoopCount, ppWave);
ret = FACTAudioEngine_PrepareWave(This->fact_engine, dwFlags, szWavePath, wStreamingPacketSize,
@@ -1278,7 +1278,7 @@ static HRESULT WINAPI IXACT3EngineImpl_Stop(IXACT3Engine *iface,
{
XACT3EngineImpl *This = impl_from_IXACT3Engine(iface);
- TRACE("(%p)->(%u, 0x%x)\n", This, nCategory, dwFlags);
+ TRACE("(%p)->(%u, 0x%lx)\n", This, nCategory, dwFlags);
return FACTAudioEngine_Stop(This->fact_engine, nCategory, dwFlags);
}
@@ -1460,7 +1460,7 @@ static IClassFactory XACTFactory = { &XACT3CF_Vtbl };
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved)
{
- TRACE("(%p, %d, %p)\n", hinstDLL, reason, pReserved);
+ TRACE("(%p, %ld, %p)\n", hinstDLL, reason, pReserved);
switch (reason)
{
--
2.34.1
More information about the wine-devel
mailing list