Module: wine
Branch: master
Commit: 30cbc4a829db372d9ec690ab3c62bc8402680562
URL: https://source.winehq.org/git/wine.git/?a=commit;h=30cbc4a829db372d9ec690ab…
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. */
Module: wine
Branch: master
Commit: 5ec0b75993071197a325b8bc5ac5e94e558c64c5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ec0b75993071197a325b8bc…
Author: Zebediah Figura <z.figura12(a)gmail.com>
Date: Fri Jan 31 10:16:46 2020 -0600
wined3d: Fix the spelling of a comment.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
dlls/wined3d/surface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 5ccdb506e4..ebf2e3afdf 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1031,7 +1031,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit
DWORD location;
/* If we would need to copy from a renderbuffer or drawable, we'd probably
- * be better of using the FBO blitter directly, since we'd need to use it
+ * be better off using the FBO blitter directly, since we'd need to use it
* to copy the resource contents to the texture anyway. */
if (op != WINED3D_BLIT_OP_RAW_BLIT
|| (src_texture->resource.format->id == dst_texture->resource.format->id