ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Scripting: Hand off full filename to Lua, add directory to DLL search path

This commit is contained in:
Vicki Pfau 2022-06-08 17:55:37 -07:00
parent 7b8ba05f88
commit 6e196748d8
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/script/engines/lua.c
View File

@ -11,6 +11,10 @@
#include <lualib.h> #include <lualib.h>
#include <lauxlib.h> #include <lauxlib.h>
#ifdef _WIN32
#include <windows.h>
#endif
#define MAX_KEY_SIZE 128 #define MAX_KEY_SIZE 128
static struct mScriptEngineContext* _luaCreate(struct mScriptEngine2*, struct mScriptContext*); static struct mScriptEngineContext* _luaCreate(struct mScriptEngine2*, struct mScriptContext*);
@ -476,24 +480,27 @@ bool _luaLoad(struct mScriptEngineContext* ctx, const char* filename, struct VFi
free(luaContext->lastError); free(luaContext->lastError);
luaContext->lastError = NULL; luaContext->lastError = NULL;
} }
char name[80]; char name[PATH_MAX + 1];
if (filename) { if (filename) {
if (*filename == '*') { if (*filename == '*') {
snprintf(name, sizeof(name), "=%s", filename + 1); snprintf(name, sizeof(name), "=%s", filename + 1);
} else { } else {
#ifdef _WIN32
char dirname[PATH_MAX] = {0};
const char* lastSlash = strrchr(filename, '/'); const char* lastSlash = strrchr(filename, '/');
const char* lastBackslash = strrchr(filename, '\\'); const char* lastBackslash = strrchr(filename, '\\');
if (lastSlash && lastBackslash) { if (lastSlash && lastBackslash) {
if (lastSlash > lastBackslash) { if (lastSlash < lastBackslash) {
filename = lastSlash + 1; lastSlash = lastBackslash;
} else {
filename = lastBackslash + 1;
} }
} else if (lastSlash) {
filename = lastSlash + 1;
} else if (lastBackslash) { } else if (lastBackslash) {
filename = lastBackslash + 1; lastSlash = lastBackslash;
} }
if (lastSlash) {
strncpy(dirname, filename, lastSlash - filename);
AddDllDirectory(dirname);
}
#endif
snprintf(name, sizeof(name), "@%s", filename); snprintf(name, sizeof(name), "@%s", filename);
} }
filename = name; filename = name;