Minor bugfixes

CMakeLists.txt

@@ -60,7 +60,7 @@ set(sources
 
 if (BUILD_SHARED_LIBS AND WIN32)
     set(sources ${sources}
-            "Zydis/Zydis.rc")
+        "Zydis/VersionInfo.rc")
 endif ()
 
 if (BUILD_C_BINDINGS)

Zydis/ZydisInstructionDecoder.hpp

@@ -45,34 +45,10 @@ namespace Zydis
  */
 class BaseInput 
 {
+friend class InstructionDecoder;
 private:
     uint8_t m_currentInput;
-protected:
-    /**
-     * @brief   Override this method in your custom data source implementations.
-     *          Reads the next byte from the data source. This method increases the current
-     *          input position by one.  
-     * @return  The current input byte.
-     */
-    virtual uint8_t internalInputPeek() = 0;
-    /**
-     * @brief   Override this method in your custom data source implementations.
-     *          Reads the next byte from the data source. This method does NOT increase the 
-     *          current input position.
-     * @return  The current input byte.
-     */
-    virtual uint8_t internalInputNext() = 0;
-protected:
-    /**
-     * @brief   Default constructor.
-     */
-    BaseInput() { };
-public:
-    /**
-     * @brief   Destructor.
-     */
-    virtual ~BaseInput() { };
-public:
+private:
     /**
      * @brief   Reads the next byte from the data source. This method does NOT increase the 
      *          current input position or the @c length field of the @c info parameter. 
@@ -111,6 +87,31 @@ public:
      * @return  The current input byte.
      */
     uint8_t inputCurrent() const;
+protected:
+    /**
+     * @brief   Override this method in your custom data source implementations.
+     *          Reads the next byte from the data source. This method increases the current
+     *          input position by one.  
+     * @return  The current input byte.
+     */
+    virtual uint8_t internalInputPeek() = 0;
+    /**
+     * @brief   Override this method in your custom data source implementations.
+     *          Reads the next byte from the data source. This method does NOT increase the 
+     *          current input position.
+     * @return  The current input byte.
+     */
+    virtual uint8_t internalInputNext() = 0;
+protected:
+    /**
+     * @brief   Default constructor.
+     */
+    BaseInput() { };
+public:
+    /**
+     * @brief   Destructor.
+     */
+    virtual ~BaseInput() { };
 public:
     /**
      * @brief   Override this method in your custom data source implementations.