Akihiro Sagawa : dsound: Don't copy the position notify on duplicate.
Alexandre Julliard
julliard at winehq.org
Fri Jul 22 10:15:59 CDT 2011
Module: wine
Branch: master
Commit: 2ab3d22663818eeb3cc586f9531f1ca55233dac1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab3d22663818eeb3cc586f9531f1ca55233dac1
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date: Thu Jul 21 21:53:48 2011 +0900
dsound: Don't copy the position notify on duplicate.
---
dlls/dsound/buffer.c | 2 ++
dlls/dsound/tests/dsound.c | 7 +------
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index dbec55d..eb8e372 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -1214,6 +1214,8 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
dsb->state = STATE_STOPPED;
dsb->buf_mixpos = dsb->sec_mixpos = 0;
dsb->notify = NULL;
+ dsb->notifies = NULL;
+ dsb->nrofnotifies = 0;
dsb->device = device;
dsb->ds3db = NULL;
dsb->iks = NULL; /* FIXME? */
diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c
index 1eef7fb..64b188c 100644
--- a/dlls/dsound/tests/dsound.c
+++ b/dlls/dsound/tests/dsound.c
@@ -1063,12 +1063,7 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb,
return rc;
ret=WaitForMultipleObjects(count,event,FALSE,0);
- if (expected != WAIT_OBJECT_0+1) {
- todo_wine
- ok(ret==expected,"expected %d. got %d\n",expected,ret);
- }
- else
- ok(ret==expected,"expected %d. got %d\n",expected,ret);
+ ok(ret==expected,"expected %d. got %d\n",expected,ret);
return rc;
}
More information about the wine-cvs
mailing list