Merge from trunk: Synthesize FILE_ATTRIBUTE_NORMAL on NetworkOpenInformation query too. This fixes the final problem with the Firefox installer. Modified: branches/ros-branch-0_2_9/reactos/drivers/fs/vfat/finfo.c _____
Modified: branches/ros-branch-0_2_9/reactos/drivers/fs/vfat/finfo.c --- branches/ros-branch-0_2_9/reactos/drivers/fs/vfat/finfo.c 2005-12-09 13:23:33 UTC (rev 20005) +++ branches/ros-branch-0_2_9/reactos/drivers/fs/vfat/finfo.c 2005-12-09 13:24:00 UTC (rev 20006) @@ -252,6 +252,7 @@
FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_READONLY))) { + DPRINT("Synthesizing FILE_ATTRIBUTE_NORMAL\n"); BasicInfo->FileAttributes |= FILE_ATTRIBUTE_NORMAL; } DPRINT("Getting attributes 0x%02x\n", BasicInfo->FileAttributes); @@ -428,6 +429,16 @@ NetworkInfo->EndOfFile = Fcb->RFCB.FileSize; } NetworkInfo->FileAttributes = *Fcb->Attributes & 0x3f; + /* Synthesize FILE_ATTRIBUTE_NORMAL */ + if (0 == (NetworkInfo->FileAttributes & (FILE_ATTRIBUTE_DIRECTORY | + FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_READONLY))) + { + DPRINT("Synthesizing FILE_ATTRIBUTE_NORMAL\n"); + NetworkInfo->FileAttributes |= FILE_ATTRIBUTE_NORMAL; + }
*BufferLength -= sizeof(FILE_NETWORK_OPEN_INFORMATION); return STATUS_SUCCESS;