react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/PropertyPage.cpp

@@ -16,13 +16,7 @@ extern bool g_IsNT;
 namespace NWindows {
 namespace NControl {
 
-static
-#ifdef Z7_OLD_WIN_SDK
-  BOOL
-#else
-  INT_PTR
-#endif
-APIENTRY MyProperyPageProcedure(HWND dialogHWND, UINT message, WPARAM wParam, LPARAM lParam)
+static INT_PTR APIENTRY MyProperyPageProcedure(HWND dialogHWND, UINT message, WPARAM wParam, LPARAM lParam)
 {
   CWindow tempDialog(dialogHWND);
   if (message == WM_INITDIALOG)
@@ -40,91 +34,75 @@ bool CPropertyPage::OnNotify(UINT /* controlID */, LPNMHDR lParam)
 {
   switch (lParam->code)
   {
-    case PSN_APPLY: SetMsgResult(OnApply2(LPPSHNOTIFY(lParam))); break;
-    case PSN_KILLACTIVE: SetMsgResult(BoolToBOOL(OnKillActive2(LPPSHNOTIFY(lParam)))); break;
-    case PSN_SETACTIVE: SetMsgResult(OnSetActive2(LPPSHNOTIFY(lParam))); break;
-    case PSN_RESET: OnReset2(LPPSHNOTIFY(lParam)); break;
-    case PSN_HELP: OnNotifyHelp2(LPPSHNOTIFY(lParam)); break;
+    case PSN_APPLY: SetMsgResult(OnApply(LPPSHNOTIFY(lParam))); break;
+    case PSN_KILLACTIVE: SetMsgResult(BoolToBOOL(OnKillActive(LPPSHNOTIFY(lParam)))); break;
+    case PSN_SETACTIVE: SetMsgResult(OnSetActive(LPPSHNOTIFY(lParam))); break;
+    case PSN_RESET: OnReset(LPPSHNOTIFY(lParam)); break;
+    case PSN_HELP: OnNotifyHelp(LPPSHNOTIFY(lParam)); break;
     default: return false;
   }
   return true;
 }
 
-/*
-PROPSHEETPAGE fields depend from
-#if   (_WIN32_WINNT >= 0x0600)
-#elif (_WIN32_WINNT >= 0x0501)
-#elif (_WIN32_IE >= 0x0400)
-PROPSHEETHEADER fields depend from
-#if (_WIN32_IE >= 0x0400)
-*/
-#if defined(PROPSHEETPAGEA_V1_SIZE) && !defined(Z7_OLD_WIN_SDK)
-#ifndef _UNICODE
-#define my_compatib_PROPSHEETPAGEA PROPSHEETPAGEA_V1
-#endif
-#define my_compatib_PROPSHEETPAGEW PROPSHEETPAGEW_V1
-#else
-// for old mingw:
-#ifndef _UNICODE
-#define my_compatib_PROPSHEETPAGEA PROPSHEETPAGEA
-#endif
-#define my_compatib_PROPSHEETPAGEW PROPSHEETPAGEW
-#endif
-
 INT_PTR MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndParent, const UString &title)
 {
-  unsigned i;
   #ifndef _UNICODE
   AStringVector titles;
+  #endif
+  #ifndef _UNICODE
+  CRecordVector<PROPSHEETPAGEA> pagesA;
+  #endif
+  CRecordVector<PROPSHEETPAGEW> pagesW;
+
+  unsigned i;
+  #ifndef _UNICODE
   for (i = 0; i < pagesInfo.Size(); i++)
     titles.Add(GetSystemString(pagesInfo[i].Title));
-  CRecordVector<my_compatib_PROPSHEETPAGEA> pagesA;
   #endif
-  CRecordVector<my_compatib_PROPSHEETPAGEW> pagesW;
 
   for (i = 0; i < pagesInfo.Size(); i++)
   {
     const CPageInfo &pageInfo = pagesInfo[i];
     #ifndef _UNICODE
     {
-      my_compatib_PROPSHEETPAGEA page;
-      memset(&page, 0, sizeof(page));
+      PROPSHEETPAGE page;
       page.dwSize = sizeof(page);
       page.dwFlags = PSP_HASHELP;
       page.hInstance = g_hInstance;
-      page.pszTemplate = MAKEINTRESOURCEA(pageInfo.ID);
-      // page.pszIcon = NULL;
+      page.pszTemplate = MAKEINTRESOURCE(pageInfo.ID);
+      page.pszIcon = NULL;
       page.pfnDlgProc = NWindows::NControl::MyProperyPageProcedure;
       
-      if (!titles[i].IsEmpty())
+      if (titles[i].IsEmpty())
+        page.pszTitle = NULL;
+      else
       {
-        page.pszTitle = titles[i];
         page.dwFlags |= PSP_USETITLE;
+        page.pszTitle = titles[i];
       }
-      // else page.pszTitle = NULL;
       page.lParam = (LPARAM)pageInfo.Page;
-      // page.pfnCallback = NULL;
+      page.pfnCallback = NULL;
       pagesA.Add(page);
     }
     #endif
     {
-      my_compatib_PROPSHEETPAGEW page;
-      memset(&page, 0, sizeof(page));
+      PROPSHEETPAGEW page;
       page.dwSize = sizeof(page);
       page.dwFlags = PSP_HASHELP;
       page.hInstance = g_hInstance;
       page.pszTemplate = MAKEINTRESOURCEW(pageInfo.ID);
-      // page.pszIcon = NULL;
+      page.pszIcon = NULL;
       page.pfnDlgProc = NWindows::NControl::MyProperyPageProcedure;
       
-      if (!pageInfo.Title.IsEmpty())
+      if (pageInfo.Title.IsEmpty())
+        page.pszTitle = NULL;
+      else
       {
-        page.pszTitle = pageInfo.Title;
         page.dwFlags |= PSP_USETITLE;
+        page.pszTitle = pageInfo.Title;
       }
-      // else page.pszTitle = NULL;
       page.lParam = (LPARAM)pageInfo.Page;
-      // page.pfnCallback = NULL;
+      page.pfnCallback = NULL;
       pagesW.Add(page);
     }
   }
@@ -132,16 +110,16 @@ INT_PTR MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndPare
   #ifndef _UNICODE
   if (!g_IsNT)
   {
-    PROPSHEETHEADERA sheet;
+    PROPSHEETHEADER sheet;
     sheet.dwSize = sizeof(sheet);
     sheet.dwFlags = PSH_PROPSHEETPAGE;
     sheet.hwndParent = hwndParent;
     sheet.hInstance = g_hInstance;
     AString titleA (GetSystemString(title));
     sheet.pszCaption = titleA;
-    sheet.nPages = pagesA.Size();
+    sheet.nPages = pagesInfo.Size();
     sheet.nStartPage = 0;
-    sheet.ppsp = (LPCPROPSHEETPAGEA)(const void *)pagesA.ConstData();
+    sheet.ppsp = &pagesA.Front();
     sheet.pfnCallback = NULL;
     return ::PropertySheetA(&sheet);
   }
@@ -154,9 +132,9 @@ INT_PTR MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndPare
     sheet.hwndParent = hwndParent;
     sheet.hInstance = g_hInstance;
     sheet.pszCaption = title;
-    sheet.nPages = pagesW.Size();
+    sheet.nPages = pagesInfo.Size();
     sheet.nStartPage = 0;
-    sheet.ppsp = (LPCPROPSHEETPAGEW)(const void *)pagesW.ConstData();
+    sheet.ppsp = &pagesW.Front();
     sheet.pfnCallback = NULL;
     return ::PropertySheetW(&sheet);
   }

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

@@ -1,7 +1,7 @@
 // Windows/Control/PropertyPage.h
 
-#ifndef ZIP7_INC_WINDOWS_CONTROL_PROPERTYPAGE_H
-#define ZIP7_INC_WINDOWS_CONTROL_PROPERTYPAGE_H
+#ifndef __WINDOWS_CONTROL_PROPERTYPAGE_H
+#define __WINDOWS_CONTROL_PROPERTYPAGE_H
 
 #include "../../Common/MyWindows.h"
 
@@ -17,23 +17,23 @@ INT_PTR APIENTRY ProperyPageProcedure(HWND dialogHWND, UINT message, WPARAM wPar
 class CPropertyPage: public CDialog
 {
 public:
-  CPropertyPage(HWND window = NULL): CDialog(window) {}
+  CPropertyPage(HWND window = NULL): CDialog(window){};
   
   void Changed() { PropSheet_Changed(GetParent(), (HWND)*this); }
   void UnChanged() { PropSheet_UnChanged(GetParent(), (HWND)*this); }
 
-  virtual bool OnNotify(UINT controlID, LPNMHDR lParam) Z7_override;
+  virtual bool OnNotify(UINT controlID, LPNMHDR lParam);
 
   virtual bool OnKillActive() { return false; } // false = OK
-  virtual bool OnKillActive2(const PSHNOTIFY *) { return OnKillActive(); }
+  virtual bool OnKillActive(const PSHNOTIFY *) { return OnKillActive(); }
   virtual LONG OnSetActive() { return false; } // false = OK
-  virtual LONG OnSetActive2(const PSHNOTIFY *) { return OnSetActive(); }
+  virtual LONG OnSetActive(const PSHNOTIFY *) { return OnSetActive(); }
   virtual LONG OnApply() { return PSNRET_NOERROR; }
-  virtual LONG OnApply2(const PSHNOTIFY *) { return OnApply(); }
+  virtual LONG OnApply(const PSHNOTIFY *) { return OnApply(); }
   virtual void OnNotifyHelp() {}
-  virtual void OnNotifyHelp2(const PSHNOTIFY *) { OnNotifyHelp(); }
+  virtual void OnNotifyHelp(const PSHNOTIFY *) { OnNotifyHelp(); }
   virtual void OnReset() {}
-  virtual void OnReset2(const PSHNOTIFY *) { OnReset(); }
+  virtual void OnReset(const PSHNOTIFY *) { OnReset(); }
 };
 
 struct CPageInfo

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

@@ -1,7 +1,7 @@
 // Windows/Control/ReBar.h
   
-#ifndef ZIP7_INC_WINDOWS_CONTROL_REBAR_H
-#define ZIP7_INC_WINDOWS_CONTROL_REBAR_H
+#ifndef __WINDOWS_CONTROL_REBAR_H
+#define __WINDOWS_CONTROL_REBAR_H
 
 #include "../Window.h"
 
@@ -14,7 +14,7 @@ public:
   bool SetBarInfo(LPREBARINFO barInfo)
     { return LRESULTToBool(SendMsg(RB_SETBARINFO, 0, (LPARAM)barInfo)); }
   bool InsertBand(int index, LPREBARBANDINFO bandInfo)
-    { return LRESULTToBool(SendMsg(RB_INSERTBAND, MY_int_TO_WPARAM(index), (LPARAM)bandInfo)); }
+    { return LRESULTToBool(SendMsg(RB_INSERTBAND, index, (LPARAM)bandInfo)); }
   bool SetBandInfo(unsigned index, LPREBARBANDINFO bandInfo)
     { return LRESULTToBool(SendMsg(RB_SETBANDINFO, index, (LPARAM)bandInfo)); }
   void MaximizeBand(unsigned index, bool ideal)

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

@@ -1,7 +1,7 @@
 // Windows/Control/Static.h
 
-#ifndef ZIP7_INC_WINDOWS_CONTROL_STATIC_H
-#define ZIP7_INC_WINDOWS_CONTROL_STATIC_H
+#ifndef __WINDOWS_CONTROL_STATIC_H
+#define __WINDOWS_CONTROL_STATIC_H
 
 #include "../Window.h"
 

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

@@ -1,7 +1,7 @@
 // Windows/Control/StatusBar.h
 
-#ifndef ZIP7_INC_WINDOWS_CONTROL_STATUSBAR_H
-#define ZIP7_INC_WINDOWS_CONTROL_STATUSBAR_H
+#ifndef __WINDOWS_CONTROL_STATUSBAR_H
+#define __WINDOWS_CONTROL_STATUSBAR_H
 
 #include "../Window.h"
 
@@ -12,7 +12,7 @@ class CStatusBar: public NWindows::CWindow
 {
 public:
   bool Create(LONG style, LPCTSTR text, HWND hwndParent, UINT id)
-    { return (_window = ::CreateStatusWindow(style, text, hwndParent, id)) != NULL; }
+    { return (_window = ::CreateStatusWindow(style, text, hwndParent, id)) != 0; }
   bool SetText(LPCTSTR text)
     { return CWindow::SetText(text); }
   bool SetText(unsigned index, LPCTSTR text, UINT type)
@@ -22,7 +22,7 @@ public:
 
   #ifndef _UNICODE
   bool Create(LONG style, LPCWSTR text, HWND hwndParent, UINT id)
-    { return (_window = ::CreateStatusWindowW(style, text, hwndParent, id)) != NULL; }
+    { return (_window = ::CreateStatusWindowW(style, text, hwndParent, id)) != 0; }
   bool SetText(LPCWSTR text)
     { return CWindow::SetText(text); }
   bool SetText(unsigned index, LPCWSTR text, UINT type)
@@ -34,7 +34,7 @@ public:
   bool SetParts(unsigned numParts, const int *edgePostions)
     { return LRESULTToBool(SendMsg(SB_SETPARTS, numParts, (LPARAM)edgePostions)); }
   void Simple(bool simple)
-    { SendMsg(SB_SIMPLE, (WPARAM)BoolToBOOL(simple), 0); }
+    { SendMsg(SB_SIMPLE, BoolToBOOL(simple), 0); }
 };
 
 }}

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/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/Control/ToolBar.h

@@ -1,7 +1,7 @@
 // Windows/Control/ToolBar.h
   
-#ifndef ZIP7_INC_WINDOWS_CONTROL_TOOLBAR_H
-#define ZIP7_INC_WINDOWS_CONTROL_TOOLBAR_H
+#ifndef __WINDOWS_CONTROL_TOOLBAR_H
+#define __WINDOWS_CONTROL_TOOLBAR_H
 
 #include "../Window.h"
 
@@ -18,7 +18,7 @@ public:
   #ifdef UNDER_CE
   {
     // maybe it must be fixed for more than 1 buttons
-    const DWORD val = GetButtonSize();
+    DWORD val = GetButtonSize();
     size->cx = LOWORD(val);
     size->cy = HIWORD(val);
     return true;

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

@@ -1,7 +1,7 @@
 // Windows/Control/Trackbar.h
 
-#ifndef ZIP7_INC_WINDOWS_CONTROL_TRACKBAR_H
-#define ZIP7_INC_WINDOWS_CONTROL_TRACKBAR_H
+#ifndef __WINDOWS_CONTROL_TRACKBAR_H
+#define __WINDOWS_CONTROL_TRACKBAR_H
 
 #include "../Window.h"
 

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/Window2.cpp

@@ -32,9 +32,9 @@ static LRESULT CALLBACK WindowProcedure(HWND aHWND, UINT message, WPARAM wParam,
   if (message == MY_START_WM_CREATE)
     tempWindow.SetUserDataLongPtr((LONG_PTR)(((LPCREATESTRUCT)lParam)->lpCreateParams));
   CWindow2 *window = (CWindow2 *)(tempWindow.GetUserDataLongPtr());
-  if (window && message == MY_START_WM_CREATE)
+  if (window != NULL && message == MY_START_WM_CREATE)
     window->Attach(aHWND);
-  if (!window)
+  if (window == 0)
   {
     #ifndef _UNICODE
     if (g_IsNT)
@@ -140,7 +140,7 @@ LRESULT CWindow2::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
         return -1;
       break;
     case WM_COMMAND:
-      if (OnCommand(HIWORD(wParam), LOWORD(wParam), lParam, result))
+      if (OnCommand(wParam, lParam, result))
         return result;
       break;
     case WM_NOTIFY:
@@ -160,14 +160,12 @@ LRESULT CWindow2::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
   return DefProc(message, wParam, lParam);
 }
 
-/*
-bool CWindow2::OnCommand2(WPARAM wParam, LPARAM lParam, LRESULT &result)
+bool CWindow2::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT &result)
 {
   return OnCommand(HIWORD(wParam), LOWORD(wParam), lParam, result);
 }
-*/
 
-bool CWindow2::OnCommand(unsigned /* code */, unsigned /* itemID */, LPARAM /* lParam */, LRESULT & /* result */)
+bool CWindow2::OnCommand(int /* code */, int /* itemID */, LPARAM /* lParam */, LRESULT & /* result */)
 {
   return false;
   // return DefProc(message, wParam, lParam);
@@ -178,7 +176,7 @@ bool CWindow2::OnCommand(unsigned /* code */, unsigned /* itemID */, LPARAM /* l
 }
 
 /*
-bool CDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
+bool CDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {

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

@@ -1,7 +1,7 @@
 // Windows/Control/Window2.h
 
-#ifndef ZIP7_INC_WINDOWS_CONTROL_WINDOW2_H
-#define ZIP7_INC_WINDOWS_CONTROL_WINDOW2_H
+#ifndef __WINDOWS_CONTROL_WINDOW2_H
+#define __WINDOWS_CONTROL_WINDOW2_H
 
 #include "../Window.h"
 
@@ -10,12 +10,10 @@ namespace NControl {
 
 class CWindow2: public CWindow
 {
-  // Z7_CLASS_NO_COPY(CWindow2)
-
   LRESULT DefProc(UINT message, WPARAM wParam, LPARAM lParam);
 public:
-  CWindow2(HWND newWindow = NULL): CWindow(newWindow) {}
-  virtual ~CWindow2() {}
+  CWindow2(HWND newWindow = NULL): CWindow(newWindow){};
+  virtual ~CWindow2() {};
 
   bool CreateEx(DWORD exStyle, LPCTSTR className, LPCTSTR windowName,
       DWORD style, int x, int y, int width, int height,
@@ -30,8 +28,8 @@ public:
   virtual LRESULT OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
   virtual bool OnCreate(CREATESTRUCT * /* createStruct */) { return true; }
   // virtual LRESULT OnCommand(WPARAM wParam, LPARAM lParam);
-  // bool OnCommand2(WPARAM wParam, LPARAM lParam, LRESULT &result);
-  virtual bool OnCommand(unsigned code, unsigned itemID, LPARAM lParam, LRESULT &result);
+  virtual bool OnCommand(WPARAM wParam, LPARAM lParam, LRESULT &result);
+  virtual bool OnCommand(int code, int itemID, LPARAM lParam, LRESULT &result);
   virtual bool OnSize(WPARAM /* wParam */, int /* xSize */, int /* ySize */) { return false; }
   virtual bool OnNotify(UINT /* controlID */, LPNMHDR /* lParam */, LRESULT & /* result */) { return false; }
   virtual void OnDestroy() { PostQuitMessage(0); }
@@ -39,7 +37,7 @@ public:
   /*
   virtual LRESULT  OnHelp(LPHELPINFO helpInfo) { OnHelp(); }
   virtual LRESULT  OnHelp() {};
-  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND);
+  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
   virtual void OnOK() {};
   virtual void OnCancel() {};
   */

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

@@ -4,8 +4,6 @@
 
 #include "DLL.h"
 
-#ifdef _WIN32
-
 #ifndef _UNICODE
 extern bool g_IsNT;
 #endif
@@ -17,11 +15,11 @@ namespace NDLL {
 
 bool CLibrary::Free() throw()
 {
-  if (_module == NULL)
+  if (_module == 0)
     return true;
   if (!::FreeLibrary(_module))
     return false;
-  _module = NULL;
+  _module = 0;
   return true;
 }
 
@@ -61,14 +59,14 @@ bool CLibrary::Load(CFSTR path) throw()
 
 bool MyGetModuleFileName(FString &path)
 {
-  const HMODULE hModule = g_hInstance;
+  HMODULE hModule = g_hInstance;
   path.Empty();
   #ifndef _UNICODE
   if (!g_IsNT)
   {
     TCHAR s[MAX_PATH + 2];
     s[0] = 0;
-    const DWORD size = ::GetModuleFileName(hModule, s, MAX_PATH + 1);
+    DWORD size = ::GetModuleFileName(hModule, s, MAX_PATH + 1);
     if (size <= MAX_PATH && size != 0)
     {
       path = fas2fs(s);
@@ -80,7 +78,7 @@ bool MyGetModuleFileName(FString &path)
   {
     WCHAR s[MAX_PATH + 2];
     s[0] = 0;
-    const DWORD size = ::GetModuleFileNameW(hModule, s, MAX_PATH + 1);
+    DWORD size = ::GetModuleFileNameW(hModule, s, MAX_PATH + 1);
     if (size <= MAX_PATH && size != 0)
     {
       path = us2fs(s);
@@ -90,16 +88,16 @@ bool MyGetModuleFileName(FString &path)
   return false;
 }
 
-#ifndef Z7_SFX
+#ifndef _SFX
 
 FString GetModuleDirPrefix()
 {
   FString s;
   if (MyGetModuleFileName(s))
   {
-    const int pos = s.ReverseFind_PathSepar();
+    int pos = s.ReverseFind_PathSepar();
     if (pos >= 0)
-      s.DeleteFrom((unsigned)(pos + 1));
+      s.DeleteFrom(pos + 1);
   }
   if (s.IsEmpty())
     s = "." STRING_PATH_SEPARATOR;
@@ -109,70 +107,3 @@ FString GetModuleDirPrefix()
 #endif
 
 }}
-
-#else // _WIN32
-
-#include <dlfcn.h>
-#include <stdlib.h>
-
-// FARPROC
-void *GetProcAddress(HMODULE module, LPCSTR procName)
-{
-  void *ptr = NULL;
-  if (module)
-    ptr = dlsym(module, procName);
-  return ptr;
-}
-
-namespace NWindows {
-namespace NDLL {
-
-bool CLibrary::Free() throw()
-{
-  if (!_module)
-    return true;
-  const int ret = dlclose(_module);
-  if (ret != 0)
-    return false;
-  _module = NULL;
-  return true;
-}
-
-bool CLibrary::Load(CFSTR path) throw()
-{
-  if (!Free())
-    return false;
-
-  int options = 0;
-
-  #ifdef RTLD_LOCAL
-    options |= RTLD_LOCAL;
-  #endif
-
-  #ifdef RTLD_NOW
-    options |= RTLD_NOW;
-  #endif
-
-  #ifdef RTLD_GROUP
-    #if ! (defined(hpux) || defined(__hpux))
-      options |= RTLD_GROUP; // mainly for solaris but not for HPUX
-    #endif
-  #endif
-  
-  _module = dlopen(path, options);
-  return (_module != NULL);
-}
-
-/*
-// FARPROC
-void * CLibrary::GetProc(LPCSTR procName) const
-{
-  // return My_GetProcAddress(_module, procName);
-  return local_GetProcAddress(_module, procName);
-  // return NULL;
-}
-*/
-
-}}
-
-#endif

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

@@ -1,29 +1,18 @@
 // Windows/DLL.h
 
-#ifndef ZIP7_INC_WINDOWS_DLL_H
-#define ZIP7_INC_WINDOWS_DLL_H
+#ifndef __WINDOWS_DLL_H
+#define __WINDOWS_DLL_H
 
 #include "../Common/MyString.h"
 
-#ifndef _WIN32
-typedef void * HMODULE;
-// typedef int (*FARPROC)();
-// typedef void *FARPROC;
-void *GetProcAddress(HMODULE module, LPCSTR procName);
-#endif
-
 namespace NWindows {
 namespace NDLL {
 
-#ifdef _WIN32
-
-/*
 #ifdef UNDER_CE
-#define My_GetProcAddress(module, procName) (void *)::GetProcAddressA(module, procName)
+#define My_GetProcAddress(module, procName) ::GetProcAddressA(module, procName)
 #else
-#define My_GetProcAddress(module, procName) (void *)::GetProcAddress(module, procName)
+#define My_GetProcAddress(module, procName) ::GetProcAddress(module, procName)
 #endif
-*/
 
 /* Win32: Don't call CLibrary::Free() and FreeLibrary() from another
     FreeLibrary() code: detaching code in DLL entry-point or in
@@ -33,25 +22,13 @@ class CLibrary
 {
   HMODULE _module;
 
-  // Z7_CLASS_NO_COPY(CLibrary);
-  // copy constructor is required here
+  // CLASS_NO_COPY(CLibrary);
 public:
-  CLibrary(): _module(NULL) {}
+  CLibrary(): _module(NULL) {};
   ~CLibrary() { Free(); }
 
-  CLibrary(const CLibrary &c): _module(NULL)
-  {
-    if (c._module)
-    {
-      // we need non const to reference from original item
-      // c._module = NULL;
-      throw 20230102;
-    }
-  }
-
-  HMODULE Get_HMODULE() const { return _module; }
-  // operator HMODULE() const { return _module; }
-  // HMODULE* operator&() { return &_module; }
+  operator HMODULE() const { return _module; }
+  HMODULE* operator&() { return &_module; }
   bool IsLoaded() const { return (_module != NULL); }
 
   void Attach(HMODULE m)
@@ -61,7 +38,7 @@ public:
   }
   HMODULE Detach()
   {
-    const HMODULE m = _module;
+    HMODULE m = _module;
     _module = NULL;
     return m;
   }
@@ -69,31 +46,9 @@ public:
   bool Free() throw();
   bool LoadEx(CFSTR path, DWORD flags = LOAD_LIBRARY_AS_DATAFILE) throw();
   bool Load(CFSTR path) throw();
-  // FARPROC
-  // void *GetProc(LPCSTR procName) const { return My_GetProcAddress(_module, procName); }
-};
-
-#else
-
-class CLibrary
-{
-  HMODULE _module;
-
-  // Z7_CLASS_NO_COPY(CLibrary);
-public:
-  CLibrary(): _module(NULL) {}
-  ~CLibrary() { Free(); }
-
-  HMODULE Get_HMODULE() const { return _module; }
-
-  bool Free() throw();
-  bool Load(CFSTR path) throw();
-  // FARPROC
-  // void *GetProc(LPCSTR procName) const; // { return My_GetProcAddress(_module, procName); }
+  FARPROC GetProc(LPCSTR procName) const { return My_GetProcAddress(_module, procName); }
 };
 
-#endif
-
 bool MyGetModuleFileName(FString &path);
 
 FString GetModuleDirPrefix();

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

@@ -1,16 +1,16 @@
 // Windows/Defs.h
 
-#ifndef ZIP7_INC_WINDOWS_DEFS_H
-#define ZIP7_INC_WINDOWS_DEFS_H
+#ifndef __WINDOWS_DEFS_H
+#define __WINDOWS_DEFS_H
 
 #include "../Common/MyWindows.h"
 
 #ifdef _WIN32
+inline bool LRESULTToBool(LRESULT v) { return (v != FALSE); }
+inline bool BOOLToBool(BOOL v) { return (v != FALSE); }
 inline BOOL BoolToBOOL(bool v) { return (v ? TRUE: FALSE); }
 #endif
 
-inline bool BOOLToBool(BOOL v) { return (v != FALSE); }
-
 inline VARIANT_BOOL BoolToVARIANT_BOOL(bool v) { return (v ? VARIANT_TRUE: VARIANT_FALSE); }
 inline bool VARIANT_BOOLToBool(VARIANT_BOOL v) { return (v != VARIANT_FALSE); }