react-native-update 10.28.10 → 10.29.0-beta.0

package/harmony/src/main/cpp/lzma/CPP/Windows/SecurityUtils.cpp

@@ -1,181 +0,0 @@
-// Windows/SecurityUtils.cpp
-
-#include "StdAfx.h"
-
-#include "../Common/MyString.h"
-
-#include "SecurityUtils.h"
-
-namespace NWindows {
-namespace NSecurity {
-
-/*
-bool MyLookupAccountSid(LPCTSTR systemName, PSID sid,
-  CSysString &accountName, CSysString &domainName, PSID_NAME_USE sidNameUse)
-{
-  DWORD accountNameSize = 0, domainNameSize = 0;
-
-  if (!::LookupAccountSid(systemName, sid,
-      accountName.GetBuf(0), &accountNameSize,
-      domainName.GetBuf(0), &domainNameSize, sidNameUse))
-  {
-    if (::GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-      return false;
-  }
-  DWORD accountNameSize2 = accountNameSize, domainNameSize2 = domainNameSize;
-  bool result = BOOLToBool(::LookupAccountSid(systemName, sid,
-      accountName.GetBuf(accountNameSize), &accountNameSize2,
-      domainName.GetBuf(domainNameSize), &domainNameSize2, sidNameUse));
-  accountName.ReleaseBuf_CalcLen(accountNameSize);
-  domainName.ReleaseBuf_CalcLen(domainNameSize);
-  return result;
-}
-*/
-  
-static void SetLsaString(LPWSTR src, PLSA_UNICODE_STRING dest)
-{
-  int len = (int)wcslen(src);
-  dest->Length = (USHORT)(len * sizeof(WCHAR));
-  dest->MaximumLength = (USHORT)((len + 1) * sizeof(WCHAR));
-  dest->Buffer = src;
-}
-
-/*
-static void MyLookupSids(CPolicy &policy, PSID ps)
-{
-  LSA_REFERENCED_DOMAIN_LIST *referencedDomains = NULL;
-  LSA_TRANSLATED_NAME *names = NULL;
-  NTSTATUS nts = policy.LookupSids(1, &ps, &referencedDomains, &names);
-  int res = LsaNtStatusToWinError(nts);
-  LsaFreeMemory(referencedDomains);
-  LsaFreeMemory(names);
-}
-*/
-
-#ifndef _UNICODE
-typedef BOOL (WINAPI * LookupAccountNameWP)(
-    LPCWSTR lpSystemName,
-    LPCWSTR lpAccountName,
-    PSID Sid,
-    LPDWORD cbSid,
-    LPWSTR ReferencedDomainName,
-    LPDWORD cchReferencedDomainName,
-    PSID_NAME_USE peUse
-    );
-#endif
-
-static PSID GetSid(LPWSTR accountName)
-{
-  #ifndef _UNICODE
-  HMODULE hModule = GetModuleHandle(TEXT("Advapi32.dll"));
-  if (hModule == NULL)
-    return NULL;
-  LookupAccountNameWP lookupAccountNameW = (LookupAccountNameWP)GetProcAddress(hModule, "LookupAccountNameW");
-  if (lookupAccountNameW == NULL)
-    return NULL;
-  #endif
-
-  DWORD sidLen = 0, domainLen = 0;
-  SID_NAME_USE sidNameUse;
-  if (!
-    #ifdef _UNICODE
-    ::LookupAccountNameW
-    #else
-    lookupAccountNameW
-    #endif
-    (NULL, accountName, NULL, &sidLen, NULL, &domainLen, &sidNameUse))
-  {
-    if (::GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-    {
-      PSID pSid = ::HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sidLen);
-      LPWSTR domainName = (LPWSTR)::HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (domainLen + 1) * sizeof(WCHAR));
-      BOOL res =
-        #ifdef _UNICODE
-        ::LookupAccountNameW
-        #else
-        lookupAccountNameW
-        #endif
-        (NULL, accountName, pSid, &sidLen, domainName, &domainLen, &sidNameUse);
-      ::HeapFree(GetProcessHeap(), 0, domainName);
-      if (res)
-        return pSid;
-    }
-  }
-  return NULL;
-}
-
-#define MY__SE_LOCK_MEMORY_NAME L"SeLockMemoryPrivilege"
-
-bool AddLockMemoryPrivilege()
-{
-  CPolicy policy;
-  LSA_OBJECT_ATTRIBUTES attr;
-  attr.Length = sizeof(attr);
-  attr.RootDirectory = NULL;
-  attr.ObjectName  = NULL;
-  attr.Attributes = 0;
-  attr.SecurityDescriptor = NULL;
-  attr.SecurityQualityOfService  = NULL;
-  if (policy.Open(NULL, &attr,
-      // GENERIC_WRITE)
-      POLICY_ALL_ACCESS)
-      // STANDARD_RIGHTS_REQUIRED,
-      // GENERIC_READ | GENERIC_EXECUTE | POLICY_VIEW_LOCAL_INFORMATION | POLICY_LOOKUP_NAMES)
-      != 0)
-    return false;
-  LSA_UNICODE_STRING userRights;
-  wchar_t s[128] = MY__SE_LOCK_MEMORY_NAME;
-  SetLsaString(s, &userRights);
-  WCHAR userName[256 + 2];
-  DWORD size = 256;
-  if (!GetUserNameW(userName, &size))
-    return false;
-  PSID psid = GetSid(userName);
-  if (psid == NULL)
-    return false;
-  bool res = false;
-
-  /*
-  PLSA_UNICODE_STRING userRightsArray;
-  ULONG countOfRights;
-  NTSTATUS status = policy.EnumerateAccountRights(psid, &userRightsArray, &countOfRights);
-  if (status != 0)
-    return false;
-  bool finded = false;
-  for (ULONG i = 0; i < countOfRights; i++)
-  {
-    LSA_UNICODE_STRING &ur = userRightsArray[i];
-    if (ur.Length != s.Length() * sizeof(WCHAR))
-      continue;
-    if (wcsncmp(ur.Buffer, s, s.Length()) != 0)
-      continue;
-    finded = true;
-    res = true;
-    break;
-  }
-  if (!finded)
-  */
-  {
-    /*
-    LSA_ENUMERATION_INFORMATION *enums;
-    ULONG countReturned;
-    NTSTATUS status = policy.EnumerateAccountsWithUserRight(&userRights, &enums, &countReturned);
-    if (status == 0)
-    {
-      for (ULONG i = 0; i < countReturned; i++)
-        MyLookupSids(policy, enums[i].Sid);
-      if (enums)
-        ::LsaFreeMemory(enums);
-      res = true;
-    }
-    */
-    NTSTATUS status = policy.AddAccountRights(psid, &userRights);
-    if (status == 0)
-      res = true;
-    // ULONG res = LsaNtStatusToWinError(status);
-  }
-  HeapFree(GetProcessHeap(), 0, psid);
-  return res;
-}
-
-}}

package/harmony/src/main/cpp/lzma/CPP/Windows/SecurityUtils.h

@@ -1,167 +0,0 @@
-// Windows/SecurityUtils.h
-
-#ifndef __WINDOWS_SECURITY_UTILS_H
-#define __WINDOWS_SECURITY_UTILS_H
-
-#include <NTSecAPI.h>
-
-#include "Defs.h"
-
-namespace NWindows {
-namespace NSecurity {
-
-class CAccessToken
-{
-  HANDLE _handle;
-public:
-  CAccessToken(): _handle(NULL) {};
-  ~CAccessToken() { Close(); }
-  bool Close()
-  {
-    if (_handle == NULL)
-      return true;
-    bool res = BOOLToBool(::CloseHandle(_handle));
-    if (res)
-      _handle = NULL;
-    return res;
-  }
-
-  bool OpenProcessToken(HANDLE processHandle, DWORD desiredAccess)
-  {
-    Close();
-    return BOOLToBool(::OpenProcessToken(processHandle, desiredAccess, &_handle));
-  }
-
-  /*
-  bool OpenThreadToken(HANDLE threadHandle, DWORD desiredAccess, bool openAsSelf)
-  {
-    Close();
-    return BOOLToBool(::OpenTreadToken(threadHandle, desiredAccess, BoolToBOOL(anOpenAsSelf), &_handle));
-  }
-  */
-
-  bool AdjustPrivileges(bool disableAllPrivileges, PTOKEN_PRIVILEGES newState,
-      DWORD bufferLength, PTOKEN_PRIVILEGES previousState, PDWORD returnLength)
-    { return BOOLToBool(::AdjustTokenPrivileges(_handle, BoolToBOOL(disableAllPrivileges),
-      newState, bufferLength, previousState, returnLength)); }
-  
-  bool AdjustPrivileges(bool disableAllPrivileges, PTOKEN_PRIVILEGES newState)
-    { return AdjustPrivileges(disableAllPrivileges, newState, 0, NULL, NULL); }
-  
-  bool AdjustPrivileges(PTOKEN_PRIVILEGES newState)
-    { return AdjustPrivileges(false, newState); }
-
-};
-
-#ifndef _UNICODE
-typedef NTSTATUS (NTAPI *LsaOpenPolicyP)(PLSA_UNICODE_STRING SystemName,
-    PLSA_OBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK DesiredAccess, PLSA_HANDLE PolicyHandle);
-typedef NTSTATUS (NTAPI *LsaCloseP)(LSA_HANDLE ObjectHandle);
-typedef NTSTATUS (NTAPI *LsaAddAccountRightsP)(LSA_HANDLE PolicyHandle,
-    PSID AccountSid, PLSA_UNICODE_STRING UserRights, ULONG CountOfRights );
-#define MY_STATUS_NOT_IMPLEMENTED           ((NTSTATUS)0xC0000002L)
-#endif
-
-struct CPolicy
-{
-protected:
-  LSA_HANDLE _handle;
-  #ifndef _UNICODE
-  HMODULE hModule;
-  #endif
-public:
-  operator LSA_HANDLE() const { return _handle; }
-  CPolicy(): _handle(NULL)
-  {
-    #ifndef _UNICODE
-    hModule = GetModuleHandle(TEXT("Advapi32.dll"));
-    #endif
-  };
-  ~CPolicy() { Close(); }
-
-  NTSTATUS Open(PLSA_UNICODE_STRING systemName, PLSA_OBJECT_ATTRIBUTES objectAttributes,
-      ACCESS_MASK desiredAccess)
-  {
-    #ifndef _UNICODE
-    if (hModule == NULL)
-      return MY_STATUS_NOT_IMPLEMENTED;
-    LsaOpenPolicyP lsaOpenPolicy = (LsaOpenPolicyP)GetProcAddress(hModule, "LsaOpenPolicy");
-    if (lsaOpenPolicy == NULL)
-      return MY_STATUS_NOT_IMPLEMENTED;
-    #endif
-
-    Close();
-    return
-      #ifdef _UNICODE
-      ::LsaOpenPolicy
-      #else
-      lsaOpenPolicy
-      #endif
-      (systemName, objectAttributes, desiredAccess, &_handle);
-  }
-  
-  NTSTATUS Close()
-  {
-    if (_handle == NULL)
-      return 0;
-
-    #ifndef _UNICODE
-    if (hModule == NULL)
-      return MY_STATUS_NOT_IMPLEMENTED;
-    LsaCloseP lsaClose = (LsaCloseP)GetProcAddress(hModule, "LsaClose");
-    if (lsaClose == NULL)
-      return MY_STATUS_NOT_IMPLEMENTED;
-    #endif
-
-    NTSTATUS res =
-      #ifdef _UNICODE
-      ::LsaClose
-      #else
-      lsaClose
-      #endif
-      (_handle);
-    _handle = NULL;
-    return res;
-  }
-  
-  NTSTATUS EnumerateAccountsWithUserRight(PLSA_UNICODE_STRING userRights,
-      PLSA_ENUMERATION_INFORMATION *enumerationBuffer, PULONG countReturned)
-    { return LsaEnumerateAccountsWithUserRight(_handle, userRights, (void **)enumerationBuffer, countReturned); }
-
-  NTSTATUS EnumerateAccountRights(PSID sid, PLSA_UNICODE_STRING* userRights, PULONG countOfRights)
-    { return ::LsaEnumerateAccountRights(_handle, sid, userRights, countOfRights); }
-
-  NTSTATUS LookupSids(ULONG count, PSID* sids,
-      PLSA_REFERENCED_DOMAIN_LIST* referencedDomains, PLSA_TRANSLATED_NAME* names)
-    { return LsaLookupSids(_handle, count, sids, referencedDomains, names); }
-
-  NTSTATUS AddAccountRights(PSID accountSid, PLSA_UNICODE_STRING userRights, ULONG countOfRights)
-  {
-    #ifndef _UNICODE
-    if (hModule == NULL)
-      return MY_STATUS_NOT_IMPLEMENTED;
-    LsaAddAccountRightsP lsaAddAccountRights = (LsaAddAccountRightsP)GetProcAddress(hModule, "LsaAddAccountRights");
-    if (lsaAddAccountRights == NULL)
-      return MY_STATUS_NOT_IMPLEMENTED;
-    #endif
-
-    return
-      #ifdef _UNICODE
-      ::LsaAddAccountRights
-      #else
-      lsaAddAccountRights
-      #endif
-      (_handle, accountSid, userRights, countOfRights);
-  }
-  NTSTATUS AddAccountRights(PSID accountSid, PLSA_UNICODE_STRING userRights)
-    { return AddAccountRights(accountSid, userRights, 1); }
-
-  NTSTATUS RemoveAccountRights(PSID accountSid, bool allRights, PLSA_UNICODE_STRING userRights, ULONG countOfRights)
-    { return LsaRemoveAccountRights(_handle, accountSid, (BOOLEAN)(allRights ? TRUE : FALSE), userRights, countOfRights); }
-};
-
-bool AddLockMemoryPrivilege();
-
-}}
-
-#endif

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

@@ -1,358 +0,0 @@
-// Windows/Shell.cpp
-
-#include "StdAfx.h"
-
-/*
-#include <stdio.h>
-#include <string.h>
-*/
-
-#include "../Common/MyCom.h"
-#ifndef _UNICODE
-#include "../Common/StringConvert.h"
-#endif
-
-#include "COM.h"
-#include "Shell.h"
-
-#ifndef _UNICODE
-extern bool g_IsNT;
-#endif
-
-namespace NWindows {
-namespace NShell {
-
-#ifndef UNDER_CE
-
-// SHGetMalloc is unsupported in Windows Mobile?
-
-void CItemIDList::Free()
-{
-  if (m_Object == NULL)
-    return;
-  CMyComPtr<IMalloc> shellMalloc;
-  if (::SHGetMalloc(&shellMalloc) != NOERROR)
-    throw 41099;
-  shellMalloc->Free(m_Object);
-  m_Object = NULL;
-}
-
-/*
-CItemIDList::(LPCITEMIDLIST itemIDList): m_Object(NULL)
-  {  *this = itemIDList; }
-CItemIDList::(const CItemIDList& itemIDList): m_Object(NULL)
-  {  *this = itemIDList; }
-
-CItemIDList& CItemIDList::operator=(LPCITEMIDLIST object)
-{
-  Free();
-  if (object != 0)
-  {
-    UINT32 size = GetSize(object);
-    m_Object = (LPITEMIDLIST)CoTaskMemAlloc(size);
-    if (m_Object != NULL)
-      MoveMemory(m_Object, object, size);
-  }
-  return *this;
-}
-
-CItemIDList& CItemIDList::operator=(const CItemIDList &object)
-{
-  Free();
-  if (object.m_Object != NULL)
-  {
-    UINT32 size = GetSize(object.m_Object);
-    m_Object = (LPITEMIDLIST)CoTaskMemAlloc(size);
-    if (m_Object != NULL)
-      MoveMemory(m_Object, object.m_Object, size);
-  }
-  return *this;
-}
-*/
-
-/////////////////////////////
-// CDrop
-
-void CDrop::Attach(HDROP object)
-{
-  Free();
-  m_Object = object;
-  m_Assigned = true;
-}
-
-void CDrop::Free()
-{
-  if (m_MustBeFinished && m_Assigned)
-    Finish();
-  m_Assigned = false;
-}
-
-UINT CDrop::QueryCountOfFiles()
-{
-  return QueryFile(0xFFFFFFFF, (LPTSTR)NULL, 0);
-}
-
-UString CDrop::QueryFileName(UINT fileIndex)
-{
-  UString fileName;
-  #ifndef _UNICODE
-  if (!g_IsNT)
-  {
-    AString fileNameA;
-    UINT bufferSize = QueryFile(fileIndex, (LPTSTR)NULL, 0);
-    const unsigned len = bufferSize + 2;
-    QueryFile(fileIndex, fileNameA.GetBuf(len), bufferSize + 1);
-    fileNameA.ReleaseBuf_CalcLen(len);
-    fileName = GetUnicodeString(fileNameA);
-  }
-  else
-  #endif
-  {
-    UINT bufferSize = QueryFile(fileIndex, (LPWSTR)NULL, 0);
-    const unsigned len = bufferSize + 2;
-    QueryFile(fileIndex, fileName.GetBuf(len), bufferSize + 1);
-    fileName.ReleaseBuf_CalcLen(len);
-  }
-  return fileName;
-}
-
-void CDrop::QueryFileNames(UStringVector &fileNames)
-{
-  UINT numFiles = QueryCountOfFiles();
-  /*
-  char s[100];
-  sprintf(s, "QueryFileNames: %d files", numFiles);
-  OutputDebugStringA(s);
-  */
-  fileNames.ClearAndReserve(numFiles);
-  for (UINT i = 0; i < numFiles; i++)
-  {
-    const UString s2 = QueryFileName(i);
-    if (!s2.IsEmpty())
-      fileNames.AddInReserved(s2);
-    /*
-    OutputDebugStringW(L"file ---");
-    OutputDebugStringW(s2);
-    */
-  }
-}
-
-
-bool GetPathFromIDList(LPCITEMIDLIST itemIDList, CSysString &path)
-{
-  const unsigned len = MAX_PATH * 2;
-  bool result = BOOLToBool(::SHGetPathFromIDList(itemIDList, path.GetBuf(len)));
-  path.ReleaseBuf_CalcLen(len);
-  return result;
-}
-
-#endif
-
-#ifdef UNDER_CE
-
-bool BrowseForFolder(LPBROWSEINFO, CSysString)
-{
-  return false;
-}
-
-bool BrowseForFolder(HWND, LPCTSTR, UINT, LPCTSTR, CSysString &)
-{
-  return false;
-}
-
-bool BrowseForFolder(HWND /* owner */, LPCTSTR /* title */,
-    LPCTSTR /* initialFolder */, CSysString & /* resultPath */)
-{
-  /*
-  // SHBrowseForFolder doesn't work before CE 6.0 ?
-  if (GetProcAddress(LoadLibrary(L"ceshell.dll", L"SHBrowseForFolder") == 0)
-    MessageBoxW(0, L"no", L"", 0);
-  else
-    MessageBoxW(0, L"yes", L"", 0);
-  */
-  /*
-  UString s = "all files";
-  s += " (*.*)";
-  return MyGetOpenFileName(owner, title, initialFolder, s, resultPath, true);
-  */
-  return false;
-}
-
-#else
-
-bool BrowseForFolder(LPBROWSEINFO browseInfo, CSysString &resultPath)
-{
-  NWindows::NCOM::CComInitializer comInitializer;
-  LPITEMIDLIST itemIDList = ::SHBrowseForFolder(browseInfo);
-  if (itemIDList == NULL)
-    return false;
-  CItemIDList itemIDListHolder;
-  itemIDListHolder.Attach(itemIDList);
-  return GetPathFromIDList(itemIDList, resultPath);
-}
-
-
-int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM /* lp */, LPARAM data)
-{
-  #ifndef UNDER_CE
-  switch (uMsg)
-  {
-    case BFFM_INITIALIZED:
-    {
-      SendMessage(hwnd, BFFM_SETSELECTION, TRUE, data);
-      break;
-    }
-    /*
-    case BFFM_SELCHANGED:
-    {
-      TCHAR dir[MAX_PATH];
-      if (::SHGetPathFromIDList((LPITEMIDLIST) lp , dir))
-        SendMessage(hwnd, BFFM_SETSTATUSTEXT, 0, (LPARAM)dir);
-      else
-        SendMessage(hwnd, BFFM_SETSTATUSTEXT, 0, (LPARAM)TEXT(""));
-      break;
-    }
-    */
-    default:
-      break;
-  }
-  #endif
-  return 0;
-}
-
-
-bool BrowseForFolder(HWND owner, LPCTSTR title, UINT ulFlags,
-    LPCTSTR initialFolder, CSysString &resultPath)
-{
-  CSysString displayName;
-  BROWSEINFO browseInfo;
-  browseInfo.hwndOwner = owner;
-  browseInfo.pidlRoot = NULL;
-
-  // there are Unicode/Astring problems in some WinCE SDK ?
-  /*
-  #ifdef UNDER_CE
-  browseInfo.pszDisplayName = (LPSTR)displayName.GetBuf(MAX_PATH);
-  browseInfo.lpszTitle = (LPCSTR)title;
-  #else
-  */
-  browseInfo.pszDisplayName = displayName.GetBuf(MAX_PATH);
-  browseInfo.lpszTitle = title;
-  // #endif
-  browseInfo.ulFlags = ulFlags;
-  browseInfo.lpfn = (initialFolder != NULL) ? BrowseCallbackProc : NULL;
-  browseInfo.lParam = (LPARAM)initialFolder;
-  return BrowseForFolder(&browseInfo, resultPath);
-}
-
-bool BrowseForFolder(HWND owner, LPCTSTR title,
-    LPCTSTR initialFolder, CSysString &resultPath)
-{
-  return BrowseForFolder(owner, title,
-      #ifndef UNDER_CE
-      BIF_NEWDIALOGSTYLE |
-      #endif
-      BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT, initialFolder, resultPath);
-  // BIF_STATUSTEXT; BIF_USENEWUI   (Version 5.0)
-}
-
-#ifndef _UNICODE
-
-typedef BOOL (WINAPI * SHGetPathFromIDListWP)(LPCITEMIDLIST pidl, LPWSTR pszPath);
-
-bool GetPathFromIDList(LPCITEMIDLIST itemIDList, UString &path)
-{
-  path.Empty();
-  SHGetPathFromIDListWP shGetPathFromIDListW = (SHGetPathFromIDListWP)
-    ::GetProcAddress(::GetModuleHandleW(L"shell32.dll"), "SHGetPathFromIDListW");
-  if (shGetPathFromIDListW == 0)
-    return false;
-  const unsigned len = MAX_PATH * 2;
-  bool result = BOOLToBool(shGetPathFromIDListW(itemIDList, path.GetBuf(len)));
-  path.ReleaseBuf_CalcLen(len);
-  return result;
-}
-
-typedef LPITEMIDLIST (WINAPI * SHBrowseForFolderWP)(LPBROWSEINFOW lpbi);
-
-bool BrowseForFolder(LPBROWSEINFOW browseInfo, UString &resultPath)
-{
-  NWindows::NCOM::CComInitializer comInitializer;
-  SHBrowseForFolderWP shBrowseForFolderW = (SHBrowseForFolderWP)
-    ::GetProcAddress(::GetModuleHandleW(L"shell32.dll"), "SHBrowseForFolderW");
-  if (shBrowseForFolderW == 0)
-    return false;
-  LPITEMIDLIST itemIDList = shBrowseForFolderW(browseInfo);
-  if (itemIDList == NULL)
-    return false;
-  CItemIDList itemIDListHolder;
-  itemIDListHolder.Attach(itemIDList);
-  return GetPathFromIDList(itemIDList, resultPath);
-}
-
-
-int CALLBACK BrowseCallbackProc2(HWND hwnd, UINT uMsg, LPARAM /* lp */, LPARAM data)
-{
-  switch (uMsg)
-  {
-    case BFFM_INITIALIZED:
-    {
-      SendMessageW(hwnd, BFFM_SETSELECTIONW, TRUE, data);
-      break;
-    }
-    /*
-    case BFFM_SELCHANGED:
-    {
-      wchar_t dir[MAX_PATH * 2];
-
-      if (shGetPathFromIDListW((LPITEMIDLIST)lp , dir))
-        SendMessageW(hwnd, BFFM_SETSTATUSTEXTW, 0, (LPARAM)dir);
-      else
-        SendMessageW(hwnd, BFFM_SETSTATUSTEXTW, 0, (LPARAM)L"");
-      break;
-    }
-    */
-    default:
-      break;
-  }
-  return 0;
-}
-
-
-static bool BrowseForFolder(HWND owner, LPCWSTR title, UINT ulFlags,
-    LPCWSTR initialFolder, UString &resultPath)
-{
-  UString displayName;
-  BROWSEINFOW browseInfo;
-  browseInfo.hwndOwner = owner;
-  browseInfo.pidlRoot = NULL;
-  browseInfo.pszDisplayName = displayName.GetBuf(MAX_PATH);
-  browseInfo.lpszTitle = title;
-  browseInfo.ulFlags = ulFlags;
-  browseInfo.lpfn = (initialFolder != NULL) ? BrowseCallbackProc2 : NULL;
-  browseInfo.lParam = (LPARAM)initialFolder;
-  return BrowseForFolder(&browseInfo, resultPath);
-}
-
-bool BrowseForFolder(HWND owner, LPCWSTR title, LPCWSTR initialFolder, UString &resultPath)
-{
-  if (g_IsNT)
-    return BrowseForFolder(owner, title,
-      BIF_NEWDIALOGSTYLE | BIF_RETURNONLYFSDIRS
-      //  | BIF_STATUSTEXT // This flag is not supported when BIF_NEWDIALOGSTYLE is specified.
-      , initialFolder, resultPath);
-  // BIF_STATUSTEXT; BIF_USENEWUI   (Version 5.0)
-  CSysString s;
-  bool res = BrowseForFolder(owner, GetSystemString(title),
-      BIF_NEWDIALOGSTYLE | BIF_RETURNONLYFSDIRS
-      // | BIF_STATUSTEXT  // This flag is not supported when BIF_NEWDIALOGSTYLE is specified.
-      , GetSystemString(initialFolder), s);
-  resultPath = GetUnicodeString(s);
-  return res;
-}
-
-#endif
-
-#endif
-
-}}