Remove incorrect change Modified: trunk/reactos/subsys/system/usetup/bootsup.c _____
Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2005-05-01 21:51:57 UTC (rev 14933) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2005-05-01 21:57:57 UTC (rev 14934) @@ -371,7 +371,7 @@
NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=COM1 /NOGUIBOOT"); + L"/DEBUGPORT=SCREEN /NOGUIBOOT");
/* Save the ini file */ IniCacheSave(IniCache, IniPath); @@ -1134,15 +1134,19 @@ NULL, NULL);
- Status = NtOpenFile(&FileHandle, - FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, - &ObjectAttributes, - &IoStatusBlock, - 0, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); + Status = NtCreateFile(&FileHandle, + FILE_WRITE_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OVERWRITE_IF, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY, + NULL, + 0); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); RtlFreeHeap(ProcessHeap, 0, NewBootSector); return(Status); } @@ -1291,15 +1295,19 @@ NULL, NULL);
- Status = NtOpenFile(&FileHandle, - FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, - &ObjectAttributes, - &IoStatusBlock, - 0, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); + Status = NtCreateFile(&FileHandle, + FILE_WRITE_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OVERWRITE_IF, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY, + NULL, + 0); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); RtlFreeHeap(ProcessHeap, 0, NewBootSector); return(Status); } @@ -2072,7 +2080,7 @@ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\loader\freeldr.sys");
- wcscpy(DstPath, L"\Device\Floppy0\freeldr.sys"); + wcscat(DstPath, L"\Device\Floppy0\freeldr.sys");
DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2083,7 +2091,7 @@ }
/* Create new 'freeldr.ini' */ - wcscpy(DstPath, L"\Device\Floppy0\freeldr.ini"); + wcscat(DstPath, L"\Device\Floppy0\freeldr.ini");
DPRINT("Create new 'freeldr.ini'\n"); Status = CreateFreeLoaderIniForReactos(DstPath, @@ -2098,7 +2106,7 @@ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\loader\fat.bin");
- wcscpy(DstPath, L"\Device\Floppy0"); + wcscat(DstPath, L"\Device\Floppy0");
DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat16BootCodeToDisk(SrcPath,