Przeglądaj źródła

Merge branch 'main' into 7zdll

Martijn Laan 3 miesięcy temu
rodzic
commit
3f417868d3

+ 1 - 1
Projects/Src/Compression.LZMACompressor.pas

@@ -481,7 +481,7 @@ procedure TLZMAWorkerThread.SetProps(const LZMA2: Boolean;
   const EncProps: TLZMAEncoderProps);
   const EncProps: TLZMAEncoderProps);
 var
 var
   Res: TLZMASRes;
   Res: TLZMASRes;
-  ThreadID: DWORD;
+  ThreadID: TThreadID;
 begin
 begin
   Res := LZMA_Init(LZMA2, FLZMAHandle);
   Res := LZMA_Init(LZMA2, FLZMAHandle);
   if Res = SZ_ERROR_MEM then
   if Res = SZ_ERROR_MEM then

+ 1 - 1
Projects/Src/Compression.SevenZipDecoder.pas

@@ -327,7 +327,7 @@ begin
   if State.Aborted then
   if State.Aborted then
     raise Exception.Create(SetupMessages[msgErrorExtractionAborted])
     raise Exception.Create(SetupMessages[msgErrorExtractionAborted])
   else if Res <> 0 then
   else if Res <> 0 then
-    raise Exception.Create(FmtSetupMessage(msgErrorExtractionFailed, [Res.ToString]));
+    raise Exception.Create(FmtSetupMessage(msgErrorExtractionFailed, [Res.ToString])); { Already logged by 7zMain.c }
 end;
 end;
 
 
 end.
 end.

+ 2 - 2
Projects/Src/IDE.MainForm.pas

@@ -5988,12 +5988,12 @@ begin
 
 
     ReplyMessage(Message.Result);  { so that Setup enters a paused state now }
     ReplyMessage(Message.Result);  { so that Setup enters a paused state now }
     if LineNumber >= 0 then begin
     if LineNumber >= 0 then begin
-      S := Format('Line %d:' + SNewLine + '%s.', [LineNumber + 1, FDebuggerException]);
+      S := Format('Line %d:' + SNewLine + '%s', [LineNumber + 1, AddPeriod(FDebuggerException)]);
       if (Memo <> nil) and (Memo.Filename <> '') then
       if (Memo <> nil) and (Memo.Filename <> '') then
         S := Memo.Filename + SNewLine2 + S;
         S := Memo.Filename + SNewLine2 + S;
       MsgBox(S, 'Runtime Error', mbCriticalError, mb_Ok)
       MsgBox(S, 'Runtime Error', mbCriticalError, mb_Ok)
     end else
     end else
-      MsgBox(FDebuggerException + '.', 'Runtime Error', mbCriticalError, mb_Ok);
+      MsgBox(AddPeriod(FDebuggerException), 'Runtime Error', mbCriticalError, mb_Ok);
   end;
   end;
 end;
 end;