react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/OverwriteDialog.cpp

@@ -2,10 +2,8 @@
 
 #include "StdAfx.h"
 
-#include "../../../Common/IntToString.h"
 #include "../../../Common/StringConvert.h"
 
-#include "../../../Windows/FileFind.h"
 #include "../../../Windows/PropVariantConv.h"
 #include "../../../Windows/ResourceString.h"
 
@@ -19,7 +17,7 @@
 
 using namespace NWindows;
 
-#ifdef Z7_LANG
+#ifdef LANG
 static const UInt32 kLangIDs[] =
 {
   IDT_OVERWRITE_HEADER,
@@ -31,16 +29,12 @@ static const UInt32 kLangIDs[] =
 };
 #endif
 
-static const unsigned kCurrentFileNameSizeLimit = 72;
+static const unsigned kCurrentFileNameSizeLimit = 82;
+static const unsigned kCurrentFileNameSizeLimit2 = 30;
 
 void COverwriteDialog::ReduceString(UString &s)
 {
-  const unsigned size =
-#ifdef UNDER_CE
-      !_isBig ? 30 : // kCurrentFileNameSizeLimit2
-#endif
-      kCurrentFileNameSizeLimit;
-
+  unsigned size = _isBig ? kCurrentFileNameSizeLimit : kCurrentFileNameSizeLimit2;
   if (s.Len() > size)
   {
     s.Delete(size / 2, s.Len() - size);
@@ -48,231 +42,71 @@ void COverwriteDialog::ReduceString(UString &s)
   }
   if (!s.IsEmpty() && s.Back() == ' ')
   {
-    // s += (wchar_t)(0x2423); // visible space
+    // s += (wchar_t)(0x2423);
     s.InsertAtFront(L'\"');
-    s.Add_Char('\"');
+    s += L'\"';
   }
 }
 
-
-void COverwriteDialog::SetItemIcon(unsigned iconID, HICON hIcon)
-{
-  NControl::CStatic staticContol;
-  staticContol.Attach(GetItem(iconID));
-  hIcon = staticContol.SetIcon(hIcon);
-  if (hIcon)
-    DestroyIcon(hIcon);
-}
-
-void AddSizeValue(UString &s, UInt64 value);
-void AddSizeValue(UString &s, UInt64 value)
+void COverwriteDialog::SetFileInfoControl(int textID, int iconID,
+    const NOverwriteDialog::CFileInfo &fileInfo)
 {
+  UString sizeString;
+  if (fileInfo.SizeIsDefined)
+    sizeString = MyFormatNew(IDS_FILE_SIZE, NumberToString(fileInfo.Size));
+
+  const UString &fileName = fileInfo.Name;
+  int slashPos = fileName.ReverseFind_PathSepar();
+  UString s1 = fileName.Left(slashPos + 1);
+  UString s2 = fileName.Ptr(slashPos + 1);
+
+  ReduceString(s1);
+  ReduceString(s2);
+  
+  UString s = s1;
+  s.Add_LF();
+  s += s2;
+  s.Add_LF();
+  s += sizeString;
+  s.Add_LF();
+
+  if (fileInfo.TimeIsDefined)
   {
-    wchar_t sz[32];
-    ConvertUInt64ToString(value, sz);
-    s += MyFormatNew(IDS_FILE_SIZE, sz);
-  }
-  if (value >= (1 << 10))
-  {
-    char c;
-          if (value >= ((UInt64)10 << 30)) { value >>= 30; c = 'G'; }
-    else  if (value >=         (10 << 20)) { value >>= 20; c = 'M'; }
-    else                                   { value >>= 10; c = 'K'; }
-    s += " : ";
-    s.Add_UInt64(value);
-    s.Add_Space();
-    s.Add_Char(c);
-    s += "iB";
+    AddLangString(s, IDS_PROP_MTIME);
+    s += ": ";
+    char t[32];
+    ConvertUtcFileTimeToString(fileInfo.Time, t);
+    s += t;
   }
-}
 
+  NControl::CDialogChildControl control;
+  control.Init(*this, textID);
+  control.SetText(s);
 
-void COverwriteDialog::SetFileInfoControl(
-    const NOverwriteDialog::CFileInfo &fileInfo,
-    unsigned textID,
-    unsigned iconID,
-    unsigned iconID_2)
-{
-  {
-    const UString &path = fileInfo.Path;
-    const int slashPos = path.ReverseFind_PathSepar();
-    UString s = path.Left((unsigned)(slashPos + 1));
-    ReduceString(s);
-    s.Add_LF();
-    {
-      UString s2 = path.Ptr((unsigned)(slashPos + 1));
-      ReduceString(s2);
-      s += s2;
-    }
-    s.Add_LF();
-    if (fileInfo.Size_IsDefined)
-      AddSizeValue(s, fileInfo.Size);
-    s.Add_LF();
-    if (fileInfo.Time_IsDefined)
-    {
-      AddLangString(s, IDS_PROP_MTIME);
-      s += ": ";
-      char t[64];
-      ConvertUtcFileTimeToString(fileInfo.Time, t);
-      s += t;
-    }
-    SetItemText(textID, s);
-  }
-/*
-  SHGetFileInfo():
-    DOCs: If uFlags does not contain SHGFI_EXETYPE or SHGFI_SYSICONINDEX,
-          the return value is nonzero if successful, or zero otherwise.
-    We don't use SHGFI_EXETYPE or SHGFI_SYSICONINDEX here.
-  win10: we call with SHGFI_ICON flag set.
-    it returns 0: if error : (shFileInfo::*) members are not set.
-    it returns non_0, if successful, and retrieve:
-      { shFileInfo.hIcon != NULL : the handle to icon (must be destroyed by our code)
-        shFileInfo.iIcon is index of the icon image within the system image list.
-      }
-  Note:
-    If we send path to ".exe" file,
-    SHGFI_USEFILEATTRIBUTES flag is ignored, and it tries to open file.
-    and return icon from that exe file.
-    So we still need to reduce path, if want to get raw icon of exe file.
-    
-  if (name.Len() >= MAX_PATH))
+  SHFILEINFO shellFileInfo;
+  if (::SHGetFileInfo(
+      GetSystemString(fileInfo.Name), FILE_ATTRIBUTE_NORMAL, &shellFileInfo,
+      sizeof(shellFileInfo), SHGFI_ICON | SHGFI_USEFILEATTRIBUTES | SHGFI_LARGEICON))
   {
-    it can return:
-      return 0.
-      return 1 and:
-        { shFileInfo.hIcon != NULL : is some default icon for file
-          shFileInfo.iIcon == 0
-        }
-    return results (0 or 1) can depend from:
-      - unicode/non-unicode
-      - (SHGFI_USEFILEATTRIBUTES) flag
-      - exact file extension (.exe).
-  }
-*/
-  int iconIndex = -1;
-  for (unsigned i = 0; i < 2; i++)
-  {
-    CSysString name = GetSystemString(fileInfo.Path);
-    if (i != 0)
-    {
-      if (!fileInfo.Is_FileSystemFile)
-        break;
-      if (name.Len() < 4 ||
-          (!StringsAreEqualNoCase_Ascii(name.RightPtr(4), ".exe") &&
-           !StringsAreEqualNoCase_Ascii(name.RightPtr(4), ".ico")))
-        break;
-      // if path for ".exe" file is long, it returns default icon (shFileInfo.iIcon == 0).
-      // We don't want to show that default icon.
-      // But we will check for default icon later instead of MAX_PATH check here.
-      // if (name.Len() >= MAX_PATH) break; // optional
-    }
-    else
-    {
-      // we need only file extension with dot
-      const int separ = name.ReverseFind_PathSepar();
-      name.DeleteFrontal((unsigned)(separ + 1));
-      // if (name.Len() >= MAX_PATH)
-      {
-        const int dot = name.ReverseFind_Dot();
-        if (dot >= 0)
-          name.DeleteFrontal((unsigned)dot);
-        // else name.Empty(); to set default name below
-      }
-      // name.Empty(); // for debug
-    }
-
-    if (name.IsEmpty())
-    {
-      // If we send empty name, SHGetFileInfo() returns some strange icon.
-      // So we use common dummy name without extension,
-      // and SHGetFileInfo() will return default icon (iIcon == 0)
-      name = "__file__";
-    }
-
-    DWORD attrib = FILE_ATTRIBUTE_ARCHIVE;
-    if (fileInfo.Is_FileSystemFile)
-    {
-      NFile::NFind::CFileInfo fi;
-      if (fi.Find(us2fs(fileInfo.Path)) && !fi.IsAltStream && !fi.IsDir())
-        attrib = fi.Attrib;
-    }
-
-    SHFILEINFO shFileInfo;
-    // ZeroMemory(&shFileInfo, sizeof(shFileInfo)); // optional
-    shFileInfo.hIcon = NULL; // optional
-    shFileInfo.iIcon = -1;   // optional
-    // memset(&shFileInfo, 1, sizeof(shFileInfo)); // for debug
-    const DWORD_PTR res = ::SHGetFileInfo(name, attrib,
-        &shFileInfo, sizeof(shFileInfo),
-        SHGFI_ICON | SHGFI_LARGEICON | SHGFI_SHELLICONSIZE |
-        // (i == 0 ? SHGFI_USEFILEATTRIBUTES : 0)
-        SHGFI_USEFILEATTRIBUTES
-        // we use SHGFI_USEFILEATTRIBUTES for second icon, because
-        // it still returns real icon from exe files
-        );
-    if (res && shFileInfo.hIcon)
-    {
-      // we don't show second icon, if icon index (iIcon) is same
-      // as first icon index of first shown icon (exe file without icon)
-      if (   shFileInfo.iIcon >= 0
-          && shFileInfo.iIcon != iconIndex
-          && (shFileInfo.iIcon != 0 || i == 0)) // we don't want default icon for second icon
-      {
-        iconIndex = shFileInfo.iIcon;
-        SetItemIcon(i == 0 ? iconID : iconID_2, shFileInfo.hIcon);
-      }
-      else
-        DestroyIcon(shFileInfo.hIcon);
-    }
+    NControl::CStatic staticContol;
+    staticContol.Attach(GetItem(iconID));
+    staticContol.SetIcon(shellFileInfo.hIcon);
   }
 }
 
-
-
 bool COverwriteDialog::OnInit()
 {
-  #ifdef Z7_LANG
+  #ifdef LANG
   LangSetWindowText(*this, IDD_OVERWRITE);
-  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
+  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
   #endif
-  SetFileInfoControl(OldFileInfo,
-      IDT_OVERWRITE_OLD_FILE_SIZE_TIME,
-      IDI_OVERWRITE_OLD_FILE,
-      IDI_OVERWRITE_OLD_FILE_2);
-  SetFileInfoControl(NewFileInfo,
-      IDT_OVERWRITE_NEW_FILE_SIZE_TIME,
-      IDI_OVERWRITE_NEW_FILE,
-      IDI_OVERWRITE_NEW_FILE_2);
+  SetFileInfoControl(IDT_OVERWRITE_OLD_FILE_SIZE_TIME, IDI_OVERWRITE_OLD_FILE, OldFileInfo);
+  SetFileInfoControl(IDT_OVERWRITE_NEW_FILE_SIZE_TIME, IDI_OVERWRITE_NEW_FILE, NewFileInfo);
   NormalizePosition();
-
-  if (!ShowExtraButtons)
-  {
-    HideItem(IDB_YES_TO_ALL);
-    HideItem(IDB_NO_TO_ALL);
-    HideItem(IDB_AUTO_RENAME);
-  }
-
-  if (DefaultButton_is_NO)
-  {
-    PostMsg(DM_SETDEFID, IDNO);
-    HWND h = GetItem(IDNO);
-    PostMsg(WM_NEXTDLGCTL, (WPARAM)h, TRUE);
-    // ::SetFocus(h);
-  }
-
   return CModalDialog::OnInit();
 }
 
-bool COverwriteDialog::OnDestroy()
-{
-  SetItemIcon(IDI_OVERWRITE_OLD_FILE, NULL);
-  SetItemIcon(IDI_OVERWRITE_OLD_FILE_2, NULL);
-  SetItemIcon(IDI_OVERWRITE_NEW_FILE, NULL);
-  SetItemIcon(IDI_OVERWRITE_NEW_FILE_2, NULL);
-  return false; // we return (false) to perform default dialog operation
-}
-
-bool COverwriteDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
+bool COverwriteDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
@@ -281,7 +115,7 @@ bool COverwriteDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
     case IDB_YES_TO_ALL:
     case IDB_NO_TO_ALL:
     case IDB_AUTO_RENAME:
-      End((INT_PTR)buttonID);
+      End(buttonID);
       return true;
   }
   return CModalDialog::OnButtonClicked(buttonID, buttonHWND);

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/OverwriteDialog.h

@@ -1,7 +1,7 @@
 // OverwriteDialog.h
 
-#ifndef ZIP7_INC_OVERWRITE_DIALOG_H
-#define ZIP7_INC_OVERWRITE_DIALOG_H
+#ifndef __OVERWRITE_DIALOG_H
+#define __OVERWRITE_DIALOG_H
 
 #include "../../../Windows/Control/Dialog.h"
 
@@ -12,78 +12,58 @@ namespace NOverwriteDialog
 {
   struct CFileInfo
   {
-    bool Size_IsDefined;
-    bool Time_IsDefined;
-    bool Is_FileSystemFile;
+    bool SizeIsDefined;
+    bool TimeIsDefined;
     UInt64 Size;
     FILETIME Time;
-    UString Path;
-
-    void SetTime(const FILETIME &t)
-    {
-      Time = t;
-      Time_IsDefined = true;
-    }
+    UString Name;
     
-    void SetTime2(const FILETIME *t)
+    void SetTime(const FILETIME *t)
     {
-      if (!t)
-        Time_IsDefined = false;
+      if (t == 0)
+        TimeIsDefined = false;
       else
-        SetTime(*t);
+      {
+        TimeIsDefined = true;
+        Time = *t;
+      }
     }
-
-    void SetSize(UInt64 size)
+    void SetSize(const UInt64 *size)
     {
-      Size = size;
-      Size_IsDefined = true;
-    }
-
-    void SetSize2(const UInt64 *size)
-    {
-      if (!size)
-        Size_IsDefined = false;
+      if (size == 0)
+        SizeIsDefined = false;
       else
-        SetSize(*size);
+      {
+        SizeIsDefined = true;
+        Size = *size;
+      }
     }
-
-    CFileInfo():
-      Size_IsDefined(false),
-      Time_IsDefined(false),
-      Is_FileSystemFile(false)
-      {}
   };
 }
 
 class COverwriteDialog: public NWindows::NControl::CModalDialog
 {
-#ifdef UNDER_CE
   bool _isBig;
-#endif
 
-  void SetItemIcon(unsigned iconID, HICON hIcon);
-  void SetFileInfoControl(const NOverwriteDialog::CFileInfo &fileInfo, unsigned textID, unsigned iconID, unsigned iconID_2);
-  virtual bool OnInit() Z7_override;
-  virtual bool OnDestroy() Z7_override;
-  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
+  void SetFileInfoControl(int textID, int iconID, const NOverwriteDialog::CFileInfo &fileInfo);
+  virtual bool OnInit();
+  bool OnButtonClicked(int buttonID, HWND buttonHWND);
   void ReduceString(UString &s);
 
 public:
-  bool ShowExtraButtons;
-  bool DefaultButton_is_NO;
-  NOverwriteDialog::CFileInfo OldFileInfo;
-  NOverwriteDialog::CFileInfo NewFileInfo;
-
-  COverwriteDialog(): ShowExtraButtons(true), DefaultButton_is_NO(false) {}
-
-  INT_PTR Create(HWND parent = NULL)
+  INT_PTR Create(HWND parent = 0)
   {
-#ifdef UNDER_CE
     BIG_DIALOG_SIZE(280, 200);
+    #ifdef UNDER_CE
     _isBig = isBig;
-#endif
+    #else
+    _isBig = true;
+    #endif
     return CModalDialog::Create(SIZED_DIALOG(IDD_OVERWRITE), parent);
   }
+
+  NOverwriteDialog::CFileInfo OldFileInfo;
+  NOverwriteDialog::CFileInfo NewFileInfo;
 };
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/OverwriteDialog.rc

@@ -1,7 +1,7 @@
 #include "OverwriteDialogRes.h"
 #include "../../GuiCommon.rc"
 
-#define xc 340
+#define xc 280
 #define yc 200
 
 #undef iconSize
@@ -25,13 +25,11 @@ BEGIN
   LTEXT  "Would you like to replace the existing file", IDT_OVERWRITE_QUESTION_BEGIN, m, 28, xc, 8
   
   ICON   "", IDI_OVERWRITE_OLD_FILE,             m,  44, iconSize, iconSize
-  ICON   "", IDI_OVERWRITE_OLD_FILE_2,           m,  44 + iconSize, iconSize, iconSize
   LTEXT  "", IDT_OVERWRITE_OLD_FILE_SIZE_TIME,   x,  44, fx, fy, SS_NOPREFIX
   
   LTEXT  "with this one?", IDT_OVERWRITE_QUESTION_END, m,  98, xc, 8
 
   ICON   "", IDI_OVERWRITE_NEW_FILE,             m, 114, iconSize, iconSize
-  ICON   "", IDI_OVERWRITE_NEW_FILE_2,           m, 114 + iconSize, iconSize, iconSize
   LTEXT  "", IDT_OVERWRITE_NEW_FILE_SIZE_TIME,   x, 114, fx, fy, SS_NOPREFIX
   
   PUSHBUTTON  "&Yes",         IDYES,             bx3, by2, bxs, bys

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/OverwriteDialogRes.h

@@ -11,9 +11,7 @@
 #define IDB_NO_TO_ALL                  441
 
 #define IDI_OVERWRITE_OLD_FILE             100
-#define IDI_OVERWRITE_OLD_FILE_2           101
-#define IDT_OVERWRITE_OLD_FILE_SIZE_TIME   102
+#define IDI_OVERWRITE_NEW_FILE             101
 
-#define IDI_OVERWRITE_NEW_FILE             110
-#define IDI_OVERWRITE_NEW_FILE_2           111
-#define IDT_OVERWRITE_NEW_FILE_SIZE_TIME   112
+#define IDT_OVERWRITE_OLD_FILE_SIZE_TIME   102
+#define IDT_OVERWRITE_NEW_FILE_SIZE_TIME   103

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/PasswordDialog.cpp

@@ -4,11 +4,11 @@
 
 #include "PasswordDialog.h"
 
-#ifdef Z7_LANG
+#ifdef LANG
 #include "LangUtils.h"
 #endif
 
-#ifdef Z7_LANG
+#ifdef LANG
 static const UInt32 kLangIDs[] =
 {
   IDT_PASSWORD_ENTER,
@@ -30,9 +30,9 @@ void CPasswordDialog::SetTextSpec()
 
 bool CPasswordDialog::OnInit()
 {
-  #ifdef Z7_LANG
+  #ifdef LANG
   LangSetWindowText(*this, IDD_PASSWORD);
-  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
+  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
   #endif
   _passwordEdit.Attach(GetItem(IDE_PASSWORD_PASSWORD));
   CheckButton(IDX_PASSWORD_SHOW, ShowPassword);
@@ -40,7 +40,7 @@ bool CPasswordDialog::OnInit()
   return CModalDialog::OnInit();
 }
 
-bool CPasswordDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
+bool CPasswordDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
 {
   if (buttonID == IDX_PASSWORD_SHOW)
   {

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/PasswordDialog.h

@@ -1,7 +1,7 @@
 // PasswordDialog.h
 
-#ifndef ZIP7_INC_PASSWORD_DIALOG_H
-#define ZIP7_INC_PASSWORD_DIALOG_H
+#ifndef __PASSWORD_DIALOG_H
+#define __PASSWORD_DIALOG_H
 
 #include "../../../Windows/Control/Dialog.h"
 #include "../../../Windows/Control/Edit.h"
@@ -12,9 +12,9 @@ class CPasswordDialog: public NWindows::NControl::CModalDialog
 {
   NWindows::NControl::CEdit _passwordEdit;
 
-  virtual void OnOK() Z7_override;
-  virtual bool OnInit() Z7_override;
-  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
+  virtual void OnOK();
+  virtual bool OnInit();
+  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
   void SetTextSpec();
   void ReadControls();
 public:
@@ -22,7 +22,7 @@ public:
   bool ShowPassword;
   
   CPasswordDialog(): ShowPassword(false) {}
-  INT_PTR Create(HWND parentWindow = NULL) { return CModalDialog::Create(IDD_PASSWORD, parentWindow); }
+  INT_PTR Create(HWND parentWindow = 0) { return CModalDialog::Create(IDD_PASSWORD, parentWindow); }
 };
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/PasswordDialog.rc

@@ -1,11 +1,7 @@
 #include "PasswordDialogRes.h"
 #include "../../GuiCommon.rc"
 
-#ifdef UNDER_CE
 #define xc 140
-#else
-#define xc 200
-#endif
 #define yc 72
 
 IDD_PASSWORD  DIALOG  0, 0, xs, ys  MY_MODAL_DIALOG_STYLE  MY_FONT

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/ProgressDialog.cpp

@@ -15,7 +15,7 @@ extern HINSTANCE g_hInstance;
 static const UINT_PTR kTimerID = 3;
 static const UINT kTimerElapse = 100;
 
-#ifdef Z7_LANG
+#ifdef LANG
 #include "LangUtils.h"
 #endif
 
@@ -32,7 +32,7 @@ HRESULT CProgressSync::ProcessStopAndPause()
   return S_OK;
 }
 
-#ifndef Z7_SFX
+#ifndef _SFX
 CProgressDialog::~CProgressDialog()
 {
   AddToTitle(L"");
@@ -45,17 +45,15 @@ void CProgressDialog::AddToTitle(LPCWSTR s)
 #endif
 
 
-#define UNDEFINED_VAL ((UInt64)(Int64)-1)
-
 bool CProgressDialog::OnInit()
 {
-  _range = UNDEFINED_VAL;
-  _prevPercentValue = UNDEFINED_VAL;
+  _range = (UInt64)(Int64)-1;
+  _prevPercentValue = -1;
 
   _wasCreated = true;
   _dialogCreatedEvent.Set();
 
-  #ifdef Z7_LANG
+  #ifdef LANG
   LangSetDlgItems(*this, NULL, 0);
   #endif
 
@@ -116,7 +114,7 @@ bool CProgressDialog::OnTimer(WPARAM /* timerID */, LPARAM /* callback */)
   if (total == 0)
     total = 1;
 
-  const UInt64 percentValue = completed * 100 / total;
+  int percentValue = (int)(completed * 100 / total);
   if (percentValue != _prevPercentValue)
   {
     wchar_t s[64];
@@ -124,7 +122,7 @@ bool CProgressDialog::OnTimer(WPARAM /* timerID */, LPARAM /* callback */)
     UString title = s;
     title += "% ";
     SetText(title + _title);
-    #ifndef Z7_SFX
+    #ifndef _SFX
     AddToTitle(title + MainAddTitle);
     #endif
     _prevPercentValue = percentValue;
@@ -138,11 +136,8 @@ bool CProgressDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
   {
     case kCloseMessage:
     {
-      if (_timer)
-      {
-        KillTimer(kTimerID);
-        _timer = 0;
-      }
+      KillTimer(_timer);
+      _timer = 0;
       if (_inCancelMessageBox)
       {
         _externalCloseMessageWasReceived = true;
@@ -161,7 +156,7 @@ bool CProgressDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
   return CModalDialog::OnMessage(message, wParam, lParam);
 }
 
-bool CProgressDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
+bool CProgressDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {