react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Shell.h

@@ -1,21 +1,17 @@
 // Windows/Shell.h
 
-#ifndef ZIP7_WINDOWS_SHELL_H
-#define ZIP7_WINDOWS_SHELL_H
+#ifndef __WINDOWS_SHELL_H
+#define __WINDOWS_SHELL_H
 
-#include "../Common/MyWindows.h"
-#if defined(__MINGW32__) || defined(__MINGW64__)
+#include <windows.h>
 #include <shlobj.h>
-#else
-#include <ShlObj.h>
-#endif
 
 #include "../Common/MyString.h"
 
 #include "Defs.h"
 
-namespace NWindows {
-namespace NShell {
+namespace NWindows{
+namespace NShell{
 
 /////////////////////////
 // CItemIDList
@@ -24,7 +20,6 @@ namespace NShell {
 class CItemIDList
 {
   LPITEMIDLIST m_Object;
-  Z7_CLASS_NO_COPY(CItemIDList)
 public:
   CItemIDList(): m_Object(NULL) {}
   // CItemIDList(LPCITEMIDLIST itemIDList);
@@ -54,7 +49,6 @@ public:
 /////////////////////////////
 // CDrop
 
-/*
 class CDrop
 {
   HDROP m_Object;
@@ -69,51 +63,22 @@ public:
   operator HDROP() { return m_Object;}
   bool QueryPoint(LPPOINT point)
     { return BOOLToBool(::DragQueryPoint(m_Object, point)); }
-  void Finish()
-  {
-    ::DragFinish(m_Object);
-  }
-  UINT QueryFile(UINT fileIndex, LPTSTR fileName, UINT bufSize)
-    { return ::DragQueryFile(m_Object, fileIndex, fileName, bufSize); }
+  void Finish() {  ::DragFinish(m_Object); }
+  UINT QueryFile(UINT fileIndex, LPTSTR fileName, UINT fileNameSize)
+    { return ::DragQueryFile(m_Object, fileIndex, fileName, fileNameSize); }
   #ifndef _UNICODE
-  UINT QueryFile(UINT fileIndex, LPWSTR fileName, UINT bufSize)
-    { return ::DragQueryFileW(m_Object, fileIndex, fileName, bufSize); }
+  UINT QueryFile(UINT fileIndex, LPWSTR fileName, UINT fileNameSize)
+    { return ::DragQueryFileW(m_Object, fileIndex, fileName, fileNameSize); }
   #endif
   UINT QueryCountOfFiles();
-  void QueryFileName(UINT fileIndex, UString &fileName);
+  UString QueryFileName(UINT fileIndex);
   void QueryFileNames(UStringVector &fileNames);
 };
-*/
-#endif
-
-struct CFileAttribs
-{
-  int FirstDirIndex;
-  // DWORD Sum;
-  // DWORD Product;
-  // CRecordVector<DWORD> Vals;
-  // CRecordVector<bool> IsDirVector;
-
-  CFileAttribs()
-  {
-    Clear();
-  }
-
-  void Clear()
-  {
-    FirstDirIndex = -1;
-    // Sum = 0;
-    // Product = 0;
-    // IsDirVector.Clear();
-  }
-};
-
 
-/* read pathnames from HDROP or SHELLIDLIST.
-   The parser can return E_INVALIDARG, if there is some unexpected data in dataObject */
-HRESULT DataObject_GetData_HDROP_or_IDLIST_Names(IDataObject *dataObject, UStringVector &names);
+#endif
 
-HRESULT DataObject_GetData_FILE_ATTRS(IDataObject *dataObject, CFileAttribs &attribs);
+/////////////////////////////
+// Functions
 
 bool GetPathFromIDList(LPCITEMIDLIST itemIDList, CSysString &path);
 bool BrowseForFolder(LPBROWSEINFO lpbi, CSysString &resultPath);

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/StdAfx.h

@@ -1,11 +1,8 @@
 // StdAfx.h
 
-#ifndef ZIP7_INC_STDAFX_H
-#define ZIP7_INC_STDAFX_H
+#ifndef __STDAFX_H
+#define __STDAFX_H
 
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#pragma warning(disable : 4464) // relative include path contains '..'
-#endif
 #include "../Common/Common.h"
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Synchronization.cpp

@@ -2,86 +2,9 @@
 
 #include "StdAfx.h"
 
-#ifndef _WIN32
-
 #include "Synchronization.h"
 
 namespace NWindows {
 namespace NSynchronization {
 
-/*
-#define INFINITE  0xFFFFFFFF
-#define MAXIMUM_WAIT_OBJECTS 64
-#define STATUS_ABANDONED_WAIT_0 ((NTSTATUS)0x00000080L)
-#define WAIT_ABANDONED   ((STATUS_ABANDONED_WAIT_0 ) + 0 )
-#define WAIT_ABANDONED_0 ((STATUS_ABANDONED_WAIT_0 ) + 0 )
-// WINAPI
-DWORD WaitForMultipleObjects(DWORD count, const HANDLE *handles, BOOL wait_all, DWORD timeout);
-*/
-
-/* clang: we need to place some virtual functions in cpp file to rid off the warning:
-   'CBaseHandle_WFMO' has no out-of-line virtual method definitions;
-   its vtable will be emitted in every translation unit */
-CBaseHandle_WFMO::~CBaseHandle_WFMO()
-{
-}
-
-bool CBaseEvent_WFMO::IsSignaledAndUpdate()
-{
-  if (this->_state == false)
-    return false;
-  if (this->_manual_reset == false)
-    this->_state = false;
-  return true;
-}
-
-bool CSemaphore_WFMO::IsSignaledAndUpdate()
-{
-  if (this->_count == 0)
-    return false;
-  this->_count--;
-  return true;
-}
-
-DWORD WINAPI WaitForMultiObj_Any_Infinite(DWORD count, const CHandle_WFMO *handles)
-{
-  if (count < 1)
-  {
-    // abort();
-    SetLastError(EINVAL);
-    return WAIT_FAILED;
-  }
-
-  CSynchro *synchro = handles[0]->_sync;
-  synchro->Enter();
-  
-  // #ifdef DEBUG_SYNCHRO
-  for (DWORD i = 1; i < count; i++)
-  {
-    if (synchro != handles[i]->_sync)
-    {
-      // abort();
-      synchro->Leave();
-      SetLastError(EINVAL);
-      return WAIT_FAILED;
-    }
-  }
-  // #endif
-
-  for (;;)
-  {
-    for (DWORD i = 0; i < count; i++)
-    {
-      if (handles[i]->IsSignaledAndUpdate())
-      {
-        synchro->Leave();
-        return WAIT_OBJECT_0 + i;
-      }
-    }
-    synchro->WaitCond();
-  }
-}
-
 }}
-
-#endif

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Synchronization.h

@@ -1,12 +1,10 @@
 // Windows/Synchronization.h
 
-#ifndef ZIP7_INC_WINDOWS_SYNCHRONIZATION_H
-#define ZIP7_INC_WINDOWS_SYNCHRONIZATION_H
+#ifndef __WINDOWS_SYNCHRONIZATION_H
+#define __WINDOWS_SYNCHRONIZATION_H
 
 #include "../../C/Threads.h"
 
-#include "../Common/MyTypes.h"
-
 #include "Defs.h"
 
 #ifdef _WIN32
@@ -16,30 +14,28 @@
 namespace NWindows {
 namespace NSynchronization {
 
-class CBaseEvent  MY_UNCOPYABLE
+class CBaseEvent
 {
 protected:
   ::CEvent _object;
 public:
   bool IsCreated() { return Event_IsCreated(&_object) != 0; }
-
+  operator HANDLE() { return _object; }
   CBaseEvent() { Event_Construct(&_object); }
   ~CBaseEvent() { Close(); }
   WRes Close() { return Event_Close(&_object); }
-
   #ifdef _WIN32
-  operator HANDLE() { return _object; }
   WRes Create(bool manualReset, bool initiallyOwn, LPCTSTR name = NULL, LPSECURITY_ATTRIBUTES sa = NULL)
   {
     _object = ::CreateEvent(sa, BoolToBOOL(manualReset), BoolToBOOL(initiallyOwn), name);
-    if (name == NULL && _object != NULL)
+    if (name == NULL && _object != 0)
       return 0;
     return ::GetLastError();
   }
   WRes Open(DWORD desiredAccess, bool inheritHandle, LPCTSTR name)
   {
     _object = ::OpenEvent(desiredAccess, BoolToBOOL(inheritHandle), name);
-    if (_object != NULL)
+    if (_object != 0)
       return 0;
     return ::GetLastError();
   }
@@ -58,10 +54,10 @@ public:
   {
     return ManualResetEvent_Create(&_object, initiallyOwn ? 1: 0);
   }
-  WRes CreateIfNotCreated_Reset()
+  WRes CreateIfNotCreated()
   {
     if (IsCreated())
-      return Reset();
+      return 0;
     return ManualResetEvent_CreateNotSignaled(&_object);
   }
   #ifdef _WIN32
@@ -79,25 +75,21 @@ public:
   {
     return AutoResetEvent_CreateNotSignaled(&_object);
   }
-  WRes CreateIfNotCreated_Reset()
+  WRes CreateIfNotCreated()
   {
     if (IsCreated())
-      return Reset();
+      return 0;
     return AutoResetEvent_CreateNotSignaled(&_object);
   }
 };
 
-
-/*
 #ifdef _WIN32
-
 class CObject: public CHandle
 {
 public:
   WRes Lock(DWORD timeoutInterval = INFINITE)
     { return (::WaitForSingleObject(_handle, timeoutInterval) == WAIT_OBJECT_0 ? 0 : ::GetLastError()); }
 };
-
 class CMutex: public CObject
 {
 public:
@@ -122,47 +114,33 @@ public:
     return ::ReleaseMutex(_handle) ? 0 : ::GetLastError();
   }
 };
-
-class CMutexLock  MY_UNCOPYABLE
+class CMutexLock
 {
   CMutex *_object;
 public:
   CMutexLock(CMutex &object): _object(&object) { _object->Lock(); }
   ~CMutexLock() { _object->Release(); }
 };
+#endif
 
-#endif // _WIN32
-*/
-
-
-class CSemaphore  MY_UNCOPYABLE
+class CSemaphore
 {
   ::CSemaphore _object;
 public:
   CSemaphore() { Semaphore_Construct(&_object); }
   ~CSemaphore() { Close(); }
-  WRes Close() { return Semaphore_Close(&_object); }
-
-  #ifdef _WIN32
+  WRes Close() {  return Semaphore_Close(&_object); }
   operator HANDLE() { return _object; }
-  #endif
-
-  // bool IsCreated() const { return Semaphore_IsCreated(&_object) != 0; }
-
-  WRes Create(UInt32 initCount, UInt32 maxCount)
+  WRes Create(UInt32 initiallyCount, UInt32 maxCount)
   {
-    return Semaphore_Create(&_object, initCount, maxCount);
-  }
-  WRes OptCreateInit(UInt32 initCount, UInt32 maxCount)
-  {
-    return Semaphore_OptCreateInit(&_object, initCount, maxCount);
+    return Semaphore_Create(&_object, initiallyCount, maxCount);
   }
   WRes Release() { return Semaphore_Release1(&_object); }
   WRes Release(UInt32 releaseCount) { return Semaphore_ReleaseN(&_object, releaseCount); }
   WRes Lock() { return Semaphore_Wait(&_object); }
 };
 
-class CCriticalSection  MY_UNCOPYABLE
+class CCriticalSection
 {
   ::CCriticalSection _object;
 public:
@@ -172,7 +150,7 @@ public:
   void Leave() { CriticalSection_Leave(&_object); }
 };
 
-class CCriticalSectionLock  MY_UNCOPYABLE
+class CCriticalSectionLock
 {
   CCriticalSection *_object;
   void Unlock()  { _object->Leave(); }
@@ -181,206 +159,6 @@ public:
   ~CCriticalSectionLock() { Unlock(); }
 };
 
-
-#ifdef _WIN32
-
-typedef HANDLE CHandle_WFMO;
-typedef CSemaphore CSemaphore_WFMO;
-typedef CAutoResetEvent CAutoResetEvent_WFMO;
-typedef CManualResetEvent CManualResetEvent_WFMO;
-
-inline DWORD WINAPI WaitForMultiObj_Any_Infinite(DWORD count, const CHandle_WFMO *handles)
-{
-  return ::WaitForMultipleObjects(count, handles, FALSE, INFINITE);
-}
-
-#define SYNC_OBJ_DECL(obj)
-#define SYNC_WFMO(x)
-#define SYNC_PARAM(x)
-#define SYNC_PARAM_DECL(x)
-
-#else //  _WIN32
-
-// POSIX sync objects for WaitForMultipleObjects
-
-#define SYNC_WFMO(x) x
-#define SYNC_PARAM(x) x,
-#define SYNC_PARAM_DECL(x) NWindows::NSynchronization::CSynchro *x
-#define SYNC_OBJ_DECL(x) NWindows::NSynchronization::CSynchro x;
-
-class CSynchro  MY_UNCOPYABLE
-{
-  pthread_mutex_t _mutex;
-  pthread_cond_t _cond;
-  bool _isValid;
-
-public:
-  CSynchro() { _isValid = false; }
-  ~CSynchro()
-  {
-    if (_isValid)
-    {
-      ::pthread_mutex_destroy(&_mutex);
-      ::pthread_cond_destroy(&_cond);
-    }
-    _isValid = false;
-  }
-  WRes Create()
-  {
-    RINOK(::pthread_mutex_init(&_mutex, NULL))
-    const WRes ret = ::pthread_cond_init(&_cond, NULL);
-    _isValid = 1;
-    return ret;
-  }
-  WRes Enter()
-  {
-#if defined(Z7_LLVM_CLANG_VERSION) && (__clang_major__ == 13) \
-      && defined(__FreeBSD__)
-  #pragma GCC diagnostic ignored "-Wthread-safety-negative"
-  #pragma GCC diagnostic ignored "-Wthread-safety-analysis"
-#endif
-    return ::pthread_mutex_lock(&_mutex);
-  }
-  WRes Leave()
-  {
-    return ::pthread_mutex_unlock(&_mutex);
-  }
-  WRes WaitCond()
-  {
-    return ::pthread_cond_wait(&_cond, &_mutex);
-  }
-  WRes LeaveAndSignal()
-  {
-    const WRes res1 = ::pthread_cond_broadcast(&_cond);
-    const WRes res2 = ::pthread_mutex_unlock(&_mutex);
-    return (res2 ? res2 : res1);
-  }
-};
-
-
-struct CBaseHandle_WFMO;
-typedef NWindows::NSynchronization::CBaseHandle_WFMO *CHandle_WFMO;
-
-// these constants are from Windows
-#define WAIT_OBJECT_0 0
-#define WAIT_FAILED ((DWORD)0xFFFFFFFF)
-
-DWORD WINAPI WaitForMultiObj_Any_Infinite(DWORD count, const CHandle_WFMO *handles);
-
-
-struct CBaseHandle_WFMO  MY_UNCOPYABLE
-{
-  CSynchro *_sync;
-
-  CBaseHandle_WFMO(): _sync(NULL) {}
-  virtual ~CBaseHandle_WFMO();
-
-  operator CHandle_WFMO() { return this; }
-  virtual bool IsSignaledAndUpdate() = 0;
-};
-
-
-class CBaseEvent_WFMO : public CBaseHandle_WFMO
-{
-  bool _manual_reset;
-  bool _state;
-
-public:
-
-  // bool IsCreated()  { return (this->_sync != NULL); }
-  // CBaseEvent_WFMO()  { ; }
-  // ~CBaseEvent_WFMO() Z7_override { Close(); }
-
-  WRes Close() { this->_sync = NULL; return 0; }
-
-  WRes Create(
-      CSynchro *sync,
-      bool manualReset, bool initiallyOwn)
-  {
-    this->_sync         = sync;
-    this->_manual_reset = manualReset;
-    this->_state        = initiallyOwn;
-    return 0;
-  }
-
-  WRes Set()
-  {
-    RINOK(this->_sync->Enter())
-    this->_state = true;
-    return this->_sync->LeaveAndSignal();
-  }
-
-  WRes Reset()
-  {
-    RINOK(this->_sync->Enter())
-    this->_state = false;
-    return this->_sync->Leave();
-  }
-  
-  virtual bool IsSignaledAndUpdate() Z7_override;
-};
-
-
-class CManualResetEvent_WFMO Z7_final: public CBaseEvent_WFMO
-{
-public:
-  WRes Create(CSynchro *sync, bool initiallyOwn = false) { return CBaseEvent_WFMO::Create(sync, true, initiallyOwn); }
-};
-
-
-class CAutoResetEvent_WFMO Z7_final: public CBaseEvent_WFMO
-{
-public:
-  WRes Create(CSynchro *sync) { return CBaseEvent_WFMO::Create(sync, false, false); }
-  WRes CreateIfNotCreated_Reset(CSynchro *sync)
-  {
-    return Create(sync);
-  }
-};
-
-
-class CSemaphore_WFMO Z7_final: public CBaseHandle_WFMO
-{
-  UInt32 _count;
-  UInt32 _maxCount;
-
-public:
-  CSemaphore_WFMO() : _count(0), _maxCount(0) {}
-  
-  WRes Close() { this->_sync = NULL; return 0; }
-
-  WRes Create(CSynchro *sync, UInt32 initCount, UInt32 maxCount)
-  {
-    if (initCount > maxCount || maxCount < 1)
-      return EINVAL;
-    this->_sync     = sync;
-    this->_count    = initCount;
-    this->_maxCount = maxCount;
-    return 0;
-  }
-  
-  WRes Release(UInt32 releaseCount = 1)
-  {
-    if (releaseCount < 1)
-      return EINVAL;
-
-    RINOK(this->_sync->Enter())
-    UInt32 newCount = this->_count + releaseCount;
-    if (newCount > this->_maxCount)
-    {
-      RINOK(this->_sync->Leave())
-      return ERROR_TOO_MANY_POSTS; // EINVAL
-    }
-    this->_count = newCount;
-
-    return this->_sync->LeaveAndSignal();
-  }
-
-  virtual bool IsSignaledAndUpdate() Z7_override;
-};
-
-#endif // _WIN32
-
 }}
 
 #endif