Skip to content

W
wine-winehq
Commit c59e9d30 authored by Vijay Kiran Kamuju's avatar Vijay Kiran Kamuju Committed by Alexandre Julliard
Browse files
Options

setupapi/tests: Remove win_9x checks.

Signed-off-by: 's avatarVijay Kiran Kamuju <infyquest@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 0a89a699
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 63 deletions
dlls/setupapi/tests/diskspace.c
View file @ c59e9d30
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
#include "wine/test.h" #include "wine/test.h"
static BOOL is_win9x;
static void test_SetupCreateDiskSpaceListA(void) static void test_SetupCreateDiskSpaceListA(void)
{ {
HDSKSPC ret; HDSKSPC ret;
...@@ -152,34 +150,29 @@ static void test_SetupDuplicateDiskSpaceListA(void) ...@@ -152,34 +150,29 @@ static void test_SetupDuplicateDiskSpaceListA(void)
{ {
HDSKSPC handle, duplicate; HDSKSPC handle, duplicate;
if (is_win9x) SetLastError(0xdeadbeef);
win_skip("SetupDuplicateDiskSpaceListA crashes with NULL disk space handle on Win9x\n"); duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0, 0);
else ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate);
{ ok(GetLastError() == ERROR_INVALID_HANDLE,
SetLastError(0xdeadbeef); "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", GetLastError());
duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0, 0);
ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate);
ok(GetLastError() == ERROR_INVALID_HANDLE,
"Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", GetLastError());
SetLastError(0xdeadbeef);
duplicate = SetupDuplicateDiskSpaceListA(NULL, (void *)0xdeadbeef, 0, 0);
ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate);
ok(GetLastError() == ERROR_INVALID_PARAMETER,
"Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0xdeadbeef, 0); duplicate = SetupDuplicateDiskSpaceListA(NULL, (void *)0xdeadbeef, 0, 0);
ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate);
ok(GetLastError() == ERROR_INVALID_PARAMETER, ok(GetLastError() == ERROR_INVALID_PARAMETER,
"Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0, ~0U); duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0xdeadbeef, 0);
ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate);
ok(GetLastError() == ERROR_INVALID_PARAMETER, ok(GetLastError() == ERROR_INVALID_PARAMETER,
"Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
}
SetLastError(0xdeadbeef);
duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0, ~0U);
ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate);
ok(GetLastError() == ERROR_INVALID_PARAMETER,
"Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
handle = SetupCreateDiskSpaceListA(NULL, 0, 0); handle = SetupCreateDiskSpaceListA(NULL, 0, 0);
ok(handle != NULL, ok(handle != NULL,
...@@ -306,42 +299,37 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) ...@@ -306,42 +299,37 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void)
HDSKSPC handle; HDSKSPC handle;
LONGLONG space; LONGLONG space;
if (is_win9x) SetLastError(0xdeadbeef);
win_skip("SetupQuerySpaceRequiredOnDriveA crashes with NULL disk space handle on Win9x\n"); ret = SetupQuerySpaceRequiredOnDriveA(NULL, NULL, NULL, NULL, 0);
else ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret);
{ ok(GetLastError() == ERROR_INVALID_PARAMETER,
SetLastError(0xdeadbeef); "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n",
ret = SetupQuerySpaceRequiredOnDriveA(NULL, NULL, NULL, NULL, 0); GetLastError());
ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret);
ok(GetLastError() == ERROR_INVALID_PARAMETER,
"Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n",
GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
space = 0xdeadbeef; space = 0xdeadbeef;
ret = SetupQuerySpaceRequiredOnDriveA(NULL, NULL, &space, NULL, 0); ret = SetupQuerySpaceRequiredOnDriveA(NULL, NULL, &space, NULL, 0);
ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret);
ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER, ok(GetLastError() == ERROR_INVALID_PARAMETER,
"Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n",
GetLastError()); GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = SetupQuerySpaceRequiredOnDriveA(NULL, "", NULL, NULL, 0); ret = SetupQuerySpaceRequiredOnDriveA(NULL, "", NULL, NULL, 0);
ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret);
ok(GetLastError() == ERROR_INVALID_HANDLE, ok(GetLastError() == ERROR_INVALID_HANDLE,
"Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n",
GetLastError()); GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
space = 0xdeadbeef; space = 0xdeadbeef;
ret = SetupQuerySpaceRequiredOnDriveA(NULL, "", &space, NULL, 0); ret = SetupQuerySpaceRequiredOnDriveA(NULL, "", &space, NULL, 0);
ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret);
ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n");
ok(GetLastError() == ERROR_INVALID_HANDLE, ok(GetLastError() == ERROR_INVALID_HANDLE,
"Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n",
GetLastError()); GetLastError());
}
handle = SetupCreateDiskSpaceListA(NULL, 0, 0); handle = SetupCreateDiskSpaceListA(NULL, 0, 0);
ok(handle != NULL, ok(handle != NULL,
...@@ -474,8 +462,6 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) ...@@ -474,8 +462,6 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void)
START_TEST(diskspace) START_TEST(diskspace)
{ {
is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) &&
GetLastError() == ERROR_CALL_NOT_IMPLEMENTED;
test_SetupCreateDiskSpaceListA(); test_SetupCreateDiskSpaceListA();
test_SetupCreateDiskSpaceListW(); test_SetupCreateDiskSpaceListW();
test_SetupDuplicateDiskSpaceListA(); test_SetupDuplicateDiskSpaceListA();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment