Updated detection of incompatible programs

Author: ccw808

Client/loader/MainFunctions.cpp

@@ -391,26 +391,30 @@ void HandleNotUsedMainMenu ( void )
     // Check if problem processes are active
     struct
     {
-        const char* szFilename;
+        std::vector<SString> matchTextList;
         const char* szProductName;
         const char* szTrouble;
     } procItems[] = {
-        {"Evolve", "Evolve", "not-used-menu-evolve"},
-        {"GbpSv.exe", "GAS Tecnologia - G-Buster Browser Defense", "not-used-menu-gbpsv"}};
+        {{"\\Evolve"}, "Evolve", "not-used-menu-evolve"},
+        {{"\\GbpSv.exe", "Diebold\\Warsaw"}, "GAS Tecnologia - G-Buster Browser Defense", "not-used-menu-gbpsv"}};
     for (uint i = 0; i < NUMELMS(procItems); i++ )
     {
         for ( auto processId : MyEnumProcesses( true ) )
         {
-            SString strFilename = GetProcessFilename( processId );
-            if ( strFilename.BeginsWithI( procItems[i].szFilename ) )
+            SString strProcessFilename = GetProcessPathFilename(processId);    
+            for (auto strMatchText : procItems[i].matchTextList)
             {
-                SString strMessage = _("Are you having problems running MTA:SA?.\n\nTry disabling the following products for GTA and MTA:");
-                strMessage += "\n\n";
-                strMessage += procItems[i].szProductName;
-                DisplayErrorMessageBox ( strMessage, _E("CL43"), procItems[i].szTrouble );
-                break;
+                if (strProcessFilename.ContainsI(strMatchText))
+                {
+                    SString strMessage = _("Are you having problems running MTA:SA?.\n\nTry disabling the following products for GTA and MTA:");
+                    strMessage += "\n\n";
+                    strMessage += procItems[i].szProductName;
+                    DisplayErrorMessageBox ( strMessage, _E("CL43"), procItems[i].szTrouble );
+                    goto done;
+                }
             }
         }
+        done:;
     }
 }
 

Client/loader/StdInc.h

@@ -15,6 +15,7 @@
 #include <Psapi.h>
 #include <time.h>
 #include <fstream>
+#include <winternl.h>
 
 #include "..\sdk\core\CLocalizationInterface.h"
 extern CLocalizationInterface* g_pLocalization;

Client/loader/Utils.cpp

@@ -349,9 +349,6 @@ WString devicePathToWin32Path ( const WString& strDevicePath )
 }
 
 
-typedef WINBASEAPI BOOL (WINAPI *LPFN_QueryFullProcessImageNameW)(__in HANDLE hProcess, __in DWORD dwFlags, __out_ecount_part(*lpdwSize, *lpdwSize) LPWSTR lpExeName, __inout PDWORD lpdwSize);
-
-
 ///////////////////////////////////////////////////////////////////////////
 //
 // GetProcessPathFilename
@@ -361,17 +358,7 @@ typedef WINBASEAPI BOOL (WINAPI *LPFN_QueryFullProcessImageNameW)(__in HANDLE hP
 ///////////////////////////////////////////////////////////////////////////
 SString GetProcessPathFilename ( DWORD processID )
 {
-    static LPFN_QueryFullProcessImageNameW fnQueryFullProcessImageNameW = NULL;
-    static bool bDoneGetProcAddress = false;
-    if ( !bDoneGetProcAddress )
-    {
-        // Find 'QueryFullProcessImageNameA'
-        bDoneGetProcAddress = true;
-        HMODULE hModule = GetModuleHandle ( "Kernel32.dll" );
-        fnQueryFullProcessImageNameW = static_cast < LPFN_QueryFullProcessImageNameW > ( static_cast < PVOID > ( GetProcAddress( hModule, "QueryFullProcessImageNameW" ) ) );
-    }
-
-    if ( fnQueryFullProcessImageNameW )
+    if ( _QueryFullProcessImageNameW )
     {
         for ( int i = 0 ; i < 2 ; i++ )
         {
@@ -380,7 +367,7 @@ SString GetProcessPathFilename ( DWORD processID )
             {
                 WCHAR szProcessName[MAX_PATH] = L"";
                 DWORD dwSize = NUMELMS(szProcessName);
-                DWORD bOk = fnQueryFullProcessImageNameW ( hProcess, 0, szProcessName, &dwSize );
+                DWORD bOk = _QueryFullProcessImageNameW ( hProcess, 0, szProcessName, &dwSize );
                 CloseHandle( hProcess );
                 if ( bOk )
                 {
@@ -433,6 +420,23 @@ SString GetProcessPathFilename ( DWORD processID )
         }
     }
 
+    if ( _NtQuerySystemInformation )
+    {
+        SYSTEM_PROCESS_IMAGE_NAME_INFORMATION info;
+        WCHAR szProcessName[MAX_PATH] = L"";
+        info.ProcessId = (HANDLE)processID;
+        info.ImageName.Length = 0;
+        info.ImageName.MaximumLength = sizeof(szProcessName);
+        info.ImageName.Buffer = szProcessName;
+
+        NTSTATUS status = _NtQuerySystemInformation(SystemProcessImageNameInformation, &info, sizeof(info), NULL);
+        if (NT_SUCCESS(status))
+        {
+            WString strProcessName = WStringX(info.ImageName.Buffer, info.ImageName.Length / 2);
+            return ToUTF8(devicePathToWin32Path(strProcessName));
+        }
+    }
+
     return "";
 }
 
@@ -1260,7 +1264,7 @@ Return Value:
 void RelaunchAsAdmin(const SString& strCmdLine, const SString& strReason)
 {
     HideSplash();
-    AddReportLog(7115, SString("Loader - Request to elevate privilages (%s)", *strReason));
+    AddReportLog(7115, SString("Loader - Request to elevate privileges (%s)", *strReason));
     MessageBoxUTF8(NULL, SString ( _("MTA:SA needs Administrator access for the following task:\n\n  '%s'\n\nPlease confirm in the next window."), *strReason), "Multi Theft Auto: San Andreas", MB_OK | MB_ICONINFORMATION | MB_TOPMOST);
     ReleaseSingleInstanceMutex();
     ShellExecuteNonBlocking("runas", PathJoin(GetMTASAPath(), MTA_EXE_NAME), strCmdLine);            

Client/loader/Utils.h

@@ -201,6 +201,14 @@ class CStuckProcessDetector
     CElapsedTime    m_StuckTimer;
 };
 
+// For NtQuerySystemInformation
+#define STATUS_INFO_LENGTH_MISMATCH	((NTSTATUS)0xC0000004L)
+#define SystemProcessImageNameInformation ((SYSTEM_INFORMATION_CLASS)88)
+typedef struct _SYSTEM_PROCESS_IMAGE_NAME_INFORMATION
+{
+    HANDLE ProcessId;
+    UNICODE_STRING ImageName;
+} SYSTEM_PROCESS_IMAGE_NAME_INFORMATION, *PSYSTEM_PROCESS_IMAGE_NAME_INFORMATION;
 
 #undef CREATE_SUSPENDED
 #define CREATE_SUSPENDED 5
@@ -242,6 +250,8 @@ class CStuckProcessDetector
     #define _InitializeProcThreadAttributeList  __InitializeProcThreadAttributeList()
     #define _DeleteProcThreadAttributeList      __DeleteProcThreadAttributeList()
     #define _UpdateProcThreadAttribute          __UpdateProcThreadAttribute()
+    #define _QueryFullProcessImageNameW         __QueryFullProcessImageNameW()
+    #define _NtQuerySystemInformation           __NtQuerySystemInformation()
 
     DEFFUNCTION( "kernel32", Virt,ualAll,ocEx )
     DEFFUNCTION( "kernel32", Virt,ualPro,tectEx )
@@ -254,5 +264,7 @@ class CStuckProcessDetector
     DEFFUNCTION( "kernel32", Initiali,zeProcT,hreadAttributeList )
     DEFFUNCTION( "kernel32", Dele,teProcT,hreadAttributeList )
     DEFFUNCTION( "kernel32", Upda,teProcT,hreadAttribute )
+    DEFFUNCTION( "kernel32", QueryFullProcessImageNam,e,W )
+    DEFFUNCTION( "ntdll", NtQuerySystemInformati,o,n )
 
 #endif