Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fixed all Codeanalysis warnings

Browse Source
This commit is contained in:
/dev/sdb 2016-01-03 19:29:22 +01:00
parent 1e1a415125
commit 94730e7ff2
2 changed files with 119 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
src/Components/Modules/ConnectProtocol.cpp
View File

@ -3,7 +3,7 @@
namespace Components
{
#define MAX_PROCESSES 1024
#define MAX_PROCESSES 1024
int evaluated = 0;
//Declarations SendMessage stuff
@ -16,29 +16,50 @@ namespace Components
LPCTSTR sk = TEXT("SOFTWARE\\Classes\\iw4x\\shell\\open\\command");
LPCTSTR data = "URL:iw4x Protocol";
LPCTSTR value = TEXT("URL Protocol");
HMODULE hModule = GetModuleHandle(NULL);
char ownPth[MAX_PATH];
char workdir[MAX_PATH];
char regred[MAX_PATH];
char ownPth[MAX_PATH] = {0};
char workdir[MAX_PATH] = {0};
char regred[MAX_PATH] = {0};
DWORD dwsize = MAX_PATH;
HMODULE hModule = GetModuleHandle(NULL);
if (hModule != NULL)
{
GetModuleFileName(hModule, ownPth, (sizeof(ownPth)));
GetModuleFileName(hModule, workdir, (sizeof(workdir)));
//////DBG(("EXE Path: %s", ownPth));
}
else
if (GetModuleFileName(hModule, ownPth, MAX_PATH) == ERROR)
{
//////DBG("Cant get executable path");
OutputDebugString("ownPth = Error");
return false;
}
if (GetModuleFileName(hModule, workdir, MAX_PATH) == ERROR)
{
OutputDebugString("workdir = Error");
return false;
}
else
{
char* endPtr = strstr(workdir, "iw4x.exe");
if (endPtr != NULL)
{
*endPtr = 0;
}
else
{
////DBG(("EXE Path: %s", ownPth));
////DBG(("EXE Path2: %s", workdir));
return false;
}
}
//OutputDebugString(Utils::VA("EXE Path: %s", ownPth));
}
else
{
//OutputDebugString(Utils::VA("Cant get executable path"));
return false;
}
/*OutputDebugString(Utils::VA("EXE Path: %s", ownPth));
OutputDebugString(Utils::VA("EXE Path2: %s", workdir));*/
SetCurrentDirectory(workdir);
@ -50,7 +71,16 @@ namespace Components
if (openRes == ERROR_SUCCESS)
{
char* endPt = strstr(regred, "\" \"%1\"");
if (endPt != NULL)
{
*endPt = 0;
}
else
{
OutputDebugString("endPt = Null");
return false;
}
char* regredPtr = regred;
regredPtr++;
@ -62,16 +92,25 @@ namespace Components
if (strcmp(regredPtr, ownPth))
{
////DBG("Protocol changed, reinstall");
//sk = TEXT("SOFTWARE\\Classes\\iw4x");
//openRes = RegOpenKeyEx(HKEY_CURRENT_USER, sk, 0, KEY_ALL_ACCESS, &hKey);
//if (openRes == ERROR_SUCCESS)
//{
// ////DBG("Protocol is corrupted, reinstall");
// RegDeleteKey(hKey, 0);
// RegCloseKey(hKey);
//}
sk = TEXT("SOFTWARE\\Classes\\iw4x");
openRes = RegOpenKeyEx(HKEY_CURRENT_USER, sk, 0, KEY_ALL_ACCESS, &hKey);
if (openRes == ERROR_SUCCESS)
openRes = RegDeleteKey(HKEY_CURRENT_USER, sk);
if (openRes != ERROR_SUCCESS)
{
////DBG("Protocol is corrupted, reinstall");
RegDeleteKey(hKey, 0);
RegCloseKey(hKey);
//RegCloseKey(hKey);
}
}
else{
////DBG("Protocol is already installed");
@ -79,30 +118,41 @@ namespace Components
}
}
else{
openRes = RegOpenKeyEx(HKEY_CURRENT_USER, sk, 0, KEY_ALL_ACCESS, &hKey);
if (openRes == ERROR_SUCCESS)
//openRes = RegOpenKeyEx(HKEY_CURRENT_USER, sk, 0, KEY_ALL_ACCESS, &hKey);
//if (openRes == ERROR_SUCCESS)
//{
// ////DBG("Protocol is corrupted, reinstall");
// RegDeleteKey(hKey, 0);
// RegCloseKey(hKey);
//}
sk = TEXT("SOFTWARE\\Classes\\iw4x");
openRes = RegDeleteKey(HKEY_CURRENT_USER, sk);
if (openRes != ERROR_SUCCESS)
{
////DBG("Protocol is corrupted, reinstall");
RegDeleteKey(hKey, 0);
RegCloseKey(hKey);
//RegCloseKey(hKey);
}
}
/*////DBG("Protocol is already installed");
return true;*/
//////DBG("Protocol is already installed");
//return true;
}
else
{
sk = TEXT("SOFTWARE\\Classes\\iw4x");
openRes = RegOpenKeyEx(HKEY_CURRENT_USER, sk, 0, KEY_ALL_ACCESS, &hKey);
if (openRes == ERROR_SUCCESS)
openRes = RegDeleteKey(HKEY_CURRENT_USER, sk);
if (openRes != ERROR_SUCCESS)
{
////DBG("Protocol is corrupted, reinstall");
RegDeleteKey(hKey, 0);
RegCloseKey(hKey);
//return false;
//RegCloseKey(hKey);
}
}
@ -176,14 +226,14 @@ namespace Components
else
{
////DBG("Error creating Key shell\\open\\command");
RegCloseKey(hKey);
//RegCloseKey(hKey);
return false;
}
}
else
{
////DBG("Error opening SOFTWARE\\Classes\\iw3mp");
RegCloseKey(hKey);
//RegCloseKey(hKey);
return false;
}
}
@ -204,7 +254,7 @@ namespace Components
else
{
////DBG("Error creating subkey DefaultIcon");
RegCloseKey(hKey);
//RegCloseKey(hKey);
return false;
}
}
@ -225,7 +275,7 @@ namespace Components
else
{
////DBG("Error creating key SOFTWARE\\Classes\\iw3mp");
RegCloseKey(hKey);
//RegCloseKey(hKey);
return false;
}
}
@ -242,22 +292,37 @@ namespace Components
{
if (evaluated) return;
evaluated = 1;
char* args = GetCommandLineA();
OutputDebugString("Evaluated = 1");
char* args = GetCommandLine();
OutputDebugString("GetCommandLine");
char* substr = strstr(args, "iw4x://");
if (!substr || substr == args)
{
OutputDebugString("substr==args");
OutputDebugString(substr);
OutputDebugString("substr==args");
OutputDebugString(args);
return;
}
substr += 8;
substr += 7;
char* substr2 = strstr(substr, "/");
if (substr2 != NULL)
{
*substr2 = 0;
////DBG(("Connecting to: %s", substr));
}
else
{
OutputDebugString("substr2 = NULL");
return;
}
Command::Execute(Utils::VA("connect %s;", substr), false);
////DBG(("Connecting to: %s", substr));
OutputDebugString(Utils::VA("connect %s", substr));
Command::Execute(Utils::VA("connect %s;", substr), true);
}
BOOL ConnectProtocol::InvokeConnect()
@ -282,7 +347,15 @@ namespace Components
substr += 7;
char* substr2 = strstr(substr, "/");
if (substr2 != NULL)
{
*substr2 = 0;
}
else
{
return false;
}
if (proc_id != 0)
{
@ -320,7 +393,9 @@ namespace Components
ConnectProtocol::ConnectProtocol()
{
OutputDebugString("Installing Protocol");
ConnectProtocol::InstallProtocol();
ConnectProtocol::EvaluateProtocol();
}

2
src/Components/Modules/ConnectProtocol.hpp
View File

@ -6,7 +6,7 @@ namespace Components
ConnectProtocol();
const char* GetName() { return "ConnectProtocol"; };
void EvaluateProtocol();
static void EvaluateProtocol();
static BOOL InvokeConnect();
private: