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

--- Merging r33894 into '.':

Browse Source 
U    rtl/go32v2/dos.pp
U    rtl/msdos/dos.pp
U    rtl/os2/sysutils.pp
U    rtl/os2/dos.pas
U    rtl/watcom/dos.pp
--- Recording mergeinfo for merge of r33894 into '.':
 U   .

# revisions: 33894

git-svn-id: branches/fixes_3_0@33907 -
This commit is contained in:
marco 2016-06-04 17:17:44 +00:00
parent 996809edc7
commit 04dc706dbe
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/go32v2/dos.pp
View File

@ -796,7 +796,7 @@ begin
if attr=$8 then
dosregs.ecx:=8
else
dosregs.ecx:=attr and (not 8);
dosregs.ecx:=attr and (not 8) and $FF; { no required attributes }
dosregs.edx:=tb_offset+Sizeof(LFNSearchrec)+1;
dosmemput(tb_segment,tb_offset+Sizeof(LFNSearchrec)+1,path^,strlen(path)+1);
dosregs.ds:=tb_segment;

2
rtl/msdos/dos.pp
View File

@ -591,7 +591,7 @@ begin
if attr=$8 then
dosregs.cx:=8
else
dosregs.cx:=attr and (not 8);
dosregs.cx:=attr and (not 8) and $FF; { No required attributes }
dosregs.dx:=Ofs(path^);
dosregs.ds:=Seg(path^);
dosregs.di:=Ofs(w);

5
rtl/os2/dos.pas
View File

@ -92,8 +92,9 @@ threadvar
LastDosErrorModuleName: string;
const FindResvdMask = $00003737; {Allowed bits in attribute
specification for DosFindFirst call.}
const
FindResvdMask = $00003737 {Allowed bits for DosFindFirst parameter Attribute}
and $000000FF; {combined with a mask for allowed attributes only}
function GetMsCount: int64;

4
rtl/os2/sysutils.pp
View File

@ -72,8 +72,8 @@ const
faOpenReplace = $00040000; {Truncate if file exists}
faCreate = $00050000; {Create if file does not exist, truncate otherwise}
FindResvdMask = $00003737; {Allowed bits in attribute
specification for DosFindFirst call.}
FindResvdMask = $00003737 {Allowed bits for DosFindFirst parameter Attribute}
and $000000FF; {combined with a mask for allowed attributes only}
function FileOpen (const FileName: rawbytestring; Mode: integer): THandle;
Var

2
rtl/watcom/dos.pp
View File

@ -464,7 +464,7 @@ begin
if attr=$8 then
dosregs.ecx:=8
else
dosregs.ecx:=attr and (not 8);
dosregs.ecx:=attr and (not 8) and $FF; { No required attributes }
dosregs.edx:=tb_offset+Sizeof(LFNSearchrec)+1;
dosmemput(tb_segment,tb_offset+Sizeof(LFNSearchrec)+1,path^,strlen(path)+1);
dosregs.ds:=tb_segment;