Merge remote-tracking branch 'origin/pr/413'

# Conflicts:
#	Software/src/GrabWidget.cpp
#	Software/src/LedDeviceManager.cpp
#	Software/src/LightpackApplication.cpp
#	Software/src/src.pro
#	Software/src/wizard/ConfigureUdpDevicePage.cpp
#	Software/src/wizard/MonitorConfigurationPage.cpp
#	Software/src/wizard/SelectDevicePage.cpp

Author: psieg

Software/build-config.prf

@@ -7,7 +7,7 @@ exists(build-vars.prf) {
 #------------------------------------------------------------------------------
 # Parsing configuration
 #------------------------------------------------------------------------------
-win32: {
+win32 {
     # Target architecture
     QMAKE_TARGET.arch = $$TARGET_ARCH
     _TARGET_ARCH = $$(TARGET_ARCH)

Software/build-vars.prf.default

@@ -4,7 +4,7 @@
 #------------------------------------------------------------------------------
 # General
 #------------------------------------------------------------------------------
-win32: {
+win32 {
 	# Set this to -Win32 for 32-bit
 	OPENSSL_DIR = "C:\\OpenSSL-Win64\\bin"
 	# Set this to run without openssl. The updatecheck won't work.
@@ -47,8 +47,8 @@ macx {
 	# DEFINES += SAVE_FRAME_TO_FILE
 
 	# CONFIG += debug
-	# QMAKE_CC += clang
-	# QMAKE_CXX += clang++
+	# QMAKE_CC = clang
+	# QMAKE_CXX = clang++
 	# QMAKE_CFLAGS_DEBUG += -ggdb
 	# QMAKE_CFLAGS_RELEASE += -march=native
 	# QMAKE_CXXFLAGS_DEBUG += -ggdb

Software/common/WinDXUtils.cpp

@@ -146,7 +146,7 @@ UINT GetDxgiPresentOffset(HWND hwnd) {
 
 #ifndef NO_QT
 	char buf[100];
-	sprintf(buf, "presentFuncPtr=%x", presentFuncPtr);
+	sprintf(buf, "presentFuncPtr=%llx", presentFuncPtr);
 	DEBUG_MID_LEVEL << Q_FUNC_INFO << buf;
 #endif
 
@@ -227,7 +227,7 @@ UINT GetD3D9PresentOffset(HWND hWnd){
 		uintptr_t presentFuncPtr = pvtbl[D3D9_PRESENT_FUNC_ORD];
 #ifndef NO_QT
 		char buf[100];
-		sprintf(buf, "presentFuncPtr=%x", presentFuncPtr);
+		sprintf(buf, "presentFuncPtr=%llx", presentFuncPtr);
 		DEBUG_MID_LEVEL << Q_FUNC_INFO << buf;
 #endif
 
@@ -306,7 +306,7 @@ UINT GetD3D9SCPresentOffset(HWND hWnd){
 		uintptr_t presentFuncPtr = pvtbl[D3D9_SCPRESENT_FUNC_ORD];
 #ifndef NO_QT
 		char buf[100];
-		sprintf(buf, "presentFuncPtr=%x", presentFuncPtr);
+		sprintf(buf, "presentFuncPtr=%llx", presentFuncPtr);
 		DEBUG_MID_LEVEL << Q_FUNC_INFO << buf;
 #endif
 
@@ -387,7 +387,7 @@ UINT GetD3D9ResetOffset(HWND hWnd){
 		uintptr_t resetFuncPtr = pvtbl[D3D9_RESET_FUNC_ORD];
 #ifndef NO_QT
 		char buf[100];
-		sprintf(buf, "resetFuncPtr=%x", resetFuncPtr);
+		sprintf(buf, "resetFuncPtr=%llx", resetFuncPtr);
 		DEBUG_MID_LEVEL << Q_FUNC_INFO << buf;
 #endif
 

Software/grab/D3D10Grabber.cpp

@@ -33,8 +33,8 @@
 
 #include <QObject>
 #include <QThread>
-#include <QApplication>
-#include <QDesktopWidget>
+#include <QScreen>
+#include <QGuiApplication>
 #include <QMessageBox>
 #include <cstdlib>
 #include <stdio.h>
@@ -77,7 +77,7 @@ namespace {
 
 	const unsigned kBytesPerPixel = 4;
 
-	D3D10GrabberWorker::D3D10GrabberWorker(QObject *parent, LPSECURITY_ATTRIBUTES lpsa) : 
+	D3D10GrabberWorker::D3D10GrabberWorker(QObject *parent, LPSECURITY_ATTRIBUTES lpsa) :
 		QObject(parent),
 		m_lpsa(lpsa)
 	{
@@ -171,7 +171,7 @@ namespace {
 		if (m_libraryInjector) {
 			m_libraryInjector->Release();
 			CoUninitialize();
-		}	
+		}
 	}
 
 	void D3D10GrabberInjector::infectCleanDxProcesses() {
@@ -366,19 +366,20 @@ class D3D10GrabberImpl: public QObject
 		}
 		m_worker->moveToThread(m_workerThread.data());
 		m_workerThread->start();
-		connect(m_worker.data(), SIGNAL(frameGrabbed()), this, SIGNAL(frameGrabbed()), Qt::QueuedConnection);
+		connect(m_worker.data(), &D3D10GrabberWorker::frameGrabbed, this, &D3D10GrabberImpl::frameGrabbed, Qt::QueuedConnection);
 		QMetaObject::invokeMethod(m_worker.data(), "runLoop", Qt::QueuedConnection);
 
+		using namespace std::chrono_literals;
 		m_processesScanAndInfectTimer.reset(new QTimer(this));
-		m_processesScanAndInfectTimer->setInterval(5000);
+		m_processesScanAndInfectTimer->setInterval(5s);
 		m_processesScanAndInfectTimer->setSingleShot(false);
-		connect(m_processesScanAndInfectTimer.data(), SIGNAL(timeout()), m_injector.data(), SLOT(infectCleanDxProcesses()));
+		connect(m_processesScanAndInfectTimer.data(), &QTimer::timeout, m_injector.data(), &D3D10GrabberInjector::infectCleanDxProcesses);
 		m_processesScanAndInfectTimer->start();
 
-		m_checkIfFrameGrabbedTimer.reset(new QTimer());
+		m_checkIfFrameGrabbedTimer.reset(new QTimer(this));
 		m_checkIfFrameGrabbedTimer->setSingleShot(false);
-		m_checkIfFrameGrabbedTimer->setInterval(1000);
-		connect(m_checkIfFrameGrabbedTimer.data(), SIGNAL(timeout()), SLOT(handleIfFrameGrabbed()));
+		m_checkIfFrameGrabbedTimer->setInterval(1s);
+		connect(m_checkIfFrameGrabbedTimer.data(), &QTimer::timeout, this, &D3D10GrabberImpl::handleIfFrameGrabbed);
 		m_checkIfFrameGrabbedTimer->start();
 		m_isInited = true;
 		return m_isInited;
@@ -610,7 +611,7 @@ private slots:
 		m_injectorThread->wait();
 
 
-		disconnect(this, SLOT(handleIfFrameGrabbed()));
+		disconnect(this, &D3D10GrabberImpl::handleIfFrameGrabbed, nullptr, nullptr);
 		freeIPC();
 		CoUninitialize();
 		m_isInited = false;
@@ -648,18 +649,18 @@ D3D10Grabber::D3D10Grabber(QObject *parent, GrabberContext *context, GetHwndCall
 
 void D3D10Grabber::init() {
 	m_impl->init();
-	connect(m_impl.data(), SIGNAL(frameGrabbed()), this, SLOT(grab()));
+	connect(m_impl.data(), &D3D10GrabberImpl::frameGrabbed, this, &D3D10Grabber::grab);
 	_screensWithWidgets.clear();
 	GrabbedScreen grabbedScreen;
-	grabbedScreen.screenInfo.handle = reinterpret_cast<void *>(QApplication::desktop()->primaryScreen());
-	grabbedScreen.screenInfo.rect = QApplication::desktop()->screenGeometry(QApplication::desktop()->primaryScreen());
+	grabbedScreen.screenInfo.handle = QGuiApplication::primaryScreen();// unused?
+	grabbedScreen.screenInfo.rect = QGuiApplication::primaryScreen()->geometry();
 	_screensWithWidgets.append(grabbedScreen);
 
 	if (!WinUtils::IsUserAdmin()) {
 		qWarning() << Q_FUNC_INFO << "DX hooking is enabled but application not running elevated";
 		// Do not show the message box during initialization (creating a unwanted message loop)
 		// Show as soon as the message loop is established
-		QTimer::singleShot(0, this, SLOT(showAdminMessage()));
+		QTimer::singleShot(0, this, &D3D10Grabber::showAdminMessage);
 	}
 }
 

Software/grab/DDuplGrabber.cpp

@@ -618,7 +618,7 @@ GrabResult DDuplGrabber::grabScreens()
 				// in theory, DXGI_ERROR_INVALID_CALL is returned if the frame was not released
 				// it also happens in conjunction with secure desktop (even though the frame was properly released)
 				m_state = LostAccess;
-				DEBUG_LOW_LEVEL << Q_FUNC_INFO << "Lost Access to desktop" << screen.screenInfo.handle << ":" << (void*)(0xffffffff & hr) << ", requesting realloc";
+				DEBUG_LOW_LEVEL << Q_FUNC_INFO << "Lost Access to desktop" << screen.screenInfo.handle << ":" << IntToPtr(0xffffffff & hr) << ", requesting realloc";
 				return GrabResultFrameNotReady;
 			}
 			else if (FAILED(hr))

Software/grab/GrabberBase.cpp

@@ -60,7 +60,7 @@ GrabberBase::GrabberBase(QObject *parent, GrabberContext *grabberContext) : QObj
 		m_timer->stop();
 	m_timer.reset(new QTimer(this));
 	m_timer->setTimerType(Qt::PreciseTimer);
-	connect(m_timer.data(), SIGNAL(timeout()), this, SLOT(grab()));
+	connect(m_timer.data(), &QTimer::timeout, this, &GrabberBase::grab);
 }
 
 void GrabberBase::setGrabInterval(int msec)

Software/grab/grab.pro

@@ -9,7 +9,7 @@ QT       += widgets
 DESTDIR = ../lib
 TARGET = grab
 TEMPLATE = lib
-CONFIG += staticlib
+CONFIG += staticlib c++17
 
 include(../build-config.prf)
 
@@ -27,7 +27,6 @@ QMAKE_CFLAGS = $$(CFLAGS)
 QMAKE_CXXFLAGS = $$(CXXFLAGS)
 QMAKE_LFLAGS = $$(LDFLAGS)
 
-QMAKE_CXXFLAGS += -std=c++17
 CONFIG(clang) {
     QMAKE_CXXFLAGS += -stdlib=libc++
     LIBS += -stdlib=libc++
@@ -44,7 +43,7 @@ unix:!macx {
 
 # Mac platform
 macx {
-    contains(DEFINES, MAC_OS_CG_GRAB_SUPPORT) || contains(DEFINES, MAC_OS_AV_GRAB_SUPPORT) {
+    contains(DEFINES, MAC_OS_CG_GRAB_SUPPORT) | contains(DEFINES, MAC_OS_AV_GRAB_SUPPORT) {
         GRABBERS_HEADERS += include/MacOSGrabberBase.hpp
         GRABBERS_SOURCES += MacOSGrabberBase.mm
     }

Software/grab/include/BlueLightReduction.hpp

@@ -1,16 +1,17 @@
 #pragma once
 #include <QList>
 #include <QRgb>
-#include <cassert>
 
 namespace BlueLightReduction
 {
 	class Client
 	{
+		Q_DISABLE_COPY(Client)
 	public:
-		static bool isSupported() { assert(("BlueLightReduction::isSupported() is not implemented", false)); return false; }
+		static bool isSupported() { Q_ASSERT_X(false, "BlueLightReduction::isSupported()", "not implemented"); return false; }
 		virtual void apply(QList<QRgb>& colors, const double gamma = 1.2) = 0;
 		virtual ~Client() = default;
+		Client() = default;
 	};
 
 	Client* create();

Software/grab/include/GrabberBase.hpp

@@ -91,22 +91,21 @@ class GrabberBase : public QObject
 
 	virtual const char * name() const = 0;
 
-public slots:
 	virtual void startGrabbing();
 	virtual void stopGrabbing();
 	virtual bool isGrabbingStarted() const;
-	virtual void setGrabInterval(int msec);
+public slots:
 
+	virtual void setGrabInterval(int msec);
 	virtual void grab();
 
-protected slots:
+protected:
 	/*!
 		Grabs screens and saves them to \a GrabberBase#_screensWithWidgets field. Called by
 		\a GrabberBase#grab() slot. Needs to be implemented in derived classes.
 		\return GrabResult
 	*/
 	virtual GrabResult grabScreens() = 0;
-
 	/*!
 		* Frees unnecessary resources and allocates needed ones based on \a ScreenInfo
 		* \param grabScreens
@@ -121,10 +120,7 @@ protected slots:
 		* \return
 		*/
 	virtual QList< ScreenInfo > * screensWithWidgets(QList< ScreenInfo > * result, const QList<GrabWidget *> &grabWidgets) = 0;
-
 	virtual bool isReallocationNeeded(const QList< ScreenInfo > &grabScreens) const;
-
-protected:
 	const GrabbedScreen * screenOfRect(const QRect &rect) const;
 
 signals:

Software/grab/include/GrabberContext.hpp

@@ -79,7 +79,7 @@ class GrabberContext {
 	}
 
 	void releaseAllBufs() {
-		for (QList<AllocatedBuf*>::const_iterator iter = _allocatedBufs.cbegin(); iter != _allocatedBufs.end(); ++iter) {
+		for (QList<AllocatedBuf*>::const_iterator iter = _allocatedBufs.cbegin(); iter != _allocatedBufs.cend(); ++iter) {
 			(*iter)->isAvail = true;
 		}
 	}