Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPLIB] Remove a deprecated error number (that gets merged with ERROR_TXTSETUP_SECTION).

Browse source 
[USETUP] Improve usage of ERROR_TXTSETUP_SECTION and ERROR_CABINET_SECTION error codes, correctly display associated error message, and remove a deprecated string.
This commit is contained in:
Hermès Bélusca-Maïto 2017-12-30 18:21:42 +01:00
parent 4b148bcaf2
commit a7afba7703
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
29 changed files with 1130 additions and 1314 deletions
Download patch file Download diff file Expand all files Collapse all files

27
base/setup/usetup/mui.c
View file

@ -175,15 +175,14 @@ MUIDisplayPage(
}
VOID
MUIDisplayError(
MUIDisplayErrorV(
IN ULONG ErrorNum,
OUT PINPUT_RECORD Ir,
IN ULONG WaitEvent,
...)
IN va_list args)
{
const MUI_ERROR * entry;
const MUI_ERROR* entry;
CHAR Buffer[2048];
va_list ap;
if (ErrorNum >= ERROR_LAST_ERROR_CODE)
{
@ -191,7 +190,6 @@ MUIDisplayError(
"Press ENTER to continue",
Ir,
POPUP_WAIT_ENTER);
return;
}
@ -205,9 +203,7 @@ MUIDisplayError(
return;
}
va_start(ap, WaitEvent);
vsprintf(Buffer, entry[ErrorNum].ErrorText, ap);
va_end(ap);
vsprintf(Buffer, entry[ErrorNum].ErrorText, args);
PopupError(Buffer,
entry[ErrorNum].ErrorStatus,
@ -215,6 +211,21 @@ MUIDisplayError(
WaitEvent);
}
VOID
__cdecl
MUIDisplayError(
IN ULONG ErrorNum,
OUT PINPUT_RECORD Ir,
IN ULONG WaitEvent,
...)
{
va_list arg_ptr;
va_start(arg_ptr, WaitEvent);
MUIDisplayErrorV(ErrorNum, Ir, WaitEvent, arg_ptr);
va_end(arg_ptr);
}
LPSTR
MUIGetString(
ULONG Number)