Mercurial > sdl-ios-xcode
view src/main/epoc/SDL_main.cpp @ 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 | f6ffac90895c |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ /* SDL_main.cpp The Epoc executable startup functions Epoc version by Hannu Viitala (hannu.j.viitala@mbnet.fi) */ #include <e32std.h> #include <e32def.h> #include <e32svr.h> #include <e32base.h> #include <estlib.h> #include <stdlib.h> #include <stdio.h> #include <w32std.h> #include <apgtask.h> #include "SDL_error.h" #ifndef EXPORT_C # ifdef __VC32__ # define IMPORT_C __declspec(dllexport) # define EXPORT_C __declspec(dllexport) # endif # ifdef __GCC32__ # define IMPORT_C # define EXPORT_C __declspec(dllexport) # endif #endif #if defined(__WINS__) #include <estw32.h> IMPORT_C void RegisterWsExe(const TDesC &aName); #endif /* The prototype for the application's main() function */ #define main SDL_main extern "C" int main (int argc, char *argv[], char *envp[]); extern "C" void exit (int ret); /* Epoc main function */ GLDEF_C TInt E32Main() { /* Get the clean-up stack */ CTrapCleanup* cleanup = CTrapCleanup::New(); #if defined(__WINS__) /* arrange for access to Win32 stdin/stdout/stderr */ RWin32Stream::StartServer(); #endif /* Arrange for multi-threaded operation */ SpawnPosixServerThread(); /* Get args and environment */ int argc=0; char** argv=0; char** envp=0; __crt0(argc,argv,envp); #if defined(__WINS__) /* Cause the graphical Window Server to come into existence */ RSemaphore sem; sem.CreateGlobal(_L("WsExeSem"),0); RegisterWsExe(sem.FullName()); #endif /* Start the application! */ /* Create stdlib */ _REENT; /* Set process and thread priority */ RThread currentThread; currentThread.Rename(_L("SdlProgram")); currentThread.SetProcessPriority(EPriorityLow); currentThread.SetPriority(EPriorityMuchLess); /* Call stdlib main */ int ret = main(argc, argv, envp); /* !! process exits here if there is "exit()" in main! */ /* Call exit */ exit(ret); /* !! process exits here! */ /* Free resources and return */ CloseSTDLIB(); delete cleanup; return(KErrNone); } /* Epoc dll entry point */ #if defined(__WINS__) GLDEF_C TInt E32Dll(TDllReason) { return(KErrNone); } EXPORT_C TInt WinsMain(TAny *) { E32Main(); return KErrNone; } #endif