Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

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

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

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e4b3c7cf02b1e324ef9f… commit 5e4b3c7cf02b1e324ef9f1c7d1e754b78539f03a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 18 20:31:29 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 17:12:15 2018 +0200 [USER32] Code formatting/indentation fixes only. --- win32ss/user/user32/windows/messagebox.c | 553 ++++++++++++++++--------------- 1 file changed, 282 insertions(+), 271 deletions(-) diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c index 0b94c6c044..9367d67fdd 100644 --- a/win32ss/user/user32/windows/messagebox.c +++ b/win32ss/user/user32/windows/messagebox.c @@ -98,17 +98,16 @@ static const MSGBTNINFO MsgBtnInfo[] = DECLARE_MB_3(CANCEL, TRYAGAIN, CONTINUE) }; - typedef struct _MSGBOXINFO { - MSGBOXPARAMSW; // Wine passes this too. - // ReactOS - HICON Icon; - HFONT Font; - int DefBtn; - int nButtons; - LONG *Btns; - UINT Timeout; + MSGBOXPARAMSW; // Wine passes this too. + // ReactOS + HICON Icon; + HFONT Font; + int DefBtn; + int nButtons; + LONG *Btns; + UINT Timeout; } MSGBOXINFO, *PMSGBOXINFO; /* INTERNAL FUNCTIONS ********************************************************/ @@ -217,147 +216,155 @@ static VOID MessageBoxTextToClipboard(HWND DialogWindow) RtlFreeHeap(GetProcessHeap(), 0, pMessageBoxText); } -static INT_PTR CALLBACK MessageBoxProc( HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam ) +static INT_PTR CALLBACK MessageBoxProc( + HWND hwnd, UINT message, + WPARAM wParam, LPARAM lParam) { - int i, Alert; - PMSGBOXINFO mbi; - HELPINFO hi; - HWND owner; + int i, Alert; + PMSGBOXINFO mbi; + HELPINFO hi; + HWND owner; - switch(message) { + switch (message) + { case WM_INITDIALOG: - mbi = (PMSGBOXINFO)lParam; + { + mbi = (PMSGBOXINFO)lParam; - SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)mbi); - NtUserxSetMessageBox(hwnd); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)mbi); + NtUserxSetMessageBox(hwnd); - if(!GetPropW(hwnd, L"ROS_MSGBOX")) - { - SetPropW(hwnd, L"ROS_MSGBOX", (HANDLE)lParam); + if (!GetPropW(hwnd, L"ROS_MSGBOX")) + { + SetPropW(hwnd, L"ROS_MSGBOX", (HANDLE)lParam); - if (mbi->dwContextHelpId) - SetWindowContextHelpId(hwnd, mbi->dwContextHelpId); + if (mbi->dwContextHelpId) + SetWindowContextHelpId(hwnd, mbi->dwContextHelpId); - if (mbi->Icon) - { - SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)mbi->Icon, 0); - Alert = ALERT_SYSTEM_WARNING; - } - else // Setup the rest of the alerts. - { - switch(mbi->dwStyle & MB_ICONMASK) - { - case MB_ICONWARNING: + if (mbi->Icon) + { + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)mbi->Icon, 0); Alert = ALERT_SYSTEM_WARNING; - break; - case MB_ICONERROR: - Alert = ALERT_SYSTEM_ERROR; - break; - case MB_ICONQUESTION: - Alert = ALERT_SYSTEM_QUERY; - break; - default: - Alert = ALERT_SYSTEM_INFORMATIONAL; - /* fall through */ - } + } + else // Setup the rest of the alerts. + { + switch (mbi->dwStyle & MB_ICONMASK) + { + case MB_ICONWARNING: + Alert = ALERT_SYSTEM_WARNING; + break; + case MB_ICONERROR: + Alert = ALERT_SYSTEM_ERROR; + break; + case MB_ICONQUESTION: + Alert = ALERT_SYSTEM_QUERY; + break; + default: + Alert = ALERT_SYSTEM_INFORMATIONAL; + /* fall through */ + } + } + /* 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: + 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); } - /* Send out the alert notifications. */ - NotifyWinEvent(EVENT_SYSTEM_ALERT, hwnd, OBJID_ALERT, Alert); + return 0; + } - /* 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 WM_COMMAND: + switch (LOWORD(wParam)) { - case MB_ABORTRETRYIGNORE: - case MB_YESNO: - RemoveMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND); - break; + case IDOK: + case IDCANCEL: + case IDABORT: + case IDRETRY: + case IDIGNORE: + case IDYES: + case IDNO: + case IDTRYAGAIN: + case IDCONTINUE: + EndDialog(hwnd, wParam); + return 0; + case IDHELP: + /* send WM_HELP message to messagebox window */ + hi.cbSize = sizeof(HELPINFO); + hi.iContextType = HELPINFO_WINDOW; + hi.iCtrlId = LOWORD(wParam); + hi.hItemHandle = (HANDLE)lParam; + hi.dwContextId = 0; + GetCursorPos(&hi.MousePos); + SendMessageW(hwnd, WM_HELP, 0, (LPARAM)&hi); + return 0; } - SetFocus(GetDlgItem(hwnd, mbi->DefBtn)); - if(mbi->Timeout && (mbi->Timeout != (UINT)-1)) - SetTimer(hwnd, 0, mbi->Timeout, NULL); - } - return 0; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - case IDCANCEL: - case IDABORT: - case IDRETRY: - case IDIGNORE: - case IDYES: - case IDNO: - case IDTRYAGAIN: - case IDCONTINUE: - EndDialog(hwnd, wParam); - return 0; - case IDHELP: - /* send WM_HELP message to messagebox window */ - hi.cbSize = sizeof(HELPINFO); - hi.iContextType = HELPINFO_WINDOW; - hi.iCtrlId = LOWORD(wParam); - hi.hItemHandle = (HANDLE)lParam; - hi.dwContextId = 0; - GetCursorPos(&hi.MousePos); - SendMessageW(hwnd, WM_HELP, 0, (LPARAM)&hi); - return 0; - } - return 0; + return 0; case WM_COPY: MessageBoxTextToClipboard(hwnd); return 0; case WM_HELP: - mbi = (PMSGBOXINFO)GetPropW(hwnd, L"ROS_MSGBOX"); - if(!mbi) + { + mbi = (PMSGBOXINFO)GetPropW(hwnd, L"ROS_MSGBOX"); + if (!mbi) + return 0; + memcpy(&hi, (void *)lParam, sizeof(hi)); + 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); + } return 0; - memcpy(&hi, (void *)lParam, sizeof(hi)); - 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); - } - return 0; + } case WM_CLOSE: - mbi = (PMSGBOXINFO)GetPropW(hwnd, L"ROS_MSGBOX"); - if(!mbi) - return 0; - switch(mbi->dwStyle & MB_TYPEMASK) - { + { + mbi = (PMSGBOXINFO)GetPropW(hwnd, L"ROS_MSGBOX"); + if (!mbi) + return 0; + switch (mbi->dwStyle & MB_TYPEMASK) + { case MB_ABORTRETRYIGNORE: case MB_YESNO: - return 1; - } - EndDialog(hwnd, IDCANCEL); - return 1; + return 1; + } + EndDialog(hwnd, IDCANCEL); + return 1; + } case WM_TIMER: - if(wParam == 0) - { - EndDialog(hwnd, 32000); - } - return 0; - } - return 0; + if (wParam == 0) + { + EndDialog(hwnd, 32000); + } + return 0; + } + return 0; } static int MessageBoxTimeoutIndirectW( - CONST MSGBOXPARAMSW *lpMsgBoxParams, UINT Timeout) + CONST MSGBOXPARAMSW *lpMsgBoxParams, UINT Timeout) { DLGTEMPLATE *tpl; DLGITEMTEMPLATE *iico, *itxt; @@ -430,7 +437,7 @@ MessageBoxTimeoutIndirectW( Buttons.btnCnt++; } - switch(lpMsgBoxParams->dwStyle & MB_ICONMASK) + switch (lpMsgBoxParams->dwStyle & MB_ICONMASK) { case MB_ICONEXCLAMATION: Icon = LoadIconW(0, IDI_EXCLAMATIONW); @@ -502,9 +509,9 @@ MessageBoxTimeoutIndirectW( } buf = RtlAllocateHeap(GetProcessHeap(), 0, bufsize); - if(!buf) + if (!buf) { - return 0; + return 0; } iico = itxt = NULL; @@ -516,10 +523,10 @@ MessageBoxTimeoutIndirectW( tpl->style = WS_CAPTION | WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_SYSMENU | DS_CENTER | 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; - if(lpMsgBoxParams->dwStyle & MB_RIGHT) - tpl->dwExtendedStyle |= WS_EX_RIGHT; + if (lpMsgBoxParams->dwStyle & MB_TOPMOST) + tpl->dwExtendedStyle |= WS_EX_TOPMOST; + if (lpMsgBoxParams->dwStyle & MB_RIGHT) + tpl->dwExtendedStyle |= WS_EX_RIGHT; tpl->x = 100; tpl->y = 100; tpl->cdit = Buttons.btnCnt + ((Icon != (HICON)0) ? 1 : 0) + 1; @@ -535,35 +542,35 @@ MessageBoxTimeoutIndirectW( dest += sizeof(WCHAR); /* Create icon */ - if(Icon) + if (Icon) { - dest = (BYTE*)(((ULONG_PTR)dest + 3) & ~3); - iico = (DLGITEMTEMPLATE *)dest; - iico->style = WS_CHILD | WS_VISIBLE | SS_ICON; - iico->dwExtendedStyle = 0; - iico->id = MSGBOX_IDICON; - - dest += sizeof(DLGITEMTEMPLATE); - *(WORD*)dest = 0xFFFF; - dest += sizeof(WORD); - *(WORD*)dest = 0x0082; /* static control */ - dest += sizeof(WORD); - *(WORD*)dest = 0xFFFF; - dest += sizeof(WORD); - *(WCHAR*)dest = 0; - dest += sizeof(WCHAR); - *(WORD*)dest = 0; - dest += sizeof(WORD); + dest = (BYTE*)(((ULONG_PTR)dest + 3) & ~3); + iico = (DLGITEMTEMPLATE *)dest; + iico->style = WS_CHILD | WS_VISIBLE | SS_ICON; + iico->dwExtendedStyle = 0; + iico->id = MSGBOX_IDICON; + + dest += sizeof(DLGITEMTEMPLATE); + *(WORD*)dest = 0xFFFF; + dest += sizeof(WORD); + *(WORD*)dest = 0x0082; /* static control */ + dest += sizeof(WORD); + *(WORD*)dest = 0xFFFF; + dest += sizeof(WORD); + *(WCHAR*)dest = 0; + dest += sizeof(WCHAR); + *(WORD*)dest = 0; + dest += sizeof(WORD); } /* create static for text */ dest = (BYTE*)(((UINT_PTR)dest + 3) & ~3); itxt = (DLGITEMTEMPLATE *)dest; itxt->style = WS_CHILD | WS_VISIBLE | SS_NOPREFIX; - if(lpMsgBoxParams->dwStyle & MB_RIGHT) - itxt->style |= SS_RIGHT; + if (lpMsgBoxParams->dwStyle & MB_RIGHT) + itxt->style |= SS_RIGHT; else - itxt->style |= SS_LEFT; + itxt->style |= SS_LEFT; itxt->dwExtendedStyle = 0; itxt->id = MSGBOX_IDTEXT; dest += sizeof(DLGITEMTEMPLATE); @@ -586,134 +593,136 @@ MessageBoxTimeoutIndirectW( btnsize.cy = BTN_CY; btnrect.left = btnrect.top = 0; - for(i = 0; i < Buttons.btnCnt; i++) + for (i = 0; i < Buttons.btnCnt; i++) { - dest = (BYTE*)(((UINT_PTR)dest + 3) & ~3); - ibtn[i] = (DLGITEMTEMPLATE *)dest; - ibtn[i]->style = WS_CHILD | WS_VISIBLE | WS_TABSTOP; - if(!defbtn && (i == ((lpMsgBoxParams->dwStyle & MB_DEFMASK) >> 8))) - { - 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]; - 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)); - dest += ButtonLen[i] * 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, 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); + dest = (BYTE*)(((UINT_PTR)dest + 3) & ~3); + ibtn[i] = (DLGITEMTEMPLATE *)dest; + ibtn[i]->style = WS_CHILD | WS_VISIBLE | WS_TABSTOP; + if (!defbtn && (i == ((lpMsgBoxParams->dwStyle & MB_DEFMASK) >> 8))) + { + 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]; + 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)); + dest += ButtonLen[i] * 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, 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); } /* make first button the default button if no other is */ - if(!defbtn) + if (!defbtn) { - ibtn[0]->style &= ~BS_PUSHBUTTON; - ibtn[0]->style |= BS_DEFPUSHBUTTON; - mbi.DefBtn = Buttons.btnIdx[0]; + 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) - txtrect.right -= GetSystemMetrics(SM_CXICON) + MSGBOXEX_SPACING; + 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_CALCRECT); + DrawTextW(hDC, text, textlen, &txtrect, DT_LEFT | DT_NOPREFIX | DT_WORDBREAK | DT_CALCRECT); } else { - txtrect.right = txtrect.left + 1; - txtrect.bottom = txtrect.top + 1; + txtrect.right = txtrect.left + 1; + txtrect.bottom = txtrect.top + 1; } txtrect.right++; - if(hDC) - DeleteDC(hDC); + if (hDC) + DeleteDC(hDC); /* calculate position and size of the icon */ rc.left = rc.bottom = rc.right = 0; btntop = 0; - if(iico) + if (iico) { - rc.right = GetSystemMetrics(SM_CXICON); - rc.bottom = GetSystemMetrics(SM_CYICON); + 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); + 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; + rc.top = MSGBOXEX_MARGIN; #endif - btnleft = (Buttons.btnCnt * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; - if(btnleft > txtrect.right + rc.right + MSGBOXEX_SPACING) - { + btnleft = (Buttons.btnCnt * (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); + lmargin = MSGBOXEX_MARGIN + ((btnleft - txtrect.right - rc.right - MSGBOXEX_SPACING) / 2); #else - lmargin = MSGBOXEX_MARGIN; + 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; + 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 = (Buttons.btnCnt * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; - if(btnleft > txtrect.right) - { + btnleft = (Buttons.btnCnt * (btnsize.cx + MSGBOXEX_BUTTONSPACING)) - MSGBOXEX_BUTTONSPACING; + if (btnleft > txtrect.right) + { #ifdef MSGBOX_TEXTHCENTER - lmargin = MSGBOXEX_MARGIN + ((btnleft - txtrect.right) / 2); + lmargin = MSGBOXEX_MARGIN + ((btnleft - txtrect.right) / 2); #else - lmargin = MSGBOXEX_MARGIN; + lmargin = MSGBOXEX_MARGIN; #endif - btnleft = MSGBOXEX_MARGIN; - } - else - { - lmargin = MSGBOXEX_MARGIN; - btnleft = MSGBOXEX_MARGIN + (txtrect.right / 2) - (btnleft / 2); - } - rc.left = lmargin; + 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 < Buttons.btnCnt; i++) + for (i = 0; i < Buttons.btnCnt; 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); - btnleft += btnsize.cx + MSGBOXEX_BUTTONSPACING; + 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); + btnleft += btnsize.cx + MSGBOXEX_BUTTONSPACING; } /* calculate size and position of the messagebox window */ btnleft = max(btnleft - MSGBOXEX_BUTTONSPACING, rc.left + txtrect.right); @@ -750,8 +759,8 @@ MessageBoxTimeoutIndirectW( ret = DialogBoxIndirectParamW(lpMsgBoxParams->hInstance, tpl, lpMsgBoxParams->hwndOwner, MessageBoxProc, (LPARAM)&mbi); - if(hFont) - DeleteObject(hFont); + if (hFont) + DeleteObject(hFont); RtlFreeHeap(GetProcessHeap(), 0, buf); return ret; @@ -766,10 +775,10 @@ MessageBoxTimeoutIndirectW( int WINAPI MessageBoxA( - HWND hWnd, - LPCSTR lpText, - LPCSTR lpCaption, - UINT uType) + IN HWND hWnd, + IN LPCSTR lpText, + IN LPCSTR lpCaption, + IN UINT uType) { return MessageBoxExA(hWnd, lpText, lpCaption, uType, LANG_NEUTRAL); } @@ -781,11 +790,11 @@ MessageBoxA( int WINAPI MessageBoxExA( - HWND hWnd, - LPCSTR lpText, - LPCSTR lpCaption, - UINT uType, - WORD wLanguageId) + IN HWND hWnd, + IN LPCSTR lpText, + IN LPCSTR lpCaption, + IN UINT uType, + IN WORD wLanguageId) { MSGBOXPARAMSA msgbox; @@ -810,11 +819,11 @@ MessageBoxExA( int WINAPI MessageBoxExW( - HWND hWnd, - LPCWSTR lpText, - LPCWSTR lpCaption, - UINT uType, - WORD wLanguageId) + IN HWND hWnd, + IN LPCWSTR lpText, + IN LPCWSTR lpCaption, + IN UINT uType, + IN WORD wLanguageId) { MSGBOXPARAMSW msgbox; @@ -839,7 +848,7 @@ MessageBoxExW( int WINAPI MessageBoxIndirectA( - CONST MSGBOXPARAMSA *lpMsgBoxParams) + IN CONST MSGBOXPARAMSA* lpMsgBoxParams) { MSGBOXPARAMSW msgboxW; UNICODE_STRING textW, captionW, iconW; @@ -869,7 +878,7 @@ MessageBoxIndirectA( else captionW.Buffer = (LPWSTR)lpMsgBoxParams->lpszCaption; - if(lpMsgBoxParams->dwStyle & MB_USERICON) + if (lpMsgBoxParams->dwStyle & MB_USERICON) { if (!IS_INTRESOURCE(lpMsgBoxParams->lpszIcon)) { @@ -918,7 +927,7 @@ MessageBoxIndirectA( int WINAPI MessageBoxIndirectW( - CONST MSGBOXPARAMSW *lpMsgBoxParams) + IN CONST MSGBOXPARAMSW* lpMsgBoxParams) { return MessageBoxTimeoutIndirectW(lpMsgBoxParams, (UINT)-1); } @@ -930,10 +939,10 @@ MessageBoxIndirectW( int WINAPI MessageBoxW( - HWND hWnd, - LPCWSTR lpText, - LPCWSTR lpCaption, - UINT uType) + IN HWND hWnd, + IN LPCWSTR lpText, + IN LPCWSTR lpCaption, + IN UINT uType) { return MessageBoxExW(hWnd, lpText, lpCaption, uType, LANG_NEUTRAL); } @@ -944,12 +953,12 @@ MessageBoxW( int WINAPI MessageBoxTimeoutA( - HWND hWnd, - LPCSTR lpText, - LPCSTR lpCaption, - UINT uType, - WORD wLanguageId, - DWORD dwTime) + IN HWND hWnd, + IN LPCSTR lpText, + IN LPCSTR lpCaption, + IN UINT uType, + IN WORD wLanguageId, + IN DWORD dwTime) { MSGBOXPARAMSW msgboxW; UNICODE_STRING textW, captionW; @@ -993,12 +1002,12 @@ MessageBoxTimeoutA( int WINAPI MessageBoxTimeoutW( - HWND hWnd, - LPCWSTR lpText, - LPCWSTR lpCaption, - UINT uType, - WORD wLanguageId, - DWORD dwTime) + IN HWND hWnd, + IN LPCWSTR lpText, + IN LPCWSTR lpCaption, + IN UINT uType, + IN WORD wLanguageId, + IN DWORD dwTime) { MSGBOXPARAMSW msgbox; @@ -1034,7 +1043,7 @@ SoftModalMessageBox(DWORD Unknown0) */ BOOL WINAPI -MessageBeep(UINT uType) +MessageBeep(IN UINT uType) { return NtUserxMessageBeep(uType); } @@ -1047,7 +1056,9 @@ MessageBeep(UINT uType) * and: http://undoc.airesoft.co.uk/user32.dll/MB_GetString.php * for more information. */ -LPCWSTR WINAPI MB_GetString(UINT wBtn) +LPCWSTR +WINAPI +MB_GetString(IN UINT wBtn) { LPCWSTR btnStr = NULL;

1 0

01/01: [CONFIGURE] Fix tabulation issue
by Oleksandr Shaposhnikov 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=729d6e79814e3f153b6a6… commit 729d6e79814e3f153b6a676a2795e6d138698338 Author: Oleksandr Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Fri Aug 17 17:43:54 2018 +0300 Commit: Oleksandr Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Fri Aug 17 17:45:07 2018 +0300 [CONFIGURE] Fix tabulation issue --- configure.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.cmd b/configure.cmd index bacc75a743..d8f44af545 100755 --- a/configure.cmd +++ b/configure.cmd @@ -71,7 +71,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.13." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.14." > NUL && set VS_VERSION=15 - cl 2>&1 | find "19.15." > NUL && set VS_VERSION=15 + cl 2>&1 | find "19.15." > NUL && set VS_VERSION=15 if not defined VS_VERSION ( echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. goto quit

1 0

01/01: [SHELL32_WINETEST] Fix 2 MSVC warnings about flags
by Serge Gautherie 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=669d6b445bdf3c2074626… commit 669d6b445bdf3c20746268efea00c730c6b74706 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Jul 19 18:45:32 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 17 16:21:30 2018 +0200 [SHELL32_WINETEST] Fix 2 MSVC warnings about flags - "...\ebrowser.c(1188) : warning C4133: 'function' : incompatible types - from 'DWORD *' to 'EXPLORER_BROWSER_OPTIONS *'" - "...\ebrowser.c(1198) : warning C4133: 'function' : incompatible types - from 'DWORD *' to 'EXPLORER_BROWSER_OPTIONS *'" Cherry-pick https://source.winehq.org/git/wine.git/commit/535f2f9e663b7b3db3147960942d3… CORE-7538 --- modules/rostests/winetests/shell32/ebrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/winetests/shell32/ebrowser.c b/modules/rostests/winetests/shell32/ebrowser.c index 3e89b90439..28219e8817 100644 --- a/modules/rostests/winetests/shell32/ebrowser.c +++ b/modules/rostests/winetests/shell32/ebrowser.c @@ -1102,7 +1102,7 @@ static void test_basics(void) IShellBrowser *psb; FOLDERSETTINGS fs; ULONG lres; - DWORD flags; + EXPLORER_BROWSER_OPTIONS flags; HDWP hdwp; RECT rc; HRESULT hr;

1 0

01/01: [OLEAUT32] Fix an MSVC warning about VarCyMul()
by Serge Gautherie 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ad650469ea76edf8b3ec… commit 2ad650469ea76edf8b3ec3d8dbc867c5a5781598 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jul 18 15:21:15 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 17 16:18:41 2018 +0200 [OLEAUT32] Fix an MSVC warning about VarCyMul() "...\vartype.c(3808) : warning C4028: formal parameter 2 different from declaration" Mininal cherry-pick Alexandre Julliard https://source.winehq.org/git/wine.git/commit/18f7ec3670375f6389b36527fbfe1… CORE-7538 --- dll/win32/oleaut32/vartype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/oleaut32/vartype.c b/dll/win32/oleaut32/vartype.c index eeef9922f2..9e271be5a2 100644 --- a/dll/win32/oleaut32/vartype.c +++ b/dll/win32/oleaut32/vartype.c @@ -3804,7 +3804,7 @@ HRESULT WINAPI VarCyAdd(const CY cyLeft, const CY cyRight, CY* pCyOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyMul(const CY cyLeft, const CY cyRight, CY* pCyOut) +HRESULT WINAPI VarCyMul(const CY cyLeft, CY cyRight, CY* pCyOut) { double l,r; _VarR8FromCy(cyLeft, &l);

1 0

01/01: [FONT][WIN32SS] Ignore identical mapping in IntLoadFontSubstList
by Katayama Hirofumi MZ 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd2ab1e9bc88e1ee257fb… commit bd2ab1e9bc88e1ee257fb51ef358c10881cdfc44 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 17 10:46:01 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 17 16:05:04 2018 +0200 [FONT][WIN32SS] Ignore identical mapping in IntLoadFontSubstList --- win32ss/gdi/ntgdi/freetype.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 118b7444e4..5293c7e446 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -453,6 +453,15 @@ IntLoadFontSubstList(PLIST_ENTRY pHead) CharSets[FONTSUBST_TO] = (BYTE)_wtoi(pch + 1); } + /* is it identical? */ + if (RtlEqualUnicodeString(&FromW, &ToW, TRUE) && + CharSets[FONTSUBST_FROM] == CharSets[FONTSUBST_TO]) + { + RtlFreeUnicodeString(&FromW); + RtlFreeUnicodeString(&ToW); + continue; + } + /* allocate an entry */ pEntry = ExAllocatePoolWithTag(PagedPool, sizeof(FONTSUBST_ENTRY), TAG_FONT); if (pEntry == NULL)

1 0

01/01: [REACTOS] Warn if not using RosBE custom CMake
by Serge Gautherie 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ee150c374d16beb94b2a… commit 2ee150c374d16beb94b2aa966ec3740db674f51a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri May 11 05:57:10 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 17 14:03:59 2018 +0200 [REACTOS] Warn if not using RosBE custom CMake Better be explicit immediately, than fail later without a clue. Thanks to Yuntian Zhang for initial code, adapted by me. CORE-14607 --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b6235d9cb..90e76be2f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.2.1) cmake_policy(VERSION 3.2.1) +if(NOT CMAKE_VERSION MATCHES "ReactOS") + message(WARNING "Building with \"${CMAKE_COMMAND}\", which is not the custom CMake included in RosBE, might cause build issues...") +endif() + # Don't escape preprocessor definition values added via add_definitions cmake_policy(SET CMP0005 OLD)

1 0

04/04: [NTOSKRNL] Only allow page file on a few specific device types
by Pierre Schweitzer 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12e8d7fe0e4e45f802ae5… commit 12e8d7fe0e4e45f802ae5db29e755d5ad184d1a9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Aug 16 19:00:22 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Aug 16 19:00:22 2018 +0200 [NTOSKRNL] Only allow page file on a few specific device types --- ntoskrnl/mm/pagefile.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 985557825f..0649f0f2c2 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -364,6 +364,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, SECURITY_DESCRIPTOR SecurityDescriptor; PACL Dacl; PWSTR Buffer; + DEVICE_TYPE DeviceType; DPRINT("NtCreatePagingFile(FileName %wZ, MinimumSize %I64d)\n", FileName, MinimumSize->QuadPart); @@ -727,6 +728,17 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, return Status; } + /* Only allow page file on a few device types */ + DeviceType = IoGetRelatedDeviceObject(FileObject)->DeviceType; + if (DeviceType != FILE_DEVICE_DISK_FILE_SYSTEM && DeviceType != FILE_DEVICE_NETWORK_FILE_SYSTEM && + DeviceType != FILE_DEVICE_DFS_VOLUME && DeviceType != FILE_DEVICE_DFS_FILE_SYSTEM) + { + ObDereferenceObject(FileObject); + ZwClose(FileHandle); + ExFreePoolWithTag(Buffer, TAG_MM); + return Status; + } + /* Deny page file creation on a floppy disk */ FsDeviceInfo.Characteristics = 0; IoQueryVolumeInformation(FileObject, FileFsDeviceInformation, sizeof(FsDeviceInfo), &FsDeviceInfo, &Count);

1 0

03/04: [NTOSKRNL] Don't need all access for file object
by Pierre Schweitzer 16 Aug '18

16 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc59c97308161fade55a7… commit cc59c97308161fade55a7f2dab17579130ec5219 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Aug 16 18:54:23 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Aug 16 18:54:23 2018 +0200 [NTOSKRNL] Don't need all access for file object --- ntoskrnl/mm/pagefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 14c558e9f9..985557825f 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -715,7 +715,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, } Status = ObReferenceObjectByHandle(FileHandle, - FILE_ALL_ACCESS, + FILE_READ_DATA | FILE_WRITE_DATA, IoFileObjectType, KernelMode, (PVOID*)&FileObject,

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2018