v1.0.0.16 - revert adding lua libs (io, os and package) by linking st…

…atic lua library
mrfearless · Sep 4, 2019 · 17a91eb · 17a91eb
1 parent 395958c
commit 17a91eb
Show file tree

Hide file tree

Showing 9 changed files with 1,095 additions and 521 deletions.
diff --git a/EEexDLL/EEex.db b/EEexDLL/EEex.db
diff --git a/EEexDLL/EEex.dll b/EEexDLL/EEex.dll
diff --git a/EEexDLL/EEex.inc b/EEexDLL/EEex.inc
@@ -16,11 +16,11 @@ includelib kernel32.lib
 includelib psapi.lib
 includelib version.lib
 
-;IFDEF EEEX_LUALIB
+IFDEF EEEX_LUALIB
 include lua52.inc
 includelib lua523.lib ; nil value for lua_setglobal
 includelib msvcrt12.lib
-;ENDIF
+ENDIF
 
 ;------------------------------------------------------------------------------
 ; EEex.dll Prototypes

diff --git a/EEexDLL/EEex.rap b/EEexDLL/EEex.rap
@@ -82,7 +82,7 @@ MilestoneOnTime=2
 MilestoneOnDate=0
 MilestoneOnDateWhen=1
 MilestoneOnDateStatus=0
-MilestoneOnDateDate=2
+MilestoneOnDateDate=4
 MilestoneOnDateTimeYear=2019
 MilestoneOnDateTimeMonth=1
 MilestoneOnDateTimeDate=26
@@ -106,7 +106,7 @@ ProductVer2Range=0
 ProductVer3Range=0
 ProductVer4Range=0
 [PTimer]
-PTimer=485716803
+PTimer=487306563
 [GroupExpand]
 GroupExpand=1,1,0
 [BookMark]
@@ -137,20 +137,20 @@ GroupExpand=1,1,0
 [VerInf]
 Nme=VERINF1
 ID=1
-FV=1.0.0.15
-PV=1.0.0.15
+FV=1.0.0.16
+PV=1.0.0.16
 VerOS=0x00000004
 VerFT=0x00000002
 VerLNG=0x00000409
 VerCHS=0x000004B0
-ProductVersion=1.0.0.15
+ProductVersion=1.0.0.16
 ProductName=EEex.dll
 OriginalFilename=EEex.dll
 LegalTrademarks=fearless
 LegalCopyright=fearless
 InternalName=EEex.dll
 FileDescription=EEex.dll
-FileVersion=1.0.0.15
+FileVersion=1.0.0.16
 CompanyName=fearless
 [Collapse]
 3=
@@ -168,12 +168,12 @@ CompanyName=fearless
 3=0,0,0,0,53
 4=0,0,0,0,8344
 5=0,0,0,0,1274
-1=0,0,1248,579,8858
+1=0,0,1248,579,612
 6=0,0,0,0,13740
-2=0,0,0,0,7584
+2=0,0,0,0,624
 7=0,0,0,0,10336
 8=0,0,0,0,65567
-9=0,0,0,0,18810
+9=0,0,0,0,4093
 10=0,0,1248,579,9103
 11=0,0,0,0,687
 [Find]

diff --git a/EEexDLL/EEexLua.asm b/EEexDLL/EEexLua.asm
@@ -106,16 +106,6 @@ EEexLuaInit PROC C lua_State:DWORD, lpszString:DWORD
         ret
     .ENDIF    
     
-    ; 04/09/2019 - add in other lua libraries
-    Invoke luaL_requiref, g_lua, CTEXT("io"), Addr luaopen_io, 1
-    Invoke lua_settop, g_lua, -2
-    
-    Invoke luaL_requiref, g_lua, CTEXT("os"), Addr luaopen_os, 1
-    Invoke lua_settop, g_lua, -2
-    
-    Invoke luaL_requiref, g_lua, CTEXT("package"), Addr luaopen_package, 1
-    Invoke lua_settop, g_lua, -2
-    
     ;---------------------------
     ; For prototype of no params
     ;---------------------------

diff --git a/EEexDLL/Res/EEexVer.rc b/EEexDLL/Res/EEexVer.rc
@@ -1,7 +1,7 @@
 #define VERINF1 1
 VERINF1 VERSIONINFO
-FILEVERSION 1,0,0,15
-PRODUCTVERSION 1,0,0,15
+FILEVERSION 1,0,0,16
+PRODUCTVERSION 1,0,0,16
 FILEOS 0x00000004
 FILETYPE 0x00000002
 BEGIN
@@ -10,14 +10,14 @@ BEGIN
     BLOCK "040904B0"
     BEGIN
       VALUE "CompanyName", "fearless\0"
-      VALUE "FileVersion", "1.0.0.15\0"
+      VALUE "FileVersion", "1.0.0.16\0"
       VALUE "FileDescription", "EEex.dll\0"
       VALUE "InternalName", "EEex.dll\0"
       VALUE "LegalCopyright", "fearless\0"
       VALUE "LegalTrademarks", "fearless\0"
       VALUE "OriginalFilename", "EEex.dll\0"
       VALUE "ProductName", "EEex.dll\0"
-      VALUE "ProductVersion", "1.0.0.15\0"
+      VALUE "ProductVersion", "1.0.0.16\0"
     END
   END
   BLOCK "VarFileInfo"

diff --git a/EEexDLL/lua52.inc b/EEexDLL/lua52.inc
@@ -383,6 +383,9 @@ LUA_ERRSYNTAX	        EQU 3
 LUA_ERRMEM	            EQU 4
 LUA_ERRGCMM	            EQU 5
 LUA_ERRERR	            EQU 6
+LUA_ERRFILE             EQU (LUA_ERRERR+1)
+
+LUA_MULTRET	            EQU (-1)
 
 ; basic types
 LUA_TNONE		        EQU -1

diff --git a/Release/EEex.dll b/Release/EEex.dll
diff --git a/Release/EEexLoader.zip b/Release/EEexLoader.zip