Merge pull request #19 from psieg/fix/dxscan_thread

Move D3D10Grabber to dedicated thread

Author: psieg

Software/grab/D3D10Grabber.cpp

@@ -262,6 +262,10 @@ class D3D10GrabberImpl: public QObject
 
 #endif
 
+        m_thread.reset(new QThread());
+        m_thread->start();
+        this->moveToThread(m_thread.data());
+
         m_processesScanAndInfectTimer.reset(new QTimer(this));
         m_processesScanAndInfectTimer->setInterval(5000);
         m_processesScanAndInfectTimer->setSingleShot(false);
@@ -593,6 +597,11 @@ private slots:
         disconnect(m_worker.data());
         m_worker->stop = true;
 
+        m_thread->quit();
+        m_workerThread->quit();
+        m_thread->wait();
+        m_workerThread->wait();
+
         sanitizeProcesses();
 
         disconnect(this, SLOT(handleIfFrameGrabbed()));
@@ -623,6 +632,7 @@ private slots:
     QScopedPointer<QTimer> m_checkIfFrameGrabbedTimer;
     QScopedPointer<D3D10GrabberWorker> m_worker;
     QScopedPointer<QThread> m_workerThread;
+    QScopedPointer<QThread> m_thread;
     HOOKSGRABBER_SHARED_MEM_DESC m_memDesc;
     D3D10Grabber &m_owner;
     bool m_injectD3D9;

Software/grab/WinUtils.cpp

@@ -42,7 +42,16 @@ const WCHAR lightpackUnhookDllName[] = L"prismatik-unhook.dll";
 const WCHAR lightpackHooksDllName32[] = L"prismatik-hooks32.dll";
 const WCHAR lightpackOffsetFinderName[] = L"offsetfinder.exe";
 #endif
-static LPCWSTR pwstrExcludeProcesses[] = { L"skype.exe", L"chrome.exe", L"firefox.exe", L"iexplore.exe", L"qtcreator.exe", L"devenv.exe", L"thunderbird.exe" };
+static LPCWSTR pwstrExcludeProcesses[] = {
+    // Windows
+    L"dwm.exe", L"ShellExperienceHost.exe", L"ApplicationFrameHost.exe", L"LockAppHost.exe", L"explorer.exe", L"SearchUI.exe"
+    // Graphics Drivers
+    L"igfxEM.exe", L"igfxTray.exe", L"nvxdsync.exe", L"nvvsvc.exe",
+    // Browsers
+    L"chrome.exe", L"firefox.exe", L"iexplore.exe",
+    // Apps
+    L"skype.exe", L"SkypeHost.exe", L"qtcreator.exe", L"devenv.exe", L"thunderbird.exe", L"Steam.exe"
+};
 static LPCWSTR pwstrDxModules[] = { L"d3d9.dll", L"dxgi.dll" };
 static LPCWSTR pwstrDxgiModules[] = { L"dxgi.dll" };
 static LPCWSTR pwstrHookModules[] = { L"prismatik-hooks.dll", L"prismatik-hooks32.dll" };
@@ -133,10 +142,13 @@ QList<DWORD> * getProcessesIDs(QList<DWORD> * processes, LPCWSTR withModule[], U
     HMODULE hMods[1024];
     DWORD cbNeeded;
     DWORD cProcesses;
-    char debug_buf[255];
+    char debug_buf_process[255];
+    char debug_buf_module[255];
     WCHAR executableName[MAX_PATH];
     unsigned int i;
 
+    DEBUG_MID_LEVEL << Q_FUNC_INFO << "scanning";
+
     //     Get the list of process identifiers.
     processes->clear();
 
@@ -167,12 +179,12 @@ QList<DWORD> * getProcessesIDs(QList<DWORD> * processes, LPCWSTR withModule[], U
 
             PathStripPathW(executableName);
 
-            ::WideCharToMultiByte(CP_ACP, 0, executableName, -1, debug_buf, 255, NULL, NULL);
-            DEBUG_MID_LEVEL << Q_FUNC_INFO << debug_buf;
+            ::WideCharToMultiByte(CP_ACP, 0, executableName, -1, debug_buf_process, 255, NULL, NULL);
+            DEBUG_HIGH_LEVEL << Q_FUNC_INFO << "evaluating process" << debug_buf_process;
 
             for (unsigned k = 0; k < SIZEOF_ARRAY(pwstrExcludeProcesses); k++) {
                 if (wcsicmp(executableName, pwstrExcludeProcesses[k]) == 0) {
-                    DEBUG_MID_LEVEL << Q_FUNC_INFO << "skipping " << pwstrExcludeProcesses[k];
+                    DEBUG_HIGH_LEVEL << Q_FUNC_INFO << "skipping" << debug_buf_process;
                     goto nextProcess;
                 }
             }
@@ -194,8 +206,8 @@ QList<DWORD> * getProcessesIDs(QList<DWORD> * processes, LPCWSTR withModule[], U
                     {
 
                         PathStripPathW(szModName);
-                        ::WideCharToMultiByte(CP_ACP, 0, szModName, -1, debug_buf, 255, NULL, NULL);
-                        DEBUG_HIGH_LEVEL << Q_FUNC_INFO << debug_buf;
+                        ::WideCharToMultiByte(CP_ACP, 0, szModName, -1, debug_buf_module, 255, NULL, NULL);
+                        //DEBUG_HIGH_LEVEL << Q_FUNC_INFO << debug_buf_process << "has module" << debug_buf_module;
 
                         for (unsigned k = 0; k < withoutModuleCount; k++) {
                             if (wcsicmp(szModName, withoutModule[k]) == 0) {
@@ -220,11 +232,19 @@ QList<DWORD> * getProcessesIDs(QList<DWORD> * processes, LPCWSTR withModule[], U
                             RECT rcWindow;
                             GetWindowRect(wnd, &rcWindow);
                             if ((w == (rcWindow.right - rcWindow.left)) &&
-                                (h == (rcWindow.bottom - rcWindow.top)))
-                                processes->append(aProcesses[i]);
+                                (h == (rcWindow.bottom - rcWindow.top))) {
 
+                                DEBUG_MID_LEVEL << Q_FUNC_INFO << debug_buf_process << "has required module and fullscreen window";
+                                processes->append(aProcesses[i]);
+                            } else {
+                                DEBUG_MID_LEVEL << Q_FUNC_INFO << debug_buf_process << "has required module and non-fullscreen window";
+                            }
+                        } else {
+                            DEBUG_MID_LEVEL << Q_FUNC_INFO << debug_buf_process << "has required module and no window";
                         }
-                    } else {
+                    }
+                    else {
+                        DEBUG_MID_LEVEL << Q_FUNC_INFO << debug_buf_process << "has required module";
                         processes->append(aProcesses[i]);
                     }
 
@@ -241,11 +261,11 @@ QList<DWORD> * getProcessesIDs(QList<DWORD> * processes, LPCWSTR withModule[], U
 }
 
 QList<DWORD> * getDxProcessesIDs(QList<DWORD> * processes, LPCWSTR wstrSystemRootPath) {
-	return getProcessesIDs(processes, pwstrDxModules, SIZEOF_ARRAY(pwstrDxModules), pwstrHookModules, SIZEOF_ARRAY(pwstrHookModules), wstrSystemRootPath, true);
+    return getProcessesIDs(processes, pwstrDxModules, SIZEOF_ARRAY(pwstrDxModules), pwstrHookModules, SIZEOF_ARRAY(pwstrHookModules), wstrSystemRootPath, true);
 }
 
 QList<DWORD> * getDxgiProcessesIDs(QList<DWORD> * processes, LPCWSTR wstrSystemRootPath) {
-	return getProcessesIDs(processes, pwstrDxgiModules, SIZEOF_ARRAY(pwstrDxgiModules), pwstrHookModules, SIZEOF_ARRAY(pwstrHookModules), wstrSystemRootPath, true);
+    return getProcessesIDs(processes, pwstrDxgiModules, SIZEOF_ARRAY(pwstrDxgiModules), pwstrHookModules, SIZEOF_ARRAY(pwstrHookModules), wstrSystemRootPath, true);
 }
 
 QList<DWORD> * getHookedProcessesIDs(QList<DWORD> * processes, LPCWSTR wstrSystemRootPath) {

Software/src/ApiServer.cpp

@@ -182,6 +182,11 @@ ApiServer::ApiServer(quint16 port, QObject *parent)
     }
 }
 
+ApiServer::~ApiServer() {
+    m_apiSetColorTaskThread->quit();
+    m_apiSetColorTaskThread->wait();
+}
+
 void ApiServer::setInterface(LightpackPluginInterface *lightpackInterface)
 {
     QString test = lightpack->Version();

Software/src/ApiServer.hpp

@@ -56,6 +56,7 @@ class ApiServer : public QTcpServer
 public:
     ApiServer(QObject *parent = 0);
     ApiServer(quint16 port, QObject *parent = 0);
+    ~ApiServer();
 
     void setInterface(LightpackPluginInterface *lightpackInterface);
     void firstStart();

Software/src/LedDeviceManager.cpp

@@ -59,7 +59,9 @@ LedDeviceManager::LedDeviceManager(QObject *parent)
 
 LedDeviceManager::~LedDeviceManager()
 {
-    m_ledDeviceThread->deleteLater();
+    m_ledDeviceThread->quit();
+    m_ledDeviceThread->wait();
+
     for (int i = 0; i < m_ledDevices.size(); i++) {
         if(m_ledDevices[i])
             m_ledDevices[i]->close();

Software/src/LightpackApplication.cpp

@@ -65,9 +65,10 @@ LightpackApplication::~LightpackApplication()
 
     m_EventFilters.clear();
 
-    m_ledDeviceManagerThread->exit(0);
-    m_apiServerThread->exit(0);
-
+    m_ledDeviceManagerThread->quit();
+    m_apiServerThread->quit();
+    m_ledDeviceManagerThread->wait();
+    m_apiServerThread->wait();
 
     delete m_settingsWindow;
     m_settingsWindow = NULL;
@@ -632,10 +633,6 @@ void LightpackApplication::startPluginManager()
     m_pluginManager->LoadPlugins(QString(Settings::getApplicationDirPath() + "Plugins"));
     m_pluginManager->StartPlugins();
 
-    //m_PluginThread = new QThread();
-    //m_pluginManager->moveToThread(m_PluginThread);
-    //m_PluginThread->start();
-
 }
 
 

Software/src/LightpackApplication.hpp

@@ -113,7 +113,6 @@ private slots:
 
     PluginsManager *m_pluginManager;
     LightpackPluginInterface *m_pluginInterface;
-    QThread* m_PluginThread;
     QWidget *consolePlugin;
 
     QString m_applicationDirPath;