Andrew Eikum : x3daudio1_2: Use shared source.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 07fb596afc2f41cea28677dc864389c3f54df3c7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=07fb596afc2f41cea28677dc86...

Author: Andrew Eikum 
Date:   Thu Jan 14 11:38:35 2016 -0600

x3daudio1_2: Use shared source.

Signed-off-by: Andrew Eikum 
Signed-off-by: Alexandre Julliard

---

configure                         |  1 +
 configure.ac                      |  1 +
 dlls/x3daudio1_2/Makefile.in      |  4 +++-
 dlls/x3daudio1_2/main.c           | 37 -------------------------------------
 dlls/x3daudio1_2/x3daudio1_2.spec |  4 ++--
 5 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/configure b/configure
index 462543f..f259186 100755
--- a/configure
+++ b/configure
@@ -13719,6 +13719,7 @@ fi
 if test "x$ac_cv_have_openalsoft" != xyes
 then
     as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported"
+    enable_x3daudio1_2=${enable_x3daudio1_2:-no}
     enable_x3daudio1_3=${enable_x3daudio1_3:-no}
     enable_x3daudio1_4=${enable_x3daudio1_4:-no}
     enable_x3daudio1_5=${enable_x3daudio1_5:-no}
diff --git a/configure.ac b/configure.ac
index 5e0f131..326c0ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1662,6 +1662,7 @@ fi
 if test "x$ac_cv_have_openalsoft" != xyes
 then
     WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported])
+    enable_x3daudio1_2=${enable_x3daudio1_2:-no}
     enable_x3daudio1_3=${enable_x3daudio1_3:-no}
     enable_x3daudio1_4=${enable_x3daudio1_4:-no}
     enable_x3daudio1_5=${enable_x3daudio1_5:-no}
diff --git a/dlls/x3daudio1_2/Makefile.in b/dlls/x3daudio1_2/Makefile.in
index 6632115..d5de11b 100644
--- a/dlls/x3daudio1_2/Makefile.in
+++ b/dlls/x3daudio1_2/Makefile.in
@@ -1,4 +1,6 @@
+EXTRADEFS = -DX3DAUDIO1_VER=2 -DXAUDIO2_VER=2
 MODULE    = x3daudio1_2.dll
+PARENTSRC = ../xaudio2_7

C_SRCS = \
-	main.c
+	x3daudio.c
diff --git a/dlls/x3daudio1_2/main.c b/dlls/x3daudio1_2/main.c
deleted file mode 100644
index d71c54a..0000000
--- a/dlls/x3daudio1_2/main.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2015 Alex Henrie
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
-{
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(instance);
-            break;
-    }
-
-    return TRUE;
-}
diff --git a/dlls/x3daudio1_2/x3daudio1_2.spec b/dlls/x3daudio1_2/x3daudio1_2.spec
index 30da23c..0d6caa0 100644
--- a/dlls/x3daudio1_2/x3daudio1_2.spec
+++ b/dlls/x3daudio1_2/x3daudio1_2.spec
@@ -1,2 +1,2 @@
-@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) xaudio2_8.X3DAudioCalculate
-@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_7.X3DAudioInitialize
+@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr)
+@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize