Merge branch '10.11' into 'master'10.11

10.11

Latest changes:
* Last FreeFileSync version supporting Windows XP and Vista
* Fixed crash on multi-monitor set
* Fixed dialogs not showing after opening UAC prompt
* Support launching through symlink (Linux)
* Added example desktop starter files (Linux)
* Fixed misleading error when determining file permissions support
* Updated wxWidgets, libcurl, libssh2, VS, GCC, Xcode

See merge request opensource-tracking/FreeFileSync!8

3 files changed, 0 insertions, 507 deletions

diff --git a/zenXml/zenxml/bind.h b/zenXml/zenxml/bind.h
deleted file mode 100755
index 28f02745..00000000
--- a/zenXml/zenxml/bind.h
+++ /dev/null
@@ -1,390 +0,0 @@
-// *****************************************************************************
-// * This file is part of the FreeFileSync project. It is distributed under    *
-// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
-// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
-// *****************************************************************************
-
-#ifndef BIND_H_9081740816593478258435
-#define BIND_H_9081740816593478258435
-
-#include <set>
-#include "cvrt_struc.h"
-#include "parser.h"
-#include "io.h"
-
-
-namespace zen
-{
-/**
-\file
-\brief Map user data types to XML
-*/
-
-///Load XML document from a file
-/**
-Convenience function that does nothing more than calling loadStream() and parse().
-
-\tparam String Arbitrary string-like type: e.g. std::string, wchar_t*, char[], wchar_t, wxString, MyStringClass, ...
-\param filename Input file name
-\returns The loaded XML document
-\throw XmlFileError
-\throw XmlParsingError
-*/
-template <class String> inline
-XmlDoc load(const String& filename) //throw XmlFileError, XmlParsingError
-{
-    std::string stream = loadStream(filename); //throw XmlFileError
-    return parse(stream); //throw XmlParsingError
-}
-
-
-///Save XML document to a file
-/**
-Convenience function that does nothing more than calling serialize() and saveStream().
-
-\tparam String Arbitrary string-like type: e.g. std::string, wchar_t*, char[], wchar_t, wxString, MyStringClass, ...
-\param doc The XML document to save
-\param filename Output file name
-\param lineBreak Line break, default: carriage return + new line
-\param indent Indentation, default: four space characters
-\throw XmlFileError
-*/
-template <class String> inline
-void save(const XmlDoc& doc,
-          const String& filename,
-          const std::string& lineBreak = "\r\n",
-          const std::string& indent = "    ") //throw XmlFileError
-{
-    std::string stream = serialize(doc, lineBreak, indent); //noexcept
-    saveStream(stream, filename); //throw XmlFileError
-}
-
-
-///Proxy class to conveniently convert user data into XML structure
-class XmlOut
-{
-public:
-    ///Construct an output proxy for an XML document
-    /**
-      \code
-        zen::XmlDoc doc;
-
-        zen::XmlOut out(doc);
-        out["elem1"]( 1); //
-        out["elem2"]( 2); //write data into XML elements
-        out["elem3"](-3); //
-
-        save(doc, "out.xml"); //throw XmlFileError
-      \endcode
-      Output:
-      \verbatim
-      <?xml version="1.0" encoding="utf-8"?>
-      <Root>
-          <elem1>1</elem1>
-          <elem2>2</elem2>
-          <elem3>-3</elem3>
-      </Root>
-      \endverbatim
-    */
-    XmlOut(XmlDoc& doc) : ref_(&doc.root()) {}
-    ///Construct an output proxy for a single XML element
-    /**
-      \sa XmlOut(XmlDoc& doc)
-    */
-    XmlOut(XmlElement& element) : ref_(&element) {}
-
-    ///Retrieve a handle to an XML child element for writing
-    /**
-    The child element will be created if it is not yet existing.
-    \tparam String Arbitrary string-like type: e.g. std::string, wchar_t*, char[], wchar_t, wxString, MyStringClass, ...
-    \param name The name of the child element
-    */
-    template <class String>
-    XmlOut operator[](const String& name) const
-    {
-        const std::string utf8name = utfTo<std::string>(name);
-        XmlElement* child = ref_->getChild(utf8name);
-        return child ? *child : ref_->addChild(utf8name);
-    }
-
-    ///Write user data to the underlying XML element
-    /**
-    This conversion requires a specialization of zen::writeText() or zen::writeStruc() for type T.
-    \tparam T User type that is converted into an XML element value.
-    */
-    template <class T>
-    void operator()(const T& value) { writeStruc(value, *ref_); }
-
-    ///Write user data to an XML attribute
-    /**
-    This conversion requires a specialization of zen::writeText() for type T.
-      \code
-        zen::XmlDoc doc;
-
-        zen::XmlOut out(doc);
-        out["elem"].attribute("attr1",  1); //
-        out["elem"].attribute("attr2",  2); //write data into XML attributes
-        out["elem"].attribute("attr3", -3); //
-
-        save(doc, "out.xml"); //throw XmlFileError
-      \endcode
-      Output:
-      \verbatim
-      <?xml version="1.0" encoding="utf-8"?>
-      <Root>
-          <elem attr1="1" attr2="2" attr3="-3"/>
-      </Root>
-      \endverbatim
-
-    \tparam String Arbitrary string-like type: e.g. std::string, wchar_t*, char[], wchar_t, wxString, MyStringClass, ...
-    \tparam T String-convertible user data type: e.g. any string-like type, all built-in arithmetic numbers
-    \sa XmlElement::setAttribute()
-    */
-    template <class String, class T>
-    void attribute(const String& name, const T& value) { ref_->setAttribute(name, value); }
-
-    ///Return a reference to the underlying Xml element
-    XmlElement& ref() { return *ref_; }
-
-private:
-    XmlElement* ref_; //always bound!
-};
-
-
-///Proxy class to conveniently convert XML structure to user data
-class XmlIn
-{
-    class ErrorLog;
-
-public:
-    ///Construct an input proxy for an XML document
-    /**
-      \code
-        zen::XmlDoc doc;
-          ... //load document
-        zen::XmlIn in(doc);
-        in["elem1"](value1); //
-        in["elem2"](value2); //read data from XML elements into variables "value1", "value2", "value3"
-        in["elem3"](value3); //
-      \endcode
-    */
-    XmlIn(const XmlDoc& doc) : log_(std::make_shared<ErrorLog>()) { refList_.push_back(&doc.root()); }
-    ///Construct an input proxy for a single XML element, may be nullptr
-    /**
-      \sa XmlIn(const XmlDoc& doc)
-    */
-    XmlIn(const XmlElement* element) : log_(std::make_shared<ErrorLog>()) { refList_.push_back(element); }
-    ///Construct an input proxy for a single XML element
-    /**
-      \sa XmlIn(const XmlDoc& doc)
-    */
-    XmlIn(const XmlElement& element) : log_(std::make_shared<ErrorLog>()) { refList_.push_back(&element); }
-
-    ///Retrieve a handle to an XML child element for reading
-    /**
-    It is \b not an error if the child element does not exist, but only later if a conversion to user data is attempted.
-    \tparam String Arbitrary string-like type: e.g. std::string, wchar_t*, char[], wchar_t, wxString, MyStringClass, ...
-    \param name The name of the child element
-    */
-    template <class String>
-    XmlIn operator[](const String& name) const
-    {
-        std::vector<const XmlElement*> childList;
-
-        if (refIndex_ < refList_.size())
-        {
-            auto iterPair = refList_[refIndex_]->getChildren(name);
-            std::for_each(iterPair.first, iterPair.second,
-            [&](const XmlElement& child) { childList.push_back(&child); });
-        }
-
-        return XmlIn(childList, childList.empty() ? getChildNameFormatted(name) : std::string(), log_);
-    }
-
-    ///Refer to next sibling element with the same name
-    /**
-    <b>Example:</b> Loop over all XML child elements named "Item"
-    \verbatim
-    <?xml version="1.0" encoding="utf-8"?>
-    <Root>
-        <Item>1</Item>
-        <Item>3</Item>
-        <Item>5</Item>
-    </Root>
-    \endverbatim
-
-    \code
-    zen::XmlIn in(doc);
-    ...
-    for (zen::XmlIn child = in["Item"]; child; child.next())
-    {
-        ...
-    }
-    \endcode
-    */
-    void next() { ++refIndex_; }
-
-    ///Read user data from the underlying XML element
-    /**
-    This conversion requires a specialization of zen::readText() or zen::readStruc() for type T.
-    \tparam T User type that receives the data
-    \return "true" if data was read successfully
-    */
-    template <class T>
-    bool operator()(T& value) const
-    {
-        if (refIndex_ < refList_.size())
-        {
-            bool success = readStruc(*refList_[refIndex_], value);
-            if (!success)
-                log_->notifyConversionError(getNameFormatted());
-            return success;
-        }
-        else
-        {
-            log_->notifyMissingElement(getNameFormatted());
-            return false;
-        }
-    }
-
-    ///Read user data from an XML attribute
-    /**
-    This conversion requires a specialization of zen::readText() for type T.
-
-    \code
-        zen::XmlDoc doc;
-          ... //load document
-        zen::XmlIn in(doc);
-        in["elem"].attribute("attr1", value1); //
-        in["elem"].attribute("attr2", value2); //read data from XML attributes into variables "value1", "value2", "value3"
-        in["elem"].attribute("attr3", value3); //
-    \endcode
-
-    \tparam String Arbitrary string-like type: e.g. std::string, wchar_t*, char[], wchar_t, wxString, MyStringClass, ...
-    \tparam T String-convertible user data type: e.g. any string-like type, all built-in arithmetic numbers
-    \returns "true" if the attribute was found and the conversion to the output value was successful.
-    \sa XmlElement::getAttribute()
-    */
-    template <class String, class T>
-    bool attribute(const String& name, T& value) const
-    {
-        if (refIndex_ < refList_.size())
-        {
-            bool success = refList_[refIndex_]->getAttribute(name, value);
-            if (!success)
-                log_->notifyMissingAttribute(getNameFormatted(), utfTo<std::string>(name));
-            return success;
-        }
-        else
-        {
-            log_->notifyMissingElement(getNameFormatted());
-            return false;
-        }
-    }
-
-    ///Return a pointer to the underlying Xml element, may be nullptr
-    const XmlElement* get() const { return refIndex_ < refList_.size() ? refList_[refIndex_] : nullptr; }
-
-    ///Test whether the underlying XML element exists
-    /**
-      \code
-         XmlIn in(doc);
-         XmlIn child = in["elem1"];
-         if (child)
-           ...
-      \endcode
-      Use member pointer as implicit conversion to bool (C++ Templates - Vandevoorde/Josuttis; chapter 20)
-    */
-    explicit operator bool() const { return get() != nullptr; }
-
-    ///Notifies errors while mapping the XML to user data
-    /**
-    Error logging is shared by each hiearchy of XmlIn proxy instances that are created from each other. Consequently it doesn't matter which instance you query for errors:
-      \code
-        XmlIn in(doc);
-        XmlIn inItem = in["item1"];
-
-        int value = 0;
-        inItem(value); //let's assume this conversion failed
-
-        assert(in.errorsOccured() == inItem.errorsOccured());
-        assert(in.getErrorsAs<std::string>() == inItem.getErrorsAs<std::string>());
-      \endcode
-
-      Note that error logging is \b NOT global, but owned by all instances of a hierarchy of XmlIn proxies.
-      Therefore it's safe to use unrelated XmlIn proxies in multiple threads.
-      \n\n
-      However be aware that the chain of connected proxy instances will be broken once you call XmlIn::get() to retrieve the underlying pointer.
-      Errors that occur when working with this pointer are not logged by the original set of related instances.
-    */
-    bool errorsOccured() const { return !log_->elementList().empty(); }
-
-    ///Get a list of XML element and attribute names which failed to convert to user data.
-    /**
-      \tparam String Arbitrary string class: e.g. std::string, std::wstring, wxString, MyStringClass, ...
-      \returns A list of XML element and attribute names, empty list if no errors occured.
-    */
-    template <class String>
-    std::vector<String> getErrorsAs() const
-    {
-        std::vector<String> output;
-        const auto& elements = log_->elementList();
-        std::transform(elements.begin(), elements.end(), std::back_inserter(output), [](const std::string& str) { return utfTo<String>(str); });
-        return output;
-    }
-
-private:
-    XmlIn(const std::vector<const XmlElement*>& siblingList, const std::string& elementNameFmt, const std::shared_ptr<ErrorLog>& sharedlog) :
-        refList_(siblingList), formattedName_(elementNameFmt), log_(sharedlog)
-    { assert((!siblingList.empty() && elementNameFmt.empty()) || (siblingList.empty() && !elementNameFmt.empty())); }
-
-    static std::string getNameFormatted(const XmlElement& elem) //"<Root> <Level1> <Level2>"
-    {
-        return (elem.parent() ? getNameFormatted(*elem.parent()) + " " : std::string()) + "<" + elem.getNameAs<std::string>() + ">";
-    }
-
-    std::string getNameFormatted() const
-    {
-        if (refIndex_ < refList_.size())
-        {
-            assert(formattedName_.empty());
-            return getNameFormatted(*refList_[refIndex_]);
-        }
-        else
-            return formattedName_;
-    }
-
-    std::string getChildNameFormatted(const std::string& childName) const
-    {
-        std::string parentName = getNameFormatted();
-        return (parentName.empty() ? std::string() : (parentName + " ")) + "<" + childName + ">";
-    }
-
-    class ErrorLog
-    {
-    public:
-        void notifyConversionError (const std::string& displayName)  { insert(displayName); }
-        void notifyMissingElement  (const std::string& displayName)  { insert(displayName); }
-        void notifyMissingAttribute(const std::string& displayName, const std::string& attribName) { insert(displayName + " @" + attribName); }
-
-        const std::vector<std::string>& elementList() const { return failedElements; }
-
-    private:
-        void insert(const std::string& newVal)
-        {
-            if (usedElements.insert(newVal).second)
-                failedElements.push_back(newVal);
-        }
-
-        std::vector<std::string> failedElements; //unique list of failed elements
-        std::set<std::string>    usedElements;
-    };
-
-    std::vector<const XmlElement*> refList_; //all sibling elements with same name (all pointers bound!)
-    size_t refIndex_ = 0;                    //this sibling's index in refList_
-    std::string formattedName_;     //contains full and formatted element name if (and only if) refList_ is empty
-    std::shared_ptr<ErrorLog> log_; //always bound
-};
-}
-
-#endif //BIND_H_9081740816593478258435
diff --git a/zenXml/zenxml/error.h b/zenXml/zenxml/error.h
deleted file mode 100755
index ceb36816..00000000
--- a/zenXml/zenxml/error.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// *****************************************************************************
-// * This file is part of the FreeFileSync project. It is distributed under    *
-// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
-// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
-// *****************************************************************************
-
-#ifndef ERROR_H_01873461843302148947321
-#define ERROR_H_01873461843302148947321
-
-namespace zen
-{
-///Exception base class for zen::Xml
-struct XmlError
-{
-    virtual ~XmlError() {}
-};
-}
-
-#endif //ERROR_H_01873461843302148947321
diff --git a/zenXml/zenxml/io.h b/zenXml/zenxml/io.h
deleted file mode 100755
index 6d5a21d5..00000000
--- a/zenXml/zenxml/io.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// *****************************************************************************
-// * This file is part of the FreeFileSync project. It is distributed under    *
-// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
-// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
-// *****************************************************************************
-
-#ifndef IO_H_8917640501480763248343343
-#define IO_H_8917640501480763248343343
-
-#include <cstdio>
-#include <cerrno>
-#include <zen/scope_guard.h>
-#include <zen/utf.h>
-#include "error.h"
-
-
-namespace zen
-{
-/**
-\file
-\brief Save and load byte streams from files
-*/
-
-
-
-///Exception thrown due to failed file I/O
-struct XmlFileError : public XmlError
-{
-    using ErrorCode = int;
-
-    explicit XmlFileError(ErrorCode ec) : lastError(ec) {}
-    ///Native error code: errno
-    ErrorCode lastError;
-};
-
-
-
-
-///Save byte stream to a file
-/**
-\tparam String Arbitrary string-like type: e.g. std::string, wchar_t*, char[], wchar_t, wxString, MyStringClass, ...
-\param stream Input byte stream
-\param filename Output file name
-\throw XmlFileError
-*/
-template <class String>
-void saveStream(const std::string& stream, const String& filename) //throw XmlFileError
-{
-    FILE* handle = ::fopen(utfTo<std::string>(filename).c_str(), "w");
-    if (!handle)
-        throw XmlFileError(errno);
-    ZEN_ON_SCOPE_EXIT(::fclose(handle));
-
-    const size_t bytesWritten = ::fwrite(stream.c_str(), 1, stream.size(), handle);
-    if (::ferror(handle) != 0)
-        throw XmlFileError(errno);
-
-    (void)bytesWritten;
-    assert(bytesWritten == stream.size());
-}
-
-
-///Load byte stream from a file
-/**
-\tparam String Arbitrary string-like type: e.g. std::string, wchar_t*, char[], wchar_t, wxString, MyStringClass, ...
-\param filename Input file name
-\return Output byte stream
-\throw XmlFileError
-*/
-template <class String>
-std::string loadStream(const String& filename) //throw XmlFileError
-{
-    FILE* handle = ::fopen(utfTo<std::string>(filename).c_str(), "r");
-    if (!handle)
-        throw XmlFileError(errno);
-    ZEN_ON_SCOPE_EXIT(::fclose(handle));
-
-    std::string stream;
-    const size_t blockSize = 64 * 1024;
-    do
-    {
-        stream.resize(stream.size() + blockSize); //let's pray std::string implements exponential growth!
-
-        const size_t bytesRead = ::fread(&*(stream.end() - blockSize), 1, blockSize, handle);
-        if (::ferror(handle))
-            throw XmlFileError(errno);
-        if (bytesRead > blockSize)
-            throw XmlFileError(0);
-        if (bytesRead < blockSize)
-            stream.resize(stream.size() - blockSize + bytesRead); //caveat: unsigned arithmetics
-    }
-    while (!::feof(handle));
-
-    return stream;
-}
-}
-
-#endif //IO_H_8917640501480763248343343