Просмотр исходного кода

--- Merging r33894 into '.':
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 -

marco 9 лет назад
Родитель
Сommit
04dc706dbe
5 измененных файлов с 8 добавлено и 7 удалено
  1. 1 1
      rtl/go32v2/dos.pp
  2. 1 1
      rtl/msdos/dos.pp
  3. 3 2
      rtl/os2/dos.pas
  4. 2 2
      rtl/os2/sysutils.pp
  5. 1 1
      rtl/watcom/dos.pp

+ 1 - 1
rtl/go32v2/dos.pp

@@ -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;

+ 1 - 1
rtl/msdos/dos.pp

@@ -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);

+ 3 - 2
rtl/os2/dos.pas

@@ -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;

+ 2 - 2
rtl/os2/sysutils.pp

@@ -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

+ 1 - 1
rtl/watcom/dos.pp

@@ -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;