March 2024 - Wine-commits - list.winehq.org

Rémi Bernon : winevulkan: Introduce a new get_host_surface_extension driver entry.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: c7da2450c9d05a4957bf9f2d42990826f26dff6f URL: https://gitlab.winehq.org/wine/wine/-/commit/c7da2450c9d05a4957bf9f2d429908… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 12:38:06 2024 +0100 winevulkan: Introduce a new get_host_surface_extension driver entry. --- dlls/winemac.drv/vulkan.c | 6 ++++++ dlls/winevulkan/vulkan.c | 28 ++++++++++++++++++---------- dlls/winewayland.drv/vulkan.c | 6 ++++++ dlls/winex11.drv/vulkan.c | 6 ++++++ include/wine/vulkan_driver.h | 1 + 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index e76422280af..63c4896e54d 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -361,6 +361,11 @@ static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * return res; } +static const char *macdrv_get_host_surface_extension(void) +{ + return pvkCreateMetalSurfaceEXT ? "VK_EXT_metal_surface" : "VK_MVK_macos_surface"; +} + static VkSurfaceKHR macdrv_wine_get_host_surface(VkSurfaceKHR surface) { struct wine_vk_surface *mac_surface = surface_from_handle(surface); @@ -384,6 +389,7 @@ static const struct vulkan_funcs vulkan_funcs = macdrv_vkGetSwapchainImagesKHR, macdrv_vkQueuePresentKHR, + macdrv_get_host_surface_extension, macdrv_wine_get_host_surface, }; diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index fd1d2006318..8a022195ec2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -571,6 +571,7 @@ static VkResult wine_vk_instance_convert_create_info(struct conversion_context * { VkDebugUtilsMessengerCreateInfoEXT *debug_utils_messenger; VkDebugReportCallbackCreateInfoEXT *debug_report_callback; + const char **new_extensions; VkBaseInStructure *header; unsigned int i; @@ -614,39 +615,46 @@ static VkResult wine_vk_instance_convert_create_info(struct conversion_context * return VK_ERROR_LAYER_NOT_PRESENT; } - TRACE("Enabled %u instance extensions.\n", dst->enabledExtensionCount); - for (i = 0; i < dst->enabledExtensionCount; i++) + for (i = 0; i < src->enabledExtensionCount; i++) { - const char *extension_name = dst->ppEnabledExtensionNames[i]; + const char *extension_name = src->ppEnabledExtensionNames[i]; TRACE("Extension %u: %s.\n", i, debugstr_a(extension_name)); if (!wine_vk_instance_extension_supported(extension_name)) { WARN("Extension %s is not supported.\n", debugstr_a(extension_name)); return VK_ERROR_EXTENSION_NOT_PRESENT; } + } + + new_extensions = conversion_context_alloc(ctx, (src->enabledExtensionCount + 2) * + sizeof(*src->ppEnabledExtensionNames)); + memcpy(new_extensions, src->ppEnabledExtensionNames, + dst->enabledExtensionCount * sizeof(*dst->ppEnabledExtensionNames)); + dst->ppEnabledExtensionNames = new_extensions; + dst->enabledExtensionCount = src->enabledExtensionCount; + + for (i = 0; i < dst->enabledExtensionCount; i++) + { + const char *extension_name = dst->ppEnabledExtensionNames[i]; if (!strcmp(extension_name, "VK_EXT_debug_utils") || !strcmp(extension_name, "VK_EXT_debug_report")) { object->enable_wrapper_list = VK_TRUE; } if (!strcmp(extension_name, "VK_KHR_win32_surface")) { + new_extensions[i] = vk_funcs->p_get_host_surface_extension(); object->enable_win32_surface = VK_TRUE; } } if (use_external_memory()) { - const char **new_extensions; - - new_extensions = conversion_context_alloc(ctx, (dst->enabledExtensionCount + 2) * - sizeof(*dst->ppEnabledExtensionNames)); - memcpy(new_extensions, src->ppEnabledExtensionNames, - dst->enabledExtensionCount * sizeof(*dst->ppEnabledExtensionNames)); new_extensions[dst->enabledExtensionCount++] = "VK_KHR_get_physical_device_properties2"; new_extensions[dst->enabledExtensionCount++] = "VK_KHR_external_memory_capabilities"; - dst->ppEnabledExtensionNames = new_extensions; } + TRACE("Enabled %u instance extensions.\n", dst->enabledExtensionCount); + return VK_SUCCESS; } diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index c7cbdc90e28..6bac804a118 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -469,6 +469,11 @@ static VkResult wayland_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR return check_queue_present(present_info, res); } +static const char *wayland_get_host_surface_extension(void) +{ + return "VK_KHR_wayland_surface"; +} + static VkSurfaceKHR wayland_wine_get_host_surface(VkSurfaceKHR surface) { return wine_vk_surface_from_handle(surface)->host_surface; @@ -485,6 +490,7 @@ static const struct vulkan_funcs vulkan_funcs = .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR, .p_vkGetSwapchainImagesKHR = wayland_vkGetSwapchainImagesKHR, .p_vkQueuePresentKHR = wayland_vkQueuePresentKHR, + .p_get_host_surface_extension = wayland_get_host_surface_extension, .p_wine_get_host_surface = wayland_wine_get_host_surface, }; diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 6216a7eb5e8..31bfdb98f86 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -396,6 +396,11 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * return res; } +static const char *X11DRV_get_host_surface_extension(void) +{ + return "VK_KHR_xlib_surface"; +} + static VkSurfaceKHR X11DRV_wine_get_host_surface( VkSurfaceKHR surface ) { struct wine_vk_surface *x11_surface = surface_from_handle(surface); @@ -419,6 +424,7 @@ static const struct vulkan_funcs vulkan_funcs = X11DRV_vkGetSwapchainImagesKHR, X11DRV_vkQueuePresentKHR, + X11DRV_get_host_surface_extension, X11DRV_wine_get_host_surface, }; diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 495331e397d..cd76dcbbcc2 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -42,6 +42,7 @@ struct vulkan_funcs VkResult (*p_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); /* winevulkan specific functions */ + const char *(*p_get_host_surface_extension)(void); VkSurfaceKHR (*p_wine_get_host_surface)(VkSurfaceKHR); };

1 0

Rémi Bernon : winevulkan: Remove now unnecessary vkCreateInstance driver entry.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: a875c18552743243dadf6c60cf79d69ddef2974a URL: https://gitlab.winehq.org/wine/wine/-/commit/a875c18552743243dadf6c60cf79d6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 27 08:46:29 2024 +0100 winevulkan: Remove now unnecessary vkCreateInstance driver entry. --- dlls/win32u/d3dkmt.c | 4 ++- dlls/win32u/vulkan.c | 2 -- dlls/winemac.drv/vulkan.c | 78 ------------------------------------------- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan.c | 4 ++- dlls/winewayland.drv/vulkan.c | 74 ---------------------------------------- dlls/winex11.drv/vulkan.c | 78 ------------------------------------------- dlls/winex11.drv/xrandr.c | 17 ++++++---- include/wine/vulkan_driver.h | 3 +- 9 files changed, 17 insertions(+), 244 deletions(-)

1 0

Rémi Bernon : winevulkan: Remove now unnecessary vkDestroyInstance driver entry.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 69b049d1b6bb68c6eaabcc270b747fd7f7a0cc32 URL: https://gitlab.winehq.org/wine/wine/-/commit/69b049d1b6bb68c6eaabcc270b747f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 12:39:47 2024 +0100 winevulkan: Remove now unnecessary vkDestroyInstance driver entry. --- dlls/win32u/d3dkmt.c | 4 +++- dlls/win32u/vulkan.c | 1 - dlls/winemac.drv/vulkan.c | 13 ------------- dlls/winevulkan/make_vulkan | 2 -- dlls/winevulkan/vulkan.c | 4 ++-- dlls/winevulkan/vulkan_thunks.h | 2 ++ dlls/winewayland.drv/vulkan.c | 14 -------------- dlls/winex11.drv/vulkan.c | 13 ------------- dlls/winex11.drv/xrandr.c | 6 +++++- include/wine/vulkan_driver.h | 3 +-- 10 files changed, 13 insertions(+), 49 deletions(-)

1 0

Rémi Bernon : win32u: Use named adapters instead of struct gdi_adapter.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: fecfb442405011f123d2458aac7c42d9f1a28330 URL: https://gitlab.winehq.org/wine/wine/-/commit/fecfb442405011f123d2458aac7c42… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 27 08:57:10 2024 +0100 win32u: Use named adapters instead of struct gdi_adapter. --- dlls/win32u/sysparams.c | 39 +++++++++++++++------------------------ dlls/wineandroid.drv/init.c | 7 ++----- dlls/winemac.drv/display.c | 10 ++++------ dlls/winewayland.drv/display.c | 21 +++++++-------------- dlls/winex11.drv/display.c | 7 ++++--- dlls/winex11.drv/x11drv.h | 10 ++++++++-- dlls/winex11.drv/xinerama.c | 8 ++++---- dlls/winex11.drv/xrandr.c | 10 +++++----- include/wine/gdi_driver.h | 8 +------- 9 files changed, 50 insertions(+), 70 deletions(-)

1 0

Rémi Bernon : win32u: Rename struct adapter to struct source.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: c635a25f216552034055d4f56aee0804c8d5f39f URL: https://gitlab.winehq.org/wine/wine/-/commit/c635a25f216552034055d4f56aee08… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 17:45:29 2024 +0100 win32u: Rename struct adapter to struct source. To match the D3DKMT terminology and avoid confusion between the GPUs, which are called adapter there. --- dlls/win32u/sysparams.c | 476 ++++++++++++++++++++--------------------- dlls/wineandroid.drv/init.c | 2 +- dlls/winemac.drv/display.c | 2 +- dlls/winewayland.drv/display.c | 6 +- dlls/winex11.drv/display.c | 2 +- include/wine/gdi_driver.h | 2 +- 6 files changed, 244 insertions(+), 246 deletions(-)

1 0

Paul Gofman : ddraw: Don't demand WINED3D_BIND_SHADER_RESOURCE for making surface in vidmem.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 11949950509a8cc569f1c28e39d6bdcda52eb5d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/11949950509a8cc569f1c28e39d6bd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 21 17:45:47 2024 -0600 ddraw: Don't demand WINED3D_BIND_SHADER_RESOURCE for making surface in vidmem. --- dlls/ddraw/surface.c | 10 +++++++++- dlls/ddraw/tests/ddraw1.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr7.c | 6 ++++-- 6 files changed, 193 insertions(+), 3 deletions(-)

1 0

Piotr Caban : gdi32: Implicitly call StartPage in ExtEscape on printer DC.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 2546468b4ce14a118fa1771bdc2d54db0668d07a URL: https://gitlab.winehq.org/wine/wine/-/commit/2546468b4ce14a118fa1771bdc2d54… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 13:22:02 2024 +0100 gdi32: Implicitly call StartPage in ExtEscape on printer DC. --- dlls/gdi32/dc.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 87335469b9b..0a57d74485e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -743,16 +743,31 @@ INT WINAPI Escape( HDC hdc, INT escape, INT in_count, const char *in_data, void INT WINAPI ExtEscape( HDC hdc, INT escape, INT input_size, const char *input, INT output_size, char *output ) { - struct print *print; DC_ATTR *dc_attr; if (is_meta_dc( hdc )) return METADC_ExtEscape( hdc, escape, input_size, input, output_size, output ); if (!(dc_attr = get_dc_attr( hdc ))) return 0; - if ((print = get_dc_print( dc_attr )) && dc_attr->emf) + if (dc_attr->print) { - int ret = EMFDC_ExtEscape( dc_attr, escape, input_size, input, output_size, output ); - if (ret) return ret; + switch (escape) + { + case PASSTHROUGH: + case POSTSCRIPT_DATA: + case GETFACENAME: + case DOWNLOADFACE: + case BEGIN_PATH: + case CLIP_TO_PATH: + case END_PATH: + case DOWNLOADHEADER: + print_call_start_page( dc_attr ); + } + + if (dc_attr->emf) + { + int ret = EMFDC_ExtEscape( dc_attr, escape, input_size, input, output_size, output ); + if (ret) return ret; + } } return NtGdiExtEscape( hdc, NULL, 0, escape, input_size, input, output_size, output ); }

1 0

Rémi Bernon : win32u: Split writing adapter to registry to a separate helper.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: c6e328c2d02ec4ec5a6f8e96de661589e7c5ee30 URL: https://gitlab.winehq.org/wine/wine/-/commit/c6e328c2d02ec4ec5a6f8e96de6615… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 16:38:50 2024 +0100 win32u: Split writing adapter to registry to a separate helper. --- dlls/win32u/sysparams.c | 70 +++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 29 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 0122c8b0b13..66c68e23d10 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1257,14 +1257,45 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) ctx->gpu_count++; } -static void add_adapter( const struct gdi_adapter *adapter, void *param ) +static BOOL write_adapter_to_registry( const struct adapter *adapter, HKEY *adapter_key ) { - struct device_manager_ctx *ctx = param; - unsigned int adapter_index, len; + struct gpu *gpu = adapter->gpu; + unsigned int len, adapter_index = gpu->adapter_count; char name[64], buffer[MAX_PATH]; WCHAR bufferW[MAX_PATH]; HKEY hkey; + sprintf( buffer, "%s\\Video\\%s\\%04x", control_keyA, gpu->guid, adapter_index ); + len = asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR); + + hkey = reg_create_ascii_key( NULL, buffer, REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, NULL ); + if (!hkey) hkey = reg_create_ascii_key( NULL, buffer, REG_OPTION_VOLATILE | REG_OPTION_OPEN_LINK, NULL ); + + sprintf( name, "\\Device\\Video%u", adapter->id ); + set_reg_ascii_value( video_key, name, buffer ); + + if (!hkey) return FALSE; + + sprintf( buffer, "%s\\Class\\%s\\%04X", control_keyA, guid_devclass_displayA, gpu->index ); + len = asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR); + set_reg_value( hkey, symbolic_link_valueW, REG_LINK, bufferW, len ); + NtClose( hkey ); + + /* Following information is Wine specific, it doesn't really exist on Windows. */ + sprintf( buffer, "System\\CurrentControlSet\\Control\\Video\\%s\\%04x", gpu->guid, adapter_index ); + *adapter_key = reg_create_ascii_key( config_key, buffer, REG_OPTION_VOLATILE, NULL ); + + set_reg_ascii_value( *adapter_key, "GPUID", gpu->path ); + set_reg_value( *adapter_key, state_flagsW, REG_DWORD, &adapter->state_flags, + sizeof(adapter->state_flags) ); + + return TRUE; +} + +static void add_adapter( const struct gdi_adapter *adapter, void *param ) +{ + struct device_manager_ctx *ctx = param; + TRACE( "\n" ); if (ctx->adapter_key) @@ -1273,37 +1304,18 @@ static void add_adapter( const struct gdi_adapter *adapter, void *param ) ctx->adapter_key = NULL; } - adapter_index = ctx->gpu.adapter_count++; - memset( &ctx->adapter, 0, sizeof(ctx->adapter) ); ctx->adapter.gpu = &ctx->gpu; - ctx->adapter.id = ctx->adapter_count++; - - snprintf( buffer, ARRAY_SIZE(buffer), "%s\\Video\\%s\\%04x", control_keyA, ctx->gpu.guid, adapter_index ); - len = asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR); + ctx->adapter.id = ctx->adapter_count; + ctx->adapter.state_flags = adapter->state_flags; - hkey = reg_create_ascii_key( NULL, buffer, REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, NULL ); - if (!hkey) hkey = reg_create_ascii_key( NULL, buffer, REG_OPTION_VOLATILE | REG_OPTION_OPEN_LINK, NULL ); - - sprintf( name, "\\Device\\Video%u", ctx->adapter.id ); - set_reg_ascii_value( video_key, name, buffer ); - - if (hkey) + if (!write_adapter_to_registry( &ctx->adapter, &ctx->adapter_key )) + WARN( "Failed to write adapter to registry\n" ); + else { - sprintf( buffer, "%s\\Class\\%s\\%04X", control_keyA, guid_devclass_displayA, ctx->gpu.index ); - len = asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR); - set_reg_value( hkey, symbolic_link_valueW, REG_LINK, bufferW, len ); - NtClose( hkey ); + ctx->gpu.adapter_count++; + ctx->adapter_count++; } - else ERR( "failed to create link key\n" ); - - /* Following information is Wine specific, it doesn't really exist on Windows. */ - snprintf( buffer, ARRAY_SIZE(buffer), "System\\CurrentControlSet\\Control\\Video\\%s\\%04x", ctx->gpu.guid, adapter_index ); - ctx->adapter_key = reg_create_ascii_key( config_key, buffer, REG_OPTION_VOLATILE, NULL ); - - set_reg_ascii_value( ctx->adapter_key, "GPUID", ctx->gpu.path ); - set_reg_value( ctx->adapter_key, state_flagsW, REG_DWORD, &adapter->state_flags, - sizeof(adapter->state_flags) ); } static BOOL write_monitor_to_registry( struct monitor *monitor, const BYTE *edid, UINT edid_len )

1 0

Rémi Bernon : win32u: Use a symlink for the logically indexed adapter config key.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 00a0c97879e986616bacf79c99cb7b8b6dd7b007 URL: https://gitlab.winehq.org/wine/wine/-/commit/00a0c97879e986616bacf79c99cb7b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 17:20:12 2024 +0100 win32u: Use a symlink for the logically indexed adapter config key. Linking it to what will be a physically identified adapter config key. --- dlls/win32u/sysparams.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 66c68e23d10..15c4af1d07a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -109,10 +109,10 @@ struct adapter { LONG refcount; struct list entry; + char path[MAX_PATH]; unsigned int id; struct gpu *gpu; UINT state_flags; - WCHAR config_key[MAX_PATH]; UINT monitor_count; UINT mode_count; DEVMODEW *modes; @@ -447,7 +447,7 @@ static BOOL adapter_get_registry_settings( const struct adapter *adapter, DEVMOD mutex = get_display_device_init_mutex(); - if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + if (!(hkey = reg_open_ascii_key( config_key, adapter->path ))) ret = FALSE; else { ret = read_adapter_mode( hkey, ENUM_REGISTRY_SETTINGS, mode ); @@ -466,7 +466,7 @@ static BOOL adapter_set_registry_settings( const struct adapter *adapter, const mutex = get_display_device_init_mutex(); - if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + if (!(hkey = reg_open_ascii_key( config_key, adapter->path ))) ret = FALSE; else { ret = write_adapter_mode( hkey, ENUM_REGISTRY_SETTINGS, mode ); @@ -499,7 +499,7 @@ static BOOL adapter_get_current_settings( const struct adapter *adapter, DEVMODE mutex = get_display_device_init_mutex(); - if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + if (!(hkey = reg_open_ascii_key( config_key, adapter->path ))) ret = FALSE; else { ret = read_adapter_mode( hkey, ENUM_CURRENT_SETTINGS, mode ); @@ -518,7 +518,7 @@ static BOOL adapter_set_current_settings( const struct adapter *adapter, const D mutex = get_display_device_init_mutex(); - if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + if (!(hkey = reg_open_ascii_key( config_key, adapter->path ))) ret = FALSE; else { ret = write_adapter_mode( hkey, ENUM_CURRENT_SETTINGS, mode ); @@ -618,17 +618,13 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i /* Find adapter */ sprintf( buffer, "\\Device\\Video%d", index ); size = query_reg_ascii_value( video_key, buffer, value, sizeof(buffer) ); - if (!size || value->Type != REG_SZ || - value->DataLength <= sizeof("\\Registry\\Machine\\") * sizeof(WCHAR)) - return FALSE; + if (!size || value->Type != REG_SZ) return FALSE; /* DeviceKey */ - size = sizeof("\\Registry\\Machine\\") - 1; - memcpy( info->config_key, value_str + size, value->DataLength - size ); - - if (!(hkey = reg_open_key( config_key, info->config_key, - lstrlenW( info->config_key ) * sizeof(WCHAR) ))) - return FALSE; + size = sizeof("\\Registry\\Machine"); + if (value->DataLength / sizeof(WCHAR) <= size) return FALSE; + for (i = 0; i < value->DataLength / sizeof(WCHAR) - size; i++) info->path[i] = value_str[size + i]; + if (!(hkey = reg_open_ascii_key( config_key, info->path ))) return FALSE; /* StateFlags */ if (query_reg_ascii_value( hkey, "StateFlags", value, sizeof(buffer) ) && value->Type == REG_DWORD) @@ -1282,13 +1278,19 @@ static BOOL write_adapter_to_registry( const struct adapter *adapter, HKEY *adap NtClose( hkey ); /* Following information is Wine specific, it doesn't really exist on Windows. */ - sprintf( buffer, "System\\CurrentControlSet\\Control\\Video\\%s\\%04x", gpu->guid, adapter_index ); - *adapter_key = reg_create_ascii_key( config_key, buffer, REG_OPTION_VOLATILE, NULL ); - + *adapter_key = reg_create_ascii_key( NULL, adapter->path, REG_OPTION_VOLATILE, NULL ); set_reg_ascii_value( *adapter_key, "GPUID", gpu->path ); set_reg_value( *adapter_key, state_flagsW, REG_DWORD, &adapter->state_flags, sizeof(adapter->state_flags) ); + sprintf( buffer, "System\\CurrentControlSet\\Control\\Video\\%s\\%04x", gpu->guid, adapter_index ); + hkey = reg_create_ascii_key( config_key, buffer, REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, NULL ); + if (!hkey) hkey = reg_create_ascii_key( config_key, buffer, REG_OPTION_VOLATILE | REG_OPTION_OPEN_LINK, NULL ); + + len = asciiz_to_unicode( bufferW, adapter->path ) - sizeof(WCHAR); + set_reg_value( hkey, symbolic_link_valueW, REG_LINK, bufferW, len ); + NtClose( hkey ); + return TRUE; } @@ -1309,6 +1311,10 @@ static void add_adapter( const struct gdi_adapter *adapter, void *param ) ctx->adapter.id = ctx->adapter_count; ctx->adapter.state_flags = adapter->state_flags; + /* Wine specific config key where adapter settings will be held, symlinked with the logically indexed config key */ + sprintf( ctx->adapter.path, "%s\\%s\\Video\\%s\\Adapters\\%04x", config_keyA, + control_keyA + strlen( "\\Registry\\Machine" ), ctx->gpu.guid, ctx->gpu.adapter_count ); + if (!write_adapter_to_registry( &ctx->adapter, &ctx->adapter_key )) WARN( "Failed to write adapter to registry\n" ); else @@ -1695,9 +1701,7 @@ static BOOL update_display_cache_from_registry(void) } list_add_tail( &adapters, &adapter->entry ); - - size = lstrlenW( adapter->config_key ) * sizeof(WCHAR); - if (!(hkey = reg_open_key( config_key, adapter->config_key, size ))) continue; + if (!(hkey = reg_open_ascii_key( config_key, adapter->path ))) continue; for (monitor_id = 0;; monitor_id++) {

1 0

Alexandre Julliard : widl: Merge interpreted stubs header and parameters output into a single function.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 7ff6c6316ecf1b498059eecfc78ba834937af34f URL: https://gitlab.winehq.org/wine/wine/-/commit/7ff6c6316ecf1b498059eecfc78ba8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 28 08:51:01 2024 +0100 widl: Merge interpreted stubs header and parameters output into a single function. --- tools/widl/typegen.c | 76 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 22 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 14d8906173b..824ba5d4a89 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1357,7 +1357,7 @@ int is_interpreted_func( const type_t *iface, const var_t *func ) return (get_stub_mode() != MODE_Os); } -static void write_proc_func_header( FILE *file, int indent, const type_t *iface, +static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, const var_t *func, unsigned int *offset, unsigned short num_proc ) { @@ -1365,6 +1365,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, var_list_t *args = type_function_get_args( func->declspec.type ); unsigned char explicit_fc, implicit_fc; unsigned char handle_flags; + var_t *retval = type_function_get_retval( func->declspec.type ); const var_t *handle_var = get_func_handle_var( iface, func, &explicit_fc, &implicit_fc ); unsigned char oi_flags = Oi_HAS_RPCFLAGS | Oi_USE_NEW_INIT_ROUTINES; unsigned int rpc_flags = get_rpc_flags( func->attrs ); @@ -1393,7 +1394,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, param_num++; nb_args++; } - if (!is_void( type_function_get_rettype( func->declspec.type ))) + if (!is_void( retval->declspec.type )) { stack_size += pointer_size; nb_args++; @@ -1445,6 +1446,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, if (get_stub_mode() == MODE_Oif) { + unsigned int stack_offset = is_object(iface) ? pointer_size : 0; unsigned char oi2_flags = get_func_oi2_flags( func ); unsigned char ext_flags = 0; unsigned int size; @@ -1487,6 +1489,43 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, print_file( file, indent, "NdrFcShort(0x%x),\n", fpu_mask ); /* floating point mask */ *offset += 2; } + + /* emit argument data */ + if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) + { + print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); + *offset += write_new_procformatstring_type(file, indent, var, FALSE, &stack_offset); + } + + /* emit return value data */ + if (!is_void( retval->declspec.type )) + { + print_file( file, 0, "/* %u (return value) */\n", *offset ); + *offset += write_new_procformatstring_type(file, indent, retval, TRUE, &stack_offset); + } + } + else /* old style */ + { + /* emit argument data */ + if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) + { + print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); + *offset += write_old_procformatstring_type(file, indent, var, FALSE, TRUE); + } + + /* emit return value data */ + if (is_void(retval->declspec.type)) + { + print_file(file, 0, "/* %u (void) */\n", *offset); + print_file(file, indent, "0x5b,\t/* FC_END */\n"); + print_file(file, indent, "0x5c,\t/* FC_PAD */\n"); + *offset += 2; + } + else + { + print_file( file, 0, "/* %u (return value) */\n", *offset ); + *offset += write_old_procformatstring_type(file, indent, retval, TRUE, TRUE); + } } } @@ -1494,12 +1533,13 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i const var_t *func, unsigned int *offset, unsigned short num_proc ) { - unsigned int stack_offset = is_object( iface ) ? pointer_size : 0; - int is_interpreted = is_interpreted_func( iface, func ); - int is_new_style = is_interpreted && (get_stub_mode() == MODE_Oif); - var_t *retval = type_function_get_retval( func->declspec.type ); + var_t *retval; - if (is_interpreted) write_proc_func_header( file, indent, iface, func, offset, num_proc ); + if (is_interpreted_func( iface, func )) + { + write_proc_func_interp( file, indent, iface, func, offset, num_proc ); + return; + } /* emit argument data */ if (type_function_get_args(func->declspec.type)) @@ -1508,31 +1548,23 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i LIST_FOR_EACH_ENTRY( var, type_function_get_args(func->declspec.type), const var_t, entry ) { print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); - if (is_new_style) - *offset += write_new_procformatstring_type(file, indent, var, FALSE, &stack_offset); - else - *offset += write_old_procformatstring_type(file, indent, var, FALSE, is_interpreted); + *offset += write_old_procformatstring_type(file, indent, var, FALSE, FALSE); } } /* emit return value data */ + retval = type_function_get_retval( func->declspec.type ); if (is_void(retval->declspec.type)) { - if (!is_new_style) - { - print_file(file, 0, "/* %u (void) */\n", *offset); - print_file(file, indent, "0x5b,\t/* FC_END */\n"); - print_file(file, indent, "0x5c,\t/* FC_PAD */\n"); - *offset += 2; - } + print_file(file, 0, "/* %u (void) */\n", *offset); + print_file(file, indent, "0x5b,\t/* FC_END */\n"); + print_file(file, indent, "0x5c,\t/* FC_PAD */\n"); + *offset += 2; } else { print_file( file, 0, "/* %u (return value) */\n", *offset ); - if (is_new_style) - *offset += write_new_procformatstring_type(file, indent, retval, TRUE, &stack_offset); - else - *offset += write_old_procformatstring_type(file, indent, retval, TRUE, is_interpreted); + *offset += write_old_procformatstring_type(file, indent, retval, TRUE, FALSE); } }

1 0