1 files changed, 43 insertions, 31 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtfileengine.cpp b/src/plugins/platforms/winrt/qwinrtfileengine.cpp
index 3a4aa519cc..719bb18dd6 100644
--- a/src/plugins/platforms/winrt/qwinrtfileengine.cpp
+++ b/src/plugins/platforms/winrt/qwinrtfileengine.cpp
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -78,7 +70,7 @@ class QWinRTFileEnginePrivate
 {
 public:
     QWinRTFileEnginePrivate(const QString &fileName, IStorageItem *file)
-        : fileName(fileName), file(file)
+        : fileName(fileName), file(file), openMode(QIODevice::NotOpen)
     {
         HRESULT hr;
         hr = RoGetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Storage_Streams_Buffer).Get(),
@@ -109,6 +101,7 @@ public:
     int firstDot;
     ComPtr<IStorageItem> file;
     ComPtr<IRandomAccessStream> stream;
+    QIODevice::OpenMode openMode;
 
     qint64 pos;
 
@@ -148,7 +141,7 @@ QAbstractFileEngine *QWinRTFileEngineHandler::create(const QString &fileName) co
     return Q_NULLPTR;
 }
 
-static HRESULT getDestinationFolder(const QString &fileName, const QString newFileName,
+static HRESULT getDestinationFolder(const QString &fileName, const QString &newFileName,
                                     IStorageItem *file, IStorageFolder **folder)
 {
     HRESULT hr;
@@ -211,6 +204,8 @@ bool QWinRTFileEngine::open(QIODevice::OpenMode openMode)
     hr = QWinRTFunctions::await(op, d->stream.GetAddressOf());
     RETURN_AND_SET_ERROR_IF_FAILED(QFileDevice::OpenError, false);
 
+    d->openMode = openMode;
+
     return SUCCEEDED(hr);
 }
 
@@ -228,9 +223,33 @@ bool QWinRTFileEngine::close()
     hr = closable->Close();
     RETURN_AND_SET_ERROR_IF_FAILED(QFileDevice::UnspecifiedError, false);
     d->stream.Reset();
+    d->openMode = QIODevice::NotOpen;
     return SUCCEEDED(hr);
 }
 
+bool QWinRTFileEngine::flush()
+{
+    Q_D(QWinRTFileEngine);
+
+    if (!d->stream)
+        return false;
+
+    if (!(d->openMode & QIODevice::WriteOnly))
+        return true;
+
+    ComPtr<IOutputStream> stream;
+    HRESULT hr = d->stream.As(&stream);
+    RETURN_AND_SET_ERROR_IF_FAILED(QFileDevice::WriteError, false);
+    ComPtr<IAsyncOperation<bool>> flushOp;
+    hr = stream->FlushAsync(&flushOp);
+    RETURN_AND_SET_ERROR_IF_FAILED(QFileDevice::WriteError, false);
+    boolean flushed;
+    hr = QWinRTFunctions::await(flushOp, &flushed);
+    RETURN_AND_SET_ERROR_IF_FAILED(QFileDevice::WriteError, false);
+
+    return true;
+}
+
 qint64 QWinRTFileEngine::size() const
 {
     Q_D(const QWinRTFileEngine);
@@ -492,13 +511,6 @@ qint64 QWinRTFileEngine::write(const char *data, qint64 maxlen)
     hr = QWinRTFunctions::await(op, &length);
     RETURN_AND_SET_ERROR_IF_FAILED(QFileDevice::WriteError, -1);
 
-    ComPtr<IAsyncOperation<bool>> flushOp;
-    hr = stream->FlushAsync(&flushOp);
-    RETURN_AND_SET_ERROR_IF_FAILED(QFileDevice::WriteError, -1);
-    boolean flushed;
-    hr = QWinRTFunctions::await(flushOp, &flushed);
-    RETURN_AND_SET_ERROR_IF_FAILED(QFileDevice::WriteError, -1);
-
     return qint64(length);
 }