Version 0.3.1

* Some improvements to http error displaying
* Memory leak fixed

Author: igor725

build.bat

@@ -47,9 +47,9 @@ SET RL_SCRIPTHOOK_SDK_DIR=.\src\thirdparty\ScriptHook!RL_SCRIPTHOOK_VARIANT!
 IF "%RL_STANDALONE%"=="1" (
 	SET RL_OUT_PATH=".\objs\output!RL_SCRIPTHOOK_VARIANT!"
 	SET RL_CFLAGS=!RL_CFLAGS! /DREDLUA_STANDALONE /Zi /MTd
-	SET RL_CFLAGS=!RL_CFLAGS! /Fd!RL_OUT_PATH!\ /DEBUG 
+	SET RL_CFLAGS=!RL_CFLAGS! /Fd!RL_OUT_PATH!\ /DEBUG
 	SET RL_SOURCES=!RL_SOURCES! src\thirdparty\easyloggingpp.cpp
-	SET RL_OUT_BIN=RedLua.dll	
+	SET RL_OUT_BIN=RedLua.dll
 ) ELSE (
 	SET RL_CFLAGS=!RL_CFLAGS! /MT
 	SET RL_LIBS=!RL_LIBS! ScriptHook!RL_SCRIPTHOOK_VARIANT!.lib

src/base.cpp

@@ -46,7 +46,7 @@ void RedLuaMain(void) {
 	if(logger->enabled(el::Level::Global) && logger->toStandardOutput(el::Level::Global)) {
 		bool alloced = false;
 		if(AttachConsole(ATTACH_PARENT_PROCESS) || (alloced = AllocConsole()) == true) {
-			if(alloced) SetConsoleTitle("RedLua debug console");
+			if(alloced) SetConsoleTitle(REDLUA_NAME " debug console");
 			freopen("CONOUT$", "w", stdout);
 			freopen("CONOUT$", "w", stderr);
 			HasConsole = true;
@@ -60,7 +60,7 @@ void RedLuaMain(void) {
 	menuController->SetCurrentPosition(
 		Settings.Read("menu_position", 0)
 	);
-	LOG(DEBUG) << "RedLua menu initialized";
+	LOG(DEBUG) << REDLUA_NAME " menu initialized";
 #endif
 	if(Settings.Read("auto_updates", false)) {
 		LOG(DEBUG) << "Starting updates checker...";
@@ -72,7 +72,7 @@ void RedLuaMain(void) {
 			CreateUpdateAlert(menuController, data);
 #endif
 		else
-			LOG(DEBUG) << "RedLua updater: " << data;
+			LOG(DEBUG) << REDLUA_NAME " updater: " << data;
 		if(UpdatesCtl.CheckNativeDB(data))
 			LOG(INFO) << "NativeDB updated successfully";
 		else

src/constants.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #define REDLUA_NAME "RedLua"
-#define REDLUA_VERSION "v0.3.0"
-#define REDLUA_VERSION_NUM 030
+#define REDLUA_VERSION "v0.3.1"
+#define REDLUA_VERSION_NUM 031
 #define REDLUA_FULLNAME REDLUA_NAME " " REDLUA_VERSION
 
 #ifndef REDLUA_GTAV

src/dllmain.cpp

@@ -17,7 +17,7 @@ BOOL DllMain(HMODULE hInstance, DWORD dwReason, LPVOID lpReserved) {
 			|| !EnsureDirectory(REDLUA_CLIBS_DIR)) {
 				switch(MessageBox(NULL, "Failed to create RedLua "
 					"directory, please set write permissions "
-					"to the root folder of the game.", "RedLua",
+					"to the root folder of the game.", REDLUA_FULLNAME,
 					MB_ICONERROR | MB_CANCELTRYCONTINUE | MB_DEFBUTTON2
 				)) {
 					case IDCANCEL:

src/menus/helpers.hpp

@@ -18,8 +18,9 @@ class MenuItemLink : public MenuItemDefault {
 
 class MenuTemporary : public MenuBase
 {
-	virtual void OnPop(void)
+	void OnPop(void)
 	{
+		GetController()->UnregisterMenu(this);
 		delete this;
 	}
 

src/menus/scripts.cpp

@@ -2,17 +2,13 @@
 #include "luascript.hpp"
 #include "menus\scripts.hpp"
 
-class MenuScript : public MenuBase {
-	virtual void OnPop() {
-		delete this;
-	}
-
+class MenuScript : public MenuTemporary {
 private:
 	LuaScript *m_script;
 
 public:
 	MenuScript(MenuItemTitle *title, LuaScript *script)
-		: MenuBase(title), m_script(script) {}
+		: MenuTemporary(title), m_script(script) {}
 
 	virtual LuaScript *GetScript(void) {
 		return m_script;

src/native/call.hpp

@@ -50,7 +50,7 @@ static int native_prepare_nobj(lua_State *L, NativeParam *param, bool vector_all
 			nativePush(vec[i * 2]);
 		return 3;
 	}
-	
+
 	NativeTypeInfo &nti_obj = get_type_info(no->hdr.type),
 	&nti_param = get_type_info(param->type);
 
@@ -127,19 +127,19 @@ static int native_perform(lua_State *L, NativeMeth *meth) {
 			case NTYPE_HASH:
 				lua_pushinteger(L, *ret);
 				break;
-			
+
 			case NTYPE_FLOAT:
 				lua_pushnumber(L, *(float *)ret);
 				break;
-			
+
 			case NTYPE_BOOL:
 				lua_pushboolean(L, *(int *)ret);
 				break;
-			
+
 			case NTYPE_CHAR:
 				lua_pushlstring(L, (char *)ret, 1);
 				break;
-			
+
 			default:
 				push_cached_fullobject(L, meth->returns, (NativeData)*ret);
 				break;

src/native/object.hpp

@@ -33,7 +33,7 @@ static NativeObject *push_uncached_fullcopy
 		memcpy(&no->content, ptr, nti.size * count);
 	else
 		memset(&no->content, 0, nti.size * count);
-	
+
 	return no;
 }
 
@@ -47,7 +47,7 @@ static NativeObject *push_cached_lightobjectlink
 	NativeCache *cache = get_native_cache(L, cache_ref);
 	if(search_in_cache(L, cache, &cache_id, type, -1, &cached))
 		return (NativeObject *)lua_touserdata(L, -1);
-	
+
 	auto no = (NativeObject *)lua_newuserdata(L, sizeof(NativeObject));
 	NATIVEOBJECT_INITLIGHT(no, type, false, 1, *ptr);
 	luaL_setmetatable(L, LUANATIVE_OBJECT);
@@ -106,7 +106,7 @@ static int vector_newindex(lua_State *L, NativeObject *no, char idx) {
 		case 'X':
 			nv->x = (float)luaL_checknumber(L, 3);
 			break;
-		
+
 		case 'y':
 		case 'Y':
 			nv->y = (float)luaL_checknumber(L, 3);
@@ -130,7 +130,7 @@ static int vector_index(lua_State *L, NativeObject *no, char idx) {
 		case 'X':
 			lua_pushnumber(L, nv->x);
 			return 1;
-		
+
 		case 'y':
 		case 'Y':
 			lua_pushnumber(L, nv->y);

src/thirdparty/scriptmenu.h

@@ -198,13 +198,13 @@ class MenuBase
 	void AddItem(MenuItemBase *item) { item->SetMenu(this); m_items.push_back(item); }
 	int GetActiveItemIndex() { return m_activeScreenIndex * MenuBase_linesPerScreen + m_activeLineIndex; }
 	void OnDraw();
-	void OnPop() {}
 	int OnInput();
 	void OnFrame()
 	{
 		for (size_t i = 0; i < m_items.size(); i++)
 			m_items[i]->OnFrame();
 	}
+	virtual void OnPop() {}
 	void SetController(MenuController *controller) { m_controller = controller; }
 	MenuController *GetController() { return m_controller; }
 };
@@ -304,6 +304,16 @@ class MenuController
 			m_menuList.push_back(menu);
 		}
 	}
+	void UnregisterMenu(MenuBase *menu)
+	{
+		for (size_t i = 0; i < m_menuList.size(); i++) {
+			if (m_menuList[i] == menu)
+			{
+				m_menuList.erase(m_menuList.begin() + i);
+				break;
+			}
+		}
+	}
 	void Update()
 	{
 		OnDraw();

src/updatesctl.cpp

@@ -16,13 +16,14 @@ using json = nlohmann::json;
 static const std::string errors[] = {
 	"Internal error: ",
 	"Server responded with error: ",
-	"HTTP request failed: ",
+	"HTTP request error: ",
 	"Malformed server response",
 
 	// Internal errors
-	"failed to initialize WinInet",
-	"InternetOpenUrl failed",
-	"HttpQueryInfo failed"
+	"failed to initialize WinInet ",
+	"InternetOpenUrl failed ",
+	"HttpQueryInfo failed ",
+	"HttpReadFile faield "
 };
 
 static HINTERNET hInternet = NULL;
@@ -39,12 +40,17 @@ void UpdatesController::Stop(void) {
 
 static HINTERNET open_request(std::string url, std::string headers) {
 	return InternetOpenUrl(hInternet, url.c_str(), headers.c_str(), headers.length(),
-	INTERNET_FLAG_SECURE | INTERNET_FLAG_NO_UI | INTERNET_FLAG_NO_COOKIES, 0);
+	INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_NO_COOKIES | INTERNET_FLAG_PRAGMA_NOCACHE, 0);
+}
+
+static std::string build_error(int t1, int t2) {
+	std::string str = errors[t1] + errors[t2];
+	return str + std::to_string(GetLastError());
 }
 
 bool UpdatesController::CheckRedLua(std::string &ret) {
 	if(!Prepare()) {
-		ret = errors[0] + errors[4];
+		ret = build_error(0, 4);
 		return false;
 	}
 
@@ -56,13 +62,15 @@ bool UpdatesController::CheckRedLua(std::string &ret) {
 
 	HINTERNET hRequest;
 	do {
-		hRequest = open_request(REDLUA_TAGS_URL, "Accept: application/json");
-		if(hRequest == NULL) break;
+		if((hRequest = open_request(REDLUA_TAGS_URL, "Accept: application/json")) == NULL) {
+			ret = build_error(0, 5);
+			break;
+		}
 
 		while((success = InternetReadFile(hRequest, buf, BUFSIZE, &read)) && read > 0)
 			temp.append((const char *)buf, read);
 		if(!success) {
-			ret = errors[2] + std::to_string(GetLastError());
+			ret = build_error(2, 7);
 			break;
 		}
 
@@ -119,13 +127,13 @@ bool UpdatesController::CheckNativeDB(std::string &ret, bool force_update) {
 		if(!force_update)
 			headers.append("\r\nIf-None-Match: " + Settings.Read("nativedb_etag", etag));
 		if((hRequest = open_request(REDLUA_NATIVEDB_URL, headers)) == NULL) {
-			ret = errors[0] + errors[5];
+			ret = build_error(0, 5);
 			break;
 		}
 
 		DWORD code = 0; DWORD codelen = sizeof(DWORD);
 		if(!HttpQueryInfo(hRequest, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &code, &codelen, NULL)) {
-			ret = errors[0] + errors[6];
+			ret = build_error(0, 6);
 			break;
 		}
 
@@ -144,7 +152,7 @@ bool UpdatesController::CheckNativeDB(std::string &ret, bool force_update) {
 
 		DWORD bufsize = BUFSIZE;
 		if(!HttpQueryInfoA(hRequest, HTTP_QUERY_ETAG, buf, &bufsize, NULL)) {
-			ret = errors[0] + errors[6];
+			ret = build_error(0, 6);
 			break;
 		}