Changeset 5326 for trunk/src/ddraw/ddraw.CPP

Timestamp:

Mar 18, 2001, 10:44:46 PM (24 years ago)

Author:

mike

Message:

Merged DDRAW and DDRAW\NEW

File:

• trunk/src/ddraw/ddraw.CPP (modified) (18 diffs)

trunk/src/ddraw/ddraw.CPP

@@ -1 @@
-/* $Id: ddraw.CPP,v 1.16 2001-03-09 22:48:47 mike Exp $ */
+/* $Id: ddraw.CPP,v 1.17 2001-03-18 21:44:44 mike Exp $ */
 
 /*
  * DXDraw DLL implementaion
  *
- * Copyright 1998 Sander va Leeuwen
+ * Copyright 1998 Sander van Leeuwen
  * Copyright 1999 Markus Montkowski
  *
@@ -16 +16 @@
 #include <memory.h>
 #include <stdio.h>
-
 #define INITGUID
 #define ICOM_CINTERFACE 1
@@ -29 +28 @@
 #include <misc.h>
 
-extern "C" {
-
 //******************************************************************************
 //******************************************************************************
@@ -40 +37 @@
   HRESULT         rc;
 
-  dprintf(("DDRAW: DirectDrawCreate %X %X %X\n", lpGUID, lplpDD, pUnkOuter));
+  dprintf(("DDRAW: DirectDrawCreate %X %X %X", lpGUID, lplpDD, pUnkOuter));
 
   newdraw = new OS2IDirectDraw(lpGUID);
@@ -55 +52 @@
     if(rc != DD_OK)
     {
-         *lplpDD = NULL;
-
-         delete newdraw;
+      *lplpDD = NULL;
+
+      delete newdraw;
     }
-    else *lplpDD = (LPDIRECTDRAW)newdraw;
+    else
+      *lplpDD = (LPDIRECTDRAW)newdraw;
   }
   return(rc);
@@ -73 +71 @@
 
 //******************************************************************************
-//typedef BOOL (FAR PASCAL * LPDDENUMCALLBACKA)(GUID FAR *, LPSTR, LPSTR, LPVOID);
+typedef BOOL (FAR PASCAL * LPDDENUMCALLBACKA)(GUID FAR *, LPSTR, LPSTR, LPVOID);
 //******************************************************************************
 HRESULT WIN32API OS2DirectDrawEnumerateA(LPDDENUMCALLBACKA lpCallback,
                LPVOID lpContext)
 {
-  dprintf(("DDRAW: DirectDrawEnumerateA\n Callback for DIVE\n"));
+  dprintf(("DDRAW: DirectDrawEnumerateA\n Callback for DIVE"));
   //call it twice for the DirectDraw & Direct3D classes
-  if(lpCallback(NULL, "DIVE DirectDraw for OS/2",
-                "DirectDraw/2 v0.2", lpContext) == DDENUMRET_CANCEL)
-  {
-    dprintf(("DDRAW: Cancel Callback\n"));
+ if(lpCallback(NULL, "DIVE DirectDraw for OS/2",
+                "DirectDraw/2 v0.4", lpContext) == DDENUMRET_CANCEL)
+  {
+    dprintf(("DDRAW: Cancel Callback"));
     return(DD_OK);
   }
 //SvL: Crashes dxview.exe; expects a different vtbl when creating
 //     an IID_IDirect3D object
-#if 1
+#if 1 //!!enabled!!
   else //now for Direct3D
   {
@@ -95 +93 @@
       "Direct3D/2 v0.2", lpContext) == DDENUMRET_CANCEL)
     {
-      dprintf(("DDRAW: Cancel Callback\n"));
+      dprintf(("DDRAW: Cancel Callback"));
       return(DD_OK);
     }
@@ -120 +118 @@
   PENUMDATA pData;
 
-  dprintf(("DDRAW: SimpleEnum\n"));
+  dprintf(("DDRAW: SimpleEnum"));
 
   pData = (PENUMDATA)lpContext;
@@ -129 +127 @@
                             NULL);
 
-  dprintf(("DDRAW: Callback returned\n"));
+  dprintf(("DDRAW: Callback returned"));
   return rc;
 }
@@ -140 +138 @@
   ENUMDATA data;
 
-  dprintf(("DDRAW: DirectDrawEnumerateExA\n"));
+  dprintf(("DDRAW: DirectDrawEnumerateExA"));
 
   data.lpCallbackEx = lpCallbackEx;
@@ -153 +151 @@
 DWORD WIN32API DDHAL32_VidMemFree(DWORD address)
 {
-  dprintf(("DDRAW: DDHAL32_VidMemFree, not supported\n"));
+  dprintf(("DDRAW: DDHAL32_VidMemFree, not supported"));
   return(0);
 }
@@ -160 +158 @@
 DWORD WIN32API DDHAL32_VidMemAlloc(DWORD size)
 {
-  dprintf(("DDRAW: DDHAL32_VidMemAlloc, not supported\n"));
+  dprintf(("DDRAW: DDHAL32_VidMemAlloc, not supported"));
   return(0);
 }
@@ -187 +185 @@
   else
     sprintf(buf,"<guid-0x%04x>",LOWORD(riid));
-  dprintf(("DDRAW:(%p)->(%s,%p),stub!\n",This,buf,ppobj));
+  dprintf(("DDRAW:(%p)->(%s,%p),stub!",This,buf,ppobj));
   return E_NOINTERFACE;
 }
@@ -214 +212 @@
   lpGUID = (LPGUID) riid;
 
-  dprintf(("DDRAW:DDCF_CreateInstance\n"));
+  dprintf(("DDRAW:DDCF_CreateInstance"));
   if( lpGUID &&
       ( (*lpGUID == IID_IDirectDraw ) ||
@@ -230 +228 @@
 {
   ICOM_THIS(IClassFactoryImpl,iface);
-  dprintf(("DDRAW:(%p)->(%d),stub!\n",This,dolock));
+  dprintf(("DDRAW:(%p)->(%d),stub!",This,dolock));
   return S_OK;
 }
@@ -262 +260 @@
   WINE_StringFromCLSID(riid,xbuf);
 
-  dprintf(("DDRAW:(%p,%p,%p)\n", xbuf, buf, ppv));
+  dprintf(("DDRAW:(%p,%p,%p)", xbuf, buf, ppv));
   if (!memcmp(riid,&IID_IClassFactory,sizeof(IID_IClassFactory)))
   {
@@ -269 +267 @@
     return S_OK;
   }
-  dprintf(("DDRAW: (%p,%p,%p): no interface found.\n", xbuf, buf, ppv));
+  dprintf(("DDRAW: (%p,%p,%p): no interface found.", xbuf, buf, ppv));
   return E_NOINTERFACE;
 }
@@ -283 +281 @@
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-  dprintf(("DllCanUnloadNow(void) stub\n"));
+  dprintf(("DllCanUnloadNow(void) stub"));
   return S_FALSE;
 }//******************************************************************************
-}
+