- Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Simplify adapter key path creation from gpu_guid.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: ab5d9bb67b601f659bca6a4332a4d4d3bbf365c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab5d9bb67b601f659bca6a4332a4d4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 16:55:05 2024 +0100 win32u: Simplify adapter key path creation from gpu_guid. --- dlls/win32u/sysparams.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 90f7b7447ef..f1766e9456b 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1128,7 +1128,7 @@ struct device_manager_ctx unsigned int mode_count; HANDLE mutex; char gpuid[128]; - WCHAR gpu_guid[64]; + char gpu_guid[39]; LUID gpu_luid; HKEY adapter_key; /* for the virtual desktop settings */ @@ -1178,7 +1178,7 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) char buffer[4096]; WCHAR bufferW[512]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; - unsigned int gpu_index, size; + unsigned int gpu_index, size, i; HKEY hkey, subkey; LARGE_INTEGER ft; ULONG memory_size; @@ -1286,21 +1286,21 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) if ((subkey = reg_create_key( hkey, device_parametersW, sizeof(device_parametersW), 0, NULL ))) { - if (!query_reg_value( subkey, video_idW, value, sizeof(buffer) )) + if (query_reg_value( subkey, video_idW, value, sizeof(buffer) ) != sizeof(ctx->gpu_guid) * sizeof(WCHAR)) { GUID guid; uuid_create( &guid ); - sprintf( buffer, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + sprintf( ctx->gpu_guid, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", (unsigned int)guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] ); - size = asciiz_to_unicode( ctx->gpu_guid, buffer ); - TRACE( "created guid %s\n", debugstr_w(ctx->gpu_guid) ); - set_reg_value( subkey, video_idW, REG_SZ, ctx->gpu_guid, size ); + TRACE( "created guid %s\n", debugstr_a(ctx->gpu_guid) ); + set_reg_value( subkey, video_idW, REG_SZ, bufferW, asciiz_to_unicode( bufferW, ctx->gpu_guid ) ); } else { - memcpy( ctx->gpu_guid, value->Data, value->DataLength ); - TRACE( "got guid %s\n", debugstr_w(ctx->gpu_guid) ); + WCHAR *guidW = (WCHAR *)value->Data; + for (i = 0; i < sizeof(ctx->gpu_guid); i++) ctx->gpu_guid[i] = guidW[i]; + TRACE( "got guid %s\n", debugstr_a(ctx->gpu_guid) ); } NtClose( subkey ); } @@ -1415,16 +1415,12 @@ static void add_adapter( const struct gdi_adapter *adapter, void *param ) ctx->monitor_count = 0; ctx->mode_count = 0; - len = asciiz_to_unicode( bufferW, "\\Registry\\Machine\\System\\CurrentControlSet\\" - "Control\\Video\\" ) / sizeof(WCHAR) - 1; - lstrcpyW( bufferW + len, ctx->gpu_guid ); - len += lstrlenW( bufferW + len ); - sprintf( buffer, "\\%04x", adapter_index ); - len += asciiz_to_unicode( bufferW + len, buffer ) / sizeof(WCHAR) - 1; - hkey = reg_create_key( NULL, bufferW, len * sizeof(WCHAR), - REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, NULL ); - if (!hkey) hkey = reg_create_key( NULL, bufferW, len * sizeof(WCHAR), - REG_OPTION_VOLATILE | REG_OPTION_OPEN_LINK, NULL ); + snprintf( buffer, ARRAY_SIZE(buffer), "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Video\\%s\\%04x", + ctx->gpu_guid, adapter_index ); + len = asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR); + + hkey = reg_create_key( NULL, bufferW, len, REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, NULL ); + if (!hkey) hkey = reg_create_key( NULL, bufferW, len, REG_OPTION_VOLATILE | REG_OPTION_OPEN_LINK, NULL ); sprintf( name, "\\Device\\Video%u", video_index ); asciiz_to_unicode( nameW, name ); @@ -1441,13 +1437,8 @@ static void add_adapter( const struct gdi_adapter *adapter, void *param ) else ERR( "failed to create link key\n" ); /* Following information is Wine specific, it doesn't really exist on Windows. */ - len = asciiz_to_unicode( bufferW, "System\\CurrentControlSet\\Control\\Video\\" ) - / sizeof(WCHAR) - 1; - lstrcpyW( bufferW + len, ctx->gpu_guid ); - len += lstrlenW( bufferW + len ); - sprintf( buffer, "\\%04x", adapter_index ); - len += asciiz_to_unicode( bufferW + len, buffer ) / sizeof(WCHAR) - 1; - ctx->adapter_key = reg_create_key( config_key, bufferW, len * sizeof(WCHAR), + snprintf( buffer, ARRAY_SIZE(buffer), "System\\CurrentControlSet\\Control\\Video\\%s\\%04x", ctx->gpu_guid, adapter_index ); + ctx->adapter_key = reg_create_key( config_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR), REG_OPTION_VOLATILE, NULL ); set_reg_value( ctx->adapter_key, gpu_idW, REG_SZ, bufferW, asciiz_to_unicode( bufferW, ctx->gpuid ) );

1 0

Rémi Bernon : win32u: Use REG_SZ instead of REG_BINARY for some adapter keys.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: eaed90d9b4d7d00a4a2094fe3c706ddf22dfd42b URL: https://gitlab.winehq.org/wine/wine/-/commit/eaed90d9b4d7d00a4a2094fe3c706d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 26 23:26:05 2024 +0100 win32u: Use REG_SZ instead of REG_BINARY for some adapter keys. --- dlls/win32u/sysparams.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e72960f0e36..e8f9ed7816a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1343,10 +1343,10 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) size = (lstrlenW( desc ) + 1) * sizeof(WCHAR); set_reg_value( hkey, driver_descW, REG_SZ, desc, size ); - set_reg_value( hkey, adapter_stringW, REG_BINARY, desc, size ); - set_reg_value( hkey, bios_stringW, REG_BINARY, desc, size ); - set_reg_value( hkey, chip_typeW, REG_BINARY, desc, size ); - set_reg_value( hkey, dac_typeW, REG_BINARY, ramdacW, sizeof(ramdacW) ); + set_reg_value( hkey, adapter_stringW, REG_SZ, desc, size ); + set_reg_value( hkey, bios_stringW, REG_SZ, desc, size ); + set_reg_value( hkey, chip_typeW, REG_SZ, desc, size ); + set_reg_value( hkey, dac_typeW, REG_SZ, ramdacW, sizeof(ramdacW) ); /* If we failed to retrieve the gpu memory size set a default of 1Gb */ qw_memory_size = gpu->memory_size ? gpu->memory_size : 1073741824;

1 0

Rémi Bernon : win32u: Remove unused wine_devpropkey_monitor_adapternameW property.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 20a09a30711a284deaa84c2c3044b663df6afa48 URL: https://gitlab.winehq.org/wine/wine/-/commit/20a09a30711a284deaa84c2c3044b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 26 22:09:38 2024 +0100 win32u: Remove unused wine_devpropkey_monitor_adapternameW property. --- dlls/win32u/sysparams.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index f1766e9456b..e72960f0e36 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -159,14 +159,6 @@ static const WCHAR wine_devpropkey_monitor_rcworkW[] = '\\','0','0','0','4' }; -static const WCHAR wine_devpropkey_monitor_adapternameW[] = -{ - 'P','r','o','p','e','r','t','i','e','s','\\', - '{','2','3','3','a','9','e','f','3','-','a','f','c','4','-','4','a','b','d', - '-','b','5','6','4','-','c','3','2','f','2','1','f','1','5','3','5','b','}', - '\\','0','0','0','5' -}; - static const WCHAR device_instanceW[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; static const WCHAR controlW[] = {'C','o','n','t','r','o','l'}; static const WCHAR device_parametersW[] = @@ -1521,16 +1513,6 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) NtClose( subkey ); } - /* WINE_DEVPROPKEY_MONITOR_ADAPTERNAME */ - if ((subkey = reg_create_key( hkey, wine_devpropkey_monitor_adapternameW, - sizeof(wine_devpropkey_monitor_adapternameW), 0, NULL ))) - { - sprintf( buffer, "\\\\.\\DISPLAY%u", ctx->video_count ); - set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_STRING, bufferW, - asciiz_to_unicode( bufferW, buffer )); - NtClose( subkey ); - } - /* DEVPROPKEY_MONITOR_GPU_LUID */ if ((subkey = reg_create_key( hkey, devpropkey_monitor_gpu_luidW, sizeof(devpropkey_monitor_gpu_luidW), 0, NULL )))

1 0

Zebediah Figura : mciwave: Abort the playback thread regardless of state when stopping.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 910bd392f6777957aeae9a0a6a2f1bf0e8871ca0 URL: https://gitlab.winehq.org/wine/wine/-/commit/910bd392f6777957aeae9a0a6a2f1b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 5 17:01:29 2024 -0600 mciwave: Abort the playback thread regardless of state when stopping. --- dlls/mciwave/mciwave.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index f2af38b8762..e5b94e3cceb 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -631,12 +631,8 @@ static DWORD WAVE_mciStop(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS case MCI_MODE_PAUSE: case MCI_MODE_PLAY: case MCI_MODE_RECORD: - { - int oldStat = wmw->dwStatus; - wmw->dwStatus = MCI_MODE_NOT_READY; - if (oldStat == MCI_MODE_PAUSE) - dwRet = (wmw->fInput) ? waveInReset(wmw->hWave) : waveOutReset(wmw->hWave); - } + wmw->dwStatus = MCI_MODE_NOT_READY; + dwRet = (wmw->fInput) ? waveInReset(wmw->hWave) : waveOutReset(wmw->hWave); while (wmw->dwStatus != MCI_MODE_STOP) Sleep(10); break;

1 0

Rémi Bernon : win32u: Use char array for the device manager context gpuid.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 8fcc3c4efe10b0b040da43415fa7e89ffe3e3118 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fcc3c4efe10b0b040da43415fa7e8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 19 10:46:21 2024 +0100 win32u: Use char array for the device manager context gpuid. --- dlls/win32u/sysparams.c | 60 ++++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index a31d586a5b6..90f7b7447ef 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -200,14 +200,10 @@ static const WCHAR guid_devclass_monitorW[] = {'{','4','D','3','6','E','9','6','E','-','E','3','2','5','-','1','1','C','E','-', 'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}',0}; -static const WCHAR guid_devinterface_display_adapterW[] = - {'{','5','B','4','5','2','0','1','D','-','F','2','F','2','-','4','F','3','B','-', - '8','5','B','B','-','3','0','F','F','1','F','9','5','3','5','9','9','}',0}; - -static const WCHAR guid_display_device_arrivalW[] = - {'{','1','C','A','0','5','1','8','0','-','A','6','9','9','-','4','5','0','A','-', - '9','A','0','C','-','D','E','4','F','B','E','3','D','D','D','8','9','}',0}; +static const char guid_devinterface_display_adapterA[] = "{5B45201D-F2F2-4F3B-85BB-30FF1F953599}"; +static const char guid_display_device_arrivalA[] = "{1CA05180-A699-450A-9A0C-DE4FBE3DDD89}"; +static const char guid_devinterface_monitorA[] = "{E6F07B5F-EE97-4A90-B076-33F57BF4EAA7}"; 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}; @@ -1131,7 +1127,7 @@ struct device_manager_ctx unsigned int output_count; unsigned int mode_count; HANDLE mutex; - WCHAR gpuid[128]; + char gpuid[128]; WCHAR gpu_guid[64]; LUID gpu_luid; HKEY adapter_key; @@ -1142,41 +1138,30 @@ struct device_manager_ctx UINT primary_height; }; -static void link_device( const WCHAR *instance, const WCHAR *class ) +static void link_device( const char *instance, const char *class ) { - unsigned int instance_len = lstrlenW( instance ), len; - unsigned int class_len = lstrlenW( class ); - WCHAR buffer[MAX_PATH], *ptr; + char buffer[MAX_PATH], *ptr; + WCHAR bufferW[MAX_PATH]; HKEY hkey, subkey; + unsigned int pos; static const WCHAR symbolic_linkW[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; static const WCHAR hashW[] = {'#'}; - len = asciiz_to_unicode( buffer, "DeviceClasses\\" ) / sizeof(WCHAR) - 1; - memcpy( buffer + len, class, class_len * sizeof(WCHAR) ); - len += class_len; - len += asciiz_to_unicode( buffer + len, "\\##?#" ) / sizeof(WCHAR) - 1; - memcpy( buffer + len, instance, instance_len * sizeof(WCHAR) ); - for (ptr = buffer + len; *ptr; ptr++) if (*ptr == '\\') *ptr = '#'; - len += instance_len; - buffer[len++] = '#'; - memcpy( buffer + len, class, class_len * sizeof(WCHAR) ); - len += class_len; - hkey = reg_create_key( control_key, buffer, len * sizeof(WCHAR), 0, NULL ); + pos = snprintf( buffer, ARRAY_SIZE(buffer), "DeviceClasses\\%s\\", class ); + snprintf( buffer + pos, ARRAY_SIZE(buffer) - pos, "##?#%s#%s", instance, class ); + for (ptr = buffer + pos; *ptr; ptr++) if (*ptr == '\\') *ptr = '#'; - set_reg_value( hkey, device_instanceW, REG_SZ, instance, (instance_len + 1) * sizeof(WCHAR) ); + hkey = reg_create_key( control_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR), 0, NULL ); + set_reg_value( hkey, device_instanceW, REG_SZ, bufferW, asciiz_to_unicode( bufferW, instance ) ); subkey = reg_create_key( hkey, hashW, sizeof(hashW), REG_OPTION_VOLATILE, NULL ); NtClose( hkey ); hkey = subkey; - len = asciiz_to_unicode( buffer, "\\\\?\\" ) / sizeof(WCHAR) - 1; - memcpy( buffer + len, instance, (instance_len + 1) * sizeof(WCHAR) ); - len += instance_len; - memcpy( buffer + len, class, (class_len + 1) * sizeof(WCHAR) ); - len += class_len + 1; + snprintf( buffer, ARRAY_SIZE(buffer), "\\\\?\\%s#%s", instance, class ); for (ptr = buffer + 4; *ptr; ptr++) if (*ptr == '\\') *ptr = '#'; - set_reg_value( hkey, symbolic_linkW, REG_SZ, buffer, len * sizeof(WCHAR) ); + set_reg_value( hkey, symbolic_linkW, REG_SZ, bufferW, asciiz_to_unicode( bufferW, buffer ) ); if ((subkey = reg_create_key( hkey, controlW, sizeof(controlW), REG_OPTION_VOLATILE, NULL ))) { @@ -1246,10 +1231,10 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) prepare_devices(); } - sprintf( buffer, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\%08X", + sprintf( ctx->gpuid, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\%08X", gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index ); - size = asciiz_to_unicode( ctx->gpuid, buffer ); - if (!(hkey = reg_create_key( enum_key, ctx->gpuid, size - sizeof(WCHAR), 0, NULL ))) return; + size = asciiz_to_unicode( bufferW, ctx->gpuid ); + if (!(hkey = reg_create_key( enum_key, bufferW, size - sizeof(WCHAR), 0, NULL ))) return; set_reg_value( hkey, classW, REG_SZ, displayW, sizeof(displayW) ); set_reg_value( hkey, class_guidW, REG_SZ, guid_devclass_displayW, @@ -1405,8 +1390,8 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) NtClose( hkey ); - link_device( ctx->gpuid, guid_devinterface_display_adapterW ); - link_device( ctx->gpuid, guid_display_device_arrivalW ); + link_device( ctx->gpuid, guid_devinterface_display_adapterA ); + link_device( ctx->gpuid, guid_display_device_arrivalA ); } static void add_adapter( const struct gdi_adapter *adapter, void *param ) @@ -1465,8 +1450,7 @@ static void add_adapter( const struct gdi_adapter *adapter, void *param ) ctx->adapter_key = reg_create_key( config_key, bufferW, len * sizeof(WCHAR), REG_OPTION_VOLATILE, NULL ); - set_reg_value( ctx->adapter_key, gpu_idW, REG_SZ, ctx->gpuid, - (lstrlenW( ctx->gpuid ) + 1) * sizeof(WCHAR) ); + set_reg_value( ctx->adapter_key, gpu_idW, REG_SZ, bufferW, asciiz_to_unicode( bufferW, ctx->gpuid ) ); set_reg_value( ctx->adapter_key, state_flagsW, REG_DWORD, &adapter->state_flags, sizeof(adapter->state_flags) ); } @@ -1501,7 +1485,7 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) 0, NULL ); if (!hkey) return; - link_device( bufferW, guid_devinterface_monitorW ); + link_device( instance, guid_devinterface_monitorA ); asciiz_to_unicode( bufferW, "Generic Non-PnP Monitor" ); set_reg_value( hkey, device_descW, REG_SZ, bufferW, (lstrlenW( bufferW ) + 1) * sizeof(WCHAR) );

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.11.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 5bb80251b1f00e4f3ef551761b0de80bb5ebd423 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bb80251b1f00e4f3ef551761b0de8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 12:45:06 2024 +0100 vkd3d: Import upstream release 1.11. --- libs/vkd3d/AUTHORS | 2 + libs/vkd3d/COPYING | 2 +- libs/vkd3d/Makefile.in | 1 + libs/vkd3d/config.h | 4 +- libs/vkd3d/include/private/vkd3d_common.h | 50 +- libs/vkd3d/include/private/vkd3d_debug.h | 27 + libs/vkd3d/include/vkd3d.h | 1 + libs/vkd3d/include/vkd3d_shader.h | 54 +- libs/vkd3d/libs/vkd3d-common/blob.c | 6 +- libs/vkd3d/libs/vkd3d-common/debug.c | 6 +- libs/vkd3d/libs/vkd3d-shader/d3d_asm.c | 237 +- libs/vkd3d/libs/vkd3d-shader/d3dbc.c | 210 +- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 38 +- libs/vkd3d/libs/vkd3d-shader/dxil.c | 3124 ++++++++++++++++++-- libs/vkd3d/libs/vkd3d-shader/fx.c | 966 ++++++ libs/vkd3d/libs/vkd3d-shader/glsl.c | 6 +- libs/vkd3d/libs/vkd3d-shader/hlsl.c | 155 +- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 105 +- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 8 + libs/vkd3d/libs/vkd3d-shader/hlsl.y | 803 +++-- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 270 +- libs/vkd3d/libs/vkd3d-shader/ir.c | 2817 ++++++++++++++++-- libs/vkd3d/libs/vkd3d-shader/spirv.c | 1842 ++++++------ libs/vkd3d/libs/vkd3d-shader/tpf.c | 247 +- libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 186 +- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 266 +- libs/vkd3d/libs/vkd3d/command.c | 114 +- libs/vkd3d/libs/vkd3d/device.c | 904 ++++-- libs/vkd3d/libs/vkd3d/resource.c | 292 +- libs/vkd3d/libs/vkd3d/state.c | 78 +- libs/vkd3d/libs/vkd3d/utils.c | 24 +- libs/vkd3d/libs/vkd3d/vkd3d_main.c | 34 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 160 +- 33 files changed, 10567 insertions(+), 2472 deletions(-)

1 0

Alexandre Julliard : ntdll: Implement KiUserExceptionDispatcher on ARM64EC.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: ec2e266c7643d80f0a466c545e68d29ad5f5e1dd URL: https://gitlab.winehq.org/wine/wine/-/commit/ec2e266c7643d80f0a466c545e68d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 11:23:47 2024 +0100 ntdll: Implement KiUserExceptionDispatcher on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 08284b6a917..f56931a9e4b 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1674,19 +1674,28 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) /******************************************************************* * KiUserExceptionDispatcher (NTDLL.@) */ -NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +static NTSTATUS __attribute__((used)) dispatch_exception_arm64ec( EXCEPTION_RECORD *rec, ARM64_NT_CONTEXT *arm_ctx ) { - FIXME( "not implemented\n" ); - return STATUS_INVALID_DISPOSITION; + ARM64EC_NT_CONTEXT context; + + context_arm_to_x64( &context, arm_ctx ); + return dispatch_exception( rec, &context.AMD64_Context ); } +__ASM_GLOBAL_FUNC( "#KiUserExceptionDispatcher", + ".seh_context\n\t" + ".seh_endprologue\n\t" + "add x0, sp, #0x390\n\t" /* rec (context + 1) */ + "mov x1, sp\n\t" /* context */ + "bl dispatch_exception_arm64ec\n\t" + "brk #1" ) /******************************************************************* * KiUserApcDispatcher (NTDLL.@) */ -void WINAPI dispatch_apc( void (CALLBACK *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*), - ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, - BOOLEAN alertable, ARM64_NT_CONTEXT *arm_ctx ) +static void __attribute__((used)) dispatch_apc( void (CALLBACK *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*), + ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, + BOOLEAN alertable, ARM64_NT_CONTEXT *arm_ctx ) { ARM64EC_NT_CONTEXT context;

1 0

Alexandre Julliard : ntdll: Allocate the data structure and stack for the ARM64EC emulator.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: daea0b9b57a8919be0ce1cff5b6cf36bd36b5c94 URL: https://gitlab.winehq.org/wine/wine/-/commit/daea0b9b57a8919be0ce1cff5b6cf3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 11:04:16 2024 +0100 ntdll: Allocate the data structure and stack for the ARM64EC emulator. --- dlls/ntdll/unix/thread.c | 18 ++++++++++++++++++ dlls/ntdll/unix/virtual.c | 7 +++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 6a0f2fad346..7f2f1b9a50e 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1218,6 +1218,24 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR limit, SIZE_T reserve_size, SIZE #endif } +#ifdef __aarch64__ + if (is_arm64ec()) + { + CHPE_V2_CPU_AREA_INFO *cpu_area; + const SIZE_T chpev2_stack_size = 0x40000; + + /* emulator stack */ + if ((status = virtual_alloc_thread_stack( &stack, limit_4g, 0, chpev2_stack_size, chpev2_stack_size, FALSE ))) + return status; + + cpu_area = stack.DeallocationStack; + cpu_area->ContextAmd64 = (ARM64EC_NT_CONTEXT *)&cpu_area->EmulatorDataInline; + cpu_area->EmulatorStackBase = (ULONG_PTR)stack.StackBase; + cpu_area->EmulatorStackLimit = (ULONG_PTR)stack.StackLimit + page_size; + teb->ChpeV2CpuAreaInfo = cpu_area; + } +#endif + /* native stack */ if ((status = virtual_alloc_thread_stack( &stack, 0, limit, reserve_size, commit_size, TRUE ))) return status; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 2b6ce543531..4b23d9954df 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3758,6 +3758,13 @@ void virtual_free_teb( TEB *teb ) size = 0; NtFreeVirtualMemory( GetCurrentProcess(), &teb->DeallocationStack, &size, MEM_RELEASE ); } +#ifdef __aarch64__ + if (teb->ChpeV2CpuAreaInfo) + { + size = 0; + NtFreeVirtualMemory( GetCurrentProcess(), (void **)&teb->ChpeV2CpuAreaInfo, &size, MEM_RELEASE ); + } +#endif if (thread_data->kernel_stack) { size = 0;

1 0

Alexandre Julliard : ntdll: Implement exception dispatching on ARM64EC.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: e6ce5d5df7ea3f89fb295aabc167b7b6f04f8dbd URL: https://gitlab.winehq.org/wine/wine/-/commit/e6ce5d5df7ea3f89fb295aabc167b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 11:06:34 2024 +0100 ntdll: Implement exception dispatching on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 186 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/exception.c | 34 +++++++- 2 files changed, 219 insertions(+), 1 deletion(-)

1 0

Nikolay Sivov : d3d10_1/tests: Add an effect compilation test using 10.1 features.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 5eb46419b44c8ce4362d06205fb33e7085685ff0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5eb46419b44c8ce4362d06205fb33e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 15:25:23 2024 +0100 d3d10_1/tests: Add an effect compilation test using 10.1 features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10_1/tests/d3d10_1.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index ad7aaeb0dc4..e3cd3943594 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -1053,6 +1053,30 @@ static void test_shader_profiles(void) ok(!strcmp(profile, "ps_4_0"), "Unexpected profile %s.\n", profile); } +static void test_compile_effect(void) +{ + char default_bs_source[] = "BlendState default_blend_state {};"; + char bs_source2[] = + "BlendState blend_state\n" + "{\n" + " srcblend[0] = zero;\n" + "};"; + ID3D10Blob *blob; + HRESULT hr; + + hr = D3D10CompileEffectFromMemory(default_bs_source, strlen(default_bs_source), + NULL, NULL, NULL, 0, 0, &blob, NULL); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ID3D10Blob_Release(blob); + + /* Compilation fails due to 10.1 feature incompatibility with fx_4_0 profile. */ + hr = D3D10CompileEffectFromMemory(bs_source2, strlen(bs_source2), NULL, NULL, NULL, + 0, 0, &blob, NULL); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); +} + START_TEST(d3d10_1) { test_create_device(); @@ -1062,4 +1086,5 @@ START_TEST(d3d10_1) test_getdc(); test_fx_4_1_blend_state(); test_shader_profiles(); + test_compile_effect(); }

1 0