[ros-diffs] [greatlrd] 26735: implement internal api CopyDDSurfDescToDDSurfDesc2

[greatlrd at svn.reactos.org]

Author: greatlrd
Date: Sat May 12 21:48:27 2007
New Revision: 26735

URL: http://svn.reactos.org/svn/reactos?rev=26735&view=rev
Log:
implement internal api CopyDDSurfDescToDDSurfDesc2

Modified:
    trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
    trunk/reactos/dll/directx/ddraw/Surface/createsurface.c
    trunk/reactos/dll/directx/ddraw/rosdraw.h

Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c?rev=26735&r1=26734&r2=26735&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sat May 12 21:48:27 2007
@@ -149,11 +149,7 @@
 
    if (pDDSD->dwSize == sizeof(DDSURFACEDESC))
    {
-       
-       RtlZeroMemory(&dd_desc_v2,sizeof(DDSURFACEDESC2));
-       /* FIXME implement CopyDDSurfDescToDDSurfDesc2
-          CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2,pDDSD);
-       */
+       CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2,pDDSD);
    }
    else if (pDDSD->dwSize == sizeof(DDSURFACEDESC2))
    {

Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/createsurface.c?rev=26735&r1=26734&r2=26735&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original)
+++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sat May 12 21:48:27 2007
@@ -8,6 +8,13 @@
  *
  */
 #include "rosdraw.h"
+
+
+void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc)
+{
+    RtlZeroMemory(dst_pDesc,sizeof(DDSURFACEDESC2));
+    RtlCopyMemory(dst_pDesc,src_pDesc,sizeof(DDSURFACEDESC));
+}
 
 
 HRESULT 

Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h?rev=26735&r1=26734&r2=26735&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/rosdraw.h (original)
+++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sat May 12 21:48:27 2007
@@ -25,6 +25,9 @@
 HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex);
 HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW* iface);
 
+/* convert DDSURFACEDESC to DDSURFACEDESC2 */
+void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc);
+
 /* DirectDraw Cleanup code only internal use */
 VOID Cleanup(LPDIRECTDRAW7 iface);