May 2020 - Wine-commits - list.winehq.org

Brendan Shanks : winex11.drv: Set output id property for monitors.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 707fcb99a60015fcbb20c83e9031bc5be7a58618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=707fcb99a60015fcbb20c83e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 28 18:09:30 2020 +0800 winex11.drv: Set output id property for monitors. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 55533255f3..cf661f9f06 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); +DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); @@ -506,6 +507,11 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_INT64, (const BYTE *)gpu_luid, sizeof(*gpu_luid), 0)) goto done; + /* Write DEVPROPKEY_MONITOR_OUTPUT_ID */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_OUTPUT_ID, + DEVPROP_TYPE_UINT32, (const BYTE *)&video_index, sizeof(video_index), 0)) + goto done; + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey);

1 0

Brendan Shanks : winemac.drv: Set GPU LUID property for monitors.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: c36e26f41d1653d11ac47c7890497cc14ceb99ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36e26f41d1653d11ac47c78… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 28 18:09:40 2020 +0800 winemac.drv: Set GPU LUID property for monitors. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 7d9ff2d7c6..69b74e810e 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -52,6 +52,7 @@ struct display_mode_descriptor BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmode, DWORD flags); DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); @@ -1361,12 +1362,13 @@ void macdrv_displays_changed(const macdrv_event *event) /*********************************************************************** * macdrv_init_gpu * - * Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter. + * Initialize a GPU instance. + * Return its GUID string in guid_string, driver value in driver parameter and LUID in gpu_luid. * * Return FALSE on failure and TRUE on success. */ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int gpu_index, WCHAR *guid_string, - WCHAR *driver) + WCHAR *driver, LUID *gpu_luid) { static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; @@ -1414,6 +1416,7 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int DEVPROP_TYPE_UINT64, (const BYTE *)&luid, sizeof(luid), 0)) goto done; } + *gpu_luid = luid; TRACE("GPU id:0x%s name:%s LUID:%08x:%08x.\n", wine_dbgstr_longlong(gpu->id), gpu->name, luid.HighPart, luid.LowPart); @@ -1541,7 +1544,7 @@ done: * Return FALSE on failure and TRUE on success. */ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *monitor, int monitor_index, - int video_index) + int video_index, const LUID *gpu_luid) { SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; WCHAR nameW[MAX_PATH]; @@ -1562,6 +1565,11 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW))) goto done; + /* Write DEVPROPKEY_MONITOR_GPU_LUID */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_GPU_LUID, + DEVPROP_TYPE_INT64, (const BYTE *)gpu_luid, sizeof(*gpu_luid), 0)) + goto done; + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -1670,6 +1678,7 @@ void macdrv_init_display_devices(BOOL force) DWORD disposition = 0; WCHAR guidW[40]; WCHAR driverW[1024]; + LUID gpu_luid; mutex = CreateMutexW(NULL, FALSE, init_mutexW); WaitForSingleObject(mutex, INFINITE); @@ -1699,7 +1708,7 @@ void macdrv_init_display_devices(BOOL force) for (gpu = 0; gpu < gpu_count; gpu++) { - if (!macdrv_init_gpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) + if (!macdrv_init_gpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW, &gpu_luid)) goto done; /* Initialize adapters */ @@ -1721,7 +1730,7 @@ void macdrv_init_display_devices(BOOL force) for (monitor = 0; monitor < monitor_count; monitor++) { TRACE("monitor: %#x %s\n", monitor, monitors[monitor].name); - if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) + if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid)) goto done; }

1 0

Brendan Shanks : winemac.drv: Set output id property for monitors.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: b582ab26f91b1b189409cf9d058ffd7c8827ccb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b582ab26f91b1b189409cf9d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 28 18:09:51 2020 +0800 winemac.drv: Set output id property for monitors. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 69b74e810e..5bbea22d3a 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -53,6 +53,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); +DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); @@ -1570,6 +1571,11 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m DEVPROP_TYPE_INT64, (const BYTE *)gpu_luid, sizeof(*gpu_luid), 0)) goto done; + /* Write DEVPROPKEY_MONITOR_OUTPUT_ID */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_OUTPUT_ID, + DEVPROP_TYPE_UINT32, (const BYTE *)&video_index, sizeof(video_index), 0)) + goto done; + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey);

1 0

Nikolay Sivov : dwrite: Keep text properties zero initialized.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: a66668c129aa44c7fc734ef585168326819f4836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a66668c129aa44c7fc734ef5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 14:54:25 2020 +0300 dwrite: Keep text properties zero initialized. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 6 +-- dlls/dwrite/dwrite_private.h | 10 ----- dlls/dwrite/shape.c | 99 -------------------------------------------- 3 files changed, 2 insertions(+), 113 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 556191a13d..56950a5baa 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -34,11 +34,11 @@ extern const unsigned short wine_scripts_table[] DECLSPEC_HIDDEN; /* Number of characters needed for LOCALE_SNATIVEDIGITS */ #define NATIVE_DIGITS_LEN 11 -struct dwritescript_properties { +struct dwritescript_properties +{ DWRITE_SCRIPT_PROPERTIES props; UINT32 scripttags[3]; /* Maximum 2 script tags, 0-terminated. */ BOOL is_complex; - const struct scriptshaping_ops *ops; }; #define _OT(a,b,c,d) DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d) @@ -1194,8 +1194,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, *actual_glyph_count = context.glyph_count; memcpy(glyphs, context.u.subst.glyphs, context.glyph_count * sizeof(*glyphs)); memcpy(glyph_props, context.u.subst.glyph_props, context.glyph_count * sizeof(*glyph_props)); - hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyphs, *actual_glyph_count, - text_props, glyph_props); } heap_free(context.u.subst.glyph_props); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cf3e0f7c12..2ed53658cd 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -571,15 +571,5 @@ extern void opentype_layout_apply_gsub_features(struct scriptshaping_context *co extern void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) DECLSPEC_HIDDEN; -struct scriptshaping_ops -{ - HRESULT (*contextual_shaping)(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, UINT32* actual_glyph_count); - HRESULT (*set_text_glyphs_props)(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, - UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props); - const struct shaping_features *gpos_features; -}; - -extern const struct scriptshaping_ops default_shaping_ops DECLSPEC_HIDDEN; - extern HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; extern HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index b7b40d1211..32aabac5f6 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -55,105 +55,6 @@ void release_scriptshaping_cache(struct scriptshaping_cache *cache) heap_free(cache); } -static void shape_update_clusters_from_glyphprop(UINT32 glyphcount, UINT32 text_len, UINT16 *clustermap, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) -{ - UINT32 i; - - for (i = 0; i < glyphcount; i++) { - if (!glyph_props[i].isClusterStart) { - UINT32 j; - - for (j = 0; j < text_len; j++) { - if (clustermap[j] == i) { - int k = j; - while (k >= 0 && k < text_len && !glyph_props[clustermap[k]].isClusterStart) - k--; - - if (k >= 0 && k < text_len && glyph_props[clustermap[k]].isClusterStart) - clustermap[j] = clustermap[k]; - } - } - } - } -} - -static int compare_clustersearch(const void *a, const void* b) -{ - UINT16 target = *(UINT16*)a; - UINT16 index = *(UINT16*)b; - int ret = 0; - - if (target > index) - ret = 1; - else if (target < index) - ret = -1; - - return ret; -} - -/* Maps given glyph position in glyph indices array to text index this glyph represents. - Lowest possible index is returned. - - clustermap [I] Text index to index in glyph indices array map - len [I] Clustermap size - target [I] Index in glyph indices array to map - */ -static INT32 map_glyph_to_text_pos(const UINT16 *clustermap, UINT32 len, UINT16 target) -{ - UINT16 *ptr; - INT32 k; - - ptr = bsearch(&target, clustermap, len, sizeof(UINT16), compare_clustersearch); - if (!ptr) - return -1; - - /* get to the beginning */ - for (k = (ptr - clustermap) - 1; k >= 0 && clustermap[k] == target; k--) - ; - k++; - - return k; -} - -static HRESULT default_set_text_glyphs_props(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, - UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) -{ - UINT32 i; - - for (i = 0; i < glyphcount; i++) { - UINT32 char_index[20]; - UINT32 char_count = 0; - INT32 k; - - k = map_glyph_to_text_pos(clustermap, context->length, i); - if (k >= 0) { - for (; k < context->length && clustermap[k] == i; k++) - char_index[char_count++] = k; - } - - if (char_count == 0) - continue; - - if (char_count == 1 && isspaceW(context->text[char_index[0]])) { - glyph_props[i].justification = SCRIPT_JUSTIFY_BLANK; - text_props[char_index[0]].isShapedAlone = context->text[char_index[0]] == ' '; - } - else - glyph_props[i].justification = SCRIPT_JUSTIFY_CHARACTER; - } - - /* FIXME: update properties using GDEF table */ - shape_update_clusters_from_glyphprop(glyphcount, context->length, clustermap, glyph_props); - - return S_OK; -} - -const struct scriptshaping_ops default_shaping_ops = -{ - NULL, - default_set_text_glyphs_props -}; - static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, unsigned int *script_index) {

1 0

Nikolay Sivov : dwrite: Use GPOS handlers for subtables, not whole lookups.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 684dd31cc218d77e38289c87d7df15e065ff379c URL: https://source.winehq.org/git/wine.git/?a=commit;h=684dd31cc218d77e38289c87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 14:54:26 2020 +0300 dwrite: Use GPOS handlers for subtables, not whole lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 885 +++++++++++++++++++++++-------------------------- 1 file changed, 410 insertions(+), 475 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=684dd31cc218d77e3828…

1 0

Nikolay Sivov : dwrite: Implement multiple substitution (GSUB lookup 2).
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 9f31bf0e1c444a3b96dfa478a3cfcf1bd45f470d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f31bf0e1c444a3b96dfa478… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 14:54:27 2020 +0300 dwrite: Implement multiple substitution (GSUB lookup 2). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 172 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8886186303..e31057710b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -569,6 +569,14 @@ struct ot_gsub_singlesubst_format2 UINT16 substitutes[1]; }; +struct ot_gsub_multsubst_format1 +{ + UINT16 format; + UINT16 coverage; + UINT16 seq_count; + UINT16 seq[1]; +}; + struct ot_gsub_altsubst_format1 { UINT16 format; @@ -4506,6 +4514,167 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ return ret; } +static BOOL opentype_layout_gsub_ensure_buffer(struct scriptshaping_context *context, unsigned int count) +{ + DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; + struct shaping_glyph_info *glyph_infos; + unsigned int new_capacity; + UINT16 *glyphs; + BOOL ret; + + if (context->u.subst.capacity >= count) + return TRUE; + + new_capacity = context->u.subst.capacity * 2; + + if ((glyphs = heap_realloc(context->u.subst.glyphs, new_capacity * sizeof(*glyphs)))) + context->u.subst.glyphs = glyphs; + if ((glyph_props = heap_realloc(context->u.subst.glyph_props, new_capacity * sizeof(*glyph_props)))) + context->u.subst.glyph_props = glyph_props; + if ((glyph_infos = heap_realloc(context->glyph_infos, new_capacity * sizeof(*glyph_infos)))) + context->glyph_infos = glyph_infos; + + if ((ret = (glyphs && glyph_props && glyph_infos))) + context->u.subst.capacity = new_capacity; + + return ret; +} + +static unsigned int opentype_layout_get_next_char_index(const struct scriptshaping_context *context, unsigned int idx) +{ + unsigned int start = 0, end = context->length - 1, mid, ret = ~0u; + + for (;;) + { + mid = (start + end) / 2; + + if (context->u.buffer.clustermap[mid] <= idx) + { + if (mid == end) break; + start = mid + 1; + } + else + { + ret = mid; + if (mid == start) break; + end = mid - 1; + } + } + + return ret; +} + +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, orig_glyph, glyph, seq_count, glyph_count; + const struct ot_gsub_multsubst_format1 *format1; + unsigned int i, idx, coverage_index; + const UINT16 *glyphs; + + idx = context->cur; + orig_glyph = glyph = context->u.subst.glyphs[idx]; + + format = table_read_be_word(gsub, subtable_offset); + + coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, coverage)); + + if (format == 1) + { + coverage_index = opentype_layout_is_glyph_covered(context, 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)); + + format1 = table_read_ensure(gsub, subtable_offset, FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq[seq_count])); + + if (!seq_count || seq_count <= coverage_index || !format1) + return FALSE; + + glyph_count = table_read_be_word(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index])); + + glyphs = table_read_ensure(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index]) + 2, + glyph_count * sizeof(*glyphs)); + if (!glyphs) + return FALSE; + + if (glyph_count == 1) + { + /* Equivalent of single substitution. */ + glyph = GET_BE_WORD(glyphs[0]); + + if (glyph != orig_glyph) + { + context->u.subst.glyphs[idx] = glyph; + opentype_set_subst_glyph_props(context, idx, glyph); + } + + context->cur++; + } + else if (glyph_count == 0) + { + context->cur++; + } + else + { + unsigned int shift_len, src_idx, dest_idx, mask; + + /* Current glyph is also replaced. */ + glyph_count--; + + if (!(opentype_layout_gsub_ensure_buffer(context, context->glyph_count + glyph_count))) + return FALSE; + + shift_len = context->cur + 1 < context->glyph_count ? context->glyph_count - context->cur - 1 : 0; + + if (shift_len) + { + src_idx = context->cur + 1; + dest_idx = src_idx + glyph_count; + + memmove(&context->u.subst.glyphs[dest_idx], &context->u.subst.glyphs[src_idx], + shift_len * sizeof(*context->u.subst.glyphs)); + memmove(&context->u.subst.glyph_props[dest_idx], &context->u.subst.glyph_props[src_idx], + shift_len * sizeof(*context->u.subst.glyph_props)); + memmove(&context->glyph_infos[dest_idx], &context->glyph_infos[src_idx], + shift_len * sizeof(*context->glyph_infos)); + } + + mask = context->glyph_infos[context->cur].mask; + for (i = 0, idx = context->cur; i <= glyph_count; ++i) + { + glyph = GET_BE_WORD(glyphs[i]); + context->u.subst.glyphs[idx + i] = glyph; + if (i) + context->u.subst.glyph_props[idx + i].isClusterStart = 0; + opentype_set_subst_glyph_props(context, idx + i, glyph); + /* Inherit feature mask from original matched glyph. */ + context->glyph_infos[idx + i].mask = mask; + } + + /* Update following clusters. */ + idx = opentype_layout_get_next_char_index(context, context->cur); + if (idx != ~0u) + { + for (i = idx; i < context->length; ++i) + context->u.subst.clustermap[i] += glyph_count; + } + + context->cur += glyph_count + 1; + context->glyph_count += glyph_count; + } + } + else + { + WARN("Unknown multiple substitution format %u.\n", format); + return FALSE; + } + + return TRUE; +} + static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { @@ -4822,13 +4991,15 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_SINGLE_SUBST: ret = opentype_layout_apply_gsub_single_substitution(context, lookup, subtable_offset); break; + case GSUB_LOOKUP_MULTIPLE_SUBST: + ret = opentype_layout_apply_gsub_mult_substitution(context, lookup, subtable_offset); + break; case GSUB_LOOKUP_ALTERNATE_SUBST: ret = opentype_layout_apply_gsub_alt_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); break; - case GSUB_LOOKUP_MULTIPLE_SUBST: case GSUB_LOOKUP_LIGATURE_SUBST: case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST:

1 0

Nikolay Sivov : dwrite: Update glyph component count on multiple substitution.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 2e4d71c7218d139476c5ef84129a54c9209cea8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e4d71c7218d139476c5ef84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 14:54:28 2020 +0300 dwrite: Update glyph component count on multiple substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 13 ++++++++++++- dlls/dwrite/opentype.c | 10 +++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 2ed53658cd..94705b0d63 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -468,6 +468,17 @@ struct shaping_glyph_info unsigned int props; }; +struct shaping_glyph_properties +{ + UINT16 justification : 4; + UINT16 isClusterStart : 1; + UINT16 isDiacritic : 1; + UINT16 isZeroWidthSpace : 1; + UINT16 reserved : 1; + UINT16 components : 4; + UINT16 reserved2 : 4; +}; + struct scriptshaping_context { struct scriptshaping_cache *cache; @@ -498,7 +509,7 @@ struct scriptshaping_context struct { UINT16 *glyphs; - DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; + struct shaping_glyph_properties *glyph_props; UINT16 *clustermap; } buffer; } u; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e31057710b..92061cbf5c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4648,7 +4648,10 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co glyph = GET_BE_WORD(glyphs[i]); context->u.subst.glyphs[idx + i] = glyph; if (i) + { context->u.subst.glyph_props[idx + i].isClusterStart = 0; + context->u.buffer.glyph_props[idx + i].components = 0; + } opentype_set_subst_glyph_props(context, idx + i, glyph); /* Inherit feature mask from original matched glyph. */ context->glyph_infos[idx + i].mask = mask; @@ -5081,11 +5084,12 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c codepoint = context->u.subst.digits[codepoint - '0']; context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); - context->u.subst.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; - context->u.subst.glyph_props[g].isClusterStart = 1; + context->u.buffer.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; + context->u.buffer.glyph_props[g].isClusterStart = 1; opentype_set_subst_glyph_props(context, g, context->u.subst.glyphs[g]); if (opentype_is_default_ignorable(codepoint)) - context->u.subst.glyph_props[g].isZeroWidthSpace = 1; + context->u.buffer.glyph_props[g].isZeroWidthSpace = 1; + context->u.buffer.glyph_props[g].components = 1; context->glyph_count++; clustermap[i] = i;

1 0

Nikolay Sivov : dwrite: Add stub handler for ligature substitution.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 9479f87b8a646b4c3324070c5a56b11bdf5a7bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9479f87b8a646b4c3324070c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 14:54:29 2020 +0300 dwrite: Add stub handler for ligature substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 154 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 126 insertions(+), 28 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 92061cbf5c..c6cfdb6133 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -585,6 +585,27 @@ struct ot_gsub_altsubst_format1 UINT16 sets[1]; }; +struct ot_gsub_ligsubst_format1 +{ + UINT16 format; + UINT16 coverage; + UINT16 lig_set_count; + UINT16 lig_sets[1]; +}; + +struct ot_gsub_ligset +{ + UINT16 count; + UINT16 offsets[1]; +}; + +struct ot_gsub_lig +{ + UINT16 lig_glyph; + UINT16 comp_count; + UINT16 components[1]; +}; + struct ot_gsub_chaincontext_subst_format1 { UINT16 format; @@ -4464,13 +4485,23 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, heap_free(lookups.lookups); } +static void opentype_layout_replace_glyph(struct scriptshaping_context *context, UINT16 glyph) +{ + UINT16 orig_glyph = context->u.subst.glyphs[context->cur]; + if (glyph != orig_glyph) + { + context->u.subst.glyphs[context->cur] = glyph; + opentype_set_subst_glyph_props(context, context->cur, glyph); + } + context->cur++; +} + 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; UINT16 format, coverage, orig_glyph, glyph; unsigned int idx, coverage_index; - BOOL ret; idx = context->cur; orig_glyph = glyph = context->u.subst.glyphs[idx]; @@ -4502,16 +4533,14 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ glyph = GET_BE_WORD(format2->substitutes[coverage_index]); } else - WARN("Unknown single substitution format %u.\n", format); - - if ((ret = (glyph != orig_glyph))) { - context->u.subst.glyphs[idx] = glyph; - opentype_set_subst_glyph_props(context, idx, glyph); - context->cur++; + WARN("Unknown single substitution format %u.\n", format); + return FALSE; } - return ret; + opentype_layout_replace_glyph(context, glyph); + + return TRUE; } static BOOL opentype_layout_gsub_ensure_buffer(struct scriptshaping_context *context, unsigned int count) @@ -4568,13 +4597,13 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co unsigned int subtable_offset) { const struct dwrite_fonttable *gsub = &context->table->table; - UINT16 format, coverage, orig_glyph, glyph, seq_count, glyph_count; + UINT16 format, coverage, glyph, seq_count, glyph_count; const struct ot_gsub_multsubst_format1 *format1; unsigned int i, idx, coverage_index; const UINT16 *glyphs; idx = context->cur; - orig_glyph = glyph = context->u.subst.glyphs[idx]; + glyph = context->u.subst.glyphs[idx]; format = table_read_be_word(gsub, subtable_offset); @@ -4603,15 +4632,7 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co if (glyph_count == 1) { /* Equivalent of single substitution. */ - glyph = GET_BE_WORD(glyphs[0]); - - if (glyph != orig_glyph) - { - context->u.subst.glyphs[idx] = glyph; - opentype_set_subst_glyph_props(context, idx, glyph); - } - - context->cur++; + opentype_layout_replace_glyph(context, GET_BE_WORD(glyphs[0])); } else if (glyph_count == 0) { @@ -4682,12 +4703,11 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con unsigned int subtable_offset) { const struct dwrite_fonttable *gsub = &context->table->table; - UINT16 format, coverage, orig_glyph, glyph; unsigned int idx, coverage_index, offset; - BOOL ret; + UINT16 format, coverage, glyph; idx = context->cur; - orig_glyph = glyph = context->u.subst.glyphs[idx]; + glyph = context->u.subst.glyphs[idx]; format = table_read_be_word(gsub, subtable_offset); @@ -4721,16 +4741,92 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con glyph = table_read_be_word(gsub, subtable_offset + offset + sizeof(count) + (alt_index - 1) * sizeof(glyph)); } else + { WARN("Unexpected alternate substitution format %d.\n", format); + return FALSE; + } + + opentype_layout_replace_glyph(context, glyph); + + return TRUE; +} + +static BOOL opentype_layout_apply_ligature(struct scriptshaping_context *context, unsigned int offset) +{ + const struct dwrite_fonttable *gsub = &context->table->table; + const struct ot_gsub_lig *lig; + unsigned int comp_count; + + comp_count = table_read_be_word(gsub, offset + FIELD_OFFSET(struct ot_gsub_lig, comp_count)); + + if (!comp_count) + return FALSE; + + lig = table_read_ensure(gsub, offset, FIELD_OFFSET(struct ot_gsub_lig, components[comp_count-1])); + if (!lig) + return FALSE; - if ((ret = (glyph != orig_glyph))) + if (comp_count == 1) { - context->u.subst.glyphs[idx] = glyph; - opentype_set_subst_glyph_props(context, idx, glyph); - context->cur++; + opentype_layout_replace_glyph(context, GET_BE_WORD(lig->lig_glyph)); + return TRUE; } - return ret; + /* TODO: actually apply ligature */ + + return FALSE; +} + +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; + + glyph = context->u.subst.glyphs[context->cur]; + + format = table_read_be_word(gsub, 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; + + coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, coverage)); + + coverage_index = opentype_layout_is_glyph_covered(context, 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]))) + { + 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) + 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]))) + return TRUE; + } + } + else + WARN("Unexpected ligature substitution format %d.\n", format); + + return FALSE; } #define CHAIN_CONTEXT_MAX_LENGTH 64 @@ -5000,10 +5096,12 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_ALTERNATE_SUBST: ret = opentype_layout_apply_gsub_alt_substitution(context, lookup, subtable_offset); break; + case GSUB_LOOKUP_LIGATURE_SUBST: + ret = opentype_layout_apply_gsub_lig_substitution(context, lookup, subtable_offset); + break; case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); break; - case GSUB_LOOKUP_LIGATURE_SUBST: case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: WARN("Unimplemented lookup %d.\n", lookup->type);

1 0

Nikolay Sivov : include: Add Media Engine events constants.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: e2c681a8976bb31378fd946497da485e5ef73fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2c681a8976bb31378fd9464… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 18:54:16 2020 +0300 include: Add Media Engine events constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfmediaengine.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index e5d91a5732..4ea3d834cf 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -94,6 +94,49 @@ typedef enum MF_MEDIA_ENGINE_CREATEFLAGS MF_MEDIA_ENGINE_CREATEFLAGS_MASK = 0x1f } MF_MEDIA_ENGINE_CREATEFLAGS; +typedef enum MF_MEDIA_ENGINE_EVENT +{ + MF_MEDIA_ENGINE_EVENT_LOADSTART = 1, + MF_MEDIA_ENGINE_EVENT_PROGRESS = 2, + MF_MEDIA_ENGINE_EVENT_SUSPEND = 3, + MF_MEDIA_ENGINE_EVENT_ABORT = 4, + MF_MEDIA_ENGINE_EVENT_ERROR = 5, + MF_MEDIA_ENGINE_EVENT_EMPTIED = 6, + MF_MEDIA_ENGINE_EVENT_STALLED = 7, + MF_MEDIA_ENGINE_EVENT_PLAY = 8, + MF_MEDIA_ENGINE_EVENT_PAUSE = 9, + MF_MEDIA_ENGINE_EVENT_LOADEDMETADATA = 10, + MF_MEDIA_ENGINE_EVENT_LOADEDDATA = 11, + MF_MEDIA_ENGINE_EVENT_WAITING = 12, + MF_MEDIA_ENGINE_EVENT_PLAYING = 13, + MF_MEDIA_ENGINE_EVENT_CANPLAY = 14, + MF_MEDIA_ENGINE_EVENT_CANPLAYTHROUGH = 15, + MF_MEDIA_ENGINE_EVENT_SEEKING = 16, + MF_MEDIA_ENGINE_EVENT_SEEKED = 17, + MF_MEDIA_ENGINE_EVENT_TIMEUPDATE = 18, + MF_MEDIA_ENGINE_EVENT_ENDED = 19, + MF_MEDIA_ENGINE_EVENT_RATECHANGE = 20, + MF_MEDIA_ENGINE_EVENT_DURATIONCHANGE = 21, + MF_MEDIA_ENGINE_EVENT_VOLUMECHANGE = 22, + MF_MEDIA_ENGINE_EVENT_FORMATCHANGE = 1000, + MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS = 1001, + MF_MEDIA_ENGINE_EVENT_TIMELINE_MARKER = 1002, + MF_MEDIA_ENGINE_EVENT_BALANCECHANGE = 1003, + MF_MEDIA_ENGINE_EVENT_DOWNLOADCOMPLETE = 1004, + MF_MEDIA_ENGINE_EVENT_BUFFERINGSTARTED = 1005, + MF_MEDIA_ENGINE_EVENT_BUFFERINGENDED = 1006, + MF_MEDIA_ENGINE_EVENT_FRAMESTEPCOMPLETED = 1007, + MF_MEDIA_ENGINE_EVENT_NOTIFYSTABLESTATE = 1008, + MF_MEDIA_ENGINE_EVENT_FIRSTFRAMEREADY = 1009, + MF_MEDIA_ENGINE_EVENT_TRACKSCHANGE = 1010, + MF_MEDIA_ENGINE_EVENT_OPMINFO = 1011, + MF_MEDIA_ENGINE_EVENT_RESOURCELOST = 1012, + MF_MEDIA_ENGINE_EVENT_DELAYLOADEVENT_CHANGED = 1013, + MF_MEDIA_ENGINE_EVENT_STREAMRENDERINGERROR = 1014, + MF_MEDIA_ENGINE_EVENT_SUPPORTEDRATES_CHANGED = 1015, + MF_MEDIA_ENGINE_EVENT_AUDIOENDPOINTCHANGE = 1016, +} MF_MEDIA_ENGINE_EVENT; + [ object, uuid(fc0e10d2-ab2a-4501-a951-06bb1075184c),

1 0

Nikolay Sivov : mfmediaengine/tests: Use global factory instance.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 9de7895e4e4707b2c8fb164887a40bfe915ed580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9de7895e4e4707b2c8fb1648… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 18:54:17 2020 +0300 mfmediaengine/tests: Use global factory instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/tests/mfmediaengine.c | 85 ++++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 16 deletions(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 2bbc79fb6c..14d9eed453 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -35,6 +35,8 @@ static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); +static IMFMediaEngineClassFactory *factory; + #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) { @@ -114,25 +116,20 @@ static void test_factory(void) UINT token; HRESULT hr; - CoInitialize(NULL); - - hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IMFMediaEngineClassFactory, (void **)&factory); - ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, - "Failed to create class factory, hr %#x.\n", hr); - - hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, - &IID_IMFMediaEngineClassFactory, (void **)&factory2); - ok(hr == CLASS_E_NOAGGREGATION || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, - "Unexpected hr %#x.\n", hr); - - if (!factory) + hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFMediaEngineClassFactory, + (void **)&factory); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, "Failed to create class factory, hr %#x.\n", hr); + if (FAILED(hr)) { - win_skip("Not IMFMediaEngineClassFactory support.\n"); - CoUninitialize(); + win_skip("Media Engine is not supported.\n"); return; } + /* Aggregation is not supported. */ + hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, + &IID_IMFMediaEngineClassFactory, (void **)&factory2); + ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#x.\n", hr); + hr = pMFCreateDXGIDeviceManager(&token, &manager); ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); hr = MFCreateAttributes(&attributes, 3); @@ -163,20 +160,76 @@ static void test_factory(void) IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); IMFMediaEngineClassFactory_Release(factory); +} - CoUninitialize(); +static void test_CreateInstance(void) +{ + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; + IMFDXGIDeviceManager *manager; + IMFMediaEngine *media_engine; + IMFAttributes *attributes; + UINT token; + HRESULT hr; + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "Failed to create dxgi device manager, hr %#x.\n", hr); + + hr = MFCreateAttributes(&attributes, 3); + ok(hr == S_OK, "Failed to create attributes, hr %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + IMFAttributes_DeleteAllItems(attributes); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); + ok(hr == S_OK, "Failed to create media engine, hr %#x.\n", hr); + + IMFMediaEngine_Release(media_engine); + IMFAttributes_Release(attributes); + IMFDXGIDeviceManager_Release(manager); } START_TEST(mfmediaengine) { HRESULT hr; + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFMediaEngineClassFactory, + (void **)&factory); + if (FAILED(hr)) + { + win_skip("Media Engine is not supported.\n"); + CoUninitialize(); + return; + } + init_functions(); hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "MFStartup failed: %#x.\n", hr); test_factory(); + test_CreateInstance(); + + IMFMediaEngineClassFactory_Release(factory); + + CoUninitialize(); MFShutdown(); }

1 0