Version 0.4.0

* Standalone build improved
* Various crash fixes
+ Menu API

Author: igor725

.vscode/launch.json

@@ -5,7 +5,7 @@
 			"type": "cppvsdbg",
 			"request": "launch",
 			"program": "D:\\LuaJIT\\src\\LuaJIT.exe",
-			"args": ["sl_test.lua"],
+			"args": ["-lRedLua.native"],
 			"stopAtEntry": false,
 			"cwd": "${workspaceFolder}\\objs\\outputRDR2\\",
 			"environment": [],

README.md

@@ -143,7 +143,7 @@ native.new('Vehicle', 5) -- Returns: NativeObject of 5 Vehicles
 native.new('Vector3', 4) -- Returns: NativeVector, can be used in functions like ENTITY:GET_ENTITY_MATRIX(...)
 
 -- Get all world objects
-native.allobjects(objects_typed_array) -- Returns: objects count
+native.allobjects(objects_typed_array) -- Returns: number of objects
 native.allpeds(peds_typed_array)
 native.allpickups(pickups_typed_array)
 native.allvehicles(vehicles_typed_array)
@@ -169,6 +169,18 @@ misc.gamever() -- Returns: number (e.g. 1436.31) and string ("rdr3" or "gta5")
 
 -- Get RedLua version
 misc.libver() -- Returns: integer, e.g. 010, 020, etc.
+
+--[[
+	Library: menu
+]]
+
+-- Create a menu section for the script
+-- An example script is available here: examples/ScriptMenu.lua
+menu.set {...} -- Returns: nothing. Note that this function is NOT safe, it may throw an Lua error.
+
+-- Remove menu section for the script
+-- Note that the menu will only be removed after 1 or more (depends on the number of submenus) full garbage collection steps!
+menu.remove() -- Returns: nothing
 ```
 
 ## Contribution

build.bat

@@ -26,8 +26,8 @@ IF NOT EXIST "%RL_LUAJIT_SOURCE_DIR%\lua51.lib" (
 )
 
 SET RL_OUT_BIN=RedLua.asi
-SET RL_LIBS=user32.lib shell32.lib lua51.lib
-SET RL_SOURCES=src\*.cpp
+SET RL_LIBS=user32.lib shell32.lib Wininet.lib lua51.lib
+SET RL_SOURCES=src\*.cpp src\thirdparty\*.cpp src\menus\*.cpp
 SET RL_LDFLAGS=/DLL /INCREMENTAL /LIBPATH:"%RL_LUAJIT_SOURCE_DIR%"
 SET RL_CFLAGS=/DELPP_NO_DEFAULT_LOG_FILE /DELPP_DISABLE_LOG_FILE_FROM_ARG ^
 /DELPP_THREAD_SAFE /DWIN32_LEAN_AND_MEAN /D_CRT_SECURE_NO_WARNINGS /FC /W2 ^
@@ -48,12 +48,11 @@ 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_SOURCES=!RL_SOURCES! src\thirdparty\easyloggingpp.cpp
+	SET RL_SOURCES=!RL_SOURCES! src\emu\native.cpp
 	SET RL_OUT_BIN=RedLua.dll
 ) ELSE (
 	SET RL_CFLAGS=!RL_CFLAGS! /MT
 	SET RL_LIBS=!RL_LIBS! ScriptHook!RL_SCRIPTHOOK_VARIANT!.lib
-	SET RL_SOURCES=!RL_SOURCES! src\thirdparty\*.cpp src\menus\*.cpp
 	SET RL_LDFLAGS=!RL_LDFLAGS! /LIBPATH:"!RL_SCRIPTHOOK_SDK_DIR!\lib"
 )
 

examples/ScriptMenu.lua

@@ -0,0 +1,50 @@
+local t = {}
+
+function t.OnLoad()
+	menu.set{
+		title = 'My menu',
+		items = {
+			{
+				type = 1,
+				title = 'My inactive button'
+			},
+			{
+				type = 1,
+				title = 'My button',
+				onclick = function()
+					print('Hello!')
+				end
+			},
+			{
+				type = 2,
+				title = 'My switchable',
+				onclick = function(state)
+					return not state
+				end
+			},
+			{
+				type = 0,
+				islist = true,
+				title = 'My sublist',
+				menu = {
+					title = 'My submenu',
+					items = {
+						{
+							type = 1,
+							title = 'My subbutton',
+							onclick = function() end
+						}
+					}
+				}
+			}
+		}
+	}
+end
+
+function t.OnStop()
+	menu.remove()
+end
+
+t.OnReload = t.OnStop
+
+return t

src/base.cpp

@@ -44,33 +44,25 @@ void RedLuaMain(void) {
 	el::base::TypedConfigurations *logger;
 	logger = el::Loggers::getLogger("default")->typedConfigurations();
 	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_NAME " debug console");
+		if(AttachConsole(ATTACH_PARENT_PROCESS) || (HasConsole = AllocConsole())) {
+			if(HasConsole) SetConsoleTitle(REDLUA_NAME " debug console");
 			freopen("CONOUT$", "w", stdout);
 			freopen("CONOUT$", "w", stderr);
-			HasConsole = true;
 		}
 	}
 
 	LOG(INFO) << "Logger initialized";
-#ifndef REDLUA_STANDALONE
 	auto menuController = new MenuController();
 	auto mainMenu = CreateMainMenu(menuController);
 	menuController->SetCurrentPosition(
 		Settings.Read("menu_position", 0)
 	);
 	LOG(DEBUG) << REDLUA_NAME " menu initialized";
-#endif
 	if(Settings.Read("auto_updates", false)) {
 		LOG(DEBUG) << "Starting updates checker...";
 		std::string data;
 		if(UpdatesCtl.CheckRedLua(data))
-#ifdef REDLUA_STANDALONE
-			LOG(INFO) << "New version " << data << " detected";
-#else
 			CreateUpdateAlert(menuController, data);
-#endif
 		else
 			LOG(DEBUG) << REDLUA_NAME " updater: " << data;
 		if(UpdatesCtl.CheckNativeDB(data))
@@ -87,7 +79,6 @@ void RedLuaMain(void) {
 	}
 
 	RedLuaScanScripts();
-#ifndef REDLUA_STANDALONE
 	while(true) {
 		if(MenuInput::MenuSwitchPressed()) {
 			MenuInput::MenuInputBeep();
@@ -103,7 +94,6 @@ void RedLuaMain(void) {
 
 		WAIT(0);
 	}
-#endif
 }
 
 void RedLuaFinish(void) {

src/constants.hpp

@@ -1,16 +1,16 @@
 #pragma once
 
 #define REDLUA_NAME "RedLua"
-#define REDLUA_VERSION "v0.3.1"
-#define REDLUA_VERSION_NUM 031
+#define REDLUA_VERSION "v0.4.0"
+#define REDLUA_VERSION_NUM 040
 #define REDLUA_FULLNAME REDLUA_NAME " " REDLUA_VERSION
 
-#ifndef REDLUA_GTAV
-#define REDLUA_GAMECODE "rdr3"
-#define REDLUA_HOTKEY_DEFAULT 0x76
-#else
+#ifdef REDLUA_GTAV
 #define REDLUA_GAMECODE "gta5"
 #define REDLUA_HOTKEY_DEFAULT 0x73
+#else
+#define REDLUA_GAMECODE "rdr3"
+#define REDLUA_HOTKEY_DEFAULT 0x76
 #endif
 
 #define REDLUA_TAGS_URL "https://api.github.com/repos/igor725/RedLua/tags"

src/emu/native.cpp

@@ -0,0 +1,43 @@
+#include "emu\native.hpp"
+#include "thirdparty\easyloggingpp.h"
+#include "thirdparty\keyboard.h"
+#include "vector"
+
+struct KeyEvent {
+	DWORD key;
+	WORD repeats;
+	BYTE scanCode;
+	BOOL isExtended;
+	BOOL isWithAlt;
+	BOOL wasDownBefore;
+	BOOL isUpNow;
+};
+
+static std::vector<struct KeyEvent> VirtualPress {};
+
+void emu_scriptWait(DWORD ms) {
+	Sleep(100);
+	if(VirtualPress.size() > 0) {
+		struct KeyEvent &ke = VirtualPress.back();
+		OnKeyboardMessage(ke.key, ke.repeats, ke.scanCode,
+			ke.isExtended, ke.isWithAlt, ke.wasDownBefore, ke.isUpNow);
+		VirtualPress.pop_back();
+	}
+}
+
+void emu_nativeInit(UINT64 hash) {
+	LOG(DEBUG) << "[NC] START " << (void *)hash;
+}
+
+void emu_nativePush64(UINT64 val) {
+	LOG(DEBUG) << "\t [NC] Argument: " << (void *)val;
+}
+
+static struct _Ret {
+	int _pad[6];
+} ret;
+
+PUINT64 emu_nativeCall(void) {
+	LOG(DEBUG) << "[NC] END";
+	return (PUINT64)&ret;
+}

src/emu/native.hpp

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <Windows.h>
+
+void emu_scriptWait(DWORD ms);
+void emu_nativeInit(UINT64 hash);
+void emu_nativePush64(UINT64 val);
+PUINT64 emu_nativeCall(void);