Skip to content

W
wine-winehq
Commit 6ce8a31b authored by Akihiro Sagawa's avatar Akihiro Sagawa Committed by Alexandre Julliard
Browse files
Options

dsound: Initialize MTA in IDirectSound::Initialize().

RE:D Cherish! (Trial ver) depends on this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53613
parent 67153fa0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
dlls/dsound/dsound.c
View file @ 6ce8a31b
...@@ -207,6 +207,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) ...@@ -207,6 +207,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
WaitForSingleObject(device->thread, INFINITE); WaitForSingleObject(device->thread, INFINITE);
CloseHandle(device->thread); CloseHandle(device->thread);
} }
if (device->mta_cookie)
CoDecrementMTAUsage(device->mta_cookie);
EnterCriticalSection(&DSOUND_renderers_lock); EnterCriticalSection(&DSOUND_renderers_lock);
list_remove(&device->entry); list_remove(&device->entry);
...@@ -332,6 +334,7 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU ...@@ -332,6 +334,7 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU
WARN("DSOUND_ReopenDevice failed: %08lx\n", hr); WARN("DSOUND_ReopenDevice failed: %08lx\n", hr);
return hr; return hr;
} }
CoIncrementMTAUsage(&device->mta_cookie);
ZeroMemory(&device->drvcaps, sizeof(device->drvcaps)); ZeroMemory(&device->drvcaps, sizeof(device->drvcaps));
......
dlls/dsound/dsound_private.h
View file @ 6ce8a31b
...@@ -90,6 +90,7 @@ struct DirectSoundDevice ...@@ -90,6 +90,7 @@ struct DirectSoundDevice
int lfe_channel; int lfe_channel;
float *tmp_buffer, *cp_buffer; float *tmp_buffer, *cp_buffer;
DWORD tmp_buffer_len, cp_buffer_len; DWORD tmp_buffer_len, cp_buffer_len;
CO_MTA_USAGE_COOKIE mta_cookie;
DSVOLUMEPAN volpan; DSVOLUMEPAN volpan;
......
dlls/dsound/tests/dsound.c
View file @ 6ce8a31b
...@@ -1879,9 +1879,7 @@ static void test_implicit_mta(void) ...@@ -1879,9 +1879,7 @@ static void test_implicit_mta(void)
"IDirectSound_Initialize() failed: %08lx\n", hr); "IDirectSound_Initialize() failed: %08lx\n", hr);
if (hr == DS_OK) { if (hr == DS_OK) {
check_apttype(&test_apt_data); check_apttype(&test_apt_data);
todo_wine
ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type); ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type);
todo_wine
ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA,
"got apt type qualifier %d.\n", test_apt_data.qualifier); "got apt type qualifier %d.\n", test_apt_data.qualifier);
} }
...@@ -1896,9 +1894,7 @@ static void test_implicit_mta(void) ...@@ -1896,9 +1894,7 @@ static void test_implicit_mta(void)
"DirectSoundCreate() failed: %08lx\n", hr); "DirectSoundCreate() failed: %08lx\n", hr);
if (hr == DS_OK) { if (hr == DS_OK) {
check_apttype(&test_apt_data); check_apttype(&test_apt_data);
todo_wine
ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type); ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type);
todo_wine
ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA,
"got apt type qualifier %d.\n", test_apt_data.qualifier); "got apt type qualifier %d.\n", test_apt_data.qualifier);
IDirectSound_Release(dso); IDirectSound_Release(dso);
......
dlls/dsound/tests/dsound8.c
View file @ 6ce8a31b
...@@ -1903,9 +1903,7 @@ static void test_implicit_mta(void) ...@@ -1903,9 +1903,7 @@ static void test_implicit_mta(void)
"IDirectSound8_Initialize() failed: %08lx\n", hr); "IDirectSound8_Initialize() failed: %08lx\n", hr);
if (hr == DS_OK) { if (hr == DS_OK) {
check_apttype(&test_apt_data); check_apttype(&test_apt_data);
todo_wine
ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type); ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type);
todo_wine
ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA,
"got apt type qualifier %d.\n", test_apt_data.qualifier); "got apt type qualifier %d.\n", test_apt_data.qualifier);
} }
...@@ -1920,9 +1918,7 @@ static void test_implicit_mta(void) ...@@ -1920,9 +1918,7 @@ static void test_implicit_mta(void)
"DirectSoundCreate8() failed: %08lx\n", hr); "DirectSoundCreate8() failed: %08lx\n", hr);
if (hr == DS_OK) { if (hr == DS_OK) {
check_apttype(&test_apt_data); check_apttype(&test_apt_data);
todo_wine
ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type); ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type);
todo_wine
ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA,
"got apt type qualifier %d.\n", test_apt_data.qualifier); "got apt type qualifier %d.\n", test_apt_data.qualifier);
IDirectSound8_Release(dso); IDirectSound8_Release(dso);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment