Mercurial > sdl-ios-xcode
annotate test/testtimer.c @ 1748:5e86e34453d4
------- Comment #1 From Max Horn 2006-04-17 03:08 [reply] -------
Created an attachment (id=106) [edit]
Patch for src/joystick/win32/SDL_mmjoystick.c
I am not even a Windows user, so take the following with a grain of salt:
SDL_mmjoystick.c has a function GetJoystickName which obtains the joystick
name by looking at the registry. The way it does that seems very fishy to me.
Namely, it uses the parameter "index" to construct a registry value name (BTW,
those variables used in the code are really badly named). The value of "index"
in turn equals the current value of "numdevs", as called from
SDL_SYS_JoystickInit.
I read through the MSDN docs at
<http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/dnarinput/html/msdn_extdirect.asp>,
and I believe the simple fix is to replace line 183 of said file
SYS_JoystickName[numdevs] = GetJoystickName(numdevs, joycaps.szRegKey);
by the following:
SYS_JoystickName[numdevs] = GetJoystickName(SYS_JoystickID[i],
joycaps.szRegKey);
However, that is only *hiding* the real issue. Problem is, the list of
joysticks as returned by windows may contains "gaps", and the code deals
incorrectly with that. Namely those gaps occur if joysticks are
removed/(re)added, as the reporter observed.
The attached patch fixes this and another (off-by-one) issue in the code. But
since I have no Windows machine, I can't even test-compile it, so use with
caution.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 29 Apr 2006 20:22:31 +0000 |
| parents | d5298e8f22b3 |
| children | 14717b52abc0 |
| rev | line source |
|---|---|
| 0 | 1 |
| 2 /* Test program to check the resolution of the SDL timer on the current | |
| 3 platform | |
| 4 */ | |
| 5 | |
| 6 #include <stdlib.h> | |
| 7 #include <stdio.h> | |
| 8 | |
| 9 #include "SDL.h" | |
| 10 | |
| 11 #define DEFAULT_RESOLUTION 1 | |
| 12 | |
| 13 static int ticks = 0; | |
| 14 | |
| 15 static Uint32 ticktock(Uint32 interval) | |
| 16 { | |
| 17 ++ticks; | |
| 18 return(interval); | |
| 19 } | |
| 20 | |
| 21 static Uint32 callback(Uint32 interval, void *param) | |
| 22 { | |
|
1615
d5298e8f22b3
Ugh, more 64-bit cleanup
Sam Lantinga <slouken@libsdl.org>
parents:
1500
diff
changeset
|
23 printf("Timer %d : param = %d\n", interval, (int)(uintptr_t)param); |
| 0 | 24 return interval; |
| 25 } | |
| 26 | |
| 27 int main(int argc, char *argv[]) | |
| 28 { | |
| 29 int desired; | |
| 30 SDL_TimerID t1, t2, t3; | |
| 31 | |
| 32 if ( SDL_Init(SDL_INIT_TIMER) < 0 ) { | |
|
1484
b2b476a4a73c
Added documentation on how to build a completely useless SDL library. :)
Sam Lantinga <slouken@libsdl.org>
parents:
1151
diff
changeset
|
33 fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError()); |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
766
diff
changeset
|
34 return(1); |
| 0 | 35 } |
| 36 | |
| 37 /* Start the timer */ | |
| 38 desired = 0; | |
| 39 if ( argv[1] ) { | |
| 40 desired = atoi(argv[1]); | |
| 41 } | |
| 42 if ( desired == 0 ) { | |
| 43 desired = DEFAULT_RESOLUTION; | |
| 44 } | |
| 45 SDL_SetTimer(desired, ticktock); | |
| 46 | |
| 47 /* Wait 10 seconds */ | |
| 48 printf("Waiting 10 seconds\n"); | |
| 49 SDL_Delay(10*1000); | |
| 50 | |
| 51 /* Stop the timer */ | |
| 52 SDL_SetTimer(0, NULL); | |
| 53 | |
| 54 /* Print the results */ | |
| 55 if ( ticks ) { | |
| 56 fprintf(stderr, | |
| 57 "Timer resolution: desired = %d ms, actual = %f ms\n", | |
| 58 desired, (double)(10*1000)/ticks); | |
| 59 } | |
| 60 | |
| 61 /* Test multiple timers */ | |
| 62 printf("Testing multiple timers...\n"); | |
| 63 t1 = SDL_AddTimer(100, callback, (void*)1); | |
| 64 if(!t1) | |
|
766
ed57c876700d
Date: Wed, 26 Nov 2003 01:52:02 +0800
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
65 fprintf(stderr,"Could not create timer 1: %s\n", SDL_GetError()); |
| 0 | 66 t2 = SDL_AddTimer(50, callback, (void*)2); |
| 67 if(!t2) | |
|
766
ed57c876700d
Date: Wed, 26 Nov 2003 01:52:02 +0800
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
68 fprintf(stderr,"Could not create timer 2: %s\n", SDL_GetError()); |
| 0 | 69 t3 = SDL_AddTimer(233, callback, (void*)3); |
| 70 if(!t3) | |
|
766
ed57c876700d
Date: Wed, 26 Nov 2003 01:52:02 +0800
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
71 fprintf(stderr,"Could not create timer 3: %s\n", SDL_GetError()); |
| 0 | 72 |
| 73 /* Wait 10 seconds */ | |
| 74 printf("Waiting 10 seconds\n"); | |
| 75 SDL_Delay(10*1000); | |
| 76 | |
| 77 printf("Removing timer 1 and waiting 5 more seconds\n"); | |
| 78 SDL_RemoveTimer(t1); | |
| 79 | |
| 80 SDL_Delay(5*1000); | |
| 81 | |
| 82 SDL_RemoveTimer(t2); | |
| 83 SDL_RemoveTimer(t3); | |
| 84 | |
|
1151
be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
Ryan C. Gordon <icculus@icculus.org>
parents:
766
diff
changeset
|
85 SDL_Quit(); |
| 0 | 86 return(0); |
| 87 } |