[PATCH 02/17] dlls/xapofx1_1: enable compilation with long types
Andrew Eikum
aeikum at codeweavers.com
Wed Feb 9 07:48:48 CST 2022
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
On Mon, Feb 07, 2022 at 11:09:51PM +0100, Eric Pouech wrote:
> Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
>
> ---
> dlls/xapofx1_1/Makefile.in | 2 +-
> dlls/xapofx1_2/Makefile.in | 2 +-
> dlls/xapofx1_3/Makefile.in | 2 +-
> dlls/xapofx1_4/Makefile.in | 2 +-
> dlls/xapofx1_5/Makefile.in | 2 +-
> dlls/xaudio2_0/Makefile.in | 2 +-
> dlls/xaudio2_1/Makefile.in | 2 +-
> dlls/xaudio2_2/Makefile.in | 2 +-
> dlls/xaudio2_3/Makefile.in | 2 +-
> dlls/xaudio2_4/Makefile.in | 2 +-
> dlls/xaudio2_5/Makefile.in | 2 +-
> dlls/xaudio2_6/Makefile.in | 2 +-
> dlls/xaudio2_7/Makefile.in | 2 +-
> dlls/xaudio2_7/xapo.c | 8 ++++----
> dlls/xaudio2_7/xapofx.c | 6 +++---
> dlls/xaudio2_7/xaudio_dll.c | 10 +++++-----
> dlls/xaudio2_8/Makefile.in | 2 +-
> dlls/xaudio2_9/Makefile.in | 2 +-
> 18 files changed, 27 insertions(+), 27 deletions(-)
>
> diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in
> index 98340327178..1eb2e2210c0 100644
> --- a/dlls/xapofx1_1/Makefile.in
> +++ b/dlls/xapofx1_1/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAPOFX1_VER=1 -DXAUDIO2_VER=2
> +EXTRADEFS = -DXAPOFX1_VER=1 -DXAUDIO2_VER=2
> MODULE = xapofx1_1.dll
> IMPORTS = $(FAUDIO_PE_LIBS) ole32
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in
> index 450600c85ee..38db115b39a 100644
> --- a/dlls/xapofx1_2/Makefile.in
> +++ b/dlls/xapofx1_2/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAPOFX1_VER=2 -DXAUDIO2_VER=3
> +EXTRADEFS = -DXAPOFX1_VER=2 -DXAUDIO2_VER=3
> MODULE = xapofx1_2.dll
> IMPORTS = $(FAUDIO_PE_LIBS) ole32
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in
> index ffa542a982b..409fc9ad55b 100644
> --- a/dlls/xapofx1_3/Makefile.in
> +++ b/dlls/xapofx1_3/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAPOFX1_VER=3 -DXAUDIO2_VER=4
> +EXTRADEFS = -DXAPOFX1_VER=3 -DXAUDIO2_VER=4
> MODULE = xapofx1_3.dll
> IMPORTS = $(FAUDIO_PE_LIBS) ole32
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in
> index 23cc86c6025..63eccff64b0 100644
> --- a/dlls/xapofx1_4/Makefile.in
> +++ b/dlls/xapofx1_4/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAPOFX1_VER=4 -DXAUDIO2_VER=6
> +EXTRADEFS = -DXAPOFX1_VER=4 -DXAUDIO2_VER=6
> MODULE = xapofx1_4.dll
> IMPORTS = $(FAUDIO_PE_LIBS) ole32
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in
> index 9b23f2e68c0..fc692d781db 100644
> --- a/dlls/xapofx1_5/Makefile.in
> +++ b/dlls/xapofx1_5/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAPOFX1_VER=5 -DXAUDIO2_VER=7
> +EXTRADEFS = -DXAPOFX1_VER=5 -DXAUDIO2_VER=7
> MODULE = xapofx1_5.dll
> IMPORTS = $(FAUDIO_PE_LIBS) ole32
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in
> index adca89c6062..860e03e716f 100644
> --- a/dlls/xaudio2_0/Makefile.in
> +++ b/dlls/xaudio2_0/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=0
> +EXTRADEFS = -DXAUDIO2_VER=0
> MODULE = xaudio2_0.dll
> IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in
> index eeb297de6d6..fa942761308 100644
> --- a/dlls/xaudio2_1/Makefile.in
> +++ b/dlls/xaudio2_1/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=1
> +EXTRADEFS = -DXAUDIO2_VER=1
> MODULE = xaudio2_1.dll
> IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in
> index 0656e2b39d8..26eee0a6f31 100644
> --- a/dlls/xaudio2_2/Makefile.in
> +++ b/dlls/xaudio2_2/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=2
> +EXTRADEFS = -DXAUDIO2_VER=2
> MODULE = xaudio2_2.dll
> IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in
> index efbf392be5b..f6c555a9a3b 100644
> --- a/dlls/xaudio2_3/Makefile.in
> +++ b/dlls/xaudio2_3/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=3
> +EXTRADEFS = -DXAUDIO2_VER=3
> MODULE = xaudio2_3.dll
> IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in
> index 17d85ebdb17..33bd0c155db 100644
> --- a/dlls/xaudio2_4/Makefile.in
> +++ b/dlls/xaudio2_4/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=4
> +EXTRADEFS = -DXAUDIO2_VER=4
> MODULE = xaudio2_4.dll
> IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in
> index 2becbec90f4..c4035aeb13f 100644
> --- a/dlls/xaudio2_5/Makefile.in
> +++ b/dlls/xaudio2_5/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=5
> +EXTRADEFS = -DXAUDIO2_VER=5
> MODULE = xaudio2_5.dll
> IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in
> index faa71447a6f..dbe2ae7829f 100644
> --- a/dlls/xaudio2_6/Makefile.in
> +++ b/dlls/xaudio2_6/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=6
> +EXTRADEFS = -DXAUDIO2_VER=6
> MODULE = xaudio2_6.dll
> IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in
> index f0cb4e8c275..ef3987b693e 100644
> --- a/dlls/xaudio2_7/Makefile.in
> +++ b/dlls/xaudio2_7/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=7
> +EXTRADEFS = -DXAUDIO2_VER=7
> MODULE = xaudio2_7.dll
> IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c
> index 47210f1570e..1451816df9c 100644
> --- a/dlls/xaudio2_7/xapo.c
> +++ b/dlls/xaudio2_7/xapo.c
> @@ -74,7 +74,7 @@ static ULONG WINAPI XAPOFX_AddRef(IXAPO *iface)
> {
> XA2XAPOFXImpl *This = impl_from_IXAPO(iface);
> ULONG ref = This->fapo->AddRef(This->fapo);
> - TRACE("(%p)->(): Refcount now %u\n", This, ref);
> + TRACE("(%p)->(): Refcount now %lu\n", This, ref);
> return ref;
> }
>
> @@ -83,7 +83,7 @@ static ULONG WINAPI XAPOFX_Release(IXAPO *iface)
> XA2XAPOFXImpl *This = impl_from_IXAPO(iface);
> ULONG ref = This->fapo->Release(This->fapo);
>
> - TRACE("(%p)->(): Refcount now %u\n", This, ref);
> + TRACE("(%p)->(): Refcount now %lu\n", This, ref);
>
> if(!ref)
> HeapFree(GetProcessHeap(), 0, This);
> @@ -286,7 +286,7 @@ static ULONG WINAPI xapocf_AddRef(IClassFactory *iface)
> {
> struct xapo_cf *This = xapo_impl_from_IClassFactory(iface);
> ULONG ref = InterlockedIncrement(&This->ref);
> - TRACE("(%p)->(): Refcount now %u\n", This, ref);
> + TRACE("(%p)->(): Refcount now %lu\n", This, ref);
> return ref;
> }
>
> @@ -294,7 +294,7 @@ static ULONG WINAPI xapocf_Release(IClassFactory *iface)
> {
> struct xapo_cf *This = xapo_impl_from_IClassFactory(iface);
> ULONG ref = InterlockedDecrement(&This->ref);
> - TRACE("(%p)->(): Refcount now %u\n", This, ref);
> + TRACE("(%p)->(): Refcount now %lu\n", This, ref);
> if (!ref)
> HeapFree(GetProcessHeap(), 0, This);
> return ref;
> diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c
> index d1ded4fab92..acb175556a2 100644
> --- a/dlls/xaudio2_7/xapofx.c
> +++ b/dlls/xaudio2_7/xapofx.c
> @@ -69,7 +69,7 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 in
> }else{
> hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj);
> if(FAILED(hr)){
> - WARN("CoCreateInstance failed: %08x\n", hr);
> + WARN("CoCreateInstance failed: %08lx\n", hr);
> return hr;
> }
> }
> @@ -84,7 +84,7 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 in
> IXAPO_Release(xapo);
>
> if(FAILED(hr)){
> - WARN("Initialize failed: %08x\n", hr);
> + WARN("Initialize failed: %08lx\n", hr);
> IUnknown_Release(obj);
> return hr;
> }
> @@ -134,7 +134,7 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out)
> }else{
> hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj);
> if(FAILED(hr)){
> - WARN("CoCreateInstance failed: %08x\n", hr);
> + WARN("CoCreateInstance failed: %08lx\n", hr);
> return hr;
> }
> }
> diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
> index e5a83ebdbf8..5730e0b8811 100644
> --- a/dlls/xaudio2_7/xaudio_dll.c
> +++ b/dlls/xaudio2_7/xaudio_dll.c
> @@ -80,7 +80,7 @@ static XA2VoiceImpl *impl_from_IXAudio2Voice(IXAudio2Voice *iface);
>
> 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)
> {
> @@ -1403,7 +1403,7 @@ static ULONG WINAPI IXAudio2Impl_AddRef(IXAudio2 *iface)
> {
> IXAudio2Impl *This = impl_from_IXAudio2(iface);
> ULONG ref = FAudio_AddRef(This->faudio);
> - TRACE("(%p)->(): Refcount now %u\n", This, ref);
> + TRACE("(%p)->(): Refcount now %lu\n", This, ref);
> return ref;
> }
>
> @@ -1412,7 +1412,7 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface)
> IXAudio2Impl *This = impl_from_IXAudio2(iface);
> ULONG ref = FAudio_Release(This->faudio);
>
> - TRACE("(%p)->(): Refcount now %u\n", This, ref);
> + TRACE("(%p)->(): Refcount now %lu\n", This, ref);
>
> if (!ref) {
> XA2VoiceImpl *v, *v2;
> @@ -1792,7 +1792,7 @@ static ULONG WINAPI XAudio2CF_AddRef(IClassFactory *iface)
> {
> struct xaudio2_cf *This = impl_from_IClassFactory(iface);
> ULONG ref = InterlockedIncrement(&This->ref);
> - TRACE("(%p)->(): Refcount now %u\n", This, ref);
> + TRACE("(%p)->(): Refcount now %lu\n", This, ref);
> return ref;
> }
>
> @@ -1800,7 +1800,7 @@ static ULONG WINAPI XAudio2CF_Release(IClassFactory *iface)
> {
> struct xaudio2_cf *This = impl_from_IClassFactory(iface);
> ULONG ref = InterlockedDecrement(&This->ref);
> - TRACE("(%p)->(): Refcount now %u\n", This, ref);
> + TRACE("(%p)->(): Refcount now %lu\n", This, ref);
> if (!ref)
> HeapFree(GetProcessHeap(), 0, This);
> return ref;
> diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in
> index ddc22921dd0..3e00abd892d 100644
> --- a/dlls/xaudio2_8/Makefile.in
> +++ b/dlls/xaudio2_8/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=8
> +EXTRADEFS = -DXAUDIO2_VER=8
> MODULE = xaudio2_8.dll
> IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
> diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in
> index 5ded3cef196..eb299816b55 100644
> --- a/dlls/xaudio2_9/Makefile.in
> +++ b/dlls/xaudio2_9/Makefile.in
> @@ -1,4 +1,4 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=9
> +EXTRADEFS = -DXAUDIO2_VER=9
> MODULE = xaudio2_9.dll
> IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid
> EXTRAINCL = $(FAUDIO_PE_CFLAGS)
>
>
More information about the wine-devel
mailing list