Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CORE/Source/Basic/uRESTDWParams.pas
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,8 @@ implementation
If (Pos('.', vTempValue) > 0) Or
(Pos(':', vTempValue) > 0) Or
(Pos('/', vTempValue) > 0) Or
(Pos('\', vTempValue) > 0)
//(Pos('-', vTempValue) > 0)
(Pos('\', vTempValue) > 0) Or
(Pos('-', vTempValue) > 0)
// Or (vTempValue.CountChar('-')>1) //Testar XyberX
Then
Field.AsDateTime := StrToDateTime(vTempValue)
Expand Down
15 changes: 9 additions & 6 deletions CORE/Source/Basic/uRESTDWStorageBin.pas
Original file line number Diff line number Diff line change
Expand Up @@ -1819,12 +1819,15 @@ interface
vInt64 := vMemoryStream.Size;
AStream.Write(vInt64, SizeOf(vInt64));
SetLength(vBytes, vInt64);
Try
vMemoryStream.Position := 0;
vMemoryStream.Read(vBytes[0], vInt64);
Except
End;
AStream.Write(vBytes[0], vInt64);
if vInt64 > 0 then
begin
Try
vMemoryStream.Position := 0;
vMemoryStream.Read(vBytes[0], vInt64);
Except
End;
AStream.Write(vBytes[0], vInt64);
end;
Finally
SetLength(vBytes, 0);
FreeAndNil(vMemoryStream);
Expand Down
2 changes: 1 addition & 1 deletion CORE/Source/Consts/uRESTDWConsts.pas
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

// controle de versão
RESTDWVersionINFO = 'v2.1.0-';
RESTDWRelease = '3974';
RESTDWRelease = '3975';
RESTDWCodeProject = 'Final Fantasy X - SourceForge';
RESTDWVersao = RESTDWVersionINFO + RESTDWRelease + '(' + RESTDWCodeProject + ')';
RESTDWDialogoTitulo = 'REST DataWare Components ' + RESTDWVersao;
Expand Down
158 changes: 155 additions & 3 deletions CORE/Source/Includes/RDWWIZ.inc
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,64 @@
{$DEFINE ISDELPHI}
{$ENDIF}
{$ENDIF}
{$IFDEF VER300} //Delphi 10 Seatle
{$DEFINE DELPHI2_LVL}
{$DEFINE DELPHI3_LVL}
{$DEFINE DELPHI4_LVL}
{$DEFINE DELPHI5_LVL}
{$DEFINE DELPHI6_LVL}
{$DEFINE DELPHI7_LVL}
{$DEFINE DELPHI9_LVL}
{$DEFINE DELPHI2006_LVL}
{$DEFINE DELPHI2007_LVL}
{$DEFINE DELPHI2010_LVL}
{$DEFINE DELPHIXE_LVL}
{$DEFINE DELPHIXE2_LVL}
{$DEFINE DELPHIXE3_LVL}
{$DEFINE DELPHIXE4_LVL}
{$DEFINE DELPHIXE5_LVL}
{$DEFINE DELPHIXE6_LVL}
{$DEFINE DELPHIXE7_LVL}
{$DEFINE DELPHIXE8_LVL}
{$DEFINE DELPHI_TOUCH}
{$DEFINE DELPHI_UNICODE}
{$IFNDEF BCB}
{$DEFINE ISDELPHI}
{$ENDIF}
{$ENDIF}

{$IFDEF VER310} //Delphi 10.1 Berlin
{$DEFINE DELPHI2_LVL}
{$DEFINE DELPHI3_LVL}
{$DEFINE DELPHI4_LVL}
{$DEFINE DELPHI5_LVL}
{$DEFINE DELPHI6_LVL}
{$DEFINE DELPHI7_LVL}
{$DEFINE DELPHI9_LVL}
{$DEFINE DELPHI2006_LVL}
{$DEFINE DELPHI2007_LVL}
{$DEFINE DELPHI2010_LVL}
{$DEFINE DELPHIXE_LVL}
{$DEFINE DELPHIXE2_LVL}
{$DEFINE DELPHIXE3_LVL}
{$DEFINE DELPHIXE4_LVL}
{$DEFINE DELPHIXE5_LVL}
{$DEFINE DELPHIXE6_LVL}
{$DEFINE DELPHIXE7_LVL}
{$DEFINE DELPHIXE8_LVL}
{$DEFINE DELPHIXE9_LVL}
{$DEFINE DELPHIXE10_LVL}
{$DEFINE DELPHIXE10_1_LVL}
{$DEFINE DELPHIXE10_2_LVL}
{$DEFINE DELPHI_TOUCH}
{$DEFINE DELPHI_UNICODE}
{$DEFINE DELPHI10_LVL}
{$IFNDEF BCB}
{$DEFINE ISDELPHI}
{$ENDIF}
{$ENDIF}

{$IFDEF VER300}
{$IFDEF VER320} //Delphi 10.2 Tokyo
{$DEFINE DELPHI2_LVL}
{$DEFINE DELPHI3_LVL}
{$DEFINE DELPHI4_LVL}
Expand All @@ -376,6 +431,9 @@
{$DEFINE DELPHIXE7_LVL}
{$DEFINE DELPHIXE8_LVL}
{$DEFINE DELPHIXE9_LVL}
{$DEFINE DELPHIXE10_LVL}
{$DEFINE DELPHIXE10_1_LVL}
{$DEFINE DELPHIXE10_2_LVL}
{$DEFINE DELPHI_TOUCH}
{$DEFINE DELPHI_UNICODE}
{$DEFINE DELPHI10_LVL}
Expand All @@ -384,7 +442,7 @@
{$ENDIF}
{$ENDIF}

{$IFDEF VER310}
{$IFDEF VER330} //Delphi 10.3 Rio
{$DEFINE DELPHI2_LVL}
{$DEFINE DELPHI3_LVL}
{$DEFINE DELPHI4_LVL}
Expand All @@ -406,6 +464,100 @@
{$DEFINE DELPHIXE9_LVL}
{$DEFINE DELPHIXE10_LVL}
{$DEFINE DELPHIXE10_1_LVL}
{$DEFINE DELPHIXE10_2_LVL}
{$DEFINE DELPHI_TOUCH}
{$DEFINE DELPHI_UNICODE}
{$DEFINE DELPHI10_LVL}
{$IFNDEF BCB}
{$DEFINE ISDELPHI}
{$ENDIF}
{$ENDIF}

{$IFDEF VER340} //Delphi 10.4 Sydney
{$DEFINE DELPHI2_LVL}
{$DEFINE DELPHI3_LVL}
{$DEFINE DELPHI4_LVL}
{$DEFINE DELPHI5_LVL}
{$DEFINE DELPHI6_LVL}
{$DEFINE DELPHI7_LVL}
{$DEFINE DELPHI9_LVL}
{$DEFINE DELPHI2006_LVL}
{$DEFINE DELPHI2007_LVL}
{$DEFINE DELPHI2010_LVL}
{$DEFINE DELPHIXE_LVL}
{$DEFINE DELPHIXE2_LVL}
{$DEFINE DELPHIXE3_LVL}
{$DEFINE DELPHIXE4_LVL}
{$DEFINE DELPHIXE5_LVL}
{$DEFINE DELPHIXE6_LVL}
{$DEFINE DELPHIXE7_LVL}
{$DEFINE DELPHIXE8_LVL}
{$DEFINE DELPHIXE9_LVL}
{$DEFINE DELPHIXE10_LVL}
{$DEFINE DELPHIXE10_1_LVL}
{$DEFINE DELPHIXE10_2_LVL}
{$DEFINE DELPHI_TOUCH}
{$DEFINE DELPHI_UNICODE}
{$DEFINE DELPHI10_LVL}
{$IFNDEF BCB}
{$DEFINE ISDELPHI}
{$ENDIF}
{$ENDIF}

{$IFDEF VER350} //Delphi 11 Alexandria
{$DEFINE DELPHI2_LVL}
{$DEFINE DELPHI3_LVL}
{$DEFINE DELPHI4_LVL}
{$DEFINE DELPHI5_LVL}
{$DEFINE DELPHI6_LVL}
{$DEFINE DELPHI7_LVL}
{$DEFINE DELPHI9_LVL}
{$DEFINE DELPHI2006_LVL}
{$DEFINE DELPHI2007_LVL}
{$DEFINE DELPHI2010_LVL}
{$DEFINE DELPHIXE_LVL}
{$DEFINE DELPHIXE2_LVL}
{$DEFINE DELPHIXE3_LVL}
{$DEFINE DELPHIXE4_LVL}
{$DEFINE DELPHIXE5_LVL}
{$DEFINE DELPHIXE6_LVL}
{$DEFINE DELPHIXE7_LVL}
{$DEFINE DELPHIXE8_LVL}
{$DEFINE DELPHIXE9_LVL}
{$DEFINE DELPHIXE10_LVL}
{$DEFINE DELPHIXE10_1_LVL}
{$DEFINE DELPHIXE10_2_LVL}
{$DEFINE DELPHI_TOUCH}
{$DEFINE DELPHI_UNICODE}
{$DEFINE DELPHI10_LVL}
{$IFNDEF BCB}
{$DEFINE ISDELPHI}
{$ENDIF}
{$ENDIF}

{$IFDEF VER360} //Delphi 12 Athens
{$DEFINE DELPHI2_LVL}
{$DEFINE DELPHI3_LVL}
{$DEFINE DELPHI4_LVL}
{$DEFINE DELPHI5_LVL}
{$DEFINE DELPHI6_LVL}
{$DEFINE DELPHI7_LVL}
{$DEFINE DELPHI9_LVL}
{$DEFINE DELPHI2006_LVL}
{$DEFINE DELPHI2007_LVL}
{$DEFINE DELPHI2010_LVL}
{$DEFINE DELPHIXE_LVL}
{$DEFINE DELPHIXE2_LVL}
{$DEFINE DELPHIXE3_LVL}
{$DEFINE DELPHIXE4_LVL}
{$DEFINE DELPHIXE5_LVL}
{$DEFINE DELPHIXE6_LVL}
{$DEFINE DELPHIXE7_LVL}
{$DEFINE DELPHIXE8_LVL}
{$DEFINE DELPHIXE9_LVL}
{$DEFINE DELPHIXE10_LVL}
{$DEFINE DELPHIXE10_1_LVL}
{$DEFINE DELPHIXE10_2_LVL}
{$DEFINE DELPHI_TOUCH}
{$DEFINE DELPHI_UNICODE}
{$DEFINE DELPHI10_LVL}
Expand All @@ -414,7 +566,7 @@
{$ENDIF}
{$ENDIF}

{$IFDEF VER320}
{$IFDEF VER370} //Delphi 13 Florence
{$DEFINE DELPHI2_LVL}
{$DEFINE DELPHI3_LVL}
{$DEFINE DELPHI4_LVL}
Expand Down
1 change: 1 addition & 0 deletions CORE/Source/Includes/uRESTDW.inc
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

{$IFNDEF FPC}
{$IFDEF VER370 or CompilerVersion >= 37}
{$DEFINE DELPHI13UP}
{$DEFINE DELPHI12UP}
{$DEFINE DELPHI11UP}
{$DEFINE DELPHI10_4UP}
Expand Down
4 changes: 3 additions & 1 deletion CORE/Source/Wizards/RDWCGIWizard.pas
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,9 @@
Function GetDelphiGlobalKey : String;
Begin
Result := '';
{$IF DEFINED(DELPHI12UP)} // delphi 11 Alexandria
{$IF DEFINED(DELPHI13UP)} // delphi 12 Athens
Result := '\Software\Embarcadero\BDS\37.0\Globals';
{$ELSEIF DEFINED(DELPHI12UP)} // delphi 12 Athens
Result := '\Software\Embarcadero\BDS\23.0\Globals';
{$ELSEIF DEFINED(DELPHI11UP)} // delphi 11 Alexandria
Result := '\Software\Embarcadero\BDS\22.0\Globals';
Expand Down
5 changes: 4 additions & 1 deletion CORE/Source/Wizards/STLWizard.pas
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,12 @@
{$IFDEF ver350} // delphi 11
Result := '\Software\Embarcadero\BDS\22.0\Globals';
{$ENDIF}
{$IFDEF ver360} // delphi 11
{$IFDEF ver360} // delphi 12
Result := '\Software\Embarcadero\BDS\23.0\Globals';
{$ENDIF}
{$IFDEF ver370} // delphi 13
Result := '\Software\Embarcadero\BDS\37.0\Globals';
{$ENDIF}
End;

Function Getideprojectpath: String;
Expand Down
Loading