Henri Verbeet : ddraw: Get rid of copy_to_surfacedesc2().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Nov 28 09:55:43 2013 +0100

ddraw: Get rid of copy_to_surfacedesc2().

---

dlls/ddraw/ddraw_private.h |   12 ------------
 dlls/ddraw/surface.c       |    2 +-
 2 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index b6f5170..74e11db 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -608,18 +608,6 @@ struct member_info

#define DD_STRUCT_COPY_BYSIZE(to,from) DD_STRUCT_COPY_BYSIZE_(to,from,(from)->dwSize)

-#define SIZEOF_END_PADDING(type, last_field) \
-    (sizeof(type) - offsetof(type, last_field) - sizeof(((type *)0)->last_field))
-
-static inline void copy_to_surfacedesc2(DDSURFACEDESC2 *to, const DDSURFACEDESC2 *from)
-{
-    DWORD from_size = from->dwSize;
-    if (from_size == sizeof(DDSURFACEDESC))
-        from_size -= SIZEOF_END_PADDING(DDSURFACEDESC, ddsCaps);
-    to->dwSize = sizeof(DDSURFACEDESC2); /* for struct copy */
-    DD_STRUCT_COPY_BYSIZE_(to, from, from_size);
-}
-
 HRESULT hr_ddraw_from_wined3d(HRESULT hr) DECLSPEC_HIDDEN;

#endif
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index d6a948d..e94876f 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -5620,7 +5620,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
         return E_OUTOFMEMORY;

texture->version = version;
-    copy_to_surfacedesc2(&texture->surface_desc, surface_desc);
+    texture->surface_desc = *surface_desc;
     desc = &texture->surface_desc;

/* Ensure DDSD_CAPS is always set. */