December 2019 - Wine-Devel - list.winehq.org

[PATCH 3/3] dmime: Implement IDirectMusicPerformance8_PChannelInfo()
by Michael Stefaniuc Dec. 19, 2019

Dec. 19, 2019

NOT FOR THE FREEZE ==> DEFER Not needed for the bugs referenced in patch 1 but to validate the tests from patch 2. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/performance.c | 31 ++++++++++++++++++++++--------- dlls/dmime/tests/performance.c | 24 +++++++++++------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 2124c1fe35..9f489f5e36 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -701,18 +701,29 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPe } static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerformance8 *iface, - DWORD PChannel, IDirectMusicPort **port, DWORD *group, DWORD *MChannel) + DWORD pchannel, IDirectMusicPort **port, DWORD *group, DWORD *channel) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - DMUS_PORTPARAMS8 port_params; - GUID default_port; + struct pchannel_block *block; + struct wine_rb_entry *entry; + DWORD block_num = pchannel / 16; + unsigned int index = pchannel % 16; - FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, PChannel, port, group, MChannel); + TRACE("(%p)->(%d, %p, %p, %p)\n", This, pchannel, port, group, channel); - port_params.dwSize = sizeof(DMUS_PORTPARAMS8); - port_params.dwValidParams = 0; - IDirectMusic8_GetDefaultPort(This->dmusic, &default_port); - IDirectMusic8_CreatePort(This->dmusic, &default_port, &port_params, port, NULL); + entry = wine_rb_get(&This->pchannels, &block_num); + if (!entry) + return E_INVALIDARG; + block = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + + if (port) { + *port = block->pchannel[index].port; + IDirectMusicPort_AddRef(*port); + } + if (group) + *group = block->pchannel[index].group; + if (channel) + *channel = block->pchannel[index].channel; return S_OK; } @@ -1102,7 +1113,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire return E_INVALIDARG; } - /* FIXME: Should we create one secondary buffer for each PChannel? */ + /* FIXME: Create a proper port with enough dwGroups for the PChannels */ + IDirectMusicPerformance8_AddPort(iface, NULL); + hr = IDirectSound_CreateSoundBuffer(This->dsound, &desc, &buffer, NULL); if (FAILED(hr)) return DSERR_BUFFERLOST; diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 4c340252aa..adc20224c0 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -101,9 +101,9 @@ static HRESULT test_InitAudio(void) port = NULL; hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 127, &port, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + todo_wine ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); @@ -129,7 +129,7 @@ static HRESULT test_InitAudio(void) hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); destroy_performance(performance, NULL, NULL); /* Refcounts for auto generated dmusic and dsound */ @@ -344,7 +344,7 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); ok(hr == S_OK, "Init failed: %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); /* Add default port. Sets PChannels 0-15 to the corresponding channels in group 1 */ hr = IDirectMusicPerformance8_AddPort(perf, NULL); @@ -355,18 +355,16 @@ static void test_pchannel(void) ok(hr == S_OK && port, "PChannelInfo failed, got %08x, %p\n", hr, port); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port == port2 && group == 1 && channel == i, + ok(hr == S_OK && port == port2 && group == 1 && channel == i, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Unset PChannels fail to retrieve */ - todo_wine { hr = IDirectMusicPerformance8_PChannelInfo(perf, 16, &port2, NULL, NULL); ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD - 16, &port2, NULL, NULL); ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); - } /* Channel group 0 can be set just fine */ hr = IDirectMusicPerformance8_AssignPChannel(perf, 0, port, 0, 0); @@ -375,7 +373,7 @@ static void test_pchannel(void) ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port == port2 && group == 0 && channel == i, + ok(hr == S_OK && port == port2 && group == 0 && channel == i, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -406,7 +404,7 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 1, 7); ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 7, + ok(hr == S_OK && port2 == port && group == 1 && channel == 7, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -416,7 +414,7 @@ static void test_pchannel(void) ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); for (i = MAXDWORD - 47; i < MAXDWORD - 31; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, + ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -425,17 +423,17 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_AssignPChannel(perf, 4711, port, 1, 13); ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 4711, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 13, + ok(hr == S_OK && port2 == port && group == 1 && channel == 13, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4712, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 8, + ok(hr == S_OK && port2 == port && group == 0 && channel == 8, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4719, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 15, + ok(hr == S_OK && port2 == port && group == 0 && channel == 15, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); -- 2.24.1

1 0

[PATCH 2/3] dmime/tests: Add PChannel tests
by Michael Stefaniuc Dec. 19, 2019

Dec. 19, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Tests crash reliable without patch 1. They crash with the patch in Staging too. dlls/dmime/tests/performance.c | 126 ++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 1d17e5200e..4c340252aa 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -100,10 +100,18 @@ static HRESULT test_InitAudio(void) return hr; port = NULL; + hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 127, &port, NULL, NULL); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - ok(hr == S_OK, "Failed to call PChannelInfo (%x)\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); - if (hr == S_OK && port != NULL) + hr = IDirectMusicPerformance8_AssignPChannel(performance, 0, port, 0, 0); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%08x)\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(performance, 0, port, 0); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%08x)\n", hr); + if (port) IDirectMusicPort_Release(port); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path); @@ -120,6 +128,8 @@ static HRESULT test_InitAudio(void) create_performance(&performance, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); destroy_performance(performance, NULL, NULL); /* Refcounts for auto generated dmusic and dsound */ @@ -322,6 +332,117 @@ static void test_createport(void) IDirectMusicPerformance_Release(perf); } +static void test_pchannel(void) +{ + IDirectMusicPerformance8 *perf; + IDirectMusicPort *port = NULL, *port2; + DWORD channel, group; + unsigned int i; + HRESULT hr; + + create_performance(&perf, NULL, NULL, FALSE); + hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); + ok(hr == S_OK, "Init failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); + + /* Add default port. Sets PChannels 0-15 to the corresponding channels in group 1 */ + hr = IDirectMusicPerformance8_AddPort(perf, NULL); + ok(hr == S_OK, "AddPort of default port failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, NULL, NULL, NULL); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); + ok(hr == S_OK && port, "PChannelInfo failed, got %08x, %p\n", hr, port); + for (i = 1; i < 16; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port == port2 && group == 1 && channel == i, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Unset PChannels fail to retrieve */ + todo_wine { + hr = IDirectMusicPerformance8_PChannelInfo(perf, 16, &port2, NULL, NULL); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD - 16, &port2, NULL, NULL); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + } + + /* Channel group 0 can be set just fine */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, 0, port, 0, 0); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, 0, port, 0); + ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = 1; i < 16; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port == port2 && group == 0 && channel == i, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Last PChannel Block can be set only individually but not read */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, MAXDWORD, port, 0, 3); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + port2 = (IDirectMusicPort *)0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD, &port2, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, + "PChannelInfo failed, got %08x, %p\n", hr, port2); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD, port, 0); + ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16, port, 1); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 15; i < MAXDWORD; i++) { + hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 0, 0); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, + "PChannelInfo failed, got %08x, %p\n", hr, port2); + } + + /* Second to last PChannel Block can be set only individually and read */ + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 1, port, 1); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 31; i < MAXDWORD - 15; i++) { + hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 1, 7); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 7, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Third to last PChannel Block behaves normal */ + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 2, port, 0); + ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 47; i < MAXDWORD - 31; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* One PChannel set in a Block, rest is initialized too */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, 4711, port, 1, 13); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4711, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 13, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + group = channel = 0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4712, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 8, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + group = channel = 0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4719, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 15, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + + IDirectMusicPort_Release(port); + destroy_performance(perf, NULL, NULL); +} + static void test_COM(void) { IDirectMusicPerformance *dmp = (IDirectMusicPerformance*)0xdeadbeef; @@ -504,6 +625,7 @@ START_TEST( performance ) test_COM(); test_createport(); + test_pchannel(); test_notification_type(); CoUninitialize(); -- 2.24.1

1 0

[PATCH 1/3] dmime: Use a rbtree to store the PChannels of a performance
by Michael Stefaniuc Dec. 19, 2019

Dec. 19, 2019

The PChannel id is a 32bit, potentially random identifier and not an array index. Fixes also the handling of channel group "dwGroup" 0. As it is invalid it is used to mark uninitialized PChannels. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17766 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24740 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31562 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Supersedes the Staging patch dmime-PChannel-range. Fixes memory corruption related crashes: - Fixes bug 17766, tested with Empire Earth Demo. - Should fix bug 24740 too as that is the origin of the workaround included in Staging. But BigFish GameLauncher is a pita so can't test. - Fixes the first crash in bug 31562 and lets the game continue until it hits the next crash (unrelated to PChannels). dlls/dmime/performance.c | 109 +++++++++++++++++++++++++++------------ 1 file changed, 75 insertions(+), 34 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 615a3f8b14..2124c1fe35 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -19,10 +19,18 @@ */ #include "dmime_private.h" +#include "wine/heap.h" +#include "wine/rbtree.h" #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); +struct pchannel_block { + DWORD block_num; /* Block 0 is PChannels 0-15, Block 1 is PChannels 16-31, etc */ + DMUSIC_PRIVATE_PCHANNEL pchannel[16]; + struct wine_rb_entry entry; +}; + typedef struct IDirectMusicPerformance8Impl { IDirectMusicPerformance8 IDirectMusicPerformance8_iface; LONG ref; @@ -35,7 +43,7 @@ typedef struct IDirectMusicPerformance8Impl { float fMasterTempo; long lMasterVolume; /* performance channels */ - DMUSIC_PRIVATE_PCHANNEL PChannel[32]; + struct wine_rb_tree pchannels; /* IDirectMusicPerformance8Impl fields */ IDirectMusicAudioPath *pDefaultPath; HANDLE hNotification; @@ -192,6 +200,49 @@ static BOOL PostMessageToProcessMsgThread(IDirectMusicPerformance8Impl* This, UI return PostThreadMessageA(This->procThreadId, iMsg, 0, 0); } +static int pchannel_block_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, const struct pchannel_block, entry); + + return *(DWORD *)key - b->block_num; +} + +static void pchannel_block_free(struct wine_rb_entry *entry, void *context) +{ + struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + + heap_free(b); +} + +static struct pchannel_block *pchannel_block_set(struct wine_rb_tree *tree, DWORD block_num, + IDirectMusicPort *port, DWORD group, BOOL only_set_new) +{ + struct pchannel_block *block; + struct wine_rb_entry *entry; + unsigned int i; + + entry = wine_rb_get(tree, &block_num); + if (entry) { + block = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + if (only_set_new) + return block; + } else { + if (!(block = heap_alloc(sizeof(*block)))) + return NULL; + block->block_num = block_num; + } + + for (i = 0; i < 16; ++i) { + block->pchannel[i].port = port; + block->pchannel[i].group = group; + block->pchannel[i].channel = i; + } + if (!entry) + wine_rb_put(tree, &block->block_num, &block->entry); + + return block; +} + static inline IDirectMusicPerformance8Impl *impl_from_IDirectMusicPerformance8(IDirectMusicPerformance8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicPerformance8Impl, IDirectMusicPerformance8_iface); @@ -236,6 +287,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { + wine_rb_destroy(&This->pchannels, pchannel_block_free, NULL); This->safe.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->safe); HeapFree(GetProcessHeap(), 0, This); @@ -579,7 +631,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman GUID port_guid; IDirectMusicPort* pDefaultPort = NULL; DMUS_PORTPARAMS params; - int i, j; hr = IDirectMusic8_GetDefaultPort(This->dmusic, &port_guid); if (FAILED(hr)) return hr; ZeroMemory(&params, sizeof(params)); @@ -591,15 +642,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman if (FAILED(hr)) return hr; hr = IDirectMusicPort_Activate(pDefaultPort, TRUE); if (FAILED(hr)) { IDirectMusicPort_Release(pDefaultPort); return hr; } - j = 0; - for (i = 0; i < 16; ++i) { - if (NULL == This->PChannel[i].port) { - This->PChannel[i].port = pPort; - This->PChannel[i].group = 0; - This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ - j++; - } - } + IDirectMusicPerformance8_AssignPChannelBlock(iface, 0, pDefaultPort, 1); } else { IDirectMusicPort_AddRef(pPort); } @@ -621,41 +664,38 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RemovePort(IDirectMusicPerfor } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannelBlock(IDirectMusicPerformance8 *iface, - DWORD dwBlockNum, IDirectMusicPort *pPort, DWORD dwGroup) + DWORD block_num, IDirectMusicPort *port, DWORD group) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - int i, j, range /* min value in range */; - - FIXME("(%p, %d, %p, %d): semi-stub\n", This, dwBlockNum, pPort, dwGroup-1); - if (NULL == pPort) return E_POINTER; - - range = 16 * dwBlockNum; - j = 0; - for (i = range; i < range+16; i++) { - /*TRACE("Setting PChannel[%i] to port %p, group %ld, MIDI port %i\n", i, pPort, dwGroup-1, j); */ - This->PChannel[i].port = pPort; - This->PChannel[i].group = dwGroup - 1; /* first index is always zero */ - This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ - j++; - } - /*if (dwGroup > 2) return S_FALSE;*/ + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - return S_OK; + FIXME("(%p, %d, %p, %d): semi-stub\n", This, block_num, port, group); + + if (!port) + return E_POINTER; + if (block_num > MAXDWORD / 16) + return E_INVALIDARG; + + pchannel_block_set(&This->pchannels, block_num, port, group, FALSE); + + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPerformance8 *iface, - DWORD PChannel, IDirectMusicPort *port, DWORD group, DWORD MChannel) + DWORD pchannel, IDirectMusicPort *port, DWORD group, DWORD channel) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + struct pchannel_block *block; - TRACE("(%p)->(%d, %p, %d, %d)\n", This, PChannel, port, group, MChannel); + FIXME("(%p)->(%d, %p, %d, %d) semi-stub\n", This, pchannel, port, group, channel); if (!port) return E_POINTER; - This->PChannel[PChannel].port = port; - This->PChannel[PChannel].group = group; - This->PChannel[PChannel].channel = MChannel; + block = pchannel_block_set(&This->pchannels, pchannel / 16, port, 0, TRUE); + if (block) { + block->pchannel[pchannel % 16].group = group; + block->pchannel[pchannel % 16].channel = channel; + } return S_OK; } @@ -1211,6 +1251,7 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) obj->pDefaultPath = NULL; InitializeCriticalSection(&obj->safe); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectMusicPerformance8Impl*->safe"); + wine_rb_init(&obj->pchannels, pchannel_block_compare); obj->rtLatencyTime = 100; /* 100 ms TO FIX */ obj->dwBumperLength = 50; /* 50 ms default */ -- 2.24.1

1 0

[PATCH v2] msvcrt: Implement strtod without using 'long double'.
by Erich E. Hoover Dec. 19, 2019

Dec. 19, 2019

v2: Fix test results on 32-bit Debian *sigh* Fixes the "regression" with cl.exe caused by 0e183cc3c0d3b6f89f79047cdd71c389afc75073. ( https://bugs.winehq.org/show_bug.cgi?id=48160 ) Best, Erich

2 3

[PATCH] include: Define the _STGMEDIUM_UNION type for C++ only.
by Jeff Smith Dec. 19, 2019

Dec. 19, 2019

Fixes a regression introduced by 732f67ed38a45911d726df8da5a68710d175ba1d Based on a patch from Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- This is like https://source.winehq.org/patches/data/175999 except that this version uses #define to blank-out _STGMEDIUM_UNION for non-C++, rather than having an idl version of the enclosing struct for C++ and a baked version of that struct for non-C++. include/objidl.idl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/objidl.idl b/include/objidl.idl index a0ad1f6e01..844b94af86 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1426,8 +1426,14 @@ interface IAdviseSink : IUnknown default: wireHGLOBAL hGeneric; } GDI_OBJECT; + /* Defining the _STGMEDIUM_UNION type yields a violation of the C spec when + * NONAMELESSUNION is not defined, so only define it for C++. */ + cpp_quote("#ifndef __cplusplus") + cpp_quote("#define _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef struct _userSTGMEDIUM { - union switch(DWORD tymed) u { + union _STGMEDIUM_UNION switch(DWORD tymed) u { case TYMED_NULL: ; case TYMED_MFPICT: wireHMETAFILEPICT hMetaFilePict; case TYMED_ENHMF: wireHENHMETAFILE hHEnhMetaFile; @@ -1440,6 +1446,10 @@ interface IAdviseSink : IUnknown IUnknown *pUnkForRelease; } userSTGMEDIUM; + cpp_quote("#ifndef __cplusplus") + cpp_quote("#undef _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef [unique] userSTGMEDIUM *wireSTGMEDIUM; typedef [wire_marshal(wireSTGMEDIUM)] uSTGMEDIUM STGMEDIUM; -- 2.23.0

2 1

[PATCH] dmime: IDirectMusicPerformance8_FreePMsg Release the unknown pointer.
by Alistair Leslie-Hughes Dec. 19, 2019

Dec. 19, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/performance.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 9dbb469f388..a63bd3b4517 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -479,7 +479,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma DMUS_ItemRemoveFromQueue( This, pItem ); LeaveCriticalSection(&This->safe); - /** TODO: see if we should Release the pItem->pMsg->punkUser and others Interfaces */ + if (pPMSG->punkUser) + IUnknown_Release(pPMSG->punkUser); + HeapFree(GetProcessHeap(), 0, pItem); return S_OK; } -- 2.24.0

2 3

[PATCH] configure: Don't check for gssapi-krb5 if krb5 is missing
by Andrew Eikum Dec. 19, 2019

Dec. 19, 2019

This works around a broken krb5 package in CentOS which is missing a dependency. configure would find gssapi-krb5, but not krb5, which would cause a build failure later in <dlls/kerberos>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48314 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure.ac | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 8a121bce016..c8399de6ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -1825,21 +1825,24 @@ WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], [libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported.]) dnl **** Check for gssapi **** -if test "x$with_gssapi" != "xno" +if test "x$ac_cv_lib_soname_krb5" != "x" -o "x$with_gssapi" = "xyes" then - WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],, - [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`], - [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`], - [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h]) - if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes" - then - WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_CFLAGS=""],[$GSSAPI_LIBS]) - else - GSSAPI_CFLAGS="" - fi]) + if test "x$with_gssapi" != "xno" + then + WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],, + [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`], + [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`], + [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h]) + if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes" + then + WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_CFLAGS=""],[$GSSAPI_LIBS]) + else + GSSAPI_CFLAGS="" + fi]) + fi + WINE_NOTICE_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"], + [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.]) fi -WINE_NOTICE_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"], - [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.]) dnl **** Check for libjpeg **** if test "x$with_jpeg" != "xno" -- 2.24.1

1 0

[PATCH 1/2] ole32/tests: Add some tests for Reduce().
by Nikolay Sivov Dec. 19, 2019

Dec. 19, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 47 +++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b65c0115ca..e4d693b442 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1531,12 +1531,11 @@ todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) static void test_class_moniker(void) { + IMoniker *moniker, *inverse, *reduced; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; - IMoniker *inverse; IUnknown *unknown; FILETIME filetime; @@ -1597,8 +1596,6 @@ todo_wine ok_ole_success(hr, IMoniker_BindToStorage); IUnknown_Release(unknown); - IBindCtx_Release(bindctx); - hr = IMoniker_Inverse(moniker, &inverse); ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); @@ -1606,13 +1603,22 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Reduce() */ + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + + IBindCtx_Release(bindctx); + IMoniker_Release(moniker); } static void test_file_moniker(WCHAR* path) { - IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse; + IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced; DWORD moniker_type; + IBindCtx *bind_ctx; IStream *stream; IUnknown *unk; HRESULT hr; @@ -1654,6 +1660,21 @@ todo_wine hr = IMoniker_IsEqual(moniker1, moniker2); ok_ole_success(hr, IsEqual); + /* Reduce() */ + hr = CreateBindCtx(0, &bind_ctx); + ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker1, NULL, MKRREDUCE_ALL, NULL, &reduced); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker1, bind_ctx, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker1, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + + IBindCtx_Release(bind_ctx); + IStream_Release(stream); if (moniker1) IMoniker_Release(moniker1); @@ -1761,7 +1782,7 @@ static void test_item_moniker(void) { L"%", L"A", 0x41 }, { L"%", L"a", 0x41 }, }; - IMoniker *moniker, *moniker2; + IMoniker *moniker, *moniker2, *reduced; HRESULT hr; DWORD moniker_type, i; DWORD hash; @@ -1919,6 +1940,12 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Reduce() */ + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + IMoniker_Release(moniker); /* IsEqual */ @@ -1961,13 +1988,12 @@ static void stream_write_dword(IStream *stream, DWORD value) static void test_anti_moniker(void) { - IMoniker *moniker, *moniker2, *moniker3; + IMoniker *moniker, *moniker2, *moniker3, *inverse, *reduced; HRESULT hr; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; FILETIME filetime; - IMoniker *inverse; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; IStream *stream; @@ -2143,6 +2169,11 @@ todo_wine IStream_Release(stream); + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2); -- 2.24.0

2 3

[PATCH 2/2] wininet: Don't set default gopher protocol in InternetCrackUrlW.
by Jacek Caban Dec. 19, 2019

Dec. 19, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 3 --- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH] wininet: Add missing schemes to url_schemes.
by Jacek Caban Dec. 19, 2019

Dec. 19, 2019

Fixes res URL scheme handling. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31399 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 20 ++++++++++---------- dlls/wininet/tests/url.c | 5 ++++- 2 files changed, 14 insertions(+), 11 deletions(-)

3 3