Changeset 5820 for trunk/src

Timestamp:

May 28, 2001, 7:18:33 PM (24 years ago)

Author:

phaller

Message:

Implemented DirectDrawCreateClipper

Location:

trunk/src/ddraw

Files:

• OS2CLIPPER.CPP (modified) (4 diffs)
• OS2CLIPPER.H (modified) (2 diffs)
• ddraw.DEF (modified) (3 diffs)
• ddrawclipper.cpp (added)
• makefile (modified) (2 diffs)

trunk/src/ddraw/OS2CLIPPER.CPP

@@ -1 @@
-/* $Id: OS2CLIPPER.CPP,v 1.11 2001-04-04 09:02:14 sandervl Exp $ */
+/* $Id: OS2CLIPPER.CPP,v 1.12 2001-05-28 17:17:09 phaller Exp $ */
 
 /*
@@ -22 +22 @@
 #include <winerror.h>
 #include <winuser.h>
+
+//******************************************************************************
+//******************************************************************************
+OS2IDirectDrawClipper::OS2IDirectDrawClipper(void) :
+                 Referenced(0), lastError(DD_OK),
+                 clipWindow(0)
+{
+  // this constructor creates an unassociated instance of the ddraw clipper,
+  // no ddraw object is associated
+
+  lpVtbl                  = &Vtbl;
+  Vtbl.AddRef             = ClipAddRef;
+  Vtbl.Release            = ClipRelease;
+  Vtbl.QueryInterface     = ClipQueryInterface;
+  Vtbl.GetClipList        = ClipGetClipList;
+  Vtbl.GetHWnd            = ClipGetHWnd;
+  Vtbl.Initialize         = ClipInitialize;
+  Vtbl.IsClipListChanged  = ClipIsClipListChanged;
+  Vtbl.SetClipList        = ClipSetClipList;
+  Vtbl.SetHWnd            = ClipSetHWnd;
+
+  lpDraw                  = NULL;
+  // lpDraw->Vtbl.AddRef(lpDraw);
+  // hDive                   = lpDirectDraw->GetDiveInstance();
+  windowRect.left = windowRect.right = windowRect.top = windowRect.bottom = 0;
+}
 
 //******************************************************************************
@@ -147 +173 @@
 HRESULT WIN32API ClipGetHWnd(THIS This, HWND FAR *pHwnd)
 {
- OS2IDirectDrawClipper *me = (OS2IDirectDrawClipper *)This;
+  OS2IDirectDrawClipper *me = (OS2IDirectDrawClipper *)This;
 
   dprintf(("DDRAW: ClipGetHWnd %x %x", This, me->clipWindow));
@@ -158 +184 @@
 HRESULT WIN32API ClipInitialize(THIS This, LPDIRECTDRAW lpDD, DWORD dwFlags)
 {
+  OS2IDirectDrawClipper *me = (OS2IDirectDrawClipper *)This;
+
   dprintf(("DDRAW: ClipInitialize %x %x %x", This, lpDD, dwFlags));
 
-  return(DDERR_ALREADYINITIALIZED); // Init is done during creation see M$ Doc
+  // check parameters
+  if (dwFlags != 0)
+      return DDERR_INVALIDPARAMS;
+
+  // check if already initialized
+  if (me->hDive != NULL)
+    return(DDERR_ALREADYINITIALIZED); // Init is done during creation see M$ Doc
+
+  // initialize this instance (created with DirectDrawCreateClipper)
+
+  if (lpDD != NULL)
+  {
+      OS2IDirectDraw *os2DD = (OS2IDirectDraw *)lpDD;
+      me->lpDraw = os2DD;
+      me->lpDraw->Vtbl.AddRef(me->lpDraw);
+      me->hDive = me->lpDraw->GetDiveInstance();
+  }
+  else
+  {
+      // we're supposed to create an independent DirectDrawClipper object
+      // now.
+      if (me->lpDraw != NULL)
+      {
+          // we're not handling this any other currently
+          return(DDERR_ALREADYINITIALIZED);
+      }
+      // else
+      //   we've been independent and remain so ...
+  }
+
+  return(DD_OK);
 }
 //******************************************************************************

trunk/src/ddraw/OS2CLIPPER.H

@@ -1 @@
-/* $Id: OS2CLIPPER.H,v 1.7 2000-09-02 08:27:05 sandervl Exp $ */
+/* $Id: OS2CLIPPER.H,v 1.8 2001-05-28 17:17:12 phaller Exp $ */
 
 /*
@@ -24 +24 @@
 
   OS2IDirectDrawClipper(OS2IDirectDraw *lpDirectDraw);
-       ~OS2IDirectDrawClipper();
+  OS2IDirectDrawClipper(void);
+  ~OS2IDirectDrawClipper();
 
         int             Referenced;

trunk/src/ddraw/ddraw.DEF

@@ -1 @@
-; $Id: ddraw.DEF,v 1.8 2001-03-18 21:44:44 mike Exp $
+; $Id: ddraw.DEF,v 1.9 2001-05-28 17:17:14 phaller Exp $
 
 ;
@@ -7 +7 @@
 DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
+
+DESCRIPTION 'Odin32 System DLL - DDraw'
 
 IMPORTS
@@ -21 +23 @@
 ; DSoundHelp                @8
  DirectDrawCreate         = _OS2DirectDrawCreate@12             @9
-; DirectDrawCreateClipper         @10
+ DirectDrawCreateClipper  = _OS2DirectDrawCreateClipper@12      @10
  DirectDrawCreateEx       = _DirectDrawCreateEx@16              @11
  DirectDrawEnumerateA     = _OS2DirectDrawEnumerateA@8          @12

trunk/src/ddraw/makefile

@@ -1 @@
-# $Id: makefile,v 1.27 2001-03-18 21:44:45 mike Exp $
+# $Id: makefile,v 1.28 2001-05-28 17:17:15 phaller Exp $
 
 #
@@ -19 +19 @@
 OBJS = \
 $(OBJDIR)\ddraw.obj \
+$(OBJDIR)\ddrawclipper.obj \
 $(OBJDIR)\os2ddraw.obj \
 $(OBJDIR)\os2clipper.obj \