system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-15 00:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

winedos: Link to DirectSoundCreate through delayed imports instead of doing it by hand.

Browse source
This commit is contained in:
Alexandre Julliard 2010-01-04 17:58:25 +01:00
parent 0a8573a226
commit 8108549804
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/winedos/Makefile.in
View file

@ -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 \

16
dlls/winedos/soundblaster.c
View file

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