View Issue Details

IDProjectCategoryView StatusLast Update
0024151LazarusPatchpublic2013-04-02 17:47
ReporteroceanAssigned ToMaxim Ganetsky 
PrioritynormalSeverityminorReproducibilityhave not tried
Status closedResolutionfixed 
Product VersionProduct Build 
Target VersionFixed in Version1.1 (SVN) 
Summary0024151: Fix activexcontainer height
DescriptionHeight seems wrong, also removed couple unused variables and empty lines
TagsNo tags attached.
Fixed in Revision40653
LazTarget-
WidgetsetWin32/Win64
Attached Files
  • ac_height.patch (1,695 bytes)
    Index: components/activex/activexcontainer.pas
    ===================================================================
    --- components/activex/activexcontainer.pas	(revision 40648)
    +++ components/activex/activexcontainer.pas	(working copy)
    @@ -205,8 +205,6 @@
           property Active:boolean read FActive write SetActive;
         end;
     
    -
    -
     implementation
     
     {$ifdef wince}
    @@ -234,7 +232,6 @@
       var
         bounds:TRect;
         DC: HDC;
    -    PS: TPaintStruct;
         size:TPOINT;
         AXC:TActiveXContainer;
     begin
    @@ -246,7 +243,7 @@
           size.x:=(LOWORD(lparam)*2540) div Screen.PixelsPerInch;
           size.y:=(HIWORD(lparam)*2540) div Screen.PixelsPerInch;
           AXC.Width:=LOWORD(lparam);
    -      AXC.Height:=LOWORD(lparam);
    +      AXC.Height:=HIWORD(lparam);
           olecheck((AXC.ComServer as IOleObject).SetExtent(DVASPECT_CONTENT,size));
           bounds:=AXC.ClientRect;
           olecheck((AXC.ComServer as IOleInPlaceObject).SetObjectRects(@bounds,@bounds));
    @@ -262,8 +259,6 @@
       result:=CallWindowProc(AXC.FPrevWndProc,Ahwnd, uMsg, WParam, LParam);
     end;
     
    -
    -
     { TActiveXContainer }
     
     function TActiveXContainer.GetvObject: variant;
    @@ -546,8 +541,6 @@
     function TActiveXContainer.Invoke(DispID: LongInt; const iid: TGUID;
       LocaleID: longint; Flags: Word; var params; VarResult, ExcepInfo,
       ArgErr: pointer): HResult; stdcall;
    -var
    -  F: TFont;
     const
       DISPID_AMBIENT_BACKCOLOR         = -701;
       DISPID_AMBIENT_DISPLAYNAME       = -702;
    @@ -561,8 +554,6 @@
       DISPID_AMBIENT_SHOWHATCHING      = -712;
       DISPID_AMBIENT_SUPPORTSMNEMONICS = -714;
       DISPID_AMBIENT_AUTOCLIP          = -715;
    -
    -
     begin
       if (Flags and DISPATCH_PROPERTYGET <> 0) and (VarResult <> nil) then
       begin
    
    ac_height.patch (1,695 bytes)

Activities

ocean

2013-03-27 12:13

reporter  

ac_height.patch (1,695 bytes)
Index: components/activex/activexcontainer.pas
===================================================================
--- components/activex/activexcontainer.pas	(revision 40648)
+++ components/activex/activexcontainer.pas	(working copy)
@@ -205,8 +205,6 @@
       property Active:boolean read FActive write SetActive;
     end;
 
-
-
 implementation
 
 {$ifdef wince}
@@ -234,7 +232,6 @@
   var
     bounds:TRect;
     DC: HDC;
-    PS: TPaintStruct;
     size:TPOINT;
     AXC:TActiveXContainer;
 begin
@@ -246,7 +243,7 @@
       size.x:=(LOWORD(lparam)*2540) div Screen.PixelsPerInch;
       size.y:=(HIWORD(lparam)*2540) div Screen.PixelsPerInch;
       AXC.Width:=LOWORD(lparam);
-      AXC.Height:=LOWORD(lparam);
+      AXC.Height:=HIWORD(lparam);
       olecheck((AXC.ComServer as IOleObject).SetExtent(DVASPECT_CONTENT,size));
       bounds:=AXC.ClientRect;
       olecheck((AXC.ComServer as IOleInPlaceObject).SetObjectRects(@bounds,@bounds));
@@ -262,8 +259,6 @@
   result:=CallWindowProc(AXC.FPrevWndProc,Ahwnd, uMsg, WParam, LParam);
 end;
 
-
-
 { TActiveXContainer }
 
 function TActiveXContainer.GetvObject: variant;
@@ -546,8 +541,6 @@
 function TActiveXContainer.Invoke(DispID: LongInt; const iid: TGUID;
   LocaleID: longint; Flags: Word; var params; VarResult, ExcepInfo,
   ArgErr: pointer): HResult; stdcall;
-var
-  F: TFont;
 const
   DISPID_AMBIENT_BACKCOLOR         = -701;
   DISPID_AMBIENT_DISPLAYNAME       = -702;
@@ -561,8 +554,6 @@
   DISPID_AMBIENT_SHOWHATCHING      = -712;
   DISPID_AMBIENT_SUPPORTSMNEMONICS = -714;
   DISPID_AMBIENT_AUTOCLIP          = -715;
-
-
 begin
   if (Flags and DISPATCH_PROPERTYGET <> 0) and (VarResult <> nil) then
   begin
ac_height.patch (1,695 bytes)

Maxim Ganetsky

2013-03-27 23:40

developer   ~0066591

Applied, thanks.

Issue History

Date Modified Username Field Change
2013-03-27 12:13 ocean New Issue
2013-03-27 12:13 ocean File Added: ac_height.patch
2013-03-27 23:40 Maxim Ganetsky Fixed in Revision => 40653
2013-03-27 23:40 Maxim Ganetsky LazTarget => -
2013-03-27 23:40 Maxim Ganetsky Note Added: 0066591
2013-03-27 23:40 Maxim Ganetsky Status new => resolved
2013-03-27 23:40 Maxim Ganetsky Fixed in Version => 1.1 (SVN)
2013-03-27 23:40 Maxim Ganetsky Resolution open => fixed
2013-03-27 23:40 Maxim Ganetsky Assigned To => Maxim Ganetsky
2013-04-02 17:47 ocean Status resolved => closed