diff options
| author | George Hazan <ghazan@miranda.im> | 2020-10-16 14:30:13 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-10-16 14:30:13 +0300 |
| commit | 4bb9749b21edbe9d97ea16a440501f51d5be036c (patch) | |
| tree | 3812bf41208c04b3ba2761fbde0c46d27a1dbae8 /plugins/MirLua/src/Modules | |
| parent | cab7806ebaf3a570d995c128a08d5defc527db14 (diff) | |
MirLua:
- fixes #2589 (MirLua doesn't work correctly in 64-bit Miranda);
- code cleaning;
- version bump
Diffstat (limited to 'plugins/MirLua/src/Modules')
| -rw-r--r-- | plugins/MirLua/src/Modules/m_core.cpp | 8 | ||||
| -rw-r--r-- | plugins/MirLua/src/Modules/m_http.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/MirLua/src/Modules/m_core.cpp b/plugins/MirLua/src/Modules/m_core.cpp index 90f022a9dc..9a608f14af 100644 --- a/plugins/MirLua/src/Modules/m_core.cpp +++ b/plugins/MirLua/src/Modules/m_core.cpp @@ -21,12 +21,12 @@ static int HookEventLuaParam(void *obj, WPARAM wParam, LPARAM lParam, LPARAM par lua_rawgeti(L, LUA_REGISTRYINDEX, ref); if (wParam) - lua_pushinteger(L, wParam); + lua_pushlightuserdata(L, (void *)wParam); else lua_pushnil(L); if (lParam) - lua_pushinteger(L, lParam); + lua_pushlightuserdata(L, (void *)lParam); else lua_pushnil(L); @@ -122,8 +122,8 @@ INT_PTR CreateServiceFunctionLuaStateParam(void *obj, WPARAM wParam, LPARAM lPar int ref = param; lua_rawgeti(L, LUA_REGISTRYINDEX, ref); - lua_pushinteger(L, wParam); - lua_pushinteger(L, lParam); + lua_pushlightuserdata(L, (void *)wParam); + lua_pushlightuserdata(L, (void *)lParam); luaM_pcall(L, 2, 1); INT_PTR res = lua_tointeger(L, 1); diff --git a/plugins/MirLua/src/Modules/m_http.cpp b/plugins/MirLua/src/Modules/m_http.cpp index 006c7e9876..a3c501c44e 100644 --- a/plugins/MirLua/src/Modules/m_http.cpp +++ b/plugins/MirLua/src/Modules/m_http.cpp @@ -68,7 +68,7 @@ static void SetContent(NETLIBHTTPREQUEST *request, const char *data, size_t leng if (request->pData != nullptr) mir_free(request->pData); request->pData = mir_strdup(data); - request->dataLength = length; + request->dataLength = (int)length; } /***********************************************/ @@ -205,7 +205,7 @@ static const luaL_Reg contentApi[] = static NETLIBHTTPREQUEST* response_Create(lua_State *L, NETLIBHTTPREQUEST *request) { - NETLIBHTTPREQUEST *response = Netlib_HttpTransaction(g_hNetlib, request); + NETLIBHTTPREQUEST *response = Netlib_HttpTransaction(g_plugin.hNetlib, request); NETLIBHTTPREQUEST **udata = (NETLIBHTTPREQUEST**)lua_newuserdata(L, sizeof(NETLIBHTTPREQUEST*)); *udata = response; luaL_setmetatable(L, MT_NETLIBHTTPRESPONSE); @@ -431,7 +431,7 @@ static int request_Send(lua_State *L) static int request__index(lua_State *L) { - NETLIBHTTPREQUEST *request = *(NETLIBHTTPREQUEST**)luaL_checkudata(L, 1, MT_NETLIBHTTPREQUEST); + luaL_checkudata(L, 1, MT_NETLIBHTTPREQUEST); const char *key = lua_tostring(L, 2); if (mir_strcmpi(key, "Method") == 0) |