Changeset 4970 for trunk/src

Timestamp:

Jan 19, 2001, 3:06:55 AM (25 years ago)

Author:

mike

Message:

Several fixes to make FS DDRAW build again

Location:

trunk/src/ddraw/new

Files:

• OS2DDRAW.CPP (modified) (2 diffs)
• ddraw.CPP (modified) (3 diffs)
• ddraw.DEF (modified) (3 diffs)
• os2fsdd.cpp (modified) (1 diff)

trunk/src/ddraw/new/OS2DDRAW.CPP

@@ -1 @@
-/* $Id: OS2DDRAW.CPP,v 1.1 2000-04-07 18:21:04 mike Exp $ */
+/* $Id: OS2DDRAW.CPP,v 1.2 2001-01-19 02:06:55 mike Exp $ */
 
 /*
@@ -1605 +1605 @@
   {
       SetWindowPos(me->hwndClient, HWND_TOP,0,0,dwWidth,dwHeight,0);
-//    SetWindowPos(me->hwndClient, HWND_TOP, 0, 0, 1024, 768, 0);
+      SetCursorPos(dwWidth / 2, dwHeight / 2);
 
     if ((me->bPMILoaded) && (ModeInSVGAModeTable(dwWidth,dwHeight,dwBPP)))

trunk/src/ddraw/new/ddraw.CPP

@@ -1 @@
-/* $Id: ddraw.CPP,v 1.1 2000-04-07 18:21:11 mike Exp $ */
+/* $Id: ddraw.CPP,v 1.2 2001-01-19 02:06:55 mike Exp $ */
 
 /*
  * DXDraw DLL implementaion
  *
- * Copyright 1998 Sander va Leeuwen
+ * Copyright 1998 Sander van Leeuwen
  * Copyright 1999 Markus Montkowski
+ *
+ * WARNING: DirectDrawCreate defaults to ddraw v4 if lpGUID == NULL!!
+ *
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -46 +49 @@
   {
     newdraw->Vtbl.AddRef((IDirectDraw2 *)newdraw);
+
     rc = newdraw->GetLastError();
     if(rc != DD_OK)
@@ -58 +62 @@
   return(rc);
 }
+//******************************************************************************
+//******************************************************************************
+HRESULT WIN32API DirectDrawCreateEx(LPGUID lpGUID, LPVOID* lplpDD, REFIID iid, LPUNKNOWN pUnkOuter)
+{
+  dprintf(("DirectDrawCreateEx: %x %x %x %x", lpGUID, lplpDD, iid, pUnkOuter));
+  /* I don't know about what functionality is unique to Ex */
+  return OS2DirectDrawCreate(lpGUID,(LPDIRECTDRAW*)lplpDD,pUnkOuter);
+}
+
 //******************************************************************************
 typedef BOOL (FAR PASCAL * LPDDENUMCALLBACKA)(GUID FAR *, LPSTR, LPSTR, LPVOID);

trunk/src/ddraw/new/ddraw.DEF

@@ -1 @@
-; $Id: ddraw.DEF,v 1.1 2000-04-07 18:21:11 mike Exp $
+; $Id: ddraw.DEF,v 1.2 2001-01-19 02:06:55 mike Exp $
 
 ;
@@ -11 +11 @@
 IMPORTS
     _GpiEnableYInversion       = PMGPI.723
-    _GpiQueryDCData            = PMGPI.665
 
 EXPORTS
@@ -17 +16 @@
 ; D3DParseUnknownCommand          @2
 ; DDGetAttachedSurfaceLcl         @3
- DDHAL32_VidMemFree = _DDHAL32_VidMemFree@4         @4
- DDHAL32_VidMemAlloc    = _DDHAL32_VidMemAlloc@4        @5
+ DDHAL32_VidMemFree = _DDHAL32_VidMemFree@4                     @4
+ DDHAL32_VidMemAlloc    = _DDHAL32_VidMemAlloc@4                @5
 ; DDInternalLock            @6
 ; DDInternalUnlock            @7
 ; DSoundHelp              @8
- DirectDrawCreate       = _OS2DirectDrawCreate@12         @9
+ DirectDrawCreate         = _OS2DirectDrawCreate@12             @9
 ; DirectDrawCreateClipper         @10
-; DirectDrawCreateEx            @11
- DirectDrawEnumerateA   = _OS2DirectDrawEnumerateA@8      @12
- DirectDrawEnumerateExA   = _OS2DirectDrawEnumerateExA@12     @13
+ DirectDrawCreateEx       = _DirectDrawCreateEx@16              @11
+ DirectDrawEnumerateA     = _OS2DirectDrawEnumerateA@8          @12
+ DirectDrawEnumerateExA   = _OS2DirectDrawEnumerateExA@12       @13
 ; DirectDrawEnumerateExW          @14
 ; DirectDrawEnumerateW            @15
-DllCanUnloadNow   = _DllCanUnloadNow@0                      @16
-DllGetClassObject = _DllGetClassObject@12                    @17
+DllCanUnloadNow   = _DllCanUnloadNow@0                          @16
+DllGetClassObject = _DllGetClassObject@12                       @17
 ; GetAliasedVidMem            @18
 ; GetDDSurfaceLocal           @19

trunk/src/ddraw/new/os2fsdd.cpp

@@ -262 +262 @@
                            NULL);
 
+
    return rc;
 }