Stefan Dösinger : ddraw/test: Completely disable the refcount stealing GetClipper call.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 30cbc4a829db372d9ec690ab3c62bc8402680562
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=30cbc4a829db372d9ec690ab3...

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Mon Feb  3 13:33:22 2020 +0100

ddraw/test: Completely disable the refcount stealing GetClipper call.

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 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 45a24e3ffb..61f0adcd7e 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 3fccd02f1e..6e35bfd534 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 d97834e542..b53c0c2160 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 bbc61087ca..51223e62ac 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. */