moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2025-02-16 07:10:10 -05:00
Code Issues Releases Wiki Activity

Merge ssh://villavu.com:54367/simba

Browse Source
This commit is contained in:
Niels 2010-03-30 14:03:17 +02:00
commit cea3e066a6
19 changed files with 1874 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/SAMufasaGUI/debugimage.lfm
View File

@ -10,7 +10,6 @@ object DebugImgForm: TDebugImgForm
ClientWidth = 400
OnCreate = FormCreate
OnHide = FormHide
OnResize = FormResize
LCLVersion = '0.9.29'
object DrawImage: TImage
Left = 0
@ -18,5 +17,6 @@ object DebugImgForm: TDebugImgForm
Top = 0
Width = 400
Align = alClient
OnResize = DrawImageResize
end
end

6
Projects/SAMufasaGUI/debugimage.lrs
View File

@ -5,7 +5,7 @@ LazarusResources.Add('TDebugImgForm','FORMDATA',[
+'Top'#3#10#1#5'Width'#3#144#1#11'BorderIcons'#11#12'biSystemMenu'#10'biMinim'
+'ize'#0#11'BorderStyle'#7#12'bsToolWindow'#7'Caption'#6#12'DebugImgForm'#12
+'ClientHeight'#3','#1#11'ClientWidth'#3#144#1#8'OnCreate'#7#10'FormCreate'#6
+'OnHide'#7#8'FormHide'#8'OnResize'#7#10'FormResize'#10'LCLVersion'#6#6'0.9.2'
+'9'#0#6'TImage'#9'DrawImage'#4'Left'#2#0#6'Height'#3','#1#3'Top'#2#0#5'Width'
+#3#144#1#5'Align'#7#8'alClient'#0#0#0
+'OnHide'#7#8'FormHide'#10'LCLVersion'#6#6'0.9.29'#0#6'TImage'#9'DrawImage'#4
+'Left'#2#0#6'Height'#3','#1#3'Top'#2#0#5'Width'#3#144#1#5'Align'#7#8'alClien'
+'t'#8'OnResize'#7#15'DrawImageResize'#0#0#0
]);

14
Projects/SAMufasaGUI/debugimage.pas
View File

@ -36,9 +36,9 @@ type
TDebugImgForm = class(TForm)
DrawImage: TImage;
procedure DrawImageResize(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormHide(Sender: TObject);
procedure FormResize(Sender: TObject);
private
{ private declarations }
public
@ -67,18 +67,18 @@ begin
BlackDebugImage;
end;
procedure TDebugImgForm.FormHide(Sender: TObject);
begin
Form1.MenuItemDebugImage.Checked := False;
end;
procedure TDebugImgForm.FormResize(Sender: TObject);
procedure TDebugImgForm.DrawImageResize(Sender: TObject);
begin
DrawImage.Picture.Graphic.Width := DrawImage.Width;
DrawImage.Picture.Graphic.Height := DrawImage.Height;
BlackDebugImage;
end;
procedure TDebugImgForm.FormHide(Sender: TObject);
begin
Form1.MenuItemDebugImage.Checked := False;
end;
procedure TDebugImgForm.BlackDebugImage;
begin
DrawImage.Canvas.Brush.Color:= clBlack;

7
Projects/SAMufasaGUI/extensionmanager.pas
View File

@ -148,5 +148,12 @@ begin
end;
end;
initialization
ExtManager := TExtensionManager.Create;
ExtManager.StartDisabled := True;
finalization
if ExtManager <> nil then
FreeAndNil(ExtManager);
end.

1
Projects/SAMufasaGUI/framefunctionlist.pas
View File

@ -194,6 +194,7 @@ begin;
begin
tmpNode := FunctionList.Items.AddChild(Node,name.ShortText);
tmpNode.Data := GetMem(SizeOf(TMethodInfo));
FillChar(PMethodInfo(tmpNode.Data)^,SizeOf(TMethodInfo),0);
with PMethodInfo(tmpNode.Data)^ do
begin
MethodStr := strnew(Pchar(CleanDeclaration));

4
Projects/SAMufasaGUI/project1.lpi
View File

@ -69,9 +69,9 @@
<UnitName Value="files"/>
</Unit4>
<Unit5>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Filename Value="../../Units/MMLAddon/mmisc.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="Window"/>
<UnitName Value="mmisc"/>
</Unit5>
<Unit6>
<Filename Value="../../Units/MMLCore/finder.pas"/>

4
Projects/SAMufasaGUI/project1.lpr
View File

@ -36,7 +36,7 @@ uses
libloader, mufasabase, v_ideCodeInsight, PSDump, v_ideCodeParser,
v_AutoCompleteForm, CastaliaPasLex, CastaliaPasLexTypes, CastaliaSimplePasPar,
CastaliaSimplePasParTypes, dcpbase64, mPasLex, v_Constants, v_MiscFunctions,
extensionmanagergui;
extensionmanagergui, mmisc;
{$R project1.res}
@ -48,8 +48,8 @@ begin
Application.CreateForm(TColourHistoryForm, ColourHistoryForm);
Application.CreateForm(TAboutForm, AboutForm);
Application.CreateForm(TDebugImgForm, DebugImgForm);
Application.CreateForm(TSimbaUpdateForm, SimbaUpdateForm);
Application.CreateForm(TExtensionsForm, ExtensionsForm);
// Application.CreateForm(TSimbaUpdateForm, SimbaUpdateForm);
// Application.CreateForm(TSettingsForm, SettingsForm); Done in FormCreate of MainForm
Application.Run;
end.

273
Projects/SAMufasaGUI/testunit.pas
View File

@ -39,14 +39,14 @@ uses
{$IFDEF LINUX} os_linux, {$ENDIF} //For ColorPicker etc.
colourpicker, framescript, windowselector, lcltype, ActnList,
SynExportHTML, SynEditKeyCmds, SynEditHighlighter,
SynEditMarkupHighAll, LMessages, Buttons,
SynEditMarkupHighAll, LMessages, Buttons,mmisc,
stringutil,mufasatypesutil,mufasabase,
about, framefunctionlist, ocr, updateform, simbasettings, psextension, virtualextension,
extensionmanager, settingssandbox, v_ideCodeInsight, CastaliaPasLexTypes,
CastaliaSimplePasPar, v_AutoCompleteForm, PSDump;
const
SimbaVersion = 587;
SimbaVersion = 600;
type
@ -326,12 +326,17 @@ type
FirstRun : boolean;//Only show the warnings the first run (path not existing one's)
SearchStart : TPoint;
LastTab : integer;
UpdatingFonts : boolean;
function GetFontPath: String;
function GetIncludePath: String;
function GetScriptState: TScriptState;
procedure SetFontPath(const AValue: String);
procedure SetIncludePath(const AValue: String);
procedure SetScriptState(const State: TScriptState);
function LoadSettingDef(Key : string; Def : string) : string;
function CreateSetting(Key : string; Value : string) : string;
procedure SetSetting(key : string; Value : string);
procedure FontUpdate;
public
DebugStream: String;
SearchString : string;
@ -378,8 +383,18 @@ type
procedure HandleParameters;
procedure OnSaveScript(const Filename : string);
property IncludePath : String read GetIncludePath write SetIncludePath;
property FontPath : String read GetFontPath write SetFontPath;
end;
{ TProcThread }
TProcThread = class(TThread)
public
StartWait : Cardinal;
ClassProc : procedure of object;
NormalProc : procedure;
procedure Execute; override;
end;
procedure ClearDebug;
procedure formWriteln( S : String);
procedure formWritelnEx( S : String);
@ -595,9 +610,11 @@ var
time:integer;
LatestVersion : integer;
begin
chk := LoadSettingDef('Settings/Updater/CheckForUpdates','True');
UpdateTimer.Interval:= MaxInt;
FontUpdate;
chk := LowerCase(LoadSettingDef('Settings/Updater/CheckForUpdates','True'));
if chk <> 'True' then
if chk <> 'true' then
Exit;
LatestVersion:= SimbaUpdateForm.GetLatestSimbaVersion;
@ -958,12 +975,14 @@ end;
procedure TForm1.CreateDefaultEnvironment;
var
FontPath,PluginsPath,extensionsPath : string;
PluginsPath,extensionsPath : string;
FontUpdater : TProcThread;
begin
CreateSetting('Settings/Updater/CheckForUpdates','True');
CreateSetting('Settings/Updater/CheckEveryXMinutes','30');
CreateSetting('Settings/Interpreter/UseCPascal', 'False');
CreateSetting('Settings/Fonts/LoadOnStartUp', 'True');
CreateSetting('Settings/Fonts/Version','-1');
CreateSetting('Settings/Tabs/OpenNextOnClose','False');
CreateSetting('Settings/Tabs/OpenScriptInNewTab','True');
CreateSetting('Settings/Tabs/CheckTabsBeforeOpen','True');
@ -972,38 +991,12 @@ begin
CreateSetting('Settings/MainForm/NormalSize','739:555');
CreateSetting('Settings/FunctionList/ShowOnStart','True');
CreateSetting('Settings/Updater/RemoteLink',
{$IFDEF WINDOWS}
{$IFDEF CPUI386}
'http://simba.villavu.com/bin/Windows/x86/Stable/Simba.exe'
{$ELSE}
'http://simba.villavu.com/bin/Windows/x86_64/Stable/Simba.exe'
{$ENDIF}
{$ELSE}
{$IFDEF CPUI386}
'http://simba.villavu.com/bin/Linux/x86/Stable/Simba'
{$ELSE}
'http://simba.villavu.com/bin/Linux/x86_64/Stable/Simba'
{$ENDIF}
{$ENDIF}
);
CreateSetting('Settings/Updater/RemoteVersionLink',
{$IFDEF WINDOWS}
{$IFDEF CPUI386}
'http://simba.villavu.com/bin/Windows/x86/Stable/Version'
{$ELSE}
'http://simba.villavu.com/bin/Windows/x86_64/Stable/Version'
{$ENDIF}
{$ELSE}
{$IFDEF CPUI386}
'http://simba.villavu.com/bin/Linux/x86/Stable/Version'
{$ELSE}
'http://simba.villavu.com/bin/Linux/x86_64/Stable/Version'
{$ENDIF}
{$ENDIF}
);
CreateSetting('Settings/Updater/RemoteLink',SimbaURL + 'Simba'{$IFDEF WINDOWS} +'.exe'{$ENDIF});
CreateSetting('Settings/Updater/RemoteVersionLink',SimbaURL + 'Version');
CreateSetting('Settings/Fonts/VersionLink', FontURL + 'Version');
CreateSetting('Settings/Fonts/UpdateLink', FontURL + 'Fonts.tar.bz2');
{Creates the paths and returns the path}
fontPath := CreateSetting('Settings/Fonts/Path', ExpandFileName(MainDir+DS+ 'Fonts' + DS));
PluginsPath := CreateSetting('Settings/Plugins/Path', ExpandFileName(MainDir+ DS+ 'Plugins' + DS));
extensionsPath := CreateSetting('Settings/Extensions/Path',ExpandFileName(MainDir +DS + 'Extensions' + DS));
CreateSetting('LastConfig/MainForm/Position','');
@ -1023,6 +1016,7 @@ begin
SettingsForm.SettingsTreeView.Items.GetFirstNode.Expand(false);
SettingsForm.SaveCurrent;
LoadFormSettings;
UpdateTimer.Interval:=25;
end;
procedure TForm1.LoadFormSettings;
@ -1159,7 +1153,6 @@ end;
procedure TForm1.InitalizeTMThread(var Thread: TMThread);
var
DbgImgInfo : TDbgImgInfo;
fontPath: String;
AppPath : string;
pluginspath: string;
ScriptPath : string;
@ -1168,7 +1161,6 @@ var
loadFontsOnScriptStart: boolean;
begin
AppPath:= MainDir + DS;
fontPath := IncludeTrailingPathDelimiter(LoadSettingDef('Settings/Fonts/Path', ExpandFileName(MainDir+DS+ 'Fonts' + DS)));
PluginsPath := IncludeTrailingPathDelimiter(LoadSettingDef('Settings/Plugins/Path', ExpandFileName(MainDir+ DS+ 'Plugins' + DS)));
CurrScript.ScriptErrorLine:= -1;
CurrentSyncInfo.SyncMethod:= @Self.SafeCallThread;
@ -1668,7 +1660,7 @@ begin
if MethodInfo.Filename <> nil then
if MethodInfo.Filename <> '' then
begin;
Writeln(MethodInfo.filename);
// Writeln(MethodInfo.filename);
LoadScriptFile(MethodInfo.Filename,true,true);
end;
CurrScript.SynEdit.SelStart := MethodInfo.BeginPos + 1;
@ -1771,51 +1763,63 @@ begin
FreeAndNil(ExtManager);
end;
procedure TForm1.FormCreate(Sender: TObject);
procedure CCFillCore;
var
t: TMThread;
a: TPSScriptExtension;
b: TStringList;
ms: TMemoryStream;
procedure CCFillCore;
var
t: TMThread;
a: TPSScriptExtension;
b: TStringList;
ms: TMemoryStream;
begin
if form1.UpdatingFonts then
begin
InitalizeTMThread(t);
KillThread(t.ThreadID);
if (t is TPSThread) then
try
a := TPSScriptExtension.Create(Self);
b := TStringList.Create;
ms := TMemoryStream.Create;
try
with TPSThread(t).PSScript do
begin
a.OnCompile := OnCompile;
a.OnCompImport := OnCompImport;
a.OnExecImport := OnExecImport;
end;
a.GetValueDefs(b);
SetLength(CoreBuffer, 1);
CoreBuffer[0] := TCodeInsight.Create;
with CoreBuffer[0] do
begin
OnMessage := @OnCCMessage;
b.SaveToStream(ms);
Run(ms, nil, -1, True);
FileName := '!PSCORE!';
end;
finally
b.Free;
a.Free;
end;
finally
//KillThread(t.ThreadID);
t.Free;
mDebugLn('Updating the fonts, thus waiting a bit till we init the OCR.');
while form1.UpdatingFonts do
begin
if GetCurrentThreadId = MainThreadID then
Application.ProcessMessages;
sleep(25);
end;
end;
form1.InitalizeTMThread(t);
KillThread(t.ThreadID);
if (t is TPSThread) then
try
a := TPSScriptExtension.Create(form1);
b := TStringList.Create;
ms := TMemoryStream.Create;
try
with TPSThread(t).PSScript do
begin
a.OnCompile := OnCompile;
a.OnCompImport := OnCompImport;
a.OnExecImport := OnExecImport;
end;
a.GetValueDefs(b);
SetLength(CoreBuffer, 1);
CoreBuffer[0] := TCodeInsight.Create;
with CoreBuffer[0] do
begin
OnMessage := @form1.OnCCMessage;
b.SaveToStream(ms);
Run(ms, nil, -1, True);
FileName := '!PSCORE!';
end;
finally
b.Free;
a.Free;
end;
finally
//KillThread(t.ThreadID);
t.Free;
end;
end;
procedure TForm1.FormCreate(Sender: TObject);
var
FillThread : TProcThread;
begin
Randomize;
DecimalSeparator := '.';
@ -1837,18 +1841,22 @@ begin
TT_Console.Visible:= false;
{$endif}
InitmDebug;
ExtManager := TExtensionManager.Create;
ExtManager.StartDisabled:= True;
FillThread := TProcThread.Create(true);
FillThread.FreeOnTerminate:= True;
FillThread.NormalProc:= @CCFillCore;
UpdateTimer.OnTimer:= @UpdateTimerCheck;
Application.CreateForm(TSimbaUpdateForm, SimbaUpdateForm);
if FileExists(SimbaSettingsFile) then
begin
Application.CreateForm(TSettingsForm,SettingsForm);
Self.LoadFormSettings;
end
else begin
end else
begin
Application.CreateForm(TSettingsForm,SettingsForm);
Self.CreateDefaultEnvironment;
FillThread.StartWait:= 250;
end;
UpdateTimer.OnTimer:= @UpdateTimerCheck;
//Show close buttons @ tabs
PageControl1.Options:=PageControl1.Options+[nboShowCloseButtons];
PageControl1.OnCloseTabClicked:=ActionCloseTab.OnExecute;
@ -1877,7 +1885,8 @@ begin
HandleParameters;
TT_Update.Visible:= false;
CCFillCore;
//Fill the codeinsight buffer
FillThread.Resume;
end;
procedure TForm1.FormDestroy(Sender: TObject);
@ -2076,6 +2085,7 @@ begin
end;
Temp2Node := Tree.Items.AddChild(Tempnode,GetMethodName(Methods[i].FuncDecl,false));
Temp2Node.Data := GetMem(SizeOf(TMethodInfo));
FillChar(PMethodInfo(Temp2Node.Data)^,SizeOf(TMethodInfo),0);
with PMethodInfo(Temp2Node.Data)^ do
begin
MethodStr:= strnew(PChar(Methods[i].FuncDecl));
@ -2129,9 +2139,9 @@ end;
function GetSimbaNews: String;
var
t: TSimbaVersionThread;
t: TDownloadThread;
begin
t := TSimbaVersionThread.Create(true);
t := TDownloadThread.Create(true);
t.InputURL:='http://simba.villavu.com/bin/news';
t.Resume;
while not t.done do
@ -2203,7 +2213,16 @@ begin
end;
procedure TForm1.ButtonTrayClick(Sender: TObject);
{var
ms : TMemoryStream;
fs : TFileStream;}
begin
{
fs := TFileStream.Create('c:\remake\fonts.tar.bz2',fmOpenRead);
ms := DecompressBZip2(fs);
fs.free;
UnTar(ms,'c:\remake\fonttest\',true);
ms.free;}
Form1.Hide;
end;
@ -2280,6 +2299,16 @@ begin
result := CurrScript.FScriptState;
end;
procedure TForm1.SetFontPath(const AValue: String);
begin
SetSetting('Settings/Fonts/Path',AValue);
end;
function TForm1.GetFontPath: String;
begin
Result := IncludeTrailingPathDelimiter(LoadSettingDef('Settings/Fonts/Path', ExpandFileName(MainDir+DS+'Fonts' + DS)));
end;
function TForm1.GetIncludePath: String;
begin
Result := IncludeTrailingPathDelimiter(LoadSettingDef('Settings/Includes/Path', ExpandFileName(MainDir+DS+'Includes' + DS)));
@ -2287,7 +2316,7 @@ end;
procedure TForm1.SetIncludePath(const AValue: String);
begin
CreateSetting('Settings/Includes/Path',AValue);
SetSetting('Settings/Includes/Path',AValue);
end;
procedure TForm1.SetScriptState(const State: TScriptState);
@ -2327,6 +2356,62 @@ function TForm1.CreateSetting(Key: string; Value: string): string;
begin
result := SettingsForm.Settings.GetSetDefaultKeyValue(Key,value);
end;
procedure TForm1.SetSetting(key: string; Value: string);
begin
//Creates the setting if needed
if CreateSetting(key,value) <> value then //The setting already occurs, and has a different value.. Lets change it
begin;
SettingsForm.Settings.SetKeyValue(key,value);
SettingsForm.Settings.SaveToXML(SimbaSettingsFile);
end;
end;
procedure TForm1.FontUpdate;
var
CurrVersion : integer;
LatestVersion : integer;
FontDownload : TDownloadThread;
Stream : TStringStream;
Decompressed : TMemoryStream;
begin
if UpdatingFonts then
exit;
UpdatingFonts := True;
CurrVersion := StrToIntDef(LoadSettingDef('Settings/Fonts/Version','-1'),-1);
LatestVersion := SimbaUpdateForm.GetLatestFontVersion;
if LatestVersion > CurrVersion then
begin;
formWriteln(format('New fonts available. Current version: %d. Latest version: %d',[CurrVersion,LatestVersion]));
FontDownload := TDownloadThread.Create(True);
FontDownload.InputURL:= LoadSettingDef('Settings/Fonts/UpdateLink',FontURL + 'Fonts.tar.bz2');
FontDownload.resume;
while FontDownload.Done = false do
begin
Application.ProcessMessages;
Sleep(25);
end;
Stream := TStringStream.Create(FontDownload.ResultStr);
try
Decompressed := DecompressBZip2(stream);
if UnTar(decompressed, FontPath,true) then
begin;
FormWriteln('Succesfully installed the new fonts!');
SetSetting('Settings/Fonts/Version',IntToStr(LatestVersion));
if Assigned(self.OCR_Fonts) then
self.OCR_Fonts.Free;
Self.OCR_Fonts := TMOCR.Create(nil);
OCR_Fonts.InitTOCR(fontPath);
end;
Decompressed.free;
finally
Stream.Free;
FontDownload.Free;
end;
end;
UpdatingFonts := False;
end;
{$ifdef mswindows}
function GetConsoleWindow: HWND; stdcall; external kernel32 name 'GetConsoleWindow';
@ -2588,6 +2673,18 @@ begin
inherited Destroy;
end;
{ TProcThread }
procedure TProcThread.Execute;
begin
if startwait <> 0 then
sleep(StartWait);
if NormalProc <> nil then
NormalProc;
if ClassProc <> nil then
ClassProc;
end;
initialization
{$I testunit.lrs}

60
Projects/SAMufasaGUI/updateform.pas
View File

@ -12,9 +12,9 @@ type
{ TSimbaUpdateForm }
{ TSimbaVersionThread }
{ TDownloadThread }
TSimbaVersionThread = class(TThread)
TDownloadThread = class(TThread)
public
ResultStr : string;
InputURL : string;
@ -42,11 +42,14 @@ type
FOldSpeed : integer;
FLastUpdateSpeed : longword;
FSimbaVersion: Integer;
SimbaVersionThread : TSimbaVersionThread;
FFontVersion : integer;
SimbaVersionThread : TDownloadThread;
FontVersionThread : TDownloadThread;
private
function OnUpdateBeat: Boolean;
public
function CanUpdate: Boolean;
function GetLatestFontVersion : integer;
function GetLatestSimbaVersion: Integer;
procedure PerformUpdate;
protected
@ -56,15 +59,6 @@ type
const
DownloadSpeedTextRunning = 'Downloading at %d kB/s';
DownloadSpeedTextEnded = 'Downloaded at %d kB/s';
var
SimbaUpdateForm: TSimbaUpdateForm;
implementation
uses
internets, TestUnit, simbasettings,lclintf;
const
SimbaURL = {$IFDEF WINDOWS}
{$IFDEF CPUI386}
'http://simba.villavu.com/bin/Windows/x86/Stable/'
@ -78,8 +72,14 @@ const
'http://simba.villavu.com/bin/Linux/x86_64/Stable/'
{$ENDIF}
{$ENDIF};
FontURL = 'http://simba.villavu.com/bin/Fonts/';
var
SimbaUpdateForm: TSimbaUpdateForm;
implementation
uses
internets, TestUnit, simbasettings,lclintf;
function TSimbaUpdateForm.CanUpdate: Boolean;
begin
@ -89,11 +89,39 @@ begin
Exit(testunit.SimbaVersion < FSimbaVersion);
end;
function TSimbaUpdateForm.GetLatestFontVersion: integer;
begin
if FontVersionThread = nil then//Create thread (only if no-other one is already running)
begin
FontVersionThread := TDownloadThread.Create(true);
FontVersionThread.InputURL := SettingsForm.Settings.GetSetLoadSaveDefaultKeyValueIfNotExists(
'Settings/Fonts/VersionLink',FontURL + 'Version',SimbaSettingsFile);
FontVersionThread.Resume;
while FontVersionThread.Done = false do//Wait till thread is done
begin
Application.ProcessMessages;
Sleep(25);
end;
FFontVersion := StrToIntDef(Trim(FontVersionThread.ResultStr), -1);//Read output
FreeAndNil(FontVersionThread);//Free the thread
end else
begin
//Another thread is already running, lets wait for it! (When it's nil, it means that the result is written!)
while FontVersionThread = nil do
begin;
Application.ProcessMessages;
Sleep(50);
end;
end;
Exit(FFontVersion);
end;
function TSimbaUpdateForm.GetLatestSimbaVersion: Integer;
begin
if SimbaVersionThread = nil then//Create thread (only if no-other one is already running)
begin
SimbaVersionThread := TSimbaVersionThread.Create(true);
SimbaVersionThread := TDownloadThread.Create(true);
SimbaVersionThread.InputURL := SettingsForm.Settings.GetSetLoadSaveDefaultKeyValueIfNotExists(
'Settings/Updater/RemoteVersionLink',SimbaURL + 'Version',SimbaSettingsFile);
@ -101,7 +129,7 @@ begin
while SimbaVersionThread.Done = false do//Wait till thread is done
begin
Application.ProcessMessages;
Sleep(50);
Sleep(25);
end;
FSimbaVersion := StrToIntDef(Trim(SimbaVersionThread.ResultStr), -1);//Read output
FreeAndNil(SimbaVersionThread);//Free the thread
@ -235,9 +263,9 @@ begin
FUpdating:= false;
end;
{ TSimbaVersionThread }
{ TDownloadThread }
procedure TSimbaVersionThread.Execute;
procedure TDownloadThread.Execute;
begin
ResultStr:= GetPage(InputURL);
done := true;

97
Units/MMLAddon/mmisc.pas Normal file
View File

@ -0,0 +1,97 @@
unit mmisc;
{$mode objfpc}
interface
uses
Classes, SysUtils,bzip2, bzip2comn,bzip2stream, libtar,mufasabase,mufasatypes;
function DecompressBZip2(const input : TStream; const BlockSize : Cardinal = 4096) : TMemoryStream;
function UnTar(const Input : TStream) : TStringArray;overload;
function UnTar(const Input : TStream; outputdir : string; overwrite : boolean): boolean;overload;
implementation
function DecompressBZip2(const input: TStream; const BlockSize: Cardinal): TMemoryStream;
var
Unzipper : TDecompressBzip2Stream;
Blocks : array of Byte;
ReadSize : cardinal;
begin
SetLength(Blocks,BlockSize);
try
Unzipper := TDecompressBzip2Stream.Create(input);
except
on e : exception do
begin;
mDebugLn(e.message);
exit;
end;
end;
Result := TMemoryStream.Create;
try
repeat
ReadSize := BlockSize;
ReadSize := Unzipper.read(blocks[0],readsize); //Read ReadSize amount of bytes.
Result.Write(Blocks[0],ReadSize);
until readsize = 0;
except
on e : EBzip2 do
if E.ErrCode <> bzip2_endoffile then
raise Exception.CreateFmt('Decompression error: %s %d',[e.message,e.errcode]);
end;
Unzipper.Free;
end;
function UnTar(const Input : TStream) : TStringArray;overload;
var
Tar : TTarArchive;
DirRec : TTarDirRec;
Len : integer;
begin;
Tar := TTarArchive.Create(input);
Tar.reset;
Len := 0;
while Tar.FindNext(DirRec) do
begin
inc(len);
SetLength(result,len*2);
result[len*2-2] := DirRec.Name;
result[len*2-1] := Tar.ReadFile;
end;
Tar.Free;
end;
function UnTar(const Input: TStream; outputdir: string; overwrite: boolean): boolean; overload;
var
Tar : TTarArchive;
DirRec : TTarDirRec;
begin;
result := false;
if not DirectoryExists(outputdir) then
if not CreateDir(outputdir) then
exit;
Tar := TTarArchive.Create(input);
Tar.reset;
while Tar.FindNext(DirRec) do
begin
if (DirRec.FileType = ftDirectory) then
begin;
if not DirectoryExists(outputdir + DirRec.Name) and not CreateDir(outputdir + DirRec.Name) then
exit
end else if (DirRec.FileType = ftNormal) then
begin;
if FileExists(outputdir + dirrec.name) and not overwrite then
continue;
Tar.ReadFile(outputdir + dirrec.name);
end else
mDebugLn(format('Unknown filetype in archive. %s',[dirrec.name]));
end;
Tar.Free;
Result := true;
end;
end.

10
Units/MMLCore/client.pas
View File

@ -60,9 +60,13 @@ implementation
procedure TClient.WriteLn(s: string);
begin
if Assigned(WritelnProc) then
WritelnProc(s)
else
if self <> nil then
begin;
if Assigned(WritelnProc) then
WritelnProc(s)
else
mDebugLn(s);
end else
mDebugLn(s);
end;

14
Units/MMLCore/fontloader.pas
View File

@ -29,7 +29,7 @@ interface
uses
Classes, SysUtils,
ocrutil; // contains the actual `loading'
ocrutil,lclintf; // contains the actual `loading'
{
We will not give any access to actual indices.
@ -68,7 +68,7 @@ type
function LoadFont(Name: String; Shadow: Boolean): boolean;
procedure SetPath(aPath: String);
function GetPath: String;
function Copy: TMFonts;
function Copy(Owner : TObject): TMFonts;
function Count : integer;
property Font[Index : integer]: TMfont read GetFontByIndex; default;
end;
@ -206,8 +206,6 @@ end;
function TMFonts.LoadFont(Name: String; Shadow: Boolean): boolean;
var
f: TMFont;
ocrdata: TOcrData;
begin
if not DirectoryExists(Path + Name) then
begin
@ -215,25 +213,23 @@ begin
Exit(False);
end;
ocrdata := InitOCR(Path + Name + DS, Shadow);
f:=TMFont.Create;
f.Name := Name;
if Shadow then
F.Name := F.Name + '_s';
f.Data := ocrdata;
f.Data := InitOCR(Path + Name + DS, Shadow);
Fonts.Add(f);
{$IFDEF FONTDEBUG}
TClient(Client).Writeln('Loaded Font ' + f.Name);
{$ENDIF}
end;
function TMFonts.Copy: TMFonts;
function TMFonts.Copy(Owner : TObject): TMFonts;
var
i:integer;
begin
Result := TMFonts.Create(Client);
Result := TMFonts.Create(Owner);
Result.Path := Self.GetPath();
for i := 0 to Self.Fonts.Count -1 do
Result.Fonts.Add(TMFont(Self.Fonts.Items[i]).Copy());

2
Units/MMLCore/ocr.pas
View File

@ -164,7 +164,7 @@ end;
{ Set new Fonts. We set it to a Copy of NewFonts }
procedure TMOCR.SetFonts(NewFonts: TMFonts);
begin
Self.Fonts := NewFonts.Copy();
Self.Fonts := NewFonts.Copy(Self.Client);
end;
{

7
Units/MMLCore/ocrutil.pas
View File

@ -70,11 +70,11 @@ uses
graphtype, intfgraphics,graphics;
{End To-Remove unit}
function ReadBMP(path: string): Tbmp;
var
LazIntf : TLazIntfImage;
RawImageDesc : TRawImageDescription;
data: array of tRGB;
begin
if FileExists(path) then
begin;
@ -84,9 +84,8 @@ begin
LazIntf.LoadFromFile(path);
Result.width := LazIntf.Width;
Result.height := LazIntf.Height;
SetLength(data,LazIntf.Width*LazIntf.Height);
Move(LazIntf.PixelData[0],data[0],LazIntf.Width*LazIntf.Height*sizeOf(tRGB));
Result.data:= data;
SetLength(result.data,LazIntf.Width*LazIntf.Height);
Move(LazIntf.PixelData[0],result.data[0],LazIntf.Width*LazIntf.Height*sizeOf(tRGB));
LazIntf.Free;
end;
end;

678
Units/Misc/bzip2.pas Normal file
View File

@ -0,0 +1,678 @@
unit bzip2;
{****************************************************************************
BZIP2 decompression unit
Copyright (C) 2002 by Daniel Mantione
This unit provides a decompression stream to decode .bz2 files. It is
inpired by Julian R. Seward's libbzip2 library and therefore you should
send credits to him and bug reports to me :)
This code is licensed under the same terms as the original libbz2 library,
which is decsribed in the file LICENSE. If you don't have this file, look
at http://www.freepascal.org for this bzip2 unit, the LICENSE file will
be included. In case of problems, contact the author.
E-mail addresses:
Daniel Mantione <daniel.mantione@freepascal.org>
Julian R. Seward <jseward@acm.org>
Please do not contact Julian about this Pascal library, he didn't wrote it.
****************************************************************************}
interface
{$goto on}
uses objects, bzip2comn,classes;
Type
pstream = ^classes.tstream;
Tbzip2_decode_stream=object(objects.Tstream)
short:cardinal;
readstream:pstream;
block_randomized:boolean;
blocksize:byte;
tt:Pcardinal_array;
tt_count:cardinal;
rle_run_left,rle_run_data:byte;
nextrle:Pbyte;
decode_available:cardinal;
block_origin:cardinal;
current_block:cardinal;
read_data,bits_available:byte;
inuse16:set of 0..15;
inuse:set of 0..255;
inuse_count:cardinal;
seq_to_unseq:array[0..255] of byte;
alphasize:cardinal;
group_count,group_pos,gsel,gminlen:byte;
group_no:cardinal;
glimit,gperm,gbase:Phuffarray;
selector_count:cardinal;
selector,selector_mtf:array[0..max_selectors] of byte;
len:array[0..max_groups,0..max_alpha_size] of byte;
limit:array[0..max_groups,0..max_alpha_size] of cardinal;
base:array[0..max_groups,0..max_alpha_size] of cardinal;
perm:array[0..max_groups,0..max_alpha_size] of cardinal;
minlens:array[0..max_groups] of byte;
cftab:array[0..257] of cardinal;
mtfbase:array[0..256 div mtfl_size-1] of cardinal;
mtfa:array[0..mtfa_size-1] of byte;
constructor init(Areadstream:pstream);
function get_bits(n:byte):byte;
function get_boolean:boolean;
function get_byte:byte;
function get_cardinal24:cardinal;
function get_cardinal:cardinal;
procedure receive_mapping_table;
procedure receive_selectors;
procedure undo_mtf_values;
procedure receive_coding_tables;
procedure make_hufftab;
procedure init_mtf;
function get_mtf_value:cardinal;
procedure move_mtf_block;
procedure receive_mtf_values;
procedure detransform;
function decode_block:boolean;
procedure read(var buf;count:Longint);virtual;
procedure new_block;
procedure consume_rle;inline;
procedure rle_read(bufptr:Pbyte;var count:Longint);
destructor done;virtual;
end;
implementation
{$ifdef i386}
{$i bzip2i386.inc}
{$endif}
{*****************************************************************************
Tbzip2_decode_stream
*****************************************************************************}
constructor Tbzip2_decode_stream.init(Areadstream:pstream);
var magic:array[1..3] of char;
c:char;
begin
readstream:=Areadstream;
{Read the magic.}
readstream^.read(magic,sizeof(magic));
if magic<>bzip2_stream_magic then
begin
error(stiniterror,bzip2_bad_header_magic);
exit;
end;
{Read the block size and allocate the working array.}
readstream^.read(c,1);
blocksize:=byte(c)-byte('0');
getmem(tt,blocksize*100000*sizeof(cardinal));
decode_available:=high(decode_available);
end;
function Tbzip2_decode_stream.get_bits(n:byte):byte;
var data:byte;
begin
if n>bits_available then
begin
readstream^.read(data,1);
get_bits:=(read_data shr (8-n)) or data shr (8-(n-bits_available));
read_data:=data shl (n-bits_available);
inc(bits_available,8);
end
else
begin
get_bits:=read_data shr (8-n);
read_data:=read_data shl n;
end;
dec(bits_available,n);
end;
function Tbzip2_decode_stream.get_boolean:boolean;
begin
get_boolean:=boolean(get_bits(1));
end;
function Tbzip2_decode_stream.get_byte:byte;
begin
get_byte:=get_bits(8);
end;
function Tbzip2_decode_stream.get_cardinal24:cardinal;
begin
get_cardinal24:=get_bits(8) shl 16 or get_bits(8) shl 8 or get_bits(8);
end;
function Tbzip2_decode_stream.get_cardinal:cardinal;
begin
get_cardinal:=get_bits(8) shl 24 or get_bits(8) shl 16 or get_bits(8) shl 8 or
get_bits(8);
end;
procedure Tbzip2_decode_stream.receive_mapping_table;
{Receive the mapping table. To save space, the inuse set is stored in pieces
of 16 bits. First 16 bits are stored which pieces of 16 bits are used, then
the pieces follow.}
var i,j:byte;
begin
inuse16:=[];
{Receive the first 16 bits which tell which pieces are stored.}
for i:=0 to 15 do
if get_boolean then
include(inuse16,i);
{Receive the used pieces.}
inuse:=[];
inuse_count:=0;
for i:=0 to 15 do
if i in inuse16 then
for j:=0 to 15 do
if get_boolean then
begin
include(inuse,16*i+j);
seq_to_unseq[inuse_count]:=16*i+j;
inc(inuse_count);
end;
{ system.write('Mapping table: ');
for i:=0 to 255 do
if i in inuse then
system.write(i,' ');
writeln;}
end;
procedure Tbzip2_decode_stream.receive_selectors;
{Receives the selectors.}
var i:cardinal;
j:byte;
begin
group_count:=get_bits(3);
selector_count:=get_bits(8) shl 7 or get_bits(7);
for i:=0 to selector_count-1 do
begin
j:=0;
while get_boolean do
begin
inc(j);
if j>5 then
error(streaderror,bzip2_data_error);
end;
selector_mtf[i]:=j;
end;
{ system.write('Selector_mtf: ');
for i:=0 to selector_count-1 do
system.write(selector_mtf[i],' ');
writeln;}
end;
procedure Tbzip2_decode_stream.undo_mtf_values;
{Undo the MTF values for the selectors.}
var pos:array[0..max_groups] of byte;
i:cardinal;
v,tmp:byte;
begin
for v:=0 to group_count-1 do
pos[v]:=v;
for i:=0 to selector_count-1 do
begin
v:=selector_mtf[i];
tmp:=pos[v];
while v<>0 do
begin
pos[v]:=pos[v-1];
dec(v);
end;
pos[0]:=tmp;
selector[i]:=tmp;
end;
end;
procedure Tbzip2_decode_stream.receive_coding_tables;
var t,curr:byte;
i:cardinal;
begin
for t:=0 to group_count-1 do
begin
curr:=get_bits(5);
for i:=0 to alphasize-1 do
begin
repeat
if not(curr in [1..20]) then
begin
error(streaderror,bzip2_data_error);
exit;
end;
if not get_boolean then
break;
if get_boolean then
dec(curr)
else
inc(curr);
until false;
len[t,i]:=curr;
end;
end;
{ writeln('Coding tables:');
for t:=0 to group_count-1 do
begin
for i:=0 to alphasize-1 do
system.write(len[t,i],' ');
writeln;
end;}
end;
procedure Tbzip2_decode_stream.make_hufftab;
{Builds the Huffman tables.}
var i:cardinal;
t,minlen,maxlen:byte;
begin
for t:=0 to group_count-1 do
begin
minlen:=32;
maxlen:=0;
for i:=0 to alphasize-1 do
begin
if len[t,i]>maxlen then
maxlen:=len[t,i];
if len[t,i]<minlen then
minlen:=len[t,i];
end;
hb_create_decode_tables(limit[t],base[t],perm[t],len[t],
minlen,maxlen,alphasize);
minlens[t]:=minlen;
end;
end;
procedure Tbzip2_decode_stream.init_mtf;
var i,j:byte;
k:cardinal;
begin
k:=mtfa_size-1;
for i:=256 div mtfl_size-1 downto 0 do
begin
for j:=mtfl_size-1 downto 0 do
begin
mtfa[k]:=i*mtfl_size+j;
dec(k);
end;
mtfbase[i]:=k+1;
end;
end;
function Tbzip2_decode_stream.get_mtf_value:cardinal;
var zn:byte;
zvec:cardinal;
begin
if group_pos=0 then
begin
inc(group_no);
group_pos:=group_size;
gsel:=selector[group_no];
gminlen:=minlens[gsel];
glimit:=@limit[gsel];
gperm:=@perm[gsel];
gbase:=@base[gsel];
end;
dec(group_pos);
zn:=gminlen;
zvec:=get_bits(zn);
while zvec>glimit^[zn] do
begin
inc(zn);
zvec:=zvec shl 1 or byte(get_boolean);
end;
get_mtf_value:=gperm^[zvec-gbase^[zn]];
end;
procedure Tbzip2_decode_stream.move_mtf_block;
var i:byte;
j,k:cardinal;
begin
k:=MTFA_SIZE;
for i:=256 div MTFL_SIZE-1 downto 0 do
begin
j:=mtfbase[i];
Pcardinal(@mtfa[k- 4])^:=Pcardinal(@mtfa[j+12])^;
Pcardinal(@mtfa[k- 8])^:=Pcardinal(@mtfa[j+ 8])^;
Pcardinal(@mtfa[k-12])^:=Pcardinal(@mtfa[j+ 4])^;
dec(k,16);
Pcardinal(@mtfa[k ])^:=Pcardinal(@mtfa[j ])^;
mtfbase[i]:=k;
end;
end;
procedure Tbzip2_decode_stream.receive_mtf_values;
const run_a=0;
run_b=1;
var t,next_sym:cardinal;
es:cardinal;
n:byte;
nn,i:cardinal;
p,q:Pbyte;
u,v:Pcardinal;
lno,off:cardinal;
begin
group_no:=high(group_no);
group_pos:=0;
t:=0;
for i:=0 to 257 do
cftab[i]:=0;
init_mtf;
next_sym:=get_mtf_value;
while next_sym<>inuse_count+1 do
begin
{ writeln(t,' ',next_sym);
if t=22296 then
t:=t; }
if next_sym<=run_b then
begin
es:=0;
n:=0;
repeat
inc(es,(next_sym+1) shl n);
inc(n);
next_sym:=get_mtf_value;
until next_sym>run_b;
n:=seq_to_unseq[mtfa[mtfbase[0]]];
inc(cftab[n],es);
if t+es>100000*blocksize then
begin
error(streaderror,bzip2_data_error);
exit;
end;
while es>0 do
begin
tt^[t]:=n;
dec(es);
inc(t);
end;
end
else
begin
nn:=next_sym-1;
if nn<mtfl_size then
begin
{Avoid the costs of the general case.}
p:=@mtfa[mtfbase[0]];
q:=p+nn;
n:=q^;
repeat
q^:=(q-1)^;
dec(q);
until q=p;
q^:=n;
end
else
begin
{General case.}
lno:=nn div MTFL_SIZE;
off:=nn and (MTFL_SIZE-1);
p:=@mtfa[mtfbase[lno]];
q:=p+off;
n:=q^;
while(q<>p) do
begin
q^:=(q-1)^;
dec(q);
end;
u:=@mtfbase;
v:=u+lno;
repeat
mtfa[v^]:=mtfa[(v-1)^+MTFL_SIZE-1];
dec(v);
dec(v^);
until v=u;
mtfa[v^]:=n;
if v^=0 then
move_mtf_block;
end;
inc(cftab[seq_to_unseq[n]]);
tt^[t]:=cardinal(seq_to_unseq[n]);
inc(t);
if t>100000*blocksize then
begin
error(streaderror,bzip2_data_error);
exit;
end;
next_sym:=get_mtf_value;
end;
end;
tt_count:=t;
{Setup cftab to facilitate generation of T^(-1).}
t:=0;
for i:=0 to 256 do
begin
nn:=cftab[i];
cftab[i]:=t;
{ writeln(i,' ',t);}
inc(t,nn);
end;
end;
{$ifndef HAVE_DETRANSFORM}
procedure Tbzip2_decode_stream.detransform;
var a:cardinal;
p,q,r:Pcardinal;
begin
a:=0;
p:=@tt^[0];
q:=p+tt_count;
while p<>q do
begin
r:=@tt^[cftab[p^ and $ff]];
inc(cftab[p^ and $ff]);
r^:=r^ or a;
inc(a,256);
inc(p);
end;
end;
{$endif}
function Tbzip2_decode_stream.decode_block:boolean;
{Decode a new compressed block.}
var magic:array[1..6] of char;
stored_blockcrc:cardinal;
i:byte;
begin
for i:=1 to 6 do
magic[i]:=char(get_byte);
if magic='1AY&SY' then
begin
inc(current_block);
{ writeln('Block ',current_block,': Header ok');}
stored_blockcrc:=get_cardinal;
block_randomized:=get_boolean;
block_origin:=get_cardinal24;
{Receive the mapping table.}
receive_mapping_table;
alphasize:=cardinal(inuse_count)+2;
{ writeln('Mapping table ok.');}
{Receive the selectors.}
receive_selectors;
if status<>0 then
exit;
{ writeln('Selectors ok.');}
{Undo the MTF values for the selectors.}
undo_mtf_values;
{ writeln('Undo mtf ok.');}
{Receive the coding tables.}
receive_coding_tables;
if status<>0 then
exit;
{ writeln('Coding tables ok');}
{Build the Huffman tables.}
make_hufftab;
{ writeln('Huffman ok.');}
{Receive the MTF values.}
receive_mtf_values;
{ writeln('MTF OK');}
{Undo the Burrows Wheeler transformation.}
detransform;
{ writeln('Detransform OK');}
decode_available:=tt_count;
end
else
begin
if magic<>#$17'rE8P'#$90 then
error(streaderror,bzip2_bad_block_magic);
decode_block:=false;
end;
end;
procedure Tbzip2_decode_stream.new_block;
begin
if decode_block then
nextrle:=@tt^[tt^[block_origin] shr 8]
else
begin
error(streaderror,bzip2_endoffile);
nextrle:=nil;
end;
end;
procedure Tbzip2_decode_stream.consume_rle;inline;
{Make nextrle point to the next decoded byte. If nextrle did point to the last
byte in the current block, decode the next block.}
begin
{ Pcardinal(nextrle)^:=Pcardinal(nextrle)^ shr 8;}
nextrle:=@tt^[Pcardinal(nextrle)^ shr 8];
dec(decode_available);
if decode_available=0 then
new_block;
end;
procedure Tbzip2_decode_stream.rle_read(bufptr:Pbyte;var count:Longint);
var rle_len:cardinal;
data:byte;
label rle_write;
begin
rle_len:=rle_run_left;
data:=rle_run_data;
if block_randomized then
{Not yet implemented.}
runerror(212)
else
begin
if rle_len<>0 then
{Speed is important. Instead of an if statement within the
repeat loop use a goto outside the loop.}
goto rle_write;
repeat
if decode_available=0 then
break;
rle_len:=1;
data:=nextrle^;
consume_rle;
if (decode_available>0) and (data=nextrle^) then
begin
inc(rle_len);
consume_rle;
if (decode_available>0) and (data=nextrle^) then
begin
inc(rle_len);
consume_rle;
if (decode_available>0) and (data=nextrle^) then
begin
consume_rle;
inc(rle_len,nextrle^+1);
consume_rle;
end;
end;
end;
rle_write:
repeat
bufptr^:=data;
inc(bufptr);
dec(count);
dec(rle_len);
until (rle_len=0) or (count=0);
until count=0;
short:=count;
end;
rle_run_data:=data;
rle_run_left:=rle_len;
end;
procedure Tbzip2_decode_stream.read(var buf;count:Longint);
var bufptr:Pbyte;
begin
short:=0;
bufptr:=@buf;
if decode_available=high(decode_available) then
begin
{Initialize the rle process:
- Decode a block
- Initialize pointer.}
if not decode_block then
begin
error(streaderror,bzip2_endoffile);
nextrle:=nil;
end;
nextrle:=@tt^[tt^[block_origin] shr 8];
end;
rle_read(bufptr,count);
end;
destructor Tbzip2_decode_stream.done;
begin
if tt<>nil then
freemem(tt,blocksize*100000*sizeof(cardinal));
inherited done;
end;
end.

76
Units/Misc/bzip2comn.pp Normal file
View File

@ -0,0 +1,76 @@
unit bzip2comn;
interface
const
max_groups = 6;
max_alpha_size = 258;
max_code_len = 23;
group_size = 50;
iter_count = 4;
max_selectors = 2+(900000 div group_size);
mtfa_size = 4096;
mtfl_size = 16;
type
TCardinal_array = array [0..899999] of Cardinal;
PCardinal_array = ^TCardinal_array;
PCardinal = ^Cardinal;
Thuffarray = array[0..max_alpha_size] of Cardinal;
Phuffarray = ^Thuffarray;
{A bzip2 stream starts with this:}
const bzip2_stream_magic='BZh';
{Error codes for stream errorinfo.}
const
bzip2_bad_header_magic = 1;
bzip2_bad_block_magic = 2;
bzip2_endoffile = 3;
bzip2_data_error = 4;
procedure hb_create_decode_tables(var limit,base,perm:array of cardinal;
var length:array of byte;
minlen,maxlen:byte;alphasize:cardinal);
implementation
procedure hb_create_decode_tables(var limit,base,perm:array of cardinal;
var length:array of byte;
minlen,maxlen:byte;alphasize:cardinal);
var pp,i,j,vec:cardinal;
begin
pp:=0;
for i:=minlen to maxlen do
for j:=0 to alphasize-1 do
if length[j]=i then
begin
perm[pp]:=j;
inc(pp);
end;
for i:=0 to max_code_len-1 do
begin
base[i]:=0;
limit[i]:=0;
end;
for i:=0 to alphasize-1 do
inc(base[length[i]+1]);
for i:=1 to max_code_len-1 do
inc(base[i],base[i-1]);
vec:=0;
for i:=minlen to maxlen do
begin
inc(vec,base[i+1]-base[i]);
limit[i]:=vec-1;
vec:=vec shl 1;
end;
for i:=minlen+1 to maxlen do
base[i]:=((limit[i-1]+1) shl 1)-base[i];
end;
end.

56
Units/Misc/bzip2i386.inc Normal file
View File

@ -0,0 +1,56 @@
{$ASMMODE intel}
{$define HAVE_DETRANSFORM}
{
procedure Tbzip2_decode_stream.detransform;
var a:cardinal;
p,q,r:Pcardinal;
begin
a:=0;
p:=@tt^[0];
q:=p+tt_count;
while p<>q do
begin
r:=@tt^[cftab[p^ and $ff]];
inc(cftab[p^ and $ff]);
r^:=r^ or a;
inc(a,256);
inc(p);
end;
end;
}
{const c:cardinal=0;
procedure mcount;external name 'mcount';}
procedure Tbzip2_decode_stream.detransform;assembler;
asm
{ mov edx,offset c
call mcount}
xor edx,edx
lea ebx,[esi+Tbzip2_decode_stream.cftab]
mov ecx,[esi+Tbzip2_decode_stream.tt_count]
push esi
push ebp
mov esi,[esi+Tbzip2_decode_stream.tt]
mov edi,esi
lea ebp,[4*ecx+esi]
jmp @a2
@a1:
movzx eax,byte [esi]
mov ecx,[ebx+4*eax]
inc dword [ebx+4*eax]
or [edi+4*ecx],edx
add edx,$100
add esi,4
@a2:
cmp esi,ebp
jne @a1
pop ebp
pop esi
end ['eax','ebx','ecx','edx','edi'];

31
Units/Misc/bzip2si386.inc Normal file
View File

@ -0,0 +1,31 @@
{$ASMMODE intel}
{$define HAVE_DETRANSFORM}
procedure TDecompressBzip2Stream.detransform;assembler;
asm
{ mov edx,offset c
call mcount}
xor edx,edx
lea ebx,[esi+TDecompressBzip2Stream.cftab]
mov ecx,[esi+TDecompressBzip2Stream.tt_count]
push esi
push ebp
mov esi,[esi+TDecompressBzip2Stream.tt]
mov edi,esi
lea ebp,[4*ecx+esi]
jmp @a2
@a1:
movzx eax,byte [esi]
mov ecx,[ebx+4*eax]
inc dword [ebx+4*eax]
or [edi+4*ecx],edx
add edx,$100
add esi,4
@a2:
cmp esi,ebp
jne @a1
pop ebp
pop esi
end ['eax','ebx','ecx','edx','edi'];

668
Units/Misc/bzip2stream.pp Normal file
View File

@ -0,0 +1,668 @@
{$mode objfpc}
{$h+}
unit bzip2stream;
{****************************************************************************
BZIP2 decompression unit
Copyright (C) 2002 by Daniel Mantione
Class port (C) 2009 by Michael Van Canneyt
This unit provides a decompression stream to decode .bz2 files. It is
inpired by Julian R. Seward's libbzip2 library and therefore you should
send credits to him and bug reports to me :)
This code is licensed under the same terms as the original libbz2 library,
which is decsribed in the file LICENSE. If you don't have this file, look
at http://www.freepascal.org for this bzip2 unit, the LICENSE file will
be included. In case of problems, contact the author.
E-mail addresses:
Michael Van Canneyt <michael@freepascal.org>
Daniel Mantione <daniel.mantione@freepascal.org>
Julian R. Seward <jseward@acm.org>
Please do not contact Julian about this Pascal library, he didn't wrote it.
****************************************************************************}
interface
{$goto on}
uses Classes,SysUtils, bzip2comn;
Type
TDecompressBzip2Stream=Class(TOwnerStream)
Private
block_randomized:boolean;
blocksize:byte;
tt:Pcardinal_array;
tt_count:cardinal;
rle_run_left,rle_run_data:byte;
nextrle:Pbyte;
decode_available:cardinal;
block_origin:cardinal;
current_block:cardinal;
read_data,bits_available:byte;
inuse16:set of 0..15;
inuse:set of 0..255;
inuse_count:cardinal;
seq_to_unseq:array[0..255] of byte;
alphasize:cardinal;
group_count,group_pos,gsel,gminlen:byte;
group_no:cardinal;
glimit,gperm,gbase:Phuffarray;
selector_count:cardinal;
selector,selector_mtf:array[0..max_selectors] of byte;
len:array[0..max_groups,0..max_alpha_size] of byte;
limit:array[0..max_groups,0..max_alpha_size] of cardinal;
base:array[0..max_groups,0..max_alpha_size] of cardinal;
perm:array[0..max_groups,0..max_alpha_size] of cardinal;
minlens:array[0..max_groups] of byte;
cftab:array[0..257] of cardinal;
mtfbase:array[0..256 div mtfl_size-1] of cardinal;
mtfa:array[0..mtfa_size-1] of byte;
function get_bits(n:byte):byte;
function get_boolean:boolean;
function get_byte:byte;
function get_cardinal24:cardinal;
function get_cardinal:cardinal;
procedure receive_mapping_table;
procedure receive_selectors;
procedure undo_mtf_values;
procedure receive_coding_tables;
procedure make_hufftab;
procedure init_mtf;
function get_mtf_value:cardinal;
procedure move_mtf_block;
procedure receive_mtf_values;
procedure detransform;
function decode_block : boolean;
Function new_block : boolean;
Function consume_rle : Boolean; inline;
Function rle_read(bufptr:Pbyte;count:Longint) : longint;
Procedure Error(Msg : String; ACode : Integer);
Public
Constructor Create(ASource : TStream);
Destructor Destroy; override;
function Read(var Buffer; Count: Longint): Longint; override;
end;
EBzip2 = Class(Exception)
ErrCode : Integer;
end;
implementation
{$ifdef i386}
{$i bzip2si386.inc}
{$endif}
{*****************************************************************************
TDecompressBzip2Stream
*****************************************************************************}
Resourcestring
BZip2Initialize = 'Invalid BZip2 stream: invalid header';
SDecodingError = 'Decoding error';
SErrUnimplemented = 'Feature not implemented';
Constructor TDecompressBzip2Stream.Create(ASource: TStream);
var magic:array[1..3] of char;
c:char;
begin
Inherited Create(ASource);
{Read the magic.}
Source.ReadBuffer(magic,sizeof(magic));
if magic<>bzip2_stream_magic then
Error(BZip2Initialize,bzip2_bad_header_magic);
{Read the block size and allocate the working array.}
Source.ReadBuffer(c,1);
blocksize:=byte(c)-byte('0');
GetMem(tt,blocksize*100000*sizeof(cardinal));
decode_available:=high(decode_available);
end;
Procedure TDecompressBzip2Stream.Error(Msg : String; ACode : Integer);
Var
BE : EBzip2;
begin
BE:=EBzip2.Create(Msg);
BE.ErrCode:=ACode;
Raise BE;
end;
function TDecompressBzip2Stream.get_bits(n:byte):byte;
var data:byte;
begin
if n>bits_available then
begin
Source.ReadBuffer(data,1);
get_bits:=(read_data shr (8-n)) or data shr (8-(n-bits_available));
read_data:=data shl (n-bits_available);
inc(bits_available,8);
end
else
begin
get_bits:=read_data shr (8-n);
read_data:=read_data shl n;
end;
dec(bits_available,n);
end;
function TDecompressBzip2Stream.get_boolean:boolean;
begin
get_boolean:=boolean(get_bits(1));
end;
function TDecompressBzip2Stream.get_byte:byte;
begin
get_byte:=get_bits(8);
end;
function TDecompressBzip2Stream.get_cardinal24:cardinal;
begin
get_cardinal24:=get_bits(8) shl 16 or get_bits(8) shl 8 or get_bits(8);
end;
function TDecompressBzip2Stream.get_cardinal:cardinal;
begin
get_cardinal:=get_bits(8) shl 24 or get_bits(8) shl 16 or get_bits(8) shl 8 or
get_bits(8);
end;
procedure TDecompressBzip2Stream.receive_mapping_table;
{Receive the mapping table. To save space, the inuse set is stored in pieces
of 16 bits. First 16 bits are stored which pieces of 16 bits are used, then
the pieces follow.}
var i,j:byte;
begin
inuse16:=[];
{Receive the first 16 bits which tell which pieces are stored.}
for i:=0 to 15 do
if get_boolean then
include(inuse16,i);
{Receive the used pieces.}
inuse:=[];
inuse_count:=0;
for i:=0 to 15 do
if i in inuse16 then
for j:=0 to 15 do
if get_boolean then
begin
include(inuse,16*i+j);
seq_to_unseq[inuse_count]:=16*i+j;
inc(inuse_count);
end;
{ system.write('Mapping table: ');
for i:=0 to 255 do
if i in inuse then
system.write(i,' ');
writeln;}
end;
procedure TDecompressBzip2Stream.receive_selectors;
{Receives the selectors.}
var i:cardinal;
j:byte;
begin
group_count:=get_bits(3);
selector_count:=get_bits(8) shl 7 or get_bits(7);
for i:=0 to selector_count-1 do
begin
j:=0;
while get_boolean do
begin
inc(j);
if j>5 then
error(SDecodingError,bzip2_data_error);
end;
selector_mtf[i]:=j;
end;
{ system.write('Selector_mtf: ');
for i:=0 to selector_count-1 do
system.write(selector_mtf[i],' ');
writeln;}
end;
procedure TDecompressBzip2Stream.undo_mtf_values;
{Undo the MTF values for the selectors.}
var pos:array[0..max_groups] of byte;
i:cardinal;
v,tmp:byte;
begin
for v:=0 to group_count-1 do
pos[v]:=v;
for i:=0 to selector_count-1 do
begin
v:=selector_mtf[i];
tmp:=pos[v];
while v<>0 do
begin
pos[v]:=pos[v-1];
dec(v);
end;
pos[0]:=tmp;
selector[i]:=tmp;
end;
end;
procedure TDecompressBzip2Stream.receive_coding_tables;
var t,curr:byte;
i:cardinal;
begin
for t:=0 to group_count-1 do
begin
curr:=get_bits(5);
for i:=0 to alphasize-1 do
begin
repeat
if not(curr in [1..20]) then
error(SDecodingError,bzip2_data_error);
if not get_boolean then
break;
if get_boolean then
dec(curr)
else
inc(curr);
until false;
len[t,i]:=curr;
end;
end;
end;
procedure TDecompressBzip2Stream.make_hufftab;
{Builds the Huffman tables.}
var i:cardinal;
t,minlen,maxlen:byte;
begin
for t:=0 to group_count-1 do
begin
minlen:=32;
maxlen:=0;
for i:=0 to alphasize-1 do
begin
if len[t,i]>maxlen then
maxlen:=len[t,i];
if len[t,i]<minlen then
minlen:=len[t,i];
end;
hb_create_decode_tables(limit[t],base[t],perm[t],len[t],
minlen,maxlen,alphasize);
minlens[t]:=minlen;
end;
end;
procedure TDecompressBzip2Stream.init_mtf;
var i,j:byte;
k:cardinal;
begin
k:=mtfa_size-1;
for i:=256 div mtfl_size-1 downto 0 do
begin
for j:=mtfl_size-1 downto 0 do
begin
mtfa[k]:=i*mtfl_size+j;
dec(k);
end;
mtfbase[i]:=k+1;
end;
end;
function TDecompressBzip2Stream.get_mtf_value:cardinal;
var zn:byte;
zvec:cardinal;
begin
if group_pos=0 then
begin
inc(group_no);
group_pos:=group_size;
gsel:=selector[group_no];
gminlen:=minlens[gsel];
glimit:=@limit[gsel];
gperm:=@perm[gsel];
gbase:=@base[gsel];
end;
dec(group_pos);
zn:=gminlen;
zvec:=get_bits(zn);
while zvec>glimit^[zn] do
begin
inc(zn);
zvec:=zvec shl 1 or byte(get_boolean);
end;
get_mtf_value:=gperm^[zvec-gbase^[zn]];
end;
procedure TDecompressBzip2Stream.move_mtf_block;
var i:byte;
j,k:cardinal;
begin
k:=MTFA_SIZE;
for i:=256 div MTFL_SIZE-1 downto 0 do
begin
j:=mtfbase[i];
Pcardinal(@mtfa[k- 4])^:=Pcardinal(@mtfa[j+12])^;
Pcardinal(@mtfa[k- 8])^:=Pcardinal(@mtfa[j+ 8])^;
Pcardinal(@mtfa[k-12])^:=Pcardinal(@mtfa[j+ 4])^;
dec(k,16);
Pcardinal(@mtfa[k ])^:=Pcardinal(@mtfa[j ])^;
mtfbase[i]:=k;
end;
end;
procedure TDecompressBzip2Stream.receive_mtf_values;
const run_a=0;
run_b=1;
var t,next_sym:cardinal;
es:cardinal;
n:byte;
nn,i:cardinal;
p,q:Pbyte;
u,v:Pcardinal;
lno,off:cardinal;
begin
group_no:=high(group_no);
group_pos:=0;
t:=0;
for i:=0 to 257 do
cftab[i]:=0;
init_mtf;
next_sym:=get_mtf_value;
while next_sym<>inuse_count+1 do
begin
{ writeln(t,' ',next_sym);
if t=22296 then
t:=t; }
if next_sym<=run_b then
begin
es:=0;
n:=0;
repeat
inc(es,(next_sym+1) shl n);
inc(n);
next_sym:=get_mtf_value;
until next_sym>run_b;
n:=seq_to_unseq[mtfa[mtfbase[0]]];
inc(cftab[n],es);
if t+es>100000*blocksize then
error(SDecodingError,bzip2_data_error);
while es>0 do
begin
tt^[t]:=n;
dec(es);
inc(t);
end;
end
else
begin
nn:=next_sym-1;
if nn<mtfl_size then
begin
{Avoid the costs of the general case.}
p:=@mtfa[mtfbase[0]];
q:=p+nn;
n:=q^;
repeat
q^:=(q-1)^;
dec(q);
until q=p;
q^:=n;
end
else
begin
{General case.}
lno:=nn div MTFL_SIZE;
off:=nn and (MTFL_SIZE-1);
p:=@mtfa[mtfbase[lno]];
q:=p+off;
n:=q^;
while(q<>p) do
begin
q^:=(q-1)^;
dec(q);
end;
u:=@mtfbase;
v:=u+lno;
repeat
mtfa[v^]:=mtfa[(v-1)^+MTFL_SIZE-1];
dec(v);
dec(v^);
until v=u;
mtfa[v^]:=n;
if v^=0 then
move_mtf_block;
end;
inc(cftab[seq_to_unseq[n]]);
tt^[t]:=cardinal(seq_to_unseq[n]);
inc(t);
if t>100000*blocksize then
error(SDecodingError,bzip2_data_error);
next_sym:=get_mtf_value;
end;
end;
tt_count:=t;
{Setup cftab to facilitate generation of T^(-1).}
t:=0;
for i:=0 to 256 do
begin
nn:=cftab[i];
cftab[i]:=t;
{ writeln(i,' ',t);}
inc(t,nn);
end;
end;
{$ifndef HAVE_DETRANSFORM}
procedure TDecompressBzip2Stream.detransform;
var a:cardinal;
p,q,r:Pcardinal;
begin
a:=0;
p:=@tt^[0];
q:=p+tt_count;
while p<>q do
begin
r:=@tt^[cftab[p^ and $ff]];
inc(cftab[p^ and $ff]);
r^:=r^ or a;
inc(a,256);
inc(p);
end;
end;
{$endif}
function TDecompressBzip2Stream.decode_block:boolean;
{Decode a new compressed block.}
var magic:array[1..6] of char;
stored_blockcrc:cardinal;
i:byte;
begin
for i:=1 to 6 do
magic[i]:=char(get_byte);
if magic='1AY&SY' then
begin
inc(current_block);
stored_blockcrc:=get_cardinal;
block_randomized:=get_boolean;
block_origin:=get_cardinal24;
{Receive the mapping table.}
receive_mapping_table;
alphasize:=cardinal(inuse_count)+2;
{Receive the selectors. Raises exception}
receive_selectors;
{Undo the MTF values for the selectors.}
undo_mtf_values;
{Receive the coding tables.}
receive_coding_tables;
{Build the Huffman tables.}
make_hufftab;
{Receive the MTF values.}
receive_mtf_values;
{Undo the Burrows Wheeler transformation.}
detransform;
decode_available:=tt_count;
Result:=True;
end
else
begin
if magic<>#$17'rE8P'#$90 then
error(SDecodingError,bzip2_bad_block_magic);
Result:=false;
end;
end;
Function TDecompressBzip2Stream.new_block : Boolean;
begin
Result:=decode_block;
If result then
nextrle:=@tt^[tt^[block_origin] shr 8]
else
nextrle:=nil;
end;
Function TDecompressBzip2Stream.consume_rle : Boolean;inline;
{Make nextrle point to the next decoded byte. If nextrle did point to the last
byte in the current block, decode the next block.}
begin
{ Pcardinal(nextrle)^:=Pcardinal(nextrle)^ shr 8;}
nextrle:=@tt^[Pcardinal(nextrle)^ shr 8];
dec(decode_available);
if decode_available=0 then
Result:=new_block
else
Result:=True;
end;
Function TDecompressBzip2Stream.rle_read(bufptr:Pbyte;Count:Longint) : LongInt;
var rle_len:cardinal;
data:byte;
label rle_write;
begin
Result:=0;
rle_len:=rle_run_left;
data:=rle_run_data;
if block_randomized then
{Not yet implemented.}
Error(SErrUnimplemented,-1)
else
begin
if rle_len<>0 then
{Speed is important. Instead of an if statement within the
repeat loop use a goto outside the loop.}
goto rle_write;
repeat
if decode_available=0 then
break;
rle_len:=1;
data:=nextrle^;
if consume_rle and (decode_available>0) and (data=nextrle^) then
begin
inc(rle_len);
if consume_rle and (decode_available>0) and (data=nextrle^) then
begin
inc(rle_len);
if consume_rle and (decode_available>0) and (data=nextrle^) then
begin
if consume_rle then
inc(rle_len,nextrle^+1);
consume_rle;
end;
end;
end;
rle_write:
repeat
bufptr^:=data;
inc(bufptr);
dec(count);
dec(rle_len);
inc(Result);
until (rle_len=0) or (count=0);
until count=0;
end;
rle_run_data:=data;
rle_run_left:=rle_len;
end;
Function TDecompressBzip2Stream.Read(var Buffer; Count : Longint) : LongInt;
var bufptr:Pbyte;
begin
bufptr:=@buffer;
if decode_available=high(decode_available) then
begin
{Initialize the rle process:
- Decode a block
- Initialize pointer.}
if not decode_block then
begin
nextrle:=nil;
error(SDecodingError,bzip2_endoffile);
end;
nextrle:=@tt^[tt^[block_origin] shr 8];
end;
Result:=rle_read(bufptr,count);
end;
Destructor TDecompressBzip2Stream.Destroy;
begin
if tt<>nil then
FreeMem(tt,blocksize*100000*sizeof(cardinal));
Inherited;
end;
end.