August 2021 - Wine-commits - list.winehq.org

Anton Baskanov : fonts: Fix dotaccent glyph position in Small Fonts.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 80ef009fc123773ea118f3df57d54f727cab6893 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ef009fc123773ea118f3df… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Aug 29 21:06:25 2021 +0700 fonts: Fix dotaccent glyph position in Small Fonts. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/small_fonts.sfd | 2 +- fonts/small_fonts.ttf | Bin 19068 -> 19068 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/small_fonts.sfd b/fonts/small_fonts.sfd index 28dcee28e12..e8494c8dc8e 100644 --- a/fonts/small_fonts.sfd +++ b/fonts/small_fonts.sfd @@ -4638,7 +4638,7 @@ BDFChar: 281 369 5 1 4 0 7 :nRfMOH>QC BDFChar: 282 355 3 1 2 -2 5 JA?\cJ3ZB8 -BDFChar: 283 729 2 0 0 10 10 +BDFChar: 283 729 2 0 0 8 8 J,fQL BDFChar: 284 8470 9 0 8 0 6 `;mo.V#[:kQ[k;#MuWhX diff --git a/fonts/small_fonts.ttf b/fonts/small_fonts.ttf index a35230941a7..0e5e7f4127b 100644 Binary files a/fonts/small_fonts.ttf and b/fonts/small_fonts.ttf differ

1 0

Zebediah Figura : kernel32/tests: Add some tests for IOCTL_MOUNTMGR_QUERY_POINTS.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: c342afeff8b47a2f5c3b57db0b9a606df5587470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c342afeff8b47a2f5c3b57db… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 22:25:56 2021 -0500 kernel32/tests: Add some tests for IOCTL_MOUNTMGR_QUERY_POINTS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 89 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index ed3897a6b94..1670ab69222 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -18,14 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" +#include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" #include "winbase.h" #include "winioctl.h" #include "ntddstor.h" #include "winternl.h" -#include <stdio.h> #include "ddk/ntddcdvd.h" #include "ddk/mountmgr.h" +#include "wine/test.h" #include <pshpack1.h> struct COMPLETE_DVD_LAYER_DESCRIPTOR @@ -1619,6 +1622,87 @@ static void test_GetVolumeInformationByHandle(void) CloseHandle( file ); } +static void test_mountmgr_query_points(void) +{ + char input_buffer[64]; + MOUNTMGR_MOUNT_POINTS *output; + MOUNTMGR_MOUNT_POINT *input = (MOUNTMGR_MOUNT_POINT *)input_buffer; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + + output = malloc(1024); + + file = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, 0, 0, NULL, OPEN_EXISTING, 0, NULL ); + ok(file != INVALID_HANDLE_VALUE, "failed to open mountmgr, error %u\n", GetLastError()); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, NULL, 0, NULL, 0 ); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + + memset( input, 0, sizeof(*input) ); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input) - 1, NULL, 0 ); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), NULL, 0 ); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + memset(output, 0xcc, sizeof(*output)); + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), output, sizeof(*output) - 1 ); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + todo_wine ok(output->Size == 0xcccccccc, "got size %u\n", output->Size); + ok(output->NumberOfMountPoints == 0xcccccccc, "got count %u\n", output->NumberOfMountPoints); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + memset(output, 0xcc, sizeof(*output)); + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), output, sizeof(*output) ); + todo_wine ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + todo_wine ok(io.Status == STATUS_BUFFER_OVERFLOW, "got status %#x\n", io.Status); + todo_wine ok(io.Information == offsetof(MOUNTMGR_MOUNT_POINTS, MountPoints[0]), "got information %#Ix\n", io.Information); + ok(output->Size > offsetof(MOUNTMGR_MOUNT_POINTS, MountPoints[0]), "got size %u\n", output->Size); + todo_wine ok(output->NumberOfMountPoints && output->NumberOfMountPoints != 0xcccccccc, + "got count %u\n", output->NumberOfMountPoints); + + output = realloc(output, output->Size); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), output, output->Size ); + ok(!status, "got %#x\n", status); + ok(!io.Status, "got status %#x\n", io.Status); + ok(io.Information == output->Size, "got size %u, information %#Ix\n", output->Size, io.Information); + ok(output->Size > offsetof(MOUNTMGR_MOUNT_POINTS, MountPoints[0]), "got size %u\n", output->Size); + ok(output->NumberOfMountPoints && output->NumberOfMountPoints != 0xcccccccc, + "got count %u\n", output->NumberOfMountPoints); + + CloseHandle( file ); + + free(output); +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -1650,4 +1734,5 @@ START_TEST(volume) test_cdrom_ioctl(); test_mounted_folder(); test_GetVolumeInformationByHandle(); + test_mountmgr_query_points(); }

1 0

Zebediah Figura : mountmgr: Validate the output size for IOCTL_MOUNTMGR_QUERY_POINTS.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 17ebac8482e45de9fe431ab35d8036edf7178765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17ebac8482e45de9fe431ab3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 22:25:57 2021 -0500 mountmgr: Validate the output size for IOCTL_MOUNTMGR_QUERY_POINTS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 6 +++--- dlls/mountmgr.sys/mountmgr.c | 12 ++++-------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 1670ab69222..4915e744eba 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -1658,7 +1658,7 @@ static void test_mountmgr_query_points(void) io.Information = 0xdeadf00d; status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), NULL, 0 ); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); @@ -1667,10 +1667,10 @@ static void test_mountmgr_query_points(void) memset(output, 0xcc, sizeof(*output)); status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), output, sizeof(*output) - 1 ); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); - todo_wine ok(output->Size == 0xcccccccc, "got size %u\n", output->Size); + ok(output->Size == 0xcccccccc, "got size %u\n", output->Size); ok(output->NumberOfMountPoints == 0xcccccccc, "got count %u\n", output->NumberOfMountPoints); io.Status = 0xdeadf00d; diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 50be9eb740f..a61140d847e 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -168,8 +168,9 @@ static NTSTATUS query_mount_points( void *buff, SIZE_T insize, MOUNTMGR_MOUNT_POINTS *info; struct mount_point *mount; - /* sanity checks */ - if (input->SymbolicLinkNameOffset + input->SymbolicLinkNameLength > insize || + if (insize < sizeof(*input) || + outsize < sizeof(*info) || + input->SymbolicLinkNameOffset + input->SymbolicLinkNameLength > insize || input->UniqueIdOffset + input->UniqueIdLength > insize || input->DeviceNameOffset + input->DeviceNameLength > insize || input->SymbolicLinkNameOffset + input->SymbolicLinkNameLength < input->SymbolicLinkNameOffset || @@ -193,7 +194,7 @@ static NTSTATUS query_mount_points( void *buff, SIZE_T insize, if (size > outsize) { info = buff; - if (size >= sizeof(info->Size)) info->Size = size; + info->Size = size; iosb->Information = sizeof(info->Size); return STATUS_MORE_ENTRIES; } @@ -907,11 +908,6 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) switch(irpsp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_MOUNTMGR_QUERY_POINTS: - if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(MOUNTMGR_MOUNT_POINT)) - { - status = STATUS_INVALID_PARAMETER; - break; - } status = query_mount_points( irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength,

1 0

Zebediah Figura : mountmgr: Return STATUS_BUFFER_OVERFLOW if an insufficient buffer is passed to IOCTL_MOUNTMGR_QUERY_POINTS.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: a200c47c329b6f0cd6904f629f555b1841b17665 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a200c47c329b6f0cd6904f62… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 22:25:58 2021 -0500 mountmgr: Return STATUS_BUFFER_OVERFLOW if an insufficient buffer is passed to IOCTL_MOUNTMGR_QUERY_POINTS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 4 ++-- dlls/mountmgr.sys/mountmgr.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 4915e744eba..cb35de6add1 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -1678,8 +1678,8 @@ static void test_mountmgr_query_points(void) memset(output, 0xcc, sizeof(*output)); status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), output, sizeof(*output) ); - todo_wine ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); - todo_wine ok(io.Status == STATUS_BUFFER_OVERFLOW, "got status %#x\n", io.Status); + ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + ok(io.Status == STATUS_BUFFER_OVERFLOW, "got status %#x\n", io.Status); todo_wine ok(io.Information == offsetof(MOUNTMGR_MOUNT_POINTS, MountPoints[0]), "got information %#Ix\n", io.Information); ok(output->Size > offsetof(MOUNTMGR_MOUNT_POINTS, MountPoints[0]), "got size %u\n", output->Size); todo_wine ok(output->NumberOfMountPoints && output->NumberOfMountPoints != 0xcccccccc, diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index a61140d847e..d5cf1ae5c4b 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -196,7 +196,7 @@ static NTSTATUS query_mount_points( void *buff, SIZE_T insize, info = buff; info->Size = size; iosb->Information = sizeof(info->Size); - return STATUS_MORE_ENTRIES; + return STATUS_BUFFER_OVERFLOW; } input = HeapAlloc( GetProcessHeap(), 0, insize );

1 0

Zebediah Figura : mountmgr: Return STATUS_BUFFER_OVERFLOW if an insufficient buffer is passed to IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 33ed41950dd900bf213511e3674d4c47fe7d3323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ed41950dd900bf213511e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 22:25:59 2021 -0500 mountmgr: Return STATUS_BUFFER_OVERFLOW if an insufficient buffer is passed to IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS. STATUS_MORE_ENTRIES is used for directory enumeration APIs, and signals that a continuation will be returned on the next call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index d5cf1ae5c4b..757983c3f0b 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -319,7 +319,7 @@ static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, vo { if (offset >= sizeof(query->size)) query->size = offset; offset = sizeof(query->size); - irp->IoStatus.u.Status = STATUS_MORE_ENTRIES; + irp->IoStatus.u.Status = STATUS_BUFFER_OVERFLOW; goto err; } }

1 0

Zebediah Figura : mountmgr: Return STATUS_BUFFER_OVERFLOW if an insufficient buffer is passed to IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 56104123d9721c4ab99425421275acaf70a3c41e URL: https://source.winehq.org/git/wine.git/?a=commit;h=56104123d9721c4ab9942542… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 22:26:00 2021 -0500 mountmgr: Return STATUS_BUFFER_OVERFLOW if an insufficient buffer is passed to IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS. STATUS_MORE_ENTRIES is used for directory enumeration APIs, and signals that a continuation will be returned on the next call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 757983c3f0b..1e018a9fc0b 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -877,7 +877,7 @@ static NTSTATUS enumerate_credentials( void *buff, SIZE_T insize, SIZE_T outsize { if (size >= sizeof(list->size)) list->size = size; iosb->Information = sizeof(list->size); - status = STATUS_MORE_ENTRIES; + status = STATUS_BUFFER_OVERFLOW; } else {

1 0

Zebediah Figura : nsiproxy: Return STATUS_BUFFER_OVERFLOW to signal short buffers.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: bd1aed5319601da9fe2157ffc40c52ae23f7b940 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd1aed5319601da9fe2157ff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 22:26:01 2021 -0500 nsiproxy: Return STATUS_BUFFER_OVERFLOW to signal short buffers. STATUS_MORE_ENTRIES is used for directory enumeration APIs, and signals that a continuation will be returned on the next call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/device.c | 2 +- dlls/nsiproxy.sys/ip.c | 6 +++--- dlls/nsiproxy.sys/ndis.c | 2 +- dlls/nsiproxy.sys/tcp.c | 2 +- dlls/nsiproxy.sys/udp.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index aa1d7a08bf7..c4db45dfad2 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -74,7 +74,7 @@ static void nsiproxy_enumerate_all( IRP *irp ) enum_all.count = in->count; irp->IoStatus.u.Status = nsi_enumerate_all_ex( &enum_all ); - if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_MORE_ENTRIES) + if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_BUFFER_OVERFLOW) { irp->IoStatus.Information = out_len; *(DWORD *)out = enum_all.count; diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index e2e292f4b59..12fae3f2f12 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -754,7 +754,7 @@ static NTSTATUS ip_unicast_enumerate_all( int family, void *key_data, DWORD key_ freeifaddrs( addrs ); if (!want_data || num <= *count) *count = num; - else status = STATUS_MORE_ENTRIES; + else status = STATUS_BUFFER_OVERFLOW; return status; } @@ -990,7 +990,7 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo #endif if (!want_data || num <= *count) *count = num; - else status = STATUS_MORE_ENTRIES; + else status = STATUS_BUFFER_OVERFLOW; return status; } @@ -1233,7 +1233,7 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void #endif if (!want_data || num <= *count) *count = num; - else status = STATUS_MORE_ENTRIES; + else status = STATUS_BUFFER_OVERFLOW; return status; } diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 40a60e45c46..bf237ea16db 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -488,7 +488,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d LeaveCriticalSection( &if_list_cs ); if (!want_data || num <= *count) *count = num; - else status = STATUS_MORE_ENTRIES; + else status = STATUS_BUFFER_OVERFLOW; return status; } diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 603aefadfe9..f9ddf1a2b23 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -736,7 +736,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * #endif if (!want_data || num <= *count) *count = num; - else status = STATUS_MORE_ENTRIES; + else status = STATUS_BUFFER_OVERFLOW; heap_free( pid_map ); heap_free( addr_scopes ); diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 190eb7f21f5..112170782f7 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -390,7 +390,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void #endif if (!want_data || num <= *count) *count = num; - else status = STATUS_MORE_ENTRIES; + else status = STATUS_BUFFER_OVERFLOW; heap_free( pid_map ); heap_free( addr_scopes );

1 0

Zebediah Figura : kernelbase: Return TRUE from DeviceIoControl() if the NT status denotes success.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 7b9617ef2f2ce175a42d20c6739c40ed2168a5d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b9617ef2f2ce175a42d20c6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 22:26:02 2021 -0500 kernelbase: Return TRUE from DeviceIoControl() if the NT status denotes success. Likely a similar treatment should be given to other kernelbase APIs, but it's not immediately clear which. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 3 ++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index d21ad299d1f..a4d26c2a1be 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -4116,7 +4116,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeviceIoControl( HANDLE handle, DWORD code, void * in_buff, in_count, out_buff, out_count ); if (returned) *returned = piosb->Information; - return set_ntstatus( status ); + if (status == STATUS_PENDING || !NT_SUCCESS( status )) return set_ntstatus( status ); + return TRUE; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index dc10497caee..9ee2f55a826 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -663,17 +663,17 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) size = 0xdeadf00d; SetLastError(0xdeadf00d); ret = DeviceIoControl(device, ioctl, params, sizeof(*params), buffer, sizeof(buffer), &size, NULL); - todo_wine_if (NT_SUCCESS(expect_status) != !params->iosb_status) + todo_wine_if (NT_SUCCESS(expect_status) != NT_SUCCESS(params->iosb_status)) ok(ret == NT_SUCCESS(expect_status), "got %d\n", ret); if (NT_SUCCESS(expect_status)) { - todo_wine_if (params->iosb_status) + todo_wine_if (!NT_SUCCESS(params->iosb_status)) ok(GetLastError() == 0xdeadf00d, "got error %u\n", GetLastError()); } else { todo_wine_if (RtlNtStatusToDosError(expect_status) != RtlNtStatusToDosError(params->iosb_status) - || params->iosb_status == STATUS_PENDING) + || NT_SUCCESS(params->iosb_status)) ok(GetLastError() == RtlNtStatusToDosError(expect_status), "got error %u\n", GetLastError()); } if (NT_ERROR(expect_status))

1 0

Alexandre Julliard : makefiles: Always link Unix libraries against ntdll.so.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 2781af45d574f05464d1059a54dfce299d836f0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2781af45d574f05464d1059a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 11:12:51 2021 +0200 makefiles: Always link Unix libraries against ntdll.so. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 43141a472fa..59857762edd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3365,7 +3365,7 @@ static void output_module( struct makefile *make ) if (native_unix_lib) { - if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) + if (strcmp( make->module, "ntdll.dll" )) { strarray_add( &unix_libs, "-lntdll" ); strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" ));

1 0

Alexandre Julliard : win32u: Add the infrastructure for building the syscall table.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 33e99ce5f750331a287b033fe98d949011a41f18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33e99ce5f750331a287b033f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 11:18:20 2021 +0200 win32u: Add the infrastructure for building the syscall table. With a simple NtGdiFlush() export as example. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/Makefile.in | 8 ++++++ dlls/win32u/main.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 3 ++- 4 files changed, 138 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 4147d8586b9..9dce0bc39fd 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -1 +1,9 @@ MODULE = win32u.dll +IMPORTS = ntdll winecrt0 +EXTRALIBS = -Wl,--subsystem,unixlib + +EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin -Wb,--syscall-table,1 + +C_SRCS = \ + main.c \ + syscall.c diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c new file mode 100644 index 00000000000..f0a052be545 --- /dev/null +++ b/dlls/win32u/main.c @@ -0,0 +1,65 @@ +/* + * Win32u kernel interface + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "wine/exception.h" +#include "wine/unixlib.h" + +extern void *__wine_syscall_dispatcher DECLSPEC_HIDDEN; + +static unixlib_handle_t win32u_handle; + +void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *function ) +{ + EXCEPTION_RECORD record; + + record.ExceptionCode = EXCEPTION_WINE_STUB; + record.ExceptionFlags = EH_NONCONTINUABLE; + record.ExceptionRecord = NULL; + record.ExceptionAddress = __wine_spec_unimplemented_stub; + record.NumberParameters = 2; + record.ExceptionInformation[0] = (ULONG_PTR)module; + record.ExceptionInformation[1] = (ULONG_PTR)function; + for (;;) RtlRaiseException( &record ); +} + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + LdrDisableThreadCalloutsForDll( inst ); + if (__wine_syscall_dispatcher) break; /* already set through Wow64Transition */ + if (!NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs, + &win32u_handle, sizeof(win32u_handle), NULL )) + { + __wine_unix_call( win32u_handle, 0, &__wine_syscall_dispatcher ); + } + break; + } + return TRUE; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c new file mode 100644 index 00000000000..cb9d88a5b92 --- /dev/null +++ b/dlls/win32u/syscall.c @@ -0,0 +1,63 @@ +/* + * Unix interface for Win32 syscalls + * + * Copyright (C) 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winnt.h" +#include "winternl.h" +#include "wine/unixlib.h" + + +/*********************************************************************** + * NtGdiFlush (win32u.@) + */ +BOOL WINAPI NtGdiFlush(void) +{ + return TRUE; +} + +static void * const syscalls[] = +{ + NtGdiFlush, +}; + +static BYTE arguments[ARRAY_SIZE(syscalls)]; + +static SYSTEM_SERVICE_TABLE syscall_table = +{ + (ULONG_PTR *)syscalls, + 0, + ARRAY_SIZE(syscalls), + arguments +}; + +static NTSTATUS init( void *dispatcher ) +{ + return ntdll_init_syscalls( 1, &syscall_table, dispatcher ); +} + +unixlib_entry_t __wine_unix_call_funcs[] = { init }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 57d1871f453..7bb8c334069 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1,3 +1,4 @@ +@ extern -arch=win32 Wow64Transition __wine_syscall_dispatcher @ stub NtBindCompositionSurface @ stub NtCloseCompositionInputSink @ stub NtCompositionInputThread @@ -435,7 +436,7 @@ @ stub NtGdiFillPath @ stub NtGdiFillRgn @ stub NtGdiFlattenPath -@ stub NtGdiFlush +@ stdcall -syscall NtGdiFlush() @ stub NtGdiFontIsLinked @ stub NtGdiForceUFIMapping @ stub NtGdiFrameRgn

1 0