July 2022 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Implement hasAttributeNS for Elements.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 3388fecdf137eea62d86ac1bad9a568e6137f205 URL: https://gitlab.winehq.org/wine/wine/-/commit/3388fecdf137eea62d86ac1bad9a56… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jul 27 21:33:35 2022 +0300 mshtml: Implement hasAttributeNS for Elements. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 54 ++++++++++++++++++++++++++-- dlls/mshtml/tests/documentmode.js | 74 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 2 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Implement lastElementChild for Elements.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 06872bd8e643a829bd62fda66b092974669de883 URL: https://gitlab.winehq.org/wine/wine/-/commit/06872bd8e643a829bd62fda66b0929… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jul 27 21:33:35 2022 +0300 mshtml: Implement lastElementChild for Elements. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 26 ++++++++++++++++++++++++-- dlls/mshtml/tests/dom.js | 5 ++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4681fc79782..29e5d859243 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6524,8 +6524,30 @@ static HRESULT WINAPI ElementTraversal_get_firstElementChild(IElementTraversal * static HRESULT WINAPI ElementTraversal_get_lastElementChild(IElementTraversal *iface, IHTMLElement **p) { HTMLElement *This = impl_from_IElementTraversal(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMElement *nselem = NULL; + HTMLElement *elem; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->dom_element) { + *p = NULL; + return S_OK; + } + + nsIDOMElement_GetLastElementChild(This->dom_element, &nselem); + if(!nselem) { + *p = NULL; + return S_OK; + } + + hres = get_element(nselem, &elem); + nsIDOMElement_Release(nselem); + if(FAILED(hres)) + return hres; + + *p = &elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI ElementTraversal_get_previousElementSibling(IElementTraversal *iface, IHTMLElement **p) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 3939dd95642..bd6fbf3793b 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -89,12 +89,15 @@ sync_test("textContent", function() { sync_test("ElementTraversal", function() { var div = document.createElement("div"); - div.innerHTML = "abc<b>bold</b><script>/* */<script><div>text</div>def"; + div.innerHTML = "abc<b>bold</b><script>/* */</script><div>text</div>def"; ok(div.firstElementChild.outerHTML === "<b>bold</b>", "div.firstElementChild.outerHTML = " + div.firstElementChild.outerHTML); + ok(div.lastElementChild.outerHTML === "<div>text</div>", + "div.lastElementChild.outerHTML = " + div.lastElementChild.outerHTML); div.innerHTML = "abc"; ok(div.firstElementChild === null, "div.firstElementChild = " + div.firstElementChild); + ok(div.lastElementChild === null, "div.lastElementChild = " + div.lastElementChild); ok(!("firstElementChild" in document), "firstElementChild found in document"); });

1 0

Gabriel Ivăncescu : mshtml: Implement nextElementSibling for Elements.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 67f182bf7805484636d0f9e5c59080f59dd0c2d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/67f182bf7805484636d0f9e5c59080… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jul 27 21:33:35 2022 +0300 mshtml: Implement nextElementSibling for Elements. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 26 ++++++++++++++++++++++++-- dlls/mshtml/tests/dom.js | 5 +++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 29e5d859243..5eced270c3c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6560,8 +6560,30 @@ static HRESULT WINAPI ElementTraversal_get_previousElementSibling(IElementTraver static HRESULT WINAPI ElementTraversal_get_nextElementSibling(IElementTraversal *iface, IHTMLElement **p) { HTMLElement *This = impl_from_IElementTraversal(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMElement *nselem = NULL; + HTMLElement *elem; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->dom_element) { + *p = NULL; + return S_OK; + } + + nsIDOMElement_GetNextElementSibling(This->dom_element, &nselem); + if(!nselem) { + *p = NULL; + return S_OK; + } + + hres = get_element(nselem, &elem); + nsIDOMElement_Release(nselem); + if(FAILED(hres)) + return hres; + + *p = &elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI ElementTraversal_get_childElementCount(IElementTraversal *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index bd6fbf3793b..e164c9502ff 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -94,12 +94,17 @@ sync_test("ElementTraversal", function() { "div.firstElementChild.outerHTML = " + div.firstElementChild.outerHTML); ok(div.lastElementChild.outerHTML === "<div>text</div>", "div.lastElementChild.outerHTML = " + div.lastElementChild.outerHTML); + ok(div.firstElementChild.nextElementSibling.outerHTML === "<script>/* */</script>", + "div.firstElementChild.nextElementSibling.outerHTML = " + div.firstElementChild.nextElementSibling.outerHTML); + ok(div.lastElementChild.nextElementSibling === null, + "div.lastElementChild.nextElementSibling = " + div.lastElementChild.nextElementSibling); div.innerHTML = "abc"; ok(div.firstElementChild === null, "div.firstElementChild = " + div.firstElementChild); ok(div.lastElementChild === null, "div.lastElementChild = " + div.lastElementChild); ok(!("firstElementChild" in document), "firstElementChild found in document"); + ok(!("nextElementSibling" in document), "nextElementSibling found in document"); }); sync_test("head", function() {

1 0

Gabriel Ivăncescu : mshtml: Implement previousElementSibling for Elements.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 107f318ee60b7de695d7bdc094a7bc5d38f8c3f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/107f318ee60b7de695d7bdc094a7bc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jul 27 21:33:35 2022 +0300 mshtml: Implement previousElementSibling for Elements. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 26 ++++++++++++++++++++++++-- dlls/mshtml/tests/dom.js | 4 ++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5eced270c3c..76de1a0337c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6553,8 +6553,30 @@ static HRESULT WINAPI ElementTraversal_get_lastElementChild(IElementTraversal *i static HRESULT WINAPI ElementTraversal_get_previousElementSibling(IElementTraversal *iface, IHTMLElement **p) { HTMLElement *This = impl_from_IElementTraversal(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMElement *nselem = NULL; + HTMLElement *elem; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->dom_element) { + *p = NULL; + return S_OK; + } + + nsIDOMElement_GetPreviousElementSibling(This->dom_element, &nselem); + if(!nselem) { + *p = NULL; + return S_OK; + } + + hres = get_element(nselem, &elem); + nsIDOMElement_Release(nselem); + if(FAILED(hres)) + return hres; + + *p = &elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI ElementTraversal_get_nextElementSibling(IElementTraversal *iface, IHTMLElement **p) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index e164c9502ff..93b4dc196ec 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -98,6 +98,10 @@ sync_test("ElementTraversal", function() { "div.firstElementChild.nextElementSibling.outerHTML = " + div.firstElementChild.nextElementSibling.outerHTML); ok(div.lastElementChild.nextElementSibling === null, "div.lastElementChild.nextElementSibling = " + div.lastElementChild.nextElementSibling); + ok(div.lastElementChild.previousElementSibling.outerHTML === "<script>/* */</script>", + "div.lastElementChild.previousElementSibling.outerHTML = " + div.lastElementChild.previousElementSibling.outerHTML); + ok(div.firstElementChild.previousElementSibling === null, + "div.firstElementChild.previousElementSibling = " + div.firstElementChild.previousElementSibling); div.innerHTML = "abc"; ok(div.firstElementChild === null, "div.firstElementChild = " + div.firstElementChild);

1 0

Gabriel Ivăncescu : mshtml: Implement childElementCount for Elements.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: b4adbb4dc08d385e3c490496b1652431df617557 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4adbb4dc08d385e3c490496b16524… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jul 27 21:33:35 2022 +0300 mshtml: Implement childElementCount for Elements. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 11 +++++++++-- dlls/mshtml/tests/dom.js | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 76de1a0337c..826d131df77 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6611,8 +6611,15 @@ static HRESULT WINAPI ElementTraversal_get_nextElementSibling(IElementTraversal static HRESULT WINAPI ElementTraversal_get_childElementCount(IElementTraversal *iface, LONG *p) { HTMLElement *This = impl_from_IElementTraversal(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 count = 0; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->dom_element) + nsIDOMElement_GetChildElementCount(This->dom_element, &count); + + *p = count; + return S_OK; } static const IElementTraversalVtbl ElementTraversalVtbl = { diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 93b4dc196ec..231633b0712 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -90,6 +90,7 @@ sync_test("textContent", function() { sync_test("ElementTraversal", function() { var div = document.createElement("div"); div.innerHTML = "abc<b>bold</b><script>/* */</script><div>text</div>def"; + ok(div.childElementCount === 3, "div.childElementCount = " + div.childElementCount); ok(div.firstElementChild.outerHTML === "<b>bold</b>", "div.firstElementChild.outerHTML = " + div.firstElementChild.outerHTML); ok(div.lastElementChild.outerHTML === "<div>text</div>", @@ -104,9 +105,11 @@ sync_test("ElementTraversal", function() { "div.firstElementChild.previousElementSibling = " + div.firstElementChild.previousElementSibling); div.innerHTML = "abc"; + ok(div.childElementCount === 0, "div.childElementCount = " + div.childElementCount); ok(div.firstElementChild === null, "div.firstElementChild = " + div.firstElementChild); ok(div.lastElementChild === null, "div.lastElementChild = " + div.lastElementChild); + ok(!("childElementCount" in document), "childElementCount found in document"); ok(!("firstElementChild" in document), "firstElementChild found in document"); ok(!("nextElementSibling" in document), "nextElementSibling found in document"); });

1 0

Gabriel Ivăncescu : mshtml: Implement HTMLTitleElement's text property.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 1381ced8ecbfaa57aa378ab32e94d5aa51873160 URL: https://gitlab.winehq.org/wine/wine/-/commit/1381ced8ecbfaa57aa378ab32e94d5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jul 27 21:33:35 2022 +0300 mshtml: Implement HTMLTitleElement's text property. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlhead.c | 22 ++++++++++++++++++---- dlls/mshtml/tests/dom.js | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 1bad06ee9d7..786d60ae227 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -103,15 +103,29 @@ static HRESULT WINAPI HTMLTitleElement_Invoke(IHTMLTitleElement *iface, DISPID d static HRESULT WINAPI HTMLTitleElement_put_text(IHTMLTitleElement *iface, BSTR v) { HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString text; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&text, v); + nsres = nsIDOMNode_SetTextContent(This->element.node.nsnode, &text); + nsAString_Finish(&text); + + return map_nsresult(nsres); } static HRESULT WINAPI HTMLTitleElement_get_text(IHTMLTitleElement *iface, BSTR *p) { HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString text; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&text, NULL); + nsres = nsIDOMNode_GetTextContent(This->element.node.nsnode, &text); + return return_nsstr(nsres, &text, p); } static const IHTMLTitleElementVtbl HTMLTitleElementVtbl = { diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 231633b0712..fcbca0f4b2f 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -533,6 +533,24 @@ sync_test("title", function() { elem.title = "test"; ok(elem.title === "test", "div.title = " + elem.title); ok(elem.getAttribute("title") === "test", "title attribute = " + elem.getAttribute("title")); + + var orig = document.title; + document.title = "w i n e test"; + var title = document.getElementsByTagName("title")[0]; + ok(title.text === "w i n e test", "<title> element text = " + title.text); + title.text = "winetest"; + ok(title.text === "winetest", "<title> element text after change = " + title.text); + ok(document.title === "winetest", "document.title after <title> change = " + document.title); + + elem = document.createElement("title"); + ok(elem.text === "", "detached <title> element text = " + elem.text); + elem.text = "foobar"; + ok(elem.text === "foobar", "detached <title> element text after change = " + elem.text); + ok(document.title === "winetest", "document.title after detached <title> change = " + document.title); + + title.parentNode.replaceChild(elem, title); + ok(document.title === "foobar", "document.title after <title> replaced = " + document.title); + document.title = orig; }); sync_test("disabled", function() {

1 0

Rémi Bernon : winex11.drv: Set desktop settings handler before updating display devices.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 000891f7193883bf1e0afaca179d00094decf985 URL: https://gitlab.winehq.org/wine/wine/-/commit/000891f7193883bf1e0afaca179d00… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 14:05:27 2022 +0200 winex11.drv: Set desktop settings handler before updating display devices. --- dlls/winex11.drv/desktop.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 162b524d504..3e589f9d940 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -335,6 +335,16 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) max_width = primary_rect.right; max_height = primary_rect.bottom; + /* Initialize virtual desktop display settings handler */ + settings_handler.name = "Virtual Desktop"; + settings_handler.priority = 1000; + settings_handler.get_id = X11DRV_desktop_get_id; + settings_handler.get_modes = X11DRV_desktop_get_modes; + settings_handler.free_modes = X11DRV_desktop_free_modes; + settings_handler.get_current_mode = X11DRV_desktop_get_current_mode; + settings_handler.set_current_mode = X11DRV_desktop_set_current_mode; + X11DRV_Settings_SetHandler( &settings_handler ); + /* Initialize virtual desktop mode display device handler */ desktop_handler.name = "Virtual Desktop"; desktop_handler.get_gpus = X11DRV_desktop_get_gpus; @@ -346,16 +356,6 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) desktop_handler.register_event_handlers = NULL; TRACE("Display device functions are now handled by: Virtual Desktop\n"); X11DRV_DisplayDevices_Init( TRUE ); - - /* Initialize virtual desktop display settings handler */ - settings_handler.name = "Virtual Desktop"; - settings_handler.priority = 1000; - settings_handler.get_id = X11DRV_desktop_get_id; - settings_handler.get_modes = X11DRV_desktop_get_modes; - settings_handler.free_modes = X11DRV_desktop_free_modes; - settings_handler.get_current_mode = X11DRV_desktop_get_current_mode; - settings_handler.set_current_mode = X11DRV_desktop_set_current_mode; - X11DRV_Settings_SetHandler( &settings_handler ); }

1 0

Rémi Bernon : winemac.drv: Introduce new display_mode_to_devmode helper.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 237778d7f6974a36184888bf8bbcfe10cd9fe5d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/237778d7f6974a36184888bf8bbcfe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jul 9 01:24:09 2022 +0200 winemac.drv: Introduce new display_mode_to_devmode helper. --- dlls/winemac.drv/display.c | 136 ++++++++++++++++++++++++--------------------- 1 file changed, 73 insertions(+), 63 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index a217a3fc422..d2f221fdbd1 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -61,6 +61,78 @@ static pthread_mutex_t modes_mutex = PTHREAD_MUTEX_INITIALIZER; static BOOL inited_original_display_mode; +static int display_mode_bits_per_pixel(CGDisplayModeRef display_mode) +{ + CFStringRef pixel_encoding; + int bits_per_pixel = 0; + + pixel_encoding = CGDisplayModeCopyPixelEncoding(display_mode); + if (pixel_encoding) + { + if (CFEqual(pixel_encoding, CFSTR(kIO32BitFloatPixels))) + bits_per_pixel = 128; + else if (CFEqual(pixel_encoding, CFSTR(kIO16BitFloatPixels))) + bits_per_pixel = 64; + else if (CFEqual(pixel_encoding, CFSTR(kIO64BitDirectPixels))) + bits_per_pixel = 64; + else if (CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels))) + bits_per_pixel = 30; + else if (CFEqual(pixel_encoding, CFSTR(IO32BitDirectPixels))) + bits_per_pixel = 32; + else if (CFEqual(pixel_encoding, CFSTR(IO16BitDirectPixels))) + bits_per_pixel = 16; + else if (CFEqual(pixel_encoding, CFSTR(IO8BitIndexedPixels))) + bits_per_pixel = 8; + else if (CFEqual(pixel_encoding, CFSTR(IO4BitIndexedPixels))) + bits_per_pixel = 4; + else if (CFEqual(pixel_encoding, CFSTR(IO2BitIndexedPixels))) + bits_per_pixel = 2; + else if (CFEqual(pixel_encoding, CFSTR(IO1BitIndexedPixels))) + bits_per_pixel = 1; + + CFRelease(pixel_encoding); + } + + return bits_per_pixel; +} + + +static void display_mode_to_devmode(CGDirectDisplayID display_id, CGDisplayModeRef display_mode, DEVMODEW *devmode) +{ + uint32_t io_flags; + double rotation; + + rotation = CGDisplayRotation(display_id); + devmode->dmDisplayOrientation = ((int)((rotation / 90) + 0.5)) % 4; + devmode->dmFields |= DM_DISPLAYORIENTATION; + + io_flags = CGDisplayModeGetIOFlags(display_mode); + if (io_flags & kDisplayModeStretchedFlag) + devmode->dmDisplayFixedOutput = DMDFO_STRETCH; + else + devmode->dmDisplayFixedOutput = DMDFO_CENTER; + devmode->dmFields |= DM_DISPLAYFIXEDOUTPUT; + + devmode->dmBitsPerPel = display_mode_bits_per_pixel(display_mode); + if (devmode->dmBitsPerPel) + devmode->dmFields |= DM_BITSPERPEL; + + devmode->dmPelsWidth = CGDisplayModeGetWidth(display_mode); + devmode->dmPelsHeight = CGDisplayModeGetHeight(display_mode); + devmode->dmFields |= DM_PELSWIDTH | DM_PELSHEIGHT; + + devmode->dmDisplayFlags = 0; + if (io_flags & kDisplayModeInterlacedFlag) + devmode->dmDisplayFlags |= DM_INTERLACED; + devmode->dmFields |= DM_DISPLAYFLAGS; + + devmode->dmDisplayFrequency = CGDisplayModeGetRefreshRate(display_mode); + if (!devmode->dmDisplayFrequency) + devmode->dmDisplayFrequency = 60; + devmode->dmFields |= DM_DISPLAYFREQUENCY; +} + + static BOOL set_setting_value(HKEY hkey, const char *name, DWORD val) { WCHAR nameW[128]; @@ -321,42 +393,6 @@ static BOOL display_mode_matches_descriptor(CGDisplayModeRef mode, const struct } -static int display_mode_bits_per_pixel(CGDisplayModeRef display_mode) -{ - CFStringRef pixel_encoding; - int bits_per_pixel = 0; - - pixel_encoding = CGDisplayModeCopyPixelEncoding(display_mode); - if (pixel_encoding) - { - if (CFEqual(pixel_encoding, CFSTR(kIO32BitFloatPixels))) - bits_per_pixel = 128; - else if (CFEqual(pixel_encoding, CFSTR(kIO16BitFloatPixels))) - bits_per_pixel = 64; - else if (CFEqual(pixel_encoding, CFSTR(kIO64BitDirectPixels))) - bits_per_pixel = 64; - else if (CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels))) - bits_per_pixel = 30; - else if (CFEqual(pixel_encoding, CFSTR(IO32BitDirectPixels))) - bits_per_pixel = 32; - else if (CFEqual(pixel_encoding, CFSTR(IO16BitDirectPixels))) - bits_per_pixel = 16; - else if (CFEqual(pixel_encoding, CFSTR(IO8BitIndexedPixels))) - bits_per_pixel = 8; - else if (CFEqual(pixel_encoding, CFSTR(IO4BitIndexedPixels))) - bits_per_pixel = 4; - else if (CFEqual(pixel_encoding, CFSTR(IO2BitIndexedPixels))) - bits_per_pixel = 2; - else if (CFEqual(pixel_encoding, CFSTR(IO1BitIndexedPixels))) - bits_per_pixel = 1; - - CFRelease(pixel_encoding); - } - - return bits_per_pixel; -} - - static int get_default_bpp(void) { int ret; @@ -893,8 +929,6 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, DEVMODEW *devmode CGDisplayModeRef display_mode; int display_mode_bpp; BOOL synthesized = FALSE; - double rotation; - uint32_t io_flags; TRACE("%s, %u, %p + %hu, %08x\n", debugstr_w(devname), mode, devmode, devmode->dmSize, flags); @@ -1004,23 +1038,10 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, DEVMODEW *devmode devmode->dmPosition.y = 0; devmode->dmFields |= DM_POSITION; - rotation = CGDisplayRotation(displays[0].displayID); - devmode->dmDisplayOrientation = ((int)((rotation / 90) + 0.5)) % 4; - devmode->dmFields |= DM_DISPLAYORIENTATION; - - io_flags = CGDisplayModeGetIOFlags(display_mode); - if (io_flags & kDisplayModeStretchedFlag) - devmode->dmDisplayFixedOutput = DMDFO_STRETCH; - else - devmode->dmDisplayFixedOutput = DMDFO_CENTER; - devmode->dmFields |= DM_DISPLAYFIXEDOUTPUT; - + display_mode_to_devmode(displays[0].displayID, display_mode, devmode); devmode->dmBitsPerPel = display_mode_bpp; if (devmode->dmBitsPerPel) devmode->dmFields |= DM_BITSPERPEL; - - devmode->dmPelsWidth = CGDisplayModeGetWidth(display_mode); - devmode->dmPelsHeight = CGDisplayModeGetHeight(display_mode); if (retina_enabled) { struct display_mode_descriptor* desc = create_original_display_mode_descriptor(displays[0].displayID); @@ -1031,17 +1052,6 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, DEVMODEW *devmode } free_display_mode_descriptor(desc); } - devmode->dmFields |= DM_PELSWIDTH | DM_PELSHEIGHT; - - devmode->dmDisplayFlags = 0; - if (io_flags & kDisplayModeInterlacedFlag) - devmode->dmDisplayFlags |= DM_INTERLACED; - devmode->dmFields |= DM_DISPLAYFLAGS; - - devmode->dmDisplayFrequency = CGDisplayModeGetRefreshRate(display_mode); - if (!devmode->dmDisplayFrequency) - devmode->dmDisplayFrequency = 60; - devmode->dmFields |= DM_DISPLAYFREQUENCY; CFRelease(display_mode); macdrv_free_displays(displays);

1 0

Rémi Bernon : win32u: Introduce new add_mode device manager callback.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 20414797edf900f61d198611e7e3cb09091bbe57 URL: https://gitlab.winehq.org/wine/wine/-/commit/20414797edf900f61d198611e7e3cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 7 00:20:19 2022 +0200 win32u: Introduce new add_mode device manager callback. And use it to enumerate display modes in winex11 and wineandroid. --- dlls/win32u/sysparams.c | 104 ++++++++++++++++++++++++++++++++++---------- dlls/wineandroid.drv/init.c | 6 +++ dlls/winemac.drv/display.c | 83 ++++++++++++++++++++++++++++++++++- dlls/winex11.drv/display.c | 16 +++++++ include/wine/gdi_driver.h | 1 + 5 files changed, 187 insertions(+), 23 deletions(-)

1 0

Rémi Bernon : win32u: Read and cache adapter modes from the registry.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 546638a8751feb0956c7b7705b4865ad2484d287 URL: https://gitlab.winehq.org/wine/wine/-/commit/546638a8751feb0956c7b7705b4865… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 1 06:56:54 2022 +0200 win32u: Read and cache adapter modes from the registry. --- dlls/win32u/sysparams.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 614ed8ba8d9..3c1051b2d80 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -203,6 +203,8 @@ static const WCHAR guid_devinterface_monitorW[] = {'{','E','6','F','0','7','B','5','F','-','E','E','9','7','-','4','A','9','0','-', 'B','0','7','6','-','3','3','F','5','7','B','F','4','E','A','A','7','}',0}; +#define NEXT_DEVMODEW(mode) ((DEVMODEW *)((char *)((mode) + 1) + (mode)->dmDriverExtra)) + /* Cached display device information */ struct display_device { @@ -220,6 +222,8 @@ struct adapter struct display_device dev; unsigned int id; const WCHAR *config_key; + unsigned int mode_count; + DEVMODEW *modes; }; struct monitor @@ -545,8 +549,9 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i char buffer[4096]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; WCHAR *value_str = (WCHAR *)value->Data; + DWORD i, driver_extra = 0, size; + DEVMODEW *mode; HKEY hkey; - DWORD size; if (!enum_key && !(enum_key = reg_open_key( NULL, enum_keyW, sizeof(enum_keyW) ))) return FALSE; @@ -585,10 +590,29 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i /* Interface name */ info->dev.interface_name[0] = 0; + /* ModeCount / DriverExtra */ + if (query_reg_value( hkey, mode_countW, value, sizeof(buffer) ) && value->Type == REG_DWORD) + info->mode_count = *(const DWORD *)value->Data; + if (query_reg_value( hkey, driver_extraW, value, sizeof(buffer) ) && value->Type == REG_DWORD) + driver_extra = *(const DWORD *)value->Data; + + /* Modes */ + if ((info->modes = calloc( info->mode_count, sizeof(DEVMODEW) + driver_extra ))) + { + for (i = 0, mode = info->modes; i < info->mode_count; i++) + { + mode->dmSize = offsetof(DEVMODEW, dmICMMethod); + mode->dmDriverExtra = driver_extra; + if (!read_adapter_mode( hkey, i, mode )) break; + mode = NEXT_DEVMODEW(mode); + } + info->mode_count = i; + } + /* DeviceID */ size = query_reg_value( hkey, gpu_idW, value, sizeof(buffer) ); NtClose( hkey ); - if (!size || value->Type != REG_SZ) return FALSE; + if (!size || value->Type != REG_SZ || !info->mode_count || !info->modes) return FALSE; if (!(hkey = reg_open_key( enum_key, value_str, value->DataLength - sizeof(WCHAR) ))) return FALSE; @@ -1370,6 +1394,7 @@ static void clear_display_devices(void) { adapter = LIST_ENTRY( list_head( &adapters ), struct adapter, entry ); list_remove( &adapter->entry ); + free( adapter->modes ); free( adapter ); } } @@ -1408,6 +1433,7 @@ static BOOL update_display_cache_from_registry(void) if (!read_display_adapter_settings( adapter_id, adapter )) { + free( adapter->modes ); free( adapter ); break; }

1 0