[ros-diffs] [greatlrd] 23288: rewrote Main_DDrawSurface_AddAttachedSurface lite so we are using Gdientry DdattachSurface and using wine attach code. to keep Hal compatible.

[greatlrd at svn.reactos.org]

Author: greatlrd
Date: Tue Jul 25 21:31:07 2006
New Revision: 23288

URL: http://svn.reactos.org/svn/reactos?rev=23288&view=rev
Log:
rewrote Main_DDrawSurface_AddAttachedSurface lite so we are using Gdientry DdattachSurface and using wine attach code. 
to keep Hal compatible. 
 

Modified:
    trunk/reactos/dll/directx/ddraw/main/surface_main.c

Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surface_main.c?rev=23288&r1=23287&r2=23288&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Tue Jul 25 21:31:07 2006
@@ -113,19 +113,48 @@
 Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface,
 					  LPDIRECTDRAWSURFACE7 pAttach)
 {
+   DWORD ret;
    DX_WINDBG_trace();
 
-   IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;        
-   
-   IDirectDrawSurfaceImpl* That = NULL;
+   IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;           
+   IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)pAttach;
+
    if (pAttach==NULL)
    {
-     return DDERR_INVALIDOBJECT;     
+      return DDERR_CANNOTATTACHSURFACE;     
    }
-   That = (IDirectDrawSurfaceImpl*)pAttach;
+
+   ret = DdAttachSurface( That->Surf->mpPrimaryLocals[0],This->Surf->mpPrimaryLocals[0]);
+
+   if (ret == DD_OK)
+   {
+	   /* 
+	      Here we put in wine code 	   
+
+	      Wine Code from wine cvs 27/7-2006 
+		  with small changes to fith into our ddraw desgin
+
+	   */
+	  if (This->Surf->mddsdPrimary.ddsCaps.dwCaps & That->Surf->mddsdPrimary.ddsCaps.dwCaps & DDSCAPS_MIPMAP)
+      {
+          That->Surf->mddsdPrimary.ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL;        
+      }
+
+	  if( (That->Surf->next_attached != NULL) || (That->Surf->first_attached != (DWORD*)That) )
+      { 
+	      DX_STUB_str("Wine Code fails");
+          return DDERR_CANNOTATTACHSURFACE;
+      }
+
+	  That->Surf->next_attached = This->Surf->next_attached;
+      That->Surf->first_attached = This->Surf->first_attached;
+      This->Surf->next_attached = (DWORD*)That;
+
+      Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)pAttach);
+	  return DD_OK;
+   }
    
-   //FIXME Have I put This and That in right order ?? DdAttachSurface(from, to) 
-   return DdAttachSurface( That->Surf->mpPrimaryLocals[0],This->Surf->mpPrimaryLocals[0]);
+   return ret;
 }
 
 /* MSDN: "not currently implemented." */