Further refactoring, move ImageInfo into Disassembler/DisassemblerWin32X86.

courgette/courgette.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COURGETTE_COURGETTE_H_
 #define COURGETTE_COURGETTE_H_
 
 #include <stddef.h>   // Required to define size_t on GCC
 
 #include "base/file_path.h"
@@ skipping 69 matching lines @@
 Status ApplyEnsemblePatch(const FilePath::CharType* old_file_name,
                           const FilePath::CharType* patch_file_name,
                           const FilePath::CharType* new_file_name);
 
 // Generates a patch that will transform the bytes in |old| into the bytes in
 // |target|.
 // Returns C_OK unless something when wrong (unexpected).
 Status GenerateEnsemblePatch(SourceStream* old, SourceStream* target,
                              SinkStream* patch);
 
-// Parses a Windows 32-bit 'Portable Executable' format file from memory,
-// storing the pointer to the AssemblyProgram in |*output|.
-// Returns C_OK if successful, otherwise returns an error status and sets
-// |*output| to NULL.
-ExecutableType DetectExecutableType(const void* buffer, size_t length);
+// Detects the type of an executable file, and it's length. The length
+// may be slightly smaller than some executables (like ELF), but will include
+// all bytes the courgette algorithm has special benefit for.
+// On sucess:
+//   Fill in type and detected_length, and return C_OK.
+// On failure:
+//   Fill in type with UNKNOWN, detected_length with 0, and
+//   return C_INPUT_NOT_RECOGNIZED
+Status DetectExecutableType(const void* buffer, size_t length,
+                            ExecutableType* type,
+                            size_t* detected_length);
 
 // Attempts to detect the type of executable, and parse it with the
 // appropriate tools, storing the pointer to the AssemblyProgram in |*output|.
 // Returns C_OK if successful, otherwise returns an error status and sets
 // |*output| to NULL.
 Status ParseDetectedExecutable(const void* buffer, size_t length,
                                AssemblyProgram** output);
 
 // Converts |program| into encoded form, returning it as |*output|.
 // Returns C_OK if succeeded, otherwise returns an error status and
@@ skipping 20 matching lines @@
 
 // Used to free an EncodedProgram returned by other APIs.
 void DeleteEncodedProgram(EncodedProgram* encoded);
 
 // Adjusts |program| to look more like |model|.
 //
 Status Adjust(const AssemblyProgram& model, AssemblyProgram *program);
 
 }  // namespace courgette
 #endif  // COURGETTE_COURGETTE_H_