[PATCH] ddraw/tests: Fix a few typos.

Matteo Bruni mbruni at codeweavers.com
Mon Nov 18 10:35:19 CST 2019


Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
Also fix the same comment in ddraw4.c, merge with another similar
patch that I had in my queue.

Supersedes patch 174018.

 dlls/ddraw/tests/ddraw1.c | 2 +-
 dlls/ddraw/tests/ddraw2.c | 2 +-
 dlls/ddraw/tests/ddraw4.c | 4 ++--
 dlls/ddraw/tests/ddraw7.c | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 64c03c87d0c..fa65d0e722e 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -5083,7 +5083,7 @@ static void test_surface_attachment(void)
     hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2);
     todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr);
     if (SUCCEEDED(hr))
-        IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3);
+        IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2);
     hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3);
     ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr);
     hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3);
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 77c8e32e6bd..541362c7488 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -6094,7 +6094,7 @@ static void test_surface_attachment(void)
     hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2);
     todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr);
     if (SUCCEEDED(hr))
-        IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3);
+        IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface2);
     hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3);
     ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr);
     hr = IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index df20ccb09d3..e61d67d723d 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -7624,7 +7624,7 @@ static void test_surface_attachment(void)
     hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2);
     todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr);
     if (SUCCEEDED(hr))
-        IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3);
+        IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2);
     hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3);
     ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr);
     hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3);
@@ -16622,7 +16622,7 @@ static void test_surface_format_conversion_alpha(void)
                 {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}
             },
             "R5G6B5", 2, 4, 4, 0, TRUE,
-            /* Looks broken for sysmem texture convertions on Windows (at
+            /* Looks broken for sysmem texture conversions on Windows (at
              * least with hardware device), the result is either error from
              * _Blt() or a copy of the source data without any conversion. */
         },
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 7c46f33cb7a..c1db7b2df6a 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -7496,7 +7496,7 @@ static void test_surface_attachment(void)
     hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2);
     todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr);
     if (SUCCEEDED(hr))
-        IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3);
+        IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface2);
     hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3);
     ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr);
     hr = IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3);
@@ -16593,7 +16593,7 @@ static void test_surface_format_conversion_alpha(void)
                 {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}
             },
             "R5G6B5", 2, 4, 4, 0, TRUE,
-            /* Looks broken for sysmem texture convertions on Windows (at
+            /* Looks broken for sysmem texture conversions on Windows (at
              * least with hardware device), the result is either error from
              * _Blt() or a copy of the source data without any conversion. */
         },
-- 
2.21.0




More information about the wine-devel mailing list