Changeset 210 for trunk/src/ddraw/ddraw.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/ddraw.CPP (modified) (3 diffs)

trunk/src/ddraw/ddraw.CPP

@@ -1 @@
-/* $Id: ddraw.CPP,v 1.3 1999-06-10 17:10:57 phaller Exp $ */
+#include <memory.h>
 
-/*
- * DirectDraw exported APIs
- *
- * Copyright 1998 Sander van Leeuwen (sandervl@xs4all.nl)
- *
- * Project Odin Software License can be found in LICENSE.TXT
- *
- */
-
-/*@Const************************************************************************
-*   Defined Constants                                                          *
-*******************************************************************************/
+#include <builtin.h>
 #define INITGUID
-#define INCL_GUIDS
-#define WIN32SDK_NOPOSTWRAPPER
-
-/*@Header***********************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
-#include <os2win.h>
-#include <memory.h>
-#include <builtin.h>
-#include <dive.h>
-
-#include <w_windows.h>
-#include <ddraw.h>
-#include <d3d.h>
-#include <Win32SDKPostWrapper.h>
-
 #include "os2ddraw.h"
+// define the following as we include winnt.h
+#define _OS2WIN_H
+#define FAR
 #include "misc.h"
 
 //******************************************************************************
 //******************************************************************************
-HRESULT WIN32API OS2DirectDrawCreate(GUID FAR *lpGUID,
-                                 LPDIRECTDRAW FAR *lplpDD,
-                             IUnknown FAR *pUnkOuter)
+HRESULT WIN32API OS2DirectDrawCreate( GUID FAR *lpGUID,
+                                      LPDIRECTDRAW FAR *lplpDD,
+                                      IUnknown FAR *pUnkOuter)
 {
- OS2IDirectDraw *newdraw = new OS2IDirectDraw(lpGUID);;
- HRESULT         rc;
+  OS2IDirectDraw *newdraw;
+  HRESULT         rc;
 
-  dprintf(("DirectDrawCreate %X %X %X\n", lpGUID, lplpDD, pUnkOuter));
+  WriteLog("DirectDrawCreate %X %X %X\n", lpGUID, lplpDD, pUnkOuter);
+  newdraw = new OS2IDirectDraw(lpGUID);
 
-  if(newdraw == NULL)   return(DDERR_NODIRECTDRAWHW);
+  if(newdraw == NULL)
+    return(DDERR_NODIRECTDRAWHW);
 
 //  newdraw->Vtbl.AddRef((IDirectDraw *)newdraw);
   rc = newdraw->GetLastError();
-  if(rc != DD_OK) {
+  if(rc != DD_OK)
+  {
     *lplpDD = NULL;
     delete newdraw;
   }
-  else  *lplpDD = (LPDIRECTDRAW)newdraw;
+  else
+    *lplpDD = (LPDIRECTDRAW)newdraw;
+
   return(rc);
 }
 //******************************************************************************
-#if 0  //KSO Apr 19 1999: not needed any longer!
 typedef BOOL (FAR PASCAL * LPDDENUMCALLBACKA)(GUID FAR *, LPSTR, LPSTR, LPVOID);
-#endif
 //******************************************************************************
 HRESULT WIN32API OS2DirectDrawEnumerateA(LPDDENUMCALLBACKA lpCallback,
-                             LPVOID lpContext)
+               LPVOID lpContext)
 {
-  dprintf(("DirectDrawEnumerateA\n"));
+  WriteLog("DirectDrawEnumerateA\n Callback for DIVE\n");
   //call it twice for the DirectDraw & Direct3D classes
-  if(lpCallback(NULL, "DIVE DirectDraw for OS/2",
-        "DirectDraw/2 v0.1", lpContext) == DDENUMRET_CANCEL) {
+ if(lpCallback(NULL, "DIVE DirectDraw for OS/2",
+                "DirectDraw/2 v0.1", lpContext) == DDENUMRET_CANCEL)
+  {
+    WriteLog("Cancel Callback\n");
     return(DD_OK);
   }
   else //now for Direct3D
-  if(lpCallback((GUID *)&IID_IDirect3D, "3Dfx Voodoo Direct3D/2",
-        "Direct3D/2 v0.1", lpContext) == DDENUMRET_CANCEL) {
-    return(DD_OK);
+  {
+    WriteLog("Callback for 3Dfx Voodoo");
+    if(lpCallback((GUID *)&IID_IDirect3D, "3Dfx Voodoo Direct3D/2",
+      "Direct3D/2 v0.1", lpContext) == DDENUMRET_CANCEL)
+    {
+      WriteLog("Cancel Callback\n");
+      return(DD_OK);
+    }
   }
+  WriteLog("Done Enumeration\n\n");
+
   return(DD_OK);
+}
+//******************************************************************************
+typedef struct
+{
+  LPDDENUMCALLBACKEXA lpCallbackEx;
+  LPVOID lpContext;
+} ENUMDATA, *PENUMDATA;
+
+BOOL FAR PASCAL SimpleEnum ( GUID FAR *lpGUID,
+                             LPSTR  lpDriverDescription,
+                             LPSTR  lpDriverName,
+                             LPVOID lpContext)
+{
+  BOOL rc;
+  PENUMDATA pData;
+
+  WriteLog("SimpleEnum\n");
+
+  pData = (PENUMDATA)lpContext;
+  rc = pData->lpCallbackEx( lpGUID,
+                            lpDriverDescription,
+                            lpDriverName,
+                            pData->lpContext,
+                            NULL);
+
+  WriteLog("Callback returned");
+  return rc;
+}
+
+//******************************************************************************
+HRESULT WIN32API OS2DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallbackEx,
+                                            LPVOID lpContext,
+                                            DWORD dwFlags)
+{
+  ENUMDATA data;
+
+  WriteLog("DirectDrawEnumerateExA\n");
+
+  data.lpCallbackEx = lpCallbackEx;
+  data.lpContext    = lpContext;
+
+   OS2DirectDrawEnumerateA( SimpleEnum,
+                            &data);
+  return (DD_OK);
 }
 //******************************************************************************
@@ -80 +112 @@
 DWORD WIN32API DDHAL32_VidMemFree(DWORD address)
 {
-  dprintf(("DDHAL32_VidMemFree, not supported\n"));
+  WriteLog("DDHAL32_VidMemFree, not supported\n");
   return(0);
 }
@@ -87 +119 @@
 DWORD WIN32API DDHAL32_VidMemAlloc(DWORD size)
 {
-  dprintf(("DDHAL32_VidMemAlloc, not supported\n"));
+  WriteLog("DDHAL32_VidMemAlloc, not supported\n");
   return(0);
 }