xapofx1_1: Enable compilation with long types.

dlls/xapofx1_1/Makefile.in

-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)

dlls/xapofx1_2/Makefile.in

-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)

dlls/xapofx1_3/Makefile.in

-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)

dlls/xapofx1_4/Makefile.in

-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)

dlls/xapofx1_5/Makefile.in

-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)

dlls/xaudio2_0/Makefile.in

-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)

dlls/xaudio2_1/Makefile.in

-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)

dlls/xaudio2_2/Makefile.in

-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)

dlls/xaudio2_3/Makefile.in

-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)

dlls/xaudio2_4/Makefile.in

-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)

dlls/xaudio2_5/Makefile.in

-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)

dlls/xaudio2_6/Makefile.in

-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)

dlls/xaudio2_7/Makefile.in

-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)

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;

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;
         }
     }

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;

dlls/xaudio2_8/Makefile.in

-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)

dlls/xaudio2_9/Makefile.in

-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)