paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-15 21:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r30258 into '.':

Browse Source 
U    packages/chm/src/fasthtmlparser.pas
--- Recording mergeinfo for merge of r30258 into '.':
 U   .
--- Merging r30292 into '.':
U    rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r30292 into '.':
 G   .
--- Merging r30327 into '.':
U    packages/winunits-base/src/imm_dyn.pas
U    packages/winunits-base/src/imm.pas
--- Recording mergeinfo for merge of r30327 into '.':
 G   .
--- Merging r30618 into '.':
U    utils/fpmake.pp
--- Recording mergeinfo for merge of r30618 into '.':
 G   .
--- Merging r30621 into '.':
U    rtl/linux/linux.pp
--- Recording mergeinfo for merge of r30621 into '.':
 G   .
--- Merging r30332 into '.':
U    rtl/openbsd/ptypes.inc
--- Recording mergeinfo for merge of r30332 into '.':
 G   .
--- Merging r30333 into '.':
G    rtl/openbsd/ptypes.inc
--- Recording mergeinfo for merge of r30333 into '.':
 G   .
--- Merging r30365 into '.':
U    packages/regexpr/src/regexpr.pas
--- Recording mergeinfo for merge of r30365 into '.':
 G   .

# revisions: 30258,30292,30327,30618,30621,30332,30333,30365

git-svn-id: branches/fixes_3_0@31113 -
This commit is contained in:
marco 2015-06-18 08:54:50 +00:00
parent 7ca1faa6b4
commit 533ca47296
8 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/chm/src/fasthtmlparser.pas
View File

@ -1,22 +1,5 @@
{ Copyright (C) <2005> <Andrew Haines> fasthtmlparser.pas
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
for more details.
You should have received a copy of the GNU Library General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
}
{
See the file COPYING.FPC, included in this distribution,
for details about the copyright.
See the section LICENSE/TERMS below for details about the copyright.
}
// TODO:
{

11
packages/regexpr/src/regexpr.pas
View File

@ -176,7 +176,7 @@ const
const
NSUBEXP = 15; // max number of subexpression //###0.929
NSUBEXP = 90; // max number of subexpression //###0.929
// Cannot be more than NSUBEXPMAX
// Be carefull - don't use values which overflow CLOSE opcode
// (in this case you'll get compiler erorr).
@ -389,7 +389,8 @@ type
function GetLinePairedSeparator : RegExprString;
public
constructor Create;
constructor Create; overload;
constructor Create(AExpression:string); overload;
destructor Destroy; override;
class function VersionMajor : integer; //###0.944
@ -1201,6 +1202,12 @@ constructor TRegExpr.Create;
end; { of constructor TRegExpr.Create
--------------------------------------------------------------}
constructor TRegExpr.Create(AExpression:string);
begin
create;
Expression:=AExpression;
end;
destructor TRegExpr.Destroy;
begin
if programm <> nil then

8
packages/winunits-base/src/imm.pas
View File

@ -314,17 +314,17 @@ function ImmReleaseContext(wnd: HWND; imc: HIMC): LongBool; stdcall; external Im
function ImmAssociateContext(wnd: HWND; imc: HIMC): HIMC; stdcall; external Imm name 'ImmAssociateContext';
function ImmAssociateContextEx(wnd: HWND; imc: HIMC; dwFlags: DWORD): LongBool; stdcall; external Imm name 'ImmAssociateContextEx';
function ImmGetCompositionStringA(imc: HIMC; dwIndex: DWORD;
function ImmGetCompositionStringA(imc: HIMC; dwIndex: LONG;
lpBuf: LPVOID; dwBufLen: DWORD): Longword; stdcall; external Imm name 'ImmGetCompositionStringA';
function ImmGetCompositionStringW(imc: HIMC; dwIndex: DWORD;
function ImmGetCompositionStringW(imc: HIMC; dwIndex: LONG;
lpBuf: LPVOID; dwBufLen: DWORD): Longword; stdcall; external Imm name 'ImmGetCompositionStringW';
{$ifndef UNICODE}
function ImmGetCompositionString(imc: HIMC; dwIndex: DWORD;
lpBuf: LPVOID; dwBufLen: DWORD): Longword; stdcall; external Imm name 'ImmGetCompositionStringA';
lpBuf: LPVOID; dwBufLen: DWORD): LONG; stdcall; external Imm name 'ImmGetCompositionStringA';
{$else}
function ImmGetCompositionString(imc: HIMC; dwIndex: DWORD;
lpBuf: LPVOID; dwBufLen: DWORD): Longword; stdcall; external Imm name 'ImmGetCompositionStringW';
lpBuf: LPVOID; dwBufLen: DWORD): LONG; stdcall; external Imm name 'ImmGetCompositionStringW';
{$endif}
function ImmSetCompositionStringA(imc: HIMC; dwIndex: DWORD; lpComp: LPVOID;

4
packages/winunits-base/src/imm_dyn.pas
View File

@ -45,9 +45,9 @@ var
ImmAssociateContextEx: function (wnd: HWND; imc: HIMC; dwFlags: DWORD): LongBool; stdcall = nil;
ImmGetCompositionStringA: function (imc: HIMC; dwIndex: DWORD;
lpBuf: LPVOID; dwBufLen: DWORD): Longword; stdcall = nil;
lpBuf: LPVOID; dwBufLen: DWORD): LONG; stdcall = nil;
ImmGetCompositionStringW: function (imc: HIMC; dwIndex: DWORD;
lpBuf: LPVOID; dwBufLen: DWORD): Longword; stdcall = nil;
lpBuf: LPVOID; dwBufLen: DWORD): LONG; stdcall = nil;
ImmSetCompositionStringA: function (imc: HIMC; dwIndex: DWORD; lpComp: LPVOID;
dwCompLen: DWORD; lpRead: LPVOID; dwReadLen: DWORD): LongBool; stdcall = nil;

14
rtl/linux/linux.pp
View File

@ -458,6 +458,8 @@ Type
function clock_getres(clk_id : clockid_t; res : ptimespec) : cint; {$ifdef FPC_USE_LIBC} cdecl; external name 'clock_getres'; {$ENDIF}
function clock_gettime(clk_id : clockid_t; tp: ptimespec) : cint; {$ifdef FPC_USE_LIBC} cdecl; external name 'clock_gettime'; {$ENDIF}
function clock_settime(clk_id : clockid_t; tp : ptimespec) : cint; {$ifdef FPC_USE_LIBC} cdecl; external name 'clock_settime'; {$ENDIF}
function setregid(rgid,egid : uid_t): cint; {$ifdef FPC_USE_LIBC} cdecl; external name 'setregid'; {$ENDIF}
function setreuid(ruid,euid : uid_t): cint; {$ifdef FPC_USE_LIBC} cdecl; external name 'setreuid'; {$ENDIF}
implementation
@ -725,5 +727,17 @@ function clock_settime(clk_id : clockid_t; tp : ptimespec) : cint;
begin
clock_settime:=do_SysCall(syscall_nr_clock_settime,tsysparam(clk_id),tsysparam(tp));
end;
function setregid(rgid,egid : uid_t): cint;
begin
setregid:=do_syscall(syscall_nr_setregid,rgid,egid);
end;
function setreuid(ruid,euid : uid_t): cint;
begin
setreuid:=do_syscall(syscall_nr_setreuid,ruid,euid);
end;
{$endif}
end.

11
rtl/objpas/classes/streams.inc
View File

@ -192,7 +192,7 @@ end;
repeat
r:=Read(PByte(@Buffer)[t],Count);
inc(t,r);
until (t=Count) or (r=0);
until (t=Count) or (r<=0);
if (t<Count) then
Raise EReadError.Create(SReadError);
end;
@ -207,7 +207,7 @@ end;
Repeat
r:=Write(PByte(@Buffer)[t],Count);
inc(t,r);
Until (t=count) or (r=0);
Until (t=count) or (r<=0);
if (t<Count) then
Raise EWriteError.Create(SWriteError);
end;
@ -833,8 +833,11 @@ begin
Result:=Length(FDataString)-FPosition;
If Result>Count then Result:=Count;
// This supposes FDataString to be of type AnsiString !
Move (Pchar(FDataString)[FPosition],Buffer,Result);
FPosition:=FPosition+Result;
if Result>0 then
begin
Move (Pchar(FDataString)[FPosition],Buffer,Result);
FPosition:=FPosition+Result;
end;
end;

7
rtl/openbsd/ptypes.inc
View File

@ -52,8 +52,11 @@ type
pid_t = cint32; { used as process identifier }
TPid = pid_t;
pPid = ^pid_t;
{$ifdef CPU64}
size_t = cuint64;
{$else}
size_t = cuint32; { as definied in the C standard}
{$endif}
TSize = size_t;
pSize = ^size_t;
pSize_t = ^size_t;
@ -173,7 +176,7 @@ type
end;
// kernel statfs from mount.h
TStatfs = packed record
TStatfs = record
flags, { copy of mount flags }
bsize, { filesystem block size}
iosize : cint; { optimal transfr block size }

1
utils/fpmake.pp
View File

@ -66,6 +66,7 @@ begin
P.Dependencies.Add('hash');
P.Dependencies.Add('univint',[darwin,iphonesim]);
P.Dependencies.Add('rtl-extra');
P.Dependencies.Add('rtl-objpas');
P.Version:='3.0.1';