Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
719d2263
Commit
719d2263
authored
Jan 12, 2016
by
Andrew Eikum
Committed by
Alexandre Julliard
Jan 13, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xaudio2_1: Use shared source.
Signed-off-by:
Andrew Eikum
<
aeikum@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
279b3535
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
98 deletions
+32
-98
configure
configure
+1
-0
configure.ac
configure.ac
+1
-0
Makefile.in
dlls/xaudio2_1/Makefile.in
+6
-1
xaudio2_1.spec
dlls/xaudio2_1/xaudio2_1.spec
+1
-1
xaudio_classes.idl
dlls/xaudio2_1/xaudio_classes.idl
+0
-42
xaudio_dll.c
dlls/xaudio2_1/xaudio_dll.c
+0
-54
xaudio_classes.idl
dlls/xaudio2_7/xaudio_classes.idl
+23
-0
No files found.
configure
View file @
719d2263
...
...
@@ -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_xaudio2_1
=
${
enable_xaudio2_1
:-
no
}
enable_xaudio2_2
=
${
enable_xaudio2_2
:-
no
}
enable_xaudio2_3
=
${
enable_xaudio2_3
:-
no
}
enable_xaudio2_4
=
${
enable_xaudio2_4
:-
no
}
...
...
configure.ac
View file @
719d2263
...
...
@@ -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_xaudio2_1=${enable_xaudio2_1:-no}
enable_xaudio2_2=${enable_xaudio2_2:-no}
enable_xaudio2_3=${enable_xaudio2_3:-no}
enable_xaudio2_4=${enable_xaudio2_4:-no}
...
...
dlls/xaudio2_1/Makefile.in
View file @
719d2263
EXTRADEFS
=
-DXAUDIO2_VER
=
1
MODULE
=
xaudio2_1.dll
IMPORTS
=
ole32
IMPORTS
=
advapi32 kernel32 ole32 user32 uuid
EXTRALIBS
=
$(OPENAL_LIBS)
PARENTSRC
=
../xaudio2_7
C_SRCS
=
\
compat.c
\
xapofx.c
\
xaudio_dll.c
IDL_SRCS
=
xaudio_classes.idl
dlls/xaudio2_1/xaudio2_1.spec
View file @
719d2263
@ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(ptr ptr ptr)
xaudio2_7.DllGetClassObject
@ stdcall -private DllGetClassObject(ptr ptr ptr)
@ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer()
dlls/xaudio2_1/xaudio_classes.idl
deleted
100644 → 0
View file @
279b3535
/*
*
COM
Classes
for
xaudio
*
*
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
*/
#
pragma
makedep
register
[
helpstring
(
"XAudio2.1 Class"
),
threading
(
both
),
uuid
(
e21a7345
-
eb21
-
468
e
-
be50
-
804
db97cf708
)
]
coclass
XAudio21
{
interface
IXAudio22
; }
[
helpstring
(
"XAudio2.1 AudioReverb Class"
),
threading
(
both
),
uuid
(
f4769300
-
b949
-
4
df9
-
b333
-
00
d33932e9a6
)
]
coclass
AudioReverb21
{
interface
IXAPO
; }
[
helpstring
(
"XAudio2.1 AudioVolumeMeter Class"
),
threading
(
both
),
uuid
(
c1e3f122
-
a2ea
-
442
c
-
854
f
-
20
d98f8357a1
)
]
coclass
AudioVolumeMeter21
{
interface
IXAPO
; }
dlls/xaudio2_1/xaudio_dll.c
deleted
100644 → 0
View file @
279b3535
/*
* Copyright (c) 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 <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "objbase.h"
#include "rpcproxy.h"
static
HINSTANCE
instance
;
BOOL
WINAPI
DllMain
(
HINSTANCE
hinstance
,
DWORD
reason
,
LPVOID
reserved
)
{
switch
(
reason
)
{
case
DLL_WINE_PREATTACH
:
return
FALSE
;
/* prefer native version */
case
DLL_PROCESS_ATTACH
:
instance
=
hinstance
;
DisableThreadLibraryCalls
(
hinstance
);
break
;
}
return
TRUE
;
}
HRESULT
WINAPI
DllCanUnloadNow
(
void
)
{
return
S_FALSE
;
}
HRESULT
WINAPI
DllRegisterServer
(
void
)
{
return
__wine_register_resources
(
instance
);
}
HRESULT
WINAPI
DllUnregisterServer
(
void
)
{
return
__wine_unregister_resources
(
instance
);
}
dlls/xaudio2_7/xaudio_classes.idl
View file @
719d2263
...
...
@@ -234,3 +234,26 @@ coclass AudioReverb22 { interface IXAPO; }
]
coclass
AudioVolumeMeter22
{
interface
IXAPO
; }
#
endif
/*
XAUDIO2_VER
==
2
*/
#
if
XAUDIO2_VER
==
1
[
helpstring
(
"XAudio2.1 Class"
),
threading
(
both
),
uuid
(
e21a7345
-
eb21
-
468
e
-
be50
-
804
db97cf708
)
]
coclass
XAudio21
{
interface
IXAudio22
; }
[
helpstring
(
"XAudio2.1 AudioReverb Class"
),
threading
(
both
),
uuid
(
f4769300
-
b949
-
4
df9
-
b333
-
00
d33932e9a6
)
]
coclass
AudioReverb21
{
interface
IXAPO
; }
[
helpstring
(
"XAudio2.1 AudioVolumeMeter Class"
),
threading
(
both
),
uuid
(
c1e3f122
-
a2ea
-
442
c
-
854
f
-
20
d98f8357a1
)
]
coclass
AudioVolumeMeter21
{
interface
IXAPO
; }
#
endif
/*
XAUDIO2_VER
==
1
*/
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment