Merged revisions 11231 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
r11231 | hajny | 2008-06-15 15:14:07 +0000 (Sun, 15 Jun 2008) | 1 line

  * patch from Giulio for FindFirst return value with no files and SetFAttr with VolumeID - web bug #11247
........

git-svn-id: branches/rc_2_2_2@11235 -

rtl/go32v2/dos.pp

@@ -489,6 +489,8 @@ begin
   dosregs.ax:=$714e;
   msdos(dosregs);
   LoadDosError;
+  if DosError=2 then
+    DosError:=18;
 {$ifdef DEBUG_LFN}
   if (DosError=0) and LogLFN then
     begin
@@ -811,6 +813,12 @@ end;
 
 procedure setfattr(var f;attr : word);
 begin
+  { Fail for setting VolumeId. }
+  if ((attr and VolumeID)<>0) then
+  begin
+    doserror:=5;
+    exit;
+  end;
   copytodos(filerec(f).name,strlen(filerec(f).name)+1);
   dosregs.edx:=tb_offset;
   dosregs.ds:=tb_segment;