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

[PATCH 4/7] ieframe: Implement IOleObject::EnumAdvise().
by Dmitry Timoshkov 27 Jul '20

27 Jul '20

Based on ole32/defaulthandler.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/oleobject.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index face9d16e9..a3fdc060a8 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -791,7 +791,17 @@ static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, ppenumAdvise); + + TRACE("(%p)->(%p)\n", This, ppenumAdvise); + + if(!ppenumAdvise) + return E_POINTER; + + *ppenumAdvise = NULL; + + if(This->advise_holder) + return IOleAdviseHolder_EnumAdvise(This->advise_holder, ppenumAdvise); + return S_OK; } -- 2.26.2

1 0

[PATCH 3/7] ieframe: Implement IOleObject::Unadvise().
by Dmitry Timoshkov 27 Jul '20

27 Jul '20

Based on ole32/defaulthandler.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/oleobject.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 39acd43028..face9d16e9 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -779,8 +779,13 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, dwConnection); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, dwConnection); + + if(!This->advise_holder) + return OLE_E_NOCONNECTION; + + return IOleAdviseHolder_Unadvise(This->advise_holder, dwConnection); } static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise) -- 2.26.2

1 0

[PATCH 1/7] ieframe: Implement IOleObject::GetUserClassID().
by Dmitry Timoshkov 27 Jul '20

27 Jul '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/oleobject.c | 9 ++++++--- dlls/ieframe/tests/webbrowser.c | 23 ++++++++++++++++++++++- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 5c49845aa7..28ead0f687 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -719,11 +719,14 @@ static HRESULT WINAPI OleObject_IsUpToDate(IOleObject *iface) return E_NOTIMPL; } -static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID* pClsid) +static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, pClsid); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pClsid); + + *pClsid = This->version == 1 ? CLSID_WebBrowser_V1: CLSID_WebBrowser; + return S_OK; } static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfType, diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 95d5fc4988..3ec5921a32 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2227,7 +2227,7 @@ static void test_Persist(IWebBrowser2 *wb, int version) HRESULT hr; hr = IWebBrowser2_QueryInterface(wb, &IID_IPersist, (void **)&persist); - ok(hr == S_OK, "QueryInterface(IID_IPersist failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IPersist) failed: %08x\n", hr); hr = IPersist_GetClassID(persist, &guid); ok(hr == S_OK, "GetClassID failed: %08x\n", hr); @@ -2239,6 +2239,25 @@ static void test_Persist(IWebBrowser2 *wb, int version) IPersist_Release(persist); } +static void test_OleObject(IWebBrowser2 *wb, int version) +{ + IOleObject *oleobj; + CLSID clsid; + HRESULT hr; + + hr = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void **)&oleobj); + ok(hr == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hr); + + hr = IOleObject_GetUserClassID(oleobj, &clsid); + ok(hr == S_OK, "GetUserClassID failed: %08x\n", hr); + if (version == 1) + ok(IsEqualGUID(&clsid, &CLSID_WebBrowser_V1), "got wrong CLSID: %s\n", wine_dbgstr_guid(&clsid)); + else + ok(IsEqualGUID(&clsid, &CLSID_WebBrowser), "got wrong CLSID: %s\n", wine_dbgstr_guid(&clsid)); + + IOleObject_Release(oleobj); +} + static void test_ie_funcs(IWebBrowser2 *wb) { IDispatch *disp; @@ -3761,6 +3780,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_Navigate2(webbrowser, L"about:blank"); test_QueryStatusWB(webbrowser, TRUE); test_Persist(webbrowser, 2); + test_OleObject(webbrowser, 2); if(do_download) { IHTMLDocument2 *doc, *doc2; @@ -3870,6 +3890,7 @@ static void test_WebBrowserV1(void) test_ClassInfo(wb); test_EnumVerbs(wb); test_Persist(wb, 1); + test_OleObject(wb, 1); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref); -- 2.26.2

1 0

[PATCH 2/6] winex11.drv: Support detaching adapters.
by Zhiyi Zhang 27 Jul '20

27 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 4 +-- dlls/winex11.drv/settings.c | 56 ++++++++++++++++++++++++++++--------- dlls/winex11.drv/xrandr.c | 21 ++++++++++++++ 3 files changed, 66 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 0d32dbfeef9..85fb2f080a7 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -612,10 +612,10 @@ static void test_ChangeDisplaySettingsEx(void) dd.cb = sizeof(dd); res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); ok(res, "EnumDisplayDevicesA %s failed, error %#x\n", devices[device].name, GetLastError()); - todo_wine ok(!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP), "Expect device %s detached.\n", devices[device].name); + ok(!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP), "Expect device %s detached.\n", devices[device].name); count = GetSystemMetrics(SM_CMONITORS); - todo_wine ok(count == old_count - 1, "Expect monitor count %d, got %d\n", old_count - 1, count); + ok(count == old_count - 1, "Expect monitor count %d, got %d\n", old_count - 1, count); } /* Test changing each adapter to every available mode */ diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 56f55e78b42..7c7d9507187 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -805,27 +805,33 @@ static void place_all_displays(struct x11drv_display_setting *displays, INT disp } } -static LONG apply_display_settings(struct x11drv_display_setting *displays, INT display_count) +static LONG apply_display_settings(struct x11drv_display_setting *displays, INT display_count, BOOL do_attach) { DEVMODEW *full_mode; + BOOL attached_mode; INT display_idx; LONG ret; for (display_idx = 0; display_idx < display_count; ++display_idx) { - if (is_detached_mode(&displays[display_idx].desired_mode)) - { - FIXME("Detaching %s is currently unsupported.\n", - wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName)); + attached_mode = !is_detached_mode(&displays[display_idx].desired_mode); + if ((attached_mode && !do_attach) || (!attached_mode && do_attach)) continue; + + if (attached_mode) + { + full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); + if (!full_mode) + return DISP_CHANGE_BADMODE; + + full_mode->dmFields |= DM_POSITION; + full_mode->u1.s2.dmPosition = displays[display_idx].desired_mode.u1.s2.dmPosition; + } + else + { + full_mode = &displays[display_idx].desired_mode; } - full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); - if (!full_mode) - return DISP_CHANGE_BADMODE; - - full_mode->dmFields |= DM_POSITION; - full_mode->u1.s2.dmPosition = displays[display_idx].desired_mode.u1.s2.dmPosition; TRACE("handler:%s changing %s to position:(%d,%d) resolution:%ux%u frequency:%uHz " "depth:%ubits orientation:%#x.\n", handler.name, wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName), @@ -834,7 +840,8 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT full_mode->u1.s2.dmDisplayOrientation); ret = handler.set_current_mode(displays[display_idx].id, full_mode); - heap_free(full_mode); + if (attached_mode) + heap_free(full_mode); if (ret != DISP_CHANGE_SUCCESSFUL) return ret; } @@ -842,6 +849,19 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT return DISP_CHANGE_SUCCESSFUL; } +static BOOL all_detached_settings(const struct x11drv_display_setting *displays, INT display_count) +{ + INT display_idx; + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (!is_detached_mode(&displays[display_idx].desired_mode)) + return FALSE; + } + + return TRUE; +} + /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -888,9 +908,19 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_SUCCESSFUL; } + if (all_detached_settings(displays, display_count)) + { + WARN("Detaching all displays is not permitted.\n"); + heap_free(displays); + return DISP_CHANGE_SUCCESSFUL; + } + place_all_displays(displays, display_count); - ret = apply_display_settings(displays, display_count); + /* Detach displays first to free up CRTCs */ + ret = apply_display_settings(displays, display_count, FALSE); + if (ret == DISP_CHANGE_SUCCESSFUL) + ret = apply_display_settings(displays, display_count, TRUE); if (ret == DISP_CHANGE_SUCCESSFUL) X11DRV_DisplayDevices_Update(TRUE); heap_free(displays); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 4fbb2e540dc..67fd2851825 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1306,6 +1306,27 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) if (!output_info || output_info->connection != RR_Connected) goto done; + if (is_detached_mode(mode)) + { + /* Already detached */ + if (!output_info->crtc) + { + ret = DISP_CHANGE_SUCCESSFUL; + goto done; + } + + /* Execute detach operation */ + status = pXRRSetCrtcConfig( gdi_display, screen_resources, output_info->crtc, + CurrentTime, 0, 0, None, RR_Rotate_0, NULL, 0 ); + if (status == RRSetConfigSuccess) + { + get_screen_size( screen_resources, &screen_width, &screen_height ); + set_screen_size( screen_width, screen_height ); + ret = DISP_CHANGE_SUCCESSFUL; + } + goto done; + } + /* Attached */ if (output_info->crtc) { -- 2.25.1

2 1

[PATCH 1/6] winex11.drv: Support automatic display position adjustment.
by Zhiyi Zhang 27 Jul '20

27 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 36 +--- dlls/winex11.drv/settings.c | 382 +++++++++++++++++++++++++++++++----- dlls/winex11.drv/xrandr.c | 7 +- 3 files changed, 337 insertions(+), 88 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 005627f28b0..0d32dbfeef9 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -283,29 +283,9 @@ struct device_info DEVMODEA original_mode; }; -static BOOL get_primary_adapter(CHAR *name) -{ - DISPLAY_DEVICEA dd; - DWORD i; - - dd.cb = sizeof(dd); - for (i = 0; EnumDisplayDevicesA(NULL, i, &dd, 0); ++i) - { - if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - { - lstrcpyA(name, dd.DeviceName); - return TRUE; - } - } - - return FALSE; -} - #define expect_dm(a, b, c) _expect_dm(__LINE__, a, b, c) static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD test) { - CHAR primary_adapter[CCHDEVICENAME]; - BOOL is_primary; DEVMODEA dm; BOOL ret; @@ -315,33 +295,23 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te ret = EnumDisplaySettingsA(device, ENUM_CURRENT_SETTINGS, &dm); ok_(__FILE__, line)(ret, "Device %s test %d EnumDisplaySettingsA failed, error %#x\n", device, test, GetLastError()); - ok(get_primary_adapter(primary_adapter), "Failed to get primary adapter name.\n"); - is_primary = !lstrcmpA(primary_adapter, device); - ok_(__FILE__, line)((dm.dmFields & expected.dmFields) == expected.dmFields, "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected.dmFields, dm.dmFields); /* Wine doesn't support changing color depth yet */ todo_wine_if(expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) ok_(__FILE__, line)(dm.dmBitsPerPel == expected.dmBitsPerPel, "Device %s test %d expect dmBitsPerPel %d, got %d\n", device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); - /* Wine currently reports primary monitor settings for non-primary monitors */ - todo_wine_if(!is_primary && dm.dmPelsWidth != expected.dmPelsWidth) ok_(__FILE__, line)(dm.dmPelsWidth == expected.dmPelsWidth, "Device %s test %d expect dmPelsWidth %d, got %d\n", device, test, expected.dmPelsWidth, dm.dmPelsWidth); - todo_wine_if(!is_primary && dm.dmPelsHeight != expected.dmPelsHeight) ok_(__FILE__, line)(dm.dmPelsHeight == expected.dmPelsHeight, "Device %s test %d expect dmPelsHeight %d, got %d\n", device, test, expected.dmPelsHeight, dm.dmPelsHeight); - todo_wine_if(!is_primary && dm.dmPosition.x != expected.dmPosition.x) ok_(__FILE__, line)(dm.dmPosition.x == expected.dmPosition.x, "Device %s test %d expect dmPosition.x %d, got %d\n", device, test, expected.dmPosition.x, dm.dmPosition.x); - todo_wine_if(!is_primary && dm.dmPosition.y != expected.dmPosition.y) ok_(__FILE__, line)(dm.dmPosition.y == expected.dmPosition.y, "Device %s test %d expect dmPosition.y %d, got %d\n", device, test, expected.dmPosition.y, dm.dmPosition.y); - todo_wine_if(!is_primary && dm.dmDisplayFrequency != expected.dmDisplayFrequency) ok_(__FILE__, line)(dm.dmDisplayFrequency == expected.dmDisplayFrequency, "Device %s test %d expect dmDisplayFrequency %d, got %d\n", device, test, expected.dmDisplayFrequency, dm.dmDisplayFrequency); - todo_wine_if(!is_primary && dm.dmDisplayOrientation != expected.dmDisplayOrientation) ok_(__FILE__, line)(dm.dmDisplayOrientation == expected.dmDisplayOrientation, "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected.dmDisplayOrientation, dm.dmDisplayOrientation); @@ -778,7 +748,7 @@ static void test_ChangeDisplaySettingsEx(void) if (res) { /* The secondary adapter should be to the right of the primary adapter */ - todo_wine ok(dm2.dmPosition.x == dm.dmPosition.x + dm.dmPelsWidth, + ok(dm2.dmPosition.x == dm.dmPosition.x + dm.dmPelsWidth, "Expected dm2.dmPosition.x %d, got %d.\n", dm.dmPosition.x + dm.dmPelsWidth, dm2.dmPosition.x); ok(dm2.dmPosition.y == dm.dmPosition.y, "Expected dm2.dmPosition.y %d, got %d.\n", @@ -795,7 +765,7 @@ static void test_ChangeDisplaySettingsEx(void) dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok((dm2.dmPosition.x == dm.dmPosition.x - dm2.dmPelsWidth), + ok(dm2.dmPosition.x == dm.dmPosition.x - dm2.dmPelsWidth, "Expected dmPosition.x %d, got %d.\n", dm.dmPosition.x - dm2.dmPelsWidth, dm2.dmPosition.x); @@ -889,7 +859,7 @@ static void test_ChangeDisplaySettingsEx(void) dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok(dm2.dmPosition.x == dm.dmPelsWidth, "Expect dmPosition.x %d, got %d\n", + ok(dm2.dmPosition.x == dm.dmPelsWidth, "Expect dmPosition.x %d, got %d\n", dm.dmPelsWidth, dm2.dmPosition.x); } else diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 02495756179..56f55e78b42 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -36,6 +36,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11settings); +struct x11drv_display_setting +{ + ULONG_PTR id; + BOOL placed; + RECT new_rect; + RECT desired_rect; + DEVMODEW desired_mode; +}; + static struct x11drv_mode_info *dd_modes = NULL; static unsigned int dd_mode_count = 0; static unsigned int dd_max_modes = 0; @@ -534,6 +543,305 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) return full_mode; } +static LONG get_display_settings(struct x11drv_display_setting **new_displays, + INT *new_display_count, const WCHAR *dev_name, DEVMODEW *dev_mode) +{ + struct x11drv_display_setting *displays; + DEVMODEW registry_mode, current_mode; + INT display_idx, display_count = 0; + DISPLAY_DEVICEW display_device; + LONG ret = DISP_CHANGE_FAILED; + + display_device.cb = sizeof(display_device); + for (display_idx = 0; EnumDisplayDevicesW(NULL, display_idx, &display_device, 0); ++display_idx) + ++display_count; + + displays = heap_calloc(display_count, sizeof(*displays)); + if (!displays) + goto done; + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (!EnumDisplayDevicesW(NULL, display_idx, &display_device, 0)) + goto done; + + if (!handler.get_id(display_device.DeviceName, &displays[display_idx].id)) + { + ret = DISP_CHANGE_BADPARAM; + goto done; + } + + if (!dev_mode) + { + registry_mode.dmSize = sizeof(registry_mode); + if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_REGISTRY_SETTINGS, &registry_mode, 0)) + goto done; + + displays[display_idx].desired_mode = registry_mode; + } + else if (!lstrcmpiW(dev_name, display_device.DeviceName)) + { + displays[display_idx].desired_mode = *dev_mode; + if (!(dev_mode->dmFields & DM_POSITION)) + { + current_mode.dmSize = sizeof(current_mode); + if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) + goto done; + + displays[display_idx].desired_mode.dmFields |= DM_POSITION; + displays[display_idx].desired_mode.u1.s2.dmPosition = current_mode.u1.s2.dmPosition; + } + } + else + { + current_mode.dmSize = sizeof(current_mode); + if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) + goto done; + + displays[display_idx].desired_mode = current_mode; + } + + SetRect(&displays[display_idx].desired_rect, + displays[display_idx].desired_mode.u1.s2.dmPosition.x, + displays[display_idx].desired_mode.u1.s2.dmPosition.y, + displays[display_idx].desired_mode.u1.s2.dmPosition.x + displays[display_idx].desired_mode.dmPelsWidth, + displays[display_idx].desired_mode.u1.s2.dmPosition.y + displays[display_idx].desired_mode.dmPelsHeight); + lstrcpyW(displays[display_idx].desired_mode.dmDeviceName, display_device.DeviceName); + } + + *new_displays = displays; + *new_display_count = display_count; + return DISP_CHANGE_SUCCESSFUL; + +done: + heap_free(displays); + return ret; +} + +static INT offset_length(POINT offset) +{ + return offset.x * offset.x + offset.y * offset.y; +} + +/* Check if a rect overlaps with placed display rects */ +static BOOL overlap_placed_displays(const RECT *rect, const struct x11drv_display_setting *displays, INT display_count) +{ + INT display_idx; + RECT intersect; + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (displays[display_idx].placed && + IntersectRect(&intersect, &displays[display_idx].new_rect, rect)) + return TRUE; + } + return FALSE; +} + +/* Get the offset with minimum length to place a display next to the placed displays with no spacing and overlaps */ +static POINT get_placement_offset(const struct x11drv_display_setting *displays, INT display_count, INT placing_idx) +{ + POINT points[8], left_top, offset, min_offset = {0, 0}; + INT display_idx, point_idx, point_count, vertex_idx; + BOOL has_placed = FALSE, first = TRUE; + INT width, height; + RECT rect; + + /* If the display to be placed is detached, no offset is needed to place it */ + if (IsRectEmpty(&displays[placing_idx].desired_rect)) + return min_offset; + + /* If there is no placed and attached display, place this display as it is */ + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (displays[display_idx].placed && !IsRectEmpty(&displays[display_idx].new_rect)) + { + has_placed = TRUE; + break; + } + } + + if (!has_placed) + return min_offset; + + /* Try to place this display with each of its four vertices at every vertex of the placed + * displays and see which combination has the minimum offset length */ + width = displays[placing_idx].desired_rect.right - displays[placing_idx].desired_rect.left; + height = displays[placing_idx].desired_rect.bottom - displays[placing_idx].desired_rect.top; + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (!displays[display_idx].placed || IsRectEmpty(&displays[display_idx].new_rect)) + continue; + + /* Get four vertices of the placed display rectangle */ + points[0].x = displays[display_idx].new_rect.left; + points[0].y = displays[display_idx].new_rect.top; + points[1].x = displays[display_idx].new_rect.left; + points[1].y = displays[display_idx].new_rect.bottom; + points[2].x = displays[display_idx].new_rect.right; + points[2].y = displays[display_idx].new_rect.top; + points[3].x = displays[display_idx].new_rect.right; + points[3].y = displays[display_idx].new_rect.bottom; + point_count = 4; + + /* Intersected points when moving the display to be placed horizontally */ + if (displays[placing_idx].desired_rect.bottom >= displays[display_idx].new_rect.top && + displays[placing_idx].desired_rect.top <= displays[display_idx].new_rect.bottom) + { + points[point_count].x = displays[display_idx].new_rect.left; + points[point_count++].y = displays[placing_idx].desired_rect.top; + points[point_count].x = displays[display_idx].new_rect.right; + points[point_count++].y = displays[placing_idx].desired_rect.top; + } + /* Intersected points when moving the display to be placed vertically */ + if (displays[placing_idx].desired_rect.left <= displays[display_idx].new_rect.right && + displays[placing_idx].desired_rect.right >= displays[display_idx].new_rect.left) + { + points[point_count].x = displays[placing_idx].desired_rect.left; + points[point_count++].y = displays[display_idx].new_rect.top; + points[point_count].x = displays[placing_idx].desired_rect.left; + points[point_count++].y = displays[display_idx].new_rect.bottom; + } + + /* Try moving each vertex of the display rectangle to each points */ + for (point_idx = 0; point_idx < point_count; ++point_idx) + { + for (vertex_idx = 0; vertex_idx < 4; ++vertex_idx) + { + switch (vertex_idx) + { + /* Move the bottom right vertex to the point */ + case 0: + left_top.x = points[point_idx].x - width; + left_top.y = points[point_idx].y - height; + break; + /* Move the bottom left vertex to the point */ + case 1: + left_top.x = points[point_idx].x; + left_top.y = points[point_idx].y - height; + break; + /* Move the top right vertex to the point */ + case 2: + left_top.x = points[point_idx].x - width; + left_top.y = points[point_idx].y; + break; + /* Move the top left vertex to the point */ + case 3: + left_top.x = points[point_idx].x; + left_top.y = points[point_idx].y; + break; + } + + offset.x = left_top.x - displays[placing_idx].desired_rect.left; + offset.y = left_top.y - displays[placing_idx].desired_rect.top; + rect = displays[placing_idx].desired_rect; + OffsetRect(&rect, offset.x, offset.y); + if (!overlap_placed_displays(&rect, displays, display_count)) + { + if (first) + { + min_offset = offset; + first = FALSE; + continue; + } + + if (offset_length(offset) < offset_length(min_offset)) + min_offset = offset; + } + } + } + } + + return min_offset; +} + +static void place_all_displays(struct x11drv_display_setting *displays, INT display_count) +{ + INT left_most = INT_MAX, top_most = INT_MAX; + INT placing_idx, display_idx; + POINT min_offset, offset; + + /* Place all displays with no extra space between them and no overlapping */ + while (1) + { + /* Place the unplaced display with the minimum offset length first */ + placing_idx = -1; + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (displays[display_idx].placed) + continue; + + offset = get_placement_offset(displays, display_count, display_idx); + if (placing_idx == -1 || offset_length(offset) < offset_length(min_offset)) + { + min_offset = offset; + placing_idx = display_idx; + } + } + + /* If all displays are placed */ + if (placing_idx == -1) + break; + + displays[placing_idx].new_rect = displays[placing_idx].desired_rect; + OffsetRect(&displays[placing_idx].new_rect, min_offset.x, min_offset.y); + displays[placing_idx].placed = TRUE; + } + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + displays[display_idx].desired_mode.u1.s2.dmPosition.x = displays[display_idx].new_rect.left; + displays[display_idx].desired_mode.u1.s2.dmPosition.y = displays[display_idx].new_rect.top; + left_most = min(left_most, displays[display_idx].new_rect.left); + top_most = min(top_most, displays[display_idx].new_rect.top); + } + + /* Convert virtual screen coordinates to root coordinates */ + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + displays[display_idx].desired_mode.u1.s2.dmPosition.x -= left_most; + displays[display_idx].desired_mode.u1.s2.dmPosition.y -= top_most; + } +} + +static LONG apply_display_settings(struct x11drv_display_setting *displays, INT display_count) +{ + DEVMODEW *full_mode; + INT display_idx; + LONG ret; + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (is_detached_mode(&displays[display_idx].desired_mode)) + { + FIXME("Detaching %s is currently unsupported.\n", + wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName)); + continue; + } + + full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); + if (!full_mode) + return DISP_CHANGE_BADMODE; + + full_mode->dmFields |= DM_POSITION; + full_mode->u1.s2.dmPosition = displays[display_idx].desired_mode.u1.s2.dmPosition; + TRACE("handler:%s changing %s to position:(%d,%d) resolution:%ux%u frequency:%uHz " + "depth:%ubits orientation:%#x.\n", handler.name, + wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName), + full_mode->u1.s2.dmPosition.x, full_mode->u1.s2.dmPosition.y, full_mode->dmPelsWidth, + full_mode->dmPelsHeight, full_mode->dmDisplayFrequency, full_mode->dmBitsPerPel, + full_mode->u1.s2.dmDisplayOrientation); + + ret = handler.set_current_mode(displays[display_idx].id, full_mode); + heap_free(full_mode); + if (ret != DISP_CHANGE_SUCCESSFUL) + return ret; + } + + return DISP_CHANGE_SUCCESSFUL; +} + /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -541,10 +849,11 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { + struct x11drv_display_setting *displays; WCHAR primary_adapter[CCHDEVICENAME]; char bpp_buffer[16], freq_buffer[18]; - DEVMODEW default_mode, *full_mode; - ULONG_PTR id; + INT display_idx, display_count; + DEVMODEW default_mode; LONG ret; DWORD i; @@ -552,70 +861,39 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, if (!handler.name) goto old_interface; - if (!get_primary_adapter(primary_adapter)) - return DISP_CHANGE_FAILED; + ret = get_display_settings(&displays, &display_count, devname, devmode); + if (ret != DISP_CHANGE_SUCCESSFUL) + return ret; - if (!devname && !devmode) + if (flags & CDS_UPDATEREGISTRY && devname && devmode) { - default_mode.dmSize = sizeof(default_mode); - if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + for (display_idx = 0; display_idx < display_count; ++display_idx) { - ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); - return DISP_CHANGE_BADMODE; + if (!lstrcmpiW(displays[display_idx].desired_mode.dmDeviceName, devname)) + { + if (!write_registry_settings(devname, &displays[display_idx].desired_mode)) + { + ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); + heap_free(displays); + return DISP_CHANGE_NOTUPDATED; + } + break; + } } - - devname = primary_adapter; - devmode = &default_mode; - } - - if (!handler.get_id(devname, &id)) - { - ERR("Failed to get %s device id.\n", wine_dbgstr_w(devname)); - return DISP_CHANGE_BADPARAM; - } - - if (is_detached_mode(devmode)) - { - FIXME("Detaching adapters is currently unsupported.\n"); - return DISP_CHANGE_SUCCESSFUL; - } - - if (!(full_mode = get_full_mode(id, devmode))) - { - ERR("Failed to find a valid mode.\n"); - return DISP_CHANGE_BADMODE; - } - - if (flags & CDS_UPDATEREGISTRY && !write_registry_settings(devname, full_mode)) - { - ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); - heap_free(full_mode); - return DISP_CHANGE_NOTUPDATED; - } - - if (lstrcmpiW(primary_adapter, devname)) - { - FIXME("Changing non-primary adapter %s settings is currently unsupported.\n", - wine_dbgstr_w(devname)); - heap_free(full_mode); - return DISP_CHANGE_SUCCESSFUL; } if (flags & (CDS_TEST | CDS_NORESET)) { - heap_free(full_mode); + heap_free(displays); return DISP_CHANGE_SUCCESSFUL; } - TRACE("handler:%s device:%s position:(%d,%d) resolution:%ux%u frequency:%uHz depth:%ubits " - "orientation:%#x.\n", handler.name, wine_dbgstr_w(devname), full_mode->u1.s2.dmPosition.x, - full_mode->u1.s2.dmPosition.y, full_mode->dmPelsWidth, full_mode->dmPelsHeight, - full_mode->dmDisplayFrequency, full_mode->dmBitsPerPel, full_mode->u1.s2.dmDisplayOrientation); + place_all_displays(displays, display_count); - ret = handler.set_current_mode(id, full_mode); + ret = apply_display_settings(displays, display_count); if (ret == DISP_CHANGE_SUCCESSFUL) X11DRV_DisplayDevices_Update(TRUE); - heap_free(full_mode); + heap_free(displays); return ret; old_interface: diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index d111b960fa6..4fbb2e540dc 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1367,12 +1367,13 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) goto done; get_screen_size( screen_resources, &screen_width, &screen_height ); - screen_width = max( screen_width, crtc_info->x + mode->dmPelsWidth ); - screen_height = max( screen_height, crtc_info->y + mode->dmPelsHeight ); + screen_width = max( screen_width, mode->u1.s2.dmPosition.x + mode->dmPelsWidth ); + screen_height = max( screen_height, mode->u1.s2.dmPosition.y + mode->dmPelsHeight ); set_screen_size( screen_width, screen_height ); status = pXRRSetCrtcConfig( gdi_display, screen_resources, crtc, CurrentTime, - crtc_info->x, crtc_info->y, rrmode, rotation, outputs, output_count ); + mode->u1.s2.dmPosition.x, mode->u1.s2.dmPosition.y, rrmode, + rotation, outputs, output_count ); if (status == RRSetConfigSuccess) ret = DISP_CHANGE_SUCCESSFUL; -- 2.25.1

2 1

[PATCH] wininet: Handle empty expires for cookie setting.
by Jactry Zeng 27 Jul '20

27 Jul '20

Superseded patch 189784. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/wininet/cookie.c | 2 +- dlls/wininet/tests/internet.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 1786b3d281..090653864a 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -977,7 +977,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D substr_skip(&data, len); - if(end_ptr - data.str < ARRAY_SIZE(buf)-1) { + if (data.str[0] && (end_ptr - data.str < ARRAY_SIZE(buf) - 1)) { memcpy(buf, data.str, data.len*sizeof(WCHAR)); buf[data.len] = 0; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e69b45a7e6..ef1adefd1a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -510,7 +510,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -524,16 +524,26 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", "A", buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); /* test persistent cookies */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + /* test invalid expires parameter */ + ret = InternetSetCookieA("http://testing.example.com", NULL, "Q=R; expires="); + ok(ret, "InternetSetCookie failed %#x.\n", GetLastError()); + len = 1024; + memset(buffer, 0xac, sizeof(buffer)); + ret = InternetGetCookieA("http://testing.example.com/", NULL, buffer, &len); + ok(ret, "InternetGetCookie failed %#x.\n", GetLastError()); + ok(len == 29, "got len %u.\n", len); + ok(!!strstr(buffer, "Q=R"), "cookie is not present.\n"); + len = sizeof(buffer); ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); - ok(ret, "got error %u\n", GetLastError()); - ok(len == 24, "got len %u\n", len); + ok(ret, "got error %#x\n", GetLastError()); + ok(len == 29, "got len %u\n", len); ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */ -- 2.27.0

1 0

[PATCH] wininet: Handle empty expires for cookie setting.
by Jactry Zeng 27 Jul '20

27 Jul '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/wininet/cookie.c | 2 +- dlls/wininet/tests/internet.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 1786b3d281..090653864a 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -977,7 +977,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D substr_skip(&data, len); - if(end_ptr - data.str < ARRAY_SIZE(buf)-1) { + if (data.str[0] && (end_ptr - data.str < ARRAY_SIZE(buf) - 1)) { memcpy(buf, data.str, data.len*sizeof(WCHAR)); buf[data.len] = 0; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e69b45a7e6..ef1adefd1a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -510,7 +510,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -524,16 +524,26 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", "A", buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); /* test persistent cookies */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + /* test invalid expires parameter */ + ret = InternetSetCookieA("http://testing.example.com", NULL, "Q=R; expires="); + ok(ret, "InternetSetCookie failed %#x.\n", GetLastError()); + len = 1024; + memset(buffer, 0xac, sizeof(buffer)); + ret = InternetGetCookieA("http://testing.example.com/", NULL, buffer, &len); + ok(ret, "InternetGetCookie failed %#x.\n", GetLastError()); + ok(len == 29, "got len %u.\n", len); + ok(!!strstr(buffer, "Q=R"), "cookie is not present.\n"); + len = sizeof(buffer); ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); - ok(ret, "got error %u\n", GetLastError()); - ok(len == 24, "got len %u\n", len); + ok(ret, "got error %#x\n", GetLastError()); + ok(len == 29, "got len %u\n", len); ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */ -- 2.27.0

2 1

[PATCH 1/2] wbemprox/tests: Fix test failures.
by Gijs Vermeulen 27 Jul '20

27 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wbemprox/tests/query.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index da47773da2..0fa091b739 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,8 +1144,10 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PhysicalMemory" ); IEnumWbemClassObject *result; IWbemClassObject *obj; - HRESULT hr; + CIMTYPE type; + VARIANT val; DWORD count; + HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); if (hr != S_OK) @@ -1154,21 +1156,39 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) return; } - hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - - if (count > 0) + for (;;) { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"BankLabel", VT_BSTR, CIM_STRING ); check_property( obj, L"Capacity", VT_BSTR, CIM_UINT64 ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceLocator", VT_BSTR, CIM_STRING ); check_property( obj, L"FormFactor", VT_I4, CIM_UINT16 ); check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 ); - check_property( obj, L"PartNumber", VT_NULL, CIM_STRING ); - check_property( obj, L"SerialNumber", VT_NULL, CIM_STRING ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"PartNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "PartNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"SerialNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "SerialNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); -- 2.27.0

2 3

[PATCH] sc.exe: Fake succes for the SdSet argument
by Louis Lenders 27 Jul '20

27 Jul '20

https://bugs.winehq.org/show_bug.cgi?id=49620 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- programs/sc/sc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 1976c38a78..ad74cab74b 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -220,6 +220,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR startW[] = {'s','t','a','r','t',0}; static const WCHAR stopW[] = {'s','t','o','p',0}; + static const WCHAR sdsetW[] = {'s','d','s','e','t',0}; SC_HANDLE manager, service; SERVICE_STATUS status; BOOL ret = FALSE; @@ -328,6 +329,11 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } + else if (!wcsicmp( argv[1], sdsetW )) + { + WINE_FIXME("command not supported, just faking success for now\n"); + ret = TRUE; + } else WINE_FIXME("command not supported\n"); -- 2.28.0.rc2

1 0

[PATCH] fonts: Add initial version of Webdings font.
by Dmitry Timoshkov 27 Jul '20

27 Jul '20

Some applications confusingly use Webdings instead of Marlett to draw non-client areas of their custom controls, this initial version of Webdings contains just a few glyphs copied from Marlett to make these apps happy. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/Makefile.in | 1 + fonts/webdings.sfd | 198 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 fonts/webdings.sfd diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 08c82646de..b802185198 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -10,4 +10,5 @@ FONT_SRCS = \ system.sfd \ tahoma.sfd \ tahomabd.sfd \ + webdings.sfd \ wingding.sfd diff --git a/fonts/webdings.sfd b/fonts/webdings.sfd new file mode 100644 index 0000000000..0a42dbe564 --- /dev/null +++ b/fonts/webdings.sfd @@ -0,0 +1,198 @@ +SplineFontDB: 3.0 +FontName: WineWebdings +FullName: Webdings +FamilyName: Webdings +Weight: Regular +Copyright: Copyright (C) 2020 Dmitry Timoshkov +UComments: "#pragma makedep install" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: 0 +UnderlineWidth: 0 +Ascent: 2048 +Descent: 0 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +FSType: 0 +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 0 +PfmFamily: 81 +TTFWeight: 500 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 0 0 0 0 0 0 0 0 0 0 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'Wine' +DEI: 91125 +ShortTable: cvt 2 + 68 + 1297 +EndShort +LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "http://www.winehq.org" "" "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.+AAoACgAA-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.+AAoACgAA-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+AAoA" "http://www.gnu.org/licenses/lgpl.html" +Encoding: Symbol +Compacted: 1 +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -72 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 26 10 +TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 +BeginChars: 257 8 + +StartChar: f020 +Encoding: 0 61472 0 +AltUni2: 000000.ffffffff.0 +Width: 1024 +Flags: W +LayerCount: 2 +Fore +SplineSet +41 41 m 1,0,-1 + 819 41 l 1,1,-1 + 819 1324 l 1,2,-1 + 41 1324 l 1,3,-1 + 41 41 l 1,0,-1 +0 0 m 1,4,-1 + 0 1365 l 1,5,-1 + 860 1365 l 1,6,-1 + 860 0 l 1,7,-1 + 0 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: zero +Encoding: 48 48 1 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +256 256 m 1,0,-1 + 256 512 l 1,1,-1 + 1280 512 l 1,2,-1 + 1280 256 l 1,3,-1 + 256 256 l 1,0,-1 +EndSplineSet +EndChar + +StartChar: one +Encoding: 49 49 2 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +256 384 m 1,0,-1 + 1536 384 l 1,1,-1 + 1536 1408 l 1,2,-1 + 256 1408 l 1,3,-1 + 256 384 l 1,0,-1 +128 256 m 1,4,-1 + 128 1664 l 1,5,-1 + 1664 1664 l 1,6,-1 + 1664 256 l 1,7,-1 + 128 256 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: two +Encoding: 50 50 3 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +128 256 m 1,0,-1 + 128 1152 l 1,1,-1 + 512 1152 l 1,2,-1 + 512 1664 l 1,3,-1 + 1664 1664 l 1,4,-1 + 1664 768 l 1,5,-1 + 1280 768 l 1,6,-1 + 1280 256 l 1,7,-1 + 128 256 l 1,0,-1 +256 384 m 1,8,-1 + 1152 384 l 1,9,-1 + 1152 896 l 1,10,-1 + 256 896 l 1,11,-1 + 256 384 l 1,8,-1 +640 1152 m 1,12,-1 + 1280 1152 l 1,13,-1 + 1280 896 l 1,14,-1 + 1536 896 l 1,15,-1 + 1536 1408 l 1,16,-1 + 640 1408 l 1,17,-1 + 640 1152 l 1,12,-1 +EndSplineSet +EndChar + +StartChar: three +Encoding: 51 51 4 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1150 1726 m 25,0,-1 + 1150 446 l 25,1,-1 + 510 1086 l 25,2,-1 + 1150 1726 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: four +Encoding: 52 52 5 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +842 1732 m 25,0,-1 + 842 452 l 25,1,-1 + 1482 1092 l 25,2,-1 + 842 1732 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: five +Encoding: 53 53 6 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +320 768 m 25,0,-1 + 1600 768 l 25,1,-1 + 960 1408 l 25,2,-1 + 320 768 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: six +Encoding: 54 54 7 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +320 1282 m 25,0,-1 + 1600 1282 l 25,1,-1 + 960 642 l 25,2,-1 + 320 1282 l 25,0,-1 +EndSplineSet +EndChar +EndChars +EndSplineFont -- 2.26.2

3 3