react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/Wildcard.h

@@ -1,7 +1,7 @@
 // Common/Wildcard.h
 
-#ifndef ZIP7_INC_COMMON_WILDCARD_H
-#define ZIP7_INC_COMMON_WILDCARD_H
+#ifndef __COMMON_WILDCARD_H
+#define __COMMON_WILDCARD_H
 
 #include "MyString.h"
 
@@ -51,117 +51,50 @@ struct CItem
   bool CheckPath(const UStringVector &pathParts, bool isFile) const;
 };
 
-
-
-const Byte kMark_FileOrDir = 0;
-const Byte kMark_StrictFile = 1;
-const Byte kMark_StrictFile_IfWildcard = 2;
-
-struct CCensorPathProps
-{
-  bool Recursive;
-  bool WildcardMatching;
-  Byte MarkMode;
-  
-  CCensorPathProps():
-      Recursive(false),
-      WildcardMatching(true),
-      MarkMode(kMark_FileOrDir)
-      {}
-};
-
-
-class CCensorNode  MY_UNCOPYABLE
+class CCensorNode
 {
   CCensorNode *Parent;
   
   bool CheckPathCurrent(bool include, const UStringVector &pathParts, bool isFile) const;
   void AddItemSimple(bool include, CItem &item);
 public:
-  // bool ExcludeDirItems;
-
-  CCensorNode():
-      Parent(NULL)
-      // , ExcludeDirItems(false)
-      {}
+  bool CheckPathVect(const UStringVector &pathParts, bool isFile, bool &include) const;
 
-  CCensorNode(const UString &name, CCensorNode *parent):
-      Parent(parent)
-      // , ExcludeDirItems(false)
-      , Name(name)
-      {}
+  CCensorNode(): Parent(0) { };
+  CCensorNode(const UString &name, CCensorNode *parent): Name(name), Parent(parent) { };
 
   UString Name; // WIN32 doesn't support wildcards in file names
   CObjectVector<CCensorNode> SubNodes;
   CObjectVector<CItem> IncludeItems;
   CObjectVector<CItem> ExcludeItems;
 
-  CCensorNode &Find_SubNode_Or_Add_New(const UString &name)
-  {
-    int i = FindSubNode(name);
-    if (i >= 0)
-      return SubNodes[(unsigned)i];
-    // return SubNodes.Add(CCensorNode(name, this));
-    CCensorNode &node = SubNodes.AddNew();
-    node.Parent = this;
-    node.Name = name;
-    return node;
-  }
-
   bool AreAllAllowed() const;
 
   int FindSubNode(const UString &path) const;
 
   void AddItem(bool include, CItem &item, int ignoreWildcardIndex = -1);
-  // void AddItem(bool include, const UString &path, const CCensorPathProps &props);
-  void Add_Wildcard()
-  {
-    CItem item;
-    item.PathParts.Add(L"*");
-    item.Recursive = false;
-    item.ForFile = true;
-    item.ForDir = true;
-    item.WildcardMatching = true;
-    AddItem(
-        true // include
-        , item);
-  }
+  void AddItem(bool include, const UString &path, bool recursive, bool forFile, bool forDir, bool wildcardMatching);
+  void AddItem2(bool include, const UString &path, bool recursive, bool wildcardMatching);
 
-  // NeedCheckSubDirs() returns true, if there are IncludeItems rules that affect items in subdirs
   bool NeedCheckSubDirs() const;
   bool AreThereIncludeItems() const;
 
-  /*
-  CheckPathVect() doesn't check path in Parent CCensorNode
-  so use CheckPathVect() for root CCensorNode
-  OUT:
-    returns (true) && (include = false) - file in exlude list
-    returns (true) && (include = true)  - file in include list and is not in exlude list
-    returns (false)  - file is not in (include/exlude) list
-  */
-  bool CheckPathVect(const UStringVector &pathParts, bool isFile, bool &include) const;
-
   // bool CheckPath2(bool isAltStream, const UString &path, bool isFile, bool &include) const;
   // bool CheckPath(bool isAltStream, const UString &path, bool isFile) const;
 
-  // CheckPathToRoot_Change() changes pathParts !!!
-  bool CheckPathToRoot_Change(bool include, UStringVector &pathParts, bool isFile) const;
-  bool CheckPathToRoot(bool include, const UStringVector &pathParts, bool isFile) const;
-
+  bool CheckPathToRoot(bool include, UStringVector &pathParts, bool isFile) const;
   // bool CheckPathToRoot(const UString &path, bool isFile, bool include) const;
   void ExtendExclude(const CCensorNode &fromNodes);
 };
 
-
-struct CPair  MY_UNCOPYABLE
+struct CPair
 {
   UString Prefix;
   CCensorNode Head;
   
-  // CPair(const UString &prefix): Prefix(prefix) { };
+  CPair(const UString &prefix): Prefix(prefix) { };
 };
 
-
 enum ECensorPathMode
 {
   k_RelatPath,  // absolute prefix as Prefix, remain path in Tree
@@ -169,63 +102,48 @@ enum ECensorPathMode
   k_AbsPath     // full path in Tree
 };
 
-
 struct CCensorPath
 {
   UString Path;
   bool Include;
-  CCensorPathProps Props;
+  bool Recursive;
+  bool WildcardMatching;
 
   CCensorPath():
-      Include(true)
-      {}
+    Include(true),
+    Recursive(false),
+    WildcardMatching(true)
+    {}
 };
 
-
-class CCensor  MY_UNCOPYABLE
+class CCensor
 {
-  int FindPairForPrefix(const UString &prefix) const;
+  int FindPrefix(const UString &prefix) const;
 public:
   CObjectVector<CPair> Pairs;
 
-  bool ExcludeDirItems;
-  bool ExcludeFileItems;
-
-  CCensor():
-      ExcludeDirItems(false),
-      ExcludeFileItems(false)
-      {}
-
   CObjectVector<NWildcard::CCensorPath> CensorPaths;
   
   bool AllAreRelative() const
     { return (Pairs.Size() == 1 && Pairs.Front().Prefix.IsEmpty()); }
   
-  void AddItem(ECensorPathMode pathMode, bool include, const UString &path, const CCensorPathProps &props);
+  void AddItem(ECensorPathMode pathMode, bool include, const UString &path, bool recursive, bool wildcardMatching);
   // bool CheckPath(bool isAltStream, const UString &path, bool isFile) const;
   void ExtendExclude();
 
   void AddPathsToCensor(NWildcard::ECensorPathMode censorPathMode);
-  void AddPreItem(bool include, const UString &path, const CCensorPathProps &props);
-
-  void AddPreItem_NoWildcard(const UString &path)
+  void AddPreItem(bool include, const UString &path, bool recursive, bool wildcardMatching);
+  void AddPreItem(const UString &path)
   {
-    CCensorPathProps props;
-    props.WildcardMatching = false;
-    AddPreItem(
-        true,  // include
-        path, props);
+    AddPreItem(true, path, false, false);
   }
   void AddPreItem_Wildcard()
   {
-    CCensorPathProps props;
-    // props.WildcardMatching = true;
-    AddPreItem(
-        true,  // include
-        UString("*"), props);
+    AddPreItem(true, UString("*"), false, true);
   }
 };
 
+
 }
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/XzCrc64Reg.cpp

@@ -9,31 +9,34 @@
 
 #include "../7zip/Common/RegisterCodec.h"
 
-Z7_CLASS_IMP_COM_1(
-  CXzCrc64Hasher
-  , IHasher
-)
+class CXzCrc64Hasher:
+  public IHasher,
+  public CMyUnknownImp
+{
   UInt64 _crc;
-public:
-  Byte _mtDummy[1 << 7];  // it's public to eliminate clang warning: unused private field
+  Byte mtDummy[1 << 7];
 
+public:
   CXzCrc64Hasher(): _crc(CRC64_INIT_VAL) {}
+
+  MY_UNKNOWN_IMP1(IHasher)
+  INTERFACE_IHasher(;)
 };
 
-Z7_COM7F_IMF2(void, CXzCrc64Hasher::Init())
+STDMETHODIMP_(void) CXzCrc64Hasher::Init() throw()
 {
   _crc = CRC64_INIT_VAL;
 }
 
-Z7_COM7F_IMF2(void, CXzCrc64Hasher::Update(const void *data, UInt32 size))
+STDMETHODIMP_(void) CXzCrc64Hasher::Update(const void *data, UInt32 size) throw()
 {
   _crc = Crc64Update(_crc, data, size);
 }
 
-Z7_COM7F_IMF2(void, CXzCrc64Hasher::Final(Byte *digest))
+STDMETHODIMP_(void) CXzCrc64Hasher::Final(Byte *digest) throw()
 {
-  const UInt64 val = CRC64_GET_DIGEST(_crc);
-  SetUi64(digest, val)
+  UInt64 val = CRC64_GET_DIGEST(_crc);
+  SetUi64(digest, val);
 }
 
 REGISTER_HASHER(CXzCrc64Hasher, 0x4, "CRC64", 8)

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

@@ -1,9 +1,9 @@
 // Windows/COM.h
 
-#ifndef ZIP7_INC_WINDOWS_COM_H
-#define ZIP7_INC_WINDOWS_COM_H
+#ifndef __WINDOWS_COM_H
+#define __WINDOWS_COM_H
 
-// #include "../Common/MyString.h"
+#include "../Common/MyString.h"
 
 namespace NWindows {
 namespace NCOM {
@@ -21,18 +21,17 @@ public:
     // it's single thread. Do we need multithread?
     CoInitialize(NULL);
     #endif
-  }
+  };
   ~CComInitializer() { CoUninitialize(); }
 };
 
-/*
-class CStgMedium2
+class CStgMedium
 {
   STGMEDIUM _object;
-  bool _mustBeReleased;
 public:
-  CStgMedium2(): _mustBeReleased(false) {}
-  ~CStgMedium2() { Free(); }
+  bool _mustBeReleased;
+  CStgMedium(): _mustBeReleased(false) {}
+  ~CStgMedium() { Free(); }
   void Free()
   {
     if (_mustBeReleased)
@@ -43,21 +42,6 @@ public:
   STGMEDIUM* operator->() { return &_object;}
   STGMEDIUM* operator&() { return &_object; }
 };
-*/
-
-struct CStgMedium: public STGMEDIUM
-{
-  CStgMedium()
-  {
-    tymed = TYMED_NULL; // 0
-    hGlobal = NULL;
-    pUnkForRelease = NULL;
-  }
-  ~CStgMedium()
-  {
-    ReleaseStgMedium(this);
-  }
-};
 
 #endif
 

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

@@ -2,7 +2,7 @@
 
 #include "StdAfx.h"
 
-#include "../Common/MyBuffer.h"
+#include "../Common/MyWindows.h"
 
 #ifdef UNDER_CE
 #include <commdlg.h>
@@ -14,7 +14,6 @@
 
 #include "CommonDialog.h"
 #include "Defs.h"
-// #include "FileDir.h"
 
 #ifndef _UNICODE
 extern bool g_IsNT;
@@ -22,46 +21,58 @@ extern bool g_IsNT;
 
 namespace NWindows {
 
-/*
-  GetSaveFileName()
-  GetOpenFileName()
-  OPENFILENAME
+#ifndef _UNICODE
 
-(lpstrInitialDir) : the initial directory.
-DOCs: the algorithm for selecting the initial directory varies on different platforms:
+class CDoubleZeroStringListA
 {
-  Win2000/XP/Vista:
-    1. If lpstrFile contains a path, that path is the initial directory.
-    2. Otherwise, lpstrInitialDir specifies the initial directory.
-
-  Win7:
-    If lpstrInitialDir has the same value as was passed the first time
-    the application used an Open or Save As dialog box, the path
-    most recently selected by the user is used as the initial directory.
+  LPTSTR Buf;
+  unsigned Size;
+public:
+  CDoubleZeroStringListA(LPSTR buf, unsigned size): Buf(buf), Size(size) {}
+  bool Add(LPCSTR s) throw();
+  void Finish() { *Buf = 0; }
+};
+
+bool CDoubleZeroStringListA::Add(LPCSTR s) throw()
+{
+  unsigned len = MyStringLen(s) + 1;
+  if (len >= Size)
+    return false;
+  MyStringCopy(Buf, s);
+  Buf += len;
+  Size -= len;
+  return true;
 }
 
-Win10:
- in:
-  function supports (lpstrInitialDir) path with super prefix "\\\\?\\"
-  function supports (lpstrInitialDir) path with long path
-  function doesn't support absolute (lpstrFile) path with super prefix "\\\\?\\"
-  function doesn't support absolute (lpstrFile) path with long path
- out: the path with super prefix "\\\\?\\" will be returned, if selected path is long
-
-WinXP-64 and Win10: if no filters, the system shows all files.
-    but DOCs say: If all three members are zero or NULL,
-        the system does not use any filters and does not
-        show any files in the file list control of the dialog box.
+#endif
 
-in Win7+: GetOpenFileName() and GetSaveFileName()
-    do not support pstrCustomFilter feature anymore
-*/
+class CDoubleZeroStringListW
+{
+  LPWSTR Buf;
+  unsigned Size;
+public:
+  CDoubleZeroStringListW(LPWSTR buf, unsigned size): Buf(buf), Size(size) {}
+  bool Add(LPCWSTR s) throw();
+  void Finish() { *Buf = 0; }
+};
+
+bool CDoubleZeroStringListW::Add(LPCWSTR s) throw()
+{
+  unsigned len = MyStringLen(s) + 1;
+  if (len >= Size)
+    return false;
+  MyStringCopy(Buf, s);
+  Buf += len;
+  Size -= len;
+  return true;
+}
 
-#ifdef UNDER_CE
-#define MY_OFN_PROJECT  0x00400000
-#define MY_OFN_SHOW_ALL 0x01000000
-#endif
+#define MY__OFN_PROJECT  0x00400000
+#define MY__OFN_SHOW_ALL 0x01000000
 
+/* if (lpstrFilter == NULL && nFilterIndex == 0)
+  MSDN : "the system doesn't show any files",
+  but WinXP-64 shows all files. Why ??? */
 
 /*
 structures
@@ -75,194 +86,99 @@ contain additional members:
 #endif
 
 If we compile the source code with (_WIN32_WINNT >= 0x0500), some functions
-will not work at NT 4.0, if we use sizeof(OPENFILENAME).
-We try to use reduced structure OPENFILENAME_NT4.
-*/
-
-// #if defined(_WIN64) || (defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0500)
-#if defined(__GNUC__) && (__GNUC__ <= 9) || defined(Z7_OLD_WIN_SDK)
-  #ifndef _UNICODE
-  #define my_compatib_OPENFILENAMEA       OPENFILENAMEA
-  #endif
-  #define my_compatib_OPENFILENAMEW       OPENFILENAMEW
+will not work at NT 4.0, if we use sizeof(OPENFILENAME*).
+So we use size of old version of structure. */
 
-  // MinGW doesn't support some required macros. So we define them here:
-  #ifndef CDSIZEOF_STRUCT
-  #define CDSIZEOF_STRUCT(structname, member)  (((int)((LPBYTE)(&((structname*)0)->member) - ((LPBYTE)((structname*)0)))) + sizeof(((structname*)0)->member))
-  #endif
-  #ifndef _UNICODE
-  #ifndef OPENFILENAME_SIZE_VERSION_400A
-  #define OPENFILENAME_SIZE_VERSION_400A  CDSIZEOF_STRUCT(OPENFILENAMEA,lpTemplateName)
-  #endif
-  #endif
-  #ifndef OPENFILENAME_SIZE_VERSION_400W
-  #define OPENFILENAME_SIZE_VERSION_400W  CDSIZEOF_STRUCT(OPENFILENAMEW,lpTemplateName)
-  #endif
-  
-  #ifndef _UNICODE
-  #define my_compatib_OPENFILENAMEA_size OPENFILENAME_SIZE_VERSION_400A
-  #endif
-  #define my_compatib_OPENFILENAMEW_size OPENFILENAME_SIZE_VERSION_400W
-#else
-  #ifndef _UNICODE
-  #define my_compatib_OPENFILENAMEA       OPENFILENAME_NT4A
-  #define my_compatib_OPENFILENAMEA_size  sizeof(my_compatib_OPENFILENAMEA)
-  #endif
-  #define my_compatib_OPENFILENAMEW       OPENFILENAME_NT4W
-  #define my_compatib_OPENFILENAMEW_size  sizeof(my_compatib_OPENFILENAMEW)
-#endif
-/*
-#elif defined(UNDER_CE) || defined(_WIN64) || (_WIN32_WINNT < 0x0500)
+#if defined(UNDER_CE) || defined(_WIN64) || (_WIN32_WINNT < 0x0500)
 // || !defined(WINVER)
-  #ifndef _UNICODE
-  #define my_compatib_OPENFILENAMEA       OPENFILENAMEA
   #define my_compatib_OPENFILENAMEA_size sizeof(OPENFILENAMEA)
-  #endif
-  #define my_compatib_OPENFILENAMEW       OPENFILENAMEW
   #define my_compatib_OPENFILENAMEW_size sizeof(OPENFILENAMEW)
 #else
-
+  #define my_compatib_OPENFILENAMEA_size OPENFILENAME_SIZE_VERSION_400A
+  #define my_compatib_OPENFILENAMEW_size OPENFILENAME_SIZE_VERSION_400W
 #endif
-*/
 
-#ifndef _UNICODE
 #define CONV_U_To_A(dest, src, temp) AString temp; if (src) { temp = GetSystemString(src); dest = temp; }
-#endif
 
-bool CCommonDialogInfo::CommonDlg_BrowseForFile(LPCWSTR lpstrInitialDir, const UStringVector &filters)
+bool MyGetOpenFileName(HWND hwnd, LPCWSTR title,
+    LPCWSTR initialDir,
+    LPCWSTR filePath,
+    LPCWSTR filterDescription,
+    LPCWSTR filter,
+    UString &resPath
+    #ifdef UNDER_CE
+    , bool openFolder
+    #endif
+    )
 {
-  /* GetSaveFileName() and GetOpenFileName() could change current dir,
-     if OFN_NOCHANGEDIR is not used.
-     We can restore current dir manually, if it's required.
-     22.02: we use OFN_NOCHANGEDIR. So we don't need to restore current dir manually. */
-  // NFile::NDir::CCurrentDirRestorer curDirRestorer;
-
-#ifndef _UNICODE
+  const unsigned kBufSize = MAX_PATH * 2;
+  const unsigned kFilterBufSize = MAX_PATH;
+  if (!filter)
+    filter = L"*.*";
+  #ifndef _UNICODE
   if (!g_IsNT)
   {
-    AString tempPath;
-    AStringVector f;
-    unsigned i;
-    for (i = 0; i < filters.Size(); i++)
-      f.Add(GetSystemString(filters[i]));
-    unsigned size = f.Size() + 1;
-    for (i = 0; i < f.Size(); i++)
-      size += f[i].Len();
-    CObjArray<char> filterBuf(size);
-    // memset(filterBuf, 0, size * sizeof(char));
-    {
-      char *dest = filterBuf;
-      for (i = 0; i < f.Size(); i++)
-      {
-        const AString &s = f[i];
-        MyStringCopy(dest, s);
-        dest += s.Len() + 1;
-      }
-      *dest = 0;
-    }
-    my_compatib_OPENFILENAMEA p;
+    CHAR buf[kBufSize];
+    MyStringCopy(buf, (const char *)GetSystemString(filePath));
+    // OPENFILENAME_NT4A
+    OPENFILENAMEA p;
     memset(&p, 0, sizeof(p));
     p.lStructSize = my_compatib_OPENFILENAMEA_size;
-    p.hwndOwner = hwndOwner;
-    if (size > 1)
+    p.hwndOwner = hwnd;
+    CHAR filterBuf[kFilterBufSize];
     {
+      CDoubleZeroStringListA dz(filterBuf, kFilterBufSize);
+      dz.Add(GetSystemString(filterDescription ? filterDescription : filter));
+      dz.Add(GetSystemString(filter));
+      dz.Finish();
       p.lpstrFilter = filterBuf;
-      p.nFilterIndex = (DWORD)(FilterIndex + 1);
-    }
-
-    CONV_U_To_A(p.lpstrInitialDir, lpstrInitialDir, initialDir_a)
-    CONV_U_To_A(p.lpstrTitle, lpstrTitle, title_a)
-
-    const AString filePath_a = GetSystemString(FilePath);
-    const unsigned bufSize = MAX_PATH * 8
-        + filePath_a.Len()
-        + initialDir_a.Len();
-    p.nMaxFile = bufSize;
-    p.lpstrFile = tempPath.GetBuf(bufSize);
-    MyStringCopy(p.lpstrFile, filePath_a);
-    p.Flags =
-          OFN_EXPLORER
-        | OFN_HIDEREADONLY
-        | OFN_NOCHANGEDIR;
-    const BOOL b = SaveMode ?
-        ::GetSaveFileNameA((LPOPENFILENAMEA)(void *)&p) :
-        ::GetOpenFileNameA((LPOPENFILENAMEA)(void *)&p);
-    if (!b)
-      return false;
-    {
-      tempPath.ReleaseBuf_CalcLen(bufSize);
-      FilePath = GetUnicodeString(tempPath);
-      FilterIndex = (int)p.nFilterIndex - 1;
-      return true;
+      p.nFilterIndex = 1;
     }
+    
+    p.lpstrFile = buf;
+    p.nMaxFile = kBufSize;
+    CONV_U_To_A(p.lpstrInitialDir, initialDir, initialDirA);
+    CONV_U_To_A(p.lpstrTitle, title, titleA);
+    p.Flags = OFN_EXPLORER | OFN_HIDEREADONLY;
+
+    bool res = BOOLToBool(::GetOpenFileNameA(&p));
+    resPath = GetUnicodeString(buf);
+    return res;
   }
   else
-#endif
+  #endif
   {
-    UString tempPath;
-    unsigned size = filters.Size() + 1;
-    unsigned i;
-    for (i = 0; i < filters.Size(); i++)
-      size += filters[i].Len();
-    CObjArray<wchar_t> filterBuf(size);
-    // memset(filterBuf, 0, size * sizeof(wchar_t));
-    {
-      wchar_t *dest = filterBuf;
-      for (i = 0; i < filters.Size(); i++)
-      {
-        const UString &s = filters[i];
-        MyStringCopy(dest, s);
-        dest += s.Len() + 1;
-      }
-      *dest = 0;
-      // if ((unsigned)(dest + 1 - filterBuf) != size) return false;
-    }
-    my_compatib_OPENFILENAMEW p;
+    WCHAR buf[kBufSize];
+    MyStringCopy(buf, filePath);
+    // OPENFILENAME_NT4W
+    OPENFILENAMEW p;
     memset(&p, 0, sizeof(p));
     p.lStructSize = my_compatib_OPENFILENAMEW_size;
-    p.hwndOwner = hwndOwner;
-    if (size > 1)
+    p.hwndOwner = hwnd;
+    
+    WCHAR filterBuf[kFilterBufSize];
     {
+      CDoubleZeroStringListW dz(filterBuf, kFilterBufSize);
+      dz.Add(filterDescription ? filterDescription : filter);
+      dz.Add(filter);
+      dz.Finish();
       p.lpstrFilter = filterBuf;
-      p.nFilterIndex = (DWORD)(FilterIndex + 1);
-    }
-    unsigned bufSize = MAX_PATH * 8 + FilePath.Len();
-    if (lpstrInitialDir)
-    {
-      p.lpstrInitialDir = lpstrInitialDir;
-      bufSize += MyStringLen(lpstrInitialDir);
+      p.nFilterIndex = 1;
     }
-    p.nMaxFile = bufSize;
-    p.lpstrFile = tempPath.GetBuf(bufSize);
-    MyStringCopy(p.lpstrFile, FilePath);
-    p.lpstrTitle = lpstrTitle;
-    p.Flags =
-          OFN_EXPLORER
-        | OFN_HIDEREADONLY
-        | OFN_NOCHANGEDIR
-        // | OFN_FORCESHOWHIDDEN // Win10 shows hidden items even without this flag
-        // | OFN_PATHMUSTEXIST
-      #ifdef UNDER_CE
-        | (OpenFolderMode ? (MY_OFN_PROJECT | MY_OFN_SHOW_ALL) : 0)
-      #endif
+        
+    p.lpstrFile = buf;
+    p.nMaxFile = kBufSize;
+    p.lpstrInitialDir = initialDir;
+    p.lpstrTitle = title;
+    p.Flags = OFN_EXPLORER | OFN_HIDEREADONLY
+        #ifdef UNDER_CE
+        | (openFolder ? (MY__OFN_PROJECT | MY__OFN_SHOW_ALL) : 0)
+        #endif
         ;
-    const BOOL b = SaveMode ?
-        ::GetSaveFileNameW((LPOPENFILENAMEW)(void *)&p) :
-        ::GetOpenFileNameW((LPOPENFILENAMEW)(void *)&p);
-    /* DOCs: lpstrFile :
-        if the buffer is too small, then:
-        - the function returns FALSE
-        - the CommDlgExtendedError() returns FNERR_BUFFERTOOSMALL
-        - the first two bytes of the lpstrFile buffer contain the
-          required size, in bytes or characters. */
-    if (!b)
-      return false;
-    {
-      tempPath.ReleaseBuf_CalcLen(bufSize);
-      FilePath = tempPath;
-      FilterIndex = (int)p.nFilterIndex - 1;
-      return true;
-    }
+
+    bool res = BOOLToBool(::GetOpenFileNameW(&p));
+    resPath = buf;
+    return res;
   }
 }