- Wine-Devel - list.winehq.org

[PATCH 05/11] msvcrt: Use _beginthread_start_routine_t from public header.
by Piotr Caban Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/msvcrt.h | 2 -- dlls/msvcrt/thread.c | 7 ++++--- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 4 files changed, 10 insertions(+), 11 deletions(-)

1 0

[PATCH 04/11] msvcrt: Remove MSVCRT_ prefix from cpp.c functions.
by Piotr Caban Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 148 +++++------ dlls/msvcr110/msvcr110.spec | 192 +++++++------- dlls/msvcr120/msvcr120.spec | 192 +++++++------- dlls/msvcr70/msvcr70.spec | 154 +++++------ dlls/msvcr71/msvcr71.spec | 138 +++++----- dlls/msvcr80/msvcr80.spec | 144 +++++----- dlls/msvcr90/msvcr90.spec | 144 +++++----- dlls/msvcrt/cpp.c | 510 ++++++++++++++++++------------------ dlls/msvcrt/cppexcept.h | 8 +- dlls/msvcrt/cxx.h | 14 +- dlls/msvcrt/except_i386.c | 6 +- dlls/msvcrt/except_x86_64.c | 6 +- dlls/msvcrt/msvcrt.h | 17 +- dlls/msvcrt/msvcrt.spec | 216 +++++++-------- dlls/msvcrt/scheduler.c | 22 +- dlls/msvcrtd/msvcrtd.spec | 138 +++++----- dlls/ucrtbase/ucrtbase.spec | 36 +-- 17 files changed, 1042 insertions(+), 1043 deletions(-)

1 0

[PATCH 03/11] msvcrt: Use struct tm from public header.
by Piotr Caban Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 4 +- dlls/msvcrt/time.c | 90 ++++++++++++++++++++++---------------------- 2 files changed, 46 insertions(+), 48 deletions(-)

1 0

[PATCH 02/11] msvcrt: Use EOF from public header.
by Piotr Caban Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/console.c | 18 +++++------ dlls/msvcrt/file.c | 74 +++++++++++++++++++++---------------------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/scanf.h | 4 +-- dlls/msvcrt/wcs.c | 4 +-- 6 files changed, 51 insertions(+), 52 deletions(-)

1 0

[PATCH 01/11] msvcrt: Use WEOF from public header.
by Piotr Caban Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/console.c | 18 ++++++++---------- dlls/msvcrt/file.c | 42 +++++++++++++++++++++--------------------- dlls/msvcrt/mbcs.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/scanf.h | 8 ++++---- dlls/msvcrt/string.c | 22 +++++++++++----------- dlls/msvcrt/wcs.c | 4 ++-- 7 files changed, 48 insertions(+), 51 deletions(-)

1 0

[v4 PATCH 1/4] mf/topoloader: Add partial topology resolution tests.
by Nikolay Sivov Nov. 30, 2020

Nov. 30, 2020

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/Makefile.in | 2 - dlls/mf/tests/mf.c | 705 ++++++++++++++++++++++++++++++++------ dlls/mf/tests/resource.rc | 22 -- dlls/mf/tests/test.wav | Bin 4488 -> 0 bytes 4 files changed, 597 insertions(+), 132 deletions(-) delete mode 100644 dlls/mf/tests/resource.rc delete mode 100644 dlls/mf/tests/test.wav diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index 5eb9ee4d4e3..614eb4fbc9e 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -3,5 +3,3 @@ IMPORTS = mf mfplat mfuuid ole32 user32 C_SRCS = \ mf.c - -RC_SRCS = resource.rc diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index fda80974724..5e5c30ec6fc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -97,34 +97,6 @@ static HWND create_window(void) 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); } -static WCHAR *load_resource(const WCHAR *name) -{ - static WCHAR pathW[MAX_PATH]; - DWORD written; - HANDLE file; - HRSRC res; - void *ptr; - - GetTempPathW(ARRAY_SIZE(pathW), pathW); - lstrcatW(pathW, name); - - file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, - NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", - wine_dbgstr_w(pathW), GetLastError()); - - res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); - ok(res != 0, "couldn't find resource\n"); - ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); - WriteFile(file, ptr, SizeofResource(GetModuleHandleA(NULL), res), - &written, NULL); - ok(written == SizeofResource(GetModuleHandleA(NULL), res), - "couldn't write resource\n" ); - CloseHandle(file); - - return pathW; -} - static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -1447,28 +1419,458 @@ static const IMFSampleGrabberSinkCallbackVtbl test_grabber_callback_vtbl = test_grabber_callback_OnShutdown, }; +struct test_source +{ + IMFMediaSource IMFMediaSource_iface; + LONG refcount; +}; + +static struct test_source *impl_from_IMFMediaSource(IMFMediaSource *iface) +{ + return CONTAINING_RECORD(iface, struct test_source, IMFMediaSource_iface); +} + +static HRESULT WINAPI test_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) +{ + if (IsEqualIID(riid, &IID_IMFMediaSource) + || IsEqualIID(riid, &IID_IMFMediaEventGenerator) + || IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + } + else + { + *out = NULL; + return E_NOINTERFACE; + } + + IMFMediaSource_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI test_source_AddRef(IMFMediaSource *iface) +{ + struct test_source *source = impl_from_IMFMediaSource(iface); + return InterlockedIncrement(&source->refcount); +} + +static ULONG WINAPI test_source_Release(IMFMediaSource *iface) +{ + struct test_source *source = impl_from_IMFMediaSource(iface); + ULONG refcount = InterlockedDecrement(&source->refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, source); + + return refcount; +} + +static HRESULT WINAPI test_source_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_source_GetCharacteristics(IMFMediaSource *iface, DWORD *flags) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **pd) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *pd, const GUID *time_format, + const PROPVARIANT *start_position) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_source_Stop(IMFMediaSource *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_source_Pause(IMFMediaSource *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_source_Shutdown(IMFMediaSource *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IMFMediaSourceVtbl test_source_vtbl = +{ + test_source_QueryInterface, + test_source_AddRef, + test_source_Release, + test_source_GetEvent, + test_source_BeginGetEvent, + test_source_EndGetEvent, + test_source_QueueEvent, + test_source_GetCharacteristics, + test_source_CreatePresentationDescriptor, + test_source_Start, + test_source_Stop, + test_source_Pause, + test_source_Shutdown, +}; + +static IMFMediaSource *create_test_source(void) +{ + struct test_source *source; + + source = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*source)); + source->IMFMediaSource_iface.lpVtbl = &test_source_vtbl; + source->refcount = 1; + + return &source->IMFMediaSource_iface; +} + +struct type_attr +{ + const GUID *key; + unsigned int value; +}; + +static void init_media_type(IMFMediaType *mediatype, const GUID *major, const struct type_attr *attrs) +{ + HRESULT hr; + + hr = IMFMediaType_DeleteAllItems(mediatype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, major); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + while (attrs->key) + { + if (IsEqualGUID(attrs->key, &MF_MT_SUBTYPE)) + { + GUID subtype; + + memcpy(&subtype, IsEqualGUID(major, &MFMediaType_Audio) ? &MFAudioFormat_Base : &MFVideoFormat_Base, + sizeof(subtype)); + subtype.Data1 = attrs->value; + hr = IMFMediaType_SetGUID(mediatype, attrs->key, &subtype); + } + else + hr = IMFMediaType_SetUINT32(mediatype, attrs->key, attrs->value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + attrs++; + } +} + +static void init_source_node(IMFMediaType *mediatype, IMFMediaSource *source, IMFTopologyNode *node) +{ + IMFPresentationDescriptor *pd; + IMFMediaTypeHandler *handler; + IMFStreamDescriptor *sd; + HRESULT hr; + + hr = IMFTopologyNode_DeleteAllItems(node); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateStreamDescriptor(0, 1, &mediatype, &sd); + ok(hr == S_OK, "Failed to create stream descriptor, hr %#x.\n", hr); + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); + ok(hr == S_OK, "Failed to get media type handler, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype); + ok(hr == S_OK, "Failed to set current media type, hr %#x.\n", hr); + + IMFMediaTypeHandler_Release(handler); + + hr = MFCreatePresentationDescriptor(1, &sd, &pd); + ok(hr == S_OK, "Failed to create presentation descriptor, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUnknown(node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)pd); + ok(hr == S_OK, "Failed to set node pd, hr %#x.\n", hr); + + IMFPresentationDescriptor_Release(pd); + + hr = IMFTopologyNode_SetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + ok(hr == S_OK, "Failed to set node sd, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUnknown(node, &MF_TOPONODE_SOURCE, (IUnknown *)source); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFStreamDescriptor_Release(sd); +} + +static void init_sink_node(IMFActivate *sink_activate, unsigned int method, IMFTopologyNode *node) +{ + IMFStreamSink *stream_sink; + IMFMediaSink *sink; + HRESULT hr; + + hr = IMFTopologyNode_DeleteAllItems(node); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaSink_Release(sink); + + hr = IMFTopologyNode_SetObject(node, (IUnknown *)stream_sink); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + IMFStreamSink_Release(stream_sink); + + hr = IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_CONNECT_METHOD, method); + ok(hr == S_OK, "Failed to set connect method, hr %#x.\n", hr); +} + +enum loader_test_flags +{ + LOADER_EXPECTED_DECODER = 0x1, + LOADER_EXPECTED_CONVERTER = 0x2, + LOADER_TODO = 0x4, +}; + static void test_topology_loader(void) { + static const struct loader_test + { + const GUID *major; + struct + { + struct type_attr attrs[8]; + } input_type; + struct + { + struct type_attr attrs[8]; + } output_type; + + MF_CONNECT_METHOD method; + HRESULT expected_result; + unsigned int flags; + } + loader_tests[] = + { + { + /* PCM -> PCM, same type */ + &MFMediaType_Audio, + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, + { &MF_MT_AUDIO_NUM_CHANNELS, 1 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + { &MF_MT_AUDIO_BITS_PER_SAMPLE, 8 }, + } + }, + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, + { &MF_MT_AUDIO_NUM_CHANNELS, 1 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + { &MF_MT_AUDIO_BITS_PER_SAMPLE, 8 }, + } + }, + + MF_CONNECT_DIRECT, + S_OK, + }, + + { + /* PCM -> PCM, different bps. */ + &MFMediaType_Audio, + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, + { &MF_MT_AUDIO_NUM_CHANNELS, 1 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + { &MF_MT_AUDIO_BITS_PER_SAMPLE, 8 }, + } + }, + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, + { &MF_MT_AUDIO_NUM_CHANNELS, 1 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 48000 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + { &MF_MT_AUDIO_BITS_PER_SAMPLE, 8 }, + } + }, + + MF_CONNECT_DIRECT, + MF_E_INVALIDMEDIATYPE, + LOADER_TODO, + }, + + { + /* PCM -> PCM, different bps. */ + &MFMediaType_Audio, + /* Source type */ + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, + { &MF_MT_AUDIO_NUM_CHANNELS, 1 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + { &MF_MT_AUDIO_BITS_PER_SAMPLE, 8 }, + } + }, + /* Sink type */ + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, + { &MF_MT_AUDIO_NUM_CHANNELS, 1 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 48000 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + { &MF_MT_AUDIO_BITS_PER_SAMPLE, 8 }, + } + }, + + MF_CONNECT_ALLOW_CONVERTER, + S_OK, + LOADER_EXPECTED_CONVERTER, + }, + + { + /* MP3 -> PCM */ + &MFMediaType_Audio, + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_MPEGLAYER3 }, + { &MF_MT_AUDIO_NUM_CHANNELS, 2 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 16000 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + } + }, + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, + { &MF_MT_AUDIO_NUM_CHANNELS, 1 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + { &MF_MT_AUDIO_BITS_PER_SAMPLE, 8 }, + } + }, + + MF_CONNECT_DIRECT, + MF_E_INVALIDMEDIATYPE, + LOADER_TODO, + }, + + { + /* MP3 -> PCM */ + &MFMediaType_Audio, + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_MPEGLAYER3 }, + { &MF_MT_AUDIO_NUM_CHANNELS, 2 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 16000 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + } + }, + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, + { &MF_MT_AUDIO_NUM_CHANNELS, 1 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + { &MF_MT_AUDIO_BITS_PER_SAMPLE, 8 }, + } + }, + + MF_CONNECT_ALLOW_CONVERTER, + MF_E_TRANSFORM_NOT_POSSIBLE_FOR_CURRENT_MEDIATYPE_COMBINATION, + LOADER_TODO, + }, + + { + /* MP3 -> PCM */ + &MFMediaType_Audio, + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_MPEGLAYER3 }, + { &MF_MT_AUDIO_NUM_CHANNELS, 2 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 16000 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + } + }, + { + { + { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, + { &MF_MT_AUDIO_NUM_CHANNELS, 1 }, + { &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 44100 }, + { &MF_MT_AUDIO_BLOCK_ALIGNMENT, 1 }, + { &MF_MT_AUDIO_BITS_PER_SAMPLE, 8 }, + } + }, + + MF_CONNECT_ALLOW_DECODER, + S_OK, + LOADER_EXPECTED_DECODER, + }, + }; + IMFSampleGrabberSinkCallback test_grabber_callback = { &test_grabber_callback_vtbl }; + IMFTopologyNode *src_node, *sink_node, *src_node2, *sink_node2, *mft_node; IMFTopology *topology, *topology2, *full_topology; - IMFTopologyNode *src_node, *sink_node; + IMFMediaType *media_type, *input_type, *output_type; + unsigned int i, count, value, index; IMFPresentationDescriptor *pd; - IMFSourceResolver *resolver; IMFActivate *sink_activate; - IMFStreamSink *stream_sink; - unsigned int count, value; - IMFMediaType *media_type; + MF_TOPOLOGY_TYPE node_type; IMFStreamDescriptor *sd; - MF_OBJECT_TYPE obj_type; + IMFTransform *transform; IMFMediaSource *source; IMFTopoLoader *loader; - IMFByteStream *stream; - IMFAttributes *attr; - IMFMediaSink *sink; - WCHAR *filename; - BOOL selected; + IUnknown *node_object; + WORD node_count; + TOPOID node_id; HRESULT hr; - GUID guid; + BOOL ret; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Startup failure, hr %#x.\n", hr); @@ -1487,44 +1889,39 @@ static void test_topology_loader(void) todo_wine ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#x.\n", hr); - hr = MFCreateSourceResolver(&resolver); - ok(hr == S_OK, "Failed to create source resolver, hr %#x.\n", hr); + /* Add source node. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); - filename = load_resource(L"test.wav"); + /* When a decoder is involved, windows requires this attribute to be present */ + source = create_test_source(); - hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); - ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)source); + ok(hr == S_OK, "Failed to set node source, hr %#x.\n", hr); - IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attr); - IMFAttributes_SetString(attr, &MF_BYTESTREAM_CONTENT_TYPE, L"audio/wav"); - IMFAttributes_Release(attr); + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, - &obj_type, (IUnknown **)&source); - ok(hr == S_OK || broken(FAILED(hr)) /* Vista */, "Failed to create source, hr %#x.\n", hr); - if (FAILED(hr)) - return; + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); - ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr); - if (FAILED(hr)) - return; + hr = MFCreateStreamDescriptor(0, 1, &media_type, &sd); + ok(hr == S_OK, "Failed to create stream descriptor, hr %#x.\n", hr); - hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); - ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + ok(hr == S_OK, "Failed to set node sd, hr %#x.\n", hr); - /* Add source node. */ - hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node); - ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); - - hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)source); - ok(hr == S_OK, "Failed to set node source, hr %#x.\n", hr); + hr = MFCreatePresentationDescriptor(1, &sd, &pd); + ok(hr == S_OK, "Failed to create presentation descriptor, hr %#x.\n", hr); hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)pd); ok(hr == S_OK, "Failed to set node pd, hr %#x.\n", hr); - hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); - ok(hr == S_OK, "Failed to set node sd, hr %#x.\n", hr); + IMFPresentationDescriptor_Release(pd); + IMFStreamDescriptor_Release(sd); + IMFMediaType_Release(media_type); hr = IMFTopology_AddNode(topology, src_node); ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); @@ -1534,7 +1931,9 @@ todo_wine todo_wine ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#x.\n", hr); - /* Add grabber sink. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node); + ok(hr == S_OK, "Failed to create output node, hr %#x.\n", hr); + hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); @@ -1546,13 +1945,11 @@ todo_wine hr = MFCreateSampleGrabberSinkActivate(media_type, &test_grabber_callback, &sink_activate); ok(hr == S_OK, "Failed to create grabber sink, hr %#x.\n", hr); - IMFMediaType_Release(media_type); - - hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node); - ok(hr == S_OK, "Failed to create output node, hr %#x.\n", hr); - hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink_activate); ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + hr = IMFTopology_AddNode(topology, sink_node); ok(hr == S_OK, "Failed to add sink node, hr %#x.\n", hr); @@ -1567,55 +1964,147 @@ todo_wine hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); ok(hr == MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED, "Unexpected hr %#x.\n", hr); - hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); - ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + hr = MFCreateMediaType(&input_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); - hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = MFCreateMediaType(&output_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); - hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); - ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(loader_tests); ++i) + { + const struct loader_test *test = &loader_tests[i]; - IMFStreamSink_Release(stream_sink); + init_media_type(input_type, test->major, test->input_type.attrs); + init_media_type(output_type, test->major, test->output_type.attrs); - hr = IMFTopology_GetCount(topology, &count); - ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); - ok(count == 0, "Unexpected count %u.\n", count); + hr = MFCreateSampleGrabberSinkActivate(output_type, &test_grabber_callback, &sink_activate); + ok(hr == S_OK, "Failed to create grabber sink, hr %#x.\n", hr); - hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); - ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); - ok(full_topology != topology, "Unexpected instance.\n"); + init_source_node(input_type, source, src_node); + init_sink_node(sink_activate, test->method, sink_node); - hr = IMFTopology_GetCount(topology, &count); - ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); - ok(count == 0, "Unexpected count %u.\n", count); + hr = IMFTopology_GetCount(topology, &count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); - hr = IMFTopology_GetCount(full_topology, &count); - ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); +todo_wine_if(test->flags & LOADER_TODO) + ok(hr == test->expected_result, "Unexpected hr %#x on test %u.\n", hr, i); + ok(full_topology != topology, "Unexpected instance.\n"); + + if (test->expected_result == S_OK && hr == S_OK) + { + hr = IMFTopology_GetCount(full_topology, &count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); todo_wine - ok(count == 1, "Unexpected count %u.\n", count); + ok(count == 1, "Unexpected count %u.\n", count); - hr = IMFTopology_GetItemByIndex(full_topology, 0, &guid, NULL); -todo_wine { - ok(hr == S_OK, "Failed to get attribute key, hr %#x.\n", hr); - ok(IsEqualGUID(&guid, &MF_TOPOLOGY_RESOLUTION_STATUS), "Unexpected key %s.\n", wine_dbgstr_guid(&guid)); -} - value = 0xdeadbeef; - hr = IMFTopology_GetUINT32(full_topology, &MF_TOPOLOGY_RESOLUTION_STATUS, &value); + value = 0xdeadbeef; + hr = IMFTopology_GetUINT32(full_topology, &MF_TOPOLOGY_RESOLUTION_STATUS, &value); todo_wine { - ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); - ok(value == MF_TOPOLOGY_RESOLUTION_SUCCEEDED, "Unexpected value %#x.\n", value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(value == MF_TOPOLOGY_RESOLUTION_SUCCEEDED, "Unexpected value %#x.\n", value); } - hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL); - ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); - ok(full_topology != topology2, "Unexpected instance.\n"); + count = 2; + if (test->flags & LOADER_EXPECTED_DECODER) + count++; + if (test->flags & LOADER_EXPECTED_CONVERTER) + count++; - IMFTopology_Release(topology2); - IMFTopology_Release(full_topology); + hr = IMFTopology_GetNodeCount(full_topology, &node_count); + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + todo_wine_if(test->flags & (LOADER_EXPECTED_CONVERTER | LOADER_EXPECTED_DECODER)) + ok(node_count == count, "Unexpected node count %u.\n", node_count); + + hr = IMFTopologyNode_GetTopoNodeID(src_node, &node_id); + ok(hr == S_OK, "Failed to get source node id, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeByID(full_topology, node_id, &src_node2); + ok(hr == S_OK, "Failed to get source in resolved topology, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetTopoNodeID(sink_node, &node_id); + ok(hr == S_OK, "Failed to get sink node id, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeByID(full_topology, node_id, &sink_node2); + ok(hr == S_OK, "Failed to get sink in resolved topology, hr %#x.\n", hr); + + if (test->flags & (LOADER_EXPECTED_DECODER | LOADER_EXPECTED_CONVERTER) && strcmp(winetest_platform, "wine")) + { + hr = IMFTopologyNode_GetOutput(src_node2, 0, &mft_node, &index); + ok(hr == S_OK, "Failed to get transform node in resolved topology, hr %#x.\n", hr); + ok(!index, "Unexpected stream index %u.\n", index); + + hr = IMFTopologyNode_GetNodeType(mft_node, &node_type); + ok(hr == S_OK, "Failed to get transform node type in resolved topology, hr %#x.\n", hr); + ok(node_type == MF_TOPOLOGY_TRANSFORM_NODE, "Unexpected node type %u.\n", node_type); + + hr = IMFTopologyNode_GetObject(mft_node, &node_object); + ok(hr == S_OK, "Failed to get object of transform node, hr %#x.\n", hr); + + hr = IUnknown_QueryInterface(node_object, &IID_IMFTransform, (void **)&transform); + ok(hr == S_OK, "Failed to get IMFTransform from transform node's object, hr %#x.\n", hr); + IUnknown_Release(node_object); + + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Failed to get transform input type, hr %#x.\n", hr); + + hr = IMFMediaType_Compare(input_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret); + ok(hr == S_OK, "Failed to compare media types, hr %#x.\n", hr); + ok(ret, "Input type of first transform doesn't match source node type.\n"); + + IMFTopologyNode_Release(mft_node); + IMFMediaType_Release(media_type); + IMFTransform_Release(transform); + + hr = IMFTopologyNode_GetInput(sink_node2, 0, &mft_node, &index); + ok(hr == S_OK, "Failed to get transform node in resolved topology, hr %#x.\n", hr); + ok(!index, "Unexpected stream index %u.\n", index); + + hr = IMFTopologyNode_GetNodeType(mft_node, &node_type); + ok(hr == S_OK, "Failed to get transform node type in resolved topology, hr %#x.\n", hr); + ok(node_type == MF_TOPOLOGY_TRANSFORM_NODE, "Unexpected node type %u.\n", node_type); + + hr = IMFTopologyNode_GetObject(mft_node, &node_object); + ok(hr == S_OK, "Failed to get object of transform node, hr %#x.\n", hr); + + hr = IUnknown_QueryInterface(node_object, &IID_IMFTransform, (void**) &transform); + ok(hr == S_OK, "Failed to get IMFTransform from transform node's object, hr %#x.\n", hr); + IUnknown_Release(node_object); + + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Failed to get transform output type, hr %#x.\n", hr); + + hr = IMFMediaType_Compare(output_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret); + ok(hr == S_OK, "Failed to compare media types, hr %#x.\n", hr); + ok(ret, "Output type of last transform doesn't match sink node type.\n"); + + IMFTopologyNode_Release(mft_node); + IMFMediaType_Release(media_type); + IMFTransform_Release(transform); + } + + IMFTopologyNode_Release(sink_node2); + + hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL); + ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); + ok(full_topology != topology2, "Unexpected instance.\n"); + + IMFTopology_Release(topology2); + IMFTopology_Release(full_topology); + } + + hr = IMFTopology_GetCount(topology, &count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); + + IMFActivate_ShutdownObject(sink_activate); + IMFActivate_Release(sink_activate); + } + + IMFMediaType_Release(input_type); + IMFMediaType_Release(output_type); IMFMediaSource_Release(source); - IMFSourceResolver_Release(resolver); - IMFByteStream_Release(stream); IMFTopoLoader_Release(loader); hr = MFShutdown(); diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc deleted file mode 100644 index f54212a8c8f..00000000000 --- a/dlls/mf/tests/resource.rc +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2019 Nikolay Sivov for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "windef.h" - -/* @makedep: test.wav */ -test.wav RCDATA test.wav diff --git a/dlls/mf/tests/test.wav b/dlls/mf/tests/test.wav deleted file mode 100644 index 51d23936196da1a0452c78713c8af819259d225e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4488 zcmWIYbaQJEWMBw)40BD(Em06)U|?VbLYFlRV9dzC!QkT=93ll2_w;k~_Y8Im;RCXL z63fy|&GbwR^b8FQ8B!8U60LxyG&DA~w6?W(c6Imk^!D}jLqT6(Z%=nuXGeQmYjaa$ zeO*m;Rb_cuX-RQWQDFfL6c!d0mz0*3S5#Kl)YdmNHMg|2cYsVnGN`|=7h+OdYfE!u zLtSl6Rb>Ulq(Zn!AcH_ARa910*VfgKI%zbNM$^)0jvFnPMvKbP3T3p~9c`R|TVA8> dC3y36v{gCU_8#q_jCPtvyOyIJ(a)PQhp007ieqznK6 -- 2.29.2

2 7

[PATCH] ntdll: Add a timezone mapping rule for North Korea Standard Time.
by Akihiro Sagawa Nov. 30, 2020

Nov. 30, 2020

Otherwise, another UTC+9 timezone matches to the timezone. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50213 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/unix/system.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)

1 0

[PATCH] mfplat/mediatype: Store extra format data as MF_MT_USER_DATA when initializing from WAVEFORMATEX.
by Nikolay Sivov Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 13 ++++++++++--- dlls/mfplat/tests/mfplat.c | 28 +++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index f3895ca4d49..62d75e80146 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2943,6 +2943,13 @@ static void mediatype_set_guid(IMFMediaType *mediatype, const GUID *attr, const *hr = IMFMediaType_SetGUID(mediatype, attr, value); } +static void mediatype_set_blob(IMFMediaType *mediatype, const GUID *attr, const UINT8 *data, + unsigned int size, HRESULT *hr) +{ + if (SUCCEEDED(*hr)) + *hr = IMFMediaType_SetBlob(mediatype, attr, data, size); +} + /*********************************************************************** * MFInitMediaTypeFromWaveFormatEx (mfplat.@) */ @@ -2957,9 +2964,6 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA if (!mediatype || !format) return E_POINTER; - if (format->cbSize && format->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) - return E_INVALIDARG; - if (format->cbSize + sizeof(*format) > size) return E_INVALIDARG; @@ -3007,6 +3011,9 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA mediatype_set_uint32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1, &hr); } + if (format->cbSize) + mediatype_set_blob(mediatype, &MF_MT_USER_DATA, (const UINT8 *)(format + 1), format->cbSize, &hr); + return hr; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 474d6281f5f..38e8acb966e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5600,9 +5600,12 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void) { WAVE_FORMAT_WMAUDIO_LOSSLESS }, { WAVE_FORMAT_WMASPDIF }, }; + + UINT8 buff[MPEGLAYER3_WFX_EXTRA_BYTES]; WAVEFORMATEXTENSIBLE waveformatext; + MPEGLAYER3WAVEFORMAT mp3format; IMFMediaType *mediatype; - unsigned int i; + unsigned int i, size; HRESULT hr; hr = MFCreateMediaType(&mediatype); @@ -5628,6 +5631,29 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void) validate_media_type(mediatype, &waveformatext.Format); } + /* MPEGLAYER3WAVEFORMAT */ + mp3format.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + mp3format.wfx.nChannels = 2; + mp3format.wfx.nSamplesPerSec = 44100; + mp3format.wfx.nAvgBytesPerSec = 16000; + mp3format.wfx.nBlockAlign = 1; + mp3format.wfx.wBitsPerSample = 0; + mp3format.wfx.cbSize = MPEGLAYER3_WFX_EXTRA_BYTES; + mp3format.wID = MPEGLAYER3_ID_MPEG; + mp3format.fdwFlags = 0; + mp3format.nBlockSize = 417; + mp3format.nFramesPerBlock = 0; + mp3format.nCodecDelay = 0; + + hr = MFInitMediaTypeFromWaveFormatEx(mediatype, (WAVEFORMATEX *)&mp3format, sizeof(mp3format)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + validate_media_type(mediatype, &mp3format.wfx); + hr = IMFMediaType_GetBlob(mediatype, &MF_MT_USER_DATA, buff, sizeof(buff), &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size == mp3format.wfx.cbSize, "Unexpected size %u.\n", size); + ok(!memcmp(buff, (WAVEFORMATEX *)&mp3format + 1, size), "Unexpected user data.\n"); + IMFMediaType_Release(mediatype); } -- 2.29.2

2 1

[PATCH 1/5] dwrite/layout: Keep automatic axes property.
by Nikolay Sivov Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 53 +++++++++++++++------- dlls/dwrite/tests/layout.c | 91 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b9321157a91..25d3bcb4ad0 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -32,7 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -struct dwrite_textformat_data { +struct dwrite_textformat_data +{ WCHAR *family_name; UINT32 family_len; WCHAR *locale; @@ -51,6 +52,7 @@ struct dwrite_textformat_data { DWRITE_VERTICAL_GLYPH_ORIENTATION vertical_orientation; DWRITE_OPTICAL_ALIGNMENT optical_alignment; DWRITE_LINE_SPACING spacing; + DWRITE_AUTOMATIC_FONT_AXES automatic_axes; FLOAT fontsize; FLOAT tabstop; @@ -4144,17 +4146,25 @@ static HRESULT WINAPI dwritetextlayout4_GetFontAxisValues(IDWriteTextLayout4 *if static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextlayout4_GetAutomaticFontAxes(IDWriteTextLayout4 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout4(iface); + + TRACE("%p.\n", iface); - return DWRITE_AUTOMATIC_FONT_AXES_NONE; + return layout->format.automatic_axes; } static HRESULT WINAPI dwritetextlayout4_SetAutomaticFontAxes(IDWriteTextLayout4 *iface, DWRITE_AUTOMATIC_FONT_AXES axes) { - FIXME("%p, %d.\n", iface, axes); + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout4(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, axes); + + if ((unsigned int)axes > DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE) + return E_INVALIDARG; + + layout->format.automatic_axes = axes; + return S_OK; } static const IDWriteTextLayout4Vtbl dwritetextlayoutvtbl = @@ -4702,17 +4712,15 @@ static HRESULT WINAPI dwritetextformat3_layout_GetFontAxisValues(IDWriteTextForm static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_layout_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); - - return DWRITE_AUTOMATIC_FONT_AXES_NONE; + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); + return IDWriteTextLayout4_GetAutomaticFontAxes(&layout->IDWriteTextLayout4_iface); } static HRESULT WINAPI dwritetextformat3_layout_SetAutomaticFontAxes(IDWriteTextFormat3 *iface, DWRITE_AUTOMATIC_FONT_AXES axes) { - FIXME("%p, %d.\n", iface, axes); - - return E_NOTIMPL; + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); + return IDWriteTextLayout4_SetAutomaticFontAxes(&layout->IDWriteTextLayout4_iface, axes); } static const IDWriteTextFormat3Vtbl dwritetextformat3_layout_vtbl = @@ -5036,6 +5044,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I { struct dwrite_textformat *textformat; IDWriteTextFormat1 *format1; + IDWriteTextFormat3 *format3; UINT32 len; HRESULT hr; @@ -5125,6 +5134,13 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I layout->format.optical_alignment = DWRITE_OPTICAL_ALIGNMENT_NONE; } + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat3, (void **)&format3); + if (hr == S_OK) + { + layout->format.automatic_axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + IDWriteTextFormat3_Release(format3); + } + return IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); } @@ -5833,16 +5849,22 @@ static HRESULT WINAPI dwritetextformat3_GetFontAxisValues(IDWriteTextFormat3 *if static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return DWRITE_AUTOMATIC_FONT_AXES_NONE; + TRACE("%p.\n", iface); + + return format->format.automatic_axes; } static HRESULT WINAPI dwritetextformat3_SetAutomaticFontAxes(IDWriteTextFormat3 *iface, DWRITE_AUTOMATIC_FONT_AXES axes) { - FIXME("%p, %d.\n", iface, axes); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, axes); + + format->format.automatic_axes = axes; + + return S_OK; } static const IDWriteTextFormat3Vtbl dwritetextformatvtbl = @@ -5948,6 +5970,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.trimmingsign = NULL; This->format.collection = collection; This->format.fallback = NULL; + This->format.automatic_axes = DWRITE_AUTOMATIC_FONT_AXES_NONE; IDWriteFontCollection_AddRef(collection); *format = (IDWriteTextFormat *)&This->IDWriteTextFormat3_iface; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 2e309f14b73..beb09f400f9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5732,6 +5732,96 @@ todo_wine { IDWriteFactory_Release(factory); } +static void test_automatic_font_axes(void) +{ + DWRITE_AUTOMATIC_FONT_AXES axes; + IDWriteTextLayout4 *layout4 = NULL; + IDWriteTextFormat3 *format3; + IDWriteTextLayout *layout; + IDWriteTextFormat *format; + IDWriteFactory *factory; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 16.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %x.\n", hr); + + IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout4, (void **)&layout4); + + IDWriteTextLayout_Release(layout); + + if (!layout4) + { + win_skip("Text layout does not support variable fonts.\n"); + IDWriteFactory_Release(factory); + IDWriteTextFormat_Release(format); + return; + } + + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat3, (void **)&format3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_NONE, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextFormat3_SetAutomaticFontAxes(format3, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_SetAutomaticFontAxes(format3, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteTextFormat3_Release(format3); + + axes = IDWriteTextLayout4_GetAutomaticFontAxes(layout4); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_NONE, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextLayout4_SetAutomaticFontAxes(layout4, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextLayout4_SetAutomaticFontAxes(layout4, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteTextLayout4_Release(layout4); + + /* Out of range values allow for formats, but not for layouts. */ + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %x.\n", hr); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout4, (void **)&layout4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextLayout4_GetAutomaticFontAxes(layout4); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextLayout4_QueryInterface(layout4, &IID_IDWriteTextFormat3, (void **)&format3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextLayout4_SetAutomaticFontAxes(layout4, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextFormat3_SetAutomaticFontAxes(format3, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + IDWriteTextFormat3_Release(format3); + + IDWriteTextLayout_Release(layout); + + IDWriteTextLayout4_Release(layout4); + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -5783,6 +5873,7 @@ START_TEST(layout) test_line_spacing(); test_GetOverhangMetrics(); test_tab_stops(); + test_automatic_font_axes(); IDWriteFactory_Release(factory); } -- 2.29.2

1 4

[PATCH] ntdll: Initialize local variable (valgrind).
by Rémi Bernon Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- ==1164948== Conditional jump or move depends on uninitialised value(s) ==1164948== at 0x46D1C1E: open_dll_file (loader.c:1187) ==1164948== by 0x46D2343: open_builtin_file (loader.c:1230) ==1164948== by 0x46D32CF: load_ntdll (loader.c:1453) ==1164948== by 0x46D32CF: start_main_thread (loader.c:1602) ==1164948== by 0x46D32CF: __wine_main (loader.c:1838) ==1164948== by 0x7D001258: main (main.c:157) ==1164948== ==1164948== Conditional jump or move depends on uninitialised value(s) ==1164948== at 0x47073A9: find_view (virtual.c:937) ==1164948== by 0x47073A9: NtUnmapViewOfSection (virtual.c:4065) ==1164948== by 0x46D1C2A: open_dll_file (loader.c:1189) ==1164948== by 0x46D2343: open_builtin_file (loader.c:1230) ==1164948== by 0x46D32CF: load_ntdll (loader.c:1453) ==1164948== by 0x46D32CF: start_main_thread (loader.c:1602) ==1164948== by 0x46D32CF: __wine_main (loader.c:1838) ==1164948== by 0x7D001258: main (main.c:157) dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c8a5410a30a..08f8128e0f5 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1446,7 +1446,7 @@ static void load_ntdll(void) { NTSTATUS status; SECTION_IMAGE_INFORMATION info; - void *module; + void *module = NULL; char *name = build_path( dll_dir, "ntdll.dll.so" ); name[strlen(name) - 3] = 0; /* remove .so */ -- 2.29.2

1 0