Ros-diffs

ros-diffs@reactos.org

81390 discussions

11/11: [USER32] Update file description.
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b4673a3caa3f55231e5a… commit 9b4673a3caa3f55231e5a7a5ee0791b62aacca2b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 16 22:08:08 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 17:12:25 2018 +0200 [USER32] Update file description. --- win32ss/user/user32/windows/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index 3cf8371a54..0fc31a71fe 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -19,7 +19,7 @@ /* * PROJECT: ReactOS user32.dll * FILE: win32ss/user/user32/windows/dialog.c - * PURPOSE: Input + * PURPOSE: Dialog Manager * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Thomas Weidenmueller (w3seek(a)users.sourceforge.net) * Steven Edwards (Steven_Ed4153(a)yahoo.com)

1 0

10/11: [USER32] Implement SoftModalMessageBox() based on the original MessageBoxTimeoutIndirectW().
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2be262bfb10551e4b8829… commit 2be262bfb10551e4b8829936fb68156583993f5e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 16 22:04:48 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 17:12:24 2018 +0200 [USER32] Implement SoftModalMessageBox() based on the original MessageBoxTimeoutIndirectW(). Additional changes: - Adapt the message-box dialog procedure to correctly take into account the presence or absence of a CANCEL button and take appropriate actions. - Cache the strings retrieved by MB_GetString() (add FIXME notices too). --- win32ss/user/user32/user32.spec | 2 +- win32ss/user/user32/windows/messagebox.c | 436 +++++++++++++++++++++---------- 2 files changed, 293 insertions(+), 145 deletions(-) diff --git a/win32ss/user/user32/user32.spec b/win32ss/user/user32/user32.spec index 79c0693ac9..2f3ec10bac 100644 --- a/win32ss/user/user32/user32.spec +++ b/win32ss/user/user32/user32.spec @@ -675,7 +675,7 @@ 666 stdcall ShowStartGlass(long) 667 stdcall ShowWindow(long long) NtUserShowWindow 668 stdcall ShowWindowAsync(long long) NtUserShowWindowAsync -669 stdcall SoftModalMessageBox(long) +669 stdcall SoftModalMessageBox(ptr) 670 stdcall SubtractRect(ptr ptr ptr) 671 stdcall SwapMouseButton(long) 672 stdcall SwitchDesktop(long) NtUserSwitchDesktop diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c index 9ac339a97e..8dc135fa39 100644 --- a/win32ss/user/user32/windows/messagebox.c +++ b/win32ss/user/user32/windows/messagebox.c @@ -22,6 +22,7 @@ * PURPOSE: Message Boxes * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * Hermes Belusca-Maito * UPDATE HISTORY: * 2003/07/28 Added some NT features * 2003/07/27 Code ported from wine @@ -29,6 +30,7 @@ */ #include <user32.h> +#include <ntstrsafe.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); @@ -100,6 +102,43 @@ static const MSGBTNINFO MsgBtnInfo[] = /* INTERNAL FUNCTIONS ********************************************************/ +static UINT +LoadAllocStringW( + IN HINSTANCE hInstance OPTIONAL, + IN UINT uID, + OUT PWSTR* pString, + IN PCWSTR pDefaultString OPTIONAL) +{ + UINT Length; + PCWSTR pStr; + + /* Try to load the string from the resource */ + Length = LoadStringW(hInstance, uID, (LPWSTR)&pStr, 0); + if (Length == 0) + { + /* If the resource string was not found, use the fallback default one */ + + if (!pDefaultString) + { + /* None was specified, return NULL */ + *pString = NULL; + return 0; + } + + pStr = pDefaultString; + Length = wcslen(pStr); + } + + /* Allocate a new buffer, adding a NULL-terminator */ + *pString = RtlAllocateHeap(RtlGetProcessHeap(), 0, (Length + 1) * sizeof(WCHAR)); + if (!*pString) + return 0; + + /* Copy the string, NULL-terminated */ + RtlStringCchCopyNW(*pString, Length + 1, pStr, Length); + return Length; +} + static VOID MessageBoxTextToClipboard(HWND DialogWindow) { HWND hwndText; @@ -208,15 +247,14 @@ static INT_PTR CALLBACK MessageBoxProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - int Alert; PMSGBOXDATA mbd; - HELPINFO hi; - HWND hwndOwner; switch (message) { case WM_INITDIALOG: { + int Alert; + mbd = (PMSGBOXDATA)lParam; SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)mbd); @@ -234,7 +272,7 @@ static INT_PTR CALLBACK MessageBoxProc( SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)(HICON)mbd->mbp.lpszIcon, 0); Alert = ALERT_SYSTEM_WARNING; } - else // Setup the rest of the alerts. + else /* Setup the rest of the alerts */ { switch (mbd->mbp.dwStyle & MB_ICONMASK) { @@ -249,32 +287,66 @@ static INT_PTR CALLBACK MessageBoxProc( break; default: Alert = ALERT_SYSTEM_INFORMATIONAL; - /* fall through */ + /* Fall through */ } } - /* Send out the alert notifications. */ + /* Send out the alert notifications */ NotifyWinEvent(EVENT_SYSTEM_ALERT, hwnd, OBJID_ALERT, Alert); - switch (mbd->mbp.dwStyle & MB_TYPEMASK) + /* Disable the Close menu button if no Cancel button is specified */ + if (mbd->uCancelId == 0) { - case MB_ABORTRETRYIGNORE: - case MB_YESNO: - RemoveMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND); - break; + HMENU hSysMenu = GetSystemMenu(hwnd, FALSE); + if (hSysMenu) + DeleteMenu(hSysMenu, SC_CLOSE, MF_BYCOMMAND); } - ASSERT(mbd->uDefButton < mbd->dwButtons); - SetFocus(GetDlgItem(hwnd, mbd->pidButton[mbd->uDefButton])); + + /* Set the focus to the default button */ + if (mbd->dwButtons > 0) + { + ASSERT(mbd->uDefButton < mbd->dwButtons); + SetFocus(GetDlgItem(hwnd, mbd->pidButton[mbd->uDefButton])); + } + + /* Set up the window timer */ if (mbd->dwTimeout && (mbd->dwTimeout != (UINT)-1)) SetTimer(hwnd, 0, mbd->dwTimeout, NULL); } - return 0; + return FALSE; } case WM_COMMAND: - switch (LOWORD(wParam)) + { + UINT i; + INT_PTR iCtrlId = LOWORD(wParam); + + switch (iCtrlId) { + /* Handle the default message-box buttons */ case IDOK: case IDCANCEL: + /* + * The dialog manager always sends IDCANCEL when the user + * presses ESCape. We check here whether the message box + * has a CANCEL button, or whether we should fall back to + * the OK button, by using the correct uCancelId. + */ + if (iCtrlId == IDCANCEL) + { + mbd = (PMSGBOXDATA)GetPropW(hwnd, L"ROS_MSGBOX"); + if (!mbd) + return FALSE; /* Ignore */ + + /* Check whether we can cancel the message box */ + if (mbd->uCancelId == 0) + return TRUE; // FALSE; /* No, ignore */ + /* Quit with the correct return value */ + iCtrlId = mbd->uCancelId; + } + if (!GetDlgItem(hwnd, iCtrlId)) + return FALSE; /* Ignore */ + + /* Fall through */ case IDABORT: case IDRETRY: case IDIGNORE: @@ -282,69 +354,93 @@ static INT_PTR CALLBACK MessageBoxProc( case IDNO: case IDTRYAGAIN: case IDCONTINUE: - EndDialog(hwnd, wParam); - return 0; + EndDialog(hwnd, iCtrlId); + return TRUE; + + case IDCLOSE: + return FALSE; /* Ignore */ + case IDHELP: - /* send WM_HELP message to messagebox window */ + { + /* Send WM_HELP message to the message-box window */ + HELPINFO hi; hi.cbSize = sizeof(hi); hi.iContextType = HELPINFO_WINDOW; - hi.iCtrlId = LOWORD(wParam); + hi.iCtrlId = iCtrlId; hi.hItemHandle = (HANDLE)lParam; hi.dwContextId = 0; GetCursorPos(&hi.MousePos); SendMessageW(hwnd, WM_HELP, 0, (LPARAM)&hi); - return 0; + return TRUE; + } + + default: + break; } - return 0; + + /* Check for any other user-defined buttons */ + mbd = (PMSGBOXDATA)GetPropW(hwnd, L"ROS_MSGBOX"); + if (!mbd) + return FALSE; + + for (i = 0; i < mbd->dwButtons; ++i) + { + if (iCtrlId == mbd->pidButton[i]) + { + EndDialog(hwnd, iCtrlId); + return TRUE; + } + } + + return FALSE; + } case WM_COPY: MessageBoxTextToClipboard(hwnd); - return 0; + return TRUE; case WM_HELP: { + LPHELPINFO phi = (LPHELPINFO)lParam; mbd = (PMSGBOXDATA)GetPropW(hwnd, L"ROS_MSGBOX"); if (!mbd) - return 0; - memcpy(&hi, (void *)lParam, sizeof(hi)); - hi.dwContextId = GetWindowContextHelpId(hwnd); + return FALSE; + phi->dwContextId = GetWindowContextHelpId(hwnd); if (mbd->mbp.lpfnMsgBoxCallback) { - mbd->mbp.lpfnMsgBoxCallback(&hi); + mbd->mbp.lpfnMsgBoxCallback(phi); } else { - hwndOwner = GetWindow(hwnd, GW_OWNER); + HWND hwndOwner = GetWindow(hwnd, GW_OWNER); if (hwndOwner) - SendMessageW(hwndOwner, WM_HELP, 0, (LPARAM)&hi); + SendMessageW(hwndOwner, WM_HELP, 0, lParam); } - return 0; + return TRUE; } case WM_CLOSE: { mbd = (PMSGBOXDATA)GetPropW(hwnd, L"ROS_MSGBOX"); if (!mbd) - return 0; - switch (mbd->mbp.dwStyle & MB_TYPEMASK) - { - case MB_ABORTRETRYIGNORE: - case MB_YESNO: - return 1; - } - EndDialog(hwnd, IDCANCEL); - return 1; + return FALSE; + + /* Check whether we can cancel the message box */ + if (mbd->uCancelId == 0) + return TRUE; /* No, ignore */ + /* Quit with the correct return value */ + EndDialog(hwnd, mbd->uCancelId); + return TRUE; } case WM_TIMER: if (wParam == 0) - { EndDialog(hwnd, IDTIMEOUT); - } - return 0; + return FALSE; } - return 0; + + return FALSE; } static int @@ -352,40 +448,33 @@ MessageBoxTimeoutIndirectW( CONST MSGBOXPARAMSW *lpMsgBoxParams, UINT dwTimeout) { int ret = 0; + UINT i; + LPWSTR defCaption = NULL; MSGBOXDATA mbd; MSGBTNINFO Buttons; LPCWSTR ButtonText[MSGBOXEX_MAXBTNS]; - DLGTEMPLATE *tpl; - DLGITEMTEMPLATE *iico, *itxt, *ibtn; - NONCLIENTMETRICSW nclm; - LPVOID buf; - BYTE *dest; - LPCWSTR caption, text; - HFONT hFont, hOldFont; - HICON hIcon; - HWND hDCWnd; - HDC hDC; - SIZE units; - int bufsize, caplen, textlen, i, btnleft, btntop; - size_t ButtonLen; - RECT btnrect, txtrect, rc; - SIZE btnsize; - POINT iconPos; SIZE iconSize; - ZeroMemory(&mbd, sizeof(mbd)); memcpy(&mbd.mbp, lpMsgBoxParams, sizeof(mbd.mbp)); - lpMsgBoxParams = &mbd.mbp; - - mbd.wLanguageId = (WORD)lpMsgBoxParams->dwLanguageId; // FIXME! + mbd.wLanguageId = (WORD)lpMsgBoxParams->dwLanguageId; mbd.dwTimeout = dwTimeout; + if (!mbd.mbp.lpszCaption) + { + /* No caption, use the default one */ + LoadAllocStringW(User32Instance, + IDS_ERROR, + &defCaption, + L"Error"); + mbd.mbp.lpszCaption = (defCaption ? defCaption : L"Error"); + } + /* Create the selected buttons; unknown types will fall back to MB_OK */ i = (lpMsgBoxParams->dwStyle & MB_TYPEMASK); if (i >= ARRAYSIZE(MsgBtnInfo)) i = MB_OK; - /* Get buttons IDs */ + /* Get the buttons IDs */ Buttons = MsgBtnInfo[i]; /* Add the Help button */ @@ -398,6 +487,23 @@ MessageBoxTimeoutIndirectW( ASSERT(Buttons.btnCnt <= MSGBOXEX_MAXBTNS); + /* Retrieve the pointers to the button labels and find the Cancel button */ + mbd.uCancelId = (i == MB_OK ? IDOK : 0); + for (i = 0; i < Buttons.btnCnt; ++i) + { + // FIXME: Use the strings in the correct language. + // MB_GetString gives the string in default system language. + ButtonText[i] = MB_GetString(Buttons.btnIds[i] - IDS_OK); /* or: Buttons.btnIdx[i] - IDOK */ +#if 0 + LoadAllocStringW(User32Instance, + Buttons.btnIds[i], + &ButtonText[i], + L""); +#endif + if (Buttons.btnIdx[i] == IDCANCEL) + mbd.uCancelId = IDCANCEL; + } + mbd.pidButton = Buttons.btnIdx; mbd.ppszButtonText = ButtonText; mbd.dwButtons = Buttons.btnCnt; @@ -406,48 +512,95 @@ MessageBoxTimeoutIndirectW( /* Make the first button the default button if none other is */ if (mbd.uDefButton >= mbd.dwButtons) mbd.uDefButton = 0; - // mbd.uCancelId; + /* Call the helper function */ + ret = SoftModalMessageBox(&mbd); - /* Load the caption */ - if (!lpMsgBoxParams->lpszCaption) +#if 0 + for (i = 0; i < mbd.dwButtons; i++) { - /* No caption, use the default one */ - caplen = LoadStringW(User32Instance, IDS_ERROR, (LPWSTR)&caption, 0); + if (ButtonText[i] && *ButtonText[i]) + RtlFreeHeap(RtlGetProcessHeap(), 0, ButtonText[i]); } - else if (IS_INTRESOURCE(lpMsgBoxParams->lpszCaption)) +#endif + + if (defCaption) + RtlFreeHeap(RtlGetProcessHeap(), 0, defCaption); + + return ret; +} + +int +WINAPI +SoftModalMessageBox(IN LPMSGBOXDATA lpMsgBoxData) +{ + int ret = 0; + MSGBOXDATA mbd; + LPMSGBOXPARAMSW lpMsgBoxParams = &mbd.mbp; + DLGTEMPLATE *tpl; + DLGITEMTEMPLATE *iico, *itxt, *ibtn; + NONCLIENTMETRICSW nclm; + LPVOID buf; + BYTE *dest; + LPWSTR caption, text; + HFONT hFont, hOldFont; + HICON hIcon; + HWND hDCWnd; + HDC hDC; + SIZE units; + int bufsize, caplen, textlen, i, btnleft, btntop; + size_t ButtonLen; + RECT btnrect, txtrect, rc; + SIZE btnsize; + POINT iconPos; SIZE iconSize; + + /* Capture the MsgBoxData */ + memcpy(&mbd, lpMsgBoxData, sizeof(mbd)); + + /* Load the caption */ + caption = NULL; + if (lpMsgBoxParams->lpszCaption && IS_INTRESOURCE(lpMsgBoxParams->lpszCaption)) { /* User-defined resource string */ - caplen = LoadStringW(lpMsgBoxParams->hInstance, - PtrToUlong(lpMsgBoxParams->lpszCaption), - (LPWSTR)&caption, 0); + caplen = LoadAllocStringW(lpMsgBoxParams->hInstance, + PtrToUlong(lpMsgBoxParams->lpszCaption), + &caption, + NULL); + lpMsgBoxParams->lpszCaption = caption; } - else + else if (lpMsgBoxParams->lpszCaption) { /* UNICODE string pointer */ - caption = lpMsgBoxParams->lpszCaption; - caplen = wcslen(caption); + caplen = wcslen(lpMsgBoxParams->lpszCaption); } - - /* Load the text */ - if (!lpMsgBoxParams->lpszText) + if (!lpMsgBoxParams->lpszCaption) { - /* No text, use blank */ - text = L""; - textlen = 0; + /* No caption, use blank */ + lpMsgBoxParams->lpszCaption = L""; + caplen = 0; } - else if (IS_INTRESOURCE(lpMsgBoxParams->lpszText)) + + /* Load the text */ + text = NULL; + if (lpMsgBoxParams->lpszText && IS_INTRESOURCE(lpMsgBoxParams->lpszText)) { /* User-defined resource string */ - textlen = LoadStringW(lpMsgBoxParams->hInstance, - PtrToUlong(lpMsgBoxParams->lpszText), - (LPWSTR)&text, 0); + textlen = LoadAllocStringW(lpMsgBoxParams->hInstance, + PtrToUlong(lpMsgBoxParams->lpszText), + &text, + NULL); + lpMsgBoxParams->lpszText = text; } - else + else if (lpMsgBoxParams->lpszText) { /* UNICODE string pointer */ - text = lpMsgBoxParams->lpszText; - textlen = wcslen(text); + textlen = wcslen(lpMsgBoxParams->lpszText); + } + if (!lpMsgBoxParams->lpszText) + { + /* No text, use blank */ + lpMsgBoxParams->lpszText = L""; + textlen = 0; } /* Load the icon */ @@ -483,7 +636,7 @@ MessageBoxTimeoutIndirectW( break; } /* Reuse the internal pointer! */ - ((MSGBOXPARAMSW*)lpMsgBoxParams)->lpszIcon = (LPCWSTR)hIcon; + lpMsgBoxParams->lpszIcon = (LPCWSTR)hIcon; /* Basic space */ bufsize = sizeof(DLGTEMPLATE) + @@ -509,31 +662,17 @@ MessageBoxTimeoutIndirectW( /* Space for the buttons */ for (i = 0; i < mbd.dwButtons; i++) { - /* Get the default text of the buttons */ - if (Buttons.btnIds[i]) - { - LPCWSTR pStr; - ButtonLen = LoadStringW(User32Instance, - Buttons.btnIds[i], - (LPWSTR)&pStr, 0); - mbd.ppszButtonText[i] = RtlAllocateHeap(GetProcessHeap(), 0, (ButtonLen + 1) * sizeof(WCHAR)); - if (mbd.ppszButtonText[i]) - { - memcpy((LPWSTR)mbd.ppszButtonText[i], pStr, ButtonLen * sizeof(WCHAR)); - ((LPWSTR)mbd.ppszButtonText[i])[ButtonLen] = 0; - } - else - { - mbd.ppszButtonText[i] = L""; - ButtonLen = 0; - } - } - else + if (!mbd.ppszButtonText[i] || !*mbd.ppszButtonText[i]) { /* No text, use blank */ mbd.ppszButtonText[i] = L""; ButtonLen = 0; } + else + { + /* UNICODE string pointer */ + ButtonLen = wcslen(mbd.ppszButtonText[i]); + } bufsize = ALIGN_UP(bufsize, DWORD); bufsize += sizeof(DLGITEMTEMPLATE) + @@ -542,7 +681,7 @@ MessageBoxTimeoutIndirectW( } /* Allocate the dialog template */ - buf = RtlAllocateHeap(GetProcessHeap(), 0, bufsize); + buf = RtlAllocateHeap(RtlGetProcessHeap(), 0, bufsize); if (!buf) goto Quit; @@ -554,7 +693,7 @@ MessageBoxTimeoutIndirectW( hFont = CreateFontIndirectW(&nclm.lfMessageFont); if (!hFont) { - ERR("Cannot retrieve nclm.lfMessageFont!\n"); + ERR("Cannot retrieve nclm.lfMessageFont! (error %lu)\n", GetLastError()); goto Quit; } @@ -568,7 +707,7 @@ MessageBoxTimeoutIndirectW( } if (!hDC) { - ERR("GetDCEx() failed, bail out!\n"); + ERR("GetDCEx() failed, bail out! (error %lu)\n", GetLastError()); goto Quit; } hOldFont = SelectObject(hDC, hFont); @@ -577,7 +716,7 @@ MessageBoxTimeoutIndirectW( if (!units.cx) { DWORD defUnits; - ERR("GdiGetCharDimensions() failed, falling back to default values!\n"); + ERR("GdiGetCharDimensions() failed, falling back to default values (error %lu)\n", GetLastError()); defUnits = GetDialogBaseUnits(); units.cx = LOWORD(defUnits); units.cy = HIWORD(defUnits); @@ -590,7 +729,7 @@ MessageBoxTimeoutIndirectW( txtrect.top = txtrect.left = txtrect.bottom = 0; if (textlen != 0) { - DrawTextW(hDC, text, textlen, &txtrect, + DrawTextW(hDC, lpMsgBoxParams->lpszText, textlen, &txtrect, DT_LEFT | DT_NOPREFIX | DT_WORDBREAK | DT_EXPANDTABS | DT_EXTERNALLEADING | DT_EDITCONTROL | DT_CALCRECT); } else @@ -682,7 +821,6 @@ MessageBoxTimeoutIndirectW( } - /* Initialize the dialog template */ tpl = (DLGTEMPLATE *)buf; @@ -701,7 +839,7 @@ MessageBoxTimeoutIndirectW( *(DWORD*)dest = 0; /* no menu and use default window class */ dest += 2 * sizeof(WORD); - memcpy(dest, caption, caplen * sizeof(WCHAR)); + memcpy(dest, lpMsgBoxParams->lpszCaption, caplen * sizeof(WCHAR)); dest += caplen * sizeof(WCHAR); *(WCHAR*)dest = L'\0'; dest += sizeof(WCHAR); @@ -755,7 +893,7 @@ MessageBoxTimeoutIndirectW( dest += sizeof(WORD); *(WORD*)dest = 0x0082; /* static control */ dest += sizeof(WORD); - memcpy(dest, text, textlen * sizeof(WCHAR)); + memcpy(dest, lpMsgBoxParams->lpszText, textlen * sizeof(WCHAR)); dest += textlen * sizeof(WCHAR); *(WCHAR*)dest = 0; dest += sizeof(WCHAR); @@ -808,10 +946,11 @@ MessageBoxTimeoutIndirectW( btnleft += btnsize.cx + MSGBOXEX_BUTTONSPACING; } - /* Calculate the size and position of the messagebox window */ + /* Calculate the size and position of the message-box window */ btnleft = max(btnleft - MSGBOXEX_BUTTONSPACING, rc.left + txtrect.right); btnleft += MSGBOXEX_MARGIN; - btntop += btnsize.cy + MSGBOXEX_MARGIN; + if (mbd.dwButtons > 0) + btntop += btnsize.cy + MSGBOXEX_MARGIN; /* Set the size and position of the static message */ itxt->x = RESCALE_X(rc.left, units); @@ -823,19 +962,20 @@ MessageBoxTimeoutIndirectW( tpl->cx = RESCALE_X(btnleft, units); tpl->cy = RESCALE_Y(btntop, units); - /* Finally show the messagebox */ + /* Finally show the message-box */ ret = DialogBoxIndirectParamW(lpMsgBoxParams->hInstance, tpl, lpMsgBoxParams->hwndOwner, MessageBoxProc, (LPARAM)&mbd); Quit: - RtlFreeHeap(GetProcessHeap(), 0, buf); + if (buf) + RtlFreeHeap(RtlGetProcessHeap(), 0, buf); - for (i = 0; i < mbd.dwButtons; i++) - { - if (mbd.ppszButtonText[i] && *(mbd.ppszButtonText[i])) - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR)mbd.ppszButtonText[i]); - } + if (text) + RtlFreeHeap(RtlGetProcessHeap(), 0, text); + + if (caption) + RtlFreeHeap(RtlGetProcessHeap(), 0, caption); return ret; } @@ -1098,24 +1238,13 @@ MessageBoxTimeoutW( } -/* - * @unimplemented - */ -DWORD -WINAPI -SoftModalMessageBox(DWORD Unknown0) -{ - UNIMPLEMENTED; - return 0; -} - - /* * @implemented */ BOOL WINAPI -MessageBeep(IN UINT uType) +MessageBeep( + IN UINT uType) { return NtUserxMessageBeep(uType); } @@ -1130,9 +1259,30 @@ MessageBeep(IN UINT uType) */ LPCWSTR WINAPI -MB_GetString(IN UINT wBtn) +MB_GetString( + IN UINT wBtn) { - LPCWSTR btnStr = NULL; + static BOOL bCached = FALSE; + static MBSTRING MBStrings[MAX_MB_STRINGS]; // FIXME: Use gpsi->MBStrings when this is loaded by Win32k! + + // + // FIXME - TODO: The gpsi->MBStrings[] array should be loaded by win32k! + // + ASSERT(IDCONTINUE <= MAX_MB_STRINGS); + if (!bCached) + { + UINT i; + for (i = 0; i < MAX_MB_STRINGS; ++i) + { + /*gpsi->*/MBStrings[i].uID = IDOK + i; + /*gpsi->*/MBStrings[i].uStr = IDS_OK + i; // See user32/include/resource.h + LoadStringW(User32Instance, + /*gpsi->*/MBStrings[i].uStr, + /*gpsi->*/MBStrings[i].szName, + ARRAYSIZE(/*gpsi->*/MBStrings[i].szName)); + } + bCached = TRUE; + } /* * The allowable IDs are between "IDOK - 1" (0) and "IDCONTINUE - 1" (10) inclusive. @@ -1141,9 +1291,7 @@ MB_GetString(IN UINT wBtn) if (wBtn > IDCONTINUE - 1) return NULL; - wBtn += 800; // See user32/include/resource.h - LoadStringW(User32Instance, wBtn, (LPWSTR)&btnStr, 0); - return btnStr; + return /*gpsi->*/MBStrings[wBtn].szName; } /* EOF */

1 0

09/11: [ROSTESTS] Add an interactive test for the user32.dll API SoftModalMessageBox().
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5fedabbf0aefb015841b2… commit 5fedabbf0aefb015841b2329a8d64d099c3a6c7b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 16 22:01:52 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 17:12:23 2018 +0200 [ROSTESTS] Add an interactive test for the user32.dll API SoftModalMessageBox(). --- modules/rostests/win32/user32/CMakeLists.txt | 1 + .../win32/user32/softmodalmsgbox/CMakeLists.txt | 5 + .../win32/user32/softmodalmsgbox/resource.h | 2 + .../win32/user32/softmodalmsgbox/softmodalmsgbox.c | 122 +++++++++++++++++++++ .../user32/softmodalmsgbox/softmodalmsgbox.rc | 11 ++ 5 files changed, 141 insertions(+) diff --git a/modules/rostests/win32/user32/CMakeLists.txt b/modules/rostests/win32/user32/CMakeLists.txt index d1d83974bd..205afbc403 100644 --- a/modules/rostests/win32/user32/CMakeLists.txt +++ b/modules/rostests/win32/user32/CMakeLists.txt @@ -1,4 +1,5 @@ add_subdirectory(biditext) add_subdirectory(paintdesktop) +add_subdirectory(softmodalmsgbox) add_subdirectory(sysicon) add_subdirectory(winstation) diff --git a/modules/rostests/win32/user32/softmodalmsgbox/CMakeLists.txt b/modules/rostests/win32/user32/softmodalmsgbox/CMakeLists.txt new file mode 100644 index 0000000000..310a01e518 --- /dev/null +++ b/modules/rostests/win32/user32/softmodalmsgbox/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(softmodalmsgbox softmodalmsgbox.c softmodalmsgbox.rc) +set_module_type(softmodalmsgbox win32cui UNICODE) +add_importlibs(softmodalmsgbox user32 msvcrt kernel32) +add_rostests_file(TARGET softmodalmsgbox SUBDIR suppl) diff --git a/modules/rostests/win32/user32/softmodalmsgbox/resource.h b/modules/rostests/win32/user32/softmodalmsgbox/resource.h new file mode 100644 index 0000000000..6e6ee36e09 --- /dev/null +++ b/modules/rostests/win32/user32/softmodalmsgbox/resource.h @@ -0,0 +1,2 @@ +#define IDS_RES_CAPTION 101 +#define IDS_RES_MESSAGE 102 diff --git a/modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.c b/modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.c new file mode 100644 index 0000000000..40913e6142 --- /dev/null +++ b/modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.c @@ -0,0 +1,122 @@ +/* + * PROJECT: ReactOS Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests the undocumented user32.dll API SoftModalMessageBox(). + * COPYRIGHT: Copyright 2018 Hermes Belusca-Maito + */ + +#include <stdio.h> +#include <stdlib.h> +#include <conio.h> + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + +#include "resource.h" + +/* Adjust according to your platform! -- ReactOS is currently compatible with Windows Server 2003 */ +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WS03 // _WIN32_WINNT_WIN2K // _WIN32_WINNT_WS03 // _WIN32_WINNT_WIN7 + +typedef struct _MSGBOXDATA +{ + MSGBOXPARAMSW mbp; // Size: 0x28 (x86), 0x50 (x64) + HWND hwndOwner; // Will be converted to PWND +#if defined(_WIN32) && (_WIN32_WINNT >= _WIN32_WINNT_WIN7) /* (NTDDI_VERSION >= NTDDI_WIN7) */ + DWORD dwPadding; +#endif + WORD wLanguageId; + INT* pidButton; // Array of button IDs + LPCWSTR* ppszButtonText; // Array of button text strings + DWORD dwButtons; // Number of buttons + UINT uDefButton; // Default button ID + UINT uCancelId; // Button ID corresponding to Cancel action +#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) /* (NTDDI_VERSION >= NTDDI_WINXP) */ + DWORD dwTimeout; // Message box timeout +#endif + DWORD dwReserved0; +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) /* (NTDDI_VERSION >= NTDDI_WIN7) */ + DWORD dwReserved[4]; +#endif +} MSGBOXDATA, *PMSGBOXDATA, *LPMSGBOXDATA; + + +#if defined(_WIN64) + +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) /* (NTDDI_VERSION >= NTDDI_WIN7) */ +C_ASSERT(sizeof(MSGBOXDATA) == 0x98); +#elif (_WIN32_WINNT <= _WIN32_WINNT_WS03) /* (NTDDI_VERSION == NTDDI_WS03) */ +C_ASSERT(sizeof(MSGBOXDATA) == 0x88); +#endif + +#else + +#if (_WIN32_WINNT <= _WIN32_WINNT_WIN2K) /* (NTDDI_VERSION <= NTDDI_WIN2KSP4) */ +C_ASSERT(sizeof(MSGBOXDATA) == 0x48); +#elif (_WIN32_WINNT >= _WIN32_WINNT_WIN7) /* (NTDDI_VERSION >= NTDDI_WIN7) */ +C_ASSERT(sizeof(MSGBOXDATA) == 0x60); +#else // (_WIN32_WINNT == _WIN32_WINNT_WINXP || _WIN32_WINNT == _WIN32_WINNT_WS03) /* (NTDDI_VERSION == NTDDI_WS03) */ +C_ASSERT(sizeof(MSGBOXDATA) == 0x4C); +#endif + +#endif + + +typedef int (WINAPI *SOFTMODALMESSAGEBOX)(LPMSGBOXDATA lpMsgBoxData); +// int WINAPI SoftModalMessageBox(IN LPMSGBOXDATA lpMsgBoxData); +SOFTMODALMESSAGEBOX SoftModalMessageBox = NULL; + +// +// Example taken from http://rsdn.org/forum/winapi/3273168.1 +// See also http://www.vbforums.com/showthread.php?840593-Message-Box-with-Four-Buttons +// +int wmain(int argc, WCHAR* argv[]) +{ + MSGBOXDATA data; + int res = 0; + + INT pids[] = + { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 /*, 2*/ + }; + /* NOTE: Buttons do NOT support resource IDs specifications! */ + LPCWSTR ppText[] = + { + L"Button 1", L"Button 2", L"Button 3", L"Button 4", L"Button 5", L"Button 6", L"Button 7", L"Button 8", L"Button 9", L"Button 10", L"Button 11", L"Button 12", L"Button 13" + }; + + ZeroMemory(&data, sizeof(data)); + data.mbp.cbSize = sizeof(data.mbp); + data.mbp.hwndOwner = FindWindowW(L"Shell_TrayWnd", NULL); + data.mbp.hInstance = GetModuleHandleW(NULL); + data.mbp.lpszText = L"This is a message box made using the undocumented SoftModalMessageBox() API."; + data.mbp.lpszCaption = MAKEINTRESOURCEW(IDS_RES_CAPTION); // L"SoftModalMessageBox"; + data.mbp.lpfnMsgBoxCallback = NULL; // SoftModalMessageBoxCallback; + data.mbp.dwStyle = MB_ICONINFORMATION | MB_RETRYCANCEL; + + data.wLanguageId = 0; + data.pidButton = pids; + data.ppszButtonText = ppText; + data.dwButtons = _countof(pids); + data.uDefButton = 2; + data.uCancelId = 0; +#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) /* (NTDDI_VERSION >= NTDDI_WINXP) */ + data.dwTimeout = 3 * 1000; +#endif + + SoftModalMessageBox = (SOFTMODALMESSAGEBOX)GetProcAddress(GetModuleHandleW(L"user32.dll"), "SoftModalMessageBox"); + if (!SoftModalMessageBox) + { + printf("SoftModalMessageBoxW not found in user32.dll\n"); + } + else + { + res = SoftModalMessageBox(&data); + printf("Returned value = %i\n\n", res); + } + + printf("Press any key to quit...\n"); + _getch(); + return 0; +} diff --git a/modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.rc b/modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.rc new file mode 100644 index 0000000000..e04c4eaee9 --- /dev/null +++ b/modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.rc @@ -0,0 +1,11 @@ + +#include <windef.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_RES_CAPTION "Resource Caption" + IDS_RES_MESSAGE "Resource Message" +END

1 0

08/11: [USER32] Code refactoring for MessageBoxTimeoutIndirectW(), in preparation for SoftModalMessageBox() implementation.
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f7318b7594ec97165d3f… commit 4f7318b7594ec97165d3f62c6a4eaf82af43b987 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 12 18:16:29 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 17:12:22 2018 +0200 [USER32] Code refactoring for MessageBoxTimeoutIndirectW(), in preparation for SoftModalMessageBox() implementation. - Remove usage of ButtonLen and ibtn-pointer arrays, to make the code more generic and less dependent on the (maximal) number of buttons in the message boxes. - Move around the code that computes the positions and sizes of the window controls. --- win32ss/user/user32/windows/messagebox.c | 384 +++++++++++++++++-------------- 1 file changed, 215 insertions(+), 169 deletions(-) diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c index 6fb379869e..9ac339a97e 100644 --- a/win32ss/user/user32/windows/messagebox.c +++ b/win32ss/user/user32/windows/messagebox.c @@ -97,6 +97,7 @@ static const MSGBTNINFO MsgBtnInfo[] = DECLARE_MB_3(CANCEL, TRYAGAIN, CONTINUE) }; + /* INTERNAL FUNCTIONS ********************************************************/ static VOID MessageBoxTextToClipboard(HWND DialogWindow) @@ -350,25 +351,26 @@ static int MessageBoxTimeoutIndirectW( CONST MSGBOXPARAMSW *lpMsgBoxParams, UINT dwTimeout) { + int ret = 0; MSGBOXDATA mbd; + MSGBTNINFO Buttons; + LPCWSTR ButtonText[MSGBOXEX_MAXBTNS]; DLGTEMPLATE *tpl; - DLGITEMTEMPLATE *iico, *itxt; + DLGITEMTEMPLATE *iico, *itxt, *ibtn; NONCLIENTMETRICSW nclm; LPVOID buf; BYTE *dest; LPCWSTR caption, text; HFONT hFont, hOldFont; - HICON Icon; + HICON hIcon; HWND hDCWnd; HDC hDC; SIZE units; - int bufsize, ret, caplen, textlen, i, btnleft, btntop, lmargin; - MSGBTNINFO Buttons; - LPCWSTR ButtonText[MSGBOXEX_MAXBTNS]; - int ButtonLen[MSGBOXEX_MAXBTNS]; - DLGITEMTEMPLATE *ibtn[MSGBOXEX_MAXBTNS]; + int bufsize, caplen, textlen, i, btnleft, btntop; + size_t ButtonLen; RECT btnrect, txtrect, rc; SIZE btnsize; + POINT iconPos; SIZE iconSize; ZeroMemory(&mbd, sizeof(mbd)); @@ -394,6 +396,8 @@ MessageBoxTimeoutIndirectW( Buttons.btnCnt++; } + ASSERT(Buttons.btnCnt <= MSGBOXEX_MAXBTNS); + mbd.pidButton = Buttons.btnIdx; mbd.ppszButtonText = ButtonText; mbd.dwButtons = Buttons.btnCnt; @@ -405,6 +409,7 @@ MessageBoxTimeoutIndirectW( // mbd.uCancelId; + /* Load the caption */ if (!lpMsgBoxParams->lpszCaption) { /* No caption, use the default one */ @@ -421,13 +426,14 @@ MessageBoxTimeoutIndirectW( { /* UNICODE string pointer */ caption = lpMsgBoxParams->lpszCaption; - caplen = strlenW(caption); + caplen = wcslen(caption); } + /* Load the text */ if (!lpMsgBoxParams->lpszText) { /* No text, use blank */ - text = L""; + text = L""; textlen = 0; } else if (IS_INTRESOURCE(lpMsgBoxParams->lpszText)) @@ -440,30 +446,31 @@ MessageBoxTimeoutIndirectW( else { /* UNICODE string pointer */ - text = lpMsgBoxParams->lpszText; - textlen = strlenW(text); + text = lpMsgBoxParams->lpszText; + textlen = wcslen(text); } + /* Load the icon */ switch (lpMsgBoxParams->dwStyle & MB_ICONMASK) { case MB_ICONEXCLAMATION: // case MB_ICONWARNING: - Icon = LoadIconW(0, IDI_EXCLAMATIONW); + hIcon = LoadIconW(NULL, IDI_EXCLAMATIONW); MessageBeep(MB_ICONEXCLAMATION); break; case MB_ICONQUESTION: - Icon = LoadIconW(0, IDI_QUESTIONW); + hIcon = LoadIconW(NULL, IDI_QUESTIONW); MessageBeep(MB_ICONQUESTION); break; case MB_ICONASTERISK: // case MB_ICONINFORMATION: - Icon = LoadIconW(0, IDI_ASTERISKW); + hIcon = LoadIconW(NULL, IDI_ASTERISKW); MessageBeep(MB_ICONASTERISK); break; case MB_ICONHAND: // case MB_ICONSTOP: case MB_ICONERROR: - Icon = LoadIconW(0, IDI_HANDW); + hIcon = LoadIconW(NULL, IDI_HANDW); MessageBeep(MB_ICONHAND); break; case MB_USERICON: - Icon = LoadIconW(lpMsgBoxParams->hInstance, lpMsgBoxParams->lpszIcon); + hIcon = LoadIconW(lpMsgBoxParams->hInstance, lpMsgBoxParams->lpszIcon); MessageBeep(MB_OK); break; default: @@ -471,13 +478,12 @@ MessageBoxTimeoutIndirectW( * By default, Windows 95/98/NT does not associate an icon * to message boxes. So ReactOS should do the same. */ - Icon = NULL; + hIcon = NULL; MessageBeep(MB_OK); break; } - /* Reuse the internal pointer! */ - ((MSGBOXPARAMSW*)lpMsgBoxParams)->lpszIcon = (LPCWSTR)Icon; + ((MSGBOXPARAMSW*)lpMsgBoxParams)->lpszIcon = (LPCWSTR)hIcon; /* Basic space */ bufsize = sizeof(DLGTEMPLATE) + @@ -485,8 +491,8 @@ MessageBoxTimeoutIndirectW( (caplen + 1) * sizeof(WCHAR) + /* title */ sizeof(WORD); /* font height */ - /* Space for icon */ - if (Icon) + /* Space for the icon */ + if (hIcon) { bufsize = ALIGN_UP(bufsize, DWORD); bufsize += sizeof(DLGITEMTEMPLATE) + @@ -494,41 +500,55 @@ MessageBoxTimeoutIndirectW( sizeof(WCHAR); } - /* Space for text */ + /* Space for the text */ bufsize = ALIGN_UP(bufsize, DWORD); bufsize += sizeof(DLGITEMTEMPLATE) + 3 * sizeof(WORD) + (textlen + 1) * sizeof(WCHAR); + /* Space for the buttons */ for (i = 0; i < mbd.dwButtons; i++) { /* Get the default text of the buttons */ if (Buttons.btnIds[i]) { - ButtonLen[i] = LoadStringW(User32Instance, - Buttons.btnIds[i], - (LPWSTR)&mbd.ppszButtonText[i], 0); + LPCWSTR pStr; + ButtonLen = LoadStringW(User32Instance, + Buttons.btnIds[i], + (LPWSTR)&pStr, 0); + mbd.ppszButtonText[i] = RtlAllocateHeap(GetProcessHeap(), 0, (ButtonLen + 1) * sizeof(WCHAR)); + if (mbd.ppszButtonText[i]) + { + memcpy((LPWSTR)mbd.ppszButtonText[i], pStr, ButtonLen * sizeof(WCHAR)); + ((LPWSTR)mbd.ppszButtonText[i])[ButtonLen] = 0; + } + else + { + mbd.ppszButtonText[i] = L""; + ButtonLen = 0; + } } else { /* No text, use blank */ mbd.ppszButtonText[i] = L""; - ButtonLen[i] = 0; + ButtonLen = 0; } - /* Space for buttons */ bufsize = ALIGN_UP(bufsize, DWORD); bufsize += sizeof(DLGITEMTEMPLATE) + 3 * sizeof(WORD) + - (ButtonLen[i] + 1) * sizeof(WCHAR); + (ButtonLen + 1) * sizeof(WCHAR); } + /* Allocate the dialog template */ buf = RtlAllocateHeap(GetProcessHeap(), 0, bufsize); if (!buf) - return 0; + goto Quit; iico = itxt = NULL; + nclm.cbSize = sizeof(nclm); SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(nclm), &nclm, 0); hFont = CreateFontIndirectW(&nclm.lfMessageFont); @@ -538,6 +558,132 @@ MessageBoxTimeoutIndirectW( goto Quit; } + hDCWnd = NULL; + hDC = GetDCEx(hDCWnd, NULL, DCX_WINDOW | DCX_CACHE); + if (!hDC) + { + /* Retry with the DC of the owner window */ + hDCWnd = lpMsgBoxParams->hwndOwner; + hDC = GetDCEx(hDCWnd, NULL, DCX_WINDOW | DCX_CACHE); + } + if (!hDC) + { + ERR("GetDCEx() failed, bail out!\n"); + goto Quit; + } + hOldFont = SelectObject(hDC, hFont); + + units.cx = GdiGetCharDimensions(hDC, NULL, &units.cy); + if (!units.cx) + { + DWORD defUnits; + ERR("GdiGetCharDimensions() failed, falling back to default values!\n"); + defUnits = GetDialogBaseUnits(); + units.cx = LOWORD(defUnits); + units.cy = HIWORD(defUnits); + } + + /* Calculate the caption rectangle */ + txtrect.right = MulDiv(GetSystemMetrics(SM_CXSCREEN), 4, 5); + if (hIcon) + txtrect.right -= GetSystemMetrics(SM_CXICON) + MSGBOXEX_SPACING; + txtrect.top = txtrect.left = txtrect.bottom = 0; + if (textlen != 0) + { + DrawTextW(hDC, text, textlen, &txtrect, + DT_LEFT | DT_NOPREFIX | DT_WORDBREAK | DT_EXPANDTABS | DT_EXTERNALLEADING | DT_EDITCONTROL | DT_CALCRECT); + } + else + { + txtrect.right = txtrect.left + 1; + txtrect.bottom = txtrect.top + 1; + } + txtrect.right++; + + /* Calculate the maximum buttons size */ + btnsize.cx = BTN_CX; + btnsize.cy = BTN_CY; + btnrect.left = btnrect.top = 0; + for (i = 0; i < mbd.dwButtons; i++) + { + // btnrect.right = btnrect.bottom = 0; // FIXME: Is it needed?? + DrawTextW(hDC, mbd.ppszButtonText[i], wcslen(mbd.ppszButtonText[i]), + &btnrect, DT_LEFT | DT_SINGLELINE | DT_CALCRECT); + btnsize.cx = max(btnsize.cx, btnrect.right); + btnsize.cy = max(btnsize.cy, btnrect.bottom); + } + + if (hOldFont) + SelectObject(hDC, hOldFont); + + ReleaseDC(hDCWnd, hDC); + + if (hFont) + DeleteObject(hFont); + + + /* Calculate position and size of controls */ + + + /* Calculate position and size of the icon */ + rc.left = rc.bottom = rc.right = 0; + btntop = 0; + if (hIcon) + { + rc.right = GetSystemMetrics(SM_CXICON); + rc.bottom = GetSystemMetrics(SM_CYICON); +#ifdef MSGBOX_ICONVCENTER + rc.top = MSGBOXEX_MARGIN + ((max(txtrect.bottom, rc.bottom) - rc.bottom) / 2); + rc.top = max(MSGBOXEX_SPACING, rc.top); +#else + rc.top = MSGBOXEX_MARGIN; +#endif + btnleft = (mbd.dwButtons * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; + if (btnleft > txtrect.right + rc.right + MSGBOXEX_SPACING) + { +#ifdef MSGBOX_TEXTHCENTER + rc.left = MSGBOXEX_MARGIN + ((btnleft - txtrect.right - rc.right - MSGBOXEX_SPACING) / 2); +#else + rc.left = MSGBOXEX_MARGIN; +#endif + btnleft = MSGBOXEX_MARGIN; + } + else + { + rc.left = MSGBOXEX_MARGIN; + btnleft = MSGBOXEX_MARGIN + ((txtrect.right + rc.right + MSGBOXEX_SPACING - btnleft) / 2); + } + + iconPos.x = RESCALE_X(rc.left, units); + iconPos.y = RESCALE_Y(rc.top, units); + iconSize.cx = RESCALE_X(rc.right, units); + iconSize.cy = RESCALE_Y(rc.bottom, units); + + btntop = rc.top + rc.bottom + MSGBOXEX_SPACING; + rc.left += rc.right + MSGBOXEX_SPACING; + } + else + { + btnleft = (mbd.dwButtons * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; + if (btnleft > txtrect.right) + { +#ifdef MSGBOX_TEXTHCENTER + rc.left = MSGBOXEX_MARGIN + ((btnleft - txtrect.right) / 2); +#else + rc.left = MSGBOXEX_MARGIN; +#endif + btnleft = MSGBOXEX_MARGIN; + } + else + { + rc.left = MSGBOXEX_MARGIN; + btnleft = MSGBOXEX_MARGIN + ((txtrect.right - btnleft) / 2); + } + } + + + + /* Initialize the dialog template */ tpl = (DLGTEMPLATE *)buf; tpl->style = WS_CAPTION | WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_SYSMENU | @@ -549,7 +695,7 @@ MessageBoxTimeoutIndirectW( tpl->dwExtendedStyle |= WS_EX_RIGHT; tpl->x = 100; tpl->y = 100; - tpl->cdit = mbd.dwButtons + (Icon ? 1 : 0) + 1; + tpl->cdit = mbd.dwButtons + (hIcon ? 1 : 0) + 1; /* Buttons, icon and text */ dest = (BYTE *)(tpl + 1); @@ -567,8 +713,8 @@ MessageBoxTimeoutIndirectW( *(WORD*)dest = 0x7FFF; dest += sizeof(WORD); - /* Create icon */ - if (Icon) + /* Create the icon */ + if (hIcon) { dest = ALIGN_UP_POINTER(dest, DWORD); iico = (DLGITEMTEMPLATE *)dest; @@ -576,6 +722,11 @@ MessageBoxTimeoutIndirectW( iico->dwExtendedStyle = 0; iico->id = MSGBOX_IDICON; + iico->x = iconPos.x; + iico->y = iconPos.y; + iico->cx = iconSize.cx; + iico->cy = iconSize.cy; + dest += sizeof(DLGITEMTEMPLATE); *(WORD*)dest = 0xFFFF; dest += sizeof(WORD); @@ -611,176 +762,64 @@ MessageBoxTimeoutIndirectW( *(WORD*)dest = 0; dest += sizeof(WORD); - hDCWnd = NULL; - hDC = GetDCEx(hDCWnd, NULL, DCX_WINDOW | DCX_CACHE); - if (!hDC) - { - /* Retry with the DC of the owner window */ - hDCWnd = lpMsgBoxParams->hwndOwner; - hDC = GetDCEx(hDCWnd, NULL, DCX_WINDOW | DCX_CACHE); - } - if (!hDC) - { - ERR("GetDCEx() failed, bail out!\n"); - goto Quit; - } - hOldFont = SelectObject(hDC, hFont); - units.cx = GdiGetCharDimensions(hDC, NULL, &units.cy); - if (!units.cx) - { - DWORD defUnits; - ERR("GdiGetCharDimensions() failed, falling back to default values!\n"); - defUnits = GetDialogBaseUnits(); - units.cx = LOWORD(defUnits); - units.cy = HIWORD(defUnits); - } + /* Calculate position of the text */ + rc.top = MSGBOXEX_MARGIN + ((rc.bottom - txtrect.bottom) / 2); + rc.top = max(rc.top, MSGBOXEX_MARGIN); - /* Create buttons */ - btnsize.cx = BTN_CX; - btnsize.cy = BTN_CY; - btnrect.left = btnrect.top = 0; /* Make the first button the default button if none other is */ if (mbd.uDefButton >= mbd.dwButtons) mbd.uDefButton = 0; + /* Create and calculate the position of the buttons */ + btntop = max(rc.top + txtrect.bottom + MSGBOXEX_SPACING, btntop); for (i = 0; i < mbd.dwButtons; i++) { + ButtonLen = wcslen(mbd.ppszButtonText[i]); + dest = ALIGN_UP_POINTER(dest, DWORD); - ibtn[i] = (DLGITEMTEMPLATE *)dest; + ibtn = (DLGITEMTEMPLATE *)dest; - ibtn[i]->style = WS_CHILD | WS_VISIBLE | WS_TABSTOP; + ibtn->style = WS_CHILD | WS_VISIBLE | WS_TABSTOP; if (i == mbd.uDefButton) - ibtn[i]->style |= BS_DEFPUSHBUTTON; + ibtn->style |= BS_DEFPUSHBUTTON; else - ibtn[i]->style |= BS_PUSHBUTTON; + ibtn->style |= BS_PUSHBUTTON; - ibtn[i]->dwExtendedStyle = 0; - ibtn[i]->id = mbd.pidButton[i]; + ibtn->dwExtendedStyle = 0; + ibtn->id = mbd.pidButton[i]; dest += sizeof(DLGITEMTEMPLATE); *(WORD*)dest = 0xFFFF; dest += sizeof(WORD); *(WORD*)dest = 0x0080; /* button control */ dest += sizeof(WORD); - memcpy(dest, mbd.ppszButtonText[i], ButtonLen[i] * sizeof(WCHAR)); - dest += ButtonLen[i] * sizeof(WCHAR); + memcpy(dest, mbd.ppszButtonText[i], ButtonLen * sizeof(WCHAR)); + dest += ButtonLen * sizeof(WCHAR); *(WORD*)dest = 0; dest += sizeof(WORD); *(WORD*)dest = 0; dest += sizeof(WORD); - // btnrect.right = btnrect.bottom = 0; // FIXME: Is it needed?? - DrawTextW(hDC, mbd.ppszButtonText[i], ButtonLen[i], &btnrect, - DT_LEFT | DT_SINGLELINE | DT_CALCRECT); - btnsize.cx = max(btnsize.cx, btnrect.right); - btnsize.cy = max(btnsize.cy, btnrect.bottom); - } - - /* calculate position and size of controls */ - txtrect.right = GetSystemMetrics(SM_CXSCREEN) / 5 * 4; - if (Icon) - txtrect.right -= GetSystemMetrics(SM_CXICON) + MSGBOXEX_SPACING; - txtrect.top = txtrect.left = txtrect.bottom = 0; - if (textlen != 0) - { - DrawTextW(hDC, text, textlen, &txtrect, - DT_LEFT | DT_NOPREFIX | DT_WORDBREAK | DT_EXPANDTABS | DT_EXTERNALLEADING | DT_EDITCONTROL | DT_CALCRECT); - } - else - { - txtrect.right = txtrect.left + 1; - txtrect.bottom = txtrect.top + 1; - } - txtrect.right++; - - if (hOldFont) - SelectObject(hDC, hOldFont); - - ReleaseDC(hDCWnd, hDC); - - if (hFont) - DeleteObject(hFont); - - /* calculate position and size of the icon */ - rc.left = rc.bottom = rc.right = 0; - btntop = 0; - - if (iico) - { - rc.right = GetSystemMetrics(SM_CXICON); - rc.bottom = GetSystemMetrics(SM_CYICON); -#ifdef MSGBOX_ICONVCENTER - rc.top = MSGBOXEX_MARGIN + (max(txtrect.bottom, rc.bottom) / 2) - (GetSystemMetrics(SM_CYICON) / 2); - rc.top = max(MSGBOXEX_SPACING, rc.top); -#else - rc.top = MSGBOXEX_MARGIN; -#endif - btnleft = (mbd.dwButtons * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; - if (btnleft > txtrect.right + rc.right + MSGBOXEX_SPACING) - { -#ifdef MSGBOX_TEXTHCENTER - lmargin = MSGBOXEX_MARGIN + ((btnleft - txtrect.right - rc.right - MSGBOXEX_SPACING) / 2); -#else - lmargin = MSGBOXEX_MARGIN; -#endif - btnleft = MSGBOXEX_MARGIN; - } - else - { - lmargin = MSGBOXEX_MARGIN; - btnleft = MSGBOXEX_MARGIN + ((txtrect.right + rc.right + MSGBOXEX_SPACING) / 2) - (btnleft / 2); - } - rc.left = lmargin; - iico->x = RESCALE_X(rc.left, units); - iico->y = RESCALE_Y(rc.top, units); - iico->cx = RESCALE_X(rc.right, units); - iico->cy = RESCALE_Y(rc.bottom, units); - btntop = rc.top + rc.bottom + MSGBOXEX_SPACING; - rc.left += rc.right + MSGBOXEX_SPACING; - } - else - { - btnleft = (mbd.dwButtons * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; - if (btnleft > txtrect.right) - { -#ifdef MSGBOX_TEXTHCENTER - lmargin = MSGBOXEX_MARGIN + ((btnleft - txtrect.right) / 2); -#else - lmargin = MSGBOXEX_MARGIN; -#endif - btnleft = MSGBOXEX_MARGIN; - } - else - { - lmargin = MSGBOXEX_MARGIN; - btnleft = MSGBOXEX_MARGIN + (txtrect.right / 2) - (btnleft / 2); - } - rc.left = lmargin; - } - /* calculate position of the text */ - rc.top = MSGBOXEX_MARGIN + (rc.bottom / 2) - (txtrect.bottom / 2); - rc.top = max(rc.top, MSGBOXEX_MARGIN); - /* calculate position of the buttons */ - btntop = max(rc.top + txtrect.bottom + MSGBOXEX_SPACING, btntop); - for (i = 0; i < mbd.dwButtons; i++) - { - ibtn[i]->x = RESCALE_X(btnleft, units); - ibtn[i]->y = RESCALE_Y(btntop, units); - ibtn[i]->cx = RESCALE_X(btnsize.cx, units); - ibtn[i]->cy = RESCALE_Y(btnsize.cy, units); + ibtn->x = RESCALE_X(btnleft, units); + ibtn->y = RESCALE_Y(btntop, units); + ibtn->cx = RESCALE_X(btnsize.cx, units); + ibtn->cy = RESCALE_Y(btnsize.cy, units); btnleft += btnsize.cx + MSGBOXEX_BUTTONSPACING; } - /* calculate size and position of the messagebox window */ + + /* Calculate the size and position of the messagebox window */ btnleft = max(btnleft - MSGBOXEX_BUTTONSPACING, rc.left + txtrect.right); btnleft += MSGBOXEX_MARGIN; btntop += btnsize.cy + MSGBOXEX_MARGIN; - /* set size and position of the message static */ + + /* Set the size and position of the static message */ itxt->x = RESCALE_X(rc.left, units); itxt->y = RESCALE_Y(rc.top, units); itxt->cx = RESCALE_X(btnleft - rc.left - MSGBOXEX_MARGIN, units); itxt->cy = RESCALE_Y(txtrect.bottom, units); - /* set size of the window */ + + /* Set the size of the window */ tpl->cx = RESCALE_X(btnleft, units); tpl->cy = RESCALE_Y(btntop, units); @@ -791,6 +830,13 @@ MessageBoxTimeoutIndirectW( Quit: RtlFreeHeap(GetProcessHeap(), 0, buf); + + for (i = 0; i < mbd.dwButtons; i++) + { + if (mbd.ppszButtonText[i] && *(mbd.ppszButtonText[i])) + RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR)mbd.ppszButtonText[i]); + } + return ret; }

1 0

07/11: [USER32] Get rid of the old MSGBOXINFO structure and use the new internal MSGBOXDATA structure instead.
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3fee2db82c404f536b76… commit e3fee2db82c404f536b769d5e756c821858f8dde Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 10 21:38:09 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 17:12:21 2018 +0200 [USER32] Get rid of the old MSGBOXINFO structure and use the new internal MSGBOXDATA structure instead. --- win32ss/user/user32/windows/messagebox.c | 191 ++++++++++++++----------------- 1 file changed, 87 insertions(+), 104 deletions(-) diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c index 72a443d25f..6fb379869e 100644 --- a/win32ss/user/user32/windows/messagebox.c +++ b/win32ss/user/user32/windows/messagebox.c @@ -73,9 +73,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); typedef struct _MSGBTNINFO { - LONG btnCnt; - LONG btnIdx[MSGBOXEX_MAXBTNS]; - UINT btnIds[MSGBOXEX_MAXBTNS]; + DWORD btnCnt; + INT btnIdx[MSGBOXEX_MAXBTNS]; + UINT btnIds[MSGBOXEX_MAXBTNS]; } MSGBTNINFO, *PMSGBTNINFO; /* Default MessageBox buttons */ @@ -97,24 +97,12 @@ static const MSGBTNINFO MsgBtnInfo[] = DECLARE_MB_3(CANCEL, TRYAGAIN, CONTINUE) }; -typedef struct _MSGBOXINFO -{ - MSGBOXPARAMSW; // Wine passes this too. - // ReactOS - HICON Icon; - int DefBtn; - int nButtons; - LONG *Btns; - UINT Timeout; -} MSGBOXINFO, *PMSGBOXINFO; - - /* INTERNAL FUNCTIONS ********************************************************/ static VOID MessageBoxTextToClipboard(HWND DialogWindow) { HWND hwndText; - PMSGBOXINFO mbi; + PMSGBOXDATA mbd; int cchTotal, cchTitle, cchText, cchButton, i, n, cchBuffer; LPWSTR pszBuffer, pszBufferPos, pMessageBoxText, pszTitle, pszText, pszButton; WCHAR szButton[MSGBOXEX_MAXBTNSTR]; @@ -122,12 +110,12 @@ static VOID MessageBoxTextToClipboard(HWND DialogWindow) static const WCHAR szLine[] = L"---------------------------\r\n"; - mbi = (PMSGBOXINFO)GetPropW(DialogWindow, L"ROS_MSGBOX"); + mbd = (PMSGBOXDATA)GetPropW(DialogWindow, L"ROS_MSGBOX"); hwndText = GetDlgItem(DialogWindow, MSGBOX_IDTEXT); cchTitle = GetWindowTextLengthW(DialogWindow) + 1; cchText = GetWindowTextLengthW(hwndText) + 1; - if (!mbi) + if (!mbd) return; pMessageBoxText = (LPWSTR)RtlAllocateHeap(GetProcessHeap(), 0, (cchTitle + cchText) * sizeof(WCHAR)); @@ -151,7 +139,7 @@ static VOID MessageBoxTextToClipboard(HWND DialogWindow) /* * Calculate the total buffer size. */ - cchTotal = 6 + cchTitle + cchText + (lstrlenW(szLine) * 4) + (mbi->nButtons * MSGBOXEX_MAXBTNSTR + 3); + cchTotal = 6 + cchTitle + cchText + (lstrlenW(szLine) * 4) + (mbd->dwButtons * MSGBOXEX_MAXBTNSTR + 3); hGlobal = GlobalAlloc(GHND, cchTotal * sizeof(WCHAR)); @@ -175,9 +163,9 @@ static VOID MessageBoxTextToClipboard(HWND DialogWindow) cchBuffer = wsprintfW(pszBuffer, L"%s%s\r\n%s%s\r\n%s", szLine, pszTitle, szLine, pszText, szLine); pszBufferPos = pszBuffer + cchBuffer; - for (i = 0; i < mbi->nButtons; i++) + for (i = 0; i < mbd->dwButtons; i++) { - GetDlgItemTextW(DialogWindow, mbi->Btns[i], szButton, MSGBOXEX_MAXBTNSTR); + GetDlgItemTextW(DialogWindow, mbd->pidButton[i], szButton, MSGBOXEX_MAXBTNSTR); cchButton = strlenW(szButton); pszButton = szButton; @@ -220,7 +208,7 @@ static INT_PTR CALLBACK MessageBoxProc( WPARAM wParam, LPARAM lParam) { int Alert; - PMSGBOXINFO mbi; + PMSGBOXDATA mbd; HELPINFO hi; HWND hwndOwner; @@ -228,26 +216,26 @@ static INT_PTR CALLBACK MessageBoxProc( { case WM_INITDIALOG: { - mbi = (PMSGBOXINFO)lParam; + mbd = (PMSGBOXDATA)lParam; - SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)mbi); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)mbd); NtUserxSetMessageBox(hwnd); if (!GetPropW(hwnd, L"ROS_MSGBOX")) { SetPropW(hwnd, L"ROS_MSGBOX", (HANDLE)lParam); - if (mbi->dwContextHelpId) - SetWindowContextHelpId(hwnd, mbi->dwContextHelpId); + if (mbd->mbp.dwContextHelpId) + SetWindowContextHelpId(hwnd, mbd->mbp.dwContextHelpId); - if (mbi->Icon) + if (mbd->mbp.lpszIcon) { - SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)mbi->Icon, 0); + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)(HICON)mbd->mbp.lpszIcon, 0); Alert = ALERT_SYSTEM_WARNING; } else // Setup the rest of the alerts. { - switch (mbi->dwStyle & MB_ICONMASK) + switch (mbd->mbp.dwStyle & MB_ICONMASK) { case MB_ICONWARNING: Alert = ALERT_SYSTEM_WARNING; @@ -266,16 +254,17 @@ static INT_PTR CALLBACK MessageBoxProc( /* Send out the alert notifications. */ NotifyWinEvent(EVENT_SYSTEM_ALERT, hwnd, OBJID_ALERT, Alert); - switch (mbi->dwStyle & MB_TYPEMASK) + switch (mbd->mbp.dwStyle & MB_TYPEMASK) { case MB_ABORTRETRYIGNORE: case MB_YESNO: RemoveMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND); break; } - SetFocus(GetDlgItem(hwnd, mbi->DefBtn)); - if (mbi->Timeout && (mbi->Timeout != (UINT)-1)) - SetTimer(hwnd, 0, mbi->Timeout, NULL); + ASSERT(mbd->uDefButton < mbd->dwButtons); + SetFocus(GetDlgItem(hwnd, mbd->pidButton[mbd->uDefButton])); + if (mbd->dwTimeout && (mbd->dwTimeout != (UINT)-1)) + SetTimer(hwnd, 0, mbd->dwTimeout, NULL); } return 0; } @@ -313,15 +302,15 @@ static INT_PTR CALLBACK MessageBoxProc( case WM_HELP: { - mbi = (PMSGBOXINFO)GetPropW(hwnd, L"ROS_MSGBOX"); - if (!mbi) + mbd = (PMSGBOXDATA)GetPropW(hwnd, L"ROS_MSGBOX"); + if (!mbd) return 0; memcpy(&hi, (void *)lParam, sizeof(hi)); hi.dwContextId = GetWindowContextHelpId(hwnd); - if (mbi->lpfnMsgBoxCallback) + if (mbd->mbp.lpfnMsgBoxCallback) { - mbi->lpfnMsgBoxCallback(&hi); + mbd->mbp.lpfnMsgBoxCallback(&hi); } else { @@ -334,10 +323,10 @@ static INT_PTR CALLBACK MessageBoxProc( case WM_CLOSE: { - mbi = (PMSGBOXINFO)GetPropW(hwnd, L"ROS_MSGBOX"); - if (!mbi) + mbd = (PMSGBOXDATA)GetPropW(hwnd, L"ROS_MSGBOX"); + if (!mbd) return 0; - switch (mbi->dwStyle & MB_TYPEMASK) + switch (mbd->mbp.dwStyle & MB_TYPEMASK) { case MB_ABORTRETRYIGNORE: case MB_YESNO: @@ -361,6 +350,7 @@ static int MessageBoxTimeoutIndirectW( CONST MSGBOXPARAMSW *lpMsgBoxParams, UINT dwTimeout) { + MSGBOXDATA mbd; DLGTEMPLATE *tpl; DLGITEMTEMPLATE *iico, *itxt; NONCLIENTMETRICSW nclm; @@ -379,8 +369,41 @@ MessageBoxTimeoutIndirectW( DLGITEMTEMPLATE *ibtn[MSGBOXEX_MAXBTNS]; RECT btnrect, txtrect, rc; SIZE btnsize; - MSGBOXINFO mbi; - BOOL defbtn = FALSE; + + + ZeroMemory(&mbd, sizeof(mbd)); + memcpy(&mbd.mbp, lpMsgBoxParams, sizeof(mbd.mbp)); + lpMsgBoxParams = &mbd.mbp; + + mbd.wLanguageId = (WORD)lpMsgBoxParams->dwLanguageId; // FIXME! + mbd.dwTimeout = dwTimeout; + + /* Create the selected buttons; unknown types will fall back to MB_OK */ + i = (lpMsgBoxParams->dwStyle & MB_TYPEMASK); + if (i >= ARRAYSIZE(MsgBtnInfo)) + i = MB_OK; + + /* Get buttons IDs */ + Buttons = MsgBtnInfo[i]; + + /* Add the Help button */ + if (lpMsgBoxParams->dwStyle & MB_HELP) + { + Buttons.btnIdx[Buttons.btnCnt] = IDHELP; + Buttons.btnIds[Buttons.btnCnt] = IDS_HELP; + Buttons.btnCnt++; + } + + mbd.pidButton = Buttons.btnIdx; + mbd.ppszButtonText = ButtonText; + mbd.dwButtons = Buttons.btnCnt; + + mbd.uDefButton = ((lpMsgBoxParams->dwStyle & MB_DEFMASK) >> 8); + /* Make the first button the default button if none other is */ + if (mbd.uDefButton >= mbd.dwButtons) + mbd.uDefButton = 0; + // mbd.uCancelId; + if (!lpMsgBoxParams->lpszCaption) { @@ -421,22 +444,6 @@ MessageBoxTimeoutIndirectW( textlen = strlenW(text); } - /* Create the selected buttons; unknown types will fall back to MB_OK */ - i = (lpMsgBoxParams->dwStyle & MB_TYPEMASK); - if (i >= ARRAYSIZE(MsgBtnInfo)) - i = MB_OK; - - /* Get buttons IDs */ - Buttons = MsgBtnInfo[i]; - - /* Add the Help button */ - if (lpMsgBoxParams->dwStyle & MB_HELP) - { - Buttons.btnIdx[Buttons.btnCnt] = IDHELP; - Buttons.btnIds[Buttons.btnCnt] = IDS_HELP; - Buttons.btnCnt++; - } - switch (lpMsgBoxParams->dwStyle & MB_ICONMASK) { case MB_ICONEXCLAMATION: // case MB_ICONWARNING: @@ -469,6 +476,9 @@ MessageBoxTimeoutIndirectW( break; } + /* Reuse the internal pointer! */ + ((MSGBOXPARAMSW*)lpMsgBoxParams)->lpszIcon = (LPCWSTR)Icon; + /* Basic space */ bufsize = sizeof(DLGTEMPLATE) + 2 * sizeof(WORD) + /* menu and class */ @@ -490,19 +500,19 @@ MessageBoxTimeoutIndirectW( 3 * sizeof(WORD) + (textlen + 1) * sizeof(WCHAR); - for (i = 0; i < Buttons.btnCnt; i++) + for (i = 0; i < mbd.dwButtons; i++) { /* Get the default text of the buttons */ if (Buttons.btnIds[i]) { ButtonLen[i] = LoadStringW(User32Instance, Buttons.btnIds[i], - (LPWSTR)&ButtonText[i], 0); + (LPWSTR)&mbd.ppszButtonText[i], 0); } else { /* No text, use blank */ - ButtonText[i] = L""; + mbd.ppszButtonText[i] = L""; ButtonLen[i] = 0; } @@ -539,12 +549,11 @@ MessageBoxTimeoutIndirectW( tpl->dwExtendedStyle |= WS_EX_RIGHT; tpl->x = 100; tpl->y = 100; - tpl->cdit = Buttons.btnCnt + (Icon ? 1 : 0) + 1; + tpl->cdit = mbd.dwButtons + (Icon ? 1 : 0) + 1; dest = (BYTE *)(tpl + 1); - *(WORD*)dest = 0; /* no menu */ - *(((WORD*)dest) + 1) = 0; /* use default window class */ + *(DWORD*)dest = 0; /* no menu and use default window class */ dest += 2 * sizeof(WORD); memcpy(dest, caption, caplen * sizeof(WCHAR)); dest += caplen * sizeof(WCHAR); @@ -632,30 +641,29 @@ MessageBoxTimeoutIndirectW( btnsize.cy = BTN_CY; btnrect.left = btnrect.top = 0; - for (i = 0; i < Buttons.btnCnt; i++) + /* Make the first button the default button if none other is */ + if (mbd.uDefButton >= mbd.dwButtons) + mbd.uDefButton = 0; + + for (i = 0; i < mbd.dwButtons; i++) { dest = ALIGN_UP_POINTER(dest, DWORD); ibtn[i] = (DLGITEMTEMPLATE *)dest; ibtn[i]->style = WS_CHILD | WS_VISIBLE | WS_TABSTOP; - if (!defbtn && (i == ((lpMsgBoxParams->dwStyle & MB_DEFMASK) >> 8))) - { + if (i == mbd.uDefButton) ibtn[i]->style |= BS_DEFPUSHBUTTON; - mbi.DefBtn = Buttons.btnIdx[i]; - defbtn = TRUE; - } else - { ibtn[i]->style |= BS_PUSHBUTTON; - } + ibtn[i]->dwExtendedStyle = 0; - ibtn[i]->id = Buttons.btnIdx[i]; + ibtn[i]->id = mbd.pidButton[i]; dest += sizeof(DLGITEMTEMPLATE); *(WORD*)dest = 0xFFFF; dest += sizeof(WORD); *(WORD*)dest = 0x0080; /* button control */ dest += sizeof(WORD); - memcpy(dest, ButtonText[i], ButtonLen[i] * sizeof(WCHAR)); + memcpy(dest, mbd.ppszButtonText[i], ButtonLen[i] * sizeof(WCHAR)); dest += ButtonLen[i] * sizeof(WCHAR); *(WORD*)dest = 0; dest += sizeof(WORD); @@ -663,20 +671,12 @@ MessageBoxTimeoutIndirectW( dest += sizeof(WORD); // btnrect.right = btnrect.bottom = 0; // FIXME: Is it needed?? - DrawTextW(hDC, ButtonText[i], ButtonLen[i], &btnrect, + DrawTextW(hDC, mbd.ppszButtonText[i], ButtonLen[i], &btnrect, DT_LEFT | DT_SINGLELINE | DT_CALCRECT); btnsize.cx = max(btnsize.cx, btnrect.right); btnsize.cy = max(btnsize.cy, btnrect.bottom); } - /* make first button the default button if no other is */ - if (!defbtn) - { - ibtn[0]->style &= ~BS_PUSHBUTTON; - ibtn[0]->style |= BS_DEFPUSHBUTTON; - mbi.DefBtn = Buttons.btnIdx[0]; - } - /* calculate position and size of controls */ txtrect.right = GetSystemMetrics(SM_CXSCREEN) / 5 * 4; if (Icon) @@ -716,7 +716,7 @@ MessageBoxTimeoutIndirectW( #else rc.top = MSGBOXEX_MARGIN; #endif - btnleft = (Buttons.btnCnt * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; + btnleft = (mbd.dwButtons * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; if (btnleft > txtrect.right + rc.right + MSGBOXEX_SPACING) { #ifdef MSGBOX_TEXTHCENTER @@ -741,7 +741,7 @@ MessageBoxTimeoutIndirectW( } else { - btnleft = (Buttons.btnCnt * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; + btnleft = (mbd.dwButtons * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; if (btnleft > txtrect.right) { #ifdef MSGBOX_TEXTHCENTER @@ -763,7 +763,7 @@ MessageBoxTimeoutIndirectW( rc.top = max(rc.top, MSGBOXEX_MARGIN); /* calculate position of the buttons */ btntop = max(rc.top + txtrect.bottom + MSGBOXEX_SPACING, btntop); - for (i = 0; i < Buttons.btnCnt; i++) + for (i = 0; i < mbd.dwButtons; i++) { ibtn[i]->x = RESCALE_X(btnleft, units); ibtn[i]->y = RESCALE_Y(btntop, units); @@ -785,26 +785,9 @@ MessageBoxTimeoutIndirectW( tpl->cy = RESCALE_Y(btntop, units); /* Finally show the messagebox */ - mbi.Icon = Icon; - mbi.dwContextHelpId = lpMsgBoxParams->dwContextHelpId; - mbi.lpfnMsgBoxCallback = lpMsgBoxParams->lpfnMsgBoxCallback; - mbi.dwStyle = lpMsgBoxParams->dwStyle; - mbi.nButtons = Buttons.btnCnt; - mbi.Btns = Buttons.btnIdx; - mbi.Timeout = dwTimeout; - - /* Pass on to Justin Case so he can peek the message? */ - mbi.cbSize = lpMsgBoxParams->cbSize; - mbi.hwndOwner = lpMsgBoxParams->hwndOwner; - mbi.hInstance = lpMsgBoxParams->hInstance; - mbi.lpszText = lpMsgBoxParams->lpszText; - mbi.lpszCaption = lpMsgBoxParams->lpszCaption; - mbi.lpszIcon = lpMsgBoxParams->lpszIcon; - mbi.dwLanguageId = lpMsgBoxParams->dwLanguageId; - ret = DialogBoxIndirectParamW(lpMsgBoxParams->hInstance, tpl, lpMsgBoxParams->hwndOwner, - MessageBoxProc, (LPARAM)&mbi); + MessageBoxProc, (LPARAM)&mbd); Quit: RtlFreeHeap(GetProcessHeap(), 0, buf);

1 0

06/11: [USER32] Code formatting only.
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b55cf703407b45ac2523a… commit b55cf703407b45ac2523a092ee69c489444290c5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 10 21:29:45 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 17:12:21 2018 +0200 [USER32] Code formatting only. --- win32ss/user/user32/windows/messagebox.c | 143 +++++++++++++++++-------------- 1 file changed, 79 insertions(+), 64 deletions(-) diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c index db812b1134..72a443d25f 100644 --- a/win32ss/user/user32/windows/messagebox.c +++ b/win32ss/user/user32/windows/messagebox.c @@ -17,10 +17,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * * PROJECT: ReactOS user32.dll * FILE: win32ss/user/user32/windows/messagebox.c - * PURPOSE: Input + * PURPOSE: Message Boxes * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Thomas Weidenmueller (w3seek(a)users.sourceforge.net) * UPDATE HISTORY: @@ -109,6 +108,7 @@ typedef struct _MSGBOXINFO UINT Timeout; } MSGBOXINFO, *PMSGBOXINFO; + /* INTERNAL FUNCTIONS ********************************************************/ static VOID MessageBoxTextToClipboard(HWND DialogWindow) @@ -222,7 +222,7 @@ static INT_PTR CALLBACK MessageBoxProc( int Alert; PMSGBOXINFO mbi; HELPINFO hi; - HWND owner; + HWND hwndOwner; switch (message) { @@ -296,7 +296,7 @@ static INT_PTR CALLBACK MessageBoxProc( return 0; case IDHELP: /* send WM_HELP message to messagebox window */ - hi.cbSize = sizeof(HELPINFO); + hi.cbSize = sizeof(hi); hi.iContextType = HELPINFO_WINDOW; hi.iCtrlId = LOWORD(wParam); hi.hItemHandle = (HANDLE)lParam; @@ -320,12 +320,14 @@ static INT_PTR CALLBACK MessageBoxProc( hi.dwContextId = GetWindowContextHelpId(hwnd); if (mbi->lpfnMsgBoxCallback) + { mbi->lpfnMsgBoxCallback(&hi); + } else { - owner = GetWindow(hwnd, GW_OWNER); - if (owner) - SendMessageW(GetWindow(hwnd, GW_OWNER), WM_HELP, 0, (LPARAM)&hi); + hwndOwner = GetWindow(hwnd, GW_OWNER); + if (hwndOwner) + SendMessageW(hwndOwner, WM_HELP, 0, (LPARAM)&hi); } return 0; } @@ -348,7 +350,7 @@ static INT_PTR CALLBACK MessageBoxProc( case WM_TIMER: if (wParam == 0) { - EndDialog(hwnd, 32000); + EndDialog(hwnd, IDTIMEOUT); } return 0; } @@ -357,7 +359,7 @@ static INT_PTR CALLBACK MessageBoxProc( static int MessageBoxTimeoutIndirectW( - CONST MSGBOXPARAMSW *lpMsgBoxParams, UINT Timeout) + CONST MSGBOXPARAMSW *lpMsgBoxParams, UINT dwTimeout) { DLGTEMPLATE *tpl; DLGITEMTEMPLATE *iico, *itxt; @@ -388,7 +390,9 @@ MessageBoxTimeoutIndirectW( else if (IS_INTRESOURCE(lpMsgBoxParams->lpszCaption)) { /* User-defined resource string */ - caplen = LoadStringW(lpMsgBoxParams->hInstance, PtrToUlong(lpMsgBoxParams->lpszCaption), (LPWSTR)&caption, 0); + caplen = LoadStringW(lpMsgBoxParams->hInstance, + PtrToUlong(lpMsgBoxParams->lpszCaption), + (LPWSTR)&caption, 0); } else { @@ -406,7 +410,9 @@ MessageBoxTimeoutIndirectW( else if (IS_INTRESOURCE(lpMsgBoxParams->lpszText)) { /* User-defined resource string */ - textlen = LoadStringW(lpMsgBoxParams->hInstance, PtrToUlong(lpMsgBoxParams->lpszText), (LPWSTR)&text, 0); + textlen = LoadStringW(lpMsgBoxParams->hInstance, + PtrToUlong(lpMsgBoxParams->lpszText), + (LPWSTR)&text, 0); } else { @@ -433,33 +439,34 @@ MessageBoxTimeoutIndirectW( switch (lpMsgBoxParams->dwStyle & MB_ICONMASK) { - case MB_ICONEXCLAMATION: - Icon = LoadIconW(0, IDI_EXCLAMATIONW); - MessageBeep(MB_ICONEXCLAMATION); - break; - case MB_ICONQUESTION: - Icon = LoadIconW(0, IDI_QUESTIONW); - MessageBeep(MB_ICONQUESTION); - break; - case MB_ICONASTERISK: - Icon = LoadIconW(0, IDI_ASTERISKW); - MessageBeep(MB_ICONASTERISK); - break; - case MB_ICONHAND: - Icon = LoadIconW(0, IDI_HANDW); - MessageBeep(MB_ICONHAND); - break; - case MB_USERICON: - Icon = LoadIconW(lpMsgBoxParams->hInstance, lpMsgBoxParams->lpszIcon); - MessageBeep(MB_OK); - break; - default: - /* By default, Windows 95/98/NT does not associate an icon to message boxes. - * So ReactOS should do the same. - */ - Icon = (HICON)0; - MessageBeep(MB_OK); - break; + case MB_ICONEXCLAMATION: // case MB_ICONWARNING: + Icon = LoadIconW(0, IDI_EXCLAMATIONW); + MessageBeep(MB_ICONEXCLAMATION); + break; + case MB_ICONQUESTION: + Icon = LoadIconW(0, IDI_QUESTIONW); + MessageBeep(MB_ICONQUESTION); + break; + case MB_ICONASTERISK: // case MB_ICONINFORMATION: + Icon = LoadIconW(0, IDI_ASTERISKW); + MessageBeep(MB_ICONASTERISK); + break; + case MB_ICONHAND: // case MB_ICONSTOP: case MB_ICONERROR: + Icon = LoadIconW(0, IDI_HANDW); + MessageBeep(MB_ICONHAND); + break; + case MB_USERICON: + Icon = LoadIconW(lpMsgBoxParams->hInstance, lpMsgBoxParams->lpszIcon); + MessageBeep(MB_OK); + break; + default: + /* + * By default, Windows 95/98/NT does not associate an icon + * to message boxes. So ReactOS should do the same. + */ + Icon = NULL; + MessageBeep(MB_OK); + break; } /* Basic space */ @@ -469,16 +476,16 @@ MessageBoxTimeoutIndirectW( sizeof(WORD); /* font height */ /* Space for icon */ - if (NULL != Icon) + if (Icon) { - bufsize = (bufsize + 3) & ~3; - bufsize += sizeof(DLGITEMTEMPLATE) + - 4 * sizeof(WORD) + - sizeof(WCHAR); + bufsize = ALIGN_UP(bufsize, DWORD); + bufsize += sizeof(DLGITEMTEMPLATE) + + 4 * sizeof(WORD) + + sizeof(WCHAR); } /* Space for text */ - bufsize = (bufsize + 3) & ~3; + bufsize = ALIGN_UP(bufsize, DWORD); bufsize += sizeof(DLGITEMTEMPLATE) + 3 * sizeof(WORD) + (textlen + 1) * sizeof(WCHAR); @@ -488,19 +495,22 @@ MessageBoxTimeoutIndirectW( /* Get the default text of the buttons */ if (Buttons.btnIds[i]) { - ButtonLen[i] = LoadStringW(User32Instance, Buttons.btnIds[i], (LPWSTR)&ButtonText[i], 0); + ButtonLen[i] = LoadStringW(User32Instance, + Buttons.btnIds[i], + (LPWSTR)&ButtonText[i], 0); } else { + /* No text, use blank */ ButtonText[i] = L""; - ButtonLen[i] = 0; + ButtonLen[i] = 0; } - /* Space for buttons */ - bufsize = (bufsize + 3) & ~3; - bufsize += sizeof(DLGITEMTEMPLATE) + - 3 * sizeof(WORD) + - (ButtonLen[i] + 1) * sizeof(WCHAR); + /* Space for buttons */ + bufsize = ALIGN_UP(bufsize, DWORD); + bufsize += sizeof(DLGITEMTEMPLATE) + + 3 * sizeof(WORD) + + (ButtonLen[i] + 1) * sizeof(WCHAR); } buf = RtlAllocateHeap(GetProcessHeap(), 0, bufsize); @@ -520,7 +530,8 @@ MessageBoxTimeoutIndirectW( tpl = (DLGTEMPLATE *)buf; - tpl->style = WS_CAPTION | WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_SYSMENU | DS_CENTER | DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG; + tpl->style = WS_CAPTION | WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_SYSMENU | + DS_CENTER | DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG; tpl->dwExtendedStyle = WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT; if (lpMsgBoxParams->dwStyle & MB_TOPMOST) tpl->dwExtendedStyle |= WS_EX_TOPMOST; @@ -528,7 +539,7 @@ MessageBoxTimeoutIndirectW( tpl->dwExtendedStyle |= WS_EX_RIGHT; tpl->x = 100; tpl->y = 100; - tpl->cdit = Buttons.btnCnt + ((Icon != (HICON)0) ? 1 : 0) + 1; + tpl->cdit = Buttons.btnCnt + (Icon ? 1 : 0) + 1; dest = (BYTE *)(tpl + 1); @@ -550,7 +561,7 @@ MessageBoxTimeoutIndirectW( /* Create icon */ if (Icon) { - dest = (BYTE*)(((ULONG_PTR)dest + 3) & ~3); + dest = ALIGN_UP_POINTER(dest, DWORD); iico = (DLGITEMTEMPLATE *)dest; iico->style = WS_CHILD | WS_VISIBLE | SS_ICON; iico->dwExtendedStyle = 0; @@ -569,8 +580,8 @@ MessageBoxTimeoutIndirectW( dest += sizeof(WORD); } - /* create static for text */ - dest = (BYTE*)(((UINT_PTR)dest + 3) & ~3); + /* Create static for text */ + dest = ALIGN_UP_POINTER(dest, DWORD); itxt = (DLGITEMTEMPLATE *)dest; itxt->style = WS_CHILD | WS_VISIBLE | SS_NOPREFIX; if (lpMsgBoxParams->dwStyle & MB_RIGHT) @@ -616,15 +627,16 @@ MessageBoxTimeoutIndirectW( units.cy = HIWORD(defUnits); } - /* create buttons */ + /* Create buttons */ btnsize.cx = BTN_CX; btnsize.cy = BTN_CY; btnrect.left = btnrect.top = 0; for (i = 0; i < Buttons.btnCnt; i++) { - dest = (BYTE*)(((UINT_PTR)dest + 3) & ~3); + dest = ALIGN_UP_POINTER(dest, DWORD); ibtn[i] = (DLGITEMTEMPLATE *)dest; + ibtn[i]->style = WS_CHILD | WS_VISIBLE | WS_TABSTOP; if (!defbtn && (i == ((lpMsgBoxParams->dwStyle & MB_DEFMASK) >> 8))) { @@ -651,7 +663,8 @@ MessageBoxTimeoutIndirectW( dest += sizeof(WORD); // btnrect.right = btnrect.bottom = 0; // FIXME: Is it needed?? - DrawTextW(hDC, ButtonText[i], ButtonLen[i], &btnrect, DT_LEFT | DT_SINGLELINE | DT_CALCRECT); + DrawTextW(hDC, ButtonText[i], ButtonLen[i], &btnrect, + DT_LEFT | DT_SINGLELINE | DT_CALCRECT); btnsize.cx = max(btnsize.cx, btnrect.right); btnsize.cy = max(btnsize.cy, btnrect.bottom); } @@ -671,7 +684,8 @@ MessageBoxTimeoutIndirectW( txtrect.top = txtrect.left = txtrect.bottom = 0; if (textlen != 0) { - DrawTextW(hDC, text, textlen, &txtrect, DT_LEFT | DT_NOPREFIX | DT_WORDBREAK | DT_EXPANDTABS | DT_EXTERNALLEADING | DT_EDITCONTROL | DT_CALCRECT); + DrawTextW(hDC, text, textlen, &txtrect, + DT_LEFT | DT_NOPREFIX | DT_WORDBREAK | DT_EXPANDTABS | DT_EXTERNALLEADING | DT_EDITCONTROL | DT_CALCRECT); } else { @@ -770,14 +784,14 @@ MessageBoxTimeoutIndirectW( tpl->cx = RESCALE_X(btnleft, units); tpl->cy = RESCALE_Y(btntop, units); - /* finally show the messagebox */ + /* Finally show the messagebox */ mbi.Icon = Icon; mbi.dwContextHelpId = lpMsgBoxParams->dwContextHelpId; mbi.lpfnMsgBoxCallback = lpMsgBoxParams->lpfnMsgBoxCallback; mbi.dwStyle = lpMsgBoxParams->dwStyle; mbi.nButtons = Buttons.btnCnt; mbi.Btns = Buttons.btnIdx; - mbi.Timeout = Timeout; + mbi.Timeout = dwTimeout; /* Pass on to Justin Case so he can peek the message? */ mbi.cbSize = lpMsgBoxParams->cbSize; @@ -788,7 +802,8 @@ MessageBoxTimeoutIndirectW( mbi.lpszIcon = lpMsgBoxParams->lpszIcon; mbi.dwLanguageId = lpMsgBoxParams->dwLanguageId; - ret = DialogBoxIndirectParamW(lpMsgBoxParams->hInstance, tpl, lpMsgBoxParams->hwndOwner, + ret = DialogBoxIndirectParamW(lpMsgBoxParams->hInstance, tpl, + lpMsgBoxParams->hwndOwner, MessageBoxProc, (LPARAM)&mbi); Quit: @@ -796,8 +811,8 @@ Quit: return ret; } -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS *****************************************************************/ /* * @implemented

1 0

05/11: [USER32] Specify the font to be used for the message-box in its dialog template, using DS_SETFONT and a font point size of 0x7FFF, instead of passing a font handle and setting the font of each control manually.
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb77cc707fa8c75296740… commit cb77cc707fa8c7529674011a7c96116e7a542251 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 10 18:20:53 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 17:12:20 2018 +0200 [USER32] Specify the font to be used for the message-box in its dialog template, using DS_SETFONT and a font point size of 0x7FFF, instead of passing a font handle and setting the font of each control manually. Also improve the flags used in the DrawTextW() call for calculating the size to be taken by the message-box text. --- win32ss/user/user32/windows/messagebox.c | 84 ++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 27 deletions(-) diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c index 96c39b791c..db812b1134 100644 --- a/win32ss/user/user32/windows/messagebox.c +++ b/win32ss/user/user32/windows/messagebox.c @@ -57,8 +57,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); #define MSGBOXEX_MAXBTNS (4) /* Rescale logical coordinates */ -#define RESCALE_X(_x, _unit) (((_x) * 4 + LOWORD(_unit) - 1) / LOWORD(_unit)) -#define RESCALE_Y(_y, _unit) (((_y) * 8 + HIWORD(_unit) - 1) / HIWORD(_unit)) +#define RESCALE_X(_x, _units) (((_x) * 4 + (_units).cx - 1) / (_units).cx) +#define RESCALE_Y(_y, _units) (((_y) * 8 + (_units).cy - 1) / (_units).cy) /* MessageBox button helpers */ @@ -103,7 +103,6 @@ typedef struct _MSGBOXINFO MSGBOXPARAMSW; // Wine passes this too. // ReactOS HICON Icon; - HFONT Font; int DefBtn; int nButtons; LONG *Btns; @@ -220,7 +219,7 @@ static INT_PTR CALLBACK MessageBoxProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - int i, Alert; + int Alert; PMSGBOXINFO mbi; HELPINFO hi; HWND owner; @@ -267,12 +266,6 @@ static INT_PTR CALLBACK MessageBoxProc( /* Send out the alert notifications. */ NotifyWinEvent(EVENT_SYSTEM_ALERT, hwnd, OBJID_ALERT, Alert); - /* set control fonts */ - SendDlgItemMessageW(hwnd, MSGBOX_IDTEXT, WM_SETFONT, (WPARAM)mbi->Font, 0); - for (i = 0; i < mbi->nButtons; i++) - { - SendDlgItemMessageW(hwnd, mbi->Btns[i], WM_SETFONT, (WPARAM)mbi->Font, 0); - } switch (mbi->dwStyle & MB_TYPEMASK) { case MB_ABORTRETRYIGNORE: @@ -372,9 +365,11 @@ MessageBoxTimeoutIndirectW( LPVOID buf; BYTE *dest; LPCWSTR caption, text; - HFONT hFont; + HFONT hFont, hOldFont; HICON Icon; + HWND hDCWnd; HDC hDC; + SIZE units; int bufsize, ret, caplen, textlen, i, btnleft, btntop, lmargin; MSGBTNINFO Buttons; LPCWSTR ButtonText[MSGBOXEX_MAXBTNS]; @@ -384,7 +379,6 @@ MessageBoxTimeoutIndirectW( SIZE btnsize; MSGBOXINFO mbi; BOOL defbtn = FALSE; - DWORD units = GetDialogBaseUnits(); if (!lpMsgBoxParams->lpszCaption) { @@ -470,8 +464,9 @@ MessageBoxTimeoutIndirectW( /* Basic space */ bufsize = sizeof(DLGTEMPLATE) + - 2 * sizeof(WORD) + /* menu and class */ - (caplen + 1) * sizeof(WCHAR); /* title */ + 2 * sizeof(WORD) + /* menu and class */ + (caplen + 1) * sizeof(WCHAR) + /* title */ + sizeof(WORD); /* font height */ /* Space for icon */ if (NULL != Icon) @@ -510,18 +505,22 @@ MessageBoxTimeoutIndirectW( buf = RtlAllocateHeap(GetProcessHeap(), 0, bufsize); if (!buf) - { return 0; - } + iico = itxt = NULL; nclm.cbSize = sizeof(nclm); - SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof(nclm), &nclm, 0); + SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(nclm), &nclm, 0); hFont = CreateFontIndirectW(&nclm.lfMessageFont); + if (!hFont) + { + ERR("Cannot retrieve nclm.lfMessageFont!\n"); + goto Quit; + } tpl = (DLGTEMPLATE *)buf; - tpl->style = WS_CAPTION | WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_SYSMENU | DS_CENTER | DS_MODALFRAME | DS_NOIDLEMSG; + tpl->style = WS_CAPTION | WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_SYSMENU | DS_CENTER | DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG; tpl->dwExtendedStyle = WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT; if (lpMsgBoxParams->dwStyle & MB_TOPMOST) tpl->dwExtendedStyle |= WS_EX_TOPMOST; @@ -541,6 +540,13 @@ MessageBoxTimeoutIndirectW( *(WCHAR*)dest = L'\0'; dest += sizeof(WCHAR); + /* + * A font point size (height) of 0x7FFF means that we use + * the message box font (NONCLIENTMETRICSW.lfMessageFont). + */ + *(WORD*)dest = 0x7FFF; + dest += sizeof(WORD); + /* Create icon */ if (Icon) { @@ -585,8 +591,30 @@ MessageBoxTimeoutIndirectW( *(WORD*)dest = 0; dest += sizeof(WORD); - hDC = CreateCompatibleDC(0); - SelectObject(hDC, hFont); + hDCWnd = NULL; + hDC = GetDCEx(hDCWnd, NULL, DCX_WINDOW | DCX_CACHE); + if (!hDC) + { + /* Retry with the DC of the owner window */ + hDCWnd = lpMsgBoxParams->hwndOwner; + hDC = GetDCEx(hDCWnd, NULL, DCX_WINDOW | DCX_CACHE); + } + if (!hDC) + { + ERR("GetDCEx() failed, bail out!\n"); + goto Quit; + } + hOldFont = SelectObject(hDC, hFont); + + units.cx = GdiGetCharDimensions(hDC, NULL, &units.cy); + if (!units.cx) + { + DWORD defUnits; + ERR("GdiGetCharDimensions() failed, falling back to default values!\n"); + defUnits = GetDialogBaseUnits(); + units.cx = LOWORD(defUnits); + units.cy = HIWORD(defUnits); + } /* create buttons */ btnsize.cx = BTN_CX; @@ -643,7 +671,7 @@ MessageBoxTimeoutIndirectW( txtrect.top = txtrect.left = txtrect.bottom = 0; if (textlen != 0) { - DrawTextW(hDC, text, textlen, &txtrect, DT_LEFT | DT_NOPREFIX | DT_WORDBREAK | DT_CALCRECT); + DrawTextW(hDC, text, textlen, &txtrect, DT_LEFT | DT_NOPREFIX | DT_WORDBREAK | DT_EXPANDTABS | DT_EXTERNALLEADING | DT_EDITCONTROL | DT_CALCRECT); } else { @@ -652,8 +680,13 @@ MessageBoxTimeoutIndirectW( } txtrect.right++; - if (hDC) - DeleteDC(hDC); + if (hOldFont) + SelectObject(hDC, hOldFont); + + ReleaseDC(hDCWnd, hDC); + + if (hFont) + DeleteObject(hFont); /* calculate position and size of the icon */ rc.left = rc.bottom = rc.right = 0; @@ -739,7 +772,6 @@ MessageBoxTimeoutIndirectW( /* finally show the messagebox */ mbi.Icon = Icon; - mbi.Font = hFont; mbi.dwContextHelpId = lpMsgBoxParams->dwContextHelpId; mbi.lpfnMsgBoxCallback = lpMsgBoxParams->lpfnMsgBoxCallback; mbi.dwStyle = lpMsgBoxParams->dwStyle; @@ -759,9 +791,7 @@ MessageBoxTimeoutIndirectW( ret = DialogBoxIndirectParamW(lpMsgBoxParams->hInstance, tpl, lpMsgBoxParams->hwndOwner, MessageBoxProc, (LPARAM)&mbi); - if (hFont) - DeleteObject(hFont); - +Quit: RtlFreeHeap(GetProcessHeap(), 0, buf); return ret; }

1 0

04/11: [SDK][UNDOCUSER] Add undocumented user32.dll SoftModalMessageBox() definition and its structure MSGBOXDATA.
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed1de7184c2992932a638… commit ed1de7184c2992932a63842bf042d2e08a4d0000 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Feb 20 23:07:11 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 17:12:20 2018 +0200 [SDK][UNDOCUSER] Add undocumented user32.dll SoftModalMessageBox() definition and its structure MSGBOXDATA. Documented on http://www.vbforums.com/showthread.php?840593-Message-Box-with-Four-Buttons and augmented from my own testings. In addition, add also MessageBoxTimeoutA/W() and MB_GetString(). --- sdk/include/reactos/undocuser.h | 77 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index f130e6b1a9..7001e985f0 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -216,6 +216,83 @@ typedef struct _BALLOON_HARD_ERROR_DATA ULONG_PTR MessageOffset; } BALLOON_HARD_ERROR_DATA, *PBALLOON_HARD_ERROR_DATA; +// +// Undocumented SoftModalMessageBox() API, which constitutes +// the basis of all implementations of the MessageBox*() APIs. +// +typedef struct _MSGBOXDATA +{ + MSGBOXPARAMSW mbp; // Size: 0x28 (on x86), 0x50 (on x64) + HWND hwndOwner; +#if defined(_WIN32) && (_WIN32_WINNT >= _WIN32_WINNT_WIN7) /* (NTDDI_VERSION >= NTDDI_WIN7) */ + DWORD dwPadding; +#endif + WORD wLanguageId; + INT* pidButton; // Array of button IDs + LPCWSTR* ppszButtonText; // Array of button text strings + DWORD dwButtons; // Number of buttons + UINT uDefButton; // Default button ID + UINT uCancelId; // Button ID for Cancel action +#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) /* (NTDDI_VERSION >= NTDDI_WINXP) */ + DWORD dwTimeout; // Message box timeout +#endif + DWORD dwReserved0; +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) /* (NTDDI_VERSION >= NTDDI_WIN7) */ + DWORD dwReserved[4]; +#endif +} MSGBOXDATA, *PMSGBOXDATA, *LPMSGBOXDATA; + +#if defined(_WIN64) + +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) /* (NTDDI_VERSION >= NTDDI_WIN7) */ +C_ASSERT(sizeof(MSGBOXDATA) == 0x98); +#elif (_WIN32_WINNT <= _WIN32_WINNT_WS03) /* (NTDDI_VERSION <= NTDDI_WS03) */ +C_ASSERT(sizeof(MSGBOXDATA) == 0x88); +#endif + +#else + +#if (_WIN32_WINNT <= _WIN32_WINNT_WIN2K) /* (NTDDI_VERSION <= NTDDI_WIN2KSP4) */ +C_ASSERT(sizeof(MSGBOXDATA) == 0x48); +#elif (_WIN32_WINNT >= _WIN32_WINNT_WIN7) /* (NTDDI_VERSION >= NTDDI_WIN7) */ +C_ASSERT(sizeof(MSGBOXDATA) == 0x60); +#else // (_WIN32_WINNT == _WIN32_WINNT_WINXP || _WIN32_WINNT == _WIN32_WINNT_WS03) /* (NTDDI_VERSION == NTDDI_WS03) */ +C_ASSERT(sizeof(MSGBOXDATA) == 0x4C); +#endif + +#endif /* defined(_WIN64) */ + +int WINAPI SoftModalMessageBox(IN LPMSGBOXDATA lpMsgBoxData); + +int +WINAPI +MessageBoxTimeoutA( + IN HWND hWnd, + IN LPCSTR lpText, + IN LPCSTR lpCaption, + IN UINT uType, + IN WORD wLanguageId, + IN DWORD dwTimeout); + +int +WINAPI +MessageBoxTimeoutW( + IN HWND hWnd, + IN LPCWSTR lpText, + IN LPCWSTR lpCaption, + IN UINT uType, + IN WORD wLanguageId, + IN DWORD dwTimeout); + +#ifdef UNICODE +#define MessageBoxTimeout MessageBoxTimeoutW +#else +#define MessageBoxTimeout MessageBoxTimeoutA +#endif + +LPCWSTR WINAPI MB_GetString(IN UINT wBtn); + + // // User api hook //

1 0

03/11: [PSDK] Add IDCANCEL and IDASYNC values (returned by MessageBoxTimeout() and WTSSendMessage() functions).
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bfd6858fbbb09353226d… commit 7bfd6858fbbb09353226d94b71ff3cceaddac196 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Feb 20 22:05:31 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 17:12:19 2018 +0200 [PSDK] Add IDCANCEL and IDASYNC values (returned by MessageBoxTimeout() and WTSSendMessage() functions). --- sdk/include/psdk/winuser.h | 5 +++++ sdk/include/psdk/wtsapi32.h | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 07613795e4..ec8249cddf 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -836,6 +836,11 @@ extern "C" { #define IDTRYAGAIN 10 #define IDCONTINUE 11 #endif +#if (WINVER >= 0x0501) +#ifndef IDTIMEOUT +#define IDTIMEOUT 32000 +#endif +#endif #define GWL_EXSTYLE (-20) #define GWL_STYLE (-16) diff --git a/sdk/include/psdk/wtsapi32.h b/sdk/include/psdk/wtsapi32.h index d00a699aac..d24bff9cfc 100644 --- a/sdk/include/psdk/wtsapi32.h +++ b/sdk/include/psdk/wtsapi32.h @@ -23,6 +23,16 @@ extern "C" { #endif +/* + * pResponse values from WTSSendMessage(), in addition + * to those from the standard MessageBox() API. + */ +#ifndef IDTIMEOUT +#define IDTIMEOUT 32000 +#endif +#ifndef IDASYNC +#define IDASYNC 32001 +#endif typedef enum _WTS_VIRTUAL_CLASS {

1 0

02/11: [USER32] Move related functions close to each other.
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcfcf7a5c90ae6f3e3f4a… commit fcfcf7a5c90ae6f3e3f4a0f36abca0e96b4accc6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 18 20:37:16 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 17:12:19 2018 +0200 [USER32] Move related functions close to each other. --- win32ss/user/user32/windows/messagebox.c | 38 +++++++++++++++----------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c index 9367d67fdd..96c39b791c 100644 --- a/win32ss/user/user32/windows/messagebox.c +++ b/win32ss/user/user32/windows/messagebox.c @@ -783,6 +783,20 @@ MessageBoxA( return MessageBoxExA(hWnd, lpText, lpCaption, uType, LANG_NEUTRAL); } +/* + * @implemented + */ +int +WINAPI +MessageBoxW( + IN HWND hWnd, + IN LPCWSTR lpText, + IN LPCWSTR lpCaption, + IN UINT uType) +{ + return MessageBoxExW(hWnd, lpText, lpCaption, uType, LANG_NEUTRAL); +} + /* * @implemented @@ -812,7 +826,6 @@ MessageBoxExA( return MessageBoxIndirectA(&msgbox); } - /* * @implemented */ @@ -920,7 +933,6 @@ MessageBoxIndirectA( return ret; } - /* * @implemented */ @@ -933,20 +945,6 @@ MessageBoxIndirectW( } -/* - * @implemented - */ -int -WINAPI -MessageBoxW( - IN HWND hWnd, - IN LPCWSTR lpText, - IN LPCWSTR lpCaption, - IN UINT uType) -{ - return MessageBoxExW(hWnd, lpText, lpCaption, uType, LANG_NEUTRAL); -} - /* * @implemented */ @@ -958,7 +956,7 @@ MessageBoxTimeoutA( IN LPCSTR lpCaption, IN UINT uType, IN WORD wLanguageId, - IN DWORD dwTime) + IN DWORD dwTimeout) { MSGBOXPARAMSW msgboxW; UNICODE_STRING textW, captionW; @@ -985,7 +983,7 @@ MessageBoxTimeoutA( msgboxW.lpfnMsgBoxCallback = NULL; msgboxW.dwLanguageId = wLanguageId; - ret = MessageBoxTimeoutIndirectW(&msgboxW, (UINT)dwTime); + ret = MessageBoxTimeoutIndirectW(&msgboxW, (UINT)dwTimeout); if (!IS_INTRESOURCE(textW.Buffer)) RtlFreeUnicodeString(&textW); @@ -1007,7 +1005,7 @@ MessageBoxTimeoutW( IN LPCWSTR lpCaption, IN UINT uType, IN WORD wLanguageId, - IN DWORD dwTime) + IN DWORD dwTimeout) { MSGBOXPARAMSW msgbox; @@ -1022,7 +1020,7 @@ MessageBoxTimeoutW( msgbox.lpfnMsgBoxCallback = NULL; msgbox.dwLanguageId = wLanguageId; - return MessageBoxTimeoutIndirectW(&msgbox, (UINT)dwTime); + return MessageBoxTimeoutIndirectW(&msgbox, (UINT)dwTimeout); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs