Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-27 19:24:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Date: Thu, 24 Jun 2004 15:13:40 +0300 (EEST)

Browse Source 
From: Martin_Storsj�
Subject: Small patches for SDL/win32

I've tried playing with running SDL compiled for Windows with Wine (and
WineX) under Linux. It didn't originally work too well, but I somehow
managed to make it work. Most of the fixes was patches to Wine(X), but I
also found something in video/windx5/SDL_dx5video.c which, as far as I can
tell, actually is a bug in SDL. The result from the COM method Release,
which returns the new reference count, is compared to DD_OK. Because
QueryInterface is called immediately before, the reference count shouldn't
be DD_OK (== 0).
This commit is contained in:
Sam Lantinga
2004-06-25 05:24:50 +00:00
parent e8954f1b31
commit 0a6926268b
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/windx5/SDL_dx5video.c
View File

@@ -1323,11 +1323,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current,
SetDDerror("DirectDrawSurface::QueryInterface", result);
return(NULL);
}
result = IDirectDrawSurface_Release(dd_surface1);
if ( result != DD_OK ) {
SetDDerror("DirectDrawSurface::Release", result);
return(NULL);
}
IDirectDrawSurface_Release(dd_surface1);
/* Get the format of the primary DirectDraw surface */
memset(&ddsd, 0, sizeof(ddsd));
@@ -1335,7 +1331,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current,
ddsd.dwFlags = DDSD_PIXELFORMAT|DDSD_CAPS;
result = IDirectDrawSurface3_GetSurfaceDesc(SDL_primary, &ddsd);
if ( result != DD_OK ) {
SetDDerror("DirectDrawSurface::Release", result);
SetDDerror("DirectDrawSurface::GetSurfaceDesc", result);
return(NULL);
}
if ( ! (ddsd.ddpfPixelFormat.dwFlags&DDPF_RGB) ) {