wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Nikolay Sivov : evr: Add IMFTopologyServiceLookupClient stub for default mixer.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 186ed57ba5c9dc9e791d234372e2318e3a1f8628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=186ed57ba5c9dc9e791d2343… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:59:35 2020 +0300 evr: Add IMFTopologyServiceLookupClient stub for default mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +--- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 97eaf976fc..3101d17ffd 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -30,6 +30,7 @@ struct video_mixer { IMFTransform IMFTransform_iface; IMFVideoDeviceID IMFVideoDeviceID_iface; + IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; LONG refcount; }; @@ -43,6 +44,11 @@ static struct video_mixer *impl_from_IMFVideoDeviceID(IMFVideoDeviceID *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoDeviceID_iface); } +static struct video_mixer *impl_from_IMFTopologyServiceLookupClient(IMFTopologyServiceLookupClient *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFTopologyServiceLookupClient_iface); +} + static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) { struct video_mixer *mixer = impl_from_IMFTransform(iface); @@ -58,6 +64,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFVideoDeviceID_iface; } + else if (IsEqualIID(riid, &IID_IMFTopologyServiceLookupClient)) + { + *obj = &mixer->IMFTopologyServiceLookupClient_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -328,6 +338,49 @@ static const IMFVideoDeviceIDVtbl video_mixer_device_id_vtbl = video_mixer_device_id_GetDeviceID, }; +static HRESULT WINAPI video_mixer_service_client_QueryInterface(IMFTopologyServiceLookupClient *iface, + REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_service_client_AddRef(IMFTopologyServiceLookupClient *iface) +{ + struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_service_client_Release(IMFTopologyServiceLookupClient *iface) +{ + struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_service_client_InitServicePointers(IMFTopologyServiceLookupClient *iface, + IMFTopologyServiceLookup *service_lookup) +{ + FIXME("%p, %p.\n", iface, service_lookup); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_service_client_ReleaseServicePointers(IMFTopologyServiceLookupClient *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static const IMFTopologyServiceLookupClientVtbl video_mixer_service_client_vtbl = +{ + video_mixer_service_client_QueryInterface, + video_mixer_service_client_AddRef, + video_mixer_service_client_Release, + video_mixer_service_client_InitServicePointers, + video_mixer_service_client_ReleaseServicePointers, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -352,6 +405,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFTransform_iface.lpVtbl = &video_mixer_transform_vtbl; object->IMFVideoDeviceID_iface.lpVtbl = &video_mixer_device_id_vtbl; + object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl; object->refcount = 1; *out = &object->IMFTransform_iface; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7fa6136b0e..56fb1680b0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -350,10 +350,8 @@ static void test_default_mixer(void) ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr: Add IMFVideoDeviceID to default mixer.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 8d791562133469554dbd6f9fe9aee04fd024dc40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d791562133469554dbd6f9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:59:34 2020 +0300 evr: Add IMFVideoDeviceID to default mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 16 +++++++++---- 2 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 41d63c8aab..97eaf976fc 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); struct video_mixer { IMFTransform IMFTransform_iface; + IMFVideoDeviceID IMFVideoDeviceID_iface; LONG refcount; }; @@ -37,19 +38,35 @@ static struct video_mixer *impl_from_IMFTransform(IMFTransform *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFTransform_iface); } +static struct video_mixer *impl_from_IMFVideoDeviceID(IMFVideoDeviceID *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoDeviceID_iface); +} + static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) { + struct video_mixer *mixer = impl_from_IMFTransform(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + if (IsEqualIID(riid, &IID_IMFTransform) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; - IMFTransform_AddRef(iface); - return S_OK; + } + else if (IsEqualIID(riid, &IID_IMFVideoDeviceID)) + { + *obj = &mixer->IMFVideoDeviceID_iface; + } + else + { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; } - WARN("Unsupported interface %s.\n", debugstr_guid(riid)); - *obj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; } static ULONG WINAPI video_mixer_transform_AddRef(IMFTransform *iface) @@ -273,6 +290,44 @@ static const IMFTransformVtbl video_mixer_transform_vtbl = video_mixer_transform_ProcessOutput, }; +static HRESULT WINAPI video_mixer_device_id_QueryInterface(IMFVideoDeviceID *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoDeviceID(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_device_id_AddRef(IMFVideoDeviceID *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoDeviceID(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_device_id_Release(IMFVideoDeviceID *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoDeviceID(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_device_id_GetDeviceID(IMFVideoDeviceID *iface, IID *device_id) +{ + TRACE("%p, %p.\n", iface, device_id); + + if (!device_id) + return E_POINTER; + + memcpy(device_id, &IID_IDirect3DDevice9, sizeof(*device_id)); + + return S_OK; +} + +static const IMFVideoDeviceIDVtbl video_mixer_device_id_vtbl = +{ + video_mixer_device_id_QueryInterface, + video_mixer_device_id_AddRef, + video_mixer_device_id_Release, + video_mixer_device_id_GetDeviceID, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -296,6 +351,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) return E_OUTOFMEMORY; object->IMFTransform_iface.lpVtbl = &video_mixer_transform_vtbl; + object->IMFVideoDeviceID_iface.lpVtbl = &video_mixer_device_id_vtbl; object->refcount = 1; *out = &object->IMFTransform_iface; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index c4b1a56157..7fa6136b0e 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -340,9 +340,11 @@ static void test_pin_info(void) static void test_default_mixer(void) { + IMFVideoDeviceID *deviceid; IMFTransform *transform; IUnknown *unk; HRESULT hr; + IID iid; hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); @@ -353,11 +355,17 @@ todo_wine if (SUCCEEDED(hr)) IUnknown_Release(unk); - hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&unk); -todo_wine + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + + hr = IMFVideoDeviceID_GetDeviceID(deviceid, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDeviceID_GetDeviceID(deviceid, &iid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualIID(&iid, &IID_IDirect3DDevice9), "Unexpected id %s.\n", wine_dbgstr_guid(&iid)); + + IMFVideoDeviceID_Release(deviceid); IMFTransform_Release(transform);

1 0

Nikolay Sivov : evr: Add IMFTransform stub for default video mixer.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: c09be94f63282f169cae6db8339514e076d323ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=c09be94f63282f169cae6db8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:59:33 2020 +0300 evr: Add IMFTransform stub for default video mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 2 +- dlls/evr/evr_classes.idl | 9 +- dlls/evr/evr_private.h | 2 +- dlls/evr/main.c | 1 + dlls/evr/mixer.c | 280 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/evr/tests/evr.c | 11 +- 6 files changed, 294 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c09be94f63282f169cae…

1 0

Nikolay Sivov : evr/tests: Add basic creation test for default mixer object.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: d492f7bbf818ba35a0bb8a7be2d814c0ba8acc5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d492f7bbf818ba35a0bb8a7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:59:32 2020 +0300 evr/tests: Add basic creation test for default mixer object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 4 +++- dlls/evr/evr.spec | 2 +- dlls/evr/mixer.c | 28 ++++++++++++++++++++++++ dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 32 +++++++++++++++++++++++++++ include/evr.idl | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 119 insertions(+), 3 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 053d80e61d..8f971dca06 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,10 +1,12 @@ MODULE = evr.dll +IMPORTLIB = evr IMPORTS = mfuuid strmiids strmbase uuid ole32 oleaut32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ evr.c \ - main.c + main.c \ + mixer.c IDL_SRCS = evr_classes.idl diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index c78900c576..ea87f16da1 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -13,7 +13,7 @@ @ stub MFCreateVideoMediaTypeFromSubtype @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader -@ stub MFCreateVideoMixer +@ stdcall MFCreateVideoMixer(ptr ptr ptr ptr) @ stub MFCreateVideoMixerAndPresenter @ stub MFCreateVideoOTA @ stub MFCreateVideoPresenter2 diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c new file mode 100644 index 0000000000..fe2f4bab1d --- /dev/null +++ b/dlls/evr/mixer.c @@ -0,0 +1,28 @@ +/* + * Copyright 2020 Nikolay Sivov + * + * 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 "wine/debug.h" +#include "evr.h" + +WINE_DEFAULT_DEBUG_CHANNEL(evr); + +HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); + return E_NOTIMPL; +} diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index 8dc11e5e55..529c535450 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = evr.dll -IMPORTS = mfuuid strmiids uuid ole32 oleaut32 +IMPORTS = mfuuid strmiids uuid dxguid ole32 oleaut32 evr C_SRCS = \ evr.c diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 489b7b949d..adb2b777a2 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -22,6 +22,7 @@ #include "dshow.h" #include "wine/test.h" #include "d3d9.h" +#include "evr.h" #include "initguid.h" #include "dxva2api.h" @@ -337,6 +338,36 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_default_mixer(void) +{ + IMFTransform *transform; + IUnknown *unk; + HRESULT hr; + + hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); +todo_wine + ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + IMFTransform_Release(transform); + + hr = MFCreateVideoMixer(NULL, &IID_IMFTransform, &IID_IMFTransform, (void **)&transform); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_MFVideoMixer9, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform); + ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); + IMFTransform_Release(transform); +} + START_TEST(evr) { CoInitialize(NULL); @@ -346,6 +377,7 @@ START_TEST(evr) test_enum_pins(); test_find_pin(); test_pin_info(); + test_default_mixer(); CoUninitialize(); } diff --git a/include/evr.idl b/include/evr.idl index 3768b41b16..39b4853b2e 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -107,3 +107,57 @@ interface IMFVideoRenderer : IUnknown [in] IMFVideoPresenter *pVideoPresenter ); } + +typedef enum _MF_SERVICE_LOOKUP_TYPE +{ + MF_SERVICE_LOOKUP_UPSTREAM, + MF_SERVICE_LOOKUP_UPSTREAM_DIRECT, + MF_SERVICE_LOOKUP_DOWNSTREAM, + MF_SERVICE_LOOKUP_DOWNSTREAM_DIRECT, + MF_SERVICE_LOOKUP_ALL, + MF_SERVICE_LOOKUP_GLOBAL, +} MF_SERVICE_LOOKUP_TYPE; + +[ + object, + uuid(fa993889-4383-415a-a930-dd472a8cf6f7), + local +] +interface IMFTopologyServiceLookup : IUnknown +{ + HRESULT LookupService( + [in] MF_SERVICE_LOOKUP_TYPE lookup_type, + [in] DWORD index, + [in] REFGUID service, + [in] REFIID riid, + [out, iid_is(riid)] void **objects, + [in, out] DWORD *num_objects + ); +} + +[ + object, + uuid(fa99388a-4383-415a-a930-dd472a8cf6f7), + local +] +interface IMFTopologyServiceLookupClient : IUnknown +{ + HRESULT InitServicePointers( + [in] IMFTopologyServiceLookup *service_lookup + ); + HRESULT ReleaseServicePointers(); +} + +[ + object, + uuid(a38d9567-5a9c-4f3c-b293-8eb415b279ba), + local +] +interface IMFVideoDeviceID : IUnknown +{ + HRESULT GetDeviceID( + [out] IID *device_id + ); +} + +cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);")

1 0

Nikolay Sivov : dwrite: Simplify ligature substitution handler.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: f5e342b2a6b99f76ed6c9dc788fb5bf426a5355c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e342b2a6b99f76ed6c9dc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:47:54 2020 +0300 dwrite: Simplify ligature substitution handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e8d2068397..53925465a1 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5119,46 +5119,37 @@ static BOOL opentype_layout_apply_ligature(struct scriptshaping_context *context static BOOL opentype_layout_apply_gsub_lig_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - const struct dwrite_fonttable *gsub = &context->table->table; - unsigned int coverage_index, offset, lig_set_offset, lig_set_count; - UINT16 format, coverage, glyph; + const struct dwrite_fonttable *table = &context->table->table; + UINT16 format, coverage, glyph, lig_set_offset; + unsigned int coverage_index; glyph = context->u.subst.glyphs[context->cur]; - format = table_read_be_word(gsub, subtable_offset); + format = table_read_be_word(table, subtable_offset); if (format == 1) { - const struct ot_gsub_ligsubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); - const struct ot_gsub_ligset *lig_set; - unsigned int i, lig_count; + const struct ot_gsub_ligsubst_format1 *format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)); + unsigned int i; + const UINT16 *offsets; + UINT16 lig_count; - coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, coverage)); - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED) - return FALSE; + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - lig_set_count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, lig_set_count)); - if (coverage_index >= lig_set_count || !table_read_ensure(gsub, subtable_offset, - FIELD_OFFSET(struct ot_gsub_ligsubst_format1, lig_sets[lig_set_count]))) - { + if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, lig_set_count), + coverage_index, &lig_set_offset)) return FALSE; - } - - lig_set_offset = table_read_be_word(gsub, subtable_offset + - FIELD_OFFSET(struct ot_gsub_ligsubst_format1, lig_sets[coverage_index])); - offset = subtable_offset + lig_set_offset; - lig_count = table_read_be_word(gsub, offset); - lig_set = table_read_ensure(gsub, offset, FIELD_OFFSET(struct ot_gsub_ligset, offsets[lig_count])); - if (!lig_count || !lig_set) + if (!(offsets = table_read_array_be_word(table, subtable_offset + lig_set_offset, ~0u, &lig_count))) return FALSE; /* First applicable ligature is used. */ for (i = 0; i < lig_count; ++i) { - if (opentype_layout_apply_ligature(context, offset + GET_BE_WORD(lig_set->offsets[i]), lookup)) + if (opentype_layout_apply_ligature(context, subtable_offset + lig_set_offset + GET_BE_WORD(offsets[i]), lookup)) return TRUE; } }

1 0

Nikolay Sivov : dwrite: Simplify alternate substitution handler.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 5909ab53032aa4e9fdbe6a83e15e970e154b8d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5909ab53032aa4e9fdbe6a83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:47:53 2020 +0300 dwrite: Simplify alternate substitution handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e729be9b20..e8d2068397 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4221,16 +4221,16 @@ static BOOL opentype_layout_apply_gpos_mark_to_base_attachment(struct scriptshap return TRUE; } -static BOOL table_read_array_be_word(const struct dwrite_fonttable *table, unsigned int offset, +static const UINT16 * table_read_array_be_word(const struct dwrite_fonttable *table, unsigned int offset, unsigned int index, UINT16 *data) { unsigned int count = table_read_be_word(table, offset); const UINT16 *array; - if (index >= count) return FALSE; + if (index != ~0u && index >= count) return NULL; if (!(array = table_read_ensure(table, offset + 2, count * sizeof(*array)))) return FALSE; - *data = GET_BE_WORD(array[index]); - return TRUE; + *data = index == ~0u ? count : GET_BE_WORD(array[index]); + return array; } static BOOL opentype_layout_apply_gpos_mark_to_lig_attachment(struct scriptshaping_context *context, @@ -4887,10 +4887,7 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co return FALSE; } - glyph_count = table_read_be_word(table, subtable_offset + seq_offset); - - if (!(glyphs = table_read_ensure(table, subtable_offset + seq_offset + 2, glyph_count * sizeof(*glyphs)))) - return FALSE; + if (!(glyphs = table_read_array_be_word(table, subtable_offset + seq_offset, ~0u, &glyph_count))) return FALSE; if (glyph_count == 1) { @@ -4959,43 +4956,36 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - const struct dwrite_fonttable *gsub = &context->table->table; - unsigned int idx, coverage_index, offset; + const struct dwrite_fonttable *table = &context->table->table; + unsigned int idx, coverage_index; UINT16 format, coverage, glyph; idx = context->cur; glyph = context->u.subst.glyphs[idx]; - format = table_read_be_word(gsub, subtable_offset); + format = table_read_be_word(table, subtable_offset); if (format == 1) { - const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); - unsigned int count, shift, alt_index; + const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)); + unsigned int shift, alt_index; + UINT16 set_offset; - coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED) - return FALSE; - - if (coverage_index >= GET_BE_WORD(format1->count)) - return FALSE; - - offset = table_read_be_word(gsub, subtable_offset + - FIELD_OFFSET(struct ot_gsub_altsubst_format1, sets[coverage_index])); + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - count = table_read_be_word(gsub, subtable_offset + offset); - if (!count) + if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, count), + coverage_index, &set_offset)) return FALSE; + /* Argument is 1-based. */ BitScanForward(&shift, context->lookup_mask); alt_index = (context->lookup_mask & context->glyph_infos[idx].mask) >> shift; + if (!alt_index) return FALSE; - if (alt_index > count || !alt_index) - return FALSE; - - glyph = table_read_be_word(gsub, subtable_offset + offset + 2 + (alt_index - 1) * sizeof(glyph)); + if (!table_read_array_be_word(table, subtable_offset + set_offset, alt_index - 1, &glyph)) return FALSE; } else {

1 0

Nikolay Sivov : dwrite: Simplify multiple substitution handler.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 78ea46f6a908656e4958aabfd5951f4332722c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ea46f6a908656e4958aabf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:47:52 2020 +0300 dwrite: Simplify multiple substitution handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c0a29d08df..e729be9b20 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4862,37 +4862,34 @@ static BOOL opentype_layout_gsub_ensure_buffer(struct scriptshaping_context *con static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - const struct dwrite_fonttable *gsub = &context->table->table; - UINT16 format, coverage, glyph, seq_count, glyph_count; - const struct ot_gsub_multsubst_format1 *format1; + const struct dwrite_fonttable *table = &context->table->table; + UINT16 format, coverage, glyph, glyph_count; unsigned int i, idx, coverage_index; const UINT16 *glyphs; idx = context->cur; glyph = context->u.subst.glyphs[idx]; - format = table_read_be_word(gsub, subtable_offset); + format = table_read_be_word(table, subtable_offset); - coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, coverage)); if (format == 1) { - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED) - return FALSE; - - seq_count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq_count)); + UINT16 seq_offset; - format1 = table_read_ensure(gsub, subtable_offset, FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq[seq_count])); + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - if (!seq_count || seq_count <= coverage_index || !format1) + if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq_count), + coverage_index, &seq_offset)) + { return FALSE; + } - glyph_count = table_read_be_word(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index])); + glyph_count = table_read_be_word(table, subtable_offset + seq_offset); - glyphs = table_read_ensure(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index]) + 2, - glyph_count * sizeof(*glyphs)); - if (!glyphs) + if (!(glyphs = table_read_ensure(table, subtable_offset + seq_offset + 2, glyph_count * sizeof(*glyphs)))) return FALSE; if (glyph_count == 1)

1 0

Nikolay Sivov : dwrite: Simplify single substitution handler.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: a13469374fa80ae583bdc52f858e8f1ce5d5b6ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=a13469374fa80ae583bdc52f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:47:51 2020 +0300 dwrite: Simplify single substitution handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 05ef7d76cd..c0a29d08df 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4793,38 +4793,33 @@ static void opentype_layout_replace_glyph(struct scriptshaping_context *context, static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - const struct dwrite_fonttable *gsub = &context->table->table; + const struct dwrite_fonttable *table = &context->table->table; UINT16 format, coverage, orig_glyph, glyph; - unsigned int idx, coverage_index; + unsigned int coverage_index; - idx = context->cur; - orig_glyph = glyph = context->u.subst.glyphs[idx]; + orig_glyph = glyph = context->u.subst.glyphs[context->cur]; - format = table_read_be_word(gsub, subtable_offset); + format = table_read_be_word(table, subtable_offset); - coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, coverage)); if (format == 1) { - const struct ot_gsub_singlesubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); - - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED) - return FALSE; + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - glyph = orig_glyph + GET_BE_WORD(format1->delta); + glyph = orig_glyph + table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, delta)); } else if (format == 2) { - UINT16 count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count)); - const struct ot_gsub_singlesubst_format2 *format2 = table_read_ensure(gsub, subtable_offset, - FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count) + count * sizeof(UINT16)); + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= count) + if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count), + coverage_index, &glyph)) + { return FALSE; - - glyph = GET_BE_WORD(format2->substitutes[coverage_index]); + } } else {

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 36bdf3dbb197f608f925dfc86ebb8c5298307409 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36bdf3dbb197f608f925dfc8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jun 17 12:10:50 2020 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5dded3a08b..1c0563a46a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-30 02:40+0200\n" +"PO-Revision-Date: 2020-06-17 12:10+0300\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -3608,7 +3608,7 @@ msgstr "Peliohjaimet" #: joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Testaa ja säädä peliohjaimia." #: jscript.rc:28 msgid "Error converting object to primitive type" @@ -3623,10 +3623,8 @@ msgid "Subscript out of range" msgstr "Indeksi alueen ulkopuolella" #: jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Paperi loppu; " +msgstr "Pinosta loppui tila" #: jscript.rc:32 msgid "Object required" @@ -3765,16 +3763,12 @@ msgid "JScript object expected" msgstr "Odotettiin JScript-objektia" #: jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "Odotettiin taulukkoa" +msgstr "Odotettiin Enumerator-objektia" #: jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Odotettiin totuusarvoa" +msgstr "Odotettiin säännöllistä lauseketta" #: jscript.rc:65 msgid "Syntax error in regular expression"

1 0

Alexandre Julliard : ntdll: Move the current directory initialization to the Unix library.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: df5e4764870e8ad1d8b206cb3475a073bc034e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df5e4764870e8ad1d8b206cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 16:19:38 2020 +0200 ntdll: Move the current directory initialization to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 55 --------------------------------- dlls/ntdll/env.c | 59 +----------------------------------- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/unix/env.c | 69 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/process.c | 46 ++++++++++++++++++---------- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 3 +- 8 files changed, 104 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df5e4764870e8ad1d8b2…

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
95
Older →

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 June 2020