[USETUP] Display some contents in the page whilst installing the bootloader (#3559)

CORE-17523
This commit is contained in:
George Bișoc 2021-04-07 10:11:07 +02:00 committed by GitHub
parent f511258ee5
commit 3ee9535e05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 862 additions and 72 deletions

View file

@ -1533,6 +1533,30 @@ static MUI_ENTRY bgBGBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY bgBGBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY bgBGKeyboardSettingsEntries[] = static MUI_ENTRY bgBGKeyboardSettingsEntries[] =
{ {
{ {
@ -2183,6 +2207,10 @@ MUI_PAGE bgBGPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
bgBGSuccessPageEntries bgBGSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
bgBGBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
bgBGBootPageEntries bgBGBootPageEntries

View file

@ -981,6 +981,30 @@ static MUI_ENTRY bnBDBootPageEntries[] =
}; };
static MUI_ENTRY bnBDBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY bnBDSelectPartitionEntries[] = static MUI_ENTRY bnBDSelectPartitionEntries[] =
{ {
{ {
@ -2171,6 +2195,10 @@ MUI_PAGE bnBDPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
bnBDSuccessPageEntries bnBDSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
bnBDBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
bnBDBootPageEntries bnBDBootPageEntries

View file

@ -1531,6 +1531,30 @@ static MUI_ENTRY csCZBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY csCZBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY csCZKeyboardSettingsEntries[] = static MUI_ENTRY csCZKeyboardSettingsEntries[] =
{ {
{ {
@ -2179,6 +2203,10 @@ MUI_PAGE csCZPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
csCZSuccessPageEntries csCZSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
csCZBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
csCZBootPageEntries csCZBootPageEntries

View file

@ -1525,6 +1525,30 @@ static MUI_ENTRY daDKBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY daDKBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY daDKKeyboardSettingsEntries[] = static MUI_ENTRY daDKKeyboardSettingsEntries[] =
{ {
{ {
@ -2174,6 +2198,10 @@ MUI_PAGE daDKPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
daDKSuccessPageEntries daDKSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
daDKBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
daDKBootPageEntries daDKBootPageEntries

View file

@ -1525,6 +1525,30 @@ static MUI_ENTRY deDEBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY deDEBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY deDEKeyboardSettingsEntries[] = static MUI_ENTRY deDEKeyboardSettingsEntries[] =
{ {
{ {
@ -2176,6 +2200,10 @@ MUI_PAGE deDEPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
deDESuccessPageEntries deDESuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
deDEBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
deDEBootPageEntries deDEBootPageEntries

View file

@ -1540,6 +1540,30 @@ static MUI_ENTRY elGRBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY elGRBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY elGRKeyboardSettingsEntries[] = static MUI_ENTRY elGRKeyboardSettingsEntries[] =
{ {
{ {
@ -2187,6 +2211,10 @@ MUI_PAGE elGRPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
elGRSuccessPageEntries elGRSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
elGRBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
elGRBootPageEntries elGRBootPageEntries

View file

@ -1523,6 +1523,30 @@ static MUI_ENTRY enUSBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY enUSBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY enUSKeyboardSettingsEntries[] = static MUI_ENTRY enUSKeyboardSettingsEntries[] =
{ {
{ {
@ -2171,6 +2195,10 @@ MUI_PAGE enUSPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
enUSSuccessPageEntries enUSSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
enUSBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
enUSBootPageEntries enUSBootPageEntries

View file

@ -1529,6 +1529,30 @@ static MUI_ENTRY esESBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY etESBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY esESKeyboardSettingsEntries[] = static MUI_ENTRY esESKeyboardSettingsEntries[] =
{ {
{ {
@ -2177,6 +2201,10 @@ MUI_PAGE esESPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
esESSuccessPageEntries esESSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
etESBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
esESBootPageEntries esESBootPageEntries

View file

@ -1526,6 +1526,30 @@ static MUI_ENTRY etEEBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY etEEBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY etEEKeyboardSettingsEntries[] = static MUI_ENTRY etEEKeyboardSettingsEntries[] =
{ {
{ {
@ -2172,6 +2196,10 @@ MUI_PAGE etEEPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
etEESuccessPageEntries etEESuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
etEEBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
etEEBootPageEntries etEEBootPageEntries

View file

@ -1524,6 +1524,30 @@ static MUI_ENTRY euESBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY euESBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY euESKeyboardSettingsEntries[] = static MUI_ENTRY euESKeyboardSettingsEntries[] =
{ {
{ {
@ -2172,6 +2196,10 @@ MUI_PAGE euESPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
euESSuccessPageEntries euESSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
euESBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
euESBootPageEntries euESBootPageEntries

View file

@ -1560,6 +1560,30 @@ static MUI_ENTRY frFRBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY frFRBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY frFRKeyboardSettingsEntries[] = static MUI_ENTRY frFRKeyboardSettingsEntries[] =
{ {
{ {
@ -2208,6 +2232,10 @@ MUI_PAGE frFRPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
frFRSuccessPageEntries frFRSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
frFRBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
frFRBootPageEntries frFRBootPageEntries

View file

@ -1527,6 +1527,30 @@ static MUI_ENTRY heILBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY heILBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY heILKeyboardSettingsEntries[] = static MUI_ENTRY heILKeyboardSettingsEntries[] =
{ {
{ {
@ -2173,6 +2197,10 @@ MUI_PAGE heILPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
heILSuccessPageEntries heILSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
heILBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
heILBootPageEntries heILBootPageEntries

View file

@ -1417,6 +1417,30 @@ static MUI_ENTRY huHUBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY huHUBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY huHUKeyboardSettingsEntries[] = static MUI_ENTRY huHUKeyboardSettingsEntries[] =
{ {
{ {
@ -2062,6 +2086,10 @@ MUI_PAGE huHUPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
huHUSuccessPageEntries huHUSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
huHUBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
huHUBootPageEntries huHUBootPageEntries

View file

@ -1523,6 +1523,30 @@ static MUI_ENTRY idIDBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY idIDBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY idIDKeyboardSettingsEntries[] = static MUI_ENTRY idIDKeyboardSettingsEntries[] =
{ {
{ {
@ -2171,6 +2195,10 @@ MUI_PAGE idIDPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
idIDSuccessPageEntries idIDSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
idIDBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
idIDBootPageEntries idIDBootPageEntries

View file

@ -980,6 +980,30 @@ static MUI_ENTRY itITBootPageEntries[] =
}; };
static MUI_ENTRY itITBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY itITSelectPartitionEntries[] = static MUI_ENTRY itITSelectPartitionEntries[] =
{ {
{ {
@ -2177,6 +2201,10 @@ MUI_PAGE itITPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
itITSuccessPageEntries itITSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
itITBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
itITBootPageEntries itITBootPageEntries

View file

@ -1526,6 +1526,30 @@ static MUI_ENTRY jaJPBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY jaJPBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY jaJPKeyboardSettingsEntries[] = static MUI_ENTRY jaJPKeyboardSettingsEntries[] =
{ {
{ {
@ -2174,6 +2198,10 @@ MUI_PAGE jaJPPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
jaJPSuccessPageEntries jaJPSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
jaJPBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
jaJPBootPageEntries jaJPBootPageEntries

View file

@ -1534,6 +1534,30 @@ static MUI_ENTRY ltLTBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY ltLTBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY ltLTKeyboardSettingsEntries[] = static MUI_ENTRY ltLTKeyboardSettingsEntries[] =
{ {
{ {
@ -2182,6 +2206,10 @@ MUI_PAGE ltLTPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
ltLTSuccessPageEntries ltLTSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
ltLTBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
ltLTBootPageEntries ltLTBootPageEntries

View file

@ -1515,6 +1515,30 @@ static MUI_ENTRY msMYBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY msMYBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY msMYKeyboardSettingsEntries[] = static MUI_ENTRY msMYKeyboardSettingsEntries[] =
{ {
{ {
@ -2156,6 +2180,10 @@ MUI_PAGE msMYPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
msMYSuccessPageEntries msMYSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
msMYBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
msMYBootPageEntries msMYBootPageEntries

View file

@ -1538,6 +1538,30 @@ static MUI_ENTRY nlNLBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY nlNLBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY nlNLkeyboardSettingsEntries[] = static MUI_ENTRY nlNLkeyboardSettingsEntries[] =
{ {
{ {
@ -2196,6 +2220,10 @@ MUI_PAGE nlNLPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
nlNLSuccessPageEntries nlNLSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
nlNLBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
nlNLBootPageEntries nlNLBootPageEntries

View file

@ -1534,6 +1534,30 @@ static MUI_ENTRY plPLBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY plPLBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY plPLKeyboardSettingsEntries[] = static MUI_ENTRY plPLKeyboardSettingsEntries[] =
{ {
{ {
@ -2179,6 +2203,10 @@ MUI_PAGE plPLPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
plPLSuccessPageEntries plPLSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
plPLBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
plPLBootPageEntries plPLBootPageEntries

View file

@ -1540,6 +1540,30 @@ static MUI_ENTRY ptBRBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY ptBRBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY ptBRKeyboardSettingsEntries[] = static MUI_ENTRY ptBRKeyboardSettingsEntries[] =
{ {
{ {
@ -2209,6 +2233,10 @@ MUI_PAGE ptBRPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
ptBRSuccessPageEntries ptBRSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
ptBRBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
ptBRBootPageEntries ptBRBootPageEntries

View file

@ -1540,6 +1540,30 @@ static MUI_ENTRY ptPTBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY ptPTBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY ptPTKeyboardSettingsEntries[] = static MUI_ENTRY ptPTKeyboardSettingsEntries[] =
{ {
{ {
@ -2194,6 +2218,10 @@ MUI_PAGE ptPTPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
ptPTSuccessPageEntries ptPTSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
ptPTBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
ptPTBootPageEntries ptPTBootPageEntries

View file

@ -1548,6 +1548,30 @@ static MUI_ENTRY roROBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY roROBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY roROKeyboardSettingsEntries[] = static MUI_ENTRY roROKeyboardSettingsEntries[] =
{ {
{ {
@ -2217,6 +2241,10 @@ MUI_PAGE roROPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
roROSuccessPageEntries roROSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
roROBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
roROBootPageEntries roROBootPageEntries

View file

@ -1546,6 +1546,30 @@ static MUI_ENTRY ruRUBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY ruRUBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY ruRUKeyboardSettingsEntries[] = static MUI_ENTRY ruRUKeyboardSettingsEntries[] =
{ {
{ {
@ -2194,6 +2218,10 @@ MUI_PAGE ruRUPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
ruRUSuccessPageEntries ruRUSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
ruRUBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
ruRUBootPageEntries ruRUBootPageEntries

View file

@ -1532,6 +1532,30 @@ static MUI_ENTRY skSKBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY skSKBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY skSKKeyboardSettingsEntries[] = static MUI_ENTRY skSKKeyboardSettingsEntries[] =
{ {
{ {
@ -2183,6 +2207,10 @@ MUI_PAGE skSKPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
skSKSuccessPageEntries skSKSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
skSKBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
skSKBootPageEntries skSKBootPageEntries

View file

@ -1530,6 +1530,30 @@ static MUI_ENTRY sqALBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY sqALBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY sqALKeyboardSettingsEntries[] = static MUI_ENTRY sqALKeyboardSettingsEntries[] =
{ {
{ {
@ -2184,6 +2208,10 @@ MUI_PAGE sqALPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
sqALSuccessPageEntries sqALSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
sqALBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
sqALBootPageEntries sqALBootPageEntries

View file

@ -1532,6 +1532,30 @@ static MUI_ENTRY svSEBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY svSEBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY svSEKeyboardSettingsEntries[] = static MUI_ENTRY svSEKeyboardSettingsEntries[] =
{ {
{ {
@ -2180,6 +2204,10 @@ MUI_PAGE svSEPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
svSESuccessPageEntries svSESuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
svSEBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
svSEBootPageEntries svSEBootPageEntries

View file

@ -1500,6 +1500,30 @@ static MUI_ENTRY trTRBootLoaderEntries[] =
} }
}; };
static MUI_ENTRY trTRBootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY trTRKeyboardSettingsEntries[] = static MUI_ENTRY trTRKeyboardSettingsEntries[] =
{ {
{ {
@ -2148,6 +2172,10 @@ MUI_PAGE trTRPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
trTRSuccessPageEntries trTRSuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
trTRBootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
trTRBootPageEntries trTRBootPageEntries

View file

@ -1531,6 +1531,30 @@ static MUI_ENTRY ukUABootLoaderEntries[] =
} }
}; };
static MUI_ENTRY ukUABootLoaderInstallPageEntries[] =
{
{
4,
3,
" ReactOS " KERNEL_VERSION_STR " Setup ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
"Installing the bootloader onto the media, please wait...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
{
0,
0,
NULL,
0
}
};
static MUI_ENTRY ukUAKeyboardSettingsEntries[] = static MUI_ENTRY ukUAKeyboardSettingsEntries[] =
{ {
{ {
@ -2180,6 +2204,10 @@ MUI_PAGE ukUAPages[] =
SUCCESS_PAGE, SUCCESS_PAGE,
ukUASuccessPageEntries ukUASuccessPageEntries
}, },
{
BOOT_LOADER_INSTALLATION_PAGE,
ukUABootLoaderInstallPageEntries
},
{ {
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
ukUABootPageEntries ukUABootPageEntries

View file

@ -4023,13 +4023,10 @@ Quit:
case 1: case 1:
return BOOT_LOADER_FLOPPY_PAGE; return BOOT_LOADER_FLOPPY_PAGE;
/* Install on both MBR and VBR */ /* Install on both MBR and VBR or VBR only */
case 2: case 2:
return BOOT_LOADER_HARDDISK_MBR_PAGE;
/* Install on VBR only */
case 3: case 3:
return BOOT_LOADER_HARDDISK_VBR_PAGE; return BOOT_LOADER_INSTALLATION_PAGE;
} }
return BOOT_LOADER_PAGE; return BOOT_LOADER_PAGE;
@ -4092,58 +4089,30 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir)
/* /*
* Displays the BootLoaderHarddiskVbrPage. * Displays the BootLoaderInstallationPage.
* *
* Next pages: * Next pages:
* SuccessPage (At once) * SuccessPage (At once)
* QuitPage * QuitPage
* *
* SIDEEFFECTS * SIDEEFFECTS
* Calls InstallVBRToPartition() * Calls InstallVBRToPartition() if VBR installation is chosen.
* Otherwise both InstallVBRToPartition() and InstallMbrBootCodeToDisk()
* are called if both MBR and VBR installation is chosen.
* *
* RETURNS * RETURNS
* Number of the next page. * Number of the next page.
*/ */
static PAGE_NUMBER static PAGE_NUMBER
BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) BootLoaderInstallationPage(PINPUT_RECORD Ir)
{
NTSTATUS Status;
Status = InstallVBRToPartition(&USetupData.SystemRootPath,
&USetupData.SourceRootPath,
&USetupData.DestinationArcPath,
SystemPartition->FileSystem);
if (!NT_SUCCESS(Status))
{
MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER,
SystemPartition->FileSystem);
return QUIT_PAGE;
}
return SUCCESS_PAGE;
}
/*
* Displays the BootLoaderHarddiskMbrPage.
*
* Next pages:
* SuccessPage (At once)
* QuitPage
*
* SIDEEFFECTS
* Calls InstallVBRToPartition()
* Calls InstallMbrBootCodeToDisk()
*
* RETURNS
* Number of the next page.
*/
static PAGE_NUMBER
BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir)
{ {
NTSTATUS Status; NTSTATUS Status;
WCHAR DestinationDevicePathBuffer[MAX_PATH]; WCHAR DestinationDevicePathBuffer[MAX_PATH];
MUIDisplayPage(BOOT_LOADER_INSTALLATION_PAGE);
if (USetupData.MBRInstallType == 2)
{
/* Step 1: Write the VBR */ /* Step 1: Write the VBR */
Status = InstallVBRToPartition(&USetupData.SystemRootPath, Status = InstallVBRToPartition(&USetupData.SystemRootPath,
&USetupData.SourceRootPath, &USetupData.SourceRootPath,
@ -4172,6 +4141,20 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir)
return QUIT_PAGE; return QUIT_PAGE;
} }
} }
}
else
{
Status = InstallVBRToPartition(&USetupData.SystemRootPath,
&USetupData.SourceRootPath,
&USetupData.DestinationArcPath,
SystemPartition->FileSystem);
if (!NT_SUCCESS(Status))
{
MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER,
SystemPartition->FileSystem);
return QUIT_PAGE;
}
}
return SUCCESS_PAGE; return SUCCESS_PAGE;
} }
@ -4632,12 +4615,8 @@ RunUSetup(VOID)
Page = BootLoaderFloppyPage(&Ir); Page = BootLoaderFloppyPage(&Ir);
break; break;
case BOOT_LOADER_HARDDISK_MBR_PAGE: case BOOT_LOADER_INSTALLATION_PAGE:
Page = BootLoaderHarddiskMbrPage(&Ir); Page = BootLoaderInstallationPage(&Ir);
break;
case BOOT_LOADER_HARDDISK_VBR_PAGE:
Page = BootLoaderHarddiskVbrPage(&Ir);
break; break;
/* Repair pages */ /* Repair pages */

View file

@ -111,8 +111,7 @@ typedef enum _PAGE_NUMBER
REGISTRY_PAGE, REGISTRY_PAGE,
BOOT_LOADER_PAGE, BOOT_LOADER_PAGE,
BOOT_LOADER_FLOPPY_PAGE, BOOT_LOADER_FLOPPY_PAGE,
BOOT_LOADER_HARDDISK_MBR_PAGE, BOOT_LOADER_INSTALLATION_PAGE,
BOOT_LOADER_HARDDISK_VBR_PAGE,
SUCCESS_PAGE, SUCCESS_PAGE,
QUIT_PAGE, QUIT_PAGE,