fix windows runner

Author: smasherprog

src/windows/ThreadRunner.cpp

@@ -1,89 +1,86 @@
-#include "ScreenCapture.h"
 #include "DXFrameProcessor.h"
 #include "GDIFrameProcessor.h"
 #include "GDIMouseProcessor.h"
 #include "GDIWindowProcessor.h"
+#include "ScreenCapture.h"
 #include "ThreadManager.h"
 
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+#include <iostream>
 #include <memory>
 #include <string>
-#include <iostream>
 
 namespace SL {
-    namespace Screen_Capture {
-
+namespace Screen_Capture {
 
-        template<class T>void ProcessExit(DUPL_RETURN Ret, T* TData) {
-            if (Ret != DUPL_RETURN_SUCCESS)
-            {
-                if (Ret == DUPL_RETURN_ERROR_EXPECTED)
-                {
-                    // The system is in a transition state so request the duplication be restarted
-                    TData->CommonData_.ExpectedErrorEvent = true;
-                }
-                else
-                {
-                    // Unexpected error so exit the application
-                    TData->CommonData_.UnexpectedErrorEvent = true;
-                }
+    template <class T> void ProcessExit(DUPL_RETURN Ret, T *TData)
+    {
+        if (Ret != DUPL_RETURN_SUCCESS) {
+            if (Ret == DUPL_RETURN_ERROR_EXPECTED) {
+                // The system is in a transition state so request the duplication be restarted
+                TData->CommonData_.ExpectedErrorEvent = true;
             }
-        }
-        template<class T>bool SwitchToInputDesktop(const std::shared_ptr<T> data) {
-            HDESK CurrentDesktop = nullptr;
-            CurrentDesktop = OpenInputDesktop(0, FALSE, GENERIC_ALL);
-            if (!CurrentDesktop)
-            {
-                // We do not have access to the desktop so request a retry
-                data->CommonData_.ExpectedErrorEvent = true;
-                ProcessExit(DUPL_RETURN::DUPL_RETURN_ERROR_EXPECTED, data.get());
-                return false;
+            else {
+                // Unexpected error so exit the application
+                TData->CommonData_.UnexpectedErrorEvent = true;
             }
+        }
+    }
+    template <class T> bool SwitchToInputDesktop(const std::shared_ptr<T> data)
+    {
+        HDESK CurrentDesktop = nullptr;
+        CurrentDesktop = OpenInputDesktop(0, FALSE, GENERIC_ALL);
+        if (!CurrentDesktop) {
+            // We do not have access to the desktop so request a retry
+            data->CommonData_.ExpectedErrorEvent = true;
+            ProcessExit(DUPL_RETURN::DUPL_RETURN_ERROR_EXPECTED, data.get());
+            return false;
+        }
 
-            // Attach desktop to this thread
-            bool DesktopAttached = SetThreadDesktop(CurrentDesktop) != 0;
-            CloseDesktop(CurrentDesktop);
-            CurrentDesktop = nullptr;
-            if (!DesktopAttached)
-            {
-                // We do not have access to the desktop so request a retry
-                data->CommonData_.ExpectedErrorEvent = true;
-                ProcessExit(DUPL_RETURN::DUPL_RETURN_ERROR_EXPECTED, data.get());
-                return false;
-            }
-            return true;
+        // Attach desktop to this thread
+        bool DesktopAttached = SetThreadDesktop(CurrentDesktop) != 0;
+        CloseDesktop(CurrentDesktop);
+        CurrentDesktop = nullptr;
+        if (!DesktopAttached) {
+            // We do not have access to the desktop so request a retry
+            data->CommonData_.ExpectedErrorEvent = true;
+            ProcessExit(DUPL_RETURN::DUPL_RETURN_ERROR_EXPECTED, data.get());
+            return false;
         }
-        void RunCaptureMouse(std::shared_ptr<Thread_Data> data) {
-            if (!SwitchToInputDesktop(data)) return;
-            TryCaptureMouse<GDIMouseProcessor>(data);
-        } 
-        void RunCaptureMonitor(std::shared_ptr<Thread_Data> data, Monitor monitor) {
-            //need to switch to the input desktop for capturing...
-            if (!SwitchToInputDesktop(data)) return;
+        return true;
+    }
+    void RunCaptureMouse(std::shared_ptr<Thread_Data> data)
+    {
+        if (!SwitchToInputDesktop(data))
+            return;
+        TryCaptureMouse<GDIMouseProcessor>(data);
+    }
+    void RunCaptureMonitor(std::shared_ptr<Thread_Data> data, Monitor monitor)
+    {
+        // need to switch to the input desktop for capturing...
+        if (!SwitchToInputDesktop(data))
+            return;
 #if defined _DEBUG || !defined NDEBUG
-            std::cout << "Starting to Capture on Monitor " << Name(monitor) << std::endl;
-            std::cout << "Trying DirectX Desktop Duplication " << std::endl;
+        std::cout << "Starting to Capture on Monitor " << Name(monitor) << std::endl;
+        std::cout << "Trying DirectX Desktop Duplication " << std::endl;
 #endif
-            if (monitor.Adapter == -1)
-            {
-                TryCaptureMonitor<GDIFrameProcessor>(data, monitor);
-            }
-            else
-            {
-                TryCaptureMonitor<DXFrameProcessor>(data, monitor);
-            }
-        }
-
-        void RunCaptureWindow(std::shared_ptr<Thread_Data> data, Window wnd) {
-            //need to switch to the input desktop for capturing...
-            if (!SwitchToInputDesktop(data)) return;
-            TryCaptureWindow<GDIFrameProcessor>(data, wnd);
+        if (!TryCaptureMonitor<DXFrameProcessor>(data, monitor)) { // if DX is not supported, fallback to GDI capture
+#if defined _DEBUG || !defined NDEBUG
+            std::cout << "DirectX Desktop Duplication not supported, falling back to GDI Capturing . . ." << std::endl;
+#endif
+            TryCaptureMonitor<GDIFrameProcessor>(data, monitor);
         }
     }
-}
-
-
 
+    void RunCaptureWindow(std::shared_ptr<Thread_Data> data, Window wnd)
+    {
+        // need to switch to the input desktop for capturing...
+        if (!SwitchToInputDesktop(data))
+            return;
+        TryCaptureWindow<GDIFrameProcessor>(data, wnd);
+    }
+} // namespace Screen_Capture
+} // namespace SL