resolve dniel97 comments

This commit is contained in:
Kagamine Haku 2024-10-16 15:01:39 +07:00
parent 243bb778d1
commit f39b9ce3a0
3 changed files with 24 additions and 36 deletions

View File

@ -4,27 +4,7 @@
#include "util/dprintf.h"
#include "platform/opensslpatch.h"
int ChecknPatch(void) {
char* cpuname = GetCpuName();
if (cpuname == NULL) {
dprintf("Error: Unable to detect CPU.\n");
return 1;
}
//dprintf("CPU Detected: %s\n", cpuname);
if (CheckCpu(cpuname)) {
OpenSSLPatch();
dprintf("OpenSSL Patch applied successfully.\n");
} else {
dprintf("Info: OpenSSL Patch is not required (AMD or Intel < 10th gen or older CPU detected).\n");
}
free(cpuname);
return 0;
}
char* GetCpuName() {
static char* GetCpuName() {
FILE* fp;
char buffer[128];
char* cpu_info = NULL;
@ -50,10 +30,9 @@ char* GetCpuName() {
return cpu_info;
}
int CheckCpu(char* cpuname) {
static int CheckCpu(char* cpuname) {
if (strstr(cpuname, "Core 2 Duo") || strstr(cpuname, "Core 2 Quad") ||
(strstr(cpuname, "Pentium") && !strstr(cpuname, "G")) || strstr(cpuname, "Celeron")) {
//dprintf("Trash detected. No patch needed.\n");
return 0;
}
@ -63,13 +42,13 @@ int CheckCpu(char* cpuname) {
if (part[0] == 'i' && strlen(part) >= 4) {
int gen = atoi(part + 1);
if (gen >= 10) {
dprintf("Intel Gen 10+ CPU Detected: %s\n", cpuname);
dprintf("OpenSSL Patch: Intel Gen 10+ CPU Detected: %s\n", cpuname);
return 1;
}
} else if (part[0] == 'G' && strlen(part) >= 4) {
int pentium = atoi(part + 1);
if (pentium / 1000 >= 6) {
dprintf("Intel Gen 10+ CPU Detected: %s\n", cpuname);
dprintf("OpenSSL Patch: Intel Gen 10+ CPU Detected: %s\n", cpuname);
return 1;
}
}
@ -80,22 +59,36 @@ int CheckCpu(char* cpuname) {
return 0;
}
void OpenSSLPatch(void) {
static void OpenSSLPatch(void) {
const char* variablename = "OPENSSL_ia32cap";
const char* variablevalue = "~0x20000000";
HKEY hKey;
if (RegOpenKeyExA(HKEY_CURRENT_USER, "Environment", 0, KEY_SET_VALUE, &hKey) == ERROR_SUCCESS) {
if (RegSetValueExA(hKey, variablename, 0, REG_SZ, (const BYTE*)variablevalue, strlen(variablevalue) + 1) == ERROR_SUCCESS) {
dprintf("Successfully set the user environment variable %s to %s\n", variablename, variablevalue);
dprintf("OpenSSL Patch: Applied successfully : Set the user environment variable %s to %s\n", variablename, variablevalue);
} else {
dprintf("Error: Failed to set the user environment variable.\n");
dprintf("OpenSSL Patch: Error: Failed to set the user environment variable.\n");
}
RegCloseKey(hKey);
SendMessageTimeoutA(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG, 5000, NULL);
} else {
dprintf("Error: Failed to open the user environment registry key.\n");
dprintf("OpenSSL Patch: Error: Failed to open the user environment registry key.\n");
}
}
int openssl_patch_apply(void) {
char* cpuname = GetCpuName();
if (cpuname == NULL) {
dprintf("OpenSSL Patch: Error: Unable to detect CPU.\n");
return 1;
}
if (CheckCpu(cpuname)) {
OpenSSLPatch();
}
free(cpuname);
return 0;
}

View File

@ -1,8 +1,3 @@
#pragma once
#include <windows.h>
int ChecknPatch(void);
void OpenSSLPatch(void);
char* GetCpuName(void);
int CheckCpu(char* cpuname);
int openssl_patch_apply(void);

View File

@ -29,7 +29,7 @@ HRESULT platform_hook_init(
assert(platform_id != NULL);
assert(redir_mod != NULL);
ChecknPatch();
openssl_patch_apply();
hr = amvideo_hook_init(&cfg->amvideo, redir_mod);