January 2023 - Wine-Commits

Zebediah Figura : win32u: Make send_message_timeout() hidden.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: b2dd38372f9b800fd54704546c8a88c22eb9013f URL: https://gitlab.winehq.org/wine/wine/-/commit/b2dd38372f9b800fd54704546c8a88… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:50:38 2023 -0600 win32u: Make send_message_timeout() hidden. --- dlls/win32u/win32u_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 96b1b7647fe..44847829b75 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -314,7 +314,7 @@ extern LRESULT send_internal_message_timeout( DWORD dest_pid, DWORD dest_tid, UI extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN; extern LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, - UINT flags, UINT timeout, BOOL ansi ); + UINT flags, UINT timeout, BOOL ansi ) DECLSPEC_HIDDEN; /* rawinput.c */ extern BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : ntdll: Make call_user_mode_callback() hidden.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 4cbb181d99bdf28ea79d9ec778c2a152fd41637d URL: https://gitlab.winehq.org/wine/wine/-/commit/4cbb181d99bdf28ea79d9ec778c2a1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:57:16 2023 -0600 ntdll: Make call_user_mode_callback() hidden. --- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 9bdb2f6d6fb..87c40d9ba96 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1155,7 +1155,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context * call_user_mode_callback */ extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ); + ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "push {r2-r12,lr}\n\t" "ldr r4, [sp, #0x30]\n\t" /* teb */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 4483303decc..d440d55fd6b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -881,7 +881,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context * call_user_mode_callback */ extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ); + ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "stp x29, x30, [sp,#-0xc0]!\n\t" "mov x29, sp\n\t" diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index d800885748f..3b16e7412f8 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1575,7 +1575,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context * call_user_mode_callback */ extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ); + ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 94d79b9cdd1..13669f0e77c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1573,7 +1573,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context * call_user_mode_callback */ extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ); + ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "subq $0xe8,%rsp\n\t" __ASM_SEH(".seh_stackalloc 0xf0\n\t")

1 0

Zebediah Figura : ntdll: Make fd_set_file_info() static.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 4827ae13928259b22e48765be3f14aef5bc26146 URL: https://gitlab.winehq.org/wine/wine/-/commit/4827ae13928259b22e48765be3f14a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:56:02 2023 -0600 ntdll: Make fd_set_file_info() static. --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 957d9f3b801..981b0c57b35 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1618,7 +1618,7 @@ static int fd_set_dos_attrib( int fd, UINT attr ) /* set the stat info and file attributes for a file (by file descriptor) */ -NTSTATUS fd_set_file_info( int fd, UINT attr ) +static NTSTATUS fd_set_file_info( int fd, UINT attr ) { struct stat st;

1 0

Alex Henrie : include: Remove __WINE_MALLOC from functions that shouldn't have it.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 9716a1a97d1a50c79b881af4e1247fdf6df0b61e URL: https://gitlab.winehq.org/wine/wine/-/commit/9716a1a97d1a50c79b881af4e1247f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 27 15:51:44 2023 -0700 include: Remove __WINE_MALLOC from functions that shouldn't have it. According to the GCC documentation,[1] __attribute__((malloc)) may not be used on functions that return memory that contains one or more valid pointers. [1] https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html --- include/adshlp.h | 2 +- include/threadpoolapiset.h | 12 ++++++------ include/winber.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/adshlp.h b/include/adshlp.h index 5dacbb6b821..7366c077788 100644 --- a/include/adshlp.h +++ b/include/adshlp.h @@ -25,7 +25,7 @@ extern "C" { BOOL WINAPI FreeADsMem(void*); void* WINAPI AllocADsMem(DWORD) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(FreeADsMem) __WINE_MALLOC; -void* WINAPI ReallocADsMem(void*,DWORD,DWORD) __WINE_ALLOC_SIZE(3) __WINE_DEALLOC(FreeADsMem) __WINE_MALLOC; +void* WINAPI ReallocADsMem(void*,DWORD,DWORD) __WINE_ALLOC_SIZE(3) __WINE_DEALLOC(FreeADsMem); BOOL WINAPI FreeADsStr(WCHAR*); WCHAR* WINAPI AllocADsStr(WCHAR*) __WINE_DEALLOC(FreeADsStr) __WINE_MALLOC; diff --git a/include/threadpoolapiset.h b/include/threadpoolapiset.h index 6d8ac44a058..73203f413ee 100644 --- a/include/threadpoolapiset.h +++ b/include/threadpoolapiset.h @@ -33,17 +33,17 @@ WINBASEAPI void WINAPI CloseThreadpoolIo(TP_IO*); WINBASEAPI void WINAPI CloseThreadpoolTimer(PTP_TIMER); WINBASEAPI void WINAPI CloseThreadpoolWait(PTP_WAIT); WINBASEAPI void WINAPI CloseThreadpoolWork(PTP_WORK); -WINBASEAPI TP_POOL* WINAPI CreateThreadpool(void*) __WINE_DEALLOC(CloseThreadpool) __WINE_MALLOC; +WINBASEAPI TP_POOL* WINAPI CreateThreadpool(void*) __WINE_DEALLOC(CloseThreadpool); WINBASEAPI TP_CLEANUP_GROUP* WINAPI CreateThreadpoolCleanupGroup(void) - __WINE_DEALLOC(CloseThreadpoolCleanupGroup) __WINE_MALLOC; + __WINE_DEALLOC(CloseThreadpoolCleanupGroup); WINBASEAPI TP_IO* WINAPI CreateThreadpoolIo(HANDLE,PTP_WIN32_IO_CALLBACK,void*,TP_CALLBACK_ENVIRON*) - __WINE_DEALLOC(CloseThreadpoolIo) __WINE_MALLOC; + __WINE_DEALLOC(CloseThreadpoolIo); WINBASEAPI TP_TIMER* WINAPI CreateThreadpoolTimer(PTP_TIMER_CALLBACK,void*,TP_CALLBACK_ENVIRON*) - __WINE_DEALLOC(CloseThreadpoolTimer) __WINE_MALLOC; + __WINE_DEALLOC(CloseThreadpoolTimer); WINBASEAPI TP_WAIT* WINAPI CreateThreadpoolWait(PTP_WAIT_CALLBACK,void*,TP_CALLBACK_ENVIRON*) - __WINE_DEALLOC(CloseThreadpoolWait) __WINE_MALLOC; + __WINE_DEALLOC(CloseThreadpoolWait); WINBASEAPI TP_WORK* WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,void*,TP_CALLBACK_ENVIRON*) - __WINE_DEALLOC(CloseThreadpoolWork) __WINE_MALLOC; + __WINE_DEALLOC(CloseThreadpoolWork); WINBASEAPI void WINAPI DisassociateCurrentThreadFromCallback(PTP_CALLBACK_INSTANCE); WINBASEAPI void WINAPI FreeLibraryWhenCallbackReturns(PTP_CALLBACK_INSTANCE,HMODULE); WINBASEAPI BOOL WINAPI IsThreadpoolTimerSet(PTP_TIMER); diff --git a/include/winber.h b/include/winber.h index 83055fa8c72..cb4f8e3ff54 100644 --- a/include/winber.h +++ b/include/winber.h @@ -29,12 +29,12 @@ typedef unsigned int ber_len_t; void CDECL ber_free( BerElement *, int ); void CDECL ber_bvfree( BERVAL * ); -BerElement * CDECL ber_alloc_t( int ) __WINE_DEALLOC(ber_free) __WINE_MALLOC; -BERVAL * CDECL ber_bvdup( BERVAL * ) __WINE_DEALLOC(ber_bvfree) __WINE_MALLOC; +BerElement * CDECL ber_alloc_t( int ) __WINE_DEALLOC(ber_free); +BERVAL * CDECL ber_bvdup( BERVAL * ) __WINE_DEALLOC(ber_bvfree); void CDECL ber_bvecfree( BERVAL ** ); ULONG CDECL ber_first_element( BerElement *, ULONG *, char ** ); int CDECL ber_flatten( BerElement *, BERVAL ** ); -BerElement * CDECL ber_init( BERVAL * ) __WINE_DEALLOC(ber_free) __WINE_MALLOC; +BerElement * CDECL ber_init( BERVAL * ) __WINE_DEALLOC(ber_free); ULONG CDECL ber_next_element( BerElement *, ULONG *, char * ); ULONG CDECL ber_peek_tag( BerElement *, ULONG * ); int WINAPIV ber_printf( BerElement *, char *, ... );

1 0

Alexandre Julliard : tools: Make sure that config.h is included.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 8772b38494e7e844bcc5546a428a85b5d28dbe50 URL: https://gitlab.winehq.org/wine/wine/-/commit/8772b38494e7e844bcc5546a428a85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 09:31:32 2023 +0100 tools: Make sure that config.h is included. --- tools/tools.h | 4 ++++ tools/winebuild/build.h | 4 ---- tools/winedump/emfspool.c | 1 + tools/wmc/lang.c | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/tools.h b/tools/tools.h index e5b8c4c64e5..fa459994eb3 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -21,6 +21,10 @@ #ifndef __WINE_TOOLS_H #define __WINE_TOOLS_H +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + #include <limits.h> #include <stdarg.h> #include <stdio.h> diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index c7d6d0cc964..733cd34e614 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -23,10 +23,6 @@ #ifndef __WINE_BUILD_H #define __WINE_BUILD_H -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - #include <stdio.h> #include <stdlib.h> #include "../tools.h" diff --git a/tools/winedump/emfspool.c b/tools/winedump/emfspool.c index 7d6344facd1..d0c90b2236b 100644 --- a/tools/winedump/emfspool.c +++ b/tools/winedump/emfspool.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include "winedump.h" #define EMFSPOOL_VERSION 0x10000 diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index 7dd80d840e6..ff6fabc915b 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -17,6 +17,9 @@ * 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 "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h>

1 0

Alexandre Julliard : include: Add some C99 floating point comparison macros.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 42b13eff2453a4eca5db8d0ca019b0fb3db7e671 URL: https://gitlab.winehq.org/wine/wine/-/commit/42b13eff2453a4eca5db8d0ca019b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 13:50:14 2023 +0100 include: Add some C99 floating point comparison macros. --- include/msvcrt/math.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index dba2b07be37..26abbae2a59 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -342,6 +342,34 @@ static inline int __signbit(double x) #endif +#ifdef _UCRT + + _ACRTIMP int __cdecl _dpcomp(double, double); + _ACRTIMP int __cdecl _fdpcomp(float, float); + +#define _FP_LT 1 +#define _FP_EQ 2 +#define _FP_GT 4 + +#ifdef __GNUC__ +# define isgreater(x, y) __builtin_isgreater(x, y) +# define isgreaterequal(x, y) __builtin_isgreaterequal(x, y) +# define isless(x, y) __builtin_isless(x, y) +# define islessequal(x, y) __builtin_islessequal(x, y) +# define islessgreater(x, y) __builtin_islessgreater(x, y) +# define isunordered(x, y) __builtin_isunordered(x, y) +#else +# define __FP_COMPARE(x,y) (sizeof(x) == sizeof(float) && sizeof(y) == sizeof(float) ? _fdpcomp(x,y) : _dpcomp(x,y)) +# define isgreater(x, y) ((__FP_COMPARE(x, y) & _FP_GT) != 0) +# define isgreaterequal(x, y) ((__FP_COMPARE(x, y) & (_FP_GT|_FP_EQ)) != 0) +# define isless(x, y) ((__FP_COMPARE(x, y) & _FP_LT) != 0) +# define islessequal(x, y) ((__FP_COMPARE(x, y) & (_FP_LT|_FP_EQ)) != 0) +# define islessgreater(x, y) ((__FP_COMPARE(x, y) & (_FP_LT|_FP_GT)) != 0) +# define isunordered(x, y) (!__FP_COMPARE(x, y)) +#endif + +#endif /* _UCRT */ + #ifdef __cplusplus } #endif

1 0

Gerald Pfeifer : tools: Include limits.h for PATH_MAX.
by Alexandre Julliard Jan. 30, 2023

Jan. 30, 2023

Module: wine Branch: master Commit: 004f367725ee8cd385277f100c10e7dc775ec8c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/004f367725ee8cd385277f100c10e7… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 28 00:39:39 2023 +0100 tools: Include limits.h for PATH_MAX. PATH_MAX is used in FreeBSD-specific code in get_argv0_dir which otherwise fails. --- tools/tools.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/tools.h b/tools/tools.h index 70ef4bd2584..e5b8c4c64e5 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -21,6 +21,7 @@ #ifndef __WINE_TOOLS_H #define __WINE_TOOLS_H +#include <limits.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h>

1 0

Rémi Bernon : gitlab: Run dinput 64-bit tests in a dedicated job.
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: 4e5fab6214d9304004369d50b6c73b8d88cf46d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e5fab6214d9304004369d50b6c73b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 8 09:33:58 2022 +0100 gitlab: Run dinput 64-bit tests in a dedicated job. --- tools/gitlab/test.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index da34390bc1f..808c825eae9 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -42,6 +42,18 @@ - wine wineboot.exe -u - wineserver -w +test-linux-64: + extends: .wine-test + variables: + INCLUDE_TESTS: "dinput" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + needs: + - job: build-linux + script: + - export WINETEST_COLOR=1 + - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL $INCLUDE_TESTS + test-linux-32: extends: .wine-test variables:

1 0

James McDonnell : kernel32: Use MoveFileWithProgress() to partially implement MoveFileTransacted(),
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: 358c840a86cf396b88f981143c9a4a77abf4f07c URL: https://gitlab.winehq.org/wine/wine/-/commit/358c840a86cf396b88f981143c9a4a… Author: James McDonnell <topgamer7(a)gmail.com> Date: Fri Nov 18 13:46:15 2022 -0800 kernel32: Use MoveFileWithProgress() to partially implement MoveFileTransacted(), --- dlls/kernel32/path.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 2dd3eac3c26..028cf96d8cc 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -143,9 +143,9 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename, */ BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle) { - FIXME("(%s, %s, %p, %p, %ld, %p)\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("(%s, %s, %p, %p, %ld, %p) semi-stub\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle); + + return MoveFileWithProgressA(source, dest, progress, data, flags); } /************************************************************************** @@ -153,9 +153,9 @@ BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS */ BOOL WINAPI MoveFileTransactedW(const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle) { - FIXME("(%s, %s, %p, %p, %ld, %p)\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("(%s, %s, %p, %p, %ld, %p) semi-stub\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle); + + return MoveFileWithProgressW(source, dest, progress, data, flags); } /**************************************************************************

1 0

Hans Leidekker : ntdll/tests: Fix path test failures on Windows 11.
by Alexandre Julliard Jan. 27, 2023

Jan. 27, 2023

Module: wine Branch: master Commit: 72e7ff64b21fcc3dd467e20a4b67e8413a267463 URL: https://gitlab.winehq.org/wine/wine/-/commit/72e7ff64b21fcc3dd467e20a4b67e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 13 15:03:12 2023 +0100 ntdll/tests: Fix path test failures on Windows 11. --- dlls/ntdll/tests/path.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 4732f6a6aa8..9210cfb8843 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -128,10 +128,10 @@ static void test_RtlIsDosDeviceName_U(void) { "c:\\nul\\", 0, 0 }, { "c:\\nul\\foo", 0, 0 }, { "c:\\nul::", 6, 6 }, - { "c:\\nul::::::", 6, 6 }, - { "c:prn ", 4, 6 }, - { "c:prn.......", 4, 6 }, - { "c:prn... ...", 4, 6 }, + { "c:\\nul::::::", 6, 6, TRUE }, /* fails on win11 */ + { "c:prn ", 4, 6, TRUE }, /* fails on win11 */ + { "c:prn.......", 4, 6, TRUE }, /* fails on win11 */ + { "c:prn... ...", 4, 6, TRUE }, /* fails on win11 */ { "c:NUL .... ", 4, 6 }, { "c: . . .", 0, 0 }, { "c:", 0, 0 }, @@ -140,14 +140,14 @@ static void test_RtlIsDosDeviceName_U(void) { "c:nul. . . :", 4, 6 }, { "c:nul . . :", 4, 6 }, { "c:nul0", 0, 0 }, - { "c:prn:aaa", 4, 6 }, - { "c:PRN:.txt", 4, 6 }, - { "c:aux:.txt...", 4, 6 }, - { "c:prn:.txt:", 4, 6 }, - { "c:nul:aaa", 4, 6 }, + { "c:prn:aaa", 4, 6, TRUE }, /* fails on win11 */ + { "c:PRN:.txt", 4, 6, TRUE }, /* fails on win11 */ + { "c:aux:.txt...", 4, 6, TRUE }, /* fails on win11 */ + { "c:prn:.txt:", 4, 6, TRUE }, /* fails on win11 */ + { "c:nul:aaa", 4, 6, TRUE }, /* fails on win11 */ { "con:", 0, 6 }, { "lpt1:", 0, 8 }, - { "c:com5:", 4, 8 }, + { "c:com5:", 4, 8, TRUE }, /* fails on win11 */ { "CoM4:", 0, 8 }, { "lpt9:", 0, 8 }, { "c:\\lpt0.txt", 0, 0 }, @@ -159,14 +159,14 @@ static void test_RtlIsDosDeviceName_U(void) { "\\??\\CONIN$", 8, 12, TRUE }, /* fails on win7 */ { "\\??\\CONOUT$", 8, 14, TRUE }, /* fails on win7 */ { "\\??\\CONERR$", 0, 0 }, - { "\\??\\CON", 8, 6 }, + { "\\??\\CON", 8, 6, TRUE }, /* fails on win11 */ { "c:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\nul.txt", 1000, 6 }, + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\nul.txt", 1000, 6, TRUE }, /* fails on win11 */ { NULL, 0 } }; @@ -321,7 +321,8 @@ static void test_RtlGetFullPathName_U(void) { "foo/..", "C:\\windows", "windows"}, { "\\windows\\nul", "\\\\.\\nul", NULL}, { "C:\\nonexistent\\nul", "\\\\.\\nul", NULL}, - { "C:\\con\\con", "\\\\.\\con", NULL}, + { "C:\\con\\con", "\\\\.\\con", NULL, + "C:\\con\\con", "con"}, /* win11 */ { "C:NUL.", "\\\\.\\NUL", NULL}, { "C:NUL", "\\\\.\\NUL", NULL}, { "AUX", "\\\\.\\AUX", NULL}, @@ -564,7 +565,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"CONERR$", L"\\??\\C:\\windows\\CONERR$", 15}, }; static const WCHAR *error_paths[] = { - NULL, L"", L" ", L"C:\\nonexistent\\nul", L"C:\\con\\con" + NULL, L"", L" ", L"C:\\nonexistent\\nul" }; GetCurrentDirectoryA(sizeof(curdir), curdir);

1 0