ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-12-14 14:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fix some grammar in DLL loading

Browse source 
* s/Sys_LoadQVMDll/Sys_LoadGameDll/
This commit is contained in:
Tim Angus 2011-08-03 14:32:49 +00:00
parent 06628af7c5
commit 85ae08e800
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/qcommon/qcommon.h
View file

@ -1071,7 +1071,7 @@ typedef enum {
void Sys_Init (void); void Sys_Init (void);
// general development dll loading for virtual machine testing // general development dll loading for virtual machine testing
void * QDECL Sys_LoadQVMDll( const char *name, intptr_t (QDECL **entryPoint)(int, ...), void * QDECL Sys_LoadGameDll( const char *name, intptr_t (QDECL **entryPoint)(int, ...),
intptr_t (QDECL *systemcalls)(intptr_t, ...) ); intptr_t (QDECL *systemcalls)(intptr_t, ...) );
void Sys_UnloadDll( void *dllHandle ); void Sys_UnloadDll( void *dllHandle );

2
code/qcommon/vm.c
View file

@ -579,7 +579,7 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
{ {
Com_Printf("Try loading dll file %s\n", filename); Com_Printf("Try loading dll file %s\n", filename);
vm->dllHandle = Sys_LoadQVMDll(filename, &vm->entryPoint, VM_DllSyscall); vm->dllHandle = Sys_LoadGameDll(filename, &vm->entryPoint, VM_DllSyscall);
if(vm->dllHandle) if(vm->dllHandle)
{ {

16
code/sys/sys_main.c
View file

@ -422,7 +422,7 @@ void *Sys_LoadDll(const char *name, qboolean useSystemLib)
void *dllhandle; void *dllhandle;
if(useSystemLib) if(useSystemLib)
Com_Printf("Try loading \"%s\"...\n", name); Com_Printf("Trying to load \"%s\"...\n", name);
if(!useSystemLib || !(dllhandle = Sys_LoadLibrary(name))) if(!useSystemLib || !(dllhandle = Sys_LoadLibrary(name)))
{ {
@ -434,7 +434,7 @@ void *Sys_LoadDll(const char *name, qboolean useSystemLib)
if(!*topDir) if(!*topDir)
topDir = "."; topDir = ".";
Com_Printf("Try loading \"%s\" from \"%s\"...\n", name, topDir); Com_Printf("Trying to load \"%s\" from \"%s\"...\n", name, topDir);
Com_sprintf(libPath, sizeof(libPath), "%s%c%s", topDir, PATH_SEP, name); Com_sprintf(libPath, sizeof(libPath), "%s%c%s", topDir, PATH_SEP, name);
if(!(dllhandle = Sys_LoadLibrary(libPath))) if(!(dllhandle = Sys_LoadLibrary(libPath)))
@ -446,7 +446,7 @@ void *Sys_LoadDll(const char *name, qboolean useSystemLib)
if(FS_FilenameCompare(topDir, basePath)) if(FS_FilenameCompare(topDir, basePath))
{ {
Com_Printf("Try loading \"%s\" from \"%s\"...\n", name, basePath); Com_Printf("Trying to load \"%s\" from \"%s\"...\n", name, basePath);
Com_sprintf(libPath, sizeof(libPath), "%s%c%s", basePath, PATH_SEP, name); Com_sprintf(libPath, sizeof(libPath), "%s%c%s", basePath, PATH_SEP, name);
dllhandle = Sys_LoadLibrary(libPath); dllhandle = Sys_LoadLibrary(libPath);
} }
@ -461,12 +461,12 @@ void *Sys_LoadDll(const char *name, qboolean useSystemLib)
/* /*
================= =================
Sys_LoadQVMDll Sys_LoadGameDll
Used to load a development dll instead of a virtual machine Used to load a development dll instead of a virtual machine
================= =================
*/ */
void *Sys_LoadQVMDll(const char *name, void *Sys_LoadGameDll(const char *name,
intptr_t (QDECL **entryPoint)(int, ...), intptr_t (QDECL **entryPoint)(int, ...),
intptr_t (*systemcalls)(intptr_t, ...)) intptr_t (*systemcalls)(intptr_t, ...))
{ {
@ -480,7 +480,7 @@ void *Sys_LoadQVMDll(const char *name,
if(!libHandle) if(!libHandle)
{ {
Com_Printf("Sys_LoadQVMDll(%s) failed:\n\"%s\"\n", name, Sys_LibraryError()); Com_Printf("Sys_LoadGameDll(%s) failed:\n\"%s\"\n", name, Sys_LibraryError());
return NULL; return NULL;
} }
@ -489,13 +489,13 @@ void *Sys_LoadQVMDll(const char *name,
if ( !*entryPoint || !dllEntry ) if ( !*entryPoint || !dllEntry )
{ {
Com_Printf ( "Sys_LoadQVMDll(%s) failed to find vmMain function:\n\"%s\" !\n", name, Sys_LibraryError( ) ); Com_Printf ( "Sys_LoadGameDll(%s) failed to find vmMain function:\n\"%s\" !\n", name, Sys_LibraryError( ) );
Sys_UnloadLibrary(libHandle); Sys_UnloadLibrary(libHandle);
return NULL; return NULL;
} }
Com_Printf ( "Sys_LoadQVMDll(%s) found vmMain function at %p\n", name, *entryPoint ); Com_Printf ( "Sys_LoadGameDll(%s) found vmMain function at %p\n", name, *entryPoint );
dllEntry( systemcalls ); dllEntry( systemcalls );
return libHandle; return libHandle;