[PATCH] ddraw/test: Completely disable the refcount stealing GetClipper call.
Stefan Dösinger
stefan at codeweavers.com
Mon Feb 3 06:33:22 CST 2020
Signed-off-by: Stefan Dösinger <stefan at codeweavers.com>
---
fg-win7u64-1spie9t64 got worse with b9a9ad4c. I suspect the
GetDeviceIdentifier shuffled data on the heap around enough to trigger the
same bug I see on that one Nvidia machine. Other testbot boxes have problems
too: https://testbot.winehq.org/JobDetails.pl?Key=64390 .
---
dlls/ddraw/tests/ddraw1.c | 5 +++--
dlls/ddraw/tests/ddraw2.c | 5 +++--
dlls/ddraw/tests/ddraw4.c | 5 +++--
dlls/ddraw/tests/ddraw7.c | 5 +++--
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 16c0cfb4e5b..b86d75eef76 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -12938,12 +12938,13 @@ static void test_clipper_refcount(void)
IDirectDrawClipper_Release(clipper);
IDirectDrawClipper_Release(clipper);
- if (!ddraw_is_nvidia(ddraw))
+ if (0)
{
/* Disabled because it causes heap corruption (HeapValidate fails and random
* hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1
* running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66
- * is affected too.
+ * is affected too. Some testbot machines have crashes directly in GetClipper
+ * or proceed with a corrupted heap too.
*
* The same Windows and driver versions run the test without heap corruption on
* a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index f0ae458d851..75d6853d6f5 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -13767,12 +13767,13 @@ static void test_clipper_refcount(void)
IDirectDrawClipper_Release(clipper);
IDirectDrawClipper_Release(clipper);
- if (!ddraw_is_nvidia(ddraw))
+ if (0)
{
/* Disabled because it causes heap corruption (HeapValidate fails and random
* hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1
* running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66
- * is affected too.
+ * is affected too. Some testbot machines have crashes directly in GetClipper
+ * or proceed with a corrupted heap too.
*
* The same Windows and driver versions run the test without heap corruption on
* a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index b6cb97c3c98..4bfe02ba63b 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -16413,12 +16413,13 @@ static void test_clipper_refcount(void)
IDirectDrawClipper_Release(clipper);
IDirectDrawClipper_Release(clipper);
- if (!ddraw_is_nvidia(ddraw))
+ if (0)
{
/* Disabled because it causes heap corruption (HeapValidate fails and random
* hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1
* running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66
- * is affected too.
+ * is affected too. Some testbot machines have crashes directly in GetClipper
+ * or proceed with a corrupted heap too.
*
* The same Windows and driver versions run the test without heap corruption on
* a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 0afbe76b6c6..6f48caa0a20 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -16340,12 +16340,13 @@ static void test_clipper_refcount(void)
IDirectDrawClipper_Release(clipper);
IDirectDrawClipper_Release(clipper);
- if (!ddraw_is_nvidia(ddraw))
+ if (0)
{
/* Disabled because it causes heap corruption (HeapValidate fails and random
* hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1
* running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66
- * is affected too.
+ * is affected too. Some testbot machines have crashes directly in GetClipper
+ * or proceed with a corrupted heap too.
*
* The same Windows and driver versions run the test without heap corruption on
* a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */
--
2.24.1
More information about the wine-devel
mailing list