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

Gabriel Ivăncescu : mshtml: Implement getAttributeNS for Elements.
by Alexandre Julliard July 27, 2022

July 27, 2022

Module: wine Branch: master Commit: 821b10907a4f1df45a35f6dee20523c47fba3f74 URL: https://gitlab.winehq.org/wine/wine/-/commit/821b10907a4f1df45a35f6dee20523… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jul 27 21:33:35 2022 +0300 mshtml: Implement getAttributeNS for Elements. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/nsembed.c | 1 + 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d911d0a0433..2d64e020cec 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4813,8 +4813,33 @@ static HRESULT WINAPI HTMLElement6_Invoke(IHTMLElement6 *iface, DISPID dispIdMem static HRESULT WINAPI HTMLElement6_getAttributeNS(IHTMLElement6 *iface, VARIANT *pvarNS, BSTR strAttributeName, VARIANT *AttributeValue) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_variant(pvarNS), debugstr_w(strAttributeName), AttributeValue); - return E_NOTIMPL; + nsAString ns_str, name_str, value_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(pvarNS), debugstr_w(strAttributeName), AttributeValue); + + if(!This->dom_element) { + FIXME("No dom_element\n"); + return E_NOTIMPL; + } + + hres = variant_to_nsstr(pvarNS, FALSE, &ns_str); + if(FAILED(hres)) + return hres; + + nsAString_InitDepend(&name_str, strAttributeName); + nsAString_InitDepend(&value_str, NULL); + nsres = nsIDOMElement_GetAttributeNS(This->dom_element, &ns_str, &name_str, &value_str); + nsAString_Finish(&ns_str); + nsAString_Finish(&name_str); + + hres = return_nsstr_variant(nsres, &value_str, 0, AttributeValue); + if(SUCCEEDED(hres) && V_VT(AttributeValue) == VT_NULL) { + V_VT(AttributeValue) = VT_BSTR; + V_BSTR(AttributeValue) = NULL; + } + return hres; } static HRESULT WINAPI HTMLElement6_setAttributeNS(IHTMLElement6 *iface, VARIANT *pvarNS, BSTR strAttributeName, VARIANT *pvarAttributeValue) @@ -6791,6 +6816,35 @@ static IHTMLEventObj *HTMLElement_set_current_event(DispatchEx *dispex, IHTMLEve return default_set_current_event(This->node.doc->window, event); } +static HRESULT IHTMLElement6_getAttributeNS_hook(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + VARIANT args[2]; + HRESULT hres; + DISPPARAMS new_dp = { args, NULL, 2, 0 }; + + if(!(flags & DISPATCH_METHOD) || dp->cArgs < 2 || dp->cNamedArgs) + return S_FALSE; + + switch(V_VT(&dp->rgvarg[dp->cArgs - 1])) { + case VT_EMPTY: + case VT_BSTR: + case VT_NULL: + return S_FALSE; + default: + break; + } + + hres = change_type(&args[1], &dp->rgvarg[dp->cArgs - 1], VT_BSTR, caller); + if(FAILED(hres)) + return hres; + args[0] = dp->rgvarg[dp->cArgs - 2]; + + hres = dispex_call_builtin(dispex, DISPID_IHTMLELEMENT6_GETATTRIBUTENS, &new_dp, res, ei, caller); + VariantClear(&args[1]); + return hres; +} + static HRESULT IHTMLElement6_setAttribute_hook(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { @@ -6823,6 +6877,7 @@ static HRESULT IHTMLElement6_setAttribute_hook(DispatchEx *dispex, WORD flags, D void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { static const dispex_hook_t elem6_ie10_hooks[] = { + {DISPID_IHTMLELEMENT6_GETATTRIBUTENS, IHTMLElement6_getAttributeNS_hook}, {DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, IHTMLElement6_setAttribute_hook}, {DISPID_UNKNOWN} }; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 8f456b40ef2..c7683a6d06d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -998,6 +998,7 @@ HRESULT variant_to_nsstr(VARIANT *v, BOOL hex_int, nsAString *nsstr) WCHAR buf[32]; switch(V_VT(v)) { + case VT_EMPTY: case VT_NULL: nsAString_InitDepend(nsstr, NULL); return S_OK;

1 0

Rémi Bernon : win32u: Fix thread safety when accessing rawinput device data.
by Alexandre Julliard July 27, 2022

July 27, 2022

Module: wine Branch: master Commit: 840ec530410c8b78bdc6884b487a31eae7ff146b URL: https://gitlab.winehq.org/wine/wine/-/commit/840ec530410c8b78bdc6884b487a31… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 26 07:32:47 2022 +0200 win32u: Fix thread safety when accessing rawinput device data. --- dlls/win32u/rawinput.c | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index dd697017953..34accc3c4a0 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -206,7 +206,7 @@ struct device static struct device *rawinput_devices; static unsigned int rawinput_devices_count, rawinput_devices_max; -static pthread_mutex_t rawinput_devices_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t rawinput_mutex = PTHREAD_MUTEX_INITIALIZER; static bool array_reserve( void **elements, unsigned int *capacity, unsigned int count, unsigned int size ) { @@ -461,8 +461,6 @@ static void rawinput_update_device_list(void) TRACE( "\n" ); - pthread_mutex_lock( &rawinput_devices_mutex ); - /* destroy previous list */ for (i = 0; i < rawinput_devices_count; ++i) { @@ -475,8 +473,6 @@ static void rawinput_update_device_list(void) enumerate_devices( RIM_TYPEMOUSE, guid_devinterface_mouseW ); enumerate_devices( RIM_TYPEKEYBOARD, guid_devinterface_keyboardW ); enumerate_devices( RIM_TYPEHID, guid_devinterface_hidW ); - - pthread_mutex_unlock( &rawinput_devices_mutex ); } static struct device *find_device_from_handle( HANDLE handle ) @@ -503,14 +499,19 @@ BOOL rawinput_device_get_usages( HANDLE handle, USAGE *usage_page, USAGE *usage { struct device *device; - *usage_page = *usage = 0; + pthread_mutex_lock( &rawinput_mutex ); + + if (!(device = find_device_from_handle( handle )) || device->info.dwType != RIM_TYPEHID) + *usage_page = *usage = 0; + else + { + *usage_page = device->info.hid.usUsagePage; + *usage = device->info.hid.usUsage; + } - if (!(device = find_device_from_handle( handle ))) return FALSE; - if (device->info.dwType != RIM_TYPEHID) return FALSE; + pthread_mutex_unlock( &rawinput_mutex ); - *usage_page = device->info.hid.usUsagePage; - *usage = device->info.hid.usUsage; - return TRUE; + return *usage_page || *usage; } /********************************************************************** @@ -535,12 +536,16 @@ UINT WINAPI NtUserGetRawInputDeviceList( RAWINPUTDEVICELIST *devices, UINT *devi return ~0u; } + pthread_mutex_lock( &rawinput_mutex ); + if (ticks - last_check > 2000) { last_check = ticks; rawinput_update_device_list(); } + pthread_mutex_unlock( &rawinput_mutex ); + if (!devices) { *device_count = rawinput_devices_count; @@ -580,13 +585,23 @@ UINT WINAPI NtUserGetRawInputDeviceInfo( HANDLE handle, UINT command, void *data SetLastError( ERROR_NOACCESS ); return ~0u; } + if (command != RIDI_DEVICENAME && command != RIDI_DEVICEINFO && command != RIDI_PREPARSEDDATA) + { + FIXME( "Command %#x not implemented!\n", command ); + SetLastError( ERROR_INVALID_PARAMETER ); + return ~0u; + } + + pthread_mutex_lock( &rawinput_mutex ); + if (!(device = find_device_from_handle( handle ))) { + pthread_mutex_unlock( &rawinput_mutex ); SetLastError( ERROR_INVALID_HANDLE ); return ~0u; } - data_len = *data_size; + len = data_len = *data_size; switch (command) { case RIDI_DEVICENAME: @@ -612,13 +627,10 @@ UINT WINAPI NtUserGetRawInputDeviceInfo( HANDLE handle, UINT command, void *data memcpy( data, preparsed, len ); *data_size = len; break; - - default: - FIXME( "command %#x not supported\n", command ); - SetLastError( ERROR_INVALID_PARAMETER ); - return ~0u; } + pthread_mutex_unlock( &rawinput_mutex ); + if (!data) return 0; @@ -796,7 +808,9 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d if (msg->message == WM_INPUT_DEVICE_CHANGE) { + pthread_mutex_lock( &rawinput_mutex ); rawinput_update_device_list(); + pthread_mutex_unlock( &rawinput_mutex ); } else {

1 0

Rémi Bernon : win32u: Read rawinput device preparsed data using virtual memory.
by Alexandre Julliard July 27, 2022

July 27, 2022

Module: wine Branch: master Commit: 4c584fe773a75632fbfbb371f23036f8fd1a453c URL: https://gitlab.winehq.org/wine/wine/-/commit/4c584fe773a75632fbfbb371f23036… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 26 09:17:12 2022 +0200 win32u: Read rawinput device preparsed data using virtual memory. --- dlls/dinput/tests/joystick8.c | 12 ++++++------ dlls/win32u/rawinput.c | 21 ++++++++++++++++++--- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 3193ee12ddc..0981d917b2a 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -4308,7 +4308,12 @@ static void test_rawinput(void) count = ARRAY_SIZE(raw_device_list); res = GetRawInputDeviceList( raw_device_list, &count, sizeof(RAWINPUTDEVICELIST) ); - todo_wine + if (!strcmp( winetest_platform, "wine" ) && res == device_count) + { + /* Wine refreshes its device list every 2s, but GetRawInputDeviceInfoW with an unknown handle will force it */ + GetRawInputDeviceInfoW( (HANDLE)0xdeadbeef, RIDI_DEVICEINFO, NULL, &count ); + res = GetRawInputDeviceList( raw_device_list, &count, sizeof(RAWINPUTDEVICELIST) ); + } ok( res == device_count + 1, "GetRawInputDeviceList returned %lu\n", res ); ok( count == ARRAY_SIZE(raw_device_list), "got count %u\n", count ); device_count = res; @@ -4326,9 +4331,7 @@ static void test_rawinput(void) if (wcsstr( path, expect_vidpid_str )) break; } - todo_wine ok( !!wcsstr( path, expect_vidpid_str ), "got path %s\n", debugstr_w(path) ); - if (!wcsstr( path, expect_vidpid_str )) goto done; file = CreateFileW( path, FILE_READ_ACCESS | FILE_WRITE_ACCESS, @@ -4346,12 +4349,9 @@ static void test_rawinput(void) while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); ok( !wm_input_device_change_count, "got %u WM_INPUT_DEVICE_CHANGE\n", wm_input_device_change_count ); - todo_wine ok( wm_input_count == 1, "got %u WM_INPUT\n", wm_input_count ); - todo_wine ok( wm_input_len == offsetof(RAWINPUT, data.hid.bRawData[desc.caps.InputReportByteLength]), "got wm_input_len %u\n", wm_input_len ); - todo_wine ok( !memcmp( rawinput->data.hid.bRawData, injected_input[i].report_buf, desc.caps.InputReportByteLength ), "got unexpected report data\n" ); wm_input_count = 0; diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 6a018e15bb7..dd697017953 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -253,6 +253,8 @@ static struct device *add_device( HKEY key, DWORD type ) NTSTATUS status; unsigned int i; UINT32 handle; + void *buffer; + SIZE_T size; HANDLE file; if (!query_reg_value( key, symbolic_linkW, value, sizeof(value_buffer) )) @@ -327,9 +329,22 @@ static struct device *add_device( HKEY key, DWORD type ) goto fail; } - status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, - IOCTL_HID_GET_COLLECTION_DESCRIPTOR, - NULL, 0, preparsed, hid_info.DescriptorSize ); + /* NtDeviceIoControlFile checks that the output buffer is writable using ntdll virtual + * memory protection information, we need an NtAllocateVirtualMemory allocated buffer. + */ + buffer = NULL; + size = hid_info.DescriptorSize; + if (!(status = NtAllocateVirtualMemory( GetCurrentProcess(), &buffer, 0, &size, + MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE ))) + { + size = 0; + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_HID_GET_COLLECTION_DESCRIPTOR, + NULL, 0, buffer, hid_info.DescriptorSize ); + if (!status) memcpy( preparsed, buffer, hid_info.DescriptorSize ); + NtFreeVirtualMemory( GetCurrentProcess(), &buffer, &size, MEM_RELEASE ); + } + if (status) { ERR( "Failed to get collection descriptor, status %#x.\n", status );

1 0

Jacek Caban : winevulkan: Remove __wine_get_vulkan_driver PE entry point.
by Alexandre Julliard July 27, 2022

July 27, 2022

Module: wine Branch: master Commit: 68bb2f62e9b153a61f0f7f14a8fe0b954710f2cd URL: https://gitlab.winehq.org/wine/wine/-/commit/68bb2f62e9b153a61f0f7f14a8fe0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 25 22:08:03 2022 +0200 winevulkan: Remove __wine_get_vulkan_driver PE entry point. --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/vulkan.c | 8 +++++--- dlls/win32u/win32u.spec | 3 --- dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ dlls/winevulkan/make_vulkan | 4 ++-- dlls/winevulkan/vulkan.c | 2 +- dlls/winevulkan/vulkan_loader.h | 1 - include/wine/gdi_driver.h | 1 - include/wine/vulkan_driver.h | 4 ++-- 10 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index cb5297c5676..aaeed2ba676 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1149,7 +1149,6 @@ static struct unix_funcs unix_funcs = __wine_get_brush_bitmap_info, __wine_get_file_outline_text_metric, __wine_get_icm_profile, - __wine_get_vulkan_driver, __wine_get_wgl_driver, __wine_send_input, }; diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 8f85f4e4632..c66be5bc7ed 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -22,12 +22,14 @@ #pragma makedep unix #endif -#include "ntgdi_private.h" +#include "win32u_private.h" +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" /*********************************************************************** - * __wine_get_vulkan_driver (win32u.@) + * __wine_get_vulkan_driver (win32u.so) */ -const struct vulkan_funcs * CDECL __wine_get_vulkan_driver( UINT version ) +const struct vulkan_funcs *__wine_get_vulkan_driver( UINT version ) { return user_driver->pwine_get_vulkan_driver( version ); } diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 979fa8475b2..3054bed8347 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1326,9 +1326,6 @@ # OpenGL @ cdecl __wine_get_wgl_driver(long long) -# Vulkan -@ cdecl __wine_get_vulkan_driver(long) - # gdi32 @ stdcall SetDIBits(long long long long ptr ptr long) @ cdecl __wine_get_brush_bitmap_info(long ptr ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d8509c83445..6e9a1926891 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -207,7 +207,6 @@ struct unix_funcs BOOL (CDECL *get_brush_bitmap_info)( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ); BOOL (CDECL *get_file_outline_text_metric)( const WCHAR *path, OUTLINETEXTMETRICW *otm ); BOOL (CDECL *get_icm_profile)( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ); - const struct vulkan_funcs * (CDECL *get_vulkan_driver)( UINT version ); struct opengl_funcs * (CDECL *get_wgl_driver)( HDC hdc, UINT version ); BOOL (CDECL *wine_send_input)( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); }; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index f331039714e..c5078c8a7f7 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -798,12 +798,6 @@ BOOL CDECL __wine_get_file_outline_text_metric( const WCHAR *path, OUTLINETEXTME return unix_funcs->get_file_outline_text_metric( path, otm ); } -const struct vulkan_funcs * CDECL __wine_get_vulkan_driver(UINT version) -{ - if (!unix_funcs) return NULL; - return unix_funcs->get_vulkan_driver( version ); -} - struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) { if (!unix_funcs) return NULL; diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5dd5fbcf578..2eeff42c56e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -156,7 +156,7 @@ DIRECT_CALL_FUNCTIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 10 +DRIVER_VERSION = 11 class ThunkType(Enum): NONE = 1 @@ -3202,7 +3202,7 @@ class VkGenerator(object): f.write(" VkSurfaceKHR (*p_wine_get_native_surface)(VkSurfaceKHR);\n") f.write("};\n\n") - f.write("extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver(UINT version);\n\n") + f.write("extern const struct vulkan_funcs * __wine_get_vulkan_driver(UINT version);\n\n") f.write("static inline void *get_vulkan_driver_device_proc_addr(\n") f.write(" const struct vulkan_funcs *vulkan_funcs, const char *name)\n{\n") diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 071dbd4cdff..da89cdd5ba2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include "vulkan_private.h" -#include "winreg.h" +#include "wine/vulkan_driver.h" #include "ntuser.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index 2efa56e0193..3ba945dbfcc 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -28,7 +28,6 @@ #include "winternl.h" #include "wine/debug.h" #include "wine/vulkan.h" -#include "wine/vulkan_driver.h" #include "wine/unixlib.h" #include "loader_thunks.h" diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 9acfaf1f65f..58b6aa9f0b8 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -339,6 +339,5 @@ extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT #endif /* WINE_UNIX_LIB */ extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); -extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver( UINT version ); #endif /* __WINE_WINE_GDI_DRIVER_H */ diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 110716e3160..f5269d554fb 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -13,7 +13,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 10 +#define WINE_VULKAN_DRIVER_VERSION 11 struct vulkan_funcs { @@ -46,7 +46,7 @@ struct vulkan_funcs VkSurfaceKHR (*p_wine_get_native_surface)(VkSurfaceKHR); }; -extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver(UINT version); +extern const struct vulkan_funcs * __wine_get_vulkan_driver(UINT version); static inline void *get_vulkan_driver_device_proc_addr( const struct vulkan_funcs *vulkan_funcs, const char *name)

1 0

Jacek Caban : winevulkan: Use syscall interface for driver functions.
by Alexandre Julliard July 27, 2022

July 27, 2022

Module: wine Branch: master Commit: bb94ec19435be0668dda5a74e1b544de97345cb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb94ec19435be0668dda5a74e1b544… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 25 20:21:24 2022 +0200 winevulkan: Use syscall interface for driver functions. --- dlls/winevulkan/loader_thunks.c | 34 +++++++++++++++++----------------- dlls/winevulkan/make_vulkan | 8 ++------ 2 files changed, 19 insertions(+), 23 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Implement removeAttributeNS for Elements.
by Alexandre Julliard July 27, 2022

July 27, 2022

Module: wine Branch: master Commit: e3b9db5af56c8ec76cf6b1722538fc4a80c7d3ba URL: https://gitlab.winehq.org/wine/wine/-/commit/e3b9db5af56c8ec76cf6b1722538fc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jul 27 21:33:35 2022 +0300 mshtml: Implement removeAttributeNS for Elements. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 52 +++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/documentmode.js | 32 ++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 18f566e70ed..0e24346c93a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4886,8 +4886,26 @@ static HRESULT WINAPI HTMLElement6_setAttributeNS(IHTMLElement6 *iface, VARIANT static HRESULT WINAPI HTMLElement6_removeAttributeNS(IHTMLElement6 *iface, VARIANT *pvarNS, BSTR strAttributeName) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_variant(pvarNS), debugstr_w(strAttributeName)); - return E_NOTIMPL; + nsAString ns_str, name_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %s)\n", This, debugstr_variant(pvarNS), debugstr_w(strAttributeName)); + + if(!This->dom_element) { + FIXME("No dom_element\n"); + return E_NOTIMPL; + } + + hres = variant_to_nsstr(pvarNS, FALSE, &ns_str); + if(FAILED(hres)) + return hres; + + nsAString_InitDepend(&name_str, strAttributeName); + nsres = nsIDOMElement_RemoveAttributeNS(This->dom_element, &ns_str, &name_str); + nsAString_Finish(&ns_str); + nsAString_Finish(&name_str); + return map_nsresult(nsres); } static HRESULT WINAPI HTMLElement6_getAttributeNodeNS(IHTMLElement6 *iface, VARIANT *pvarNS, BSTR name, IHTMLDOMAttribute2 **ppretAttribute) @@ -6934,6 +6952,35 @@ static HRESULT IHTMLElement6_setAttributeNS_hook(DispatchEx *dispex, WORD flags, return hres; } +static HRESULT IHTMLElement6_removeAttributeNS_hook(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + VARIANT args[2]; + HRESULT hres; + DISPPARAMS new_dp = { args, NULL, 2, 0 }; + + if(!(flags & DISPATCH_METHOD) || dp->cArgs < 2 || dp->cNamedArgs) + return S_FALSE; + + switch(V_VT(&dp->rgvarg[dp->cArgs - 1])) { + case VT_EMPTY: + case VT_BSTR: + case VT_NULL: + return S_FALSE; + default: + break; + } + + hres = change_type(&args[1], &dp->rgvarg[dp->cArgs - 1], VT_BSTR, caller); + if(FAILED(hres)) + return hres; + args[0] = dp->rgvarg[dp->cArgs - 2]; + + hres = dispex_call_builtin(dispex, DISPID_IHTMLELEMENT6_REMOVEATTRIBUTENS, &new_dp, res, ei, caller); + VariantClear(&args[1]); + return hres; +} + static HRESULT IHTMLElement6_setAttribute_hook(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { @@ -6972,6 +7019,7 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) static const dispex_hook_t elem6_ie10_hooks[] = { {DISPID_IHTMLELEMENT6_GETATTRIBUTENS, IHTMLElement6_getAttributeNS_hook}, {DISPID_IHTMLELEMENT6_SETATTRIBUTENS, IHTMLElement6_setAttributeNS_hook}, + {DISPID_IHTMLELEMENT6_REMOVEATTRIBUTENS, IHTMLElement6_removeAttributeNS_hook}, {DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, IHTMLElement6_setAttribute_hook}, {DISPID_UNKNOWN} }; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 9e7c3ac1d9d..32b74677822 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1480,6 +1480,7 @@ sync_test("elem_attrNS", function() { ok(r === "", "specialspace spec:align (non-NS) = " + r); r = elem.getAttributeNS(specialspace_ns, "align"); ok(r === "left", "specialspace align (non-NS) = " + r); + elem.removeAttributeNS(null, "spec:align"); elem.setAttribute("emptynsattr", "none"); elem.setAttributeNS("", "emptynsattr", "test"); @@ -1498,6 +1499,30 @@ sync_test("elem_attrNS", function() { r = elem.getAttributeNS(specialspace_ns, "emptynsattr"); ok(r === "ns", "emptynsattr specialspace ns = " + r); + elem.removeAttributeNS("", "emptynsattr"); + r = elem.getAttribute("emptynsattr"); + ok(r === "ns", "emptynsattr without NS after remove = " + r); + r = elem.getAttributeNS(specialspace_ns, "emptynsattr"); + ok(r === "ns", "emptynsattr specialspace ns after empty remove = " + r); + elem.setAttribute("emptynsattr", "test"); + r = elem.getAttribute("emptynsattr"); + ok(r === "test", "emptynsattr without NS after re-set = " + r); + r = elem.getAttributeNS(specialspace_ns, "emptynsattr"); + ok(r === "test", "emptynsattr specialspace ns after empty re-set = " + r); + + elem.removeAttribute("emptynsattr"); + r = elem.getAttribute("emptynsattr"); + ok(r === null, "emptynsattr without NS after non-NS remove = " + r); + r = elem.getAttributeNS(specialspace_ns, "emptynsattr"); + ok(r === "", "emptynsattr specialspace ns after non-NS remove = " + r); + + elem.setAttributeNS(specialspace_ns, "emptynsattr", "ns"); + elem.removeAttributeNS(svg_ns, "emptynsattr"); + r = elem.getAttributeNS(specialspace_ns, "emptynsattr"); + ok(r === "ns", "emptynsattr specialspace ns after wrong NS remove = " + r); + r = elem.getAttributeNS(specialspace_ns, "emptynsattr"); + ok(r === "ns", "emptynsattr specialspace ns after remove = " + r); + var ns = {}; ns.toString = function() { return "toString namespace"; } ns.valueOf = function() { return "valueOf namespace"; } @@ -1516,16 +1541,23 @@ sync_test("elem_attrNS", function() { r = elem.getAttributeNS(svg_ns, "testattr"); ok(r === "3", "testattr = " + r); ok(elem.testattr === undefined, "elem.testattr = " + elem.testattr); + elem.removeAttributeNS(svg_ns, "testattr"); + r = elem.getAttributeNS(svg_ns, "testattr"); + ok(r === "", "testattr after remove = " + r); arr.toString = function() { return 42; } elem.setAttributeNS(svg_ns, "testattr", arr); r = elem.getAttributeNS(svg_ns, "testattr"); ok(r === "42", "testattr with custom toString = " + r); + elem.removeAttributeNS(svg_ns, "testattr"); + r = elem.getAttributeNS(svg_ns, "testattr"); + ok(r === "", "testattr with custom toString after remove = " + r); arr.valueOf = function() { return "arrval"; } elem.setAttributeNS(svg_ns, "testattr", arr); r = elem.getAttributeNS(svg_ns, "testattr"); ok(r === "42", "testattr with custom valueOf = " + r); + elem.removeAttributeNS(svg_ns, "testattr"); elem.setAttributeNS(svg_ns, "boolattr", true); r = elem.getAttributeNS(svg_ns, "boolattr");

1 0

Rémi Bernon : winemac.drv: Introduce new display_mode_to_devmode helper.
by Alexandre Julliard July 27, 2022

July 27, 2022

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 : winex11.drv: Set desktop settings handler before updating display devices.
by Alexandre Julliard July 27, 2022

July 27, 2022

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

Jacek Caban : vulkan-1: Make sure that user32 is loaded before ICD.
by Alexandre Julliard July 27, 2022

July 27, 2022

Module: wine Branch: master Commit: 35413f9217e56209784032f749b97c481d3b4c84 URL: https://gitlab.winehq.org/wine/wine/-/commit/35413f9217e56209784032f749b97c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 22:49:28 2022 +0200 vulkan-1: Make sure that user32 is loaded before ICD. --- dlls/vulkan-1/Makefile.in | 5 ++++- dlls/vulkan-1/vulkan.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in index a4a10bc8e93..9c4dca9a880 100644 --- a/dlls/vulkan-1/Makefile.in +++ b/dlls/vulkan-1/Makefile.in @@ -1,7 +1,10 @@ MODULE = vulkan-1.dll -IMPORTS = winevulkan +IMPORTS = user32 IMPORTLIB = vulkan-1 EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc + +C_SRCS = \ + vulkan.c diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c new file mode 100644 index 00000000000..ab40260d9bd --- /dev/null +++ b/dlls/vulkan-1/vulkan.c @@ -0,0 +1,30 @@ +/* + * Copyright 2022 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include "wine/debug.h" + + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) +{ + if (reason != DLL_PROCESS_ATTACH) return TRUE; + + DisableThreadLibraryCalls(hinst); + GetDpiForSystem(); /* make sure that user32 is loaded */ + return TRUE; +}

1 0

Rémi Bernon : win32u: Read and cache adapter modes from the registry.
by Alexandre Julliard July 27, 2022

July 27, 2022

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