Skip to content
Permalink
Browse files

Merge pull request #59 from tedsmith/3.0.5-small-fixes

3.0.5 small fixes
  • Loading branch information...
tedsmith committed Jul 18, 2019
2 parents 8b8f2cd + b397f63 commit aaeb6ebca9e9d70a80927411fdbed08a249f6349
Showing with 1,317 additions and 1,745 deletions.
  1. +1 −1 .gitignore
  2. +4 −4 GPTMBR.pas
  3. +4 −4 dbases_sqlite.lfm
  4. +30 −23 dbases_sqlite.lrs
  5. +2 −4 dbases_sqlite.pas
  6. +47 −47 diskmodule.lfm
  7. +44 −33 diskmodule.pas
  8. +3 −3 diskspecification.lfm
  9. +0 −2 frmaboutunit.lrs
  10. +41 −459 quickhash.lpi
  11. +3 −3 quickhash.lpr
  12. +23 −39 quickhash_linux.lpi
  13. +1 −1 udisplaygrid.lfm
  14. +47 −39 udisplaygrid.lrs
  15. +241 −242 unit2.lfm
  16. +796 −791 unit2.lrs
  17. +30 −50 unit2.pas
@@ -1,6 +1,6 @@
# Lazarus compiler-generated binaries (safe to delete)
*.exe
*.dll
#*.dll
*.so
*.dylib
#*.lrs
@@ -93,18 +93,18 @@ implementation
function MBR_or_GPT(SelectedDisk : widestring) : string;

const
PARTITION_STYLE_MBR = 0;
PARTITION_STYLE_GPT = 1;
PARTITION_STYLE_RAW = 2;
//PARTITION_STYLE_MBR = 0;
//PARTITION_STYLE_GPT = 1;
//PARTITION_STYLE_RAW = 2;

IOCTL_DISK_GET_DRIVE_LAYOUT_EX = $00070050;
var
i: Integer;
Drive: widestring;
hDevice: THandle;
DriveLayoutInfo: TDriveLayoutInformationEx;
BytesReturned: DWORD;
begin
BytesReturned := 0;
result := '';
Drive := SelectedDisk;
// This particular handle assignment does not require admin rights as it allows
@@ -1,7 +1,7 @@
object frmSQLiteDBases: TfrmSQLiteDBases
Left = 1089
Left = 1387
Height = 562
Top = 34
Top = 109
Width = 252
Caption = 'frmSQLiteDBases'
ClientHeight = 562
@@ -12,9 +12,9 @@ object frmSQLiteDBases: TfrmSQLiteDBases
LCLVersion = '1.8.4.0'
object lblConnectionStatus: TLabel
Left = 32
Height = 17
Height = 15
Top = 32
Width = 83
Width = 81
Caption = 'Not Connected'
ParentColor = False
end
@@ -1,23 +1,30 @@
{ This is an automatically generated lazarus resource file }

LazarusResources.Add('TfrmSQLiteDBases','FORMDATA',[
'TPF0'#16'TfrmSQLiteDBases'#15'frmSQLiteDBases'#4'Left'#3#181#5#6'Height'#3
+#250#1#3'Top'#3#182#0#5'Width'#3#252#0#7'Caption'#6#15'frmSQLiteDBases'#12'C'
+'lientHeight'#3#250#1#11'ClientWidth'#3#252#0#7'OnClose'#7#9'FormClose'#8'On'
+'Create'#7#10'FormCreate'#10'LCLVersion'#6#7'1.6.4.0'#7'Visible'#9#0#6'TLabe'
+'l'#19'lblConnectionStatus'#4'Left'#2' '#6'Height'#2#13#3'Top'#2' '#5'Width'
+#2'H'#7'Caption'#6#13'Not Connected'#11'ParentColor'#8#0#0#11'TDataSource'#11
+'DataSource1'#7'DataSet'#7#9'SQLQuery1'#4'left'#2'0'#3'top'#3#144#0#0#0#9'TS'
+'QLQuery'#9'SQLQuery1'#9'FieldDefs'#14#0#8'Database'#7#18'SQLite3Connection1'
+#11'Transaction'#7#15'SQLTransaction1'#7'Options'#11#0#6'Params'#14#0#4'left'
+#2'0'#3'top'#2'P'#0#0#15'TSQLTransaction'#15'SQLTransaction1'#6'Active'#8#8
+'Database'#7#18'SQLite3Connection1'#7'Options'#11#0#4'left'#2'0'#3'top'#3#224
+#0#0#0#18'TSQLite3Connection'#18'SQLite3Connection1'#9'Connected'#8#11'Login'
+'Prompt'#8#14'KeepConnection'#8#11'Transaction'#7#15'SQLTransaction1'#7'Opti'
+'ons'#11#0#4'left'#2'0'#3'top'#3'('#1#0#0#12'TCSVExporter'#12'CSVExporter1'
+#12'ExportFields'#14#0#15'RestorePosition'#8#31'FormatSettings.DecimalSepara'
+'tor'#6#1#0#29'FormatSettings.CurrencyDigits'#2#0#29'FormatSettings.FieldDel'
+'imiter'#6#1',$FormatSettings.IgnoreOuterWhitespace'#8#27'FormatSettings.Row'
+'Delimiter'#6#2#13#10#24'FormatSettings.QuoteChar'#6#1'"'#4'left'#2'0'#3'top'
+#3'x'#1#0#0#0
]);
LazarusResources.Add('TfrmSQLiteDBases','FORMDATA',[
'TPF0'#16'TfrmSQLiteDBases'#15'frmSQLiteDBases'#4'Left'#3'k'#5#6'Height'#3'2'
+#2#3'Top'#2'm'#5'Width'#3#252#0#7'Caption'#6#15'frmSQLiteDBases'#12'ClientHe'
+'ight'#3'2'#2#11'ClientWidth'#3#252#0#7'OnClose'#7#9'FormClose'#8'OnCreate'#7
+#10'FormCreate'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#7'1.8.4.0'
+#0#6'TLabel'#19'lblConnectionStatus'#4'Left'#2' '#6'Height'#2#15#3'Top'#2' '
+#5'Width'#2'Q'#7'Caption'#6#13'Not Connected'#11'ParentColor'#8#0#0#11'TData'
+'Source'#11'DataSource1'#7'DataSet'#7#8'sqlFILES'#4'left'#2'0'#3'top'#3#144#0
+#0#0#9'TSQLQuery'#8'sqlFILES'#9'FieldDefs'#14#0#8'Database'#7#18'SQLite3Conn'
+'ection1'#11'Transaction'#7#15'SQLTransaction1'#6'Params'#14#0#4'left'#2'0'#3
+'top'#2'P'#0#0#15'TSQLTransaction'#15'SQLTransaction1'#6'Active'#8#8'Databas'
+'e'#7#18'SQLite3Connection1'#4'left'#2'0'#3'top'#3#224#0#0#0#18'TSQLite3Conn'
+'ection'#18'SQLite3Connection1'#9'Connected'#8#11'LoginPrompt'#8#14'KeepConn'
+'ection'#8#11'Transaction'#7#15'SQLTransaction1'#4'left'#2'0'#3'top'#3'('#1#0
+#0#12'TCSVExporter'#12'CSVExporter1'#12'ExportFields'#14#0#15'RestorePositio'
+'n'#8#31'FormatSettings.DecimalSeparator'#6#1#0#29'FormatSettings.CurrencyDi'
+'gits'#2#0#29'FormatSettings.FieldDelimiter'#6#1',$FormatSettings.IgnoreOute'
+'rWhitespace'#8#27'FormatSettings.RowDelimiter'#6#2#13#10#24'FormatSettings.'
+'QuoteChar'#6#1'"'#4'left'#2'0'#3'top'#3'x'#1#0#0#11'TDataSource'#11'DataSou'
+'rce2'#7'DataSet'#7#7'sqlCOPY'#4'left'#3#160#0#3'top'#3#144#0#0#0#9'TSQLQuer'
+'y'#7'sqlCOPY'#9'FieldDefs'#14#0#8'Database'#7#18'SQLite3Connection1'#11'Tra'
+'nsaction'#7#15'SQLTransaction1'#6'Params'#14#0#4'left'#3#160#0#3'top'#2'P'#0
+#0#19'TSQLDBLibraryLoader'#25'SQLDBLibraryLoaderWindows'#7'Enabled'#8#14'Con'
+'nectionType'#6#7'SQLite3'#11'LibraryName'#6#11'sqlite3.dll'#4'left'#3#160#0
+#3'top'#3#240#0#0#0#19'TSQLDBLibraryLoader'#21'SQLDBLibraryLoaderOSX'#7'Enab'
+'led'#8#14'ConnectionType'#6#7'SQLite3'#11'LibraryName'#6#16'libsqlite3.dyli'
+'b'#4'left'#3#160#0#3'top'#3'8'#1#0#0#19'TSQLDBLibraryLoader'#23'SQLDBLibrar'
+'yLoaderLinux'#7'Enabled'#8#14'ConnectionType'#6#7'SQLite3'#11'LibraryName'#6
+#13'libsqlite3.so'#4'left'#3#160#0#3'top'#3'x'#1#0#0#0
]);
@@ -111,7 +111,6 @@ implementation

procedure TfrmSQLiteDBases.FormCreate(Sender: TObject);
var
i : integer;
guid : TGuid;
SQLiteLibraryPath, strFileNameRandomiser, SafePlaceForDB : string;
{$ifdef Linux}
@@ -350,7 +349,7 @@ function TfrmSQLiteDBases.CountGridRows(DBGrid : TDBGrid) : integer;
// If big volume, uses file stream.
procedure TfrmSQLiteDBases.SaveFILESTabToHTML(DBGrid : TDBGrid; Filename : string);
var
strTitle, FileNameCell, FilePathCell, FileHashCell, AllRowCells : string;
strTitle, FileNameCell, FilePathCell, FileHashCell : string;
NoOfRowsInGrid : integer;
sl : TStringList;
fs : TFileStreamUTF8;
@@ -1061,15 +1060,14 @@ procedure TfrmSQLiteDBases.ShowAllCOPYGRID(DBGrid : TDBGrid);
procedure TfrmSQLiteDBases.SaveCOPYWindowToHTML(DBGrid : TDBGrid; Filename : string);
var
strTitle, SourceFilename, DestinationFileName, DateAttributes, SourceFileHash, DestinationFileHash : string;
i, NoOfRowsInGrid : integer;
NoOfRowsInGrid : integer;
sl : TStringList;
fs : TFileStreamUTF8;

const
strHTMLHeader = '<HTML>' ;
strTITLEHeader = '<TITLE>QuickHash HTML Output' ;
strBODYHeader = '<BODY>' ;
strTABLEHeader = '<table>' ;
strTABLEROWStart = '<TR>' ;
strTABLEDATAStart = '<TD>' ;
strTABLEDataEnd = '</TD>' ;

0 comments on commit aaeb6eb

Please sign in to comment.
You can’t perform that action at this time.