ddrawex: Remove superflous NULL checks, add error skips (Coverity).
This commit is contained in:
parent
e4d63f7711
commit
a6b714d082
|
@ -422,8 +422,17 @@ START_TEST(surface)
|
||||||
|
|
||||||
hr = pDllGetClassObject(&CLSID_DirectDrawFactory, &IID_IClassFactory, (void **) &classfactory);
|
hr = pDllGetClassObject(&CLSID_DirectDrawFactory, &IID_IClassFactory, (void **) &classfactory);
|
||||||
ok(hr == S_OK, "Failed to create a IClassFactory\n");
|
ok(hr == S_OK, "Failed to create a IClassFactory\n");
|
||||||
|
if (!SUCCEEDED(hr)) {
|
||||||
|
skip("Failed to get DirectDrawFactory\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
hr = IClassFactory_CreateInstance(classfactory, NULL, &IID_IDirectDrawFactory, (void **) &factory);
|
hr = IClassFactory_CreateInstance(classfactory, NULL, &IID_IDirectDrawFactory, (void **) &factory);
|
||||||
ok(hr == S_OK, "Failed to create a IDirectDrawFactory\n");
|
ok(hr == S_OK, "Failed to create a IDirectDrawFactory\n");
|
||||||
|
if (!SUCCEEDED(hr)) {
|
||||||
|
IClassFactory_Release(classfactory);
|
||||||
|
skip("Failed to get a DirectDrawFactory\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
GetDCTest();
|
GetDCTest();
|
||||||
CapsTest();
|
CapsTest();
|
||||||
|
@ -431,12 +440,8 @@ START_TEST(surface)
|
||||||
test_surface_from_dc3();
|
test_surface_from_dc3();
|
||||||
test_surface_from_dc4();
|
test_surface_from_dc4();
|
||||||
|
|
||||||
if(factory) {
|
|
||||||
ref = IDirectDrawFactory_Release(factory);
|
ref = IDirectDrawFactory_Release(factory);
|
||||||
ok(ref == 0, "IDirectDrawFactory not cleanly released\n");
|
ok(ref == 0, "IDirectDrawFactory not cleanly released\n");
|
||||||
}
|
|
||||||
if(classfactory) {
|
|
||||||
ref = IClassFactory_Release(classfactory);
|
ref = IClassFactory_Release(classfactory);
|
||||||
todo_wine ok(ref == 1, "IClassFactory refcount wrong, ref = %u\n", ref);
|
todo_wine ok(ref == 1, "IClassFactory refcount wrong, ref = %u\n", ref);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue