diff options
Diffstat (limited to '')
| -rw-r--r-- | miasm2/os_dep/linux/environment.py | 6 | ||||
| -rw-r--r-- | miasm2/os_dep/win_api_x86_32.py | 22 | ||||
| -rw-r--r-- | miasm2/os_dep/win_api_x86_32_seh.py | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/miasm2/os_dep/linux/environment.py b/miasm2/os_dep/linux/environment.py index 4f125563..7cafae43 100644 --- a/miasm2/os_dep/linux/environment.py +++ b/miasm2/os_dep/linux/environment.py @@ -322,7 +322,7 @@ class LinuxEnvironment(object): """A LinuxEnvironment regroups information to simulate a Linux-like environment""" - # To be overrided + # To be overridden platform_arch = None # User information @@ -655,13 +655,13 @@ class AuxVec(object): AT_SYSINFO_EHDR = 33 def __init__(self, elf_phdr_vaddr, entry_point, linux_env, **kwargs): - """Instanciate an AuxVec, with required elements: + """Instantiate an AuxVec, with required elements: - elf_phdr_vaddr: virtual address of the ELF's PHDR in memory - entry_point: virtual address of the ELF entry point - linux_env: LinuxEnvironment instance, used to provides some of the option values - Others options can be overrided by named arguments + Others options can be overridden by named arguments """ self.info = { diff --git a/miasm2/os_dep/win_api_x86_32.py b/miasm2/os_dep/win_api_x86_32.py index 25e98d4b..5d6e4765 100644 --- a/miasm2/os_dep/win_api_x86_32.py +++ b/miasm2/os_dep/win_api_x86_32.py @@ -2559,8 +2559,8 @@ def msvcrt_wcslen(jitter): jitter.func_ret_cdecl(ret_ad, len(s)) def kernel32_SetFilePointer(jitter): - ret_ad, args = jitter.func_args_stdcall(["hwnd", "distance", - "p_distance_high", + ret_ad, args = jitter.func_args_stdcall(["hwnd", "dinstance", + "p_dinstance_high", "movemethod"]) if args.hwnd == winobjs.module_cur_hwnd: @@ -2572,22 +2572,22 @@ def kernel32_SetFilePointer(jitter): # data = None if args.hwnd in winobjs.files_hwnd: - winobjs.files_hwnd[winobjs.module_cur_hwnd].seek(args.distance, args.movemethod) + winobjs.files_hwnd[winobjs.module_cur_hwnd].seek(args.dinstance, args.movemethod) elif args.hwnd in winobjs.handle_pool: wh = winobjs.handle_pool[args.hwnd] - wh.info.seek(args.distance, args.movemethod) + wh.info.seek(args.dinstance, args.movemethod) else: raise ValueError('unknown filename') - jitter.func_ret_stdcall(ret_ad, args.distance) + jitter.func_ret_stdcall(ret_ad, args.dinstance) def kernel32_SetFilePointerEx(jitter): - ret_ad, args = jitter.func_args_stdcall(["hwnd", "distance_l", - "distance_h", + ret_ad, args = jitter.func_args_stdcall(["hwnd", "dinstance_l", + "dinstance_h", "pnewfileptr", "movemethod"]) - distance = args.distance_l | (args.distance_h << 32) - if distance: + dinstance = args.dinstance_l | (args.dinstance_h << 32) + if dinstance: raise ValueError('Not implemented') if args.pnewfileptr: raise ValueError('Not implemented') @@ -2600,10 +2600,10 @@ def kernel32_SetFilePointerEx(jitter): # data = None if args.hwnd in winobjs.files_hwnd: - winobjs.files_hwnd[winobjs.module_cur_hwnd].seek(distance, args.movemethod) + winobjs.files_hwnd[winobjs.module_cur_hwnd].seek(dinstance, args.movemethod) elif args.hwnd in winobjs.handle_pool: wh = winobjs.handle_pool[args.hwnd] - wh.info.seek(distance, args.movemethod) + wh.info.seek(dinstance, args.movemethod) else: raise ValueError('unknown filename') jitter.func_ret_stdcall(ret_ad, 1) diff --git a/miasm2/os_dep/win_api_x86_32_seh.py b/miasm2/os_dep/win_api_x86_32_seh.py index 110f2b34..be524895 100644 --- a/miasm2/os_dep/win_api_x86_32_seh.py +++ b/miasm2/os_dep/win_api_x86_32_seh.py @@ -85,7 +85,7 @@ MAX_SEH = 5 def build_teb(jitter, teb_address): """ - Build TEB informations using following structure: + Build TEB information using following structure: @jitter: jitter instance @teb_address: the TEB address @@ -111,7 +111,7 @@ def build_teb(jitter, teb_address): def build_peb(jitter, peb_address): """ - Build PEB informations using following structure: + Build PEB information using following structure: @jitter: jitter instance @peb_address: the PEB address @@ -135,7 +135,7 @@ def build_peb(jitter, peb_address): def build_ldr_data(jitter, modules_info): """ - Build Loader informations using following structure: + Build Loader information using following structure: +0x000 Length : Uint4B +0x004 Initialized : UChar @@ -232,7 +232,7 @@ def create_modules_chain(jitter, name2module): out = "" for i, (fname, pe_obj) in enumerate(name2module.items(), 1): if pe_obj is None: - log.warning("Unknown module: ommited from link list (%r)", + log.warning("Unknown module: omitted from link list (%r)", fname) continue addr = base_addr + i * 0x1000 @@ -368,7 +368,7 @@ def fix_InInitializationOrderModuleList(jitter, modules_info): def add_process_env(jitter): """ - Build a process environement structure + Build a process environment structure @jitter: jitter instance """ |