pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

jvcllaz: Fix crash of JvID3v2 demo on 64bit.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6976 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-05-30 16:59:30 +00:00
parent 17dad69c3e
commit db82b4bbd6
5 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogPrj.lpi
View File

@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="12"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="JvFullColorCircleDialogPrj"/> <Title Value="JvFullColorCircleDialogPrj"/>
<Scaled Value="True"/> <Scaled Value="True"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>

14
components/jvcllaz/examples/JvID3v2/JvId3v2Demo.lpi
View File

@ -66,6 +66,20 @@
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Parsing>
<SyntaxOptions>
<IncludeAssertionCode Value="True"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<Checks>
<IOChecks Value="True"/>
<RangeChecks Value="True"/>
<OverflowChecks Value="True"/>
<StackChecks Value="True"/>
</Checks>
<VerifyObjMethodCallValidity Value="True"/>
</CodeGeneration>
<Linking> <Linking>
<Debugging> <Debugging>
<UseExternalDbgSyms Value="True"/> <UseExternalDbgSyms Value="True"/>

3
components/jvcllaz/examples/JvID3v2/JvId3v2MainFormU.lfm
View File

@ -24,8 +24,9 @@ object JvID3v2MainForm: TJvID3v2MainForm
0000FF9F0000FF9F0000FF9F0000FF9F0000FF9F0000FF0F0000FE070000FFFF 0000FF9F0000FF9F0000FF9F0000FF9F0000FF9F0000FF0F0000FE070000FFFF
0000 0000
} }
OnCreate = FormCreate
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.9.0.0' LCLVersion = '2.1.0.0'
Scaled = False Scaled = False
object Splitter1: TSplitter object Splitter1: TSplitter
Left = 185 Left = 185

9
components/jvcllaz/examples/JvID3v2/JvId3v2MainFormU.pas
View File

@ -48,6 +48,7 @@ type
JvID3v21: TJvID3v2; JvID3v21: TJvID3v2;
Panel1: TPanel; Panel1: TPanel;
ShellTreeView: TShellTreeView; ShellTreeView: TShellTreeView;
procedure FormCreate(Sender: TObject);
procedure ListView1DblClick(Sender: TObject); procedure ListView1DblClick(Sender: TObject);
procedure ShellTreeViewChange(Sender: TObject); procedure ShellTreeViewChange(Sender: TObject);
procedure ShellTreeViewGetImageIndex(Sender: TObject; Node: TTreeNode); procedure ShellTreeViewGetImageIndex(Sender: TObject; Node: TTreeNode);
@ -164,6 +165,14 @@ begin
end; end;
end; end;
procedure TJvID3v2MainForm.FormCreate(Sender: TObject);
begin
if (ParamCount > 0) and DirectoryExists(ParamStr(1)) then begin
ShellTreeView.Path := ParamStr(1);
ChangeToDir(ParamStr(1));
end;
end;
procedure TJvID3v2MainForm.UpdateItem(Item: TListItem; const AFileName: string); procedure TJvID3v2MainForm.UpdateItem(Item: TListItem; const AFileName: string);
var var
HasTag: Boolean; HasTag: Boolean;

4
components/jvcllaz/run/JvMM/jvid3v2base.pas
View File

@ -151,7 +151,7 @@ type
function ReadSyncSafeInteger(var AInt: Cardinal; const ASize: Byte): Longint; overload; function ReadSyncSafeInteger(var AInt: Cardinal; const ASize: Byte): Longint; overload;
function ReadSyncSafeInteger(var AInt: Int64; const ASize: Byte = 4): Longint; overload; function ReadSyncSafeInteger(var AInt: Int64; const ASize: Byte = 4): Longint; overload;
procedure ReadFromStream(AStream: TStream; const ASize: Integer); procedure ReadFromStream(AStream: TStream; const ASize: PtrInt);
{ Write } { Write }
function WriteDate(const ADate: TDateTime): Longint; function WriteDate(const ADate: TDateTime): Longint;
@ -7715,7 +7715,7 @@ begin
end; end;
procedure TJvID3Stream.ReadFromStream(AStream: TStream; procedure TJvID3Stream.ReadFromStream(AStream: TStream;
const ASize: Integer); const ASize: PtrInt);
begin begin
Position := 0; Position := 0;
SetSize(ASize); SetSize(ASize);