MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-23 03:33:35 +00:00
Code Issues Releases Wiki Activity

1. Changed where FreeConsole() is called.

Browse Source 
2. Added Installer check of MSH for locked binaries
This commit is contained in:
Bryan Roe
2022-01-21 10:48:41 -08:00
parent e4c4d39a92
commit fe35fa4a02
1 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meshservice/ServiceMain.c
View File

@@ -905,28 +905,6 @@ int wmain(int argc, char* wargv[])
else if (skip == 0) else if (skip == 0)
{ {
// This is only supported on Windows 8 / Windows Server 2012 R2 and newer // This is only supported on Windows 8 / Windows Server 2012 R2 and newer
FreeConsole();
HMODULE shCORE = LoadLibraryExA((LPCSTR)"Shcore.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
DpiAwarenessFunc dpiAwareness = NULL;
if (shCORE != NULL)
{
if ((dpiAwareness = (DpiAwarenessFunc)GetProcAddress(shCORE, (LPCSTR)"SetProcessDpiAwareness")) == NULL)
{
FreeLibrary(shCORE);
shCORE = NULL;
}
}
if (dpiAwareness != NULL)
{
dpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE);
FreeLibrary(shCORE);
shCORE = NULL;
}
else
{
SetProcessDPIAware();
}
char selfexe[_MAX_PATH]; char selfexe[_MAX_PATH];
char *lang = NULL; char *lang = NULL;
@@ -992,19 +970,9 @@ int wmain(int argc, char* wargv[])
g_dialogTranslationObject = duk_get_heapptr(ctx, -1); g_dialogTranslationObject = duk_get_heapptr(ctx, -1);
g_dialogCtx = ctx; g_dialogCtx = ctx;
g_dialogLanguage = lang; g_dialogLanguage = lang;
FreeConsole();
GdiPlusFlat_Init(); GdiPlusFlat_Init();
HMODULE sh = LoadLibraryExA((LPCSTR)"SHcore.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
if (sh != NULL)
{
DpiAwarenessFunc func = (DpiAwarenessFunc)GetProcAddress(sh, (LPCSTR)"SetProcessDpiAwareness");
if (func != NULL)
{
func(0);
}
FreeLibrary(sh); sh = NULL;
}
DialogBoxW(NULL, MAKEINTRESOURCEW(IDD_INSTALLDIALOG), NULL, DialogHandler); DialogBoxW(NULL, MAKEINTRESOURCEW(IDD_INSTALLDIALOG), NULL, DialogHandler);
GdiPlusFlat_Release(); GdiPlusFlat_Release();
} }