[PATCH] comctl32/tests: Remove skips from DPA tests.
Nikolay Sivov
nsivov at codeweavers.com
Tue Oct 6 02:41:18 CDT 2020
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/comctl32/tests/dpa.c | 42 ++-------------------------------------
1 file changed, 2 insertions(+), 40 deletions(-)
diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c
index 2a5eb503d9f..cbe3ab7fb2b 100644
--- a/dlls/comctl32/tests/dpa.c
+++ b/dlls/comctl32/tests/dpa.c
@@ -356,12 +356,6 @@ static void test_DPA_Merge(void)
DWORD dw;
BOOL rc;
- if(!pDPA_Merge)
- {
- win_skip("DPA_Merge() not available\n");
- return;
- }
-
dpa = pDPA_Create(0);
dpa2 = pDPA_Create(0);
dpa3 = pDPA_Create(0);
@@ -485,12 +479,6 @@ static void test_DPA_EnumCallback(void)
DWORD dw;
INT i, ret;
- if(!pDPA_EnumCallback)
- {
- win_skip("DPA_EnumCallback() not available\n");
- return;
- }
-
dpa = pDPA_Create(0);
for (i = 0; i < 6; i++)
@@ -517,12 +505,6 @@ static void test_DPA_DestroyCallback(void)
HDPA dpa;
INT i, ret;
- if(!pDPA_DestroyCallback)
- {
- win_skip("DPA_DestroyCallback() not available\n");
- return;
- }
-
dpa = pDPA_Create(0);
for (i = 0; i < 3; i++)
@@ -548,18 +530,8 @@ static void test_DPA_LoadStream(void)
ULONG written, ret;
HDPA dpa;
- if(!pDPA_LoadStream)
- {
- win_skip("DPA_LoadStream() not available. Skipping stream tests.\n");
- return;
- }
-
hRes = CoInitialize(NULL);
- if (hRes != S_OK)
- {
- ok(0, "hResult: %d\n", hRes);
- return;
- }
+ ok(hRes == S_OK, "Failed to initialize COM, hr %#x.\n", hRes);
dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE;
hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg);
@@ -666,18 +638,8 @@ static void test_DPA_SaveStream(void)
BOOL rc;
LARGE_INTEGER liZero;
- if(!pDPA_SaveStream)
- {
- win_skip("DPA_SaveStream() not available. Skipping stream tests.\n");
- return;
- }
-
hRes = CoInitialize(NULL);
- if (hRes != S_OK)
- {
- ok(0, "hResult: %d\n", hRes);
- return;
- }
+ ok(hRes == S_OK, "Failed to initialize COM, hr %#x.\n", hRes);
dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE;
hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg);
--
2.28.0
More information about the wine-devel
mailing list