AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-12-25 09:39:52 +03:00
Code Releases Activity

Merge pull request #2033 from siddharth-narayan/nt-fix

Browse Source 
Fix "Not on NT" error message and add uihelp to vpncmd
This commit is contained in:
Ilya Shipitsin 2024-09-21 21:59:10 +02:00 committed by GitHub
commit e94240d9a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mayaqua/Microsoft.c
View File

@ -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 || if ((mode == SVC_MODE_INSTALL || mode == SVC_MODE_UNINSTALL || mode == SVC_MODE_START ||
mode == SVC_MODE_STOP || mode == SVC_MODE_SERVICE) && 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 // Tried to use the command for the NT in non-WindowsNT system
MsgBox(NULL, MB_ICONSTOP, _UU("SVC_NT_ONLY")); MsgBox(NULL, MB_ICONSTOP, _UU("SVC_NT_ONLY"));

1
src/Mayaqua/Microsoft.h
View File

@ -170,7 +170,6 @@ typedef struct MS
{ {
HINSTANCE hInst; HINSTANCE hInst;
HINSTANCE hKernel32; HINSTANCE hKernel32;
bool IsNt;
bool IsAdmin; bool IsAdmin;
HANDLE hCurrentProcess; HANDLE hCurrentProcess;
UINT CurrentProcessId; UINT CurrentProcessId;

8
src/vpncmd/vpncmd.c
View File

@ -6,7 +6,9 @@
// VPN Command Line Management Utility // VPN Command Line Management Utility
#include "Cedar/Cedar.h" #include "Cedar/Cedar.h"
#ifdef OS_WIN32
#include "Cedar/CMInner.h"
#endif
#include "Cedar/Command.h" #include "Cedar/Command.h"
#include "Mayaqua/Internat.h" #include "Mayaqua/Internat.h"
@ -39,6 +41,10 @@ int main(int argc, char *argv[])
#endif #endif
InitCedar(); InitCedar();
#ifdef OS_WIN32
CmExecUiHelperMain();
#endif
s = GetCommandLineUniStr(); s = GetCommandLineUniStr();
if (s == NULL) if (s == NULL)