Changeset 211 for trunk/src/ddraw/OS2CLIPPER.H

Timestamp:

Jun 26, 1999, 1:36:08 PM (26 years ago)

Author:

hugh

Message:

Include for DX6 verion of ddraw

File:

• trunk/src/ddraw/OS2CLIPPER.H (modified) (2 diffs)

trunk/src/ddraw/OS2CLIPPER.H

@@ -1 @@
-/* $Id: OS2CLIPPER.H,v 1.3 1999-06-10 17:10:56 phaller Exp $ */
-
-/*
- * DirectDraw Clipper Class
- *
- * Copyright 1998 Sander van Leeuwen (sandervl@xs4all.nl)
- *
- * Project Odin Software License can be found in LICENSE.TXT
- *
- */
 #ifndef __OS2CLIPPER_H__
 #define __OS2CLIPPER_H__
 
-/* KSO Apr 19 1999: Set correct interface.           *
- * (INTERFACE is used in the THIS and THIS_ macros)  */
-#undef  INTERFACE
-#define INTERFACE   IDirectDrawClipper
-
+#include <dive.h>
+#define FAR
+#undef THIS
+#define THIS IDirectDrawClipper*
 class OS2IDirectDrawClipper
 {
  public:
-    //this one has to go first!
-    IDirectDrawClipperVtbl *lpVtbl;
-    IDirectDrawClipperVtbl  Vtbl;
+  //this one has to go first!
+  IDirectDrawClipperVtbl *lpVtbl;
+  IDirectDrawClipperVtbl  Vtbl;
 
-    OS2IDirectDrawClipper(OS2IDirectDraw *lpDirectDraw);
+  OS2IDirectDrawClipper(OS2IDirectDraw *lpDirectDraw);
        ~OS2IDirectDrawClipper();
 
-          int             Referenced;
+        int             Referenced;
         inline  HRESULT       GetLastError() { return lastError; };
  private:
 
  protected:
-          HRESULT                lastError;
-          OS2IDirectDraw        *lpDraw;
-          HDIVE                  hDive;
-          W32_HWND               clipWindow;
+              HRESULT                lastError;
+        OS2IDirectDraw        *lpDraw;
+        HDIVE                  hDive;
+        HWND         clipWindow;
 
                               // Linked list management
@@ -41 +30 @@
     static    OS2IDirectDrawClipper* ddraw;                  // List of OS2IDirectDraw
 
-    friend    HRESULT __stdcall ClipQueryInterface(THIS_ REFIID riid, LPVOID FAR * ppvObj);
+    friend    HRESULT __stdcall ClipQueryInterface(THIS, REFIID riid, LPVOID FAR * ppvObj);
     friend    ULONG   __stdcall ClipAddRef(THIS);
     friend    ULONG   __stdcall ClipRelease(THIS);
-    friend    HRESULT __stdcall ClipGetClipList(THIS_ W32_LPRECT, W32_LPRGNDATA, LPDWORD);
-    friend    HRESULT __stdcall ClipGetHWnd(THIS_ W32_HWND FAR *);
-    friend    HRESULT __stdcall ClipInitialize(THIS_ LPDIRECTDRAW, DWORD);
-    friend    HRESULT __stdcall ClipIsClipListChanged(THIS_ BOOL FAR *);
-    friend    HRESULT __stdcall ClipSetClipList(THIS_ W32_LPRGNDATA,DWORD);
-    friend    HRESULT __stdcall ClipSetHWnd(THIS_ DWORD, W32_HWND );
+    friend    HRESULT __stdcall ClipGetClipList(THIS, LPRECT, LPRGNDATA, LPDWORD);
+    friend    HRESULT __stdcall ClipGetHWnd(THIS, HWND FAR *);
+    friend    HRESULT __stdcall ClipInitialize(THIS, LPDIRECTDRAW, DWORD);
+    friend    HRESULT __stdcall ClipIsClipListChanged(THIS, BOOL FAR *);
+    friend    HRESULT __stdcall ClipSetClipList(THIS, LPRGNDATA,DWORD);
+    friend    HRESULT __stdcall ClipSetHWnd(THIS, DWORD, HWND );
 };
 
-HRESULT __stdcall ClipQueryInterface(THIS_ REFIID riid, LPVOID FAR * ppvObj);
+HRESULT __stdcall ClipQueryInterface(THIS, REFIID riid, LPVOID FAR * ppvObj);
 ULONG   __stdcall ClipAddRef(THIS);
 ULONG   __stdcall ClipRelease(THIS);
-HRESULT __stdcall ClipGetClipList(THIS_ W32_LPRECT, W32_LPRGNDATA, LPDWORD);
-HRESULT __stdcall ClipGetHWnd(THIS_ W32_HWND FAR *);
-HRESULT __stdcall ClipInitialize(THIS_ LPDIRECTDRAW, DWORD);
-HRESULT __stdcall ClipIsClipListChanged(THIS_ BOOL FAR *);
-HRESULT __stdcall ClipSetClipList(THIS_ W32_LPRGNDATA,DWORD);
-HRESULT __stdcall ClipSetHWnd(THIS_ DWORD, W32_HWND );
+HRESULT __stdcall ClipGetClipList(THIS, LPRECT, LPRGNDATA, LPDWORD);
+HRESULT __stdcall ClipGetHWnd(THIS, HWND FAR *);
+HRESULT __stdcall ClipInitialize(THIS, LPDIRECTDRAW, DWORD);
+HRESULT __stdcall ClipIsClipListChanged(THIS, BOOL FAR *);
+HRESULT __stdcall ClipSetClipList(THIS, LPRGNDATA,DWORD);
+HRESULT __stdcall ClipSetHWnd(THIS, DWORD, HWND );
 
 #endif