October 2022 - Wine-Commits

Francois Gouget : winetest: Old WineTest reports may not have the flaky count.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: tools Branch: master Commit: 6cb546e49db740c3e1f8661264fd8662cdd2648e URL: https://gitlab.winehq.org/winehq/tools/-/commit/6cb546e49db740c3e1f8661264f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 25 18:40:40 2022 +0200 winetest: Old WineTest reports may not have the flaky count. --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 728b749d..ceef81a1 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -829,7 +829,7 @@ while ($line = <IN>) { $pids{$l_pid || 0} = 1; $s_total += $l_total; $s_failures += $l_failures; - $s_flaky += $l_flaky; + $s_flaky += ($l_flaky || 0); $s_todo += $l_todo; $s_skipped += $l_skipped; add_test_line($class, escapeHTML($line));

1 0

Rémi Bernon : win32u: Write display modes to registry as binary blobs.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: ffbe1e6229d8bbb9209ec1da6b1382293e5bb263 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffbe1e6229d8bbb9209ec1da6b1382… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 30 15:31:01 2022 +0200 win32u: Write display modes to registry as binary blobs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53484 --- dlls/win32u/sysparams.c | 83 ++++++------------------------------------------- 1 file changed, 10 insertions(+), 73 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 9f0812b843e..b09c55b3d66 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -169,15 +169,6 @@ static const WCHAR displayW[] = {'D','i','s','p','l','a','y',0}; static const WCHAR monitorW[] = {'M','o','n','i','t','o','r',0}; static const WCHAR yesW[] = {'Y','e','s',0}; static const WCHAR noW[] = {'N','o',0}; -static const WCHAR bits_per_pelW[] = {'B','i','t','s','P','e','r','P','e','l',0}; -static const WCHAR x_resolutionW[] = {'X','R','e','s','o','l','u','t','i','o','n',0}; -static const WCHAR y_resolutionW[] = {'Y','R','e','s','o','l','u','t','i','o','n',0}; -static const WCHAR v_refreshW[] = {'V','R','e','f','r','e','s','h',0}; -static const WCHAR flagsW[] = {'F','l','a','g','s',0}; -static const WCHAR x_panningW[] = {'X','P','a','n','n','i','n','g',0}; -static const WCHAR y_panningW[] = {'Y','P','a','n','n','i','n','g',0}; -static const WCHAR orientationW[] = {'O','r','i','e','n','t','a','t','i','o','n',0}; -static const WCHAR fixed_outputW[] = {'F','i','x','e','d','O','u','t','p','u','t',0}; static const WCHAR mode_countW[] = {'M','o','d','e','C','o','u','n','t',0}; static const char guid_devclass_displayA[] = "{4D36E968-E325-11CE-BFC1-08002BE10318}"; @@ -443,84 +434,30 @@ static void adapter_release( struct adapter *adapter ) } } +C_ASSERT(sizeof(DEVMODEW) - offsetof(DEVMODEW, dmFields) == 0x94); + static BOOL write_adapter_mode( HKEY adapter_key, DWORD index, const DEVMODEW *mode ) { - WCHAR bufferW[MAX_PATH]; + WCHAR bufferW[MAX_PATH] = {0}; char buffer[MAX_PATH]; - BOOL ret = TRUE; - HKEY hkey; sprintf( buffer, "Modes\\%08X", index ); - reg_delete_tree( adapter_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR) ); - if (!(hkey = reg_create_key( adapter_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR), - REG_OPTION_VOLATILE, NULL ))) - return FALSE; - -#define set_mode_field( name, field, flag ) \ - if ((mode->dmFields & (flag)) && \ - !(ret = set_reg_value( hkey, (name), REG_DWORD, &mode->field, \ - sizeof(mode->field) ))) \ - goto done - - set_mode_field( bits_per_pelW, dmBitsPerPel, DM_BITSPERPEL ); - set_mode_field( x_resolutionW, dmPelsWidth, DM_PELSWIDTH ); - set_mode_field( y_resolutionW, dmPelsHeight, DM_PELSHEIGHT ); - set_mode_field( v_refreshW, dmDisplayFrequency, DM_DISPLAYFREQUENCY ); - set_mode_field( flagsW, dmDisplayFlags, DM_DISPLAYFLAGS ); - set_mode_field( orientationW, dmDisplayOrientation, DM_DISPLAYORIENTATION ); - set_mode_field( fixed_outputW, dmDisplayFixedOutput, DM_DISPLAYFIXEDOUTPUT ); - if (index == ENUM_CURRENT_SETTINGS || index == ENUM_REGISTRY_SETTINGS) - { - set_mode_field( x_panningW, dmPosition.x, DM_POSITION ); - set_mode_field( y_panningW, dmPosition.y, DM_POSITION ); - } - -#undef set_mode_field - -done: - NtClose( hkey ); - return ret; + asciiz_to_unicode( bufferW, buffer ); + return set_reg_value( adapter_key, bufferW, REG_BINARY, &mode->dmFields, sizeof(*mode) - offsetof(DEVMODEW, dmFields) ); } static BOOL read_adapter_mode( HKEY adapter_key, DWORD index, DEVMODEW *mode ) { - char value_buf[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; + char value_buf[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(*mode)])]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)value_buf; - WCHAR bufferW[MAX_PATH]; + WCHAR bufferW[MAX_PATH] = {0}; char buffer[MAX_PATH]; - HKEY hkey; sprintf( buffer, "Modes\\%08X", index ); - if (!(hkey = reg_open_key( adapter_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR) ))) - return FALSE; - -#define query_mode_field( name, field, flag ) \ - do \ - { \ - if (query_reg_value( hkey, (name), value, sizeof(value_buf) ) && \ - value->Type == REG_DWORD) \ - { \ - mode->field = *(const DWORD *)value->Data; \ - mode->dmFields |= (flag); \ - } \ - } while (0) + asciiz_to_unicode( bufferW, buffer ); + if (!query_reg_value( adapter_key, bufferW, value, sizeof(value_buf) )) return FALSE; - query_mode_field( bits_per_pelW, dmBitsPerPel, DM_BITSPERPEL ); - query_mode_field( x_resolutionW, dmPelsWidth, DM_PELSWIDTH ); - query_mode_field( y_resolutionW, dmPelsHeight, DM_PELSHEIGHT ); - query_mode_field( v_refreshW, dmDisplayFrequency, DM_DISPLAYFREQUENCY ); - query_mode_field( flagsW, dmDisplayFlags, DM_DISPLAYFLAGS ); - query_mode_field( orientationW, dmDisplayOrientation, DM_DISPLAYORIENTATION ); - query_mode_field( fixed_outputW, dmDisplayFixedOutput, DM_DISPLAYFIXEDOUTPUT ); - if (index == ENUM_CURRENT_SETTINGS || index == ENUM_REGISTRY_SETTINGS) - { - query_mode_field( x_panningW, dmPosition.x, DM_POSITION ); - query_mode_field( y_panningW, dmPosition.y, DM_POSITION ); - } - -#undef query_mode_field - - NtClose( hkey ); + memcpy( &mode->dmFields, value->Data, sizeof(*mode) - offsetof(DEVMODEW, dmFields) ); return TRUE; }

1 0

Brendan Shanks : vkd3d-common: Add a Windows implementation of vkd3d_set_thread_name().
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: vkd3d Branch: master Commit: 963ea98a52148cbfa1a05e74cb42c61ea12c8573 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/963ea98a52148cbfa1a05e74cb42c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Sep 15 12:07:40 2022 -0700 vkd3d-common: Add a Windows implementation of vkd3d_set_thread_name(). --- Makefile.am | 1 + include/private/vkd3d_debug.h | 1 + libs/vkd3d-common/debug.c | 55 +++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 9 ------- 4 files changed, 57 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1340be10..3787389b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -179,6 +179,7 @@ libvkd3d_common_la_SOURCES = \ libs/vkd3d-common/error.c \ libs/vkd3d-common/memory.c \ libs/vkd3d-common/utf8.c +libvkd3d_common_la_LIBADD = @PTHREAD_LIBS@ lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 579c33d3..4f6d43af 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -115,5 +115,6 @@ struct vkd3d_debug_option bool vkd3d_debug_list_has_member(const char *string, const char *member); uint64_t vkd3d_parse_debug_options(const char *string, const struct vkd3d_debug_option *options, unsigned int option_count); +void vkd3d_set_thread_name(const char *name); #endif /* __VKD3D_DEBUG_H */ diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 0b9e765a..e07ed366 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef _WIN32 +# define _WIN32_WINNT 0x0600 /* For InitOnceExecuteOnce(). */ +#endif + #include "vkd3d_debug.h" #include <assert.h> @@ -27,6 +31,11 @@ #include <stdlib.h> #include <stdbool.h> #include <string.h> +#ifdef HAVE_PTHREAD_H +#include <pthread.h> +#endif + +#include "vkd3d_memory.h" #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 @@ -369,3 +378,49 @@ uint64_t vkd3d_parse_debug_options(const char *string, return flags; } + +#ifdef _WIN32 + +static HRESULT (WINAPI *pfn_SetThreadDescription)(HANDLE, const WCHAR *); +static BOOL WINAPI resolve_SetThreadDescription(INIT_ONCE *once, void *param, void **context) +{ + HMODULE kernelbase; + + if (!(kernelbase = LoadLibraryA("kernelbase.dll"))) + return TRUE; + + if (!(pfn_SetThreadDescription = (void *)GetProcAddress(kernelbase, "SetThreadDescription"))) + FreeLibrary(kernelbase); + + return TRUE; +} + +#endif + +void vkd3d_set_thread_name(const char *name) +{ +#ifdef _WIN32 + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + WCHAR *wname; + int ret; + + InitOnceExecuteOnce(&init_once, resolve_SetThreadDescription, NULL, NULL); + if (!pfn_SetThreadDescription) + return; + + if ((ret = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0)) <= 0) + return; + + if (!(wname = vkd3d_malloc(ret * sizeof(*wname)))) + return; + + if ((ret = MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, ret)) > 0) + pfn_SetThreadDescription(GetCurrentThread(), wname); + + vkd3d_free(wname); +#elif defined(HAVE_PTHREAD_SETNAME_NP_2) + pthread_setname_np(pthread_self(), name); +#elif defined(HAVE_PTHREAD_SETNAME_NP_1) + pthread_setname_np(name); +#endif +} diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c9b70d9c..2da1ab5d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1685,15 +1685,6 @@ extern const char vkd3d_build[]; bool vkd3d_get_program_name(char program_name[PATH_MAX]); -static inline void vkd3d_set_thread_name(const char *name) -{ -#if defined(HAVE_PTHREAD_SETNAME_NP_2) - pthread_setname_np(pthread_self(), name); -#elif defined(HAVE_PTHREAD_SETNAME_NP_1) - pthread_setname_np(name); -#endif -} - VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_object, VkDebugReportObjectTypeEXT vk_object_type, const char *name); HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object,

1 0

Francois Gouget : testbot: Remove support for building with -Werror.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: tools Branch: master Commit: 12c7aabbd2c150b7da2f961ec39d37132880ec73 URL: https://gitlab.winehq.org/winehq/tools/-/commit/12c7aabbd2c150b7da2f961ec39… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Apr 4 16:42:52 2020 +0200 testbot: Remove support for building with -Werror. This feature is not used because compilation warnings should not get in the way of testing how Windows (or Wine) behaves. --- testbot/lib/Build/Utils.pm | 18 +++--------------- testbot/lib/WineTestBot/LogUtils.pm | 4 ---- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 689df28a..c1a02ac2 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -325,7 +325,6 @@ sub BuildTestLauncher() } our $FROM_SCRATCH = 1; -our $TRY_WERROR = 2; sub BuildWine($$$$;$) { @@ -339,20 +338,9 @@ sub BuildWine($$$$;$) InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); - my $Rc = 1; - if (defined $Configure and ($Flags & $TRY_WERROR)) - { - $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". - "time ../wine/configure $Configure --enable-werror && ". - join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); - LogMsg "With -Werror the $Build Wine build fails\n" if ($Rc); - } - if ($Rc) - { - $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". - (defined $Configure ? "time ../wine/configure $Configure && " : ""). - join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); - } + my $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". + (defined $Configure ? "time ../wine/configure $Configure && " : ""). + join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); if ($Rc) { LogMsg "The $Build Wine build failed\n"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index fd850f8a..1e0ff38c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -291,10 +291,6 @@ sub ParseTaskLog($) { $LogInfo->{$1} = "updated"; } - elsif ($Line =~ /^Task: With -Werror the .* Wine build fails/) - { - ; # Show these non-fatal build errors - } elsif ($Line =~ /^Task: / or _IsPerlError($Line)) { $LogInfo->{Task} = "failed";

1 0

Francois Gouget : testbot/LogUtils: Remove a redundant return in LoadLogErrors().
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: tools Branch: master Commit: e5c8222769b191314e529900277eb0086032b174 URL: https://gitlab.winehq.org/winehq/tools/-/commit/e5c8222769b191314e529900277… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 23 00:07:13 2022 +0200 testbot/LogUtils: Remove a redundant return in LoadLogErrors(). --- testbot/lib/WineTestBot/LogUtils.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1e0ff38c..922a25c0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1054,7 +1054,6 @@ sub LoadLogErrors($) else { $LogInfo->{BadLog} = "Unable to open '$LogInfo->{LogName}.errors' for reading: $!"; - return $LogInfo; } return $LogInfo;

1 0

Francois Gouget : testbot: Improve quoting when running wineserver.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: tools Branch: master Commit: 5c5c547924c159670d3202b7e73f3a7aaf1fdd13 URL: https://gitlab.winehq.org/winehq/tools/-/commit/5c5c547924c159670d3202b7e73… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 26 12:58:17 2021 +0100 testbot: Improve quoting when running wineserver. --- testbot/lib/Build/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 8a84f5e6..689df28a 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -609,7 +609,7 @@ sub CreateWinePrefix($;$) # Ensure the WinePrefix has been fully created and the registry files # saved before returning. my $WineDir = "$DataDir/wine-$Mission->{Build}"; - system("'$WineDir/server/wineserver' -w"); + system("$WineDir/server/wineserver", "-w"); } return undef;

1 0

Joel Holdsworth : ntdll: Add FSCTL_GET_REPARSE_POINT semi-stub.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: 65797763b3ac4fcab7ffc83a4f95b2e87c81f58a URL: https://gitlab.winehq.org/wine/wine/-/commit/65797763b3ac4fcab7ffc83a4f95b2… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Oct 20 11:25:07 2022 +0100 ntdll: Add FSCTL_GET_REPARSE_POINT semi-stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39627 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53439 Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 3 --- dlls/ntdll/unix/file.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8157848e41d..98d9e6b3b0a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -5342,16 +5342,13 @@ static void test_reparse_points(void) ok( !status, "open %s failed %#lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, NULL, 0 ); - todo_wine ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 0 ); - todo_wine ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); /* a volume cannot be a reparse point by definition */ status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 1 ); - todo_wine ok( status == STATUS_NOT_A_REPARSE_POINT, "expected %#lx, got %#lx\n", STATUS_NOT_A_REPARSE_POINT, status ); CloseHandle( handle ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 8a599a289f8..6b73d9dc7e8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6040,6 +6040,16 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap break; } + case FSCTL_GET_REPARSE_POINT: + io->Information = 0; + if (out_buffer && out_size) + { + FIXME("FSCTL_GET_REPARSE_POINT semi-stub\n"); + status = STATUS_NOT_A_REPARSE_POINT; + } + else status = STATUS_INVALID_USER_BUFFER; + break; + case FSCTL_GET_OBJECT_ID: { FILE_OBJECTID_BUFFER *info = out_buffer;

1 0

Joel Holdsworth : ntdll/tests: Add initial tests for reparse points.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: ed8161883a6a9f4391371a84b1b7921095ba2839 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed8161883a6a9f4391371a84b1b792… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Oct 20 11:07:48 2022 +0100 ntdll/tests: Add initial tests for reparse points. --- dlls/ntdll/tests/file.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index c011733626f..8157848e41d 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -5326,6 +5326,37 @@ static void test_mailslot_name(void) CloseHandle( device ); } +static void test_reparse_points(void) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle; + IO_STATUS_BLOCK io; + NTSTATUS status; + UNICODE_STRING nameW; + unsigned char reparse_data[1]; + + pRtlInitUnicodeString( &nameW, L"\\??\\C:\\" ); + InitializeObjectAttributes( &attr, &nameW, 0, NULL, NULL ); + + status = pNtOpenFile( &handle, READ_CONTROL, &attr, &io, 0, 0 ); + ok( !status, "open %s failed %#lx\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, NULL, 0 ); + todo_wine + ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); + + status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 0 ); + todo_wine + ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); + + /* a volume cannot be a reparse point by definition */ + status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 1 ); + todo_wine + ok( status == STATUS_NOT_A_REPARSE_POINT, "expected %#lx, got %#lx\n", STATUS_NOT_A_REPARSE_POINT, status ); + + CloseHandle( handle ); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -5399,4 +5430,5 @@ START_TEST(file) test_query_ea(); test_flush_buffers_file(); test_mailslot_name(); + test_reparse_points(); }

1 0

Alistair Leslie-Hughes : sapi: Add Voice enum tests.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: a67b9e79615d6dd6133b38055d45b0296fd803af URL: https://gitlab.winehq.org/wine/wine/-/commit/a67b9e79615d6dd6133b38055d45b0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 22 09:11:47 2022 +1100 sapi: Add Voice enum tests. --- dlls/sapi/tests/token.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 7ef58e697b0..958c50359f5 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -191,6 +191,41 @@ static void test_default_token_id(void) ISpObjectTokenCategory_Release( cat ); } +static void tests_token_voices(void) +{ + ISpObjectTokenCategory *cat; + HRESULT hr; + IEnumSpObjectTokens *tokens; + ISpObjectToken *item; + ULONG fetched = 0; + ULONG count; + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_VOICES, FALSE ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = ISpObjectTokenCategory_EnumTokens(cat, NULL, NULL, &tokens); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = IEnumSpObjectTokens_GetCount( tokens, &count ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( count != 0, "got %lu\n", count ); + ISpObjectTokenCategory_Release( cat ); + + hr = IEnumSpObjectTokens_Item(tokens, 0, &item); + ok( hr == S_OK, "got %08lx\n", hr ); + ISpObjectToken_Release(item); + + hr = IEnumSpObjectTokens_Next(tokens, 1, &item, &fetched); + ok( hr == S_OK, "got %08lx\n", hr ); + ISpObjectToken_Release(item); + + IEnumSpObjectTokens_Release(tokens); +} + static void test_object_token(void) { ISpObjectToken *token; @@ -331,5 +366,6 @@ START_TEST(token) test_token_enum(); test_default_token_id(); test_object_token(); + tests_token_voices(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : sapi: Add default voice registry key.
by Alexandre Julliard Oct. 24, 2022

Oct. 24, 2022

Module: wine Branch: master Commit: c651cf190c233ad3a2455ede6ae0f19cc00a5394 URL: https://gitlab.winehq.org/wine/wine/-/commit/c651cf190c233ad3a2455ede6ae0f1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 22 19:01:44 2021 +1000 sapi: Add default voice registry key. --- dlls/sapi/sapi.rgs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/sapi/sapi.rgs b/dlls/sapi/sapi.rgs index bf784fd58d6..cba07ab6184 100644 --- a/dlls/sapi/sapi.rgs +++ b/dlls/sapi/sapi.rgs @@ -30,6 +30,13 @@ HKLM } NoRemove Voices { + NoRemove Tokens + { + NoRemove 'Wine Default Voice' + { + NoRemove Attributes + } + } } } }

1 0