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
81085498
Commit
81085498
authored
Jan 04, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winedos: Link to DirectSoundCreate through delayed imports instead of doing it by hand.
parent
0a8573a2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
16 deletions
+2
-16
Makefile.in
dlls/winedos/Makefile.in
+1
-1
soundblaster.c
dlls/winedos/soundblaster.c
+1
-15
No files found.
dlls/winedos/Makefile.in
View file @
81085498
...
...
@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH
=
@srcdir@
MODULE
=
winedos.dll
IMPORTS
=
user32 kernel32 kernel ntdll
DELAYIMPORTS
=
ddraw
DELAYIMPORTS
=
ddraw
dsound
C_SRCS
=
\
devices.c
\
...
...
dlls/winedos/soundblaster.c
View file @
81085498
...
...
@@ -61,9 +61,6 @@ static BYTE dma_buffer[DMATRFSIZE*2];
#define DSBUFLEN 4096
/* FIXME: Only this value seems to work */
/* Direct Sound playback stuff */
static
HMODULE
hmodule
;
typedef
HRESULT
(
WINAPI
*
fnDirectSoundCreate
)
(
LPGUID
,
LPDIRECTSOUND
*
,
LPUNKNOWN
);
static
fnDirectSoundCreate
lpDirectSoundCreate
;
static
LPDIRECTSOUND
lpdsound
;
static
LPDIRECTSOUNDBUFFER
lpdsbuf
;
static
DSBUFFERDESC
buf_desc
;
...
...
@@ -126,18 +123,7 @@ static BOOL SB_Init(void)
HRESULT
result
;
if
(
!
lpdsound
)
{
hmodule
=
LoadLibraryA
(
"dsound.dll"
);
if
(
!
hmodule
)
{
ERR
(
"Can't load dsound.dll !
\n
"
);
return
0
;
}
lpDirectSoundCreate
=
(
fnDirectSoundCreate
)
GetProcAddress
(
hmodule
,
"DirectSoundCreate"
);
if
(
!
lpDirectSoundCreate
)
{
/* CloseHandle(hmodule); */
ERR
(
"Can't find DirectSoundCreate function !
\n
"
);
return
0
;
}
result
=
(
*
lpDirectSoundCreate
)(
NULL
,
&
lpdsound
,
NULL
);
result
=
DirectSoundCreate
(
NULL
,
&
lpdsound
,
NULL
);
if
(
result
!=
DS_OK
)
{
ERR
(
"Unable to initialize Sound Subsystem err = %x !
\n
"
,
result
);
return
0
;
...
...
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