June 2020 - Wine-devel - list.winehq.org

[PATCH 6/6] winemac.drv: Support multiple adapter display settings in registry.
by Zhiyi Zhang 10 Jun '20

10 Jun '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 91 +++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 31 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 461662b33b9..896948b2fea 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -151,44 +151,64 @@ static void release_display_device_init_mutex(HANDLE mutex) CloseHandle(mutex); } -static BOOL get_display_device_reg_key(char *key, unsigned len) +static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; + static const WCHAR display[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + static const WCHAR video_value_fmt[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; + static const WCHAR video_key[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O','\\',0}; + WCHAR value_name[MAX_PATH], buffer[MAX_PATH], *end_ptr; + DWORD adapter_index, size; - assert(len >= sizeof(video_path) + sizeof(display0) + 40); - - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; - - memcpy(key, video_path, sizeof(video_path)); - - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) + /* Device name has to be \\.\DISPLAY%d */ + if (strncmpiW(device_name, display, ARRAY_SIZE(display))) return FALSE; - strcat(key, display0); + /* Parse \\.\DISPLAY* */ + adapter_index = strtolW(device_name + ARRAY_SIZE(display), &end_ptr, 10) - 1; + if (*end_ptr) + return FALSE; - TRACE("display device key %s\n", wine_dbgstr_a(key)); + /* Open \Device\Video* in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + sprintfW(value_name, video_value_fmt, adapter_index); + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_key, value_name, RRF_RT_REG_SZ, NULL, buffer, &size)) + return FALSE; + + if (len < lstrlenW(buffer + 18) + 1) + return FALSE; + + /* Skip \Registry\Machine\ prefix */ + lstrcpyW(key, buffer + 18); + TRACE("display device %s registry settings key %s.\n", wine_dbgstr_w(device_name), wine_dbgstr_w(key)); return TRUE; } -static BOOL read_registry_settings(DEVMODEW *dm) +static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) { - char wine_mac_reg_key[128]; + WCHAR wine_mac_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; DWORD type, size; BOOL ret = TRUE; dm->dmFields = 0; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + if (RegOpenKeyExW(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define query_value(name, data) \ size = sizeof(DWORD); \ @@ -216,22 +236,31 @@ static BOOL read_registry_settings(DEVMODEW *dm) #undef query_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } -static BOOL write_registry_settings(const DEVMODEW *dm) +static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm) { - char wine_mac_reg_key[128]; + WCHAR wine_mac_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, + if (RegCreateKeyExW(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define set_value(name, data) \ if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \ @@ -250,6 +279,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) #undef set_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } @@ -833,12 +863,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } - if (lstrcmpiW(primary_adapter, devname)) - { - FIXME("Changing non-primary adapter settings is currently unsupported.\n"); - return DISP_CHANGE_SUCCESSFUL; - } - if (is_detached_mode(devmode)) { FIXME("Detaching adapters is currently unsupported.\n"); @@ -956,13 +980,18 @@ better: /* we have a valid mode */ TRACE("Requested display settings match mode %ld\n", best); - if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devmode)) + if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devname, devmode)) { WARN("Failed to update registry\n"); ret = DISP_CHANGE_NOTUPDATED; } else if (flags & (CDS_TEST | CDS_NORESET)) ret = DISP_CHANGE_SUCCESSFUL; + else if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter settings is currently unsupported.\n"); + ret = DISP_CHANGE_SUCCESSFUL; + } else if (macdrv_set_display_mode(&displays[0], best_display_mode)) { int mode_bpp = display_mode_bits_per_pixel(best_display_mode); @@ -1032,7 +1061,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, if (mode == ENUM_REGISTRY_SETTINGS) { TRACE("mode %d (registry) -- getting default mode\n", mode); - return read_registry_settings(devmode); + return read_registry_settings(devname, devmode); } if (macdrv_get_displays(&displays, &num_displays)) -- 2.25.1

2 1

[PATCH 5/6] winemac.drv: Use helpers to get and release display device init mutex.
by Zhiyi Zhang 10 Jun '20

10 Jun '20

This makes later patches smaller. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index e6fb9ded7eb..461662b33b9 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -136,6 +136,21 @@ static CRITICAL_SECTION modes_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL inited_original_display_mode; +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + static BOOL get_display_device_reg_key(char *key, unsigned len) { static const char display_device_guid_prop[] = "__wine_display_device_guid"; @@ -1673,7 +1688,6 @@ static void cleanup_devices(void) */ void macdrv_init_display_devices(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct macdrv_gpu *gpus = NULL; struct macdrv_adapter *adapters = NULL; @@ -1688,8 +1702,7 @@ void macdrv_init_display_devices(BOOL force) WCHAR driverW[1024]; LUID gpu_luid; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -1757,8 +1770,7 @@ done: SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); macdrv_free_gpus(gpus); macdrv_free_adapters(adapters); -- 2.25.1

2 1

[PATCH 2/6] winemac.drv: Set DM_POSITION and DM_DISPLAYORIENTATION when reporting registry display settings.
by Zhiyi Zhang 10 Jun '20

10 Jun '20

Set DM_POSITION and DM_DISPLAYORIENTATION when calling EnumDisplaySettings(ENUM_REGISTRY_SETTINGS). DM_DISPLAYFIXEDOUTPUT is not set because it is not necessarily reported according to tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 5bbea22d3aa..e6fb9ded7eb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -193,7 +193,9 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields |= DM_DISPLAYFLAGS; query_value("DefaultSettings.XPanning", &dm->dmPosition.x); query_value("DefaultSettings.YPanning", &dm->dmPosition.y); + dm->dmFields |= DM_POSITION; query_value("DefaultSettings.Orientation", &dm->dmDisplayOrientation); + dm->dmFields |= DM_DISPLAYORIENTATION; query_value("DefaultSettings.FixedOutput", &dm->dmDisplayFixedOutput); #undef query_value -- 2.25.1

2 1

[PATCH] mshtml: Add IHTMLCSSStyleDeclaration2::perspective implementation.
by Jacek Caban 10 Jun '20

10 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-)

1 0

[PATCH] winemac.drv: Ensure output IDs are unique for mirrored displays.
by Brendan Shanks 10 Jun '20

10 Jun '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/display.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 5bbea22d3aa..050bf05da92 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1545,7 +1545,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, const LUID *gpu_luid) + int video_index, const LUID *gpu_luid, UINT output_id) { SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; WCHAR nameW[MAX_PATH]; @@ -1573,7 +1573,7 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m /* 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)) + DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; /* Create driver key */ @@ -1685,6 +1685,7 @@ void macdrv_init_display_devices(BOOL force) WCHAR guidW[40]; WCHAR driverW[1024]; LUID gpu_luid; + UINT output_id = 0; mutex = CreateMutexW(NULL, FALSE, init_mutexW); WaitForSingleObject(mutex, INFINITE); @@ -1736,7 +1737,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, &gpu_luid)) + if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid, output_id++)) goto done; } -- 2.26.2

2 1

[PATCH 4/4] msvcp: Use BitScanReverse in log2i.
by Jacek Caban 10 Jun '20

10 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcp90/misc.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-)

2 1

[PATCH 1/5] dwrite: Return ranges for selected cmap.
by Nikolay Sivov 10 Jun '20

10 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 7 +- dlls/dwrite/font.c | 18 +--- dlls/dwrite/opentype.c | 188 ++++++++++++++--------------------- 3 files changed, 81 insertions(+), 132 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 2a8a4d47414..a9fbb260e35 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -198,6 +198,8 @@ enum font_flags struct dwrite_cmap; typedef UINT16 (*p_cmap_get_glyph_func)(const struct dwrite_cmap *cmap, unsigned int ch); +typedef unsigned int (*p_cmap_get_ranges_func)(const struct dwrite_cmap *cmap, unsigned int max_count, + DWRITE_UNICODE_RANGE *ranges); struct dwrite_cmap { @@ -226,6 +228,7 @@ struct dwrite_cmap } format12_13; } u; p_cmap_get_glyph_func get_glyph; + p_cmap_get_ranges_func get_ranges; unsigned short symbol : 1; IDWriteFontFileStream *stream; void *table_context; @@ -235,6 +238,8 @@ extern void dwrite_cmap_init(struct dwrite_cmap *cmap, IDWriteFontFile *file, un DWRITE_FONT_FACE_TYPE face_type) DECLSPEC_HIDDEN; extern void dwrite_cmap_release(struct dwrite_cmap *cmap) DECLSPEC_HIDDEN; extern UINT16 opentype_cmap_get_glyph(const struct dwrite_cmap *cmap, unsigned int ch) DECLSPEC_HIDDEN; +extern HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_cmap *cmap, unsigned int max_count, + DWRITE_UNICODE_RANGE *ranges, unsigned int *count) DECLSPEC_HIDDEN; struct dwrite_fontface { @@ -387,8 +392,6 @@ struct ot_gsubgpos_table extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,BOOL*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,UINT32*) DECLSPEC_HIDDEN; extern HRESULT opentype_try_get_font_table(const struct file_stream_desc *stream_desc, UINT32 tag, const void **data, void **context, UINT32 *size, BOOL *exists) DECLSPEC_HIDDEN; -extern HRESULT opentype_cmap_get_unicode_ranges(const struct file_stream_desc *stream_desc, unsigned int max_count, - DWRITE_UNICODE_RANGE *ranges, unsigned int *count) DECLSPEC_HIDDEN; extern void opentype_get_font_properties(struct file_stream_desc*,struct dwrite_font_props*) DECLSPEC_HIDDEN; extern void opentype_get_font_metrics(struct file_stream_desc*,DWRITE_FONT_METRICS1*,DWRITE_CARET_METRICS*) DECLSPEC_HIDDEN; extern void opentype_get_font_typo_metrics(struct file_stream_desc *stream_desc, unsigned int *ascent, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 7f5cce4e4b2..ab60d4368c7 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1005,7 +1005,6 @@ static HRESULT WINAPI dwritefontface1_GetUnicodeRanges(IDWriteFontFace5 *iface, DWRITE_UNICODE_RANGE *ranges, UINT32 *count) { struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); - struct file_stream_desc stream_desc; TRACE("%p, %u, %p, %p.\n", iface, max_count, ranges, count); @@ -1013,10 +1012,8 @@ static HRESULT WINAPI dwritefontface1_GetUnicodeRanges(IDWriteFontFace5 *iface, if (max_count && !ranges) return E_INVALIDARG; - stream_desc.stream = fontface->stream; - stream_desc.face_index = fontface->index; - stream_desc.face_type = fontface->type; - return opentype_cmap_get_unicode_ranges(&stream_desc, max_count, ranges, count); + dwrite_cmap_init(&fontface->cmap, NULL, fontface->index, fontface->type); + return opentype_cmap_get_unicode_ranges(&fontface->cmap, max_count, ranges, count); } static BOOL WINAPI dwritefontface1_IsMonospacedFont(IDWriteFontFace5 *iface) @@ -2000,8 +1997,6 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont3 *iface, UINT32 m UINT32 *count) { struct dwrite_font *font = impl_from_IDWriteFont3(iface); - struct file_stream_desc stream_desc; - HRESULT hr; TRACE("%p, %u, %p, %p.\n", iface, max_count, ranges, count); @@ -2009,13 +2004,8 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont3 *iface, UINT32 m if (max_count && !ranges) return E_INVALIDARG; - if (FAILED(hr = get_filestream_from_file(font->data->file, &stream_desc.stream))) - return hr; - stream_desc.face_index = font->data->face_index; - stream_desc.face_type = font->data->face_type; - hr = opentype_cmap_get_unicode_ranges(&stream_desc, max_count, ranges, count); - IDWriteFontFileStream_Release(stream_desc.stream); - return hr; + dwrite_cmap_init(&font->data->cmap, font->data->file, font->data->face_index, font->data->face_type); + return opentype_cmap_get_unicode_ranges(&font->data->cmap, max_count, ranges, count); } static BOOL WINAPI dwritefont1_IsMonospacedFont(IDWriteFont3 *iface) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 563154992ab..d8bfa3f7f6d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1571,6 +1571,18 @@ static UINT16 opentype_cmap_format0_get_glyph(const struct dwrite_cmap *cmap, un return (ch < 0xff) ? glyphs[ch] : 0; } +static unsigned int opentype_cmap_format0_get_ranges(const struct dwrite_cmap *cmap, unsigned int count, + DWRITE_UNICODE_RANGE *ranges) +{ + if (count > 0) + { + ranges->first = 0; + ranges->last = 255; + } + + return 1; +} + struct cmap_format4_compare_context { const struct dwrite_cmap *cmap; @@ -1627,6 +1639,22 @@ static UINT16 opentype_cmap_format4_get_glyph(const struct dwrite_cmap *cmap, un return glyph & 0xffff; } +static unsigned int opentype_cmap_format4_get_ranges(const struct dwrite_cmap *cmap, unsigned int count, + DWRITE_UNICODE_RANGE *ranges) +{ + unsigned int i; + + count = min(count, cmap->u.format4.seg_count); + + for (i = 0; i < count; ++i) + { + ranges[i].first = GET_BE_WORD(cmap->u.format4.starts[i]); + ranges[i].last = GET_BE_WORD(cmap->u.format4.ends[i]); + } + + return cmap->u.format4.seg_count; +} + static UINT16 opentype_cmap_format6_10_get_glyph(const struct dwrite_cmap *cmap, unsigned int ch) { const UINT16 *glyphs = cmap->data; @@ -1634,6 +1662,18 @@ static UINT16 opentype_cmap_format6_10_get_glyph(const struct dwrite_cmap *cmap, return glyphs[ch - cmap->u.format6_10.first]; } +static unsigned int opentype_cmap_format6_10_get_ranges(const struct dwrite_cmap *cmap, unsigned int count, + DWRITE_UNICODE_RANGE *ranges) +{ + if (count > 0) + { + ranges->first = cmap->u.format6_10.first; + ranges->last = cmap->u.format6_10.last; + } + + return 1; +} + static int cmap_format12_13_compare_group(const void *a, const void *b) { const unsigned int *ch = a; @@ -1661,6 +1701,23 @@ static UINT16 opentype_cmap_format12_get_glyph(const struct dwrite_cmap *cmap, u GET_BE_DWORD(group_found[2]) + (ch - GET_BE_DWORD(group_found[0])) : 0; } +static unsigned int opentype_cmap_format12_13_get_ranges(const struct dwrite_cmap *cmap, unsigned int count, + DWRITE_UNICODE_RANGE *ranges) +{ + unsigned int i, group_count = cmap->u.format12_13.group_count; + const UINT32 *groups = cmap->data; + + count = min(count, group_count); + + for (i = 0; i < count; ++i) + { + ranges[i].first = GET_BE_DWORD(groups[3 * i]); + ranges[i].last = GET_BE_DWORD(groups[3 * i + 1]); + } + + return group_count; +} + static UINT16 opentype_cmap_format13_get_glyph(const struct dwrite_cmap *cmap, unsigned int ch) { const UINT32 *groups = cmap->data; @@ -1678,6 +1735,12 @@ static UINT16 opentype_cmap_dummy_get_glyph(const struct dwrite_cmap *cmap, unsi return 0; } +static unsigned int opentype_cmap_dummy_get_ranges(const struct dwrite_cmap *cmap, unsigned int count, + DWRITE_UNICODE_RANGE *ranges) +{ + return 0; +} + UINT16 opentype_cmap_get_glyph(const struct dwrite_cmap *cmap, unsigned int ch) { UINT16 glyph; @@ -1771,6 +1834,7 @@ void dwrite_cmap_init(struct dwrite_cmap *cmap, IDWriteFontFile *file, unsigned case 0: cmap->data = table_read_ensure(&table, offset + 6, 256); cmap->get_glyph = opentype_cmap_format0_get_glyph; + cmap->get_ranges = opentype_cmap_format0_get_ranges; break; case 4: length = table_read_be_word(&table, offset + 2); @@ -1782,6 +1846,7 @@ void dwrite_cmap_init(struct dwrite_cmap *cmap, IDWriteFontFile *file, unsigned cmap->u.format4.glyph_id_array = cmap->data = cmap->u.format4.id_range_offset + count; cmap->u.format4.glyph_id_array_len = (length - 16 - 8 * count) / 2; cmap->get_glyph = opentype_cmap_format4_get_glyph; + cmap->get_ranges = opentype_cmap_format4_get_ranges; break; case 6: case 10: @@ -1792,12 +1857,14 @@ void dwrite_cmap_init(struct dwrite_cmap *cmap, IDWriteFontFile *file, unsigned cmap->u.format6_10.last = cmap->u.format6_10.first + count; cmap->data = table_read_ensure(&table, offset + f * 10, count * 2); cmap->get_glyph = opentype_cmap_format6_10_get_glyph; + cmap->get_ranges = opentype_cmap_format6_10_get_ranges; break; case 12: case 13: cmap->u.format12_13.group_count = count = table_read_be_dword(&table, offset + 12); cmap->data = table_read_ensure(&table, offset + 16, count * 3 * 4); cmap->get_glyph = format == 12 ? opentype_cmap_format12_get_glyph : opentype_cmap_format13_get_glyph; + cmap->get_ranges = opentype_cmap_format12_13_get_ranges; break; default: WARN("Unhandled subtable format %u.\n", format); @@ -1810,6 +1877,7 @@ failed: /* Dummy implementation, returns 0 unconditionally. */ cmap->data = cmap; cmap->get_glyph = opentype_cmap_dummy_get_glyph; + cmap->get_ranges = opentype_cmap_dummy_get_ranges; } } @@ -1824,125 +1892,13 @@ void dwrite_cmap_release(struct dwrite_cmap *cmap) cmap->stream = NULL; } -static unsigned int opentype_cmap_get_unicode_ranges_count(const struct dwrite_fonttable *cmap) +HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_cmap *cmap, unsigned int max_count, DWRITE_UNICODE_RANGE *ranges, + unsigned int *count) { - unsigned int i, num_tables, count = 0; - const struct cmap_header *header; - - num_tables = table_read_be_word(cmap, FIELD_OFFSET(struct cmap_header, num_tables)); - header = table_read_ensure(cmap, 0, FIELD_OFFSET(struct cmap_header, tables[num_tables])); - - if (!header) - return 0; - - for (i = 0; i < num_tables; ++i) - { - unsigned int format, offset; - - if (GET_BE_WORD(header->tables[i].platformID) != 3) - continue; - - offset = GET_BE_DWORD(header->tables[i].offset); - format = table_read_be_word(cmap, offset); - - switch (format) - { - case OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING: - { - count += table_read_be_word(cmap, offset + FIELD_OFFSET(struct cmap_segment_mapping, seg_count_x2)) / 2; - break; - } - case OPENTYPE_CMAP_TABLE_SEGMENTED_COVERAGE: - { - count += table_read_be_dword(cmap, offset + FIELD_OFFSET(struct cmap_segmented_coverage, num_groups)); - break; - } - default: - FIXME("table format %u is not supported.\n", format); - } - } - - return count; -} - -HRESULT opentype_cmap_get_unicode_ranges(const struct file_stream_desc *stream_desc, unsigned int max_count, - DWRITE_UNICODE_RANGE *ranges, unsigned int *count) -{ - unsigned int i, num_tables, k = 0; - const struct cmap_header *header; - struct dwrite_fonttable cmap; - - opentype_get_font_table(stream_desc, MS_CMAP_TAG, &cmap); - - if (!cmap.exists) + if (!cmap->data) return E_FAIL; - *count = opentype_cmap_get_unicode_ranges_count(&cmap); - - num_tables = table_read_be_word(&cmap, FIELD_OFFSET(struct cmap_header, num_tables)); - header = table_read_ensure(&cmap, 0, FIELD_OFFSET(struct cmap_header, tables[num_tables])); - - if (!header) - { - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, cmap.context); - return S_OK; - } - - for (i = 0; i < num_tables && k < max_count; ++i) - { - unsigned int j, offset, format; - - if (GET_BE_WORD(header->tables[i].platformID) != 3) - continue; - - offset = GET_BE_DWORD(header->tables[i].offset); - - format = table_read_be_word(&cmap, offset); - switch (format) - { - case OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING: - { - unsigned int segment_count = table_read_be_word(&cmap, offset + - FIELD_OFFSET(struct cmap_segment_mapping, seg_count_x2)) / 2; - const UINT16 *start_code = table_read_ensure(&cmap, offset, - FIELD_OFFSET(struct cmap_segment_mapping, end_code[segment_count]) + - 2 /* reservedPad */ + - 2 * segment_count /* start code array */); - const UINT16 *end_code = table_read_ensure(&cmap, offset, - FIELD_OFFSET(struct cmap_segment_mapping, end_code[segment_count])); - - if (!start_code || !end_code) - continue; - - for (j = 0; j < segment_count && GET_BE_WORD(end_code[j]) != 0xffff && k < max_count; ++j, ++k) - { - ranges[k].first = GET_BE_WORD(start_code[j]); - ranges[k].last = GET_BE_WORD(end_code[j]); - } - break; - } - case OPENTYPE_CMAP_TABLE_SEGMENTED_COVERAGE: - { - unsigned int num_groups = table_read_be_dword(&cmap, offset + - FIELD_OFFSET(struct cmap_segmented_coverage, num_groups)); - const struct cmap_segmented_coverage *coverage; - - coverage = table_read_ensure(&cmap, offset, - FIELD_OFFSET(struct cmap_segmented_coverage, groups[num_groups])); - - for (j = 0; j < num_groups && k < max_count; j++, k++) - { - ranges[k].first = GET_BE_DWORD(coverage->groups[j].startCharCode); - ranges[k].last = GET_BE_DWORD(coverage->groups[j].endCharCode); - } - break; - } - default: - FIXME("table format %u unhandled.\n", format); - } - } - - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, cmap.context); + *count = cmap->get_ranges(cmap, max_count, ranges); return *count > max_count ? E_NOT_SUFFICIENT_BUFFER : S_OK; } -- 2.26.2

1 4

[PATCH] msi: Fix installing from administrative image with compressed source files.
by Hans Leidekker 10 Jun '20

10 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49352 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/action.c | 10 +++---- dlls/msi/tests/install.c | 58 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 46207df0ce8..f63895f6e70 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1066,10 +1066,9 @@ static UINT load_file(MSIRECORD *row, LPVOID param) */ if (package->WordCount & msidbSumInfoSourceTypeAdminImage) { - file->IsCompressed = FALSE; + file->IsCompressed = package->WordCount & msidbSumInfoSourceTypeCompressed; } - else if (file->Attributes & - (msidbFileAttributesCompressed | msidbFileAttributesPatchAdded)) + else if (file->Attributes & (msidbFileAttributesCompressed | msidbFileAttributesPatchAdded)) { file->IsCompressed = TRUE; } @@ -1077,10 +1076,7 @@ static UINT load_file(MSIRECORD *row, LPVOID param) { file->IsCompressed = FALSE; } - else - { - file->IsCompressed = package->WordCount & msidbSumInfoSourceTypeCompressed; - } + else file->IsCompressed = package->WordCount & msidbSumInfoSourceTypeCompressed; load_file_hash(package, file); load_file_disk_id(package, file); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 99d53e56570..2cfa810e1da 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1392,6 +1392,34 @@ static const CHAR sr_custom_action_dat[] = "sourcedir_unset\t19\t\tSourceDir should not be set\n" "sourcedir_set\t19\t\tSourceDir should be set\n"; +static const CHAR ai2_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "five.txt\tFive\tfive.txt\t1000\t\t\t0\t5\n" + "four.txt\tFour\tfour.txt\t1000\t\t\t0\t4\n"; + +static const CHAR ai2_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "Five\t{8CC92E9D-14B2-4CA4-B2AA-B11D02078087}\tNEWDIR\t2\t\tfive.txt\n" + "Four\t{FD37B4EA-7209-45C0-8917-535F35A2F080}\tCABOUTDIR\t2\t\tfour.txt\n"; + +static const CHAR ai2_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "Five\t\tFive\tThe Five Feature\t5\t3\tNEWDIR\t0\n" + "Four\t\tFour\tThe Four Feature\t4\t3\tCABOUTDIR\t0\n"; + +static const CHAR ai2_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "Five\tFive\n" + "Four\tFour\n"; + static const msi_table tables[] = { ADD_TABLE(component), @@ -1821,6 +1849,18 @@ static const msi_table ai_tables[] = ADD_TABLE(property) }; +static const msi_table ai2_tables[] = +{ + ADD_TABLE(ai2_component), + ADD_TABLE(directory), + ADD_TABLE(ai2_feature), + ADD_TABLE(ai2_feature_comp), + ADD_TABLE(ai2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + static const msi_table pc_tables[] = { ADD_TABLE(ca51_component), @@ -4865,6 +4905,24 @@ static void test_adminimage(void) delete_pf_files(); + create_file("four.txt", 100); + create_file("five.txt", 100); + create_cab_file("msitest.cab", MEDIA_SIZE, "four.txt\0five.txt\0"); + create_database_wordcount(msifile, ai2_tables, ARRAY_SIZE(ai2_tables), + 100, msidbSumInfoSourceTypeAdminImage|msidbSumInfoSourceTypeCompressed, + ";1033", "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + error: DeleteFileA("msifile"); DeleteFileA("msitest\\cabout\\new\\five.txt"); -- 2.20.1

2 1

[PATCH v4 2/2] oleaut32: Retrieve funcdesc from TLB by memberid and invkind.
by Porot Mo 10 Jun '20

10 Jun '20

This allows ITypeInfo::GetDllEntry() to search exact property access functions which share same memberid. Signed-off-by: Porot Mo <porotmjp(a)gmail.com> --- v3: split tests and fix v4: remove todo_wine dlls/oleaut32/tests/typelib.c | 3 --- dlls/oleaut32/typelib.c | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-)

1 0

[PATCH resend 1/2] gdi32/tests: Remove tests for VidPnSourceId.
by Zhiyi Zhang 10 Jun '20

10 Jun '20

VidPnSourceId may be zero for non-primary adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index ed83a728131..6172d4a7983 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -86,11 +86,6 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) } ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); - if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - ok(open_adapter_gdi_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", - open_adapter_gdi_desc.VidPnSourceId); - else - ok(open_adapter_gdi_desc.VidPnSourceId, "Got unexpected value %#x.\n", open_adapter_gdi_desc.VidPnSourceId); close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; status = pD3DKMTCloseAdapter(&close_adapter_desc); @@ -135,12 +130,6 @@ static void test_D3DKMTOpenAdapterFromHdc(void) status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); todo_wine ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); todo_wine ok(open_adapter_hdc_desc.hAdapter, "Expect not null.\n"); - if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - ok(open_adapter_hdc_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", - open_adapter_hdc_desc.VidPnSourceId); - else - todo_wine ok(open_adapter_hdc_desc.VidPnSourceId, "Got unexpected value %#x.\n", - open_adapter_hdc_desc.VidPnSourceId); DeleteDC(hdc); if (status == STATUS_SUCCESS) -- 2.25.1

2 1