ddraw: Partially revert a struct copy change to fix a regression.

Commit 38713298 caused the regression.

ddraw: Partially revert a struct copy change to fix a regression.
ced4c383 · Dylan Smith · Alexandre Julliard · ed3a2765 · ced4c383
Commit ced4c383 authored Jun 28, 2011 by Dylan Smith Committed by Alexandre Julliard Jun 28, 2011
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

ddraw_private.h dlls/ddraw/ddraw_private.h +3 -2

No files found.
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -585,10 +585,11 @@ typedef struct
 #define DD_STRUCT_COPY_BYSIZE_(to,from,from_size)                 \
    do {                                                          \
        DWORD __size = (to)->dwSize;                              \
-        DWORD __copysize = min(__size, from_size);                \
+        DWORD __resetsize = min(__size, sizeof(*to));             \
+        DWORD __copysize = min(__resetsize, from_size);           \
        assert(to != from);                                       \
        memcpy(to, from, __copysize);                             \
-        memset((char*)(to) + __copysize, 0, __size - __copysize); \
+        memset((char*)(to) + __copysize, 0, __resetsize - __copysize); \
        (to)->dwSize = __size; /* restore size */                 \
    } while (0)