March 2022 - Wine-Commits - list.winehq.org

Rémi Bernon : quartz: Use the right VideoRenderer pin names.
by Alexandre Julliard March 28, 2022

March 28, 2022

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 : winegstreamer: Implement H264 decoder GetInputStreamInfo.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: aca4537c8645c991745f85ef883b97f84e4ba5cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=aca4537c8645c991745f85ef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 28 17:35:43 2022 +0200 winegstreamer: Implement H264 decoder GetInputStreamInfo. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 6 ------ dlls/winegstreamer/h264_decoder.c | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e58d8278b82..6563ca81b29 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6790,17 +6790,11 @@ static void test_h264_decoder(void) flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; memset(&input_info, 0xcd, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); - todo_wine ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr); - todo_wine ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); - todo_wine ok(input_info.dwFlags == flags, "got dwFlags %#lx\n", input_info.dwFlags); - todo_wine ok(input_info.cbSize == 0x1000, "got cbSize %lu\n", input_info.cbSize); - todo_wine ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead); - todo_wine ok(input_info.cbAlignment == 0, "got cbAlignment %#lx\n", input_info.cbAlignment); flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 2f4b42ed101..f24b07ef496 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -217,8 +217,20 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("iface %p, id %#lx, info %p stub!\n", iface, id, info); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, info %p.\n", iface, id, info); + + if (!decoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + info->hnsMaxLatency = 0; + info->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + info->cbSize = 0x1000; + info->cbMaxLookahead = 0; + info->cbAlignment = 0; + + return S_OK; } static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info)

1 0

Matteo Bruni : d3dx11/tests: Fix tests broken by using the HLSL compiler from vkd3d-shader.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: f26fa0465626561bc531dfda32a9e90e9d52c3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26fa0465626561bc531dfda… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 14:12:16 2022 +0200 d3dx11/tests: Fix tests broken by using the HLSL compiler from vkd3d-shader. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/tests/d3dx11.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index 357a84ce457..47451e7fff2 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -577,7 +577,12 @@ static void test_D3DX11CompileFromFile(void) "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result); todo_wine ok(!!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); + if (errors) + { + ID3D10Blob_Release(errors); + errors = NULL; + } if (blob) { ID3D10Blob_Release(blob); @@ -590,7 +595,12 @@ static void test_D3DX11CompileFromFile(void) hr = D3DX11CompileFromFileW(filename, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result); todo_wine ok(!!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); + if (errors) + { + ID3D10Blob_Release(errors); + errors = NULL; + } if (blob) { ID3D10Blob_Release(blob); @@ -602,7 +612,12 @@ static void test_D3DX11CompileFromFile(void) hr = D3DX11CompileFromFileA(filename_a, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result); todo_wine ok(!!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); + if (errors) + { + ID3D10Blob_Release(errors); + errors = NULL; + } if (blob) { ID3D10Blob_Release(blob); @@ -615,7 +630,12 @@ static void test_D3DX11CompileFromFile(void) hr = D3DX11CompileFromFileW(L"source.ps", NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result); todo_wine ok(!!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); + if (errors) + { + ID3D10Blob_Release(errors); + errors = NULL; + } if (blob) { ID3D10Blob_Release(blob);

1 0

Matteo Bruni : d3dcompiler: Always use vkd3d-shader's preprocessor.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 9400874e3c64036700804a99af0e2940bc4d6622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9400874e3c64036700804a99… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 14:12:18 2022 +0200 d3dcompiler: Always use vkd3d-shader's preprocessor. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_33/Makefile.in | 9 +- dlls/d3dcompiler_34/Makefile.in | 9 +- dlls/d3dcompiler_35/Makefile.in | 9 +- dlls/d3dcompiler_36/Makefile.in | 9 +- dlls/d3dcompiler_37/Makefile.in | 9 +- dlls/d3dcompiler_38/Makefile.in | 9 +- dlls/d3dcompiler_39/Makefile.in | 9 +- dlls/d3dcompiler_40/Makefile.in | 9 +- dlls/d3dcompiler_41/Makefile.in | 9 +- dlls/d3dcompiler_42/Makefile.in | 9 +- dlls/d3dcompiler_43/Makefile.in | 7 +- dlls/d3dcompiler_43/compiler.c | 652 +++----------- dlls/d3dcompiler_43/ppl.l | 1547 --------------------------------- dlls/d3dcompiler_43/ppy.y | 689 --------------- dlls/d3dcompiler_43/preproc.c | 447 ---------- dlls/d3dcompiler_43/tests/asm.c | 15 +- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 3 +- dlls/d3dcompiler_43/wpp_private.h | 251 ------ dlls/d3dcompiler_46/Makefile.in | 9 +- dlls/d3dcompiler_47/Makefile.in | 9 +- dlls/d3dx9_36/tests/asm.c | 2 +- 21 files changed, 154 insertions(+), 3567 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9400874e3c6403670080…

1 0

Rémi Bernon : quartz: Use the right ACMWrapper pin names.
by Alexandre Julliard March 28, 2022

March 28, 2022

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 March 28, 2022

March 28, 2022

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 March 28, 2022

March 28, 2022

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 : winegstreamer: Try creating a wg_transform in the H264 decoder.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 606505e5643d8df2a23a2cc074fa9b6b2ae8b05f URL: https://source.winehq.org/git/wine.git/?a=commit;h=606505e5643d8df2a23a2cc0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 28 17:35:45 2022 +0200 winegstreamer: Try creating a wg_transform in the H264 decoder. Adding H264 format support in wg_format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 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/winegstreamer/h264_decoder.c | 35 ++++++++++++++++++- dlls/winegstreamer/mfplat.c | 47 +++++++++++++++++++++++--- dlls/winegstreamer/quartz_parser.c | 11 +++--- dlls/winegstreamer/unixlib.h | 8 +++++ dlls/winegstreamer/wg_format.c | 69 +++++++++++++++++++++++++++++++++++--- dlls/winegstreamer/wg_transform.c | 4 +++ dlls/winegstreamer/wm_reader.c | 8 +++-- 7 files changed, 165 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=606505e5643d8df2a23a…

1 0

Nikolay Sivov : dbgeng: Use CRT allocation functions.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: adaa984b7bb78a6d31eba824e6a2dff153fd2cf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adaa984b7bb78a6d31eba824… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 28 14:24:59 2022 +0300 dbgeng: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 880b6f03b43..1439cedfeb3 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -31,7 +31,6 @@ #include "dbgeng.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(dbgeng); @@ -149,12 +148,12 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) count = needed / sizeof(HMODULE); - if (!(modules = heap_alloc(count * sizeof(*modules)))) + if (!(modules = calloc(count, sizeof(*modules)))) return E_OUTOFMEMORY; - if (!(target->modules.info = heap_alloc_zero(count * sizeof(*target->modules.info)))) + if (!(target->modules.info = calloc(count, sizeof(*target->modules.info)))) { - heap_free(modules); + free(modules); return E_OUTOFMEMORY; } @@ -179,7 +178,7 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) target->cpu_type = debug_target_get_module_machine(target, modules[0]); - heap_free(modules); + free(modules); target->modules.loaded = count; target->modules.unloaded = 0; /* FIXME */ @@ -331,8 +330,8 @@ static ULONG STDMETHODCALLTYPE debugclient_AddRef(IDebugClient7 *iface) static void debug_target_free(struct target_process *target) { - heap_free(target->modules.info); - heap_free(target); + free(target->modules.info); + free(target); } static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface) @@ -353,7 +352,7 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface) } if (debug_client->event_callbacks) debug_client->event_callbacks->lpVtbl->Release(debug_client->event_callbacks); - heap_free(debug_client); + free(debug_client); } return refcount; @@ -443,7 +442,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient7 *iface, return E_NOTIMPL; } - if (!(process = heap_alloc_zero(sizeof(*process)))) + if (!(process = calloc(1, sizeof(*process)))) return E_OUTOFMEMORY; process->pid = pid; @@ -1900,7 +1899,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug if (!(size = GetFileVersionInfoSizeA(info->image_name, &handle))) return E_FAIL; - if (!(version_info = heap_alloc(size))) + if (!(version_info = malloc(size))) return E_OUTOFMEMORY; if (GetFileVersionInfoA(info->image_name, handle, size, version_info)) @@ -1921,7 +1920,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug } } - heap_free(version_info); + free(version_info); return hr; } @@ -4033,8 +4032,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) TRACE("%s, %p.\n", debugstr_guid(riid), obj); - debug_client = heap_alloc_zero(sizeof(*debug_client)); - if (!debug_client) + if (!(debug_client = calloc(1, sizeof(*debug_client)))) return E_OUTOFMEMORY; debug_client->IDebugClient_iface.lpVtbl = &debugclientvtbl;

1 0

Matteo Bruni : d3dcompiler: Set initial_filename in D3DCompile2().
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 8a7651fd36ebf9850cc63327f465859b70cc40b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a7651fd36ebf9850cc63327… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 14:12:15 2022 +0200 d3dcompiler: Set initial_filename in D3DCompile2(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/compiler.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 4d2642f17e3..ba7789f45a8 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -891,6 +891,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen preprocess_info.pfn_open_include = open_include; preprocess_info.pfn_close_include = close_include; preprocess_info.include_context = include; + initial_filename = filename ? filename : ""; hlsl_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; hlsl_info.next = NULL;

1 0