diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/arch/x86/qemu/testqemu.py | 6 | ||||
| -rw-r--r-- | test/os_dep/win_api_x86_32.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/arch/x86/qemu/testqemu.py b/test/arch/x86/qemu/testqemu.py index 65d5825a..5f26d6f3 100644 --- a/test/arch/x86/qemu/testqemu.py +++ b/test/arch/x86/qemu/testqemu.py @@ -7,7 +7,7 @@ from pdb import pm from miasm2.analysis.sandbox import Sandbox_Linux_x86_32 from miasm2.jitter.jitload import log_func from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE -from miasm2.os_dep.win_api_x86_32 import get_str_ansi, upck32 +from miasm2.core.utils import upck32 # Utils def parse_fmt(s): @@ -43,7 +43,7 @@ def xxx___printf_chk(jitter): ret_ad, args = jitter.func_args_cdecl(["out", "format"]) if args.out != 1: raise RuntimeError("Not implemented") - fmt = get_str_ansi(jitter, args.format) + fmt = jitter.get_str_ansi(args.format) # Manage llx fmt = fmt.replace("llx", "lx") fmt = fmt.replace("%016lx", "%016z") @@ -56,7 +56,7 @@ def xxx___printf_chk(jitter): for x in fmt_a: a = upck32(jitter.vm.get_mem(esp + 8 + 4*i, 4)) if x == "s": - a = get_str_ansi(jitter, a) + a = jitter.get_str_ansi(a) elif x.lower() in ("x", 'd'): pass elif x.lower() in ("f", "l"): diff --git a/test/os_dep/win_api_x86_32.py b/test/os_dep/win_api_x86_32.py index 62fe2636..bb13138f 100644 --- a/test/os_dep/win_api_x86_32.py +++ b/test/os_dep/win_api_x86_32.py @@ -5,6 +5,7 @@ import unittest import logging from miasm2.analysis.machine import Machine import miasm2.os_dep.win_api_x86_32 as winapi +from miasm2.core.utils import pck32 machine = Machine("x86_32") @@ -95,9 +96,10 @@ class TestWinAPI(unittest.TestCase): self.assertTrue(dwVer) # BOOL WINAPI GetVersionEx(_Inout_ LPOSVERSIONINFO lpVersionInfo); + jit.vm.set_mem(jit.stack_base, pck32(0x9c)) jit.push_uint32_t(jit.stack_base) # lpVersionInfo jit.push_uint32_t(0) # @return - winapi.kernel32_GetVersionEx(jit) + winapi.kernel32_GetVersionExA(jit) vBool = jit.cpu.EAX self.assertTrue(vBool) |