gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Xbox One port.

Browse Source
This commit is contained in:
Mike Pall 2015-06-16 04:27:44 +02:00
parent fe565222a1
commit 28d8728869
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib_package.c
View File

@ -100,7 +100,7 @@ static void pusherror(lua_State *L)
wchar_t wbuffer[128]; wchar_t wbuffer[128];
char buffer[128*2]; char buffer[128*2];
if (FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM, if (FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
NULL, error, 0, buffer, sizeof(wbuffer)/sizeof(wchar_t), NULL) && NULL, error, 0, wbuffer, sizeof(wbuffer)/sizeof(wchar_t), NULL) &&
WideCharToMultiByte(CP_ACP, 0, wbuffer, 128, buffer, 128*2, NULL, NULL)) WideCharToMultiByte(CP_ACP, 0, wbuffer, 128, buffer, 128*2, NULL, NULL))
#else #else
char buffer[128]; char buffer[128];
@ -119,7 +119,7 @@ static void ll_unloadlib(void *lib)
static void *ll_load(lua_State *L, const char *path, int gl) static void *ll_load(lua_State *L, const char *path, int gl)
{ {
HINSTANCE lib = LoadLibraryA(path); HINSTANCE lib = LoadLibraryExA(path, NULL, 0);
if (lib == NULL) pusherror(L); if (lib == NULL) pusherror(L);
UNUSED(gl); UNUSED(gl);
return lib; return lib;

1
src/lj_arch.h
View File

@ -124,7 +124,6 @@
#define LJ_TARGET_XBOXONE 1 #define LJ_TARGET_XBOXONE 1
#define LJ_TARGET_CONSOLE 1 #define LJ_TARGET_CONSOLE 1
#define LJ_TARGET_GC64 1 #define LJ_TARGET_GC64 1
#define LoadLibraryA(name) LoadLibraryExA((name), NULL, 0)
#endif #endif
#define LJ_NUMMODE_SINGLE 0 /* Single-number mode only. */ #define LJ_NUMMODE_SINGLE 0 /* Single-number mode only. */

10
src/lj_clib.c
View File

@ -176,7 +176,7 @@ LJ_NORET LJ_NOINLINE static void clib_error(lua_State *L, const char *fmt,
wchar_t wbuf[128]; wchar_t wbuf[128];
char buf[128*2]; char buf[128*2];
if (!FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS|FORMAT_MESSAGE_FROM_SYSTEM, if (!FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS|FORMAT_MESSAGE_FROM_SYSTEM,
NULL, err, 0, buf, sizeof(wbuf)/sizeof(wchar_t), NULL) || NULL, err, 0, wbuf, sizeof(wbuf)/sizeof(wchar_t), NULL) ||
!WideCharToMultiByte(CP_ACP, 0, wbuf, 128, buf, 128*2, NULL, NULL)) !WideCharToMultiByte(CP_ACP, 0, wbuf, 128, buf, 128*2, NULL, NULL))
#else #else
char buf[128]; char buf[128];
@ -208,7 +208,7 @@ static const char *clib_extname(lua_State *L, const char *name)
static void *clib_loadlib(lua_State *L, const char *name, int global) static void *clib_loadlib(lua_State *L, const char *name, int global)
{ {
DWORD oldwerr = GetLastError(); DWORD oldwerr = GetLastError();
void *h = (void *)LoadLibraryA(clib_extname(L, name)); void *h = (void *)LoadLibraryExA(clib_extname(L, name), NULL, 0);
if (!h) clib_error(L, "cannot load module " LUA_QS ": %s", name); if (!h) clib_error(L, "cannot load module " LUA_QS ": %s", name);
SetLastError(oldwerr); SetLastError(oldwerr);
UNUSED(global); UNUSED(global);
@ -249,9 +249,9 @@ static void *clib_getsym(CLibrary *cl, const char *name)
GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS|GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS|GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
(const char *)&_fmode, &h); (const char *)&_fmode, &h);
break; break;
case CLIB_HANDLE_KERNEL32: h = LoadLibraryA("kernel32.dll"); break; case CLIB_HANDLE_KERNEL32: h = LoadLibraryExA("kernel32.dll", NULL, 0); break;
case CLIB_HANDLE_USER32: h = LoadLibraryA("user32.dll"); break; case CLIB_HANDLE_USER32: h = LoadLibraryExA("user32.dll", NULL, 0); break;
case CLIB_HANDLE_GDI32: h = LoadLibraryA("gdi32.dll"); break; case CLIB_HANDLE_GDI32: h = LoadLibraryExA("gdi32.dll", NULL, 0); break;
} }
if (!h) continue; if (!h) continue;
clib_def_handle[i] = (void *)h; clib_def_handle[i] = (void *)h;

2
src/lj_profile.c
View File

@ -266,7 +266,7 @@ static void profile_timer_start(ProfileState *ps)
{ {
#if LJ_TARGET_WINDOWS #if LJ_TARGET_WINDOWS
if (!ps->wmm) { /* Load WinMM library on-demand. */ if (!ps->wmm) { /* Load WinMM library on-demand. */
ps->wmm = LoadLibraryA("winmm.dll"); ps->wmm = LoadLibraryExA("winmm.dll", NULL, 0);
if (ps->wmm) { if (ps->wmm) {
ps->wmm_tbp = (WMM_TPFUNC)GetProcAddress(ps->wmm, "timeBeginPeriod"); ps->wmm_tbp = (WMM_TPFUNC)GetProcAddress(ps->wmm, "timeBeginPeriod");
ps->wmm_tep = (WMM_TPFUNC)GetProcAddress(ps->wmm, "timeEndPeriod"); ps->wmm_tep = (WMM_TPFUNC)GetProcAddress(ps->wmm, "timeEndPeriod");