May 2017 - Wine-commits - list.winehq.org

Jacek Caban : ntdll/tests: Added FSCTL_PIPE_PEEK tests.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 4370073bbfea01bad9a600046903a4fa6ed7a525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4370073bbfea01bad9a600046… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 10 18:55:41 2017 +0200 ntdll/tests: Added FSCTL_PIPE_PEEK tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index e242cb4..c0a785b 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -724,6 +724,31 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) ok( !reserved, "reserved is not 0: %x\n", reserved ); } +static void test_peek(HANDLE pipe) +{ + FILE_PIPE_PEEK_BUFFER buf; + IO_STATUS_BLOCK iosb; + HANDLE event = CreateEventA( NULL, TRUE, FALSE, NULL ); + NTSTATUS status; + + memset(&iosb, 0x55, sizeof(iosb)); + status = NtFsControlFile(pipe, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, &buf, sizeof(buf)); + ok(!status || status == STATUS_PENDING, "NtFsControlFile failed: %x\n", status); + ok(!iosb.Status, "iosb.Status = %x\n", iosb.Status); + ok(buf.ReadDataAvailable == 1, "ReadDataAvailable = %u\n", buf.ReadDataAvailable); + + ResetEvent(event); + memset(&iosb, 0x55, sizeof(iosb)); + status = NtFsControlFile(pipe, event, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, &buf, sizeof(buf)); + ok(!status || status == STATUS_PENDING, "NtFsControlFile failed: %x\n", status); + ok(buf.ReadDataAvailable == 1, "ReadDataAvailable = %u\n", buf.ReadDataAvailable); + ok(!iosb.Status, "iosb.Status = %x\n", iosb.Status); + todo_wine + ok(is_signaled(event), "event is not signaled\n"); + + CloseHandle(event); +} + #define PIPENAME "\\\\.\\pipe\\ntdll_tests_pipe.c" static BOOL create_pipe_pair( HANDLE *read, HANDLE *write, ULONG flags, ULONG type, ULONG size ) @@ -829,6 +854,9 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ResetEvent( event ); ret = WriteFile( write, buffer, 1, &written, NULL ); ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); + + test_peek(read); + status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );

1 0

Alexandre Julliard : qcap: Fix build when O_CLOEXEC isn't defined.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: bcc36abd8886f035652630fa62bd732519c83d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc36abd8886f035652630fa6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 13:08:57 2017 -0500 qcap: Fix build when O_CLOEXEC isn't defined. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index d67df73..b4b7b96 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -799,12 +799,16 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) sprintf(device, "/dev/video%i", card); TRACE("opening %s\n", device); - capBox->fd = video_open(device, O_RDWR | O_NONBLOCK | O_CLOEXEC); +#ifdef O_CLOEXEC + if ((capBox->fd = video_open(device, O_RDWR | O_NONBLOCK | O_CLOEXEC)) == -1 && errno == EINVAL) +#endif + capBox->fd = video_open(device, O_RDWR | O_NONBLOCK); if (capBox->fd == -1) { WARN("open failed (%d)\n", errno); goto error; } + fcntl( capBox->fd, F_SETFD, FD_CLOEXEC ); /* in case O_CLOEXEC isn't supported */ memset(&capa, 0, sizeof(capa));

1 0

Alexandre Julliard : winex11: Simplify the clipboard HTML export function.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 0bdebc66c634098e24258abcbc80403243356a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bdebc66c634098e24258abcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 15:28:12 2017 -0500 winex11: Simplify the clipboard HTML export function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 61 +++++++++++--------------------------------- 1 file changed, 15 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 4cb8cb8..2566d01 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1293,28 +1293,6 @@ static BOOL export_enhmetafile( Display *display, Window win, Atom prop, Atom ta /************************************************************************** - * get_html_description_field - * - * Find the value of a field in an HTML Format description. - */ -static LPCSTR get_html_description_field(LPCSTR data, LPCSTR keyword) -{ - LPCSTR pos=data; - - while (pos && *pos && *pos != '<') - { - if (memcmp(pos, keyword, strlen(keyword)) == 0) - return pos+strlen(keyword); - - pos = strchr(pos, '\n'); - if (pos) pos++; - } - - return NULL; -} - - -/************************************************************************** * export_text_html * * Export HTML Format to text/html. @@ -1323,36 +1301,27 @@ static LPCSTR get_html_description_field(LPCSTR data, LPCSTR keyword) */ static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) { - LPCSTR data, field_value; - UINT fragmentstart, fragmentend; - - data = GlobalLock( handle ); + const char *p, *data; + UINT start = 0, end = 0; + BOOL ret = TRUE; - /* read the important fields */ - field_value = get_html_description_field(data, "StartFragment:"); - if (!field_value) - { - ERR("Couldn't find StartFragment value\n"); - goto failed; - } - fragmentstart = atoi(field_value); + if (!(data = GlobalLock( handle ))) return FALSE; - field_value = get_html_description_field(data, "EndFragment:"); - if (!field_value) + p = data; + while (*p && *p != '<') { - ERR("Couldn't find EndFragment value\n"); - goto failed; + if (!strncmp( p, "StartFragment:", 14 )) start = atoi( p + 14 ); + else if (!strncmp( p, "EndFragment:", 12 )) end = atoi( p + 12 ); + if (!(p = strpbrk( p, "\r\n" ))) break; + while (*p == '\r' || *p == '\n') p++; } - fragmentend = atoi(field_value); - - /* export only the fragment */ - put_property( display, win, prop, target, 8, &data[fragmentstart], fragmentend - fragmentstart ); - GlobalUnlock( handle ); - return TRUE; + if (start && start < end && end <= GlobalSize( handle )) + put_property( display, win, prop, target, 8, data + start, end - start ); + else + ret = FALSE; -failed: GlobalUnlock( handle ); - return FALSE; + return ret; }

1 0

Alexandre Julliard : winex11: Remove all trailing nulls when exporting text strings.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 68bbf6fb18464f2b1f09954dda8dc121393a3046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68bbf6fb18464f2b1f09954dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 15:28:27 2017 -0500 winex11: Remove all trailing nulls when exporting text strings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 2566d01..3c1f3b4 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1130,7 +1130,7 @@ static char *string_from_unicode_text( UINT codepage, HANDLE handle, UINT *size if (str[i] == '\r' && (i == len - 1 || str[i + 1] == '\n')) continue; str[j++] = str[i]; } - if (j && !str[j - 1]) j--; /* remove trailing null */ + while (j && !str[j - 1]) j--; /* remove trailing nulls */ *size = j; TRACE( "returning %s\n", debugstr_an( str, j )); }

1 0

Alexandre Julliard : user32/tests: Test resulting size of strings with trailing nulls.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 0647abc5071913506e681bfc5239f9a6078dca54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0647abc5071913506e681bfc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 15:29:11 2017 -0500 user32/tests: Test resulting size of strings with trailing nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 17fc028..5527a6e 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -482,19 +482,19 @@ todo_wine static HGLOBAL create_textA(void) { - HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 5); + HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 10); char *p = GlobalLock(h); - strcpy(p, "test"); + memcpy(p, "test\0\0\0\0\0", 10); GlobalUnlock(h); return h; } static HGLOBAL create_textW(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; - HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 5 * sizeof(WCHAR)); + static const WCHAR testW[] = {'t','e','s','t',0,0,0,0,0,0}; + HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, sizeof(testW)); WCHAR *p = GlobalLock(h); - lstrcpyW(p, testW); + memcpy(p, testW, sizeof(testW)); GlobalUnlock(h); return h; } @@ -767,7 +767,9 @@ static void test_synthesized(void) ok(data != NULL || broken( tests[i].format == CF_DIBV5 && cf == CF_DIB ), /* >= Vista */ "%u: couldn't get data, cf %04x err %d\n", i, cf, GetLastError()); - if (cf == CF_LOCALE) + switch (cf) + { + case CF_LOCALE: { UINT *ptr = GlobalLock( data ); ok( GlobalSize( data ) == sizeof(*ptr), "%u: size %lu\n", i, GlobalSize( data )); @@ -775,6 +777,15 @@ static void test_synthesized(void) broken( *ptr == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )), "%u: CF_LOCALE %08x/%08x\n", i, *ptr, GetUserDefaultLCID() ); GlobalUnlock( data ); + break; + } + case CF_TEXT: + case CF_OEMTEXT: + ok( GlobalSize( data ) == 10, "wrong len %ld\n", GlobalSize( data )); + break; + case CF_UNICODETEXT: + ok( GlobalSize( data ) == 10 * sizeof(WCHAR), "wrong len %ld\n", GlobalSize( data )); + break; } } if (!tests[i].expected[j])

1 0

Michael Stefaniuc : dmusic/tests: Expand the dsound refcount testing with the port.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 251d1c0b86c8b26602f97e0ac6a7ee5bcf67f8ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=251d1c0b86c8b26602f97e0ac… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 10 14:43:58 2017 +0200 dmusic/tests: Expand the dsound refcount testing with the port. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 70 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 8473a40..1d1f948 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -132,9 +132,16 @@ static void test_setdsound(void) { IDirectMusic *dmusic; IDirectSound *dsound, *dsound2; + DMUS_PORTPARAMS params; + IDirectMusicPort *port = NULL; HRESULT hr; ULONG ref; + params.dwSize = sizeof(params); + params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; + params.dwChannelGroups = 1; + params.dwAudioChannels = 2; + /* Old dsound without SetCooperativeLevel() */ hr = DirectSoundCreate(NULL, &dsound, NULL); if (hr == DSERR_NODRIVER ) { @@ -147,6 +154,9 @@ static void test_setdsound(void) ok(hr == S_OK, "DirectMusic create failed: %08x\n", hr); hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &params, &port, NULL); + ok(hr == S_OK, "CreatePort returned: %x\n", hr); + IDirectMusicPort_Release(port); IDirectMusic_Release(dmusic); IDirectSound_Release(dsound); @@ -162,9 +172,23 @@ static void test_setdsound(void) ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &params, &port, NULL); + ok(hr == S_OK, "CreatePort returned: %x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + hr = IDirectMusicPort_Activate(port, TRUE); + ok(hr == S_OK, "Port Activate returned: %x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 4, "dsound ref count got %d expected 4\n", ref); /* Releasing dsound from dmusic */ hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); + todo_wine ok(hr == DMUS_E_DSOUND_ALREADY_SET, "SetDirectSound failed: %08x\n", hr); + hr = IDirectMusicPort_Activate(port, FALSE); + ok(hr == S_OK, "Port Activate returned: %x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); ok(ref == 1, "dsound ref count got %d expected 1\n", ref); @@ -189,9 +213,51 @@ static void test_setdsound(void) ref = get_refcount(dsound2); todo_wine ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); + /* Replacing the dsound in the port */ + hr = IDirectMusicPort_SetDirectSound(port, dsound, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ref = get_refcount(dsound2); + todo_wine ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); + /* Setting the dsound again on the port will mess with the parent dmusic */ + hr = IDirectMusicPort_SetDirectSound(port, dsound, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ref = get_refcount(dsound2); + ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); + IDirectSound_AddRef(dsound2); /* Crash prevention */ + hr = IDirectMusicPort_Activate(port, TRUE); + ok(hr == S_OK, "Activate returned: %x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 4, "dsound ref count got %d expected 4\n", ref); + ref = get_refcount(dsound2); + ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); + hr = IDirectMusicPort_Activate(port, TRUE); + todo_wine ok(hr == S_FALSE, "Activate returned: %x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 4, "dsound ref count got %d expected 4\n", ref); + ref = get_refcount(dsound2); + ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); + + /* Deactivating the port messes with the dsound refcount in the parent dmusic */ + hr = IDirectMusicPort_Activate(port, FALSE); + ok(hr == S_OK, "Port Activate returned: %x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ref = get_refcount(dsound2); + todo_wine ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); + hr = IDirectMusicPort_Activate(port, FALSE); + todo_wine ok(hr == S_FALSE, "Port Activate returned: %x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ref = get_refcount(dsound2); + todo_wine ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); + + IDirectMusicPort_Release(port); IDirectMusic_Release(dmusic); - IDirectSound_Release(dsound); - IDirectSound_Release(dsound2); + while (IDirectSound_Release(dsound)); } static void test_dmbuffer(void)

1 0

Michael Stefaniuc : dmusic: Use more sensible and consistent field names for IDirectMusic8Impl.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: b75e8bc6bdfaaf22583e7e8af13e9c76666eefa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75e8bc6bdfaaf22583e7e8af… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 10 14:43:59 2017 +0200 dmusic: Use more sensible and consistent field names for IDirectMusic8Impl. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic.c | 31 ++++++++++++++----------------- dlls/dmusic/dmusic_private.h | 13 +++++-------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 5b01f0f..b1c0a19 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -72,9 +72,9 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); if (!ref) { - IReferenceClock_Release(&This->pMasterClock->IReferenceClock_iface); + IReferenceClock_Release(&This->master_clock->IReferenceClock_iface); HeapFree(GetProcessHeap(), 0, This->system_ports); - HeapFree(GetProcessHeap(), 0, This->ppPorts); + HeapFree(GetProcessHeap(), 0, This->ports); HeapFree(GetProcessHeap(), 0, This); DMUSIC_UnlockModule(); } @@ -92,7 +92,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind if (!port_caps) return E_POINTER; - if (index >= This->nb_system_ports) + if (index >= This->num_system_ports) return S_FALSE; *port_caps = This->system_ports[index].caps; @@ -156,12 +156,12 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI *port = NULL; return hr; } - This->nrofports++; - if (!This->ppPorts) - This->ppPorts = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIRECTMUSICPORT) * This->nrofports); + This->num_ports++; + if (!This->ports) + This->ports = HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectMusicPort *) * This->num_ports); else - This->ppPorts = HeapReAlloc(GetProcessHeap(), 0, This->ppPorts, sizeof(LPDIRECTMUSICPORT) * This->nrofports); - This->ppPorts[This->nrofports - 1] = new_port; + This->ports = HeapReAlloc(GetProcessHeap(), 0, This->ports, sizeof(IDirectMusicPort *) * This->num_ports); + This->ports[This->num_ports - 1] = new_port; *port = new_port; return S_OK; } @@ -209,9 +209,9 @@ static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPG TRACE("(%p)->(%p, %p)\n", This, guid_clock, reference_clock); if (guid_clock) - *guid_clock = This->pMasterClock->pClockInfo.guidClock; + *guid_clock = This->master_clock->pClockInfo.guidClock; if (reference_clock) { - *reference_clock = &This->pMasterClock->IReferenceClock_iface; + *reference_clock = &This->master_clock->IReferenceClock_iface; IReferenceClock_AddRef(*reference_clock); } @@ -235,9 +235,9 @@ static HRESULT WINAPI IDirectMusic8Impl_Activate(LPDIRECTMUSIC8 iface, BOOL enab TRACE("(%p)->(%u)\n", This, enable); - for (i = 0; i < This->nrofports; i++) + for (i = 0; i < This->num_ports; i++) { - hr = IDirectMusicPort_Activate(This->ppPorts[i], enable); + hr = IDirectMusicPort_Activate(This->ports[i], enable); if (FAILED(hr)) return hr; } @@ -396,7 +396,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) if (FAILED(hr)) nb_ports--; - object->nb_system_ports = nb_ports; + object->num_system_ports = nb_ports; } /* For ClassFactory */ @@ -417,10 +417,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; dmusic->ref = 1; - dmusic->pMasterClock = NULL; - dmusic->ppPorts = NULL; - dmusic->nrofports = 0; - ret = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&dmusic->pMasterClock, NULL); + ret = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (void **)&dmusic->master_clock, NULL); if (FAILED(ret)) { HeapFree(GetProcessHeap(), 0, dmusic); return ret; diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index cfe03fc..0819687 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -106,16 +106,13 @@ extern HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* * IDirectMusic8Impl implementation structure */ struct IDirectMusic8Impl { - /* IUnknown fields */ IDirectMusic8 IDirectMusic8_iface; LONG ref; - - /* IDirectMusicImpl fields */ - IReferenceClockImpl* pMasterClock; - IDirectMusicPort** ppPorts; - int nrofports; - port_info* system_ports; - int nb_system_ports; + IReferenceClockImpl *master_clock; + IDirectMusicPort **ports; + int num_ports; + port_info *system_ports; + int num_system_ports; }; /*****************************************************************************

1 0

Michael Stefaniuc : dmusic: Implement IDirectMusic8::SetDirectSound().
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 36a88d2841acd753a3197a045122152854f893e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a88d2841acd753a3197a045… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 10 15:13:19 2017 +0200 dmusic: Implement IDirectMusic8::SetDirectSound(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 8 ++++---- dlls/dmusic/Makefile.in | 2 +- dlls/dmusic/dmusic.c | 33 +++++++++++++++++++++++++++++++-- dlls/dmusic/dmusic_private.h | 1 + dlls/dmusic/tests/dmusic.c | 18 +++++++++--------- 5 files changed, 46 insertions(+), 16 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 0932cd9..730ec52 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -169,11 +169,11 @@ static HRESULT test_InitAudio(void) IDirectMusic_SetDirectSound(dmusic, dsound, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %d expected 2\n", ref); hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %d expected 2\n", ref); ref = get_refcount(dmusic); ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); destroy_performance(performance, dmusic, dsound); @@ -183,11 +183,11 @@ static HRESULT test_InitAudio(void) IDirectMusic_SetDirectSound(dmusic, dsound, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %d expected 2\n", ref); hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ok(ref == 3, "dsound ref count got %d expected 3\n", ref); ref = get_refcount(dmusic); ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); destroy_performance(performance, dmusic, dsound); diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index 98cfaef..a8955a2 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -1,5 +1,5 @@ MODULE = dmusic.dll -IMPORTS = dxguid uuid ole32 advapi32 winmm +IMPORTS = dxguid uuid ole32 advapi32 dsound user32 winmm C_SRCS = \ buffer.c \ diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index b1c0a19..5dcda64 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -73,6 +73,8 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) if (!ref) { IReferenceClock_Release(&This->master_clock->IReferenceClock_iface); + if (This->dsound) + IDirectSound_Release(This->dsound); HeapFree(GetProcessHeap(), 0, This->system_ports); HeapFree(GetProcessHeap(), 0, This->ports); HeapFree(GetProcessHeap(), 0, This); @@ -271,11 +273,38 @@ static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort(LPDIRECTMUSIC8 iface, LPG return S_OK; } -static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound(LPDIRECTMUSIC8 iface, LPDIRECTSOUND dsound, HWND wnd) +static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound(IDirectMusic8 *iface, IDirectSound *dsound, + HWND hwnd) { IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + HRESULT hr; + int i; + + TRACE("(%p)->(%p, %p)\n", This, dsound, hwnd); + + for (i = 0; i < This->num_ports; i++) + { + hr = IDirectMusicPort_SetDirectSound(This->ports[i], NULL, NULL); + if (FAILED(hr)) + return hr; + } + + if (This->dsound) + IDirectSound_Release(This->dsound); + + if (!dsound) { + hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&This->dsound, NULL); + if (FAILED(hr)) + return hr; + hr = IDirectSound_SetCooperativeLevel(This->dsound, hwnd ? hwnd : GetForegroundWindow(), + DSSCL_PRIORITY); + if (FAILED(hr)) + IDirectSound_Release(This->dsound); + return hr; + } - FIXME("(%p)->(%p, %p): stub\n", This, dsound, wnd); + IDirectSound_AddRef(dsound); + This->dsound = dsound; return S_OK; } diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 0819687..a470989 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -108,6 +108,7 @@ extern HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* struct IDirectMusic8Impl { IDirectMusic8 IDirectMusic8_iface; LONG ref; + IDirectSound *dsound; IReferenceClockImpl *master_clock; IDirectMusicPort **ports; int num_ports; diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 1d1f948..f701b2b 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -171,11 +171,11 @@ static void test_setdsound(void) hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %d expected 2\n", ref); hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &params, &port, NULL); ok(hr == S_OK, "CreatePort returned: %x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %d expected 2\n", ref); hr = IDirectMusicPort_Activate(port, TRUE); ok(hr == S_OK, "Port Activate returned: %x\n", hr); ref = get_refcount(dsound); @@ -197,11 +197,11 @@ static void test_setdsound(void) hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %d expected 2\n", ref); hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %d expected 2\n", ref); /* Replacing one dsound with another */ hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&dsound2, NULL); @@ -211,7 +211,7 @@ static void test_setdsound(void) ref = get_refcount(dsound); ok(ref == 1, "dsound ref count got %d expected 1\n", ref); ref = get_refcount(dsound2); - todo_wine ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); /* Replacing the dsound in the port */ hr = IDirectMusicPort_SetDirectSound(port, dsound, NULL); @@ -219,27 +219,27 @@ static void test_setdsound(void) ref = get_refcount(dsound); todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); ref = get_refcount(dsound2); - todo_wine ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); /* Setting the dsound again on the port will mess with the parent dmusic */ hr = IDirectMusicPort_SetDirectSound(port, dsound, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); ref = get_refcount(dsound2); - ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); + todo_wine ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); IDirectSound_AddRef(dsound2); /* Crash prevention */ hr = IDirectMusicPort_Activate(port, TRUE); ok(hr == S_OK, "Activate returned: %x\n", hr); ref = get_refcount(dsound); todo_wine ok(ref == 4, "dsound ref count got %d expected 4\n", ref); ref = get_refcount(dsound2); - ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); + todo_wine ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); hr = IDirectMusicPort_Activate(port, TRUE); todo_wine ok(hr == S_FALSE, "Activate returned: %x\n", hr); ref = get_refcount(dsound); todo_wine ok(ref == 4, "dsound ref count got %d expected 4\n", ref); ref = get_refcount(dsound2); - ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); + todo_wine ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); /* Deactivating the port messes with the dsound refcount in the parent dmusic */ hr = IDirectMusicPort_Activate(port, FALSE);

1 0

Michael Stefaniuc : dmusic: Pass only the needed stuff to the DMPort create functions.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: e8873b75afedcb10b4915ef9b2afa3f412dda851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8873b75afedcb10b4915ef9b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 10 14:44:01 2017 +0200 dmusic: Pass only the needed stuff to the DMPort create functions. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic.c | 10 +++++----- dlls/dmusic/dmusic_private.h | 12 ++++++++---- dlls/dmusic/port.c | 30 +++++++++++++++++------------- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 5dcda64..d5d061c 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -153,7 +153,7 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI for (i = 0; S_FALSE != IDirectMusic8Impl_EnumPort(iface, i, &port_caps); i++) { if (IsEqualCLSID(request_port, &port_caps.guidPort)) { - hr = This->system_ports[i].create(&IID_IDirectMusicPort, (LPVOID*)&new_port, (LPUNKNOWN)This, port_params, &port_caps, This->system_ports[i].device); + hr = This->system_ports[i].create(This, port_params, &port_caps, &new_port); if (FAILED(hr)) { *port = NULL; return hr; @@ -379,7 +379,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) /* Fill midi mapper port info */ port->device = MIDI_MAPPER; - port->create = DMUSIC_CreateMidiOutPortImpl; + port->create = midi_out_port_create; midiOutGetDevCapsW(MIDI_MAPPER, &caps_out, sizeof(caps_out)); strcpyW(port->caps.wszDescription, caps_out.szPname); strcatW(port->caps.wszDescription, emulated); @@ -391,7 +391,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) for (i = 0; i < nb_midi_out; i++) { port->device = i; - port->create = DMUSIC_CreateMidiOutPortImpl; + port->create = midi_out_port_create; midiOutGetDevCapsW(i, &caps_out, sizeof(caps_out)); strcpyW(port->caps.wszDescription, caps_out.szPname); strcatW(port->caps.wszDescription, emulated); @@ -404,7 +404,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) for (i = 0; i < nb_midi_in; i++) { port->device = i; - port->create = DMUSIC_CreateMidiInPortImpl; + port->create = midi_in_port_create; midiInGetDevCapsW(i, &caps_in, sizeof(caps_in)); strcpyW(port->caps.wszDescription, caps_in.szPname); strcatW(port->caps.wszDescription, emulated); @@ -414,7 +414,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) } /* Fill synth port info */ - port->create = DMUSIC_CreateSynthPortImpl; + port->create = synth_port_create; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); if (SUCCEEDED(hr)) { diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index a470989..053d24f 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -71,7 +71,8 @@ typedef struct DMUSIC_PRIVATE_CHANNEL_GROUP_ { typedef struct port_info { DMUS_PORTCAPS caps; - HRESULT (*create)(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device); + HRESULT (*create)(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port); ULONG device; } port_info; @@ -157,9 +158,12 @@ struct IDirectMusicDownloadImpl { }; /** Internal factory */ -extern HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; -extern HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; -extern HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; +extern HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) DECLSPEC_HIDDEN; +extern HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) DECLSPEC_HIDDEN; +extern HRESULT midi_in_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) DECLSPEC_HIDDEN; /***************************************************************************** * IReferenceClockImpl implementation structure diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 07da1ae..577fb0a 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -30,6 +30,7 @@ typedef struct SynthPortImpl { IDirectMusicThru IDirectMusicThru_iface; IKsControl IKsControl_iface; LONG ref; + IDirectMusic8Impl *parent; IDirectSound *pDirectSound; IReferenceClock *pLatencyClock; IDirectMusicSynth *synth; @@ -763,16 +764,16 @@ static const IKsControlVtbl ikscontrol_vtbl = { IKsControlImpl_KsEvent }; -HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) +HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) { SynthPortImpl *obj; HRESULT hr = E_FAIL; int i; - TRACE("(%s, %p, %p, %p, %p, %d)\n", debugstr_guid(guid), object, unkouter, port_params, - port_caps, device); + TRACE("(%p, %p, %p)\n", port_params, port_caps, port); - *object = NULL; + *port = NULL; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SynthPortImpl)); if (!obj) @@ -782,7 +783,8 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl; obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl; obj->IKsControl_iface.lpVtbl = &ikscontrol_vtbl; - obj->ref = 0; /* Will be inited by QueryInterface */ + obj->ref = 1; + obj->parent = parent; obj->fActive = FALSE; obj->params = *port_params; obj->caps = *port_caps; @@ -839,8 +841,10 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou } } - if (SUCCEEDED(hr)) - return IDirectMusicPort_QueryInterface((LPDIRECTMUSICPORT)obj, guid, object); + if (SUCCEEDED(hr)) { + *port = &obj->IDirectMusicPort_iface; + return S_OK; + } if (obj->synth) IDirectMusicSynth_Release(obj->synth); @@ -853,18 +857,18 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou return hr; } -HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) +HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) { - TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, - port_caps, device); + FIXME("(%p, %p, %p): stub\n", port_params, port_caps, port); return E_NOTIMPL; } -HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) +HRESULT midi_in_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) { - TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, - port_caps, device); + FIXME("(%p, %p, %p): stub\n", port_params, port_caps, port); return E_NOTIMPL; }

1 0

Michael Stefaniuc : dmusic: Partially implement the synth IDirectMusicPort ::SetDirectSound().
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: f968edb988180cfdc986a838168588ed77f6edc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f968edb988180cfdc986a8381… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 10 14:44:02 2017 +0200 dmusic: Partially implement the synth IDirectMusicPort::SetDirectSound(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 41 ++++++++++++++++++++++++++++++++++------- dlls/dmusic/tests/dmusic.c | 18 +++++++++--------- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 577fb0a..1bff721 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -31,11 +31,12 @@ typedef struct SynthPortImpl { IKsControl IKsControl_iface; LONG ref; IDirectMusic8Impl *parent; - IDirectSound *pDirectSound; + IDirectSound *dsound; + IDirectSoundBuffer *dsbuffer; IReferenceClock *pLatencyClock; IDirectMusicSynth *synth; IDirectMusicSynthSink *synth_sink; - BOOL fActive; + BOOL active; DMUS_PORTCAPS caps; DMUS_PORTPARAMS params; int nrofgroups; @@ -198,6 +199,10 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPort_Release(LPDIRECTMUSICPORT ifa IDirectMusicSynth_Release(This->synth); IDirectMusicSynthSink_Release(This->synth_sink); IReferenceClock_Release(This->pLatencyClock); + if (This->dsbuffer) + IDirectSoundBuffer_Release(This->dsbuffer); + if (This->dsound) + IDirectSound_Release(This->dsound); HeapFree(GetProcessHeap(), 0, This); } @@ -437,7 +442,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Activate(LPDIRECTMUSICPORT TRACE("(%p/%p)->(%d)\n", iface, This, active); - This->fActive = active; + This->active = active; return S_OK; } @@ -468,11 +473,33 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetChannelPriority(LPDIRECT return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetDirectSound(LPDIRECTMUSICPORT iface, LPDIRECTSOUND direct_sound, LPDIRECTSOUNDBUFFER direct_sound_buffer) +static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDirectSound *dsound, + IDirectSoundBuffer *dsbuffer) { SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, direct_sound, direct_sound_buffer); + FIXME("(%p/%p)->(%p, %p): semi-stub\n", iface, This, dsound, dsbuffer); + + if (This->active) + return DMUS_E_DSOUND_ALREADY_SET; + + if (This->dsound) { + if (This->dsound != This->parent->dsound) + ERR("Not the same dsound in the port (%p) and parent dmusic (%p), expect trouble!\n", + This->dsound, This->parent->dsound); + if (!IDirectSound_Release(This->parent->dsound)) + This->parent->dsound = NULL; + } + if (This->dsbuffer) + IDirectSound_Release(This->dsbuffer); + + This->dsound = dsound; + This->dsbuffer = dsbuffer; + + if (This->dsound) + IDirectSound_AddRef(This->dsound); + if (This->dsbuffer) + IDirectSound_AddRef(This->dsbuffer); return S_OK; } @@ -543,7 +570,7 @@ static const IDirectMusicPortVtbl SynthPortImpl_DirectMusicPort_Vtbl = { SynthPortImpl_IDirectMusicPort_Activate, SynthPortImpl_IDirectMusicPort_SetChannelPriority, SynthPortImpl_IDirectMusicPort_GetChannelPriority, - SynthPortImpl_IDirectMusicPort_SetDirectSound, + synth_dmport_SetDirectSound, SynthPortImpl_IDirectMusicPort_GetFormat }; @@ -785,7 +812,7 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param obj->IKsControl_iface.lpVtbl = &ikscontrol_vtbl; obj->ref = 1; obj->parent = parent; - obj->fActive = FALSE; + obj->active = FALSE; obj->params = *port_params; obj->caps = *port_caps; diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index f701b2b..a96b4f7 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -183,11 +183,11 @@ static void test_setdsound(void) /* Releasing dsound from dmusic */ hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); - todo_wine ok(hr == DMUS_E_DSOUND_ALREADY_SET, "SetDirectSound failed: %08x\n", hr); + ok(hr == DMUS_E_DSOUND_ALREADY_SET, "SetDirectSound failed: %08x\n", hr); hr = IDirectMusicPort_Activate(port, FALSE); ok(hr == S_OK, "Port Activate returned: %x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %d expected 2\n", ref); hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); @@ -217,41 +217,41 @@ static void test_setdsound(void) hr = IDirectMusicPort_SetDirectSound(port, dsound, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %d expected 2\n", ref); ref = get_refcount(dsound2); ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); /* Setting the dsound again on the port will mess with the parent dmusic */ hr = IDirectMusicPort_SetDirectSound(port, dsound, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ok(ref == 3, "dsound ref count got %d expected 3\n", ref); ref = get_refcount(dsound2); - todo_wine ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); + ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); IDirectSound_AddRef(dsound2); /* Crash prevention */ hr = IDirectMusicPort_Activate(port, TRUE); ok(hr == S_OK, "Activate returned: %x\n", hr); ref = get_refcount(dsound); todo_wine ok(ref == 4, "dsound ref count got %d expected 4\n", ref); ref = get_refcount(dsound2); - todo_wine ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); hr = IDirectMusicPort_Activate(port, TRUE); todo_wine ok(hr == S_FALSE, "Activate returned: %x\n", hr); ref = get_refcount(dsound); todo_wine ok(ref == 4, "dsound ref count got %d expected 4\n", ref); ref = get_refcount(dsound2); - todo_wine ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); /* Deactivating the port messes with the dsound refcount in the parent dmusic */ hr = IDirectMusicPort_Activate(port, FALSE); ok(hr == S_OK, "Port Activate returned: %x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ok(ref == 3, "dsound ref count got %d expected 3\n", ref); ref = get_refcount(dsound2); todo_wine ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); hr = IDirectMusicPort_Activate(port, FALSE); todo_wine ok(hr == S_FALSE, "Port Activate returned: %x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ok(ref == 3, "dsound ref count got %d expected 3\n", ref); ref = get_refcount(dsound2); todo_wine ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref);

1 0