[ros-diffs] [cgutman] 52540: [USETUP] - Remove formatting and partitioning hacks which are unnecessary after fixing the invalid signature bug in the FAT formatting code

Author: cgutman
Date: Mon Jul  4 19:39:34 2011
New Revision: 52540

URL: http://svn.reactos.org/svn/reactos?rev=52540&view=rev
Log:
[USETUP]
- Remove formatting and partitioning hacks which are unnecessary after fixing the invalid
signature bug in the FAT formatting code

Modified:
    trunk/reactos/base/setup/usetup/interface/usetup.c
    trunk/reactos/base/setup/usetup/partlist.c

Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Jul  4 19:39:34
2011
@@ -2450,75 +2450,6 @@
                 CheckActiveBootPartition(PartitionList);
             }
 
-            if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") ==
0)
-            {
-                /* FIXME: Install boot code. This is a hack! */
-                if ((PartEntry->PartInfo[PartNum].PartitionType ==
PARTITION_FAT32_XINT13) ||
-                    (PartEntry->PartInfo[PartNum].PartitionType == PARTITION_FAT32))
-                {
-                    wcscpy(PathBuffer, SourceRootPath.Buffer);
-                    wcscat(PathBuffer, L"\\loader\\fat32.bin");
-
-                    DPRINT("Install FAT32 bootcode: %S ==> %S\n",
PathBuffer,
-                           DestinationRootPath.Buffer);
-
-                    Status = InstallFat32BootCodeToDisk(PathBuffer,
-                                                        DestinationRootPath.Buffer);
-                    if (!NT_SUCCESS(Status))
-                    {
-                        DPRINT1("InstallFat32BootCodeToDisk() failed with status
0x%08lx\n", Status);
-                        /* FIXME: show an error dialog */
-                        DestroyFileSystemList(FileSystemList);
-                        FileSystemList = NULL;
-                        return QUIT_PAGE;
-                    }
-                }
-                else
-                {
-                    wcscpy(PathBuffer, SourceRootPath.Buffer);
-                    wcscat(PathBuffer, L"\\loader\\fat.bin");
-
-                    DPRINT("Install FAT bootcode: %S ==> %S\n", PathBuffer,
-                           DestinationRootPath.Buffer);
-
-                    Status = InstallFat16BootCodeToDisk(PathBuffer,
-                                                        DestinationRootPath.Buffer);
-                    if (!NT_SUCCESS(Status))
-                    {
-                        DPRINT1("InstallFat16BootCodeToDisk() failed with status
0x%.08x\n", Status);
-                        /* FIXME: show an error dialog */
-                        DestroyFileSystemList(FileSystemList);
-                        FileSystemList = NULL;
-                        return QUIT_PAGE;
-                    }
-                }
-            }
-            else if (wcscmp(FileSystemList->Selected->FileSystem,
L"EXT2") == 0)
-            {
-                wcscpy(PathBuffer, SourceRootPath.Buffer);
-                wcscat(PathBuffer, L"\\loader\\ext2.bin");
-
-                DPRINT("Install EXT2 bootcode: %S ==> %S\n", PathBuffer,
-                       DestinationRootPath.Buffer);
-
-                Status = InstallFat32BootCodeToDisk(PathBuffer,
-                                                    DestinationRootPath.Buffer);
-                if (!NT_SUCCESS(Status))
-                {
-                    DPRINT1("InstallFat32BootCodeToDisk() failed with status
0x%08lx\n", Status);
-                    /* FIXME: show an error dialog */
-                    DestroyFileSystemList(FileSystemList);
-                    FileSystemList = NULL;
-                    return QUIT_PAGE;
-                }
-            }
-            else if (FileSystemList->Selected->FormatFunc)
-            {
-                DestroyFileSystemList(FileSystemList);
-                FileSystemList = NULL;
-                return QUIT_PAGE;
-            }
-
 #ifndef NDEBUG
             CONSOLE_SetStatusText("   Done.  Press any key ...");
             CONSOLE_ConInKey(Ir);

Modified: trunk/reactos/base/setup/usetup/partlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist…
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Mon Jul  4 19:39:34 2011
@@ -2495,7 +2495,6 @@
   PDRIVE_LAYOUT_INFORMATION DriveLayout;
   OBJECT_ATTRIBUTES ObjectAttributes;
   IO_STATUS_BLOCK Iosb;
-  WCHAR SrcPath[MAX_PATH];
   WCHAR DstPath[MAX_PATH];
   UNICODE_STRING Name;
   HANDLE FileHandle;
@@ -2689,30 +2688,6 @@
                    DriveLayout);
 
       NtClose (FileHandle);
-
-      /* Install MBR code if the disk is new */
-      if (DiskEntry1->NewDisk == TRUE &&
-          DiskEntry1->BiosDiskNumber == 0)
-      {
-        wcscpy (SrcPath, SourceRootPath.Buffer);
-        wcscat (SrcPath, L"\\loader\\dosmbr.bin");
-
-        DPRINT ("Install MBR bootcode: %S ==> %S\n",
-                SrcPath, DstPath);
-
-        /* Install MBR bootcode */
-        Status = InstallMbrBootCodeToDisk (SrcPath,
-                                           DstPath);
-        if (!NT_SUCCESS (Status))
-        {
-          DPRINT1 ("InstallMbrBootCodeToDisk() failed (Status %lx)\n",
-                   Status);
-          return FALSE;
-        }
-
-        DiskEntry1->NewDisk = FALSE;
-        DiskEntry1->NoMbr = FALSE;
-      }
     }
 
     Entry1 = Entry1->Flink;