ddraw fixes

[Andreas Mohr]

Hi all,

my last night was a bit... short ;-)

I discovered the Battlezone II Demo and tried to start it. Crash.

ChangeLog:
- correct DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1 confusion
- fix GetAvailableVidMem ddraw iface copy&paste bug (doh !)

Note that the game still doesn't work, though.
Now it comes up entirely without crashing, but the screen is black on
XF4.0.2 16bit.

Andreas Mohr
-------------- next part --------------
Determining best CVS host...
Using CVSROOT :pserver:cvs at wine.codeweavers.com:/home/cvs/wine
Index: dlls/ddraw/ddraw_private.h
===================================================================
RCS file: /home/cvs/wine/wine/dlls/ddraw/ddraw_private.h,v
retrieving revision 1.16
diff -u -r1.16 ddraw_private.h
--- dlls/ddraw/ddraw_private.h	2001/02/12 03:43:53	1.16
+++ dlls/ddraw/ddraw_private.h	2001/02/13 19:07:46
@@ -305,8 +305,8 @@
  * Structure conversion (for thunks)
  */
 void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS* pIn, DDSCAPS2* pOut);
-void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER* pIn,
-					     DDDEVICEIDENTIFIER2* pOut);
+void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2* pIn,
+					     DDDEVICEIDENTIFIER* pOut);
 
 /******************************************************************************
  * Debugging / Flags output functions
Index: dlls/ddraw/struct_convert.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/ddraw/struct_convert.c,v
retrieving revision 1.2
diff -u -r1.2 struct_convert.c
--- dlls/ddraw/struct_convert.c	2001/01/25 22:23:08	1.2
+++ dlls/ddraw/struct_convert.c	2001/02/13 19:07:46
@@ -19,8 +19,8 @@
     pOut->dwCaps4 = 0;
 }
 
-void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER* pIn,
-					     DDDEVICEIDENTIFIER2* pOut)
+void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2* pIn,
+					     DDDEVICEIDENTIFIER* pOut)
 {
     /* 2 adds a dwWHQLLevel field to the end. Both structures are
      * unversioned. */
Index: dlls/ddraw/ddraw/thunks.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/ddraw/ddraw/thunks.c,v
retrieving revision 1.5
diff -u -r1.5 thunks.c
--- dlls/ddraw/ddraw/thunks.c	2001/02/12 03:43:53	1.5
+++ dlls/ddraw/ddraw/thunks.c	2001/02/13 19:07:46
@@ -836,7 +836,7 @@
 				    LPDWORD pdwTotal, LPDWORD pdwFree)
 {
     return IDirectDraw7_GetAvailableVidMem(COM_INTERFACE_CAST(IDirectDrawImpl,
-							      IDirectDraw2,
+							      IDirectDraw4,
 							      IDirectDraw7,
 							      This),
 					   pCaps, pdwTotal, pdwFree);
@@ -884,7 +884,7 @@
 							     This),
 					  &DDDI2, dwFlags);
 
-    DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(pDDDI, &DDDI2);
+    DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(&DDDI2, pDDDI);
 
     return hr;
 }