Changeset 210 for trunk/src/ddraw/OS2D3D.CPP

Timestamp:

Jun 26, 1999, 1:34:43 PM (26 years ago)

Author:

hugh

Message:

DX 6 Version of ddraw rel files

File:

• trunk/src/ddraw/OS2D3D.CPP (modified) (11 diffs)

trunk/src/ddraw/OS2D3D.CPP

@@ -1 @@
-/* $Id: OS2D3D.CPP,v 1.3 1999-06-10 17:10:56 phaller Exp $ */
-
-//******************************************************************************
-//******************************************************************************
-// Direct3D Main Class
-//
-// Copyright 1998 Sander van Leeuwen (sandervl@xs4all.nl)
-//******************************************************************************
-//******************************************************************************
-// *
-// * Project Odin Software License can be found in LICENSE.TXT
-// *
-
-/*@Const************************************************************************
-*   Defined Constants                                                          *
-*******************************************************************************/
-#define WIN32SDK_NOPOSTWRAPPER
-
-/*@Header***********************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
-#include <os2win.h>
-#include <dive.h>
-
-#include <builtin.h>
 #include <memory.h>
 
-#include "no.h"
-#include <w_windows.h>
-#include <ddraw.h>
-#include <d3d.h>
-#include <Win32SDKPostWrapper.h>
-
+#define INITGUID
 #include "os2ddraw.h"
 #include "os2clipper.h"
 #include "os2palette.h"
 #include "os2surface.h"
+#define _OS2WIN_H
+#define FAR
 #include "misc.h"
-
-/*** IDirect3D methods ***/
-/* KSO Apr 19 1999: Set correct interface.           *
- * (INTERFACE is used in the THIS and THIS_ macros)  */
-#undef  INTERFACE
-#define INTERFACE   IDirect3D
-
+#include <winerror.h>
+#include <builtin.h>
+#undef THIS
+#define THIS VOID*
 
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall D3DQueryInterface(THIS, REFIID riid, LPVOID FAR * ppvObj)
+HRESULT __stdcall D3DQueryInterface(THIS This, REFIID riid, LPVOID FAR * ppvObj)
 {
   dprintf(("D3DQueryInterface\n"));
@@ -53 +22 @@
 
   if(IID_IDirect3D != (GUID &)&riid)
-    return E_NOINTERFACE;
+  return E_NOINTERFACE;
 
   *ppvObj = This;
@@ -62 +31 @@
 //******************************************************************************
 //******************************************************************************
-ULONG __stdcall D3DAddRef(THIS)
+ULONG __stdcall D3DAddRef(THIS This)
 {
  OS2IDirectDraw *me = (OS2IDirectDraw *)This;
@@ -71 +40 @@
 //******************************************************************************
 //******************************************************************************
-ULONG __stdcall D3DRelease(THIS)
+ULONG __stdcall D3DRelease(THIS This)
 {
  OS2IDirectDraw *me = (OS2IDirectDraw *)This;
@@ -78 +47 @@
   dprintf(("OS2IDirectDraw::%X \n", me));
   if(me->Referenced) {
-    me->Referenced--;
-    if(me->Referenced == 0) {
-        delete me;
-        return(0);
-    }
-    else    return me->Referenced;
+  me->Referenced--;
+  if(me->Referenced == 0) {
+    delete me;
+    return(0);
+  }
+  else    return me->Referenced;
   }
   else  return(0);
@@ -89 +58 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall D3DInitialize(THIS_ REFIID)
+HRESULT __stdcall D3DInitialize(THIS This, REFIID)
 {
   dprintf(("D3DInitialize\n"));
@@ -96 +65 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall D3DEnumDevices(THIS_ LPD3DENUMDEVICESCALLBACK, LPVOID)
+HRESULT __stdcall D3DEnumDevices(THIS This, LPD3DENUMDEVICESCALLBACK, LPVOID)
 {
   dprintf(("D3DEnumDevices\n"));
@@ -103 +72 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall D3DCreateLight(THIS_ LPDIRECT3DLIGHT*, IUnknown*)
+HRESULT __stdcall D3DCreateLight(THIS This, LPDIRECT3DLIGHT*, IUnknown*)
 {
   dprintf(("D3DCreateLight\n"));
@@ -110 +79 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall D3DCreateMaterial(THIS_ LPDIRECT3DMATERIAL*, IUnknown*)
+HRESULT __stdcall D3DCreateMaterial(THIS This, LPDIRECT3DMATERIAL*, IUnknown*)
 {
   dprintf(("D3DCreateMaterial\n"));
@@ -117 +86 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall D3DCreateViewport(THIS_ LPDIRECT3DVIEWPORT*, IUnknown*)
+HRESULT __stdcall D3DCreateViewport(THIS This, LPDIRECT3DVIEWPORT*, IUnknown*)
 {
   dprintf(("D3DCreateViewport\n"));
@@ -124 +93 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall D3DFindDevice(THIS_ LPD3DFINDDEVICESEARCH, LPD3DFINDDEVICERESULT)
+HRESULT __stdcall D3DFindDevice(THIS This, LPD3DFINDDEVICESEARCH, LPD3DFINDDEVICERESULT)
 {
   dprintf(("D3DCreateFindDevice\n"));