Mercurial > sdl-ios-xcode
annotate src/timer/win32/SDL_systimer.c @ 1614:6162b8d921ce
Date: Wed, 29 Mar 2006 17:26:55 +0200 CEST
From: "Fran���is Revol"
Subject: [SDL] BeOS port fix: PrintScreen key crashing
It seems the latest SDL crashes when someone hits the PrtScrn key in
ZETA (BeOS R6), somewhere it gets a negative value as key code (or a
big unsigned maybe ?), and uses it as an index in the keysym table...
I'll investigate the cause for the negative value, but it's always
better to check for bounds correctly when indexing a table. The
attached diff fixes it.
Fran���is Revol
--
Software Architect
yellowTAB GmbH
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Fri, 31 Mar 2006 06:16:20 +0000 |
| parents | 420b3f47806d |
| children | 92947e3a18db |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1180
diff
changeset
|
3 Copyright (C) 1997-2006 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1180
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1180
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1180
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1180
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1180
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1180
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
89
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
|
1433
bb6839704ed6
SDL_windows.h is no longer necessary
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
24 #define WIN32_LEAN_AND_MEAN |
|
bb6839704ed6
SDL_windows.h is no longer necessary
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
25 #include <windows.h> |
| 0 | 26 #include <mmsystem.h> |
| 27 | |
| 28 #include "SDL_timer.h" | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
29 #include "../SDL_timer_c.h" |
| 0 | 30 |
| 31 #ifdef _WIN32_WCE | |
|
1180
bdcb8bb4c831
From: Tyler Montbriand <tsm@accesscomm.ca>
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
32 #error This is WinCE. Please use src/timer/wince/SDL_systimer.c instead. |
| 0 | 33 #endif |
| 34 | |
| 35 #define TIME_WRAP_VALUE (~(DWORD)0) | |
| 36 | |
|
89
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
37 /* The first (low-resolution) ticks value of the application */ |
| 0 | 38 static DWORD start; |
| 39 | |
|
89
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
40 #ifndef USE_GETTICKCOUNT |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
41 /* Store if a high-resolution performance counter exists on the system */ |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
42 static BOOL hires_timer_available; |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
43 /* The first high-resolution ticks value of the application */ |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
44 static LARGE_INTEGER hires_start_ticks; |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
45 /* The number of ticks per second of the high-resolution performance counter */ |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
46 static LARGE_INTEGER hires_ticks_per_second; |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
47 #endif |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
48 |
| 0 | 49 void SDL_StartTicks(void) |
| 50 { | |
| 51 /* Set first ticks value */ | |
| 52 #ifdef USE_GETTICKCOUNT | |
| 53 start = GetTickCount(); | |
| 54 #else | |
|
326
72d55d02cb47
Disabled QueryPerformanceCounter(), due to problems on Win2K
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
55 #if 0 /* Apparently there are problems with QPC on Win2K */ |
|
89
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
56 if (QueryPerformanceFrequency(&hires_ticks_per_second) == TRUE) |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
57 { |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
58 hires_timer_available = TRUE; |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
59 QueryPerformanceCounter(&hires_start_ticks); |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
60 } |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
61 else |
|
326
72d55d02cb47
Disabled QueryPerformanceCounter(), due to problems on Win2K
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
62 #endif |
|
89
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
63 { |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
64 hires_timer_available = FALSE; |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
65 timeBeginPeriod(1); /* use 1 ms timer precision */ |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
66 start = timeGetTime(); |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
67 } |
| 0 | 68 #endif |
| 69 } | |
| 70 | |
| 71 Uint32 SDL_GetTicks(void) | |
| 72 { | |
| 73 DWORD now, ticks; | |
|
89
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
74 #ifndef USE_GETTICKCOUNT |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
75 LARGE_INTEGER hires_now; |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
76 #endif |
| 0 | 77 |
| 78 #ifdef USE_GETTICKCOUNT | |
| 79 now = GetTickCount(); | |
| 80 #else | |
|
89
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
81 if (hires_timer_available) |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
82 { |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
83 QueryPerformanceCounter(&hires_now); |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
84 |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
85 hires_now.QuadPart -= hires_start_ticks.QuadPart; |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
86 hires_now.QuadPart *= 1000; |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
87 hires_now.QuadPart /= hires_ticks_per_second.QuadPart; |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
88 |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
89 return (DWORD)hires_now.QuadPart; |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
90 } |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
91 else |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
92 { |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
93 now = timeGetTime(); |
|
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
94 } |
| 0 | 95 #endif |
|
89
69b8fac3e1c0
Added Holger Schemel's fix for SDL_GetTicks() on W2K
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
96 |
| 0 | 97 if ( now < start ) { |
| 98 ticks = (TIME_WRAP_VALUE-start) + now; | |
| 99 } else { | |
| 100 ticks = (now - start); | |
| 101 } | |
| 102 return(ticks); | |
| 103 } | |
| 104 | |
| 105 void SDL_Delay(Uint32 ms) | |
| 106 { | |
| 107 Sleep(ms); | |
| 108 } | |
| 109 | |
| 110 /* Data to handle a single periodic alarm */ | |
| 111 static UINT timerID = 0; | |
| 112 | |
| 1480 | 113 static void CALLBACK HandleAlarm(UINT uID, UINT uMsg, DWORD_PTR dwUser, |
| 114 DWORD_PTR dw1, DWORD_PTR dw2) | |
| 0 | 115 { |
| 116 SDL_ThreadedTimerCheck(); | |
| 117 } | |
| 118 | |
| 119 | |
| 120 int SDL_SYS_TimerInit(void) | |
| 121 { | |
| 122 MMRESULT result; | |
| 123 | |
| 124 /* Set timer resolution */ | |
| 125 result = timeBeginPeriod(TIMER_RESOLUTION); | |
| 126 if ( result != TIMERR_NOERROR ) { | |
| 127 SDL_SetError("Warning: Can't set %d ms timer resolution", | |
| 128 TIMER_RESOLUTION); | |
| 129 } | |
| 130 /* Allow 10 ms of drift so we don't chew on CPU */ | |
| 131 timerID = timeSetEvent(TIMER_RESOLUTION,1,HandleAlarm,0,TIME_PERIODIC); | |
| 132 if ( ! timerID ) { | |
| 133 SDL_SetError("timeSetEvent() failed"); | |
| 134 return(-1); | |
| 135 } | |
| 136 return(SDL_SetTimerThreaded(1)); | |
| 137 } | |
| 138 | |
| 139 void SDL_SYS_TimerQuit(void) | |
| 140 { | |
| 141 if ( timerID ) { | |
| 142 timeKillEvent(timerID); | |
| 143 } | |
| 144 timeEndPeriod(TIMER_RESOLUTION); | |
| 145 } | |
| 146 | |
| 147 int SDL_SYS_StartTimer(void) | |
| 148 { | |
| 149 SDL_SetError("Internal logic error: Win32 uses threaded timer"); | |
| 150 return(-1); | |
| 151 } | |
| 152 | |
| 153 void SDL_SYS_StopTimer(void) | |
| 154 { | |
| 155 return; | |
| 156 } | |
| 157 |