paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-18 20:39:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r33772 into '.':

Browse Source 
U    packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r33772 into '.':
 U   .
--- Merging r34294 into '.':
U    packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r34294 into '.':
 G   .
--- Merging r34467 into '.':
U    packages/fcl-base/src/inifiles.pp
--- Recording mergeinfo for merge of r34467 into '.':
 G   .
--- Merging r34500 into '.':
G    packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r34500 into '.':
 G   .

# revisions: 33772,34294,34467,34500

git-svn-id: branches/fixes_3_0@35999 -
This commit is contained in:
marco 2017-04-28 14:13:23 +00:00
parent 0822a672bd
commit 53209177df
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/fcl-base/fpmake.pp
View File

@ -124,7 +124,7 @@ begin
end;
T:=P.Targets.addUnit('advancedipc.pp');
T.ResourceStrings:=true;
T:=P.Targets.addUnit('advancedsingleinstance.pp');
T:=P.Targets.addUnit('advancedsingleinstance.pas');
T.ResourceStrings:=true;
// Additional sources
P.Sources.AddSrcFiles('src/win/fclel.*', P.Directory);

13
packages/fcl-base/src/custapp.pp
View File

@ -285,7 +285,7 @@ begin
except
On E : Exception do
Log(etError,Format('Error formatting message "%s" with %d arguments: %s',[Fmt,Length(Args),E.Message]));
end
end
end;
constructor TCustomApplication.Create(AOwner: TComponent);
@ -597,7 +597,7 @@ begin
If (Length(O)=0) or (O[1]<>FOptionChar) then
begin
If Assigned(NonOpts) then
NonOpts.Add(O)
NonOpts.Add(O);
end
else
begin
@ -623,7 +623,7 @@ begin
If FindLongopt(O) then
begin
If HaveArg then
AddToResult(Format(SErrNoOptionAllowed,[I,O]))
AddToResult(Format(SErrNoOptionAllowed,[I,O]));
end
else
begin // Required argument
@ -643,8 +643,6 @@ begin
begin
HaveArg:=(I<ParamCount) and (Length(ParamStr(I+1))>0) and (ParamStr(I+1)[1]<>FOptionChar);
UsedArg:=False;
If HaveArg then
OV:=Paramstr(I+1);
If Not CaseSensitiveOptions then
O:=LowerCase(O);
L:=Length(O);
@ -668,10 +666,11 @@ begin
end;
Inc(J);
end;
If HaveArg and UsedArg then
HaveArg:=HaveArg and UsedArg;
If HaveArg then
begin
Inc(I); // Skip argument.
O:=O[Length(O)]; // O is added to arguments !
OV:=Paramstr(I);
end;
end;
If HaveArg and ((Result='') or AllErrors) then

20
packages/fcl-base/src/inifiles.pp
View File

@ -337,7 +337,10 @@ begin
if not FValueHashValid then
UpdateValueHash;
I := FValueHash.FindIndexOf(S);
if CaseSensitive then
I := FValueHash.FindIndexOf(S)
else
I := FValueHash.FindIndexOf(AnsiUpperCase(S));
if I >= 0 then
Result := Integer(FValueHash[I])-1
else
@ -351,7 +354,10 @@ begin
if not FNameHashValid then
UpdateNameHash;
I := FNameHash.FindIndexOf(Name);
if CaseSensitive then
I := FNameHash.FindIndexOf(Name)
else
I := FNameHash.FindIndexOf(AnsiUpperCase(Name));
if I >= 0 then
Result := Integer(FNameHash[I])-1
else
@ -374,7 +380,10 @@ begin
else
FValueHash.Clear;
for I := 0 to Count - 1 do
FValueHash.Add(Strings[I], Pointer(I+1));
if CaseSensitive then
FValueHash.Add(Strings[I], Pointer(I+1))
else
FValueHash.Add(AnsiUpperCase(Strings[I]), Pointer(I+1));
FValueHashValid := True;
end;
@ -387,7 +396,10 @@ begin
else
FNameHash.Clear;
for I := 0 to Count - 1 do
FNameHash.Add(Names[I], Pointer(I+1));
if CaseSensitive then
FNameHash.Add(Names[I], Pointer(I+1))
else
FNameHash.Add(AnsiUpperCase(Names[I]), Pointer(I+1));
FNameHashValid := True;
end;