https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf368261f11a9628d76317b29c21994ac2c3a5a9
commit bf368261f11a9628d76317b29c21994ac2c3a5a9
Author: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
AuthorDate: Thu Mar 7 02:30:08 2019 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
CommitDate: Mon Aug 12 12:17:27 2024 +0200
[SETUP:REACTOS] Add new DisplayMessage(V) helpers and reimplement
DisplayError around it
The variadic DisplayMessage(V) helpers display a message box, where
both the title and message can be specified either as explicit strings
or via resource IDs. It also supports the message to be a printf-like
format string, in which case the additional formatting arguments are
subsequently specified.
---
base/setup/reactos/reactos.c | 144 ++++++++++++++++++++++++++++++++++++++++---
base/setup/reactos/reactos.h | 44 ++++++++++---
2 files changed, 172 insertions(+), 16 deletions(-)
diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c
index 2448f418888..67034f93ea5 100644
--- a/base/setup/reactos/reactos.c
+++ b/base/setup/reactos/reactos.c
@@ -92,17 +92,145 @@ CreateTitleFont(VOID)
return hFont;
}
-INT DisplayError(
- IN HWND hParentWnd OPTIONAL,
- IN UINT uIDTitle,
- IN UINT uIDMessage)
+INT
+DisplayMessageV(
+ _In_opt_ HWND hWnd,
+ _In_ UINT uType,
+ _In_opt_ PCWSTR pszTitle,
+ _In_opt_ PCWSTR pszFormatMessage,
+ _In_ va_list args)
{
- WCHAR message[512], caption[64];
+ INT iRes;
+ HINSTANCE hInstance = NULL;
+ MSGBOXPARAMSW mb = {0};
+ LPWSTR Format;
+ size_t MsgLen;
+ WCHAR StaticBuffer[256];
+ LPWSTR Buffer = StaticBuffer; // Use the static buffer by default.
+
+ /* We need to retrieve the current module's instance handle if either
+ * the title or the format message is specified by a resource ID */
+ if ((pszTitle && IS_INTRESOURCE(pszTitle)) ||
IS_INTRESOURCE(pszFormatMessage))
+ hInstance = GetModuleHandleW(NULL); // SetupData.hInstance;
+
+ /* Retrieve the format message string if this is a resource */
+ if (pszFormatMessage && IS_INTRESOURCE(pszFormatMessage)) do
+ {
+ // LoadAllocStringW()
+ PCWSTR pStr;
+
+ /* Try to load the string from the resource */
+ MsgLen = LoadStringW(hInstance, PtrToUlong(pszFormatMessage),
(LPWSTR)&pStr, 0);
+ if (MsgLen == 0)
+ {
+ /* No resource string was found, return NULL */
+ Format = NULL;
+ break;
+ }
+
+ /* Allocate a new buffer, adding a NULL-terminator */
+ Format = HeapAlloc(GetProcessHeap(), 0, (MsgLen + 1) * sizeof(WCHAR));
+ if (!Format)
+ {
+ MsgLen = 0;
+ break;
+ }
+
+ /* Copy the string, NULL-terminated */
+ StringCchCopyNW(Format, MsgLen + 1, pStr, MsgLen);
+ } while (0);
+ else
+ {
+ Format = (LPWSTR)pszFormatMessage;
+ }
+
+ if (Format)
+ {
+ /*
+ * Retrieve the message length. If it is too long, allocate
+ * an auxiliary buffer; otherwise use the static buffer.
+ * The string is built to be NULL-terminated.
+ */
+ MsgLen = _vscwprintf(Format, args);
+ if (MsgLen >= _countof(StaticBuffer))
+ {
+ Buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (MsgLen +
1) * sizeof(WCHAR));
+ if (!Buffer)
+ {
+ /* Allocation failed, use the original format string verbatim
*/
+ Buffer = Format;
+ }
+ }
+ if (Buffer != Format)
+ {
+ /* Do the printf as we use the caller's format string */
+ StringCchVPrintfW(Buffer, MsgLen + 1, Format, args);
+ }
+ }
+ else
+ {
+ Format = (LPWSTR)pszFormatMessage;
+ Buffer = Format;
+ }
+
+ /* Display the message */
+ mb.cbSize = sizeof(mb);
+ mb.hwndOwner = hWnd;
+ mb.hInstance = hInstance;
+ mb.lpszText = Buffer;
+ mb.lpszCaption = pszTitle;
+ mb.dwStyle = uType;
+ mb.dwLanguageId = MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT);
+ iRes = MessageBoxIndirectW(&mb);
+
+ /* Free the buffers if needed */
+ if ((Buffer != StaticBuffer) && (Buffer != Format))
+ HeapFree(GetProcessHeap(), 0, Buffer);
+
+ if (Format && (Format != pszFormatMessage))
+ HeapFree(GetProcessHeap(), 0, Format);
+
+ return iRes;
+}
+
+INT
+__cdecl
+DisplayMessage(
+ _In_opt_ HWND hWnd,
+ _In_ UINT uType,
+ _In_opt_ PCWSTR pszTitle,
+ _In_opt_ PCWSTR pszFormatMessage,
+ ...)
+{
+ INT iRes;
+ va_list args;
+
+ va_start(args, pszFormatMessage);
+ iRes = DisplayMessageV(hWnd, uType, pszTitle, pszFormatMessage, args);
+ va_end(args);
+
+ return iRes;
+}
+
+INT
+__cdecl
+DisplayError(
+ _In_opt_ HWND hWnd,
+ _In_ UINT uIDTitle,
+ _In_ UINT uIDMessage,
+ ...)
+{
+ INT iRes;
+ va_list args;
- LoadStringW(SetupData.hInstance, uIDMessage, message, ARRAYSIZE(message));
- LoadStringW(SetupData.hInstance, uIDTitle, caption, ARRAYSIZE(caption));
+ va_start(args, uIDMessage);
+ iRes = DisplayMessageV(hWnd, MB_OK | MB_ICONERROR,
+ MAKEINTRESOURCEW(uIDTitle),
+ MAKEINTRESOURCEW(uIDMessage),
+ args);
+ va_end(args);
- return MessageBoxW(hParentWnd, message, caption, MB_OK | MB_ICONERROR);
+ return iRes;
}
static INT_PTR CALLBACK
diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h
index 071d642d713..24ebf661bcd 100644
--- a/base/setup/reactos/reactos.h
+++ b/base/setup/reactos/reactos.h
@@ -166,6 +166,17 @@ ConvertNtPathToWin32Path(
/* drivepage.c */
+INT_PTR
+CALLBACK
+DriveDlgProc(
+ HWND hwndDlg,
+ UINT uMsg,
+ WPARAM wParam,
+ LPARAM lParam);
+
+
+/* reactos.c */
+
BOOL
CreateListViewColumns(
IN HINSTANCE hInstance,
@@ -175,14 +186,31 @@ CreateListViewColumns(
IN const INT* pColsAlign,
IN UINT nNumOfColumns);
-INT_PTR
-CALLBACK
-DriveDlgProc(
- HWND hwndDlg,
- UINT uMsg,
- WPARAM wParam,
- LPARAM lParam);
+INT
+DisplayMessageV(
+ _In_opt_ HWND hWnd,
+ _In_ UINT uType,
+ _In_opt_ PCWSTR pszTitle,
+ _In_opt_ PCWSTR pszFormatMessage,
+ _In_ va_list args);
+
+INT
+__cdecl
+DisplayMessage(
+ _In_opt_ HWND hWnd,
+ _In_ UINT uType,
+ _In_opt_ PCWSTR pszTitle,
+ _In_opt_ PCWSTR pszFormatMessage,
+ ...);
+
+INT
+__cdecl
+DisplayError(
+ _In_opt_ HWND hWnd,
+ _In_ UINT uIDTitle,
+ _In_ UINT uIDMessage,
+ ...);
#endif /* _REACTOS_PCH_ */
-/* EOP */
+/* EOF */
