mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2024-11-22 01:19:52 +03:00
Merge 27d233a522
into 5d1ce1a2cd
This commit is contained in:
commit
c7b5a68a68
@ -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"));
|
||||||
|
@ -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;
|
||||||
|
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user