February 2021 - Wine-commits

Erich E. Hoover : mountmgr.sys: Have mountmgr_ioctl return the same status as the IoStatus.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: d457a986de9d8bb0efa573c57bba98324bbb2b49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d457a986de9d8bb0efa573c5… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Feb 4 23:00:45 2021 -0700 mountmgr.sys: Have mountmgr_ioctl return the same status as the IoStatus. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 89 +++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 54ba2857e02..9e3dcadb8d7 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -973,6 +973,7 @@ static NTSTATUS enumerate_credentials( void *buff, SIZE_T insize, SIZE_T outsize static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + NTSTATUS status; TRACE( "ioctl %x insize %u outsize %u\n", irpsp->Parameters.DeviceIoControl.IoControlCode, @@ -984,109 +985,111 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_MOUNTMGR_QUERY_POINTS: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(MOUNTMGR_MOUNT_POINT)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + status = STATUS_INVALID_PARAMETER; break; } - irp->IoStatus.u.Status = query_mount_points( irp->AssociatedIrp.SystemBuffer, - irpsp->Parameters.DeviceIoControl.InputBufferLength, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - &irp->IoStatus ); + status = query_mount_points( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); break; case IOCTL_MOUNTMGR_DEFINE_UNIX_DRIVE: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_unix_drive)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + status = STATUS_INVALID_PARAMETER; break; } irp->IoStatus.Information = 0; - irp->IoStatus.u.Status = define_unix_drive( irp->AssociatedIrp.SystemBuffer, - irpsp->Parameters.DeviceIoControl.InputBufferLength ); + status = define_unix_drive( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength ); break; case IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_unix_drive)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + status = STATUS_INVALID_PARAMETER; break; } - irp->IoStatus.u.Status = query_unix_drive( irp->AssociatedIrp.SystemBuffer, - irpsp->Parameters.DeviceIoControl.InputBufferLength, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - &irp->IoStatus ); + status = query_unix_drive( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); break; case IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_dhcp_request_params)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + status = STATUS_INVALID_PARAMETER; break; } - irp->IoStatus.u.Status = query_dhcp_request_params( irp->AssociatedIrp.SystemBuffer, - irpsp->Parameters.DeviceIoControl.InputBufferLength, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - &irp->IoStatus ); + status = query_dhcp_request_params( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); break; #ifdef __APPLE__ case IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE: if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(GUID) || irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUNTMGR_TARGET_NAME)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + status = STATUS_INVALID_PARAMETER; break; } - if (TrySubmitThreadpoolCallback( query_symbol_file, irp, NULL )) return STATUS_PENDING; - irp->IoStatus.u.Status = STATUS_NO_MEMORY; + if (TrySubmitThreadpoolCallback( query_symbol_file, irp, NULL )) + return (irp->IoStatus.u.Status = STATUS_PENDING); + status = STATUS_NO_MEMORY; break; case IOCTL_MOUNTMGR_READ_CREDENTIAL: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + status = STATUS_INVALID_PARAMETER; break; } - irp->IoStatus.u.Status = read_credential( irp->AssociatedIrp.SystemBuffer, - irpsp->Parameters.DeviceIoControl.InputBufferLength, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - &irp->IoStatus ); + status = read_credential( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); break; case IOCTL_MOUNTMGR_WRITE_CREDENTIAL: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + status = STATUS_INVALID_PARAMETER; break; } - irp->IoStatus.u.Status = write_credential( irp->AssociatedIrp.SystemBuffer, - irpsp->Parameters.DeviceIoControl.InputBufferLength, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - &irp->IoStatus ); + status = write_credential( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); break; case IOCTL_MOUNTMGR_DELETE_CREDENTIAL: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + status = STATUS_INVALID_PARAMETER; break; } - irp->IoStatus.u.Status = delete_credential( irp->AssociatedIrp.SystemBuffer, - irpsp->Parameters.DeviceIoControl.InputBufferLength, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - &irp->IoStatus ); + status = delete_credential( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); break; case IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential_list)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + status = STATUS_INVALID_PARAMETER; break; } - irp->IoStatus.u.Status = enumerate_credentials( irp->AssociatedIrp.SystemBuffer, - irpsp->Parameters.DeviceIoControl.InputBufferLength, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - &irp->IoStatus ); + status = enumerate_credentials( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); break; #endif default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + status = STATUS_NOT_SUPPORTED; break; } + irp->IoStatus.u.Status = status; IoCompleteRequest( irp, IO_NO_INCREMENT ); - return STATUS_SUCCESS; + return status; } /* main entry point for the mount point manager driver */

1 0

Damjan Jovanovic : wldap32: Cyrus SASL's sasl_interact_t.result should be null-terminated.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: a4199fa255119f3048a81fd1182ef60ea0be4d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4199fa255119f3048a81fd1… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Feb 5 09:37:28 2021 +0200 wldap32: Cyrus SASL's sasl_interact_t.result should be null-terminated. Sometimes AD authentication fails as LDAP packets have garbage characters trailing the username. Reading its source code confirms that Cyrus SASL often completely ignores the sasl_interact_t.len field, and expects sasl_interact_t.result to be null-terminated. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/wldap32.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 537de67a877..3059df8603e 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -100,9 +100,10 @@ static inline LPWSTR strnAtoW( LPCSTR str, DWORD inlen, DWORD *outlen ) if (str) { DWORD len = MultiByteToWideChar( CP_ACP, 0, str, inlen, NULL, 0 ); - if ((ret = heap_alloc( len * sizeof(WCHAR) ))) + if ((ret = heap_alloc( (len+1) * sizeof(WCHAR) ))) { MultiByteToWideChar( CP_ACP, 0, str, inlen, ret, len ); + ret[len] = 0; *outlen = len; } } @@ -116,9 +117,10 @@ static inline char *strnWtoU( LPCWSTR str, DWORD inlen, DWORD *outlen ) if (str) { DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, inlen, NULL, 0, NULL, NULL ); - if ((ret = heap_alloc( len ))) + if ((ret = heap_alloc( len + 1 ))) { WideCharToMultiByte( CP_UTF8, 0, str, inlen, ret, len, NULL, NULL ); + ret[len] = 0; *outlen = len; } }

1 0

Zebediah Figura : advapi32/tests: Add some tests for querying the security of pseudo-handles.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: e9ea436052ffd79aa9e39d93238b94ea4c471a45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ea436052ffd79aa9e39d93… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 21:24:10 2021 -0600 advapi32/tests: Add some tests for querying the security of pseudo-handles. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 020e69277e0..91b358543d5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7878,6 +7878,55 @@ static void test_create_process_token_child(void) } } +static void test_pseudo_handle_security(void) +{ + char buffer[200]; + PSECURITY_DESCRIPTOR sd = buffer, sd_ptr; + unsigned int i; + DWORD size; + BOOL ret; + + static const HKEY keys[] = + { + HKEY_CLASSES_ROOT, + HKEY_CURRENT_USER, + HKEY_LOCAL_MACHINE, + HKEY_USERS, + HKEY_PERFORMANCE_DATA, + HKEY_CURRENT_CONFIG, + HKEY_DYN_DATA, + }; + + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(GetCurrentThread(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(ret, "got error %u\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(keys); ++i) + { + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(keys[i], OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(!ret, "key %p: expected failure\n", keys[i]); + ok(GetLastError() == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], GetLastError()); + + ret = GetSecurityInfo(keys[i], SE_REGISTRY_KEY, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr); + if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], ret); + else if (keys[i] == HKEY_DYN_DATA) + todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED || broken(ret == ERROR_INVALID_HANDLE) /* <7 */, + "key %p: got error %u\n", keys[i], ret); + else + todo_wine ok(!ret, "key %p: got error %u\n", keys[i], ret); + LocalFree(sd_ptr); + + ret = GetSecurityInfo(keys[i], SE_KERNEL_OBJECT, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr); + ok(ret == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], ret); + } +} + START_TEST(security) { init(); @@ -7940,6 +7989,7 @@ START_TEST(security) test_BuildSecurityDescriptorW(); test_duplicate_handle_access(); test_create_process_token(); + test_pseudo_handle_security(); /* Must be the last test, modifies process token */ test_token_security_descriptor();

1 0

Zebediah Figura : advapi32: Support GetSecurityInfo() with special root HKEY constants.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: e0302343542a9b2c6ad21e75bdea202852bae0b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0302343542a9b2c6ad21e75… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 21:24:11 2021 -0600 advapi32: Support GetSecurityInfo() with special root HKEY constants. This fixes a message box with the ASCOM Platform installer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 31 ++++++++++++++++++++++++++++++- dlls/advapi32/tests/security.c | 4 ++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a01791bbf0b..9f80a846966 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1467,6 +1467,9 @@ BOOL WINAPI PrivilegedServiceAuditAlarmA( LPCSTR SubsystemName, LPCSTR ServiceNa return TRUE; } +#define HKEY_SPECIAL_ROOT_FIRST HKEY_CLASSES_ROOT +#define HKEY_SPECIAL_ROOT_LAST HKEY_DYN_DATA + /****************************************************************************** * GetSecurityInfo [ADVAPI32.@] * @@ -1522,17 +1525,43 @@ DWORD WINAPI GetSecurityInfo( HANDLE handle, SE_OBJECT_TYPE type, SECURITY_INFOR } else { + HKEY key = NULL; + + if (type == SE_REGISTRY_KEY && (HandleToUlong(handle) >= HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)) + && (HandleToUlong(handle) <= HandleToUlong(HKEY_SPECIAL_ROOT_LAST))) + { + REGSAM access = READ_CONTROL; + DWORD ret; + + if (SecurityInfo & SACL_SECURITY_INFORMATION) + access |= ACCESS_SYSTEM_SECURITY; + + if ((ret = RegCreateKeyExW( handle, NULL, 0, NULL, 0, access, NULL, &key, NULL ))) + return ret; + + handle = key; + } + status = NtQuerySecurityObject( handle, SecurityInfo, NULL, 0, &size ); if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) + { + RegCloseKey( key ); return RtlNtStatusToDosError( status ); + } - if (!(sd = LocalAlloc( 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; + if (!(sd = LocalAlloc( 0, size ))) + { + RegCloseKey( key ); + return ERROR_NOT_ENOUGH_MEMORY; + } if ((status = NtQuerySecurityObject( handle, SecurityInfo, sd, size, &size ))) { + RegCloseKey( key ); LocalFree(sd); return RtlNtStatusToDosError( status ); } + RegCloseKey( key ); } if (ppsidOwner) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 91b358543d5..b8908b2b136 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7913,12 +7913,12 @@ static void test_pseudo_handle_security(void) ret = GetSecurityInfo(keys[i], SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr); if (keys[i] == HKEY_PERFORMANCE_DATA) - ok(ret == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], ret); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], ret); else if (keys[i] == HKEY_DYN_DATA) todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED || broken(ret == ERROR_INVALID_HANDLE) /* <7 */, "key %p: got error %u\n", keys[i], ret); else - todo_wine ok(!ret, "key %p: got error %u\n", keys[i], ret); + ok(!ret, "key %p: got error %u\n", keys[i], ret); LocalFree(sd_ptr); ret = GetSecurityInfo(keys[i], SE_KERNEL_OBJECT,

1 0

Alexandre Julliard : server: Add generic mapping masks for all object types.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 4d646de90d8a966516e72d27dd4af0adff2bc15d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d646de90d8a966516e72d27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 12:08:42 2021 +0100 server: Add generic mapping masks for all object types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 5 +++++ include/wine/server_protocol.h | 4 +++- server/completion.c | 7 +++++++ server/debugger.c | 7 +++++++ server/device.c | 7 +++++++ server/directory.c | 18 +++++++++++++++++- server/event.c | 14 ++++++++++++++ server/file.c | 7 +++++++ server/mapping.c | 7 +++++++ server/mutex.c | 7 +++++++ server/object.c | 12 +++++++++++- server/object.h | 2 ++ server/process.c | 16 ++++++++++++++++ server/protocol.def | 2 ++ server/registry.c | 7 +++++++ server/semaphore.c | 7 +++++++ server/symlink.c | 7 +++++++ server/thread.c | 8 ++++++++ server/timer.c | 7 +++++++ server/token.c | 8 ++++++++ server/trace.c | 7 +++++-- server/winstation.c | 18 ++++++++++++++++-- 22 files changed, 177 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d646de90d8a966516e7…

1 0

Alexandre Julliard : server: Use the object type information to implement access mapping.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: d6ef9401b3ef05e87e0cadd31992a6809008331e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6ef9401b3ef05e87e0cadd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 12:10:44 2021 +0100 server: Use the object type information to implement access mapping. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 1 - server/async.c | 4 ++-- server/atom.c | 2 +- server/change.c | 2 +- server/clipboard.c | 2 +- server/completion.c | 12 +----------- server/console.c | 16 ++++++++-------- server/debugger.c | 14 ++------------ server/device.c | 8 ++++---- server/directory.c | 4 ++-- server/event.c | 24 ++---------------------- server/fd.c | 18 ++++-------------- server/file.c | 21 +++++---------------- server/file.h | 1 - server/handle.c | 2 +- server/hook.c | 2 +- server/mailslot.c | 12 ++++-------- server/mapping.c | 16 +++------------- server/mutex.c | 12 +----------- server/named_pipe.c | 8 ++++---- server/object.c | 8 ++------ server/object.h | 11 ++++++++++- server/process.c | 24 ++++-------------------- server/queue.c | 4 ++-- server/registry.c | 8 ++------ server/request.c | 2 +- server/semaphore.c | 12 +----------- server/serial.c | 2 +- server/signal.c | 2 +- server/sock.c | 6 +++--- server/symlink.c | 12 +----------- server/thread.c | 14 ++++---------- server/timer.c | 12 +----------- server/token.c | 28 +++------------------------- server/winstation.c | 28 ++-------------------------- 35 files changed, 85 insertions(+), 269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6ef9401b3ef05e87e0c…

1 0

Alexandre Julliard : server: Add a request to return all object types.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: b6f774df695e4ba9b88a18cb1d47cdaa8b3fafee URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6f774df695e4ba9b88a18cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 12:14:51 2021 +0100 server: Add a request to return all object types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 79 +++++++++++++++++++++++++++++++++--------- include/wine/server_protocol.h | 20 ++++++++++- include/winternl.h | 7 +++- server/directory.c | 39 +++++++++++++++++++++ server/protocol.def | 8 +++++ server/request.h | 5 +++ server/trace.c | 20 +++++++++++ 7 files changed, 160 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6f774df695e4ba9b88a…

1 0

Alexandre Julliard : ntdll/tests: Add more tests for object types.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: d4156d1da8b4afdafa8a2993eb3735593e2b49e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4156d1da8b4afdafa8a2993… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 12:15:28 2021 +0100 ntdll/tests: Add more tests for object types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4156d1da8b4afdafa8a…

1 0

Daniel Lehman : include: Fix [v]sprintf_s declarations.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 3746381e7e8cf2671567712f6d3f17a9823e8c5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3746381e7e8cf2671567712f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Feb 1 17:42:16 2021 -0800 include: Fix [v]sprintf_s declarations. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 7dd177e9052..f78e3b36f2b 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -218,19 +218,19 @@ static inline int __cdecl vsprintf(char *buffer, const char *format, __ms_va_lis return ret < 0 ? -1 : ret; } -static inline int __cdecl vsprintf_s(char *buffer, const char *format, __ms_va_list args) +static inline int __cdecl vsprintf_s(char *buffer, size_t size, const char *format, __ms_va_list args) { - int ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args); + int ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); return ret < 0 ? -1 : ret; } -static inline int WINAPIV sprintf_s(char *buffer, size_t size, size_t count, const char *format, ...) +static inline int WINAPIV sprintf_s(char *buffer, size_t size, const char *format, ...) { int ret; __ms_va_list args; __ms_va_start(args, format); - ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args); + ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); __ms_va_end(args); return ret; }

1 0

Francois Gouget : testbot/TestWTBS: Fix the patch range when --jobs points to a non-patch job.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: tools Branch: master Commit: 1a7d958bfb7fb46696bb29abcfa43da674ecb9cd URL: https://source.winehq.org/git/tools.git/?a=commit;h=1a7d958bfb7fb46696bb29a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 5 16:03:35 2021 +0100 testbot/TestWTBS: Fix the patch range when --jobs points to a non-patch job. This resulted in an empty set of patch ranges which meant to check every patch. TestWTBS now distinguishes an undef $PatchRanges, which means to check all patches, from an empty @$PatchRanges, which means to ignore all patches. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 87b53fe..1cbec2e 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -131,11 +131,12 @@ while (@ARGV) } } -my $JobRanges = []; +my $JobRanges; if (!defined $Usage) { if (defined $OptJobs) { + $JobRanges = []; foreach my $Range (split /,+/, $OptJobs) { if ($Range =~ /^([0-9]+)$/) @@ -988,7 +989,11 @@ sub IsInRange($$) my ($Ranges, $Id) = @_; return 0 if (!$Id); - return 1 if (!$Ranges or !@$Ranges); + + # No range means to allow everything... + return 1 if (!$Ranges); + + # ...while an empty range means to reject everything foreach my $Range (@$Ranges) { return 1 if (($Range->[0] == 0 or $Range->[0] <= $Id) and @@ -1304,12 +1309,13 @@ sub CheckPatches() my $Jobs = CreateJobs(); my $Patches = CreatePatches(); - my $PatchRanges = []; + my $PatchRanges; if (@$JobRanges) { # Convert the job ranges into a list of patch ranges so that these patches: # 1. either have a job in the allowed job ranges, # 2. or have no job but are contiguous to a patch satisfying 1 or 2. + $PatchRanges = []; my ($First, $Last, $AddRange); foreach my $Patch (sort { $a->Id <=> $b->Id } @{$Patches->GetItems()}) {

1 0