fixes for 3.0.4

project-jedi · Aug 14, 2018 · fabb52d · fabb52d
1 parent 610f55c
commit fabb52d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/jcl/source/common/JclSysInfo.pas b/jcl/source/common/JclSysInfo.pas
@@ -3191,7 +3191,7 @@ function IsWindowResponding(Wnd: THandle; Timeout: Integer): Boolean;
   Res: DWORD;
 begin
   Res := 0;
-  Result := SendMessageTimeout(Wnd, WM_NULL, 0, 0, SMTO_ABORTIFHUNG, Timeout, {$IFDEF RTL230_UP}@{$ENDIF}Res) <> 0;
+  Result := SendMessageTimeout(Wnd, WM_NULL, 0, 0, SMTO_ABORTIFHUNG, Timeout, {$IFDEF RTL230_UP}@{$ENDIF}{$IFDEF FPC}@{$ENDIF}Res) <> 0;
 end;
 
 function GetWindowIcon(Wnd: THandle; LargeIcon: Boolean): HICON;

diff --git a/jcl/source/vcl/JclGraphUtils.pas b/jcl/source/vcl/JclGraphUtils.pas
@@ -575,7 +575,7 @@ procedure _BlendLine(Src, Dst: PColor32; Count: Integer); assembler;
 @4:     RET
   {$ENDIF CPU32}
   {$IFDEF CPU64}
-  TODO
+  //TODO
   {$ENDIF CPU64}
 end;
 {$ENDIF ~DELPHI64_TEMPORARY}
@@ -876,7 +876,7 @@ procedure M_BlendLine(Src, Dst: PColor32; Count: Integer); assembler;
 @4:     RET
   {$ENDIF CPU32}
   {$IFDEF CPU64}
-  TODO
+  //TODO
   {$ENDIF CPU64}
 end;
 {$ENDIF ~DELPHI64_TEMPORARY}
@@ -949,7 +949,7 @@ procedure M_BlendLineEx(Src, Dst: PColor32; Count: Integer; M: TColor32); assemb
 @4:
   {$ENDIF CPU32}
   {$IFDEF CPU64}
-  TODO
+  //TODO
   {$ENDIF CPU64}
 end;
 {$ENDIF ~DELPHI64_TEMPORARY}

diff --git a/jcl/source/windows/JclPeImage.pas b/jcl/source/windows/JclPeImage.pas
@@ -6634,7 +6634,7 @@ function InternalReadProcMem(ProcessHandle: THandle; Address: DWORD;
 function InternalReadProcMem(ProcessHandle: THandle; Address: DWORD;
   Buffer: Pointer; Size: Integer): Boolean;
 var
-  BR: DWORD;
+  BR: {$IFDEF CPU64} QWord {$ELSE} DWORD {$ENDIF};
 {$ENDIF}
 begin
   BR := 0;