[PATCH 2/3] ddraw/tests: Allow for broken surface pitch.
Jeff Smith
whydoubt at gmail.com
Thu Jan 23 11:33:30 CST 2020
Signed-off-by: Jeff Smith <whydoubt at gmail.com>
---
dlls/ddraw/tests/ddraw1.c | 3 ++-
dlls/ddraw/tests/ddraw2.c | 3 ++-
dlls/ddraw/tests/ddraw4.c | 3 ++-
dlls/ddraw/tests/ddraw7.c | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index b1045e2854..a03d0881c5 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -5509,7 +5509,8 @@ static void test_create_surface_pitch(void)
"Test %u: Got unexpected pitch %u, expected %u.\n",
i, U1(surface_desc).lPitch, test_data[i].pitch_out64);
else
- ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
+ ok(U1(surface_desc).lPitch == test_data[i].pitch_out32 || broken(
+ U1(surface_desc).lPitch == 0xfc && (test_data[i].caps & DDSCAPS_VIDEOMEMORY)),
"Test %u: Got unexpected pitch %u, expected %u.\n",
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 5a26d4eec4..688cb532bd 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -6452,7 +6452,8 @@ static void test_create_surface_pitch(void)
"Test %u: Got unexpected pitch %u, expected %u.\n",
i, U1(surface_desc).lPitch, test_data[i].pitch_out64);
else
- ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
+ ok(U1(surface_desc).lPitch == test_data[i].pitch_out32 || broken(
+ U1(surface_desc).lPitch == 0xfc && (test_data[i].caps & DDSCAPS_VIDEOMEMORY)),
"Test %u: Got unexpected pitch %u, expected %u.\n",
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 33e3db259a..96d8e2a701 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -8288,7 +8288,8 @@ static void test_create_surface_pitch(void)
"Test %u: Got unexpected pitch %u, expected %u.\n",
i, U1(surface_desc).lPitch, test_data[i].pitch_out64);
else
- ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
+ ok(U1(surface_desc).lPitch == test_data[i].pitch_out32 || broken(
+ U1(surface_desc).lPitch == 0xfc && (test_data[i].caps & DDSCAPS_VIDEOMEMORY)),
"Test %u: Got unexpected pitch %u, expected %u.\n",
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 8ad1e859fa..8044e49a60 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -8135,7 +8135,8 @@ static void test_create_surface_pitch(void)
"Test %u: Got unexpected pitch %u, expected %u.\n",
i, U1(surface_desc).lPitch, test_data[i].pitch_out64);
else
- ok(U1(surface_desc).lPitch == test_data[i].pitch_out32,
+ ok(U1(surface_desc).lPitch == test_data[i].pitch_out32 || broken(
+ U1(surface_desc).lPitch == 0xfc && (test_data[i].caps & DDSCAPS_VIDEOMEMORY)),
"Test %u: Got unexpected pitch %u, expected %u.\n",
i, U1(surface_desc).lPitch, test_data[i].pitch_out32);
}
--
2.23.0
More information about the wine-devel
mailing list