[SDL] Re: [SDL-CVS] Module SDL12: Change committed

[Torsten Giebl]

Hello !


When trying to compile a fresh checkedout CVS version
from SDL with CYGWIN ( MinGW Mode ) i get the following error :

---------------->

/timer -I../../../src/endian -I../../../src/file -I../../../src/thread 
-MT SDL_d
x5events.lo -MD -MP -MF .deps/SDL_dx5events.Tpo -c SDL_dx5events.c 
-DPIC -o .li
bs/SDL_dx5events.o
SDL_dx5events.c: In function `DX5_DInputInit':
SDL_dx5events.c:184: error: too many arguments to function 
`GetTopLevelParent'
SDL_dx5events.c: In function `DX5_DInputReset':
SDL_dx5events.c:668: error: too many arguments to function 
`GetTopLevelParent'
make[3]: *** [SDL_dx5events.lo] Error 1

<---------------


CU



Anonymous CVS Login schrieb:
> Commiter   : cvs
> CVSROOT    : /home/sdlweb/libsdl.org/cvs
> Module     : SDL12
> Commit time: 2005-08-11 01:02:11 UTC
> 
> Log message:
> 
> Patches to make SDL compatible with Win95 again.
> 
> Modified files:
>      src/video/windx5/SDL_dx5events.c
> 
> 
> ------------------------------------------------------------------------
> 
> Index: SDL12/src/video/windx5/SDL_dx5events.c
> diff -u SDL12/src/video/windx5/SDL_dx5events.c:1.23 SDL12/src/video/windx5/SDL_dx5events.c:1.24
> --- SDL12/src/video/windx5/SDL_dx5events.c:1.23	Mon Nov 15 13:11:44 2004
> +++ SDL12/src/video/windx5/SDL_dx5events.c	Wed Aug 10 18:02:01 2005
> @@ -22,7 +22,7 @@
>  
>  #ifdef SAVE_RCSID
>  static char rcsid =
> - "@(#) $Id: SDL_dx5events.c,v 1.23 2004/11/15 21:11:44 slouken Exp $";
> + "@(#) $Id: SDL_dx5events.c,v 1.24 2005/08/11 01:02:01 icculus Exp $";
>  #endif
>  
>  /* CAUTION!!!!  If you modify this file, check ../windib/SDL_sysevents.c */
> @@ -68,6 +68,19 @@
>     and give him a chance to handle some messages. */
>  static WNDPROC userWindowProc = NULL;
>  
> +static HWND GetTopLevelParent(HWND hWnd)
> +{
> +    HWND hParentWnd;
> +    while (1)
> +    {
> +        hParentWnd = GetParent(hWnd);
> +        if (hParentWnd == NULL)
> +            break;
> +        hWnd = hParentWnd;
> +    }
> +    return hWnd;
> +}
> +
>  /* Convert a DirectInput return code to a text message */
>  static void SetDIerror(char *function, int code)
>  {
> @@ -168,7 +181,7 @@
>  			SetDIerror("DirectInputDevice::QueryInterface", result);
>  			return(-1);
>  		}
> -		topwnd =  GetAncestor(SDL_Window, GA_ROOT);
> +		topwnd =  GetTopLevelParent(SDL_Window, GA_ROOT);
>  		result = IDirectInputDevice2_SetCooperativeLevel(SDL_DIdev[i],
>  					topwnd, inputs[i].win_level);
>  		if ( result != DI_OK ) {
> @@ -652,7 +665,7 @@
>  				level = inputs[i].win_level;
>  			}
>  			IDirectInputDevice2_Unacquire(SDL_DIdev[i]);
> -			topwnd = GetAncestor(SDL_Window, GA_ROOT);
> +			topwnd = GetTopLevelParent(SDL_Window, GA_ROOT);
>  			result = IDirectInputDevice2_SetCooperativeLevel(
>  					SDL_DIdev[i], topwnd, level);
>  			IDirectInputDevice2_Acquire(SDL_DIdev[i]);
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> SDL-CVS mailing list
> SDL-CVS at libsdl.org
> http://www.libsdl.org/mailman/listinfo/sdl-cvs