seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/CPP/Common/MyCom.h

@@ -1,9 +1,10 @@
 // MyCom.h
 
-#ifndef __MYCOM_H
-#define __MYCOM_H
+#ifndef __MY_COM_H
+#define __MY_COM_H
 
 #include "MyWindows.h"
+#include "NewHandler.h"
 
 #ifndef RINOK
 #define RINOK(x) { HRESULT __result_ = (x); if (__result_ != S_OK) return __result_; }
@@ -14,14 +15,9 @@ class CMyComPtr
 {
   T* _p;
 public:
-  // typedef T _PtrClass;
-  CMyComPtr() { _p = NULL;}
-  CMyComPtr(T* p) {if ((_p = p) != NULL) p->AddRef(); }
-  CMyComPtr(const CMyComPtr<T>& lp)
-  {
-    if ((_p = lp._p) != NULL)
-      _p->AddRef();
-  }
+  CMyComPtr(): _p(NULL) {}
+  CMyComPtr(T* p) throw() { if ((_p = p) != NULL) p->AddRef(); }
+  CMyComPtr(const CMyComPtr<T>& lp) throw() { if ((_p = lp._p) != NULL) _p->AddRef(); }
   ~CMyComPtr() { if (_p) _p->Release(); }
   void Release() { if (_p) { _p->Release(); _p = NULL; } }
   operator T*() const {  return (T*)_p;  }
@@ -30,7 +26,7 @@ public:
   T* operator->() const { return _p; }
   T* operator=(T* p)
   {
-    if (p != 0)
+    if (p)
       p->AddRef();
     if (_p)
       _p->Release();
@@ -40,7 +36,6 @@ public:
   T* operator=(const CMyComPtr<T>& lp) { return (*this = lp._p); }
   bool operator!() const { return (_p == NULL); }
   // bool operator==(T* pT) const {  return _p == pT; }
-  // Compare two objects for equivalence
   void Attach(T* p2)
   {
     Release();
@@ -70,7 +65,7 @@ public:
   }
   */
   template <class Q>
-  HRESULT QueryInterface(REFGUID iid, Q** pp) const
+  HRESULT QueryInterface(REFGUID iid, Q** pp) const throw()
   {
     return _p->QueryInterface(iid, (void**)pp);
   }
@@ -81,18 +76,28 @@ public:
 inline HRESULT StringToBstr(LPCOLESTR src, BSTR *bstr)
 {
   *bstr = ::SysAllocString(src);
-  return (*bstr != 0) ? S_OK : E_OUTOFMEMORY;
+  return (*bstr) ? S_OK : E_OUTOFMEMORY;
 }
 
 class CMyComBSTR
 {
-public:
   BSTR m_str;
+
+public:
   CMyComBSTR(): m_str(NULL) {}
+  ~CMyComBSTR() { ::SysFreeString(m_str); }
+  BSTR* operator&() { return &m_str; }
+  operator LPCOLESTR() const { return m_str; }
+  // operator bool() const { return m_str != NULL; }
+  // bool operator!() const { return m_str == NULL; }
+private:
+  // operator BSTR() const { return m_str; }
+
   CMyComBSTR(LPCOLESTR src) { m_str = ::SysAllocString(src); }
   // CMyComBSTR(int nSize) { m_str = ::SysAllocStringLen(NULL, nSize); }
   // CMyComBSTR(int nSize, LPCOLESTR sz) { m_str = ::SysAllocStringLen(sz, nSize);  }
   CMyComBSTR(const CMyComBSTR& src) { m_str = src.MyCopy(); }
+  
   /*
   CMyComBSTR(REFGUID src)
   {
@@ -102,7 +107,7 @@ public:
     CoTaskMemFree(szGuid);
   }
   */
-  ~CMyComBSTR() { ::SysFreeString(m_str); }
+  
   CMyComBSTR& operator=(const CMyComBSTR& src)
   {
     if (m_str != src.m_str)
@@ -113,22 +118,29 @@ public:
     }
     return *this;
   }
+  
   CMyComBSTR& operator=(LPCOLESTR src)
   {
     ::SysFreeString(m_str);
     m_str = ::SysAllocString(src);
     return *this;
   }
-  unsigned int Length() const { return ::SysStringLen(m_str); }
-  operator BSTR() const { return m_str; }
-  BSTR* operator&() { return &m_str; }
+  
+  unsigned Len() const { return ::SysStringLen(m_str); }
+
   BSTR MyCopy() const
   {
-    int byteLen = ::SysStringByteLen(m_str);
+    // We don't support Byte BSTRs here
+    return ::SysAllocStringLen(m_str, ::SysStringLen(m_str));
+    /*
+    UINT byteLen = ::SysStringByteLen(m_str);
     BSTR res = ::SysAllocStringByteLen(NULL, byteLen);
-    memcpy(res, m_str, byteLen);
+    if (res && byteLen != 0 && m_str)
+      memcpy(res, m_str, byteLen);
     return res;
+    */
   }
+  
   /*
   void Attach(BSTR src) { m_str = src; }
   BSTR Detach()
@@ -138,12 +150,12 @@ public:
     return s;
   }
   */
+
   void Empty()
   {
     ::SysFreeString(m_str);
     m_str = NULL;
   }
-  bool operator!() const {  return (m_str == NULL); }
 };
 
 //////////////////////////////////////////////////////////
@@ -153,25 +165,27 @@ class CMyUnknownImp
 public:
   ULONG __m_RefCount;
   CMyUnknownImp(): __m_RefCount(0) {}
+
+  // virtual ~CMyUnknownImp() {};
 };
 
 #define MY_QUERYINTERFACE_BEGIN STDMETHOD(QueryInterface) \
-    (REFGUID iid, void **outObject) {
+(REFGUID iid, void **outObject) throw() { *outObject = NULL;
 
-#define MY_QUERYINTERFACE_ENTRY(i) if (iid == IID_ ## i) \
-    { *outObject = (void *)(i *)this; AddRef(); return S_OK; }
+#define MY_QUERYINTERFACE_ENTRY(i) else if (iid == IID_ ## i) \
+    { *outObject = (void *)(i *)this; }
 
 #define MY_QUERYINTERFACE_ENTRY_UNKNOWN(i) if (iid == IID_IUnknown) \
-    { *outObject = (void *)(IUnknown *)(i *)this; AddRef(); return S_OK; }
+    { *outObject = (void *)(IUnknown *)(i *)this; }
 
 #define MY_QUERYINTERFACE_BEGIN2(i) MY_QUERYINTERFACE_BEGIN \
     MY_QUERYINTERFACE_ENTRY_UNKNOWN(i) \
     MY_QUERYINTERFACE_ENTRY(i)
 
-#define MY_QUERYINTERFACE_END return E_NOINTERFACE; }
+#define MY_QUERYINTERFACE_END else return E_NOINTERFACE; ++__m_RefCount; /* AddRef(); */ return S_OK; }
 
 #define MY_ADDREF_RELEASE \
-STDMETHOD_(ULONG, AddRef)() { return ++__m_RefCount; } \
+STDMETHOD_(ULONG, AddRef)() throw() { return ++__m_RefCount; } \
 STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0)  \
   return __m_RefCount; delete this; return 0; }
 
@@ -222,4 +236,27 @@ STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0)  \
   MY_QUERYINTERFACE_ENTRY(i5) \
   )
 
+#define MY_UNKNOWN_IMP6(i1, i2, i3, i4, i5, i6) MY_UNKNOWN_IMP_SPEC( \
+  MY_QUERYINTERFACE_ENTRY_UNKNOWN(i1) \
+  MY_QUERYINTERFACE_ENTRY(i1) \
+  MY_QUERYINTERFACE_ENTRY(i2) \
+  MY_QUERYINTERFACE_ENTRY(i3) \
+  MY_QUERYINTERFACE_ENTRY(i4) \
+  MY_QUERYINTERFACE_ENTRY(i5) \
+  MY_QUERYINTERFACE_ENTRY(i6) \
+  )
+
+#define MY_UNKNOWN_IMP7(i1, i2, i3, i4, i5, i6, i7) MY_UNKNOWN_IMP_SPEC( \
+  MY_QUERYINTERFACE_ENTRY_UNKNOWN(i1) \
+  MY_QUERYINTERFACE_ENTRY(i1) \
+  MY_QUERYINTERFACE_ENTRY(i2) \
+  MY_QUERYINTERFACE_ENTRY(i3) \
+  MY_QUERYINTERFACE_ENTRY(i4) \
+  MY_QUERYINTERFACE_ENTRY(i5) \
+  MY_QUERYINTERFACE_ENTRY(i6) \
+  MY_QUERYINTERFACE_ENTRY(i7) \
+  )
+
+const HRESULT k_My_HRESULT_WritingWasCut = 0x20000010;
+
 #endif

data/ext/p7zip/CPP/Common/MyGuidDef.h

@@ -3,7 +3,7 @@
 #ifndef GUID_DEFINED
 #define GUID_DEFINED
 
-#include "Types.h"
+#include "MyTypes.h"
 
 typedef struct {
   UInt32 Data1;

data/ext/p7zip/CPP/Common/MyInitGuid.h

@@ -3,20 +3,43 @@
 #ifndef __COMMON_MY_INITGUID_H
 #define __COMMON_MY_INITGUID_H
 
+/*
+This file must be included only to one C++ file in project before
+declarations of COM interfaces with DEFINE_GUID macro.
+
+Each GUID must be initialized exactly once in project.
+There are two different versions of the DEFINE_GUID macro in guiddef.h (MyGuidDef.h):
+  - if INITGUID is not defined:  DEFINE_GUID declares an external reference to the symbol name.
+  - if INITGUID is     defined:  DEFINE_GUID initializes the symbol name to the value of the GUID.
+
+Also we need IID_IUnknown that is initialized in some file for linking:
+  MSVC:  by default the linker uses some lib file that contains IID_IUnknown
+  MinGW: add -luuid switch for linker
+  WinCE: we define IID_IUnknown in this file
+  Other: we define IID_IUnknown in this file
+*/
+
 #ifdef _WIN32
+
 #ifdef UNDER_CE
 #include <basetyps.h>
 #endif
+
 #include <initguid.h>
+
 #ifdef UNDER_CE
 DEFINE_GUID(IID_IUnknown,
 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
 #endif
+
 #else
+
 #define INITGUID
 #include "MyGuidDef.h"
 DEFINE_GUID(IID_IUnknown,
 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
+
 #endif
 
+
 #endif

data/ext/p7zip/CPP/Common/MyLinux.h

@@ -0,0 +1,42 @@
+// MyLinux.h
+
+#ifndef __MY_LIN_LINUX_H
+#define __MY_LIN_LINUX_H
+
+#define MY_LIN_S_IFMT  00170000
+#define MY_LIN_S_IFSOCK 0140000
+#define MY_LIN_S_IFLNK  0120000
+#define MY_LIN_S_IFREG  0100000
+#define MY_LIN_S_IFBLK  0060000
+#define MY_LIN_S_IFDIR  0040000
+#define MY_LIN_S_IFCHR  0020000
+#define MY_LIN_S_IFIFO  0010000
+
+#define MY_LIN_S_ISLNK(m)   (((m) & MY_LIN_S_IFMT) == MY_LIN_S_IFLNK)
+#define MY_LIN_S_ISREG(m)   (((m) & MY_LIN_S_IFMT) == MY_LIN_S_IFREG)
+#define MY_LIN_S_ISDIR(m)   (((m) & MY_LIN_S_IFMT) == MY_LIN_S_IFDIR)
+#define MY_LIN_S_ISCHR(m)   (((m) & MY_LIN_S_IFMT) == MY_LIN_S_IFCHR)
+#define MY_LIN_S_ISBLK(m)   (((m) & MY_LIN_S_IFMT) == MY_LIN_S_IFBLK)
+#define MY_LIN_S_ISFIFO(m)  (((m) & MY_LIN_S_IFMT) == MY_LIN_S_IFIFO)
+#define MY_LIN_S_ISSOCK(m)  (((m) & MY_LIN_S_IFMT) == MY_LIN_S_IFSOCK)
+
+#define MY_LIN_S_ISUID 0004000
+#define MY_LIN_S_ISGID 0002000
+#define MY_LIN_S_ISVTX 0001000
+
+#define MY_LIN_S_IRWXU 00700
+#define MY_LIN_S_IRUSR 00400
+#define MY_LIN_S_IWUSR 00200
+#define MY_LIN_S_IXUSR 00100
+
+#define MY_LIN_S_IRWXG 00070
+#define MY_LIN_S_IRGRP 00040
+#define MY_LIN_S_IWGRP 00020
+#define MY_LIN_S_IXGRP 00010
+
+#define MY_LIN_S_IRWXO 00007
+#define MY_LIN_S_IROTH 00004
+#define MY_LIN_S_IWOTH 00002
+#define MY_LIN_S_IXOTH 00001
+
+#endif

data/ext/p7zip/CPP/Common/MyMap.cpp

@@ -6,7 +6,7 @@
 
 static const unsigned kNumBitsMax = sizeof(UInt32) * 8;
 
-static UInt32 GetSubBits(UInt32 value, unsigned startPos, unsigned numBits)
+static UInt32 GetSubBits(UInt32 value, unsigned startPos, unsigned numBits) throw()
 {
   if (startPos == sizeof(value) * 8)
     return 0;
@@ -18,7 +18,7 @@ static UInt32 GetSubBits(UInt32 value, unsigned startPos, unsigned numBits)
 
 static inline unsigned GetSubBit(UInt32 v, unsigned n) { return (unsigned)(v >> n) & 1; }
 
-bool CMap32::Find(UInt32 key, UInt32 &valueRes) const
+bool CMap32::Find(UInt32 key, UInt32 &valueRes) const throw()
 {
   valueRes = (UInt32)(Int32)-1;
   if (Nodes.Size() == 0)
@@ -33,7 +33,7 @@ bool CMap32::Find(UInt32 key, UInt32 &valueRes) const
     }
   }
 
-  int cur = 0;
+  unsigned cur = 0;
   unsigned bitPos = kNumBitsMax;
   for (;;)
   {
@@ -47,7 +47,7 @@ bool CMap32::Find(UInt32 key, UInt32 &valueRes) const
       valueRes = n.Values[bit];
       return (key == n.Keys[bit]);
     }
-    cur = (int)n.Keys[bit];
+    cur = (unsigned)n.Keys[bit];
   }
 }
 
@@ -74,7 +74,7 @@ bool CMap32::Set(UInt32 key, UInt32 value)
         return true;
       }
       unsigned i = kNumBitsMax - 1;
-      for (;GetSubBit(key, i) == GetSubBit(n.Key, i); i--);
+      for (; GetSubBit(key, i) == GetSubBit(n.Key, i); i--);
       n.Len = (UInt16)(kNumBitsMax - (1 + i));
       unsigned newBit = GetSubBit(key, i);
       n.Values[newBit] = value;
@@ -83,7 +83,7 @@ bool CMap32::Set(UInt32 key, UInt32 value)
     }
   }
 
-  int cur = 0;
+  unsigned cur = 0;
   unsigned bitPos = kNumBitsMax;
   for (;;)
   {
@@ -117,7 +117,7 @@ bool CMap32::Set(UInt32 key, UInt32 value)
         return true;
       }
       unsigned i = bitPos - 1;
-      for (;GetSubBit(key, i) == GetSubBit(n.Keys[bit], i); i--);
+      for (; GetSubBit(key, i) == GetSubBit(n.Keys[bit], i); i--);
      
       CNode e2;
       
@@ -135,6 +135,6 @@ bool CMap32::Set(UInt32 key, UInt32 value)
       Nodes.Add(e2);
       return false;
     }
-    cur = (int)n.Keys[bit];
+    cur = (unsigned)n.Keys[bit];
   }
 }

data/ext/p7zip/CPP/Common/MyMap.h

@@ -3,8 +3,8 @@
 #ifndef __COMMON_MYMAP_H
 #define __COMMON_MYMAP_H
 
+#include "MyTypes.h"
 #include "MyVector.h"
-#include "Types.h"
 
 class CMap32
 {
@@ -21,7 +21,7 @@ class CMap32
 public:
 
   void Clear() { Nodes.Clear(); }
-  bool Find(UInt32 key, UInt32 &valueRes) const;
+  bool Find(UInt32 key, UInt32 &valueRes) const throw();
   bool Set(UInt32 key, UInt32 value); // returns true, if there is such key already
 };