From 3a25c6bf736a800718698062a5f4a3644727de82 Mon Sep 17 00:00:00 2001 From: Siddharth Date: Wed, 17 Jul 2024 15:16:11 -0700 Subject: [PATCH 1/2] Fix incorrect "Not on NT" error messages --- src/Mayaqua/Microsoft.c | 2 +- src/Mayaqua/Microsoft.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Mayaqua/Microsoft.c b/src/Mayaqua/Microsoft.c index 4579b301..8978e80e 100644 --- a/src/Mayaqua/Microsoft.c +++ b/src/Mayaqua/Microsoft.c @@ -4259,7 +4259,7 @@ UINT MsService(char *name, SERVICE_FUNCTION *start, SERVICE_FUNCTION *stop, UINT if ((mode == SVC_MODE_INSTALL || mode == SVC_MODE_UNINSTALL || mode == SVC_MODE_START || mode == SVC_MODE_STOP || mode == SVC_MODE_SERVICE) && - (ms->IsNt == false)) + (IsNt() == false)) { // Tried to use the command for the NT in non-WindowsNT system MsgBox(NULL, MB_ICONSTOP, _UU("SVC_NT_ONLY")); diff --git a/src/Mayaqua/Microsoft.h b/src/Mayaqua/Microsoft.h index 0044bbda..69ca7715 100644 --- a/src/Mayaqua/Microsoft.h +++ b/src/Mayaqua/Microsoft.h @@ -170,7 +170,6 @@ typedef struct MS { HINSTANCE hInst; HINSTANCE hKernel32; - bool IsNt; bool IsAdmin; HANDLE hCurrentProcess; UINT CurrentProcessId; From 128fefc63eab02cf41dae473574dde3e4d6df0cf Mon Sep 17 00:00:00 2001 From: Siddharth Date: Thu, 15 Aug 2024 04:26:15 -0400 Subject: [PATCH 2/2] Add UI helper to vpncmd on Windows --- src/vpncmd/vpncmd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/vpncmd/vpncmd.c b/src/vpncmd/vpncmd.c index 78c28aa4..9f29b5a7 100644 --- a/src/vpncmd/vpncmd.c +++ b/src/vpncmd/vpncmd.c @@ -6,7 +6,9 @@ // VPN Command Line Management Utility #include "Cedar/Cedar.h" - +#ifdef OS_WIN32 +#include "Cedar/CMInner.h" +#endif #include "Cedar/Command.h" #include "Mayaqua/Internat.h" @@ -39,6 +41,10 @@ int main(int argc, char *argv[]) #endif InitCedar(); +#ifdef OS_WIN32 + CmExecUiHelperMain(); +#endif + s = GetCommandLineUniStr(); if (s == NULL)