commit 2e4c9057551a3adfcaaf6ba744f9555fd4b51eb0
author Eric Pouech <Eric.Pouech@wanadoo.fr> Tue Jun 22 19:04:44 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jun 22 19:04:44 1999 +0000
tree c62859b77a9de541ee61fe8c855d3fca86a8aa82
parent 7ac5754626a47e4ec1a6f5ba98579416616bc8cb

Fixed error handling in DGA_IDirectDraw2Impl_GetCaps().

graphics/ddraw.c

diff --git a/graphics/ddraw.c b/graphics/ddraw.c
index 29c1a65..a16b6ca 100644
--- a/graphics/ddraw.c
+++ b/graphics/ddraw.c
@@ -1557,7 +1557,7 @@
 					  b_info,
 					  usage,
 					  &(This->s.bitmap_data),
-					  NULL,
+					  (HANDLE)0,
 					  0);
     EndPaint(This->s.ddraw->d.mainWindow,&This->s.ddraw->d.ps);
     TRACE(ddraw, "DIBSection at : %p\n", This->s.bitmap_data);
@@ -3643,6 +3643,8 @@
 #ifdef HAVE_LIBXXF86DGA
         ICOM_THIS(IDirectDraw2Impl,iface);
 	TRACE(ddraw,"(%p)->GetCaps(%p,%p)\n",This,caps1,caps2);
+	if (!caps1 && !caps2)
+	   return DDERR_INVALIDPARAMS;
 	if (caps1) {
 		caps1->dwVidMemTotal = This->e.dga.fb_memsize;
 		caps1->dwCaps = 0xffffffff&~(DDCAPS_BANKSWITCHED);		/* we can do anything */