February 2020 - Wine-Commits

Zebediah Figura : quartz/filesource: Zero-initialize the file source filter.
by Alexandre Julliard Feb. 16, 2020

Feb. 16, 2020

Module: wine Branch: master Commit: 5c057693c8ef0956bbe37ba8b85a5631296d5e71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c057693c8ef0956bbe37ba8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 13 22:55:54 2020 -0600 quartz/filesource: Zero-initialize the file source filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 11cc438be2..c1f7f69d5e 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -352,7 +352,7 @@ static void async_reader_destroy(struct strmbase_filter *iface) CloseHandle(filter->port); strmbase_filter_cleanup(&filter->filter); - CoTaskMemFree(filter); + free(filter); } static HRESULT async_reader_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) @@ -414,31 +414,24 @@ static DWORD CALLBACK io_thread(void *arg) HRESULT AsyncReader_create(IUnknown *outer, void **out) { - AsyncReader *pAsyncRead; - - pAsyncRead = CoTaskMemAlloc(sizeof(AsyncReader)); + AsyncReader *object; - if (!pAsyncRead) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - strmbase_filter_init(&pAsyncRead->filter, outer, &CLSID_AsyncReader, &filter_ops); + strmbase_filter_init(&object->filter, outer, &CLSID_AsyncReader, &filter_ops); - pAsyncRead->IFileSourceFilter_iface.lpVtbl = &FileSource_Vtbl; + object->IFileSourceFilter_iface.lpVtbl = &FileSource_Vtbl; + object->IAsyncReader_iface.lpVtbl = &FileAsyncReader_Vtbl; - pAsyncRead->IAsyncReader_iface.lpVtbl = &FileAsyncReader_Vtbl; - - pAsyncRead->pszFileName = NULL; - - InitializeCriticalSection(&pAsyncRead->sample_cs); - pAsyncRead->sample_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FileAsyncReader.sample_cs"); - InitializeConditionVariable(&pAsyncRead->sample_cv); - pAsyncRead->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); - pAsyncRead->io_thread = CreateThread(NULL, 0, io_thread, pAsyncRead, 0, NULL); - - *out = &pAsyncRead->filter.IUnknown_inner; - - TRACE("-- created at %p\n", pAsyncRead); + InitializeCriticalSection(&object->sample_cs); + object->sample_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FileAsyncReader.sample_cs"); + InitializeConditionVariable(&object->sample_cv); + object->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + object->io_thread = CreateThread(NULL, 0, io_thread, object, 0, NULL); + TRACE("Created file source %p.\n", object); + *out = &object->filter.IUnknown_inner; return S_OK; }

1 0

Zebediah Figura : d3dcompiler: Get rid of the unused "subexpressions" field of struct hlsl_ir_expr.
by Alexandre Julliard Feb. 16, 2020

Feb. 16, 2020

Module: wine Branch: master Commit: 81a7da48b999a5fc4cf7470101fe88c489787593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81a7da48b999a5fc4cf74701… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 11 22:54:21 2020 -0600 d3dcompiler: Get rid of the unused "subexpressions" field of struct hlsl_ir_expr. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 - dlls/d3dcompiler_43/utils.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 9c58830ffe..3146f57c59 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -879,7 +879,6 @@ struct hlsl_ir_expr struct hlsl_ir_node node; enum hlsl_ir_expr_op op; struct hlsl_ir_node *operands[3]; - struct list *subexpressions; }; enum hlsl_ir_jump_type diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index a1470cd0f5..5e497495e6 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2186,7 +2186,6 @@ static void free_ir_constructor(struct hlsl_ir_constructor *constructor) static void free_ir_expr(struct hlsl_ir_expr *expr) { - free_instr_list(expr->subexpressions); d3dcompiler_free(expr); }

1 0

Michael Stefaniuc : dmime: Implement IDirectMusicPerformance8_PChannelInfo().
by Alexandre Julliard Feb. 16, 2020

Feb. 16, 2020

Module: wine Branch: master Commit: d3a0cd77d8c87f9fcf56958e7db01bbd07a60f09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3a0cd77d8c87f9fcf56958e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 14 01:21:07 2020 +0100 dmime: Implement IDirectMusicPerformance8_PChannelInfo(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 27 +++++++++++++++++++-------- dlls/dmime/tests/performance.c | 32 +++++++++++++++----------------- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 989e5ee207..b7b71637a1 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -725,18 +725,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; + + TRACE("(%p)->(%d, %p, %p, %p)\n", This, pchannel, port, group, channel); - FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, PChannel, port, group, MChannel); + entry = wine_rb_get(&This->pchannels, &block_num); + if (!entry) + return E_INVALIDARG; + block = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); - 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); + 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; } diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 97c43c520b..825faabc9c 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -102,11 +102,12 @@ 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); + 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); + IDirectMusicPort_Release(port); + port = NULL; 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"); @@ -114,8 +115,7 @@ static HRESULT test_InitAudio(void) 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); + IDirectMusicPort_Release(port); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path); ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%x)\n", hr); @@ -132,7 +132,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 */ @@ -223,10 +223,10 @@ static HRESULT test_InitAudio(void) DMUS_APATH_SHARED_STEREOPLUSREVERB, 29, DMUS_AUDIOF_ALL, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 31, &port, &group, &channel); - todo_wine ok(hr == S_OK && group == 2 && channel == 15, + ok(hr == S_OK && group == 2 && channel == 15, "PChannelInfo failed, got %08x, %u, %u\n", hr, group, channel); hr = IDirectMusicPerformance8_PChannelInfo(performance, 32, &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); return S_OK; @@ -349,7 +349,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); @@ -360,18 +360,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); @@ -380,7 +378,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); } @@ -411,7 +409,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); } @@ -421,7 +419,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); } @@ -430,17 +428,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);

1 0

Michael Stefaniuc : dmime: Create a port in the perf CreateStandardAudioPath().
by Alexandre Julliard Feb. 16, 2020

Feb. 16, 2020

Module: wine Branch: master Commit: 3dd2912874c9beb0e62c03b43a45788df7222d21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dd2912874c9beb0e62c03b4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 14 01:21:06 2020 +0100 dmime: Create a port in the perf CreateStandardAudioPath(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 13 ++++++++++--- dlls/dmime/tests/performance.c | 13 +++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b12247ea31..989e5ee207 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1070,16 +1070,17 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateAudioPath(IDirectMusicP } static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDirectMusicPerformance8 *iface, - DWORD dwType, DWORD dwPChannelCount, BOOL fActivate, IDirectMusicAudioPath **ppNewPath) + DWORD dwType, DWORD pchannel_count, BOOL fActivate, IDirectMusicAudioPath **ppNewPath) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); IDirectMusicAudioPath *pPath; DSBUFFERDESC desc; WAVEFORMATEX format; + DMUS_PORTPARAMS params = {0}; IDirectSoundBuffer *buffer, *primary_buffer; HRESULT hr = S_OK; - FIXME("(%p)->(%d, %d, %d, %p): semi-stub\n", This, dwType, dwPChannelCount, fActivate, ppNewPath); + FIXME("(%p)->(%d, %d, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ppNewPath); if (NULL == ppNewPath) { return E_POINTER; @@ -1126,7 +1127,13 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire return E_INVALIDARG; } - /* FIXME: Should we create one secondary buffer for each PChannel? */ + /* Create a port */ + params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; + params.dwChannelGroups = (pchannel_count + 15) / 16; + params.dwAudioChannels = format.nChannels; + if (FAILED(hr = perf_dmport_create(This, &params))) + return hr; + 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 ff275eb9c2..97c43c520b 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -82,6 +82,7 @@ static HRESULT test_InitAudio(void) IDirectSound *dsound; IDirectMusicPort *port; IDirectMusicAudioPath *path; + DWORD channel, group; HRESULT hr; ULONG ref; @@ -216,6 +217,18 @@ static HRESULT test_InitAudio(void) ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); destroy_performance(performance, dmusic, dsound); + /* InitAudio with perf channel count not a multiple of 16 rounds up */ + create_performance(&performance, NULL, NULL, TRUE); + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, + DMUS_APATH_SHARED_STEREOPLUSREVERB, 29, DMUS_AUDIOF_ALL, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 31, &port, &group, &channel); + todo_wine ok(hr == S_OK && group == 2 && channel == 15, + "PChannelInfo failed, got %08x, %u, %u\n", hr, group, channel); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 32, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + destroy_performance(performance, NULL, NULL); + return S_OK; }

1 0

Michael Stefaniuc : dmime/tests: Move some ok() calls to make it clear what is being tested.
by Alexandre Julliard Feb. 16, 2020

Feb. 16, 2020

Module: wine Branch: master Commit: 67f55f9b13376789d02c9389515b68f14e69a673 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67f55f9b13376789d02c9389… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 14 01:21:04 2020 +0100 dmime/tests: Move some ok() calls to make it clear what is being tested. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index e6a3fe2271..ff275eb9c2 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -270,35 +270,27 @@ static void test_createport(void) /* dwValidParams == 0 -> S_OK, filled struct */ portparams.dwValidParams = 0; - hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, - &portparams, &port, NULL); + hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - + todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; - todo_wine ok(portparams.dwValidParams != 0, "portparams struct was not filled in\n"); - /* dwValidParams != 0, invalid param -> S_FALSE, filled struct */ portparams.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS; portparams.dwChannelGroups = 0; - hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, - &portparams, &port, NULL); + hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); todo_wine ok(hr == S_FALSE, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; - ok(portparams.dwValidParams != 0, "portparams struct was not filled in\n"); - /* dwValidParams != 0, valid params -> S_OK */ - hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, - &portparams, &port, NULL); + hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - IDirectMusicPort_Release(port); port = NULL; @@ -307,12 +299,10 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &GUID_NULL, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - + todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; - todo_wine ok(portparams.dwValidParams != 0, "portparams struct was not filled in\n"); - /* null GUID fails */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, NULL, &portparams, &port, NULL);

1 0

Hans Leidekker : winhttp/tests: Use wide character string literals.
by Alexandre Julliard Feb. 16, 2020

Feb. 16, 2020

Module: wine Branch: master Commit: ef908c59c1274f6cd8652795739a165f544b6e50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef908c59c1274f6cd8652795… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 14 16:41:38 2020 +0100 winhttp/tests: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 55 ++-- dlls/winhttp/tests/url.c | 115 +++---- dlls/winhttp/tests/winhttp.c | 645 ++++++++++++++++---------------------- 3 files changed, 326 insertions(+), 489 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef908c59c1274f6cd865…

1 0

Zebediah Figura : winegstreamer: Negotiate allocators per source pin.
by Alexandre Julliard Feb. 16, 2020

Feb. 16, 2020

Module: wine Branch: master Commit: 6745afd81d38e26b8890bd97163eb1e4494c6cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6745afd81d38e26b8890bd97… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 13 22:55:56 2020 -0600 winegstreamer: Negotiate allocators per source pin. In particular, pass the correct buffer size for the format we have chosen. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48570 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 91 +++++++++---------------------------------- 1 file changed, 19 insertions(+), 72 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b62f44b6a1..1337cd0a81 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -57,7 +57,6 @@ struct gstdemux struct strmbase_sink sink; IAsyncReader *reader; - IMemAllocator *alloc; struct gstdemux_source **sources; unsigned int source_count; @@ -70,7 +69,6 @@ struct gstdemux GstPad *my_src, *their_sink; GstBus *bus; guint64 start, nextofs, nextpullofs, stop; - ALLOCATOR_PROPERTIES props; HANDLE no_more_pads_event, duration_event, error_event; HANDLE push_thread; @@ -486,11 +484,6 @@ static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) if (!amt_from_gst_caps(caps, &pin->mt)) return FALSE; - if (IsEqualGUID(&pin->mt.formattype, &FORMAT_VideoInfo)) - { - VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)pin->mt.pbFormat; - filter->props.cbBuffer = max(filter->props.cbBuffer, vih->bmiHeader.biSizeImage); - } SetEvent(pin->caps_event); return TRUE; } @@ -1295,7 +1288,7 @@ static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer u g_free(strcaps); } -static HRESULT GST_Connect(struct gstdemux *This, IPin *pConnectPin, ALLOCATOR_PROPERTIES *props) +static HRESULT GST_Connect(struct gstdemux *This, IPin *pConnectPin) { LONGLONG avail; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( @@ -1304,7 +1297,6 @@ static HRESULT GST_Connect(struct gstdemux *This, IPin *pConnectPin, ALLOCATOR_P GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); - This->props = *props; IAsyncReader_Length(This->reader, &This->filesize, &avail); if (!This->bus) { @@ -1329,7 +1321,6 @@ static HRESULT GST_Connect(struct gstdemux *This, IPin *pConnectPin, ALLOCATOR_P return E_FAIL; This->initial = FALSE; - *props = This->props; This->nextofs = This->nextpullofs = 0; return S_OK; } @@ -1378,9 +1369,6 @@ static void gstdemux_destroy(struct strmbase_filter *iface) assert(hr == S_OK); } - if (filter->alloc) - IMemAllocator_Release(filter->alloc); - filter->alloc = NULL; if (filter->reader) IAsyncReader_Release(filter->reader); filter->reader = NULL; @@ -1529,46 +1517,16 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE static HRESULT gstdemux_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *pmt) { struct gstdemux *filter = impl_from_strmbase_sink(iface); - IMemAllocator *allocator = NULL; - ALLOCATOR_PROPERTIES props; HRESULT hr = S_OK; mark_wine_thread(); - props.cBuffers = 8; - props.cbBuffer = 16384; - props.cbAlign = 1; - props.cbPrefix = 0; - filter->reader = NULL; - filter->alloc = NULL; if (FAILED(hr = IPin_QueryInterface(peer, &IID_IAsyncReader, (void **)&filter->reader))) return hr; - if (FAILED(hr = GST_Connect(filter, peer, &props))) - goto err; - - /* Some applications depend on IAsyncReader::RequestAllocator() passing a - * non-NULL preferred allocator. */ - hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC, - &IID_IMemAllocator, (void **)&allocator); - if (FAILED(hr)) - goto err; - hr = IAsyncReader_RequestAllocator(filter->reader, allocator, &props, &filter->alloc); - IMemAllocator_Release(allocator); - if (FAILED(hr)) - { - WARN("Failed to get allocator, hr %#x.\n", hr); - goto err; - } - - if (FAILED(hr = IMemAllocator_Commit(filter->alloc))) - { - WARN("Failed to commit allocator, hr %#x.\n", hr); - IMemAllocator_Release(filter->alloc); - filter->alloc = NULL; + if (FAILED(hr = GST_Connect(filter, peer))) goto err; - } return S_OK; err: @@ -1584,7 +1542,6 @@ static void gstdemux_sink_disconnect(struct strmbase_sink *iface) mark_wine_thread(); - IMemAllocator_Decommit(filter->alloc); GST_RemoveOutputPins(filter); } @@ -2083,37 +2040,27 @@ static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int in } static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, - IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) + IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) { - struct gstdemux_source *This = impl_source_from_IPin(&iface->pin.IPin_iface); - TRACE("(%p)->(%p, %p)\n", This, pAlloc, ppropInputRequest); - /* Unused */ - return S_OK; -} - -static HRESULT WINAPI GSTOutPin_DecideAllocator(struct strmbase_source *base, - IMemInputPin *pPin, IMemAllocator **pAlloc) -{ - struct gstdemux_source *pin = impl_source_from_IPin(&base->pin.IPin_iface); - struct gstdemux *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - HRESULT hr; - - TRACE("pin %p, peer %p, allocator %p.\n", pin, pPin, pAlloc); + struct gstdemux_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); + unsigned int buffer_size = 16384; + ALLOCATOR_PROPERTIES ret_props; - *pAlloc = NULL; - if (filter->alloc) + if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_VideoInfo)) { - hr = IMemInputPin_NotifyAllocator(pPin, filter->alloc, FALSE); - if (SUCCEEDED(hr)) - { - *pAlloc = filter->alloc; - IMemAllocator_AddRef(*pAlloc); - } + VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pin->pin.pin.mt.pbFormat; + buffer_size = format->bmiHeader.biSizeImage; + } + else if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx)) + { + WAVEFORMATEX *format = (WAVEFORMATEX *)pin->pin.pin.mt.pbFormat; + buffer_size = format->nAvgBytesPerSec; } - else - hr = VFW_E_NO_ALLOCATOR; - return hr; + props->cBuffers = max(props->cBuffers, 1); + props->cbBuffer = max(props->cbBuffer, buffer_size); + props->cbAlign = max(props->cbAlign, 1); + return IMemAllocator_SetProperties(allocator, props, &ret_props); } static void free_source_pin(struct gstdemux_source *pin) @@ -2155,8 +2102,8 @@ static const struct strmbase_source_ops source_ops = .base.pin_query_accept = source_query_accept, .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnDecideBufferSize = GSTOutPin_DecideBufferSize, - .pfnDecideAllocator = GSTOutPin_DecideAllocator, }; static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *name)

1 0

Nikolay Sivov : ole32: Fix CoGetApartmentType() return value for implicit MTA case.
by Alexandre Julliard Feb. 16, 2020

Feb. 16, 2020

Module: wine Branch: master Commit: 90a6c9bd53973fdae3287fe6fcbd5d78e7f5c6be URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a6c9bd53973fdae3287fe6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 13:01:08 2020 +0300 ole32: Fix CoGetApartmentType() return value for implicit MTA case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 1 + dlls/ole32/tests/compobj.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index aeed3b85fa..bd28f42b33 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5264,6 +5264,7 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) apartment_release(apt); *type = APTTYPE_MTA; *qualifier = APTTYPEQUALIFIER_IMPLICIT_MTA; + return S_OK; } return info->apt ? S_OK : CO_E_NOTINITIALIZED; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 7eb25af9e6..624120890d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -648,7 +648,8 @@ static void _test_apt_type(APTTYPE expected_type, APTTYPEQUALIFIER expected_qual return; hr = pCoGetApartmentType(&type, &qualifier); - ok_(__FILE__, line)(hr == S_OK || hr == CO_E_NOTINITIALIZED, "Unexpected return code: 0x%08x\n", hr); + ok_(__FILE__, line)(hr == S_OK || (type == APTTYPE_CURRENT && hr == CO_E_NOTINITIALIZED), + "Unexpected hr %#x.\n", hr); ok_(__FILE__, line)(type == expected_type, "Wrong apartment type %d, expected %d\n", type, expected_type); ok_(__FILE__, line)(qualifier == expected_qualifier, "Wrong apartment qualifier %d, expected %d\n", qualifier, expected_qualifier);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 16, 2020

Feb. 16, 2020

Module: wine Branch: master Commit: 56c5b064b835361d1987fa584d7c600530a2af99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56c5b064b835361d1987fa58… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Feb 14 08:13:01 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 7d50b4be25..f7cf2fbf54 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-13 10:10+0200\n" +"PO-Revision-Date: 2020-02-14 08:12+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9647,16 +9647,12 @@ msgid "Cape Verde Daylight Time" msgstr "Žaliojo Kyšulio vasaros laikas" #: tzres.rc:114 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "Havajų juostinis laikas" +msgstr "Haičio juostinis laikas" #: tzres.rc:115 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "Havajų vasaros laikas" +msgstr "Haičio vasaros laikas" #: tzres.rc:74 msgid "Central European Standard Time"

1 0

Nikolay Sivov : dwrite/tests: Use wide string literals for some tests.
by Alexandre Julliard Feb. 16, 2020

Feb. 16, 2020

Module: wine Branch: master Commit: c18d2d1c0d80bb644b9ca336895e8c9fd444ed3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c18d2d1c0d80bb644b9ca336… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 11:17:50 2020 +0300 dwrite/tests: Use wide string literals for some tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 99 +++--- dlls/dwrite/tests/font.c | 113 +++---- dlls/dwrite/tests/layout.c | 736 +++++++++++++++++++++---------------------- 3 files changed, 449 insertions(+), 499 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c18d2d1c0d80bb644b9c…

1 0