ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed error handling in DGA_IDirectDraw2Impl_GetCaps().

Browse Source
This commit is contained in:
Eric Pouech 1999-06-22 19:04:44 +00:00 committed by Alexandre Julliard
parent 7ac5754626
commit 2e4c905755
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/ddraw.c
View File

@ -1557,7 +1557,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetDC(LPDIRECTDRAWSURFACE4 iface,H
b_info, b_info,
usage, usage,
&(This->s.bitmap_data), &(This->s.bitmap_data),
NULL, (HANDLE)0,
0); 0);
EndPaint(This->s.ddraw->d.mainWindow,&This->s.ddraw->d.ps); EndPaint(This->s.ddraw->d.mainWindow,&This->s.ddraw->d.ps);
TRACE(ddraw, "DIBSection at : %p\n", This->s.bitmap_data); TRACE(ddraw, "DIBSection at : %p\n", This->s.bitmap_data);
@ -3643,6 +3643,8 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_GetCaps(
#ifdef HAVE_LIBXXF86DGA #ifdef HAVE_LIBXXF86DGA
ICOM_THIS(IDirectDraw2Impl,iface); ICOM_THIS(IDirectDraw2Impl,iface);
TRACE(ddraw,"(%p)->GetCaps(%p,%p)\n",This,caps1,caps2); TRACE(ddraw,"(%p)->GetCaps(%p,%p)\n",This,caps1,caps2);
if (!caps1 && !caps2)
return DDERR_INVALIDPARAMS;
if (caps1) { if (caps1) {
caps1->dwVidMemTotal = This->e.dga.fb_memsize; caps1->dwVidMemTotal = This->e.dga.fb_memsize;
caps1->dwCaps = 0xffffffff&~(DDCAPS_BANKSWITCHED); /* we can do anything */ caps1->dwCaps = 0xffffffff&~(DDCAPS_BANKSWITCHED); /* we can do anything */