Detlef Riekenberg : kernel32/tests: Avoid IOCTL_DVD_READ_STRUCTURE test failures.
Module: wine Branch: master Commit: 71cbd277e7cceeb125e4a607bb3ed962f14e57be URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cbd277e7cceeb125e4a607bb... Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 30 00:32:44 2013 +0200 kernel32/tests: Avoid IOCTL_DVD_READ_STRUCTURE test failures. --- dlls/kernel32/tests/volume.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index d788c81..f7879c8 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -775,17 +775,12 @@ static void test_dvd_read_structure(HANDLE handle) /* Test whether this ioctl is supported */ ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), &completeDvdLayerDescriptor, sizeof(struct COMPLETE_DVD_LAYER_DESCRIPTOR), &nbBytes, NULL); - if ((!ret && GetLastError() == ERROR_INVALID_FUNCTION) - || (!ret && GetLastError() == ERROR_NOT_SUPPORTED)) - { - skip("IOCTL_DVD_READ_STRUCTURE not supported\n"); - return; - } - ok(ret || broken(GetLastError() == ERROR_NOT_READY) || broken(GetLastError() == ERROR_INVALID_PARAMETER), - "IOCTL_DVD_READ_STRUCTURE (DvdPhysicalDescriptor) failed, last error = %u\n", GetLastError()); if(!ret) + { + skip("IOCTL_DVD_READ_STRUCTURE not supported: %u\n", GetLastError()); return; + } /* Confirm there is always a header before the actual data */ ok( completeDvdLayerDescriptor.Header.Length == 0x0802, "Length is 0x%04x instead of 0x0802\n", completeDvdLayerDescriptor.Header.Length);
participants (1)
-
Alexandre Julliard