- Wine-Devel - list.winehq.org

[PATCH] reg/tests: Add tests for trailing backslashes after the system key
by Hugh McMaster April 8, 2021

April 8, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/add.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index e1e7a478502..2c5a8f34ce2 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -268,6 +268,14 @@ static void test_add(void) verify_key(hkey, "keytest4"); delete_key(hkey, "keytest4"); + run_reg_exe("reg add HKCU\\ /v Value1 /t REG_SZ /d foo /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(HKEY_CURRENT_USER, "Value1"); + + run_reg_exe("reg add HKEY_CURRENT_USER\\ /v Value2 /t REG_SZ /d bar /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(HKEY_CURRENT_USER, "Value2"); + /* REG_NONE */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); -- 2.31.0

1 0

[tools 1/2] testbot/WineRun*: Standardize the WrapUpAndExit() functions.
by Francois Gouget April 8, 2021

April 8, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- With this patch the WineRun{Build,Reconfig} WrapUpAndExit() functions more closely match the ones in WineRun{Task,WineTest}. And the next patch will make use of the extra TestFailures parameter. --- testbot/bin/WineRunBuild.pl | 7 +++---- testbot/bin/WineRunReconfig.pl | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 8a92f88d1..13f488bd9 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -181,16 +181,15 @@ sub LogTaskError($) print STDERR "$Name0:error: ", $ErrMessage; } -sub WrapUpAndExit($;$$$) +sub WrapUpAndExit($;$$$$) { - my ($Status, $Retry, $TimedOut, $Reason) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; my $VMResult = defined $Reason ? $Reason : $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; - my $TestFailures; my $Tries = $Task->TestFailures || 0; if ($Retry) { @@ -490,4 +489,4 @@ $TA->Disconnect(); # Wrap up # -WrapUpAndExit($NewStatus, undef, $TaskTimedOut); +WrapUpAndExit($NewStatus, undef, undef, $TaskTimedOut); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 004987f5b..212a5d383 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -182,9 +182,9 @@ sub LogTaskError($) print STDERR "$Name0:error: ", $ErrMessage; } -sub WrapUpAndExit($;$$$) +sub WrapUpAndExit($;$$$$) { - my ($Status, $Retry, $TimedOut, $Reason) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : $Status eq 'completed' ? 'idle' : 'dirty'; my $VMResult = defined $Reason ? $Reason : @@ -192,7 +192,6 @@ sub WrapUpAndExit($;$$$) $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; - my $TestFailures; my $Tries = $Task->TestFailures || 0; if ($Retry) { @@ -567,4 +566,4 @@ if ($NewStatus eq 'completed') # In case of a regular build failure retrying is pointless. But in case of a # timeout the VM host may be less busy next time and since the snapshot is # unchanged we can retry. -WrapUpAndExit($NewStatus, $TaskTimedOut, $TaskTimedOut); +WrapUpAndExit($NewStatus, undef, $TaskTimedOut, $TaskTimedOut); -- 2.20.1

1 1

[tools] winetest/dissect: Update the dll version error highlighting.
by Francois Gouget April 8, 2021

April 8, 2021

Match all the 'dll is missing' errors. There should be no native dlls when running the tests in Wine so treat 'dlls is native' messages as errors. Also we don't get the load error 1157 anymore. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48061 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 2c89abaa2..c681c7d11 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -838,24 +838,28 @@ mydie "report reached file size limit (runaway test?)" if -s $report >= $maxfile $box->{data} .= "<table class=\"output\">\n"; foreach my $dll (sort keys %dllinfo) { - if ($dllinfo{$dll}->{version} eq "dll is missing") + if ($dllinfo{$dll}->{version} =~ /^dll is missing/) { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing</td></tr>\n", escapeHTML($dll); + my $reason = $dllinfo{$dll}->{version}; + $reason =~ s/dll is //; + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($reason); } elsif ($dllinfo{$dll}->{version} eq "skipped") { $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">skipped by user request</td></tr>\n", escapeHTML($dll); } - elsif ($dllinfo{$dll}->{version} eq "load error 1157") + elsif ($dllinfo{$dll}->{version} eq "dll is a stub") { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing dependencies</td></tr>\n", escapeHTML($dll); + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">stub</td></tr>\n", escapeHTML($dll); } - elsif ($dllinfo{$dll}->{version} eq "dll is a stub") + elsif ($dllinfo{$dll}->{version} eq "dll is native") { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">dll is a stub</td></tr>\n", escapeHTML($dll); + # There should be no native dll in the Wine tests + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">native</td></tr>\n", escapeHTML($dll); } elsif ($dllinfo{$dll}->{version} =~ /^load error/) { + # Flag unknown errors $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); } -- 2.20.1

1 0

[tools] testbot/LogUtils: Add a timeout error if the task timed out.
by Francois Gouget April 8, 2021

April 8, 2021

This ensures that the report is flagged as failed even if the timeout happened at the task level. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- So far if a Wine task ran the tests 3 times (e.g. in different bitnesses or locales), often only the first two runs would get an "xxx: Timeout" error. One would then have to deduce that the third run timed out too from the testbot.log's "The task timed out" error. Now all three runs get an "xxx: Timeout" error. This also helps TestWTBS check the timeouts. --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5d2dc33a5..0b2edf735 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -455,6 +455,10 @@ sub _CloseTestUnit($$$) { _AddExtra($LogInfo, "The report seems to have been truncated"); } + elsif ($Last and $LogInfo->{TaskTimedOut}) + { + _AddExtra($LogInfo, "$Cur->{Unit}: Timeout"); + } } } -- 2.20.1

1 0

[tools] winetest/gather: Remove an unused variable.
by Francois Gouget April 8, 2021

April 8, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/gather | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index a0b259b0d..4cbf8e67e 100755 --- a/winetest/gather +++ b/winetest/gather @@ -180,7 +180,7 @@ my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k # Command line processing # -my ($update, $builddir, $usage); +my ($builddir, $usage); sub check_opt_val($$) { @@ -210,7 +210,6 @@ while (@ARGV) elsif ($arg eq "--update") { $builddir = check_opt_val($arg, $builddir); - $update = 1; } elsif ($arg eq "--help") { -- 2.20.1

1 0

[tools] winetest/gather: Avoid a variable name collision for the header rows.
by Francois Gouget April 8, 2021

April 8, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Two $title variables with different scopes were intertwined! I renamed $stats to $stats_row just for consistency. --- winetest/gather | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/winetest/gather b/winetest/gather index 4cbf8e67e..302def437 100755 --- a/winetest/gather +++ b/winetest/gather @@ -504,7 +504,7 @@ sub build_header_footer($) my ($reports)=@_; my $unit_count=scalar(keys %alltests); - my ($title, $stats); + my ($title_row, $stats_row); foreach my $rep (@{$reports}) { my $report=$rep; my $msg; @@ -528,7 +528,7 @@ sub build_header_footer($) EOF chop $msg; } - $title .= <<"EOF"; + $title_row .= <<"EOF"; <th class="sticky"> $msg </th> @@ -549,31 +549,31 @@ EOF my $title = "$unit_count unit tests, $report->{errors} have errors"; $title .= ", $report->{todos} have todos" if $report->{todos}; - $stats .= " <th class=\"result $class\"><a title=\"$title\">$count<br>$prcnt\%</a></th>\n"; + $stats_row .= " <th class=\"result $class\"><a title=\"$title\">$count<br>$prcnt\%</a></th>\n"; } - chop $title; - chop $stats; + chop $title_row; + chop $stats_row; return <<"EOF"; <thead> <tr> <th class="test sticky" colspan="2">platforms</th> -$title +$title_row </tr> <tr> <th class="test" colspan="2">errors</th> -$stats +$stats_row <th class="test"></th> </tr> </thead> <tfoot> <tr> <th class="test" colspan="2">errors</th> -$stats +$stats_row <th class="test"></th> </tr> <tr> <th class="test" colspan="2">platforms</th> -$title +$title_row </tr> </tfoot> EOF -- 2.20.1

1 0

[PATCH] mfplat/tests: Add some more tests for IsCompressedFormat().
by Nikolay Sivov April 8, 2021

April 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c21a57be27f..c33d540ba4b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -993,14 +993,28 @@ if(0) ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); ok(compressed, "Unexpected value %d.\n", compressed); + hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_COMPRESSED, 0); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + compressed = FALSE; + hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); + ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); + ok(compressed, "Unexpected value %d.\n", compressed); + hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_COMPRESSED, 1); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + compressed = TRUE; hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); ok(!compressed, "Unexpected value %d.\n", compressed); + hr = IMFMediaType_DeleteItem(mediatype, &MF_MT_COMPRESSED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); ok(hr == S_OK, "Failed to set GUID value, hr %#x.\n", hr); -- 2.30.2

1 0

[PATCH] winegstreamer: Set MF_MT_ALL_SAMPLES_INDEPENDENT for video types.
by Nikolay Sivov April 8, 2021

April 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Needed for IsCompressedFormat(). dlls/winegstreamer/mfplat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 821657f8dd8..bb632c2cc2c 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -595,6 +595,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * IMFMediaType_SetUINT64(type, &MF_MT_FRAME_RATE, make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); + IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); return type; } -- 2.30.2

1 0

[PATCH] dxva2: Check content formats for software device in GetVideoProcessorRenderTargets().
by Nikolay Sivov April 8, 2021

April 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- EVR mixer depends on this for input type validation. dlls/dxva2/main.c | 8 +++++- dlls/dxva2/tests/dxva2.c | 60 +++++++++++++++++++++++++++++++++------- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 069f03d8077..8952de17b1e 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -399,7 +399,13 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa if (IsEqualGUID(deviceguid, &DXVA2_VideoProcSoftwareDevice)) { - /* FIXME: filter some input formats */ + if (!(video_desc->Format == D3DFMT_A8R8G8B8 || + video_desc->Format == D3DFMT_X8R8G8B8 || + video_desc->Format == D3DFMT_YUY2)) + { + WARN("Unsupported content format %#x.\n", video_desc->Format); + return E_FAIL; + } if (!(*formats = CoTaskMemAlloc(2 * sizeof(**formats)))) return E_OUTOFMEMORY; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index a49635e7596..1de1712d163 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -78,6 +78,14 @@ static void test_surface_desc(IDirect3DSurface9 *surface) ok(desc.Height == 64, "Unexpected height %u.\n", desc.Height); } +static void init_video_desc(DXVA2_VideoDesc *video_desc, D3DFORMAT format) +{ + memset(video_desc, 0, sizeof(*video_desc)); + video_desc->SampleWidth = 64; + video_desc->SampleHeight = 64; + video_desc->Format = format; +} + static void test_device_manager(void) { IDirectXVideoProcessorService *processor_service; @@ -92,11 +100,29 @@ static void test_device_manager(void) D3DFORMAT *formats; UINT token, count; IDirect3D9 *d3d; + unsigned int i; HWND window; GUID *guids; HRESULT hr; RECT rect; + static const D3DFORMAT rt_formats[] = + { + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_YUY2, + }; + static const D3DFORMAT rt_unsupported_formats[] = + { + D3DFMT_A1R5G5B5, + D3DFMT_X1R5G5B5, + D3DFMT_A2R10G10B10, + D3DFMT_A8B8G8R8, + D3DFMT_X8B8G8R8, + D3DFMT_R5G6B5, + D3DFMT_UYVY, + }; + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -316,22 +342,36 @@ static void test_device_manager(void) hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoProcessorService, (void **)&proc_service); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - memset(&video_desc, 0, sizeof(video_desc)); - video_desc.SampleWidth = 64; - video_desc.SampleHeight = 64; - video_desc.Format = D3DFMT_A8R8G8B8; + init_video_desc(&video_desc, D3DFMT_A8R8G8B8); hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(count, "Unexpected format count %u.\n", count); CoTaskMemFree(guids); - count = 0; - hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, - &video_desc, &count, &formats); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(count, "Unexpected format count %u.\n", count); - CoTaskMemFree(formats); + for (i = 0; i < ARRAY_SIZE(rt_formats); ++i) + { + init_video_desc(&video_desc, rt_formats[i]); + + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, + &video_desc, &count, &formats); + ok(hr == S_OK, "Unexpected hr %#x, format %d.\n", hr, rt_formats[i]); + ok(count == 2, "Unexpected format count %u.\n", count); + if (count == 2) + ok(formats[0] == D3DFMT_X8R8G8B8 && formats[1] == D3DFMT_A8R8G8B8, "Unexpected formats %d,%d.\n", + formats[0], formats[1]); + CoTaskMemFree(formats); + } + + for (i = 0; i < ARRAY_SIZE(rt_unsupported_formats); ++i) + { + init_video_desc(&video_desc, rt_unsupported_formats[i]); + + hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, + &video_desc, &count, &formats); + ok(hr == E_FAIL, "Unexpected hr %#x, format %d.\n", hr, rt_unsupported_formats[i]); + } IDirectXVideoProcessorService_Release(proc_service); -- 2.30.2

1 0

[PATCH] mfreadwrite: Use CRT functions for heap allocations.
by Nikolay Sivov April 8, 2021

April 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 17 ++++++++--------- dlls/mfreadwrite/writer.c | 7 +++---- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index ffe91f5d265..2edc83b8685 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -38,7 +38,6 @@ #include "dxva2api.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" #include "mf_private.h" @@ -263,7 +262,7 @@ static ULONG WINAPI source_reader_async_command_Release(IUnknown *iface) { if (command->op == SOURCE_READER_ASYNC_SEEK) PropVariantClear(&command->u.seek.position); - heap_free(command); + free(command); } return refcount; @@ -280,7 +279,7 @@ static HRESULT source_reader_create_async_op(enum source_reader_async_op op, str { struct source_reader_async_command *command; - if (!(command = heap_alloc_zero(sizeof(*command)))) + if (!(command = calloc(1, sizeof(*command)))) return E_OUTOFMEMORY; command->IUnknown_iface.lpVtbl = &source_reader_async_command_vtbl; @@ -448,7 +447,7 @@ static void source_reader_queue_response(struct source_reader *reader, struct me { struct stream_response *response; - response = heap_alloc_zero(sizeof(*response)); + response = calloc(1, sizeof(*response)); response->status = status; response->stream_index = stream->index; response->stream_flags = stream_flags; @@ -973,7 +972,7 @@ static void source_reader_release_response(struct stream_response *response) { if (response->sample) IMFSample_Release(response->sample); - heap_free(response); + free(response); } static HRESULT source_reader_get_stream_selection(const struct source_reader *reader, DWORD index, BOOL *selected) @@ -1395,10 +1394,10 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFVideoSampleAllocatorEx_Release(stream->allocator); } source_reader_release_responses(reader, NULL); - heap_free(reader->streams); + free(reader->streams); MFUnlockWorkQueue(reader->queue); DeleteCriticalSection(&reader->cs); - heap_free(reader); + free(reader); } return refcount; @@ -2287,7 +2286,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri unsigned int i; HRESULT hr; - object = heap_alloc_zero(sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -2311,7 +2310,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorCount(object->descriptor, &object->stream_count))) goto failed; - if (!(object->streams = heap_alloc_zero(object->stream_count * sizeof(*object->streams)))) + if (!(object->streams = calloc(object->stream_count, sizeof(*object->streams)))) { hr = E_OUTOFMEMORY; goto failed; diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index 41318626657..6807ee26fbe 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -25,7 +25,6 @@ #include "mf_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -76,7 +75,7 @@ static ULONG WINAPI sink_writer_Release(IMFSinkWriter *iface) if (!refcount) { - heap_free(writer); + free(writer); } return refcount; @@ -185,7 +184,7 @@ HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attribut struct sink_writer *object; HRESULT hr; - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -203,7 +202,7 @@ HRESULT create_sink_writer_from_stream(IMFByteStream *stream, IMFAttributes *att struct sink_writer *object; HRESULT hr; - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if (!object) return E_OUTOFMEMORY; -- 2.30.2

1 0