diff --git a/packages/delphiXE/heidisql.dproj b/packages/delphiXE/heidisql.dproj index 29115702..538e8793 100644 --- a/packages/delphiXE/heidisql.dproj +++ b/packages/delphiXE/heidisql.dproj @@ -28,6 +28,7 @@ WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias) ..\..\components\graphicex;..\..\components\synapse;$(DCC_UnitSearchPath) + false ..\..\res heidisql.exe diff --git a/source/dbconnection.pas b/source/dbconnection.pas index 5882e6ec..e8bea28c 100644 --- a/source/dbconnection.pas +++ b/source/dbconnection.pas @@ -2086,7 +2086,6 @@ function TMySQLConnection.GetServerVersionInt: Integer; var rx: TRegExpr; begin - Result := -1; rx := TRegExpr.Create; rx.Expression := '(\d+)\.(\d+)\.(\d+)'; if rx.Exec(FServerVersionUntouched) then begin @@ -5447,7 +5446,6 @@ begin Dialog.editUsername.Visible := _type=1; Dialog.editPassword.Visible := _type=2; Dialog.ShowModal; - Result := buf; case _type of 1: Result := PAnsiChar(AnsiString(Dialog.editUsername.Text)); 2: Result := PAnsiChar(AnsiString(Dialog.editPassword.Text)); diff --git a/source/exportgrid.pas b/source/exportgrid.pas index 9ecad635..cd22d6f0 100644 --- a/source/exportgrid.pas +++ b/source/exportgrid.pas @@ -800,6 +800,7 @@ begin S.WriteString(tmp); if radioOutputCopyToClipboard.Checked then begin + HTML := nil; // SynEdit's exporter is slow on large strings, see issue #2903 if S.Size < 100*SIZE_KB then begin case ExportFormat of @@ -812,7 +813,6 @@ begin Exporter.Free; end; efHTML: HTML := S; - else HTML := nil; end; end; StreamToClipboard(S, HTML, (ExportFormat=efHTML) and (HTML <> nil)); diff --git a/source/grideditlinks.pas b/source/grideditlinks.pas index 986ac2b5..0b7e2327 100644 --- a/source/grideditlinks.pas +++ b/source/grideditlinks.pas @@ -717,7 +717,8 @@ begin if MicroSecondsPrecision > 0 then begin DotPos := Length(FMaskEdit.Text) - Pos('.', ReverseString(FMaskEdit.Text)) + 2; ms := MakeInt(Copy(FMaskEdit.Text, DotPos, Length(FMaskEdit.Text))); - end; + end else + ms := 0; case FTableColumn.DataType.Index of dtYear: begin diff --git a/source/helpers.pas b/source/helpers.pas index 9cf7bcf1..5491e860 100644 --- a/source/helpers.pas +++ b/source/helpers.pas @@ -3022,6 +3022,7 @@ begin OS := 'Windows NT '+IntToStr(Win32MajorVersion)+'.'+IntToStr(Win32MinorVersion); UserAgent := APPNAME+'/'+MainForm.AppVersion+' ('+OS+'; '+ExtractFilename(Application.ExeName)+'; '+FOwner.Name+')'; NetHandle := InternetOpen(PChar(UserAgent), INTERNET_OPEN_TYPE_PRECONFIG, nil, nil, 0); + UrlHandle := nil; try UrlHandle := InternetOpenURL(NetHandle, PChar(FURL), nil, 0, INTERNET_FLAG_RELOAD, 0); diff --git a/source/main.pas b/source/main.pas index 70bd6dff..5cd7c758 100644 --- a/source/main.pas +++ b/source/main.pas @@ -2995,7 +2995,6 @@ begin end; -{$WARN SYMBOL_PLATFORM OFF} function TMainForm.RunQueryFiles(Filenames: TStrings; Encoding: TEncoding): Boolean; var i: Integer; @@ -3091,7 +3090,6 @@ begin AbsentFiles.Free; PopupFileList.Free; end; -{$WARN SYMBOL_PLATFORM ON} procedure TMainForm.SessionConnect(Sender: TObject); diff --git a/source/trigger_editor.pas b/source/trigger_editor.pas index 48c1b12c..56d0a698 100644 --- a/source/trigger_editor.pas +++ b/source/trigger_editor.pas @@ -172,8 +172,6 @@ end; function TfrmTriggerEditor.ApplyModifications: TModalResult; -var - sql: String; begin // Edit mode means we drop the trigger and recreate it, as there is no ALTER TRIGGER. Result := mrOk;