Move source files to /src

src/windows/rpi-imager-cli.cmd

@@ -0,0 +1,9 @@
+@echo off
+
+rem
+rem For scripting: call rpi-imager.exe and wait until it finished before continuing
+rem This is necessary because it is compiled as GUI application, and Windows
+rem normalling does not wait until those exit
+rem
+
+start /WAIT rpi-imager.exe --cli %*

src/windows/rpi-imager.manifest

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.1.0.0" processorArchitecture="X86" name="org.raspberry.imagingutility" type="win32" />
+  <description>Raspberry Pi Imager</description>
+   <dependency />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
+        </requestedPrivileges>
+       </security>
+   </trustInfo>
+</assembly>

src/windows/rpi-imager.rc

@@ -0,0 +1,22 @@
+#include <windows.h>
+
+IDI_ICON1 ICON DISCARDABLE "../icons/rpi-imager.ico"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "rpi-imager.manifest"
+
+1 VERSIONINFO
+FILEVERSION IMAGER_VERSION_CSV
+PRODUCTVERSION IMAGER_VERSION_CSV
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904b0"
+        {
+            VALUE "CompanyName",     "Raspberry Pi Ltd"
+            VALUE "FileDescription", "Raspberry Pi Imager"
+        }
+    }
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x409, 1252
+    }
+}

src/windows/winfile.cpp

@@ -0,0 +1,204 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright (C) 2020 Raspberry Pi Ltd
+ */
+
+#include "winfile.h"
+#include <QDebug>
+#include <QThread>
+
+WinFile::WinFile(QObject *parent)
+    : QObject(parent), _locked(false), _h(INVALID_HANDLE_VALUE), _lasterrorcode(0)
+{
+
+}
+
+WinFile::~WinFile()
+{
+    if (isOpen())
+        close();
+}
+
+void WinFile::setFileName(const QString &name)
+{
+    _name = name;
+}
+
+bool WinFile::open(QIODevice::OpenMode)
+{
+    QByteArray n = _name.toLatin1();
+
+    for (int attempt = 0; attempt < 20; attempt++)
+    {
+        _h = CreateFileA(n.data(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+        if (_h != INVALID_HANDLE_VALUE)
+            break;
+
+        qDebug() << "Error opening device. Retrying...";
+        QThread::msleep(100);
+    }
+
+    // Try with FILE_SHARE_WRITE
+    if (_h == INVALID_HANDLE_VALUE)
+        _h = CreateFileA(n.data(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);;
+
+    if (_h == INVALID_HANDLE_VALUE)
+    {
+        _lasterrorcode = GetLastError();
+        _lasterror = qt_error_string();
+        qDebug() << "Error opening:" << _lasterror;
+        return false;
+    }
+
+    return true;
+}
+
+void WinFile::close()
+{
+    if (!isOpen())
+        return;
+
+    if (_locked)
+    {
+        unlockVolume();
+    }
+
+    CloseHandle(_h);
+    _h = INVALID_HANDLE_VALUE;
+}
+
+bool WinFile::isOpen()
+{
+    return _h != INVALID_HANDLE_VALUE;
+}
+
+qint64 WinFile::write(const char *data, qint64 maxSize)
+{
+    DWORD bytesWritten;
+
+    if (maxSize % 512)
+        qDebug() << "write: NOT SECTOR ALIGNED";
+
+    if (!WriteFile(_h, data, maxSize, &bytesWritten, NULL))
+    {
+        _lasterrorcode = GetLastError();
+        _lasterror = qt_error_string();
+        return -1;
+    }
+
+    return bytesWritten;
+}
+
+qint64 WinFile::read(char *data, qint64 maxSize)
+{
+    DWORD bytesRead;
+
+    if (!ReadFile(_h, data, maxSize, &bytesRead, NULL))
+    {
+        _lasterrorcode = GetLastError();
+        _lasterror = qt_error_string();
+        return -1;
+    }
+
+    return bytesRead;
+}
+
+bool WinFile::seek(qint64 pos)
+{
+    LARGE_INTEGER current;
+    LARGE_INTEGER offset;
+    offset.QuadPart = pos;
+    if (!SetFilePointerEx(_h, offset, &current, FILE_BEGIN))
+    {
+        _lasterrorcode = GetLastError();
+        _lasterror = qt_error_string();
+        qDebug() << "Error seeking:" << _lasterror;
+        return false;
+    }
+
+    return true;
+}
+
+qint64 WinFile::pos()
+{
+    LARGE_INTEGER current;
+    LARGE_INTEGER offset;
+    offset.QuadPart = 0;
+    if (!SetFilePointerEx(_h, offset, &current, FILE_CURRENT))
+    {
+        _lasterrorcode = GetLastError();
+        _lasterror = qt_error_string();
+        return 0;
+    }
+
+    return qint64(current.QuadPart);
+}
+
+HANDLE WinFile::handle()
+{
+    return _h;
+}
+
+QString WinFile::errorString() const
+{
+    return _lasterror;
+}
+
+int WinFile::errorCode() const
+{
+    return _lasterrorcode;
+}
+
+bool WinFile::flush()
+{
+    if (!FlushFileBuffers(_h))
+    {
+        // Windows 7 does not support flush properly, so ignore errors
+        //_lasterror = qt_error_string();
+        //return false;
+    }
+
+    return true;
+}
+
+bool WinFile::lockVolume()
+{
+    DWORD bytesRet;
+    DeviceIoControl(_h, FSCTL_ALLOW_EXTENDED_DASD_IO, NULL, 0, NULL, 0, &bytesRet, NULL);
+    for (int attempt = 0; attempt < 20; attempt++)
+    {
+        qDebug() << "Locking volume" << _name;
+
+        if (DeviceIoControl(_h, FSCTL_LOCK_VOLUME, NULL, 0, NULL, 0, &bytesRet, NULL))
+        {
+            _locked = true;
+            qDebug() << "Locked volume";
+            return true;
+        }
+
+        qDebug() << "FSCTL_LOCK_VOLUME failed. Retrying in 0.1 sec";
+        QThread::msleep(100);
+    }
+
+    qDebug() << "Giving up locking volume";
+    return false;
+}
+
+bool WinFile::unlockVolume()
+{
+    if (!_locked)
+        return true;
+
+    DWORD bytesRet;
+    if (DeviceIoControl(_h, FSCTL_UNLOCK_VOLUME, NULL, 0, NULL, 0, &bytesRet, NULL))
+    {
+        _locked = false;
+        qDebug() << "Unlocked volume";
+        return true;
+    }
+    else
+    {
+        qDebug() << "FSCTL_UNLOCK_VOLUME failed";
+        return false;
+    }
+}

src/windows/winfile.h

@@ -0,0 +1,41 @@
+#ifndef WINFILE_H
+#define WINFILE_H
+
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright (C) 2020 Raspberry Pi Ltd
+ */
+
+#include <QObject>
+#include <QIODevice>
+#include <windows.h>
+
+class WinFile : public QObject
+{
+    Q_OBJECT
+public:
+    explicit WinFile(QObject *parent = nullptr);
+    virtual ~WinFile();
+    void setFileName(const QString &name);
+    bool open(QIODevice::OpenMode mode);
+    void close();
+    bool isOpen();
+    qint64 write(const char *data, qint64 maxSize);
+    qint64 read(char *data, qint64 maxSize);
+    HANDLE handle();
+    QString errorString() const;
+    int errorCode() const;
+    bool flush();
+    bool seek(qint64 pos);
+    qint64 pos();
+    bool lockVolume();
+    bool unlockVolume();
+
+protected:
+    bool _locked;
+    QString _name, _lasterror;
+    HANDLE _h;
+    int _lasterrorcode;
+};
+
+#endif // WINFILE_H