iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Re #361 : Fixed the Windows side of r3454 (made the legacy menu code a real module) and r3453 (new C++ dynamically loadable module system)

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3456 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: f4d4fd155fb2ebac22e61fd78139f648519a0e4e
Former-commit-id: 665b0d8a50476f2cec29b38e12a9a1fd8820e192
This commit is contained in:
pouillot 2011-03-20 10:26:35 +00:00
parent d4eca12b39
commit 1e62141893
5 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libs/tgf/module.cpp
View file

@ -26,9 +26,9 @@
#ifdef WIN32 #ifdef WIN32
# include <windows.h> # include <windows.h>
# define dlopen(soFileName) (void*)LoadLibrary(soFileName) # define dlopen(pszShLibFileName) (void*)LoadLibrary(pszShLibFileName)
# define dlsym(pvoid) GetProcAddress((HMODULE)pvoid) # define dlsym(pvHandle, pszFuncName) GetProcAddress((HMODULE)pvHandle, pszFuncName)
# define dlclose(pvoid) !FreeLibrary((HMODULE)pvoid) # define dlclose(pvHandle) !FreeLibrary((HMODULE)pvHandle)
# define soLibHandle(handle) (void*)handle # define soLibHandle(handle) (void*)handle
#else #else
# include <dlfcn.h> # include <dlfcn.h>
@ -38,10 +38,10 @@
// Name and type of the 2 extern "C" module interface functions. // Name and type of the 2 extern "C" module interface functions.
typedef int (*tModOpenFunc)(const char*, void*); // Returns 0 on success, !0 otherwise. typedef int (*tModOpenFunc)(const char*, void*); // Returns 0 on success, !0 otherwise.
static const char* pszOpenModuleFuncName = "GfModuleOpen"; static const char* pszOpenModuleFuncName = "openGfModule";
typedef int (*tModCloseFunc)(); // Returns 0 on success, !0 otherwise. typedef int (*tModCloseFunc)(); // Returns 0 on success, !0 otherwise.
static const char* pszCloseModuleFuncName = "GfModuleClose"; static const char* pszCloseModuleFuncName = "closeGfModule";
// Error code decoder. // Error code decoder.
static std::string lastDLErrorString() static std::string lastDLErrorString()
@ -109,7 +109,7 @@ GfModule* GfModule::load(const std::string& strShLibName)
{ {
GfLogError("Library %s doesn't export any '%s' function' ; module NOT loaded\n", GfLogError("Library %s doesn't export any '%s' function' ; module NOT loaded\n",
strShLibName.c_str(), pszOpenModuleFuncName); strShLibName.c_str(), pszOpenModuleFuncName);
dlclose(hSOLib); (void)dlclose(hSOLib);
return 0; return 0;
} }
@ -118,7 +118,7 @@ GfModule* GfModule::load(const std::string& strShLibName)
{ {
GfLogError("Library %s '%s' function call failed ; module NOT loaded\n", GfLogError("Library %s '%s' function call failed ; module NOT loaded\n",
strShLibName.c_str(), pszOpenModuleFuncName); strShLibName.c_str(), pszOpenModuleFuncName);
dlclose(hSOLib); (void)dlclose(hSOLib);
return 0; return 0;
} }
@ -127,7 +127,7 @@ GfModule* GfModule::load(const std::string& strShLibName)
{ {
GfLogError("Library %s '%s' function failed to register the open module ; NOT loaded\n", GfLogError("Library %s '%s' function failed to register the open module ; NOT loaded\n",
strShLibName.c_str(), pszOpenModuleFuncName); strShLibName.c_str(), pszOpenModuleFuncName);
dlclose(hSOLib); (void)dlclose(hSOLib);
return 0; return 0;
} }

5
src/libs/tgf/tgf.hpp
View file

@ -24,6 +24,11 @@
#ifndef __TGF__HPP__ #ifndef __TGF__HPP__
#define __TGF__HPP__ #define __TGF__HPP__
#ifdef _MSC_VER
// Disable useless MSVC warnings
# pragma warning (disable:4251) // class XXX needs a DLL interface ...
#endif
#include <string> #include <string>
#include <map> #include <map>

3
src/modules/userinterface/legacymenu/CMakeLists.txt
View file

@ -49,9 +49,6 @@ ADD_SDL_INCLUDEDIR()
ADD_ENET_INCLUDEDIR() ADD_ENET_INCLUDEDIR()
IF(WIN32) IF(WIN32)
# DLL export stuff under Windows (to avoid .def file)
ADD_DEFINITIONS(-DLEGACYMENU_DLL)
# Ignore some run-time libs to avoid link time warnings and sometimes even crashes. # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib") SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
ENDIF(WIN32) ENDIF(WIN32)

6
src/modules/userinterface/legacymenu/legacymenu.cpp
View file

@ -28,7 +28,7 @@
// The LegacyMenu singleton. // The LegacyMenu singleton.
LegacyMenu* LegacyMenu::_pSelf = 0; LegacyMenu* LegacyMenu::_pSelf = 0;
int GfModuleOpen(const char* pszShLibName, void* hShLibHandle) int openGfModule(const char* pszShLibName, void* hShLibHandle)
{ {
// Instanciate the (only) module instance. // Instanciate the (only) module instance.
LegacyMenu::_pSelf = new LegacyMenu(pszShLibName, hShLibHandle); LegacyMenu::_pSelf = new LegacyMenu(pszShLibName, hShLibHandle);
@ -41,7 +41,7 @@ int GfModuleOpen(const char* pszShLibName, void* hShLibHandle)
return LegacyMenu::_pSelf ? 0 : 1; return LegacyMenu::_pSelf ? 0 : 1;
} }
int GfModuleClose() int closeGfModule()
{ {
// Delete the (only) module instance. // Delete the (only) module instance.
delete LegacyMenu::_pSelf; delete LegacyMenu::_pSelf;
@ -53,7 +53,7 @@ int GfModuleClose()
LegacyMenu& LegacyMenu::self() LegacyMenu& LegacyMenu::self()
{ {
// Pre-condition : 1 successfull GfModuleOpen call. // Pre-condition : 1 successfull openGfModule call.
return *_pSelf; return *_pSelf;
} }

10
src/modules/userinterface/legacymenu/legacymenu.h
View file

@ -31,7 +31,7 @@
// DLL exported symbols declarator for Windows. // DLL exported symbols declarator for Windows.
#ifdef WIN32 #ifdef WIN32
# ifdef LEGACYMENU_DLL # ifdef legacymenu_EXPORTS
# define LEGACYMENU_API __declspec(dllexport) # define LEGACYMENU_API __declspec(dllexport)
# else # else
# define LEGACYMENU_API __declspec(dllimport) # define LEGACYMENU_API __declspec(dllimport)
@ -42,8 +42,8 @@
// The C interface of the module. // The C interface of the module.
LEGACYMENU_API extern "C" int GfModuleOpen(const char* pszShLibName, void* hShLibHandle); extern "C" int LEGACYMENU_API openGfModule(const char* pszShLibName, void* hShLibHandle);
LEGACYMENU_API extern "C" int GfModuleClose(); extern "C" int LEGACYMENU_API closeGfModule();
// The module main class (inherits GfModule, and implements IUserInterface). // The module main class (inherits GfModule, and implements IUserInterface).
class LEGACYMENU_API LegacyMenu : public GfModule, public IUserInterface class LEGACYMENU_API LegacyMenu : public GfModule, public IUserInterface
@ -112,8 +112,8 @@ protected:
IRaceEngine* _piRaceEngine; IRaceEngine* _piRaceEngine;
// Make the C interface functions nearly member functions. // Make the C interface functions nearly member functions.
friend LEGACYMENU_API int GfModuleOpen(const char* pszShLibName, void* hShLibHandle); friend int openGfModule(const char* pszShLibName, void* hShLibHandle);
friend LEGACYMENU_API int GfModuleClose(); friend int closeGfModule();
}; };
#endif /* _LEGACYMENU_H_ */ #endif /* _LEGACYMENU_H_ */