1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-26 11:29:53 +03:00

Merge PR #703: Enable debug messages and memory check with debug configuration

This commit is contained in:
Davide Beatrici 2018-09-15 20:51:31 +02:00 committed by GitHub
commit ca8b392dc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 45 additions and 1 deletions

View File

@ -783,7 +783,11 @@ UINT SWExec()
MayaquaMinimalMode(); MayaquaMinimalMode();
} }
#ifdef DEBUG
InitMayaqua(true, true, 0, NULL);
#else
InitMayaqua(false, false, 0, NULL); InitMayaqua(false, false, 0, NULL);
#endif
InitCedar(); InitCedar();
if (is_datafile_exists == false) if (is_datafile_exists == false)

View File

@ -4565,7 +4565,11 @@ void CALLBACK MsServiceDispatcher(DWORD argc, LPTSTR *argv)
//// Initialization //// Initialization
// Start of the Mayaqua // Start of the Mayaqua
#ifdef DEBUG
InitMayaqua(true, true, 0, NULL);
#else
InitMayaqua(false, false, 0, NULL); InitMayaqua(false, false, 0, NULL);
#endif
// Stop the MS-IME // Stop the MS-IME
MsDisableIme(); MsDisableIme();
@ -4740,7 +4744,11 @@ UINT MsService(char *name, SERVICE_FUNCTION *start, SERVICE_FUNCTION *stop, UINT
} }
// Start of the Mayaqua // Start of the Mayaqua
#ifdef DEBUG
InitMayaqua(true, true, 0, NULL);
#else
InitMayaqua(false, false, 0, NULL); InitMayaqua(false, false, 0, NULL);
#endif
// Stop the MS-IME // Stop the MS-IME
MsDisableIme(); MsDisableIme();

View File

@ -2753,7 +2753,11 @@ RESTART_PROCESS:
} }
else if (argc >= 3 && StrCmpi(argv[1], UNIX_SVC_ARG_START) == 0 && StrCmpi(argv[2], UNIX_SVC_ARG_FOREGROUND) == 0) else if (argc >= 3 && StrCmpi(argv[1], UNIX_SVC_ARG_START) == 0 && StrCmpi(argv[2], UNIX_SVC_ARG_FOREGROUND) == 0)
{ {
#ifdef DEBUG
InitMayaqua(true, true, argc, argv);
#else
InitMayaqua(false, false, argc, argv); InitMayaqua(false, false, argc, argv);
#endif
UnixExecService(name, start, stop); UnixExecService(name, start, stop);
FreeMayaqua(); FreeMayaqua();
} }
@ -2769,7 +2773,11 @@ void UnixServiceMain(int argc, char *argv[], char *name, SERVICE_FUNCTION *start
{ {
UINT mode = 0; UINT mode = 0;
// Start of the Mayaqua // Start of the Mayaqua
#ifdef DEBUG
InitMayaqua(true, true, argc, argv);
#else
InitMayaqua(false, false, argc, argv); InitMayaqua(false, false, argc, argv);
#endif
if (argc >= 2) if (argc >= 2)
{ {

View File

@ -136,7 +136,11 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
MayaquaMinimalMode(); MayaquaMinimalMode();
#ifdef DEBUG
InitMayaqua(true, true, argc, argv);
#else
InitMayaqua(false, false, argc, argv); InitMayaqua(false, false, argc, argv);
#endif
InitCedar(); InitCedar();
Print("hamcore.se2 Build Utility\n"); Print("hamcore.se2 Build Utility\n");

View File

@ -143,7 +143,11 @@ int main(int argc, char *argv[])
SetConsoleTitleA(CEDAR_PRODUCT_STR " VPN Command Line Utility"); SetConsoleTitleA(CEDAR_PRODUCT_STR " VPN Command Line Utility");
#endif // OS_WIN32 #endif // OS_WIN32
#ifdef DEBUG
InitMayaqua(true, true, argc, argv);
#else
InitMayaqua(false, false, argc, argv); InitMayaqua(false, false, argc, argv);
#endif
InitCedar(); InitCedar();
s = GetCommandLineUniStr(); s = GetCommandLineUniStr();

View File

@ -136,7 +136,11 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow)
{ {
InitProcessCallOnce(); InitProcessCallOnce();
#ifdef DEBUG
InitMayaqua(true, true, 0, NULL);
#else
InitMayaqua(false, false, 0, NULL); InitMayaqua(false, false, 0, NULL);
#endif
InitCedar(); InitCedar();

View File

@ -355,7 +355,11 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow)
{ {
InitProcessCallOnce(); InitProcessCallOnce();
#ifdef DEBUG
InitMayaqua(true, true, 0, NULL);
#else
InitMayaqua(false, false, 0, NULL); InitMayaqua(false, false, 0, NULL);
#endif
EnableProbe(false); EnableProbe(false);
InitCedar(); InitCedar();
SetHamMode(); SetHamMode();

View File

@ -1635,9 +1635,13 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow)
{ {
INSTANCE *instance; INSTANCE *instance;
InitProcessCallOnce(); InitProcessCallOnce();
#ifdef DEBUG
is_debug = true;
#else
is_debug = false; is_debug = false;
#endif
MayaquaMinimalMode(); MayaquaMinimalMode();
InitMayaqua(false, is_debug, 0, NULL); InitMayaqua(is_debug, is_debug, 0, NULL);
InitCedar(); InitCedar();
ViSetSkip(); ViSetSkip();
ViLoadStringTables(); ViLoadStringTables();

View File

@ -134,7 +134,11 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow)
{ {
InitProcessCallOnce(); InitProcessCallOnce();
#ifdef DEBUG
InitMayaqua(true, true, 0, NULL);
#else
InitMayaqua(false, false, 0, NULL); InitMayaqua(false, false, 0, NULL);
#endif
InitCedar(); InitCedar();
SMExec(); SMExec();
FreeCedar(); FreeCedar();