Cleanup: Remove unused members and fix some minors

# Conflicts:
#	src/win32/Thread.h

Author: arBmind

DesktopDuplicator.qbs

@@ -14,22 +14,54 @@ Project {
         cpp.enableRtti: false // disable runtime type information for faster build and smaller object files and executable
 
         cpp.minimumWindowsVersion: "10.0"
-        cpp.generateManifestFile: false
-        cpp.includePaths: 'src'
-        cpp.cxxFlags: ['/analyze', '/Zc:char8_t-']
-        cpp.defines: ['NOMINMAX']
         cpp.dynamicLibraries: ['d3d11', "User32", "Gdi32", "Shell32", "Ole32", "Comctl32"]
+        cpp.includePaths: ['src']
 
         Properties {
-            condition: qbs.toolchain.contains('msvc')
-            cpp.cxxFlags: outer.concat(
-                "/permissive-", "/Zc:__cplusplus", // best C++ compatibilty
+            condition: qbs.toolchainType == 'msvc'
+            cpp.generateManifestFile: false
+            cpp.defines: ['NOMINMAX']
+            cpp.cxxFlags: [
+                '/analyze', '/Zc:char8_t-',
+                '/permissive-', '/Zc:__cplusplus', // best C++ compatibilty
                 "/Zc:inline", // do not include inline code in object files
                 "/Zc:throwingNew", // avoid redundant null checks after new
                 "/diagnostics:caret", // better error postions
                 "/W4", // enable all warnings
                 "/experimental:external", "/external:anglebrackets", "/external:W0" // ignore warnings from external headers
-            )
+            ]
+        }
+        Properties {
+            condition: qbs.toolchainType == 'clang-cl'
+            cpp.generateManifestFile: false
+            cpp.defines: ['NOMINMAX']
+            cpp.cxxFlags: [
+                "/permissive-", "/Zc:__cplusplus", // best C++ compatibilty
+                "/Zc:inline", // do not include inline code in object files
+                "/diagnostics:caret", // better error postions
+                "/W4", // enable all warnings
+            ]
+        }
+        Properties {
+            condition: qbs.toolchain.contains('clang')
+            // note: would require '--target=x86_64-pc-windows-msvc19.43.34808' to work
+            // useful: to run third party clang based tools
+            cpp.defines: [
+                '_M_X64=100',
+                '_M_AMD64=100',
+                '_WIN64=1',
+                'NOMINMAX'
+            ]
+            cpp.cxxFlags: [
+                '-fms-volatile',
+                '-fms-extensions',
+                '-fms-compatibility-version=19.43.34808',
+                '-fms-compatibility',
+                // "-###" // print cc1 subcommand arguments
+            ]
+            cpp.systemIncludePaths: [
+                // note: actually needs msvc include & windows kit includes
+            ]
         }
 
         Depends { name: 'hlsl' }

qbs/modules/hlsl/hlsl.qbs

@@ -1,9 +1,12 @@
 import qbs 1.0
 import qbs.File
 import qbs.FileInfo
+import qbs.TextFile
 import qbs.WindowsUtils
 import qbs.ModUtils
 import qbs.Utilities
+import qbs.Process
+
 
 Module {
     property string hlslName: "fxc.exe"
@@ -67,14 +70,28 @@ Module {
             }
             args = args.concat(ModUtils.moduleProperty(input, 'flags', 'hlsl'));
             args.push(FileInfo.toWindowsSeparators(input.filePath));
-            var cmd = new Command(ModUtils.moduleProperty(product, "hlslPath"), args);
-            cmd.description = "compiling shader " + input.fileName;
-            cmd.inputFileName = input.fileName;
-            cmd.stdoutFilterFunction = function(output) {
+            var cmd = new JavaScriptCommand();
+            cmd.args = args;
+            cmd.outputPath = output.filePath;
+            cmd.hlslPath = ModUtils.moduleProperty(product, "hlslPath");
+            cmd.sourceCode = function() {
+                var process = new Process();
+                process.exec(hlslPath, args, true);
+                var file = new TextFile(outputPath, TextFile.ReadWrite);
+                var content = file.readAll();
+                file.truncate();
+                file.writeLine("#pragma once");
+                file.writeLine("#include <windows.h>");
+                file.write(content);
+                file.close();
+                var output = process.readStdOut();
                 var lines = output.split("\r\n").filter(function (s) {
-                    return !s.endsWith(inputFileName); });
-                return lines.join("\r\n");
+                    return !s.endsWith(inputFileName);
+                });
+                console.info(lines.join("\r\n"));
             };
+            cmd.description = "compiling shader " + input.fileName;
+            cmd.inputFileName = input.fileName;
             return cmd;
         }
     }

src/MainApplication.h

@@ -52,7 +52,6 @@ struct MainApplication final : private MainController {
 
     using PowerRequest = win32::PowerRequest<PowerRequestDisplayRequired, PowerRequestSystemRequired>;
     PowerRequest m_powerRequest;
-    bool m_hasPowerRequest{};
 };
 
 } // namespace deskdup

src/TaskbarButtons.h

@@ -37,10 +37,6 @@ struct TaskbarButtons {
     win32::TaskbarList m_taskbarList{};
 
     bool m_updatedButtons{};
-    bool m_showsMaximized{};
-    SystemStatus m_showsSystemStatus{};
-    DuplicationStatus m_showsDuplicationStatus{};
-    bool m_showsVisibleArea{};
 };
 
 } // namespace deskdup

src/WindowRenderer.cpp

@@ -333,7 +333,7 @@ void WindowRenderer::Resources::createRenderTarget() {
     if (IS_ERROR(result)) throw Error{result, "Failed to get backbuffer"};
 
     static constexpr const D3D11_RENDER_TARGET_VIEW_DESC *render_target_description = nullptr;
-    result = device()->CreateRenderTargetView(back_buffer.Get(), nullptr, &renderTarget);
+    result = device()->CreateRenderTargetView(back_buffer.Get(), render_target_description, &renderTarget);
     if (IS_ERROR(result)) throw Error{result, "Failed to create render target for backbuffer"};
 }
 

src/WindowRenderer.h

@@ -5,6 +5,7 @@
 
 #include <dxgi1_3.h>
 
+#include <bit>
 #include <optional>
 
 struct PointerBuffer;

src/main.cpp

@@ -2,6 +2,8 @@
 
 #include "win32/Process.h"
 
+#include "stable.h" // note: ensure the file is compiled
+
 auto WINAPI WinMain(_In_ HINSTANCE instanceHandle, _In_opt_ HINSTANCE, _In_ LPSTR, _In_ int /*showCommand*/) -> int {
     win32::Process::current_setDpiAwareness(win32::DpiAwareness::PerMonitorAwareV2);
     {

src/meta/callback_adapter.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <bit>
 #include <memory>
-#include <winnt.h>
+#include <windows.h>
 
 template<class Parameter = void *>
 class UniqueCallbackAdapter final {

src/stable.h

@@ -1,4 +1,3 @@
-#pragma
 
 #ifndef NOMINMAX
 #    define NOMINMAX

src/win32/DisplayMonitor.h

@@ -2,6 +2,7 @@
 #include "Geometry.h"
 
 #include <Windows.h>
+#include <bit>
 
 namespace win32 {