Module: wine Branch: master Commit: 4dd5893ad773833000d39058ce90e7207a8e805e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd5893ad773833000d39058ce...
Author: Michael Stefaniuc mstefani@redhat.de Date: Mon Oct 14 23:19:31 2013 +0200
dsound/tests: Compile with -D__WINESRC__.
---
dlls/dsound/tests/Makefile.in | 1 - dlls/dsound/tests/capture.c | 4 ++-- dlls/dsound/tests/ds3d.c | 2 +- dlls/dsound/tests/ds3d8.c | 2 +- dlls/dsound/tests/dsound.c | 4 ++-- dlls/dsound/tests/dsound8.c | 2 +- dlls/dsound/tests/duplex.c | 2 +- dlls/dsound/tests/propset.c | 1 + 8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in index 7302458..f97f716 100644 --- a/dlls/dsound/tests/Makefile.in +++ b/dlls/dsound/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = dsound.dll IMPORTS = ole32 version user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \ capture.c \ diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 74889d6..3e717f5 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -24,8 +24,8 @@ #include "initguid.h" #include "windows.h" #include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" -#include "mmreg.h" #include "dsconf.h"
#include "dsound_test.h" @@ -373,7 +373,7 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, state.wfx=&wfx; state.buffer_size = dscbcaps.dwBufferBytes; for (i = 0; i < NOTIFICATIONS; i++) - state.event[i] = CreateEvent( NULL, FALSE, FALSE, NULL ); + state.event[i] = CreateEventW(NULL, FALSE, FALSE, NULL); state.size = dscbcaps.dwBufferBytes / NOTIFICATIONS;
rc=IDirectSoundCaptureBuffer_QueryInterface(dscbo,&IID_IDirectSoundNotify, diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 7682851..8cf46a8 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -28,8 +28,8 @@ #include <math.h>
#include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" -#include "mmreg.h" #include "ks.h" #include "ksmedia.h" #include "dsound_test.h" diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 77f6f88..1c8b285 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -28,8 +28,8 @@ #include <math.h>
#include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" -#include "mmreg.h" #include "ks.h" #include "ksmedia.h" #include "dsound_test.h" diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 4be91fb..92262ce 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -29,9 +29,9 @@ #include <windows.h>
#include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" #include "dsconf.h" -#include "mmreg.h" #include "initguid.h" #include "ks.h" #include "ksmedia.h" @@ -1135,7 +1135,7 @@ static HRESULT test_duplicate(LPGUID lpGuid)
/* Prepare notify events */ for (i=0;i<sizeof(event)/sizeof(event[0]);i++) { - event[i] = CreateEvent(NULL,FALSE,FALSE,NULL); + event[i] = CreateEventW(NULL, FALSE, FALSE, NULL); }
/* Make silent buffer */ diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index fe5bbe0..dc7af3d 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -31,9 +31,9 @@ #include <stdio.h>
#include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" #include "dsconf.h" -#include "mmreg.h" #include "ks.h" #include "ksmedia.h"
diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index d30cc25..739811d 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -23,8 +23,8 @@ #include <stdio.h>
#include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" -#include "mmreg.h" #include "dsconf.h"
#include "dsound_test.h" diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index c62c02a..222120d 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -23,6 +23,7 @@ #include <windows.h>
#include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" #include "dsconf.h"