Commit ffe16a56 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

scrrun/tests: Run test on fixed drive.

parent 8762842c
...@@ -1795,7 +1795,6 @@ static void test_SerialNumber(void) ...@@ -1795,7 +1795,6 @@ static void test_SerialNumber(void)
IDriveCollection *drives; IDriveCollection *drives;
IEnumVARIANT *iter; IEnumVARIANT *iter;
IDrive *drive; IDrive *drive;
VARIANT var;
LONG serial; LONG serial;
HRESULT hr; HRESULT hr;
BSTR name; BSTR name;
...@@ -1805,13 +1804,31 @@ static void test_SerialNumber(void) ...@@ -1805,13 +1804,31 @@ static void test_SerialNumber(void)
hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
IDriveCollection_Release(drives);
hr = IEnumVARIANT_Next(iter, 1, &var, NULL); while (1) {
ok(hr == S_OK, "got 0x%08x\n", hr); DriveTypeConst type;
VARIANT var;
hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); hr = IEnumVARIANT_Next(iter, 1, &var, NULL);
ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_FALSE) {
VariantClear(&var); skip("No fixed drive found, skipping test.\n");
IEnumVARIANT_Release(iter);
return;
}
ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive);
ok(hr == S_OK, "got 0x%08x\n", hr);
VariantClear(&var);
hr = IDrive_get_DriveType(drive, &type);
ok(hr == S_OK, "got 0x%08x\n", hr);
if (type == Fixed)
break;
IDrive_Release(drive);
}
hr = IDrive_get_SerialNumber(drive, NULL); hr = IDrive_get_SerialNumber(drive, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "got 0x%08x\n", hr);
...@@ -1841,7 +1858,6 @@ static void test_SerialNumber(void) ...@@ -1841,7 +1858,6 @@ static void test_SerialNumber(void)
IDrive_Release(drive); IDrive_Release(drive);
IEnumVARIANT_Release(iter); IEnumVARIANT_Release(iter);
IDriveCollection_Release(drives);
} }
START_TEST(filesystem) START_TEST(filesystem)
......
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