瀏覽代碼

Updating application log API

Source commit: db63e8caa3f6f03f264a68e814b10a7299d66072
Martin Prikryl 3 年之前
父節點
當前提交
f04212e89e
共有 3 個文件被更改,包括 13 次插入11 次删除
  1. 9 9
      source/WinSCP.cpp
  2. 1 1
      source/core/CoreMain.cpp
  3. 3 1
      source/core/CoreMain.h

+ 9 - 9
source/WinSCP.cpp

@@ -17,14 +17,14 @@ USEFORM("forms\ScpExplorer.cpp", ScpExplorerForm);
 //---------------------------------------------------------------------------
 WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
 {
-  AppLog = new TApplicationLog();
+  ApplicationLog = new TApplicationLog();
   TProgramParams * Params = TProgramParams::Instance();
   UnicodeString AppLogPath;
   if (Params->FindSwitch(L"applog", AppLogPath))
   {
-    AppLog->Enable(AppLogPath);
+    ApplicationLog->Enable(AppLogPath);
   }
-  AppLog->Log(L"Starting...");
+  AppLog(L"Starting...");
 
   AddStartupSequence(L"M");
   DllHijackingProtection();
@@ -39,7 +39,7 @@ WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
     SetEnvironmentVariable(L"WINSCP_PATH",
       ExcludeTrailingBackslash(ExtractFilePath(Application->ExeName)).c_str());
     CoreInitialize();
-    AppLog->AddStartupInfo(); // Needs Configuration
+    ApplicationLog->AddStartupInfo(); // Needs Configuration
     InitializeWinHelp();
     InitializeSystemSettings();
     AddStartupSequence(L"S");
@@ -52,9 +52,9 @@ WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
         SetupInitialize();
 
         Application->Title = AppName;
-        AppLog->Log(L"Executing...");
+        AppLog(L"Executing...");
         Result = Execute();
-        AppLog->Log(L"Execution done");
+        AppLog(L"Execution done");
       }
       catch (Exception & E)
       {
@@ -68,14 +68,14 @@ WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
     }
     __finally
     {
-      AppLog->Log(L"Finalizing");
+      AppLog(L"Finalizing");
       GUIFinalize();
       FinalizeSystemSettings();
       FinalizeWinHelp();
       CoreFinalize();
       WinFinalize();
-      AppLog->Log(L"Finalizing done");
-      SAFE_DESTROY_EX(TApplicationLog, AppLog);
+      AppLog(L"Finalizing done");
+      SAFE_DESTROY_EX(TApplicationLog, ApplicationLog);
     }
   }
   catch (Exception &E)

+ 1 - 1
source/core/CoreMain.cpp

@@ -18,7 +18,7 @@
 //---------------------------------------------------------------------------
 TConfiguration * Configuration = NULL;
 TStoredSessionList * StoredSessions = NULL;
-TApplicationLog * AppLog = NULL;
+TApplicationLog * ApplicationLog = NULL;
 bool AnySession = false;
 //---------------------------------------------------------------------------
 TQueryButtonAlias::TQueryButtonAlias()

+ 3 - 1
source/core/CoreMain.h

@@ -10,7 +10,9 @@ class TStoredSessionList;
 extern TStoredSessionList *StoredSessions;
 extern bool AnySession;
 class TApplicationLog;
-extern TApplicationLog * AppLog;
+extern TApplicationLog * ApplicationLog;
+#define AppLog(S) ApplicationLog->Log(S)
+#define AppLogFmt(S, F) ApplicationLog->Log(Format(S, ARRAYOFCONST(F)))
 //---------------------------------------------------------------------------
 void CoreInitialize();
 void CoreFinalize();