Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Mar 24 10:00:45 CDT 2015


Module: wine
Branch: master
Commit: baf32ced7428a71d7b59be006b47d6e9eb7f33fe
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=baf32ced7428a71d7b59be006b47d6e9eb7f33fe

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Mar 24 11:44:08 2015 +0100

ddraw/tests: Fix compilation on systems that don't support nameless unions.

---

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

diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 8f8b757..d4483466 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -8264,7 +8264,7 @@ static void test_signed_formats(void)
             ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, format %s.\n", hr, formats[i].name);
             for (y = 0; y < 4; y++)
             {
-                memcpy((char *)surface_desc.lpSurface + y * surface_desc.lPitch,
+                memcpy((char *)surface_desc.lpSurface + y * U1(surface_desc).lPitch,
                         (char *)formats[i].content + y * 4 * formats[i].pixel_size,
                         width * formats[i].pixel_size);
             }
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 66f8cff..f3cd495 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -8474,7 +8474,7 @@ static void test_signed_formats(void)
             ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, format %s.\n", hr, formats[i].name);
             for (y = 0; y < 4; y++)
             {
-                memcpy((char *)surface_desc.lpSurface + y * surface_desc.lPitch,
+                memcpy((char *)surface_desc.lpSurface + y * U1(surface_desc).lPitch,
                         (char *)formats[i].content + y * 4 * formats[i].pixel_size,
                         width * formats[i].pixel_size);
             }




More information about the wine-cvs mailing list