From 7d0ab835aeb0403f5f5dbc8cf923711eee7847e4 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Tue, 5 Feb 2013 13:18:04 +0100 Subject: [PATCH] ddraw/tests: Use assignment instead of memcpy to copy structs. --- dlls/ddraw/tests/dsurface.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index c8f90c911e4..4e082245178 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3872,13 +3872,13 @@ static void CreateSurfaceBadCapsSizeTest(void) ddsd_ok.dwWidth = 64; ddsd_ok.dwHeight = 64; ddsd_ok.ddsCaps.dwCaps = caps; - memcpy(&ddsd_bad1, &ddsd_ok, sizeof(ddsd_bad1)); + ddsd_bad1 = ddsd_ok; ddsd_bad1.dwSize--; - memcpy(&ddsd_bad2, &ddsd_ok, sizeof(ddsd_bad2)); + ddsd_bad2 = ddsd_ok; ddsd_bad2.dwSize++; - memcpy(&ddsd_bad3, &ddsd_ok, sizeof(ddsd_bad3)); + ddsd_bad3 = ddsd_ok; ddsd_bad3.dwSize = 0; - memcpy(&ddsd_bad4, &ddsd_ok, sizeof(ddsd_bad4)); + ddsd_bad4 = ddsd_ok; ddsd_bad4.dwSize = sizeof(DDSURFACEDESC2); memset(&ddsd2_ok, 0, sizeof(ddsd2_ok)); @@ -3887,13 +3887,13 @@ static void CreateSurfaceBadCapsSizeTest(void) ddsd2_ok.dwWidth = 64; ddsd2_ok.dwHeight = 64; ddsd2_ok.ddsCaps.dwCaps = caps; - memcpy(&ddsd2_bad1, &ddsd2_ok, sizeof(ddsd2_bad1)); + ddsd2_bad1 = ddsd2_ok; ddsd2_bad1.dwSize--; - memcpy(&ddsd2_bad2, &ddsd2_ok, sizeof(ddsd2_bad2)); + ddsd2_bad2 = ddsd2_ok; ddsd2_bad2.dwSize++; - memcpy(&ddsd2_bad3, &ddsd2_ok, sizeof(ddsd2_bad3)); + ddsd2_bad3 = ddsd2_ok; ddsd2_bad3.dwSize = 0; - memcpy(&ddsd2_bad4, &ddsd2_ok, sizeof(ddsd2_bad4)); + ddsd2_bad4 = ddsd2_ok; ddsd2_bad4.dwSize = sizeof(DDSURFACEDESC); hr = IDirectDraw_CreateSurface(lpDD, &ddsd_ok, &surf, NULL);