Merge pull request #1336 from elicn/dev-improv

Periodic maintenance PR

Author: xwings

examples/scripts/dllscollector.bat

@@ -118,6 +118,8 @@ CALL :collect_dll64 shlwapi.dll
 CALL :collect_dll64 user32.dll
 CALL :collect_dll64 vcruntime140.dll
 CALL :collect_dll64 vcruntime140d.dll
+CALL :collect_dll64 vcruntime140_1.dll
+CALL :collect_dll64 vcruntime140_1d.dll
 CALL :collect_dll64 win32u.dll
 CALL :collect_dll64 winhttp.dll
 CALL :collect_dll64 wininet.dll

qiling/core.py

@@ -32,10 +32,10 @@
 class Qiling(QlCoreHooks, QlCoreStructs):
     def __init__(
             self,
-            argv: Sequence[str] = None,
+            argv: Sequence[str] = [],
             rootfs: str = r'.',
             env: MutableMapping[AnyStr, AnyStr] = {},
-            code: bytes = None,
+            code: Optional[bytes] = None,
             ostype: Union[str, QL_OS] = None,
             archtype: Union[str, QL_ARCH] = None,
             verbose: QL_VERBOSE = QL_VERBOSE.DEFAULT,
@@ -90,18 +90,26 @@ def __init__(
         ##############
         # argv setup #
         ##############
-        if argv is None:
-            argv = ['qilingcode']
+        if argv:
+            if code:
+                raise AttributeError('argv and code are mutually execlusive')
 
-        elif not os.path.exists(argv[0]):
-            raise QlErrorFileNotFound(f'Target binary not found: "{argv[0]}"')
+            target = argv[0]
+
+            if not os.path.isfile(target):
+                raise QlErrorFileNotFound(f'Target binary not found: "{target}"')
+        else:
+            # an empty argv list means we are going to execute a shellcode. to keep
+            # the 'path' api compatible, we insert a dummy placeholder
+
+            argv = ['']
 
         self._argv = argv
 
         ################
         # rootfs setup #
         ################
-        if not os.path.exists(rootfs):
+        if not os.path.isdir(rootfs):
             raise QlErrorFileNotFound(f'Target rootfs not found: "{rootfs}"')
 
         self._rootfs = rootfs
@@ -697,11 +705,11 @@ def restore(self, saved_states: Mapping[str, Any] = {}, *, snapshot: Optional[st
 
     # Map "ql_path" to any objects which implements QlFsMappedObject.
     def add_fs_mapper(self, ql_path: Union["PathLike", str], real_dest):
-        self.os.fs_mapper.add_fs_mapping(ql_path, real_dest)
+        self.os.fs_mapper.add_mapping(ql_path, real_dest)
 
     # Remove "ql_path" mapping.
     def remove_fs_mapper(self, ql_path: Union["PathLike", str]):
-        self.os.fs_mapper.remove_fs_mapping(ql_path)
+        self.os.fs_mapper.remove_mapping(ql_path)
 
     # push to stack bottom, and update stack register
     def stack_push(self, data):
@@ -757,14 +765,16 @@ def emu_start(self, begin: int, end: int, timeout: int = 0, count: int = 0):
         if getattr(self.arch, '_init_thumb', False):
             begin |= 0b1
 
-        self._state = QL_STATE.STARTED
-
         # reset exception status before emulation starts
         self._internal_exception = None
 
+        self._state = QL_STATE.STARTED
+
         # effectively start the emulation. this returns only after uc.emu_stop is called
         self.uc.emu_start(begin, end, timeout, count)
 
+        self._state = QL_STATE.STOPPED
+
         # if an exception was raised during emulation, propagate it up
         if self.internal_exception is not None:
             raise self.internal_exception