Changeset 41 for trunk

Timestamp:

Jan 9, 2017, 9:41:20 PM (8 years ago)

Author:

chronos

Message:

Fixed: Problem with reading Form canvas during OnPaint event using BitBlt. Chnaged to read using StreatchDraw as workaround.

Location:

trunk

Files:

• AI/StdAI-win32.dll (modified) ( previous)
• LocalPlayer/MessgEx.pas (modified) (2 diffs)
• LocalPlayer/Select.pas (modified) (1 diff)
• ScreenTools.pas (modified) (7 diffs)
• Start.pas (modified) (2 diffs)

trunk/LocalPlayer/MessgEx.pas

@@ -298 +298 @@
 
   // paint
-  BitBlt(LogoBuffer.Canvas.Handle, 0, 0, wb, hb, ca.Handle, x, y, SRCCOPY);
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, wb, hb, ca, x, y, SRCCOPY);
 
   if IconIndex >= 0 then
@@ -436 +436 @@
     mikEnemyShipComplete:
       begin
-        BitBlt(Buffer.Canvas.Handle, 0, 0, 140, 120, Canvas.Handle,
+        BitBltCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas,
           (ClientWidth - 140) div 2, 24, SRCCOPY);
         ImageOp_BCC(Buffer, Templates, 0, 0, 1, 279, 140, 120, 0, $FFFFFF);

trunk/LocalPlayer/Select.pas

@@ -821 +821 @@
         LoweredTextOut(Canvas, -1, MainTexture, xScreen + 10,
           ClientHeight - 29, s);
-        BitBlt(ScienceNationDot.Canvas.Handle, 0, 0, 17, 17, Canvas.Handle,
+        BitBltCanvas(ScienceNationDot.Canvas, 0, 0, 17, 17, Canvas,
           xScreen - 10, ClientHeight - 27, SRCCOPY);
         ImageOp_BCC(ScienceNationDot, Templates, 0, 0, 114, 211, 17, 17,

trunk/ScreenTools.pas

@@ -48 +48 @@
 procedure ImageOp_CCC(bmp: TBitmap; x, y, w, h, Color0, Color1,
   Color2: integer);
+function BitBltCanvas(DestCanvas: TCanvas; X, Y, Width, Height: Integer; SrcCanvas: TCanvas;
+  XSrc, YSrc: Integer; Rop: DWORD): Boolean;
 procedure SLine(ca: TCanvas; x0, x1, y: integer; cl: TColor);
 procedure DLine(ca: TCanvas; x0, x1, y: integer; cl0, cl1: TColor);
@@ -192 +194 @@
 
 uses
-  Directories, Sound, ButtonBase, ButtonA, ButtonB,
-
-  Registry;
+  Directories, Sound, Registry;
 
 var
@@ -713 +713 @@
     exit;
 
+  Src.BeginUpdate;
   dst.BeginUpdate;
   for iy := 0 to h - 1 do
@@ -725 +726 @@
       if trans <> $FF then
       begin
-        Value := (DstLine[xDst + ix][0] * trans + (Color2 shr 16 and $FF) * amp2
-          + (Color1 shr 16 and $FF) * amp1) div $FF;
+        Value := (DstLine[xDst + ix][0] * trans + ((Color2 shr 16) and $FF) * amp2
+          + ((Color1 shr 16) and $FF) * amp1) div $FF;
         if Value < 256 then
           DstLine[xDst + ix][0] := Value
         else
           DstLine[xDst + ix][0] := 255;
-        Value := (DstLine[xDst + ix][1] * trans + (Color2 shr 8 and $FF) * amp2
-          + (Color1 shr 8 and $FF) * amp1) div $FF;
+        Value := (DstLine[xDst + ix][1] * trans + ((Color2 shr 8) and $FF) * amp2
+          + ((Color1 shr 8) and $FF) * amp1) div $FF;
         if Value < 256 then
           DstLine[xDst + ix][1] := Value
@@ -746 +747 @@
     end
   end;
+  Src.EndUpdate;
   dst.EndUpdate;
 end;
@@ -802 +804 @@
   BitBlt(dst.Canvas.Handle, xDst, yDst, Width, Height,
     GrExt[HGr].Data.Canvas.Handle, xGr, yGr, SRCPAINT);
+end;
+
+function BitBltCanvas(DestCanvas: TCanvas; X, Y, Width, Height: Integer; SrcCanvas: TCanvas; XSrc,
+  YSrc: Integer; Rop: DWORD): Boolean;
+begin
+  Assert(Rop = SRCCOPY);
+  DestCanvas.CopyRect(Rect(X, X, Width, Height), SrcCanvas,
+    Rect(XSrc, YSrc, XSrc + Width, YSrc + Height));
 end;
 
@@ -1441 +1451 @@
     procedure PaintLogo(ca: TCanvas; x, y, clLight, clShade: integer);
     begin
-      BitBlt(LogoBuffer.Canvas.Handle, 0, 0, wLogo, hLogo, ca.Handle, x,
+      BitBltCanvas(LogoBuffer.Canvas, 0, 0, wLogo, hLogo, ca, x,
         y, SRCCOPY);
       ImageOp_BCC(LogoBuffer, Templates, 0, 0, 1, 1, wLogo, hLogo,

trunk/Start.pas

@@ -542 +542 @@
       TabOffset + (Tab + 1) * TabSize + 2, TabHeight, MainTexture.clBevelShade,
       MainTexture.clBevelShade); // Tab shadow
-  BitBlt(LogoBuffer.Canvas.Handle, 0, 0, 36, 36, Canvas.Handle, 6,
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, 36, 36, Canvas, 6,
     3 + 2 * integer(Tab <> 0), SRCCOPY);
+
+
   ImageOp_BCC(LogoBuffer, Templates, 0, 0, 145, 38, 36, 27, $BFBF20, $4040DF);
   // logo part 1
@@ -592 +594 @@
                 Phrases2.Lookup('ACTIONHEADER_WEB'));
               Canvas.Font.Assign(UniFont[ftNormal]);
-              BitBlt(LogoBuffer.Canvas.Handle, 0, 0, 91, 25, Canvas.Handle,
+              BitBltCanvas(LogoBuffer.Canvas, 0, 0, 91, 25, Canvas,
                 xActionIcon, y + 2, SRCCOPY);
               ImageOp_BCC(LogoBuffer, Templates, 0, 0, 1, 400, 91, 25, 0,