wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Rémi Bernon : kernel32/tests: Clean GlobalAlloc tests and move them together.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 60805ce139709f5fe0ade1c83b126181e34e960b URL: https://source.winehq.org/git/wine.git/?a=commit;h=60805ce139709f5fe0ade1c8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 28 11:35:55 2022 +0200 kernel32/tests: Clean GlobalAlloc tests and move them together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 692 +++++++++++++++++++++------------------------ 1 file changed, 329 insertions(+), 363 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60805ce139709f5fe0ad…

1 0

Rémi Bernon : kernel32/tests: Use 0xdeadbeef directly instead of a custom define.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: b4b097512f5ece93591b274def8770de1bfe7371 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4b097512f5ece93591b274d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 28 11:35:54 2022 +0200 kernel32/tests: Use 0xdeadbeef directly instead of a custom define. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 110 ++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b4b097512f5ece93591b…

1 0

Huw Davies : winealsa: Add missing includes.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 43da2eac3d2bad9455371c0a57d4cf25d6f13930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43da2eac3d2bad9455371c0a… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Mar 26 20:25:30 2022 +0000 winealsa: Add missing includes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52728 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsamidi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 476ea383a25..4f3f5538891 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -30,6 +30,8 @@ #include <stdarg.h> #include <stdio.h> +#include <stdint.h> +#include <unistd.h> #include <pthread.h> #include <time.h> #include <alsa/asoundlib.h>

1 0

Dmitry Timoshkov : kernel32/tests: Add a test to show that services.exe is supposed to run in the session 0.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: edb5762b55f04b3322972cc400bec1e973c03ae5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edb5762b55f04b3322972cc4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 25 18:40:29 2022 +0300 kernel32/tests: Add a test to show that services.exe is supposed to run in the session 0. IsWindowsService() from Microsoft.Extensions.Hosting.WindowsServices (.Net 4.6, 4.8, 5.0) depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e9e8555c32e..8f18a0d37a7 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4959,6 +4959,40 @@ static void test_job_list_attribute(HANDLE parent_job) ok(ret, "SetInformationJobObject error %lu\n", GetLastError()); } +static void test_services_exe(void) +{ + NTSTATUS status; + ULONG size, offset; + char *buf; + SYSTEM_PROCESS_INFORMATION *spi; + ULONG services_pid = 0, services_session_id = ~0; + + status = NtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); + + buf = malloc(size); + status = NtQuerySystemInformation(SystemProcessInformation, buf, size, &size); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + + spi = (SYSTEM_PROCESS_INFORMATION *)buf; + offset = 0; + + do + { + spi = (SYSTEM_PROCESS_INFORMATION *)(buf + offset); + if (!wcsnicmp(spi->ProcessName.Buffer, L"services.exe", spi->ProcessName.Length/sizeof(WCHAR))) + { + services_pid = HandleToUlong(spi->UniqueProcessId); + services_session_id = spi->SessionId; + } + offset += spi->NextEntryOffset; + } while (spi->NextEntryOffset != 0); + + ok(services_pid != 0, "services.exe not found\n"); + todo_wine + ok(services_session_id == 0, "got services.exe SessionId %lu\n", services_session_id); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -5088,6 +5122,7 @@ START_TEST(process) test_parent_process_attribute(0, NULL); test_handle_list_attribute(FALSE, NULL, NULL); test_dead_process(); + test_services_exe(); /* things that can be tested: * lookup: check the way program to be executed is searched

1 0

Rémi Bernon : quartz: Use the right VideoRenderer pin names.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: af3fcc3f3ef14eb25781855f63ca44d1e1383aa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3fcc3f3ef14eb25781855f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 25 09:42:08 2022 +0100 quartz: Use the right VideoRenderer pin names. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/videorenderer.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c1a3266197b..282d1ef7b12 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -347,7 +347,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", debugstr_w(info.achName)); + ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", debugstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(pin); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f44ce35dc59..f725a9998ce 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -481,6 +481,8 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; strmbase_renderer_init(&object->renderer, outer, &CLSID_VideoRenderer, L"In", &renderer_ops); + wcscpy(object->renderer.sink.pin.name, L"Input"); + object->IOverlay_iface.lpVtbl = &overlay_vtbl; video_window_init(&object->window, &IVideoWindow_VTable,

1 0

Rémi Bernon : quartz: Use the right AVIDec pin names.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 9e32d45d982ef6fb84f5fb1143099eb3827ce083 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e32d45d982ef6fb84f5fb11… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 25 09:42:07 2022 +0100 quartz: Use the right AVIDec pin names. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 3 +++ dlls/quartz/tests/avidec.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index f473c829cba..8cc729748c1 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -602,8 +602,11 @@ HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_AVIDec, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + wcscpy(object->sink.pin.name, L"XForm In"); strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + wcscpy(object->source.pin.name, L"XForm Out"); + object->source_IQualityControl_iface.lpVtbl = &source_qc_vtbl; strmbase_passthrough_init(&object->passthrough, (IUnknown *)&object->source.pin.IPin_iface); ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 12d8daf3872..46ce5d9eeda 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -521,7 +521,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!wcscmp(info.achName, L"XForm In"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!wcscmp(info.achName, L"XForm In"), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(pin); @@ -552,7 +552,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!wcscmp(info.achName, L"XForm Out"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!wcscmp(info.achName, L"XForm Out"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir);

1 0

Rémi Bernon : quartz: Use the right ACMWrapper pin names.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 7348ac682693885350dff3188c51bc9a4d7966f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7348ac682693885350dff318… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 25 09:42:06 2022 +0100 quartz: Use the right ACMWrapper pin names. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 3 +++ dlls/quartz/tests/acmwrapper.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index cf8e7cd125d..8e1b5e6b773 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -520,8 +520,11 @@ HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_ACMWrapper, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + wcscpy(object->sink.pin.name, L"Input"); strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + wcscpy(object->source.pin.name, L"Output"); + object->source_IQualityControl_iface.lpVtbl = &source_qc_vtbl; strmbase_passthrough_init(&object->passthrough, (IUnknown *)&object->source.pin.IPin_iface); ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 564daa3a6f9..caeca61ae50 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -380,7 +380,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", debugstr_w(info.achName)); + ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", debugstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(pin); @@ -411,7 +411,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", debugstr_w(info.achName)); + ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", debugstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir);

1 0

Rémi Bernon : qcap: Use the right AVICo pin names.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 235effd902a4c5f25ec7244d37875091beba58a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=235effd902a4c5f25ec7244d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 25 09:42:05 2022 +0100 qcap: Use the right AVICo pin names. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 3 +++ dlls/qcap/tests/avico.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 71d00c4e4ef..2a347bd2027 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -480,7 +480,10 @@ HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) object->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + wcscpy(object->sink.pin.name, L"Input"); + strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + wcscpy(object->source.pin.name, L"Output"); TRACE("Created AVI compressor %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 7435815f012..abd4fa8e5e7 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -353,7 +353,7 @@ static void test_pin_info(IBaseFilter *filter) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!lstrcmpW(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); @@ -374,7 +374,7 @@ static void test_pin_info(IBaseFilter *filter) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!lstrcmpW(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir);

1 0

Rémi Bernon : qedit: Use the right SampleGrabber pin names.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: bd18fa2099d564b6a28672f06978e3bfe0fd74cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd18fa2099d564b6a28672f0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 25 09:42:04 2022 +0100 qedit: Use the right SampleGrabber pin names. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 3 +++ dlls/qedit/tests/samplegrabber.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index a89229c4447..9b9780e564a 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -652,8 +652,11 @@ HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out) object->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + wcscpy(object->sink.pin.name, L"Input"); strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + wcscpy(object->source.pin.name, L"Output"); + strmbase_passthrough_init(&object->passthrough, (IUnknown *)&object->source.pin.IPin_iface); ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, &object->sink.pin.IPin_iface); diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 32fcfc1eb2b..9daa67355b2 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -312,7 +312,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); @@ -336,7 +336,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir);

1 0

Rémi Bernon : strmbase: Add a separate id for pins.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: aa9aa7390f5d689f4ca39cbec98b9c0dd7f2e1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9aa7390f5d689f4ca39cbe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 25 09:42:03 2022 +0100 strmbase: Add a separate id for pins. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/strmbase.h | 1 + libs/strmbase/filter.c | 2 +- libs/strmbase/pin.c | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3e92136b7f7..1b4cc3f7657 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -36,6 +36,7 @@ struct strmbase_pin struct strmbase_filter *filter; PIN_DIRECTION dir; WCHAR name[128]; + WCHAR id[128]; IPin *peer; AM_MEDIA_TYPE mt; diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c index 92b4f1cb4b6..ee41611a198 100644 --- a/libs/strmbase/filter.c +++ b/libs/strmbase/filter.c @@ -436,7 +436,7 @@ static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin * for (i = 0; (pin = filter->ops->filter_get_pin(filter, i)); ++i) { - if (!lstrcmpW(id, pin->name)) + if (!lstrcmpW(id, pin->id)) { IPin_AddRef(*ret = &pin->IPin_iface); return S_OK; diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index 1aecb7a8c98..03330837477 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -383,10 +383,10 @@ static HRESULT WINAPI pin_QueryId(IPin *iface, WCHAR **id) TRACE("pin %p %s:%s, id %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), id); - if (!(*id = CoTaskMemAlloc((lstrlenW(pin->name) + 1) * sizeof(WCHAR)))) + if (!(*id = CoTaskMemAlloc((lstrlenW(pin->id) + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; - lstrcpyW(*id, pin->name); + lstrcpyW(*id, pin->id); return S_OK; } @@ -770,6 +770,7 @@ void strmbase_source_init(struct strmbase_source *pin, struct strmbase_filter *f pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); + lstrcpyW(pin->pin.id, name); pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; } @@ -1172,6 +1173,7 @@ void strmbase_sink_init(struct strmbase_sink *pin, struct strmbase_filter *filte pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); + lstrcpyW(pin->pin.id, name); pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; pin->pAllocator = pin->preferred_allocator = allocator;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022