4.50 beta

2 files changed, 4 insertions, 24 deletions

diff --git a/CPP/7zip/Archive/Wim/WimHandler.h b/CPP/7zip/Archive/Wim/WimHandler.h
index 5142d785..25567743 100755
--- a/CPP/7zip/Archive/Wim/WimHandler.h
+++ b/CPP/7zip/Archive/Wim/WimHandler.h
@@ -28,25 +28,7 @@ class CHandler:
 {
 public:
   MY_UNKNOWN_IMP1(IInArchive)
-
-  STDMETHOD(Open)(IInStream *stream, 
-      const UInt64 *maxCheckStartPosition,
-      IArchiveOpenCallback *openArchiveCallback);  
-  STDMETHOD(Close)();  
-  STDMETHOD(GetNumberOfItems)(UInt32 *numItems);  
-  STDMETHOD(GetProperty)(UInt32 index, PROPID propID, PROPVARIANT *value);
-  STDMETHOD(Extract)(const UInt32* indices, UInt32 numItems, 
-      Int32 testMode, IArchiveExtractCallback *extractCallback);
-  
-  STDMETHOD(GetArchiveProperty)(PROPID propID, PROPVARIANT *value);
-
-  STDMETHOD(GetNumberOfProperties)(UInt32 *numProperties);  
-  STDMETHOD(GetPropertyInfo)(UInt32 index,     
-      BSTR *name, PROPID *propID, VARTYPE *varType);
-
-  STDMETHOD(GetNumberOfArchiveProperties)(UInt32 *numProperties);  
-  STDMETHOD(GetArchivePropertyInfo)(UInt32 index,     
-      BSTR *name, PROPID *propID, VARTYPE *varType);
+  INTERFACE_IInArchive(;)
 
 private:
   CDatabase m_Database;
diff --git a/CPP/7zip/Archive/Wim/WimIn.cpp b/CPP/7zip/Archive/Wim/WimIn.cpp
index e99cb37b..80ac1954 100755
--- a/CPP/7zip/Archive/Wim/WimIn.cpp
+++ b/CPP/7zip/Archive/Wim/WimIn.cpp
@@ -11,6 +11,8 @@
 
 #include "../Common/OutStreamWithSha1.h"
 
+#include "../../../../C/CpuArch.h"
+
 #include "WimIn.h"
 
 namespace NArchive{
@@ -26,11 +28,7 @@ static HRESULT ReadBytes(ISequentialInStream *inStream, void *data, UInt32 size)
   return (realProcessedSize == size) ? S_OK : S_FALSE;
 }
 
-#if defined(_M_IX86) || defined(_M_X64) || defined(_M_AMD64) || defined(__i386__) || defined(__x86_64__)
-#define WIM_LITTLE_ENDIAN_UNALIGN
-#endif
-
-#ifdef WIM_LITTLE_ENDIAN_UNALIGN 
+#ifdef LITTLE_ENDIAN_UNALIGN
 static inline UInt16 GetUInt16FromMem(const Byte *p) { return *(const UInt16 *)p; }
 static inline UInt32 GetUInt32FromMem(const Byte *p) { return *(const UInt32 *)p; }
 static inline UInt64 GetUInt64FromMem(const Byte *p) { return *(const UInt64 *)p; }