November 2018 - Wine-Commits

Michael Stefaniuc : xaudio2_7: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 47fbcece36cad190c4d18f7636df67d1382b7545 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47fbcece36cad190c4d18f76… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 16 21:50:38 2018 +0100 xaudio2_7: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index b9f4166..4980e25 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -2102,7 +2102,7 @@ static HRESULT WINAPI XA20_GetDeviceDetails(IXAudio20 *iface, UINT32 index, goto done; } - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, sizeof(pDeviceDetails->DisplayName)/sizeof(WCHAR)); + lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); PropVariantClear(&var); @@ -2385,7 +2385,7 @@ static HRESULT WINAPI XA22_GetDeviceDetails(IXAudio22 *iface, UINT32 index, goto done; } - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, sizeof(pDeviceDetails->DisplayName)/sizeof(WCHAR)); + lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); PropVariantClear(&var); @@ -2667,7 +2667,7 @@ static HRESULT WINAPI XA27_GetDeviceDetails(IXAudio27 *iface, UINT32 index, goto done; } - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, sizeof(pDeviceDetails->DisplayName)/sizeof(WCHAR)); + lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); PropVariantClear(&var);

1 0

Henri Verbeet : d3d9: Disallow index buffers in the scratch pool.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 2843e4d3cf119e60329391740fbda5f9fd08febd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2843e4d3cf119e6032939174… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 16:54:42 2018 +0330 d3d9: Disallow index buffers in the scratch pool. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 3 +++ dlls/d3d9/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index ea98ef4..b870107 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -572,6 +572,9 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de struct wined3d_buffer_desc desc; HRESULT hr; + if (pool == D3DPOOL_SCRATCH) + return D3DERR_INVALIDCALL; + desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9f293a8..d0e5660 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12967,7 +12967,7 @@ static void test_resource_access(void) hr = IDirect3DDevice9_CreateIndexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib, NULL); - todo_wine_if(tests[i].pool == D3DPOOL_SCRATCH || tests[i].usage & ~D3DUSAGE_DYNAMIC) + todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC) ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr))

1 0

Greg Smith : kernel32: Ignore FileIoPriorityHintInfo in SetFileInformationByHandle().
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: f4b07ee8eceb1d85b2bfd521462d010db00bee29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4b07ee8eceb1d85b2bfd521… Author: Greg Smith <codedonewell(a)gmail.com> Date: Mon Nov 19 07:13:50 2018 +1100 kernel32: Ignore FileIoPriorityHintInfo in SetFileInformationByHandle(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46130 Signed-off-by: Greg Smith <codedonewell(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 5 +++-- dlls/kernel32/tests/file.c | 23 +++++++++++++++++++++++ dlls/ntdll/file.c | 12 ++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index eeccf67..3214d72 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1103,7 +1103,6 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c case FileStreamInfo: case FileIdBothDirectoryInfo: case FileIdBothDirectoryRestartInfo: - case FileIoPriorityHintInfo: case FileFullDirectoryInfo: case FileFullDirectoryRestartInfo: case FileStorageInfo: @@ -1118,7 +1117,9 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c case FileDispositionInfo: status = NtSetInformationFile( file, &io, info, size, FileDispositionInformation ); break; - + case FileIoPriorityHintInfo: + status = NtSetInformationFile( file, &io, info, size, FileIoPriorityHintInformation ); + break; case FileStandardInfo: case FileCompressionInfo: case FileAttributeTagInfo: diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 168bdd5..d1b76bb 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4914,6 +4914,7 @@ static void test_SetFileInformationByHandle(void) FILE_STANDARD_INFO stdinfo = { {{0}},{{0}},0,FALSE,FALSE }; FILE_COMPRESSION_INFO compressinfo; FILE_DISPOSITION_INFO dispinfo; + DECLSPEC_ALIGN(8) FILE_IO_PRIORITY_HINT_INFO hintinfo; char tempFileName[MAX_PATH]; char tempPath[MAX_PATH]; HANDLE file; @@ -4950,6 +4951,28 @@ static void test_SetFileInformationByHandle(void) ret = pSetFileInformationByHandle(file, FileAttributeTagInfo, &fileattrinfo, sizeof(fileattrinfo)); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + SetLastError(0xdeadbeef); + hintinfo.PriorityHint = MaximumIoPriorityHintType; + ret = pSetFileInformationByHandle(file, FileIoPriorityHintInfo, &hintinfo, sizeof(hintinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + hintinfo.PriorityHint = IoPriorityHintNormal; + ret = pSetFileInformationByHandle(file, FileIoPriorityHintInfo, &hintinfo, sizeof(hintinfo)); + ok(ret, "setting FileIoPriorityHintInfo got %d, error %d\n", ret, GetLastError()); + + hintinfo.PriorityHint = IoPriorityHintVeryLow; + ret = pSetFileInformationByHandle(file, FileIoPriorityHintInfo, &hintinfo, sizeof(hintinfo)); + ok(ret, "setting FileIoPriorityHintInfo got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileIoPriorityHintInfo, &hintinfo, sizeof(hintinfo) - 1); + ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + hintinfo.PriorityHint = IoPriorityHintVeryLow - 1; + ret = pSetFileInformationByHandle(file, FileIoPriorityHintInfo, &hintinfo, sizeof(hintinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + memset(&protinfo, 0, sizeof(protinfo)); protinfo.StructureVersion = 1; protinfo.StructureSize = sizeof(protinfo); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 7c8b8ed..a43fe71 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2671,6 +2671,18 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, io->u.Status = STATUS_INFO_LENGTH_MISMATCH; break; + case FileIoPriorityHintInformation: + if (len >= sizeof(FILE_IO_PRIORITY_HINT_INFO)) + { + FILE_IO_PRIORITY_HINT_INFO *info = ptr; + if (info->PriorityHint < MaximumIoPriorityHintType) + TRACE( "ignoring FileIoPriorityHintInformation %u\n", info->PriorityHint ); + else + io->u.Status = STATUS_INVALID_PARAMETER; + } + else io->u.Status = STATUS_INFO_LENGTH_MISMATCH; + break; + case FileAllInformation: io->u.Status = STATUS_INVALID_INFO_CLASS; break;

1 0

Zhiyi Zhang : mountmgr: Add IOCTL_STORAGE_QUERY_PROPERTY stub.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 33de7fb7a8522052d34c0d26067720d007a9dad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33de7fb7a8522052d34c0d26… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 19 10:54:42 2018 +0800 mountmgr: Add IOCTL_STORAGE_QUERY_PROPERTY stub. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 46 ++++++++++++++++++++++++++++ dlls/mountmgr.sys/device.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 2de66cd..21a2b31 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -21,6 +21,7 @@ #include "wine/test.h" #include "winbase.h" #include "winioctl.h" +#include "ntddstor.h" #include <stdio.h> #include "ddk/ntddcdvd.h" @@ -590,6 +591,50 @@ static void test_disk_extents(void) CloseHandle( handle ); } +static void test_disk_query_property(void) +{ + STORAGE_PROPERTY_QUERY query = {0}; + STORAGE_DESCRIPTOR_HEADER header = {0}; + STORAGE_DEVICE_DESCRIPTOR descriptor = {0}; + HANDLE handle; + DWORD error; + DWORD size; + BOOL ret; + + handle = CreateFileA("\\\\.\\PhysicalDrive0", GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + 0, 0); + if (handle == INVALID_HANDLE_VALUE) + { + win_skip("can't open \\\\.\\PhysicalDrive0 %#x\n", GetLastError()); + return; + } + + query.PropertyId = StorageDeviceProperty; + query.QueryType = PropertyStandardQuery; + + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_QUERY_PROPERTY, &query, sizeof(query), &header, sizeof(header), &size, + NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(header), "got size %d\n", size); + ok(header.Version == sizeof(descriptor), "got header.Version %d\n", header.Version); + ok(header.Size >= sizeof(descriptor), "got header.Size %d\n", header.Size); + + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_QUERY_PROPERTY, &query, sizeof(query), &descriptor, sizeof(descriptor), + &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(descriptor), "got size %d\n", size); + ok(descriptor.Version == sizeof(descriptor), "got descriptor.Version %d\n", descriptor.Version); + ok(descriptor.Size >= sizeof(descriptor), "got descriptor.Size %d\n", descriptor.Size); + + CloseHandle(handle); +} + static void test_GetVolumePathNameA(void) { char volume_path[MAX_PATH], cwd[MAX_PATH]; @@ -1238,6 +1283,7 @@ START_TEST(volume) test_GetVolumeInformationA(); test_enum_vols(); test_disk_extents(); + test_disk_query_property(); test_GetVolumePathNamesForVolumeNameA(); test_GetVolumePathNamesForVolumeNameW(); test_cdrom_ioctl(); diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index f96b05e..6604b69 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -890,6 +890,74 @@ NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, ch return status; } +static void query_property(IRP *irp) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + STORAGE_PROPERTY_QUERY *query = irp->AssociatedIrp.SystemBuffer; + + if (!irp->AssociatedIrp.SystemBuffer + || irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(STORAGE_PROPERTY_QUERY)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + /* Try to persuade application not to check property */ + if (query->QueryType == PropertyExistsQuery) + { + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + return; + } + + switch (query->PropertyId) + { + case StorageDeviceProperty: + { + STORAGE_DEVICE_DESCRIPTOR *descriptor; + + if (!irp->UserBuffer + || irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER)) + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DEVICE_DESCRIPTOR)) + { + descriptor = irp->UserBuffer; + descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR); + descriptor->Size = sizeof(STORAGE_DEVICE_DESCRIPTOR); + irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + else + { + FIXME( "Faking StorageDeviceProperty data\n" ); + + memset( irp->UserBuffer, 0, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + descriptor = irp->UserBuffer; + descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR); + descriptor->Size = sizeof(STORAGE_DEVICE_DESCRIPTOR); + descriptor->DeviceType = FILE_DEVICE_DISK; + descriptor->DeviceTypeModifier = 0; + descriptor->RemovableMedia = FALSE; + descriptor->CommandQueueing = FALSE; + descriptor->VendorIdOffset = 0; + descriptor->ProductIdOffset = 0; + descriptor->ProductRevisionOffset = 0; + descriptor->SerialNumberOffset = 0; + descriptor->BusType = BusTypeScsi; + descriptor->RawPropertiesLength = 0; + + irp->IoStatus.Information = sizeof(STORAGE_DEVICE_DESCRIPTOR); + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + + break; + } + default: + FIXME( "Unsupported property %#x\n", query->PropertyId ); + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + break; + } +} + /* handler for ioctls on the harddisk device */ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) { @@ -962,6 +1030,9 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.u.Status = STATUS_SUCCESS; break; } + case IOCTL_STORAGE_QUERY_PROPERTY: + query_property( irp ); + break; default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;

1 0

Zebediah Figura : setupapi/tests: Add more tests for creating and removing devices.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: f86e79657452383a0af0544c28488f6d91015578 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f86e79657452383a0af0544c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 19 19:29:07 2018 -0600 setupapi/tests: Add more tests for creating and removing devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 2 +- dlls/setupapi/tests/devinst.c | 117 +++++++++++++++++++++++++++++++++------- 2 files changed, 98 insertions(+), 21 deletions(-) diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index a656441..86e7ad2 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = setupapi.dll -IMPORTS = setupapi user32 advapi32 shell32 +IMPORTS = advapi32 setupapi shell32 uuid user32 C_SRCS = \ devinst.c \ diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index ab051d8..f5d0f8c 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -329,13 +329,39 @@ static void test_install_class(void) DeleteFileA(tmpfile); } +static void check_device_info_(int line, HDEVINFO set, int index, const GUID *class, const char *expect_id) +{ + SP_DEVINFO_DATA device = {sizeof(device)}; + char id[50]; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = SetupDiEnumDeviceInfo(set, index, &device); + if (expect_id) + { + ok_(__FILE__, line)(ret, "Got unexpected error %#x.\n", GetLastError()); + ok_(__FILE__, line)(IsEqualGUID(&device.ClassGuid, class), + "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok_(__FILE__, line)(ret, "Got unexpected error %#x.\n", GetLastError()); + ok_(__FILE__, line)(!strcasecmp(id, expect_id), "Got unexpected id %s.\n", id); + } + else + { + ok_(__FILE__, line)(!ret, "Expected failure.\n"); + ok_(__FILE__, line)(GetLastError() == ERROR_NO_MORE_ITEMS, + "Got unexpected error %#x.\n", GetLastError()); + } +} +#define check_device_info(a,b,c,d) check_device_info_(__LINE__,a,b,c,d) + static void test_device_info(void) { static const GUID deadbeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; - SP_DEVINFO_DATA device = {0}; - BOOL ret; + SP_DEVINFO_DATA device = {0}, ret_device = {sizeof(ret_device)}; HDEVINFO set; - DWORD i; + char id[50]; + BOOL ret; SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL); @@ -355,44 +381,95 @@ static void test_device_info(void) ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - /* We can't add device information to the set with a different GUID */ SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &deadbeef, NULL, NULL, 0, NULL); ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_CLASS_MISMATCH, "Got unexpected error %#x.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &GUID_NULL, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_CLASS_MISMATCH, "Got unexpected error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, NULL); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); - /* This fails because the device ID already exists.. */ + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0000"); + check_device_info(set, 1, &guid, NULL); + SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, "Got unexpected error %#x.\n", GetLastError()); - /* whereas this "fails" because cbSize is wrong.. */ SetLastError(0xdeadbeef); - ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device); ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); - /* and this finally succeeds. */ - device.cbSize = sizeof(device); - ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device); - ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0000"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\0001"); + check_device_info(set, 2, &guid, NULL); - /* There were three devices added, however - the second failure just - * resulted in the SP_DEVINFO_DATA not getting copied. */ - SetLastError(0xdeadbeef); - i = 0; - while (SetupDiEnumDeviceInfo(set, i, &device)) - i++; - ok(i == 3, "Expected 3 devices, got %d.\n", i); - ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + device.cbSize = sizeof(device); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0002", &guid, NULL, NULL, 0, &device); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(IsEqualGUID(&device.ClassGuid, &guid), "Got unexpected class %s.\n", + wine_dbgstr_guid(&device.ClassGuid)); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(!strcmp(id, "ROOT\\LEGACY_BOGUS\\0002"), "Got unexpected id %s.\n", id); + + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0000"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\0001"); + check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\0002"); + check_device_info(set, 3, &guid, NULL); ret = SetupDiRemoveDevice(set, &device); todo_wine - ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0000"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\0001"); + + ret = SetupDiEnumDeviceInfo(set, 2, &ret_device); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(IsEqualGUID(&ret_device.ClassGuid, &guid), "Got unexpected class %s.\n", + wine_dbgstr_guid(&ret_device.ClassGuid)); + ret = SetupDiGetDeviceInstanceIdA(set, &ret_device, id, sizeof(id), NULL); +todo_wine { + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_NO_SUCH_DEVINST, "Got unexpected error %#x.\n", GetLastError()); +} + ok(ret_device.DevInst == device.DevInst, "Expected device node %#x, got %#x.\n", + device.DevInst, ret_device.DevInst); + + check_device_info(set, 3, &guid, NULL); + + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiCreateDeviceInfoList(NULL, NULL); + ok(set != NULL, "Failed to create device info, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\deadbeef", &deadbeef, NULL, NULL, 0, NULL); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\null", &GUID_NULL, NULL, NULL, 0, NULL); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\testguid", &guid, NULL, NULL, 0, NULL); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + check_device_info(set, 0, &deadbeef, "ROOT\\LEGACY_BOGUS\\deadbeef"); + check_device_info(set, 1, &GUID_NULL, "ROOT\\LEGACY_BOGUS\\null"); + check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\testguid"); + check_device_info(set, 3, NULL, NULL); + SetupDiDestroyDeviceInfoList(set); }

1 0

Zebediah Figura : setupapi/tests: Remove workarounds in testCreateDeviceInfo().
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 3af97988f1775de0767d98f2d2ffc8d32f610006 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3af97988f1775de0767d98f2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 19 19:29:06 2018 -0600 setupapi/tests: Remove workarounds in testCreateDeviceInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 124 +++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 69 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 1df049e..ab051d8 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -40,7 +40,6 @@ static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOI static BOOL (WINAPI *pSetupDiCreateDeviceInterfaceA)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); -static BOOL (WINAPI *pSetupDiEnumDeviceInfo)(HDEVINFO, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiEnumDeviceInterfaces)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, DWORD, PSP_DEVICE_INTERFACE_DATA); static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); @@ -77,7 +76,6 @@ static void init_function_pointers(void) pSetupDiCreateDeviceInterfaceA = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInterfaceA"); pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); - pSetupDiEnumDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInfo"); pSetupDiEnumDeviceInterfaces = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInterfaces"); pSetupDiGetDeviceInstanceIdA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInstanceIdA"); pSetupDiGetDeviceInterfaceDetailA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInterfaceDetailA"); @@ -331,83 +329,71 @@ static void test_install_class(void) DeleteFileA(tmpfile); } -static void testCreateDeviceInfo(void) +static void test_device_info(void) { + static const GUID deadbeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; + SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; + DWORD i; SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL); - ok(!ret, "Expected failure\n"); - ok(GetLastError() == ERROR_INVALID_DEVINST_NAME || - GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, - "Unexpected last error, got %08x\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DEVINST_NAME, "Got unexpected error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInfoA(NULL, "Root\\LEGACY_BOGUS\\0000", NULL, - NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLEHANDLE, got %08x\n", GetLastError()); - set = pSetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %08x\n", - GetLastError()); - if (set) - { - SP_DEVINFO_DATA devInfo = { 0 }; - DWORD i; - static GUID deadbeef = - {0xdeadbeef, 0xdead, 0xbeef, {0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; + ret = SetupDiCreateDeviceInfoA(NULL, "Root\\LEGACY_BOGUS\\0000", NULL, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); - /* No GUID given */ - SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL, - NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "Failed to create device info, error %#x.\n", GetLastError()); - /* We can't add device information to the set with a different GUID */ - SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", - &deadbeef, NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_CLASS_MISMATCH, - "Expected ERROR_CLASS_MISMATCH, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - /* Finally, with all three required parameters, this succeeds: */ - ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, - NULL, NULL, 0, NULL); - ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); - /* This fails because the device ID already exists.. */ - SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, - NULL, NULL, 0, &devInfo); - ok(!ret && GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, - "Expected ERROR_DEVINST_ALREADY_EXISTS, got %08x\n", GetLastError()); - /* whereas this "fails" because cbSize is wrong.. */ - SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, - DICD_GENERATE_ID, &devInfo); - ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, - "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); - /* and this finally succeeds. */ - devInfo.cbSize = sizeof(devInfo); - ret = pSetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, - DICD_GENERATE_ID, &devInfo); - ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); - /* There were three devices added, however - the second failure just - * resulted in the SP_DEVINFO_DATA not getting copied. - */ - SetLastError(0xdeadbeef); - i = 0; - while (pSetupDiEnumDeviceInfo(set, i, &devInfo)) - i++; - ok(i == 3, "Expected 3 devices, got %d\n", i); - ok(GetLastError() == ERROR_NO_MORE_ITEMS, - "SetupDiEnumDeviceInfo failed: %08x\n", GetLastError()); + /* We can't add device information to the set with a different GUID */ + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &deadbeef, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_CLASS_MISMATCH, "Got unexpected error %#x.\n", GetLastError()); - ret = pSetupDiRemoveDevice(set, &devInfo); - todo_wine ok(ret, "got %u\n", GetLastError()); - pSetupDiDestroyDeviceInfoList(set); - } + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, NULL); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* This fails because the device ID already exists.. */ + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, "Got unexpected error %#x.\n", GetLastError()); + + /* whereas this "fails" because cbSize is wrong.. */ + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + /* and this finally succeeds. */ + device.cbSize = sizeof(device); + ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* There were three devices added, however - the second failure just + * resulted in the SP_DEVINFO_DATA not getting copied. */ + SetLastError(0xdeadbeef); + i = 0; + while (SetupDiEnumDeviceInfo(set, i, &device)) + i++; + ok(i == 3, "Expected 3 devices, got %d.\n", i); + ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiRemoveDevice(set, &device); +todo_wine + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + SetupDiDestroyDeviceInfoList(set); } static void testGetDeviceInstanceId(void) @@ -1457,7 +1443,7 @@ START_TEST(devinst) win_skip("SetupDiOpenClassRegKeyExA is not available\n"); test_install_class(); - testCreateDeviceInfo(); + test_device_info(); testGetDeviceInstanceId(); testRegisterDeviceInfo(); testCreateDeviceInterface();

1 0

Zebediah Figura : shell32/tests: Remove some obsolete workarounds from test_ShellWindows().
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: a06d7de8929b9b15ed47c9b149cb72bef6149cc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a06d7de8929b9b15ed47c9b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 19 19:25:42 2018 -0600 shell32/tests: Remove some obsolete workarounds from test_ShellWindows(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 0d38cd0..e9948ae 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1025,18 +1025,14 @@ static void test_ShellWindows(void) hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, &IID_IShellWindows, (void**)&shellwindows); -#ifndef __i386__ -todo_wine -#endif ok(hr == S_OK, "got 0x%08x\n", hr); /* TODO: remove when explorer startup with clean prefix is fixed */ if (hr != S_OK) return; -if (0) /* NULL out argument - currently crashes on Wine */ { hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, NULL); ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "got 0x%08x\n", hr); -} + hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, &cookie); todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -1114,9 +1110,6 @@ todo_wine { IUnknown *unk; ok(disp != NULL, "got %p\n", disp); - - if (disp == NULL) goto skip_disp_tests; - ok(ret != HandleToUlong(hwnd), "got %d\n", ret); /* IDispatch-related tests */ @@ -1194,7 +1187,6 @@ if (hr == S_OK) { IServiceProvider_Release(sp); IDispatch_Release(disp); } -skip_disp_tests: disp = (void*)0xdeadbeef; ret = 0xdead;

1 0

Alexandre Julliard : server: Return a WSA error code in create_socket.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 424a379f641465cde3b3a8a5e9a39e5865f926f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=424a379f641465cde3b3a8a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 14:50:21 2018 +0100 server: Return a WSA error code in create_socket. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +---------- dlls/ws2_32/tests/sock.c | 1 - server/sock.c | 5 ++--- server/trace.c | 43 +++++++++++++++++++++++++++++++++++++++++++ tools/make_requests | 4 ++++ 5 files changed, 50 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c6805d8..2207586 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7619,7 +7619,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; req->attributes = (dwFlags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT; req->flags = dwFlags & ~WSA_FLAG_NO_HANDLE_INHERIT; - set_error( wine_server_call( req ) ); + err = NtStatusToWSAError( wine_server_call( req ) ); ret = HANDLE2SOCKET( wine_server_ptr_handle( reply->handle )); } SERVER_END_REQ; @@ -7655,7 +7655,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, return ret; } - err = GetLastError(); if (err == WSAEACCES) /* raw socket denied */ { if (type == SOCK_RAW) @@ -7663,14 +7662,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, else ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); } - else - { - /* invalid combination of valid parameters, like SOCK_STREAM + IPPROTO_UDP */ - if (err == WSAEINVAL) - err = WSAESOCKTNOSUPPORT; - else if (err == WSAEOPNOTSUPP) - err = WSAEPROTONOSUPPORT; - } done: WARN("\t\tfailed, error %d!\n", err); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c058869..b32d1c0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2773,7 +2773,6 @@ static void test_WSASocket(void) if (sock == INVALID_SOCKET) { err = WSAGetLastError(); -todo_wine ok(err == WSAEAFNOSUPPORT || broken(err == WSAEPROTONOSUPPORT), "Expected 10047, received %d\n", err); skip("IPX is not supported\n"); } diff --git a/server/sock.c b/server/sock.c index 3be24b3..6620b51 100644 --- a/server/sock.c +++ b/server/sock.c @@ -661,11 +661,10 @@ static struct object *create_socket( int family, int type, int protocol, unsigne int sockfd; sockfd = socket( family, type, protocol ); - if (debug_level) - fprintf(stderr,"socket(%d,%d,%d)=%d\n",family,type,protocol,sockfd); if (sockfd == -1) { - sock_set_error(); + if (errno == EINVAL) set_win32_error( WSAESOCKTNOSUPPORT ); + else set_win32_error( sock_get_error( errno )); return NULL; } fcntl(sockfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ diff --git a/server/trace.c b/server/trace.c index 9a84067..41bbe4a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5549,6 +5549,49 @@ static const struct { "USER_MAPPED_FILE", STATUS_USER_MAPPED_FILE }, { "VOLUME_DISMOUNTED", STATUS_VOLUME_DISMOUNTED }, { "WAS_LOCKED", STATUS_WAS_LOCKED }, + { "WSAEACCES", 0xc0010000 | WSAEACCES }, + { "WSAEADDRINUSE", 0xc0010000 | WSAEADDRINUSE }, + { "WSAEADDRNOTAVAIL", 0xc0010000 | WSAEADDRNOTAVAIL }, + { "WSAEAFNOSUPPORT", 0xc0010000 | WSAEAFNOSUPPORT }, + { "WSAEALREADY", 0xc0010000 | WSAEALREADY }, + { "WSAEBADF", 0xc0010000 | WSAEBADF }, + { "WSAECONNABORTED", 0xc0010000 | WSAECONNABORTED }, + { "WSAECONNREFUSED", 0xc0010000 | WSAECONNREFUSED }, + { "WSAECONNRESET", 0xc0010000 | WSAECONNRESET }, + { "WSAEDESTADDRREQ", 0xc0010000 | WSAEDESTADDRREQ }, + { "WSAEDQUOT", 0xc0010000 | WSAEDQUOT }, + { "WSAEFAULT", 0xc0010000 | WSAEFAULT }, + { "WSAEHOSTDOWN", 0xc0010000 | WSAEHOSTDOWN }, + { "WSAEHOSTUNREACH", 0xc0010000 | WSAEHOSTUNREACH }, + { "WSAEINPROGRESS", 0xc0010000 | WSAEINPROGRESS }, + { "WSAEINTR", 0xc0010000 | WSAEINTR }, + { "WSAEINVAL", 0xc0010000 | WSAEINVAL }, + { "WSAEISCONN", 0xc0010000 | WSAEISCONN }, + { "WSAELOOP", 0xc0010000 | WSAELOOP }, + { "WSAEMFILE", 0xc0010000 | WSAEMFILE }, + { "WSAEMSGSIZE", 0xc0010000 | WSAEMSGSIZE }, + { "WSAENAMETOOLONG", 0xc0010000 | WSAENAMETOOLONG }, + { "WSAENETDOWN", 0xc0010000 | WSAENETDOWN }, + { "WSAENETRESET", 0xc0010000 | WSAENETRESET }, + { "WSAENETUNREACH", 0xc0010000 | WSAENETUNREACH }, + { "WSAENOBUFS", 0xc0010000 | WSAENOBUFS }, + { "WSAENOPROTOOPT", 0xc0010000 | WSAENOPROTOOPT }, + { "WSAENOTCONN", 0xc0010000 | WSAENOTCONN }, + { "WSAENOTEMPTY", 0xc0010000 | WSAENOTEMPTY }, + { "WSAENOTSOCK", 0xc0010000 | WSAENOTSOCK }, + { "WSAEOPNOTSUPP", 0xc0010000 | WSAEOPNOTSUPP }, + { "WSAEPFNOSUPPORT", 0xc0010000 | WSAEPFNOSUPPORT }, + { "WSAEPROCLIM", 0xc0010000 | WSAEPROCLIM }, + { "WSAEPROTONOSUPPORT", 0xc0010000 | WSAEPROTONOSUPPORT }, + { "WSAEPROTOTYPE", 0xc0010000 | WSAEPROTOTYPE }, + { "WSAEREMOTE", 0xc0010000 | WSAEREMOTE }, + { "WSAESHUTDOWN", 0xc0010000 | WSAESHUTDOWN }, + { "WSAESOCKTNOSUPPORT", 0xc0010000 | WSAESOCKTNOSUPPORT }, + { "WSAESTALE", 0xc0010000 | WSAESTALE }, + { "WSAETIMEDOUT", 0xc0010000 | WSAETIMEDOUT }, + { "WSAETOOMANYREFS", 0xc0010000 | WSAETOOMANYREFS }, + { "WSAEUSERS", 0xc0010000 | WSAEUSERS }, + { "WSAEWOULDBLOCK", 0xc0010000 | WSAEWOULDBLOCK }, { NULL, 0 } }; diff --git a/tools/make_requests b/tools/make_requests index 3a81f36..367f245 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -298,6 +298,10 @@ sub GET_ERROR_NAMES() { $errors{$1} = "0xc0010000 | $1"; } + while (/\breturn\s+(WSA\w+)/g) + { + $errors{$1} = "0xc0010000 | $1"; + } } close FILE; }

1 0

Alexandre Julliard : ws2_32: Return a WSA error code from _is_blocking().
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 4383a9d5364e3432341f2dec62c7d94e9d122b16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4383a9d5364e3432341f2dec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 14:41:31 2018 +0100 ws2_32: Return a WSA error code from _is_blocking(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 67 +++++++++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 43 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2ea4269..c6805d8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1146,19 +1146,19 @@ static void _enable_event( HANDLE s, unsigned int event, SERVER_END_REQ; } -static NTSTATUS _is_blocking(SOCKET s, BOOL *ret) +static DWORD sock_is_blocking(SOCKET s, BOOL *ret) { - NTSTATUS status; + DWORD err; SERVER_START_REQ( get_socket_event ) { req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); req->service = FALSE; req->c_event = 0; - status = wine_server_call( req ); + err = NtStatusToWSAError( wine_server_call( req )); *ret = (reply->state & FD_WINE_NONBLOCKING) == 0; } SERVER_END_REQ; - return status; + return err; } static unsigned int _get_sock_mask(SOCKET s) @@ -1181,7 +1181,7 @@ static void _sync_sock_state(SOCKET s) BOOL dummy; /* do a dummy wineserver request in order to let the wineserver run through its select loop once */ - (void)_is_blocking(s, &dummy); + sock_is_blocking(s, &dummy); } static void _get_sock_errors(SOCKET s, int *events) @@ -2761,12 +2761,13 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) { NTSTATUS status; + DWORD err; SOCKET as; BOOL is_blocking; TRACE("socket %04lx\n", s ); - status = _is_blocking(s, &is_blocking); - if (status) + err = sock_is_blocking(s, &is_blocking); + if (err) goto error; do { @@ -2799,10 +2800,11 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) release_sock_fd( s, fd ); } } while (is_blocking && status == STATUS_CANT_WAIT); + err = NtStatusToWSAError( status ); error: - set_error(status); - WARN(" -> ERROR %d\n", GetLastError()); + WARN(" -> ERROR %d\n", err); + SetLastError(err); return INVALID_SOCKET; } @@ -3467,7 +3469,6 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) if (fd != -1) { - NTSTATUS status; BOOL is_blocking; int ret = do_connect(fd, name, namelen); if (ret == 0) @@ -3479,33 +3480,21 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); - status = _is_blocking( s, &is_blocking ); - if (status) - { - release_sock_fd( s, fd ); - set_error( status ); - return SOCKET_ERROR; - } - if (is_blocking) - { - int result; - /* block here */ - do_block(fd, POLLIN | POLLOUT, -1); - _sync_sock_state(s); /* let wineserver notice connection */ - /* retrieve any error codes from it */ - if (!(result = get_sock_error(s, FD_CONNECT_BIT))) goto connect_success; - SetLastError(result); - } - else + ret = sock_is_blocking( s, &is_blocking ); + if (!ret) { - SetLastError(WSAEWOULDBLOCK); + if (is_blocking) + { + do_block(fd, POLLIN | POLLOUT, -1); + _sync_sock_state(s); /* let wineserver notice connection */ + /* retrieve any error codes from it */ + if (!(ret = get_sock_error(s, FD_CONNECT_BIT))) goto connect_success; + } + else ret = WSAEWOULDBLOCK; } } - else - { - SetLastError(ret); - } release_sock_fd( s, fd ); + SetLastError(ret); } return SOCKET_ERROR; @@ -5667,11 +5656,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, return 0; } - if ((err = _is_blocking( s, &is_blocking ))) - { - err = NtStatusToWSAError( err ); - goto error; - } + if ((err = sock_is_blocking( s, &is_blocking ))) goto error; if ( is_blocking ) { @@ -8096,11 +8081,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (n != -1) break; - if ((err = _is_blocking( s, &is_blocking ))) - { - err = NtStatusToWSAError( err ); - goto error; - } + if ((err = sock_is_blocking( s, &is_blocking ))) goto error; if ( is_blocking ) {

1 0

Alexandre Julliard : server: Return WSA error codes in socket events.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: f670a162a0939be260cc4a84225fe8ba2c91f1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f670a162a0939be260cc4a84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 12:57:42 2018 +0100 server: Return WSA error codes in socket events. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 113 +++++++++++++++++++++++++++++++-------------------- server/sock.c | 31 +++++--------- 2 files changed, 80 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f670a162a0939be260cc…

1 0