wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Alexandre Julliard : xaudio2: Remove unnecessary kernel32 imports.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 668e9754469c8e824fc9dcb7a16533ceb4c87ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=668e9754469c8e824fc9dcb7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 15:10:25 2016 +0900 xaudio2: Remove unnecessary kernel32 imports. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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_8/Makefile.in | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in index c0e31e3..cf15c7b 100644 --- a/dlls/xaudio2_0/Makefile.in +++ b/dlls/xaudio2_0/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=0 MODULE = xaudio2_0.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in index 7aab503..32a5a62 100644 --- a/dlls/xaudio2_1/Makefile.in +++ b/dlls/xaudio2_1/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=1 MODULE = xaudio2_1.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in index 77f21bd..f20de2d 100644 --- a/dlls/xaudio2_2/Makefile.in +++ b/dlls/xaudio2_2/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=2 MODULE = xaudio2_2.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in index ed6f3e1..ca749f2 100644 --- a/dlls/xaudio2_3/Makefile.in +++ b/dlls/xaudio2_3/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=3 MODULE = xaudio2_3.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in index a909a41..0b74f68 100644 --- a/dlls/xaudio2_4/Makefile.in +++ b/dlls/xaudio2_4/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=4 MODULE = xaudio2_4.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in index ad6955c..09356c9 100644 --- a/dlls/xaudio2_5/Makefile.in +++ b/dlls/xaudio2_5/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=5 MODULE = xaudio2_5.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in index b1e7584..e0ef588 100644 --- a/dlls/xaudio2_6/Makefile.in +++ b/dlls/xaudio2_6/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=6 MODULE = xaudio2_6.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in index 8baddfd..2f2e232 100644 --- a/dlls/xaudio2_7/Makefile.in +++ b/dlls/xaudio2_7/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=7 MODULE = xaudio2_7.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) C_SRCS = \ diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in index cf16eb7..d4efc41 100644 --- a/dlls/xaudio2_8/Makefile.in +++ b/dlls/xaudio2_8/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=8 MODULE = xaudio2_8.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7

1 0

Andrew Eikum : x3daudio1_0: Use shared source.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 5ada3cea45356c964ba19017d9fb5f4f9538b63a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ada3cea45356c964ba19017d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:41 2016 -0600 x3daudio1_0: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/x3daudio1_0/Makefile.in | 4 +++- dlls/x3daudio1_0/main.c | 36 ------------------------------------ dlls/x3daudio1_0/x3daudio1_0.spec | 4 ++-- 5 files changed, 7 insertions(+), 39 deletions(-) diff --git a/configure b/configure index 134fc6d..e279b96 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_0=${enable_x3daudio1_0:-no} enable_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} enable_x3daudio1_3=${enable_x3daudio1_3:-no} diff --git a/configure.ac b/configure.ac index baa9dd8..6eac752 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_0=${enable_x3daudio1_0:-no} enable_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} enable_x3daudio1_3=${enable_x3daudio1_3:-no} diff --git a/dlls/x3daudio1_0/Makefile.in b/dlls/x3daudio1_0/Makefile.in index 16d2868..9b4ce21 100644 --- a/dlls/x3daudio1_0/Makefile.in +++ b/dlls/x3daudio1_0/Makefile.in @@ -1,4 +1,6 @@ +EXTRADEFS = -DX3DAUDIO1_VER=0 -DXAUDIO2_VER=0 MODULE = x3daudio1_0.dll +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + x3daudio.c diff --git a/dlls/x3daudio1_0/main.c b/dlls/x3daudio1_0/main.c deleted file mode 100644 index 52a5e3d..0000000 --- a/dlls/x3daudio1_0/main.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2015 Andrew Eikum for CodeWeavers - * - * 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_0/x3daudio1_0.spec b/dlls/x3daudio1_0/x3daudio1_0.spec index 30da23c..0d6caa0 100644 --- a/dlls/x3daudio1_0/x3daudio1_0.spec +++ b/dlls/x3daudio1_0/x3daudio1_0.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

1 0

Andrew Eikum : x3daudio1_1: Use shared source.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: c3562ee7ea1933235b8b3b663cb869427ae0c142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3562ee7ea1933235b8b3b663… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:38 2016 -0600 x3daudio1_1: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/x3daudio1_1/Makefile.in | 4 +++- dlls/x3daudio1_1/main.c | 36 ------------------------------------ dlls/x3daudio1_1/x3daudio1_1.spec | 4 ++-- 5 files changed, 7 insertions(+), 39 deletions(-) diff --git a/configure b/configure index f259186..134fc6d 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_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} enable_x3daudio1_3=${enable_x3daudio1_3:-no} enable_x3daudio1_4=${enable_x3daudio1_4:-no} diff --git a/configure.ac b/configure.ac index 326c0ca..baa9dd8 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_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} enable_x3daudio1_3=${enable_x3daudio1_3:-no} enable_x3daudio1_4=${enable_x3daudio1_4:-no} diff --git a/dlls/x3daudio1_1/Makefile.in b/dlls/x3daudio1_1/Makefile.in index 3d90eaa..d866dc3 100644 --- a/dlls/x3daudio1_1/Makefile.in +++ b/dlls/x3daudio1_1/Makefile.in @@ -1,4 +1,6 @@ +EXTRADEFS = -DX3DAUDIO1_VER=1 -DXAUDIO2_VER=1 MODULE = x3daudio1_1.dll +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + x3daudio.c diff --git a/dlls/x3daudio1_1/main.c b/dlls/x3daudio1_1/main.c deleted file mode 100644 index 9fc9bd2..0000000 --- a/dlls/x3daudio1_1/main.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2015 Austin English - * - * 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_1/x3daudio1_1.spec b/dlls/x3daudio1_1/x3daudio1_1.spec index 30da23c..0d6caa0 100644 --- a/dlls/x3daudio1_1/x3daudio1_1.spec +++ b/dlls/x3daudio1_1/x3daudio1_1.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

1 0

Andrew Eikum : x3daudio1_2: Use shared source.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 07fb596afc2f41cea28677dc864389c3f54df3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07fb596afc2f41cea28677dc8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:35 2016 -0600 x3daudio1_2: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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

1 0

Andrew Eikum : x3daudio1_3: Use shared source.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 85fc75af1fbbd7acf9cf343cdb221fee4dd8d137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85fc75af1fbbd7acf9cf343cd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:32 2016 -0600 x3daudio1_3: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/x3daudio1_3/Makefile.in | 4 +++- dlls/x3daudio1_3/main.c | 37 ------------------------------------- dlls/x3daudio1_3/x3daudio1_3.spec | 4 ++-- 5 files changed, 7 insertions(+), 40 deletions(-) diff --git a/configure b/configure index 5fd6276..462543f 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_3=${enable_x3daudio1_3:-no} enable_x3daudio1_4=${enable_x3daudio1_4:-no} enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} diff --git a/configure.ac b/configure.ac index 5477fcc..5e0f131 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_3=${enable_x3daudio1_3:-no} enable_x3daudio1_4=${enable_x3daudio1_4:-no} enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} diff --git a/dlls/x3daudio1_3/Makefile.in b/dlls/x3daudio1_3/Makefile.in index 631d065..cfd2c6c 100644 --- a/dlls/x3daudio1_3/Makefile.in +++ b/dlls/x3daudio1_3/Makefile.in @@ -1,4 +1,6 @@ +EXTRADEFS = -DX3DAUDIO1_VER=3 -DXAUDIO2_VER=3 MODULE = x3daudio1_3.dll +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + x3daudio.c diff --git a/dlls/x3daudio1_3/main.c b/dlls/x3daudio1_3/main.c deleted file mode 100644 index debb65c..0000000 --- a/dlls/x3daudio1_3/main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2015 Andrey Gusev - * - * 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_3/x3daudio1_3.spec b/dlls/x3daudio1_3/x3daudio1_3.spec index 30da23c..0d6caa0 100644 --- a/dlls/x3daudio1_3/x3daudio1_3.spec +++ b/dlls/x3daudio1_3/x3daudio1_3.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

1 0

Andrew Eikum : x3daudio1_4: Use shared source.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: bba6f812307adcc46cde578988a0dcd8a854e910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba6f812307adcc46cde57898… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:29 2016 -0600 x3daudio1_4: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/x3daudio1_4/Makefile.in | 4 +++- dlls/x3daudio1_4/main.c | 37 ------------------------------------- dlls/x3daudio1_4/x3daudio1_4.spec | 4 ++-- 5 files changed, 7 insertions(+), 40 deletions(-) diff --git a/configure b/configure index 09c3704..5fd6276 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_4=${enable_x3daudio1_4:-no} enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} diff --git a/configure.ac b/configure.ac index 9ba2818..5477fcc 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_4=${enable_x3daudio1_4:-no} enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} diff --git a/dlls/x3daudio1_4/Makefile.in b/dlls/x3daudio1_4/Makefile.in index e116f84..bd0eac7 100644 --- a/dlls/x3daudio1_4/Makefile.in +++ b/dlls/x3daudio1_4/Makefile.in @@ -1,4 +1,6 @@ +EXTRADEFS = -DX3DAUDIO1_VER=4 -DXAUDIO2_VER=4 MODULE = x3daudio1_4.dll +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + x3daudio.c diff --git a/dlls/x3daudio1_4/main.c b/dlls/x3daudio1_4/main.c deleted file mode 100644 index debb65c..0000000 --- a/dlls/x3daudio1_4/main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2015 Andrey Gusev - * - * 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_4/x3daudio1_4.spec b/dlls/x3daudio1_4/x3daudio1_4.spec index 30da23c..0d6caa0 100644 --- a/dlls/x3daudio1_4/x3daudio1_4.spec +++ b/dlls/x3daudio1_4/x3daudio1_4.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

1 0

Andrew Eikum : x3daudio1_5: Use shared source.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: b65465f3318b52699b6ef7fa5ee06a44cb42c67c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b65465f3318b52699b6ef7fa5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:26 2016 -0600 x3daudio1_5: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/x3daudio1_5/Makefile.in | 4 +++- dlls/x3daudio1_5/main.c | 37 ------------------------------------- dlls/x3daudio1_5/x3daudio1_5.spec | 4 ++-- 5 files changed, 7 insertions(+), 40 deletions(-) diff --git a/configure b/configure index e87d306..09c3704 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_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} diff --git a/configure.ac b/configure.ac index 8ef64f5..9ba2818 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_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} diff --git a/dlls/x3daudio1_5/Makefile.in b/dlls/x3daudio1_5/Makefile.in index 42a7f61..dac67ae 100644 --- a/dlls/x3daudio1_5/Makefile.in +++ b/dlls/x3daudio1_5/Makefile.in @@ -1,4 +1,6 @@ +EXTRADEFS = -DX3DAUDIO1_VER=5 -DXAUDIO2_VER=5 MODULE = x3daudio1_5.dll +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + x3daudio.c diff --git a/dlls/x3daudio1_5/main.c b/dlls/x3daudio1_5/main.c deleted file mode 100644 index debb65c..0000000 --- a/dlls/x3daudio1_5/main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2015 Andrey Gusev - * - * 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_5/x3daudio1_5.spec b/dlls/x3daudio1_5/x3daudio1_5.spec index 30da23c..0d6caa0 100644 --- a/dlls/x3daudio1_5/x3daudio1_5.spec +++ b/dlls/x3daudio1_5/x3daudio1_5.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

1 0

Andrew Eikum : x3daudio1_6: Use shared source.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 76af4bdd7b9d39f51d5de8a085d1d91779dbb672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76af4bdd7b9d39f51d5de8a08… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:23 2016 -0600 x3daudio1_6: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/x3daudio1_6/Makefile.in | 4 +++- dlls/x3daudio1_6/main.c | 42 --------------------------------------- dlls/x3daudio1_6/x3daudio1_6.spec | 4 ++-- 5 files changed, 7 insertions(+), 45 deletions(-) diff --git a/configure b/configure index 031ed41..e87d306 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_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_2=${enable_xapofx1_2:-no} diff --git a/configure.ac b/configure.ac index 9f2c24e..8ef64f5 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_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_2=${enable_xapofx1_2:-no} diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in index ad59b8f..177fb8d 100644 --- a/dlls/x3daudio1_6/Makefile.in +++ b/dlls/x3daudio1_6/Makefile.in @@ -1,4 +1,6 @@ +EXTRADEFS = -DX3DAUDIO1_VER=6 -DXAUDIO2_VER=6 MODULE = x3daudio1_6.dll +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + x3daudio.c diff --git a/dlls/x3daudio1_6/main.c b/dlls/x3daudio1_6/main.c deleted file mode 100644 index d39863c..0000000 --- a/dlls/x3daudio1_6/main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2015 Austin English - * - * 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" - -#include "x3daudio.h" - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - - return TRUE; -} diff --git a/dlls/x3daudio1_6/x3daudio1_6.spec b/dlls/x3daudio1_6/x3daudio1_6.spec index 30da23c..0d6caa0 100644 --- a/dlls/x3daudio1_6/x3daudio1_6.spec +++ b/dlls/x3daudio1_6/x3daudio1_6.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

1 0

Andrew Eikum : x3daudio1_7: Use shared source.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 63ef6b9a7d30ade3f4ee32b6e6920fafbfbcc5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ef6b9a7d30ade3f4ee32b6e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:19 2016 -0600 x3daudio1_7: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 ++- configure.ac | 3 ++- dlls/x3daudio1_7/Makefile.in | 5 +++-- dlls/x3daudio1_7/main.c | 45 --------------------------------------- dlls/x3daudio1_7/x3daudio1_7.spec | 4 ++-- dlls/xaudio2_7/x3daudio.c | 29 ++++++++++++++++++++++++- dlls/xaudio2_8/Makefile.in | 1 - 7 files changed, 37 insertions(+), 53 deletions(-) diff --git a/configure b/configure index 70c5ea9..031ed41 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_7=${enable_x3daudio1_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_2=${enable_xapofx1_2:-no} enable_xapofx1_3=${enable_xapofx1_3:-no} @@ -18047,7 +18048,7 @@ wine_fn_config_dll xaudio2_5 enable_xaudio2_5 clean wine_fn_config_dll xaudio2_6 enable_xaudio2_6 clean wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean wine_fn_config_test dlls/xaudio2_7/tests xaudio2_7_test -wine_fn_config_dll xaudio2_8 enable_xaudio2_8 clean,implib +wine_fn_config_dll xaudio2_8 enable_xaudio2_8 clean wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput diff --git a/configure.ac b/configure.ac index 8aca9a1..9f2c24e 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_7=${enable_x3daudio1_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_2=${enable_xapofx1_2:-no} enable_xapofx1_3=${enable_xapofx1_3:-no} @@ -3391,7 +3392,7 @@ WINE_CONFIG_DLL(xaudio2_5,,[clean]) WINE_CONFIG_DLL(xaudio2_6,,[clean]) WINE_CONFIG_DLL(xaudio2_7,,[clean]) WINE_CONFIG_TEST(dlls/xaudio2_7/tests) -WINE_CONFIG_DLL(xaudio2_8,,[clean,implib]) +WINE_CONFIG_DLL(xaudio2_8,,[clean]) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput]) diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in index 299351e..019588d 100644 --- a/dlls/x3daudio1_7/Makefile.in +++ b/dlls/x3daudio1_7/Makefile.in @@ -1,5 +1,6 @@ +EXTRADEFS = -DX3DAUDIO1_VER=7 -DXAUDIO2_VER=7 MODULE = x3daudio1_7.dll -IMPORTS = xaudio2_8 +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + x3daudio.c diff --git a/dlls/x3daudio1_7/main.c b/dlls/x3daudio1_7/main.c deleted file mode 100644 index 5d1a5a5..0000000 --- a/dlls/x3daudio1_7/main.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2014 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" -#include "x3daudio.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; -} - -void CDECL X3DA17_X3DAudioInitialize(UINT32 chanmask, float speedofsound, - X3DAUDIO_HANDLE handle) -{ - /* forward to xaudio2_8 */ - X3DAudioInitialize(chanmask, speedofsound, handle); -} diff --git a/dlls/x3daudio1_7/x3daudio1_7.spec b/dlls/x3daudio1_7/x3daudio1_7.spec index 78926ef..0d6caa0 100644 --- a/dlls/x3daudio1_7/x3daudio1_7.spec +++ b/dlls/x3daudio1_7/x3daudio1_7.spec @@ -1,2 +1,2 @@ -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) xaudio2_8.X3DAudioCalculate -@ cdecl X3DAudioInitialize(long float ptr) X3DA17_X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) +@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index 2966f56..a182852 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -25,6 +25,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +#ifdef X3DAUDIO1_VER +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, reason, pReserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} +#endif /* X3DAUDIO1_VER */ + #if XAUDIO2_VER >= 8 HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, X3DAUDIO_HANDLE handle) @@ -32,7 +49,17 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, FIXME("0x%x, %f, %p: Stub!\n", chanmask, speedofsound, handle); return S_OK; } +#endif /* XAUDIO2_VER >= 8 */ + +#ifdef X3DAUDIO1_VER +void CDECL LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound, + X3DAUDIO_HANDLE handle) +{ + FIXME("0x%x, %f, %p: Stub!\n", chanmask, speedofsound, handle); +} +#endif /* X3DAUDIO1_VER */ +#if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER void CDECL X3DAudioCalculate(const X3DAUDIO_HANDLE handle, const X3DAUDIO_LISTENER *listener, const X3DAUDIO_EMITTER *emitter, UINT32 flags, X3DAUDIO_DSP_SETTINGS *out) @@ -52,4 +79,4 @@ void CDECL X3DAudioCalculate(const X3DAUDIO_HANDLE handle, out->EmitterVelocityComponent = 0; out->ListenerVelocityComponent = 0; } -#endif /* XAUDIO2_VER >= 8 */ +#endif /* XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER */ diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in index 55f5ea2..cf16eb7 100644 --- a/dlls/xaudio2_8/Makefile.in +++ b/dlls/xaudio2_8/Makefile.in @@ -1,6 +1,5 @@ EXTRADEFS = -DXAUDIO2_VER=8 MODULE = xaudio2_8.dll -IMPORTLIB = xaudio2_8 IMPORTS = advapi32 kernel32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7

1 0

Alistair Leslie-Hughes : include: Add declaration D3DXDisassembleEffect.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 40827cbb2d0aed646f4c993b4d6c5291bbe80300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40827cbb2d0aed646f4c993b4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 12 18:32:29 2016 +1100 include: Add declaration D3DXDisassembleEffect. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx9effect.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 25d1fd2..3f527ed 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -425,6 +425,8 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WC ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors); #define D3DXCreateEffectCompilerFromResource WINELIB_NAME_AW(D3DXCreateEffectCompilerFromResource) +HRESULT WINAPI D3DXDisassembleEffect(ID3DXEffect *effect, BOOL enable_color_code, ID3DXBuffer **disassembly); + #ifdef __cplusplus } #endif

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016