浏览代码

Unicode strings

Source commit: fb7f56501359a21f82edf82318850fa6c1385b61
Martin Prikryl 2 年之前
父节点
当前提交
bfddaa7d10
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 4 4
      source/windows/GUITools.cpp
  2. 2 2
      source/windows/Tools.cpp

+ 4 - 4
source/windows/GUITools.cpp

@@ -2370,7 +2370,7 @@ bool __fastcall TSystemRequiredThread::WaitForEvent()
     if (!FTerminated && FRequired &&
         (MilliSecondsBetween(Now(), FLastRequired) > ExpireInterval))
     {
-      AppLog("System is not required");
+      AppLog(L"System is not required");
       SetThreadExecutionState(ES_CONTINUOUS);
       FLastRequired = TDateTime();
       FRequired = false;
@@ -2385,7 +2385,7 @@ void __fastcall TSystemRequiredThread::ProcessEvent()
   if (!FRequired &&
       (FLastRequired != TDateTime()))
   {
-    AppLog("System is required");
+    AppLog(L"System is required");
     SetThreadExecutionState(ES_SYSTEM_REQUIRED | ES_CONTINUOUS);
     FRequired = true;
   }
@@ -2398,7 +2398,7 @@ void SystemRequired()
     TGuard Guard(SystemRequiredThreadSection.get());
     if (SystemRequiredThread == NULL)
     {
-      AppLog("Starting system required thread");
+      AppLog(L"Starting system required thread");
       SystemRequiredThread = new TSystemRequiredThread();
       SystemRequiredThread->Start();
     }
@@ -2423,7 +2423,7 @@ void GUIFinalize()
 
   if (Thread != NULL)
   {
-    AppLog("Stopping system required thread");
+    AppLog(L"Stopping system required thread");
     Thread->Terminate();
     Thread->WaitFor();
     delete Thread;

+ 2 - 2
source/windows/Tools.cpp

@@ -1132,7 +1132,7 @@ void __fastcall CopyToClipboard(UnicodeString Text)
   HANDLE Data;
   void * DataPtr;
 
-  AppLogFmt("Copying text to clipboard [%d]", (Text.Length()));
+  AppLogFmt(L"Copying text to clipboard [%d]", (Text.Length()));
   if (OpenClipboard(0))
   {
     try
@@ -1163,7 +1163,7 @@ void __fastcall CopyToClipboard(UnicodeString Text)
     {
       CloseClipboard();
     }
-    AppLogFmt("Copied text to clipboard [%d]", (Text.Length()));
+    AppLogFmt(L"Copied text to clipboard [%d]", (Text.Length()));
   }
   else
   {