upd

odzhan · odzhan · commit 1a272c20e49f · 2019-07-20T15:49:06.000-07:00
diff --git a/os/win/x86/inmem/ax.asm b/os/win/x86/inmem/ax.asm
@@ -27,7 +27,7 @@
 ;  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ;  POSSIBILITY OF SUCH DAMAGE.
 ;
-; In-Memory execution of VBScript/JScript using 395 bytes of x86 assembly
+; In-Memory execution of VBScript/JScript using 392 bytes of x86 assembly
 ; Odzhan
 
       %include "ax.inc"
@@ -268,31 +268,29 @@ init_api:
       stosd                         ; vft.OnEnterScript       = (LPVOID)OnEnterScript;
       stosd                         ; vft.OnLeaveScript       = (LPVOID)OnLeaveScript;
       pop    eax                    ; eax = &vft
-      mov    ebp, edi               ; ebp = &IMyActiveScriptSite
-      stosd                         ; IActiveScriptSite.lpVtbl = &vft
-      xor    eax, eax
-      stosd                         ; IActiveScriptSiteWindow.lpVtbl = NULL
       
       ; 6. Set script site 
       ; engine->lpVtbl->SetScriptSite(
       ;   engine, (IActiveScriptSite *)&mas);
-      push    ebp                   ; &IMyActiveScriptSite
+      push    edi                   ; &IMyActiveScriptSite
+      stosd                         ; IActiveScriptSite.lpVtbl = &vft
+      xor     eax, eax
+      stosd                         ; IActiveScriptSiteWindow.lpVtbl = NULL
       push    esi                   ; engine
       mov     eax, [esi]
       call    dword[eax + IActiveScriptVtbl.SetScriptSite]
 
       ; 7. Parse our script
       ; parser->lpVtbl->ParseScriptText(
       ;     parser, cs, 0, 0, 0, 0, 0, 0, 0, 0);
-      mov   ebp, esp
-      cdq
+      mov    edx, esp
       push   8
       pop    ecx
 init_parse:
-      push   edx
+      push   eax                    ; 0
       loop   init_parse
-      push   ebp
-      push   ebx
+      push   edx                    ; script
+      push   ebx                    ; parser
       mov    eax, [ebx]
       call   dword[eax + IActiveScriptParse32Vtbl.ParseScriptText]
       
diff --git a/os/win/x86/inmem/ax_test.c b/os/win/x86/inmem/ax_test.c
@@ -244,7 +244,7 @@ int main(int argc, char *argv[]) {
       printf("Unable to read file.\n");
       return 0;
     }
-    run_script(lang, script);
+    run_scriptx(script);
     return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ int main(int argc, char *argv[]) {`
`244`	`244`	`printf("Unable to read file.\n");`
`245`	`245`	`return 0;`
`246`	`246`	`}`
`247`		`- run_script(lang, script);`
	`247`	`+ run_scriptx(script);`
`248`	`248`	`return 0;`
`249`	`249`	`}`
`250`	`250`