We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch for src/joystick/win32/SDL_mmjoystick.c

SDL_mmjoystick.c.diff (text/plain), 1.63 KB, created by Max Horn on 2006-04-17 03:08:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Horn

Created: 2006-04-17 03:08:38 UTC

Size: 1.63 KB

patch

obsolete

>Index: SDL_mmjoystick.c
>===================================================================
>RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/joystick/win32/SDL_mmjoystick.c,v
>retrieving revision 1.22
>diff -u -d -r1.22 SDL_mmjoystick.c
>--- SDL_mmjoystick.c	14 Apr 2006 04:46:45 -0000	1.22
>+++ SDL_mmjoystick.c	17 Apr 2006 07:07:54 -0000
>@@ -154,34 +154,26 @@
> 	JOYCAPS	joycaps;
> 	MMRESULT result;
> 
>-	numdevs = 0;
>-	maxdevs = joyGetNumDevs();
>-
>-	if ( maxdevs > MAX_JOYSTICKS ) {
>-		maxdevs = MAX_JOYSTICKS;
>-	}
>-
>-
>-	for ( i = 0; i < MAX_JOYSTICKS; i++ ) {
>-		SYS_JoystickID[i] = JOYSTICKID1 + i;
>+	/* Reset the joystick ID & name mapping tables */
>+	for ( i = 0; i < MAX_JOYSTICKS; ++i ) {
>+		SYS_JoystickID[i] = 0;
> 		SYS_JoystickName[i] = NULL;
> 	}
> 
>-
>-	for ( i = 0; (i < maxdevs); ++i ) {
>+	/* Loop over all potential joystick devices */
>+	numdevs = 0;
>+	maxdevs = joyGetNumDevs();
>+	for ( i = JOYSTICKID1; i < maxdevs && numdevs < MAX_JOYSTICKS; ++i ) {
> 		
>-		/* added 8/31/2001 By Vitaliy Mikitchenko */
> 		joyinfo.dwSize = sizeof(joyinfo);
> 		joyinfo.dwFlags = JOY_RETURNALL;
>-		/* end addition */
>-
> 		result = joyGetPosEx(SYS_JoystickID[i], &joyinfo);
> 		if ( result == JOYERR_NOERROR ) {
>-			result = joyGetDevCaps(SYS_JoystickID[i], &joycaps, sizeof(joycaps));
>+			result = joyGetDevCaps(i, &joycaps, sizeof(joycaps));
> 			if ( result == JOYERR_NOERROR ) {
>-				SYS_JoystickID[numdevs] = SYS_JoystickID[i];
>+				SYS_JoystickID[numdevs] = i;
> 				SYS_Joystick[numdevs] = joycaps;
>-				SYS_JoystickName[numdevs] = GetJoystickName(numdevs, joycaps.szRegKey);
>+				SYS_JoystickName[numdevs] = GetJoystickName(i, joycaps.szRegKey);
> 				numdevs++;
> 			}
> 		}

Actions: View | Diff

Attachments on bug 187: 106

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.