Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 01/01: [COMCTL32] Unchange the property sheet page after WM_INITDIALOG (#1842)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=344d5599351c5abae618d… commit 344d5599351c5abae618dae9693a655cdc34dab0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 17 20:02:57 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 17 20:02:57 2019 +0900 [COMCTL32] Unchange the property sheet page after WM_INITDIALOG (#1842) In my testing on Win2k3, EN_CHANGE is generated in OnInitDialog, that is correct. The target is property sheet. The property sheet does unchange the page after WM_INITDIALOG generation. CORE-16280 --- dll/win32/comctl32/propsheet.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/comctl32/propsheet.c b/dll/win32/comctl32/propsheet.c index 70316b5a2bf..746d66c8d7c 100644 --- a/dll/win32/comctl32/propsheet.c +++ b/dll/win32/comctl32/propsheet.c @@ -1333,6 +1333,9 @@ static UINT GetTemplateSize(const DLGTEMPLATE* pTemplate) return ret; } +#ifdef __REACTOS__ +static void PROPSHEET_UnChanged(HWND hwndDlg, HWND hwndCleanPage); +#endif /****************************************************************************** * PROPSHEET_CreatePage * @@ -1473,6 +1476,9 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, if (!(psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD)) EnableThemeDialogTexture (hwndPage, ETDT_ENABLETAB); +#ifdef __REACTOS__ + PROPSHEET_UnChanged(hwndParent, hwndPage); +#endif return TRUE; }

5 years, 2 months

[reactos] 01/01: [COMCTL32] remove unused theme_*.c files.

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b5f38295bd1420b55dda… commit 2b5f38295bd1420b55ddaaab57e539c863fca3b0 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Fri Jun 21 11:58:07 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 12:08:04 2019 +0200 [COMCTL32] remove unused theme_*.c files. --- dll/win32/comctl32/theme_button.c | 495 ------------------------------------- dll/win32/comctl32/theme_combo.c | 308 ----------------------- dll/win32/comctl32/theme_dialog.c | 141 ----------- dll/win32/comctl32/theme_edit.c | 130 ---------- dll/win32/comctl32/theme_listbox.c | 112 --------- 5 files changed, 1186 deletions(-) diff --git a/dll/win32/comctl32/theme_button.c b/dll/win32/comctl32/theme_button.c deleted file mode 100644 index 2864b8b6658..00000000000 --- a/dll/win32/comctl32/theme_button.c +++ /dev/null @@ -1,495 +0,0 @@ -/* - * Theming - Button control - * - * Copyright (c) 2008 by Reece H. Dunn - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "comctl32.h" -WINE_DEFAULT_DEBUG_CHANNEL(theme_button); - -#define BUTTON_TYPE 0x0f /* bit mask for the available button types */ - -#if 0 - -/* These are indices into a states array to determine the theme state for a given theme part. */ -typedef enum -{ - STATE_NORMAL, - STATE_HOT, - STATE_PRESSED, - STATE_DISABLED, - STATE_DEFAULTED -} ButtonState; - -#ifdef __REACTOS__ /* r73885 */ -typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag); -#else -typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused); -#endif - -#ifdef __REACTOS__ /* r73885 & r73907 */ -static inline LONG get_button_state( HWND hwnd ) -{ - return _GetButtonData(hwnd)->state; -} - -static inline HFONT get_button_font( HWND hwnd ) -{ - return (HFONT)_GetButtonData(hwnd)->font; -} - -static inline LONG_PTR get_button_image(HWND hwnd) -{ - return _GetButtonData(hwnd)->image; -} - -BOOL BUTTON_DrawIml(HDC hdc, BUTTON_IMAGELIST *pimlData, RECT *prc, BOOL bOnlyCalc, int index); -DWORD BUTTON_SendCustomDraw(HWND hwnd, HDC hDC, DWORD dwDrawStage, RECT* prc); -#endif - -static UINT get_drawtext_flags(DWORD style, DWORD ex_style) -{ - UINT flags = 0; - - if (style & BS_PUSHLIKE) - style &= ~BUTTON_TYPE; - - if (!(style & BS_MULTILINE)) - flags |= DT_SINGLELINE; - else - flags |= DT_WORDBREAK; - - switch (style & BS_CENTER) - { - case BS_LEFT: flags |= DT_LEFT; break; - case BS_RIGHT: flags |= DT_RIGHT; break; - case BS_CENTER: flags |= DT_CENTER; break; - default: - flags |= ((style & BUTTON_TYPE) <= BS_DEFPUSHBUTTON) - ? DT_CENTER : DT_LEFT; - } - - if (ex_style & WS_EX_RIGHT) - flags = DT_RIGHT | (flags & ~(DT_LEFT | DT_CENTER)); - - if ((style & BUTTON_TYPE) != BS_GROUPBOX) - { - switch (style & BS_VCENTER) - { - case BS_TOP: flags |= DT_TOP; break; - case BS_BOTTOM: flags |= DT_BOTTOM; break; - case BS_VCENTER: /* fall through */ - default: flags |= DT_VCENTER; break; - } - } - else - /* GroupBox's text is always single line and is top aligned. */ - flags |= DT_SINGLELINE | DT_TOP; - - return flags; -} - -static inline WCHAR *get_button_text(HWND hwnd) -{ - INT len = 512; - WCHAR *text; - text = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); - if (text) InternalGetWindowText(hwnd, text, len + 1); - return text; -} - -static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) -{ - static const int states[] = { PBS_NORMAL, PBS_HOT, PBS_PRESSED, PBS_DISABLED, PBS_DEFAULTED }; - - RECT bgRect, textRect; - HFONT font = get_button_font(hwnd); - HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; - int state = states[ drawState ]; - WCHAR *text; - PBUTTON_DATA pdata = _GetButtonData(hwnd); - HWND parent; - DWORD cdrf; - - GetClientRect(hwnd, &bgRect); - GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); - - if (prfFlag == 0) - { - if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) - DrawThemeParentBackground(hwnd, hDC, NULL); - } - - parent = GetParent(hwnd); - if (!parent) parent = hwnd; - SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); - - cdrf = BUTTON_SendCustomDraw(hwnd, hDC, CDDS_PREERASE, &bgRect); - if (cdrf == CDRF_SKIPDEFAULT) - goto cleanup; - - DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &bgRect, NULL); - - if (cdrf == CDRF_NOTIFYPOSTERASE) - BUTTON_SendCustomDraw(hwnd, hDC, CDDS_POSTERASE, &bgRect); - - cdrf = BUTTON_SendCustomDraw(hwnd, hDC, CDDS_PREPAINT, &bgRect); - if (cdrf == CDRF_SKIPDEFAULT) - goto cleanup; - - BUTTON_DrawIml(hDC, &pdata->imlData, &textRect, FALSE, drawState); - - text = get_button_text(hwnd); - if (text) - { - DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); - HeapFree(GetProcessHeap(), 0, text); - } - - if (focused) - { - MARGINS margins; - RECT focusRect = bgRect; - - GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); - - focusRect.left += margins.cxLeftWidth; - focusRect.top += margins.cyTopHeight; - focusRect.right -= margins.cxRightWidth; - focusRect.bottom -= margins.cyBottomHeight; - - DrawFocusRect( hDC, &focusRect ); - } - - if (cdrf == CDRF_NOTIFYPOSTPAINT) - BUTTON_SendCustomDraw(hwnd, hDC, CDDS_POSTPAINT, &bgRect); - -cleanup: - if (hPrevFont) SelectObject(hDC, hPrevFont); -} - -static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) -{ - static const int cb_states[3][5] = - { - { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDNORMAL }, - { CBS_CHECKEDNORMAL, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDDISABLED, CBS_CHECKEDNORMAL }, - { CBS_MIXEDNORMAL, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDDISABLED, CBS_MIXEDNORMAL } - }; - - static const int rb_states[2][5] = - { - { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDNORMAL }, - { RBS_CHECKEDNORMAL, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDDISABLED, RBS_CHECKEDNORMAL } - }; - - SIZE sz; - RECT bgRect, textRect; - HFONT font, hPrevFont = NULL; - LRESULT checkState = get_button_state(hwnd) & 3; - DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); - int part = ((dwStyle & BUTTON_TYPE) == BS_RADIOBUTTON) || ((dwStyle & BUTTON_TYPE) == BS_AUTORADIOBUTTON) - ? BP_RADIOBUTTON - : BP_CHECKBOX; - int state = (part == BP_CHECKBOX) - ? cb_states[ checkState ][ drawState ] - : rb_states[ checkState ][ drawState ]; - WCHAR *text; - LOGFONTW lf; - BOOL created_font = FALSE; - HWND parent; - HBRUSH hBrush; - DWORD cdrf; - - HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); - if (SUCCEEDED(hr)) { - font = CreateFontIndirectW(&lf); - if (!font) - TRACE("Failed to create font\n"); - else { - TRACE("font = %s\n", debugstr_w(lf.lfFaceName)); - hPrevFont = SelectObject(hDC, font); - created_font = TRUE; - } - } else { - font = get_button_font(hwnd); - hPrevFont = SelectObject(hDC, font); - } - - if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &sz))) - sz.cx = sz.cy = 13; - - GetClientRect(hwnd, &bgRect); - - if (prfFlag == 0) - { - DrawThemeParentBackground(hwnd, hDC, NULL); - } - - parent = GetParent(hwnd); - if (!parent) parent = hwnd; - hBrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)hwnd); - if (!hBrush) /* did the app forget to call defwindowproc ? */ - hBrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)hwnd ); - FillRect( hDC, &bgRect, hBrush ); - - cdrf = BUTTON_SendCustomDraw(hwnd, hDC, CDDS_PREERASE, &bgRect); - if (cdrf == CDRF_SKIPDEFAULT) - goto cleanup; - - GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); - - if (dtFlags & DT_SINGLELINE) /* Center the checkbox / radio button to the text. */ - bgRect.top = bgRect.top + (textRect.bottom - textRect.top - sz.cy) / 2; - - /* adjust for the check/radio marker */ - bgRect.bottom = bgRect.top + sz.cy; - bgRect.right = bgRect.left + sz.cx; - textRect.left = bgRect.right + 6; - - DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); - - if (cdrf == CDRF_NOTIFYPOSTERASE) - BUTTON_SendCustomDraw(hwnd, hDC, CDDS_POSTERASE, &bgRect); - - cdrf = BUTTON_SendCustomDraw(hwnd, hDC, CDDS_PREPAINT, &bgRect); - if (cdrf == CDRF_SKIPDEFAULT) - goto cleanup; - - text = get_button_text(hwnd); - if (text) - { - DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); - - if (focused) - { - RECT focusRect; - - focusRect = textRect; - - DrawTextW(hDC, text, lstrlenW(text), &focusRect, dtFlags | DT_CALCRECT); - - if (focusRect.right < textRect.right) focusRect.right++; - focusRect.bottom = textRect.bottom; - - DrawFocusRect( hDC, &focusRect ); - } - - HeapFree(GetProcessHeap(), 0, text); - } - - if (cdrf == CDRF_NOTIFYPOSTPAINT) - BUTTON_SendCustomDraw(hwnd, hDC, CDDS_POSTPAINT, &bgRect); - -cleanup: - if (created_font) DeleteObject(font); - if (hPrevFont) SelectObject(hDC, hPrevFont); -} - -#ifdef __REACTOS__ /* r73885 */ -static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) -#else -static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) -#endif -{ - static const int states[] = { GBS_NORMAL, GBS_NORMAL, GBS_NORMAL, GBS_DISABLED, GBS_NORMAL }; - - RECT bgRect, textRect, contentRect; - int state = states[ drawState ]; - WCHAR *text = get_button_text(hwnd); - LOGFONTW lf; - HFONT font, hPrevFont = NULL; - BOOL created_font = FALSE; -#ifdef __REACTOS__ /* r74406 */ - HWND parent; - HBRUSH hBrush; - RECT clientRect; -#endif - - HRESULT hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); - if (SUCCEEDED(hr)) { - font = CreateFontIndirectW(&lf); - if (!font) - TRACE("Failed to create font\n"); - else { - hPrevFont = SelectObject(hDC, font); - created_font = TRUE; - } - } else { -#ifdef __REACTOS__ /* r73885 */ - font = get_button_font(hwnd); -#else - font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); -#endif - hPrevFont = SelectObject(hDC, font); - } - - GetClientRect(hwnd, &bgRect); - textRect = bgRect; - - if (text) - { - SIZE textExtent; - GetTextExtentPoint32W(hDC, text, lstrlenW(text), &textExtent); - bgRect.top += (textExtent.cy / 2); - textRect.left += 10; - textRect.bottom = textRect.top + textExtent.cy; - textRect.right = textRect.left + textExtent.cx + 4; - - ExcludeClipRect(hDC, textRect.left, textRect.top, textRect.right, textRect.bottom); - } - - GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &bgRect, &contentRect); - ExcludeClipRect(hDC, contentRect.left, contentRect.top, contentRect.right, contentRect.bottom); - -#ifdef __REACTOS__ /* r73885 & r74149 */ - if (prfFlag == 0) - { - if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) - DrawThemeParentBackground(hwnd, hDC, NULL); - } -#else - if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) - DrawThemeParentBackground(hwnd, hDC, NULL); -#endif - -#ifdef __REACTOS__ /* r74406 */ - parent = GetParent(hwnd); - if (!parent) parent = hwnd; - hBrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)hwnd); - if (!hBrush) /* did the app forget to call defwindowproc ? */ - hBrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)hwnd ); - GetClientRect(hwnd, &clientRect); - FillRect( hDC, &clientRect, hBrush ); -#endif - - DrawThemeBackground(theme, hDC, BP_GROUPBOX, state, &bgRect, NULL); - - SelectClipRgn(hDC, NULL); - - if (text) - { - InflateRect(&textRect, -2, 0); - DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, lstrlenW(text), 0, 0, &textRect); - HeapFree(GetProcessHeap(), 0, text); - } - - if (created_font) DeleteObject(font); - if (hPrevFont) SelectObject(hDC, hPrevFont); -} - -static const pfThemedPaint btnThemedPaintFunc[BUTTON_TYPE + 1] = -{ - PB_draw, /* BS_PUSHBUTTON */ - PB_draw, /* BS_DEFPUSHBUTTON */ - CB_draw, /* BS_CHECKBOX */ - CB_draw, /* BS_AUTOCHECKBOX */ - CB_draw, /* BS_RADIOBUTTON */ - CB_draw, /* BS_3STATE */ - CB_draw, /* BS_AUTO3STATE */ - GB_draw, /* BS_GROUPBOX */ - NULL, /* BS_USERBUTTON */ - CB_draw, /* BS_AUTORADIOBUTTON */ - NULL, /* Not defined */ - NULL, /* BS_OWNERDRAW */ - NULL, /* Not defined */ - NULL, /* Not defined */ - NULL, /* Not defined */ - NULL, /* Not defined */ -}; - -BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag) -{ - DWORD dwStyle; - DWORD dwStyleEx; - DWORD type; - UINT dtFlags; - int state; - ButtonState drawState; - pfThemedPaint paint; - - /* Don't draw with themes on a button with BS_ICON or BS_BITMAP */ - if (get_button_image(hwnd) != 0) - return FALSE; - - dwStyle = GetWindowLongW(hwnd, GWL_STYLE); - type = dwStyle & BUTTON_TYPE; - - if (type != BS_PUSHBUTTON && type != BS_DEFPUSHBUTTON && (dwStyle & BS_PUSHLIKE)) - type = BS_PUSHBUTTON; - - paint = btnThemedPaintFunc[type]; - if (!paint) - return FALSE; - - dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); - dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); - state = get_button_state(hwnd); - - if(dwStyle & WS_DISABLED) - drawState = STATE_DISABLED; - else if(state & BST_PUSHED) - drawState = STATE_PRESSED; - else if ((dwStyle & BS_PUSHLIKE) && (state & (BST_CHECKED|BST_INDETERMINATE))) - drawState = STATE_PRESSED; - else if(state & BST_HOT) - drawState = STATE_HOT; - else if((state & BST_FOCUS) || (dwStyle & BS_DEFPUSHBUTTON)) - drawState = STATE_DEFAULTED; - else - drawState = STATE_NORMAL; - - if (paint == PB_draw || paint == CB_draw) - { - HDC hdc; - HBITMAP hbmp; - RECT rc; - - GetClientRect(hwnd, &rc); - hdc = CreateCompatibleDC(hParamDC); - hbmp = CreateCompatibleBitmap(hParamDC, rc.right, rc.bottom); - if (hdc && hbmp) - { - SelectObject(hdc, hbmp); - - paint(theme, hwnd, hdc, drawState, dtFlags, state & BST_FOCUS, prfFlag); - - BitBlt(hParamDC, 0, 0, rc.right, rc.bottom, hdc, 0, 0, SRCCOPY); - DeleteObject(hbmp); - DeleteDC(hdc); - return TRUE; - } - else - { - ERR("Failed to create DC and bitmap for double buffering\n"); - if (hbmp) - DeleteObject(hbmp); - if (hdc) - DeleteDC(hdc); - } - } - - paint(theme, hwnd, hParamDC, drawState, dtFlags, state & BST_FOCUS, prfFlag); - return TRUE; -} - -#endif \ No newline at end of file diff --git a/dll/win32/comctl32/theme_combo.c b/dll/win32/comctl32/theme_combo.c deleted file mode 100644 index 70442ba704b..00000000000 --- a/dll/win32/comctl32/theme_combo.c +++ /dev/null @@ -1,308 +0,0 @@ -/* - * Theming - Combo box control - * - * Copyright (c) 2005 by Frank Richter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "comctl32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(themingcombo); - -/* Subclass-private state flags */ -#define STATE_NOREDRAW 1 -#define STATE_HOT 2 - -/* some constants for metrics, same as in user32 */ -#define COMBO_XBORDERSIZE 2 -#define COMBO_YBORDERSIZE 2 -#define COMBO_EDITBUTTONSPACE 0 -#define EDIT_CONTROL_PADDING 1 - -/* paint text of combobox, needed for read-only drop downs. */ -static void paint_text (HWND hwnd, HDC hdc, DWORD dwStyle, const COMBOBOXINFO *cbi) -{ - INT id, size = 0; - LPWSTR pText = NULL; - UINT itemState = ODS_COMBOBOXEDIT; - HFONT font = (HFONT)SendMessageW (hwnd, WM_GETFONT, 0, 0); - HFONT hPrevFont = (font) ? SelectObject(hdc, font) : 0; - RECT rectEdit; - BOOL focused = GetFocus () == hwnd; - BOOL dropped = cbi->stateButton == STATE_SYSTEM_PRESSED; - - TRACE("\n"); - - /* follow Windows combobox that sends a bunch of text - * inquiries to its listbox while processing WM_PAINT. */ - - if( (id = SendMessageW (cbi->hwndList, LB_GETCURSEL, 0, 0) ) != LB_ERR ) - { - size = SendMessageW (cbi->hwndList, LB_GETTEXTLEN, id, 0); - if (size == LB_ERR) - FIXME("LB_ERR probably not handled yet\n"); - if( (pText = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR))) ) - { - /* size from LB_GETTEXTLEN may be too large, from LB_GETTEXT is accurate */ - size = SendMessageW (cbi->hwndList, LB_GETTEXT, id, (LPARAM)pText); - pText[size] = '\0'; /* just in case */ - } else return; - } - else - if( !(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) ) - return; - - /* - * Give ourselves some space. - */ - rectEdit = cbi->rcItem; - InflateRect( &rectEdit, -1, -1 ); - - if(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) - { - DRAWITEMSTRUCT dis; - HRGN clipRegion; - UINT ctlid = (UINT)GetWindowLongPtrW( hwnd, GWLP_ID ); - - /* setup state for DRAWITEM message. Owner will highlight */ - if ( focused && !dropped ) - itemState |= ODS_SELECTED | ODS_FOCUS; - - /* - * Save the current clip region. - * To retrieve the clip region, we need to create one "dummy" - * clip region. - */ - clipRegion = CreateRectRgnIndirect(&rectEdit); - - if (GetClipRgn(hdc, clipRegion)!=1) - { - DeleteObject(clipRegion); - clipRegion=NULL; - } - - if (!IsWindowEnabled(hwnd)) itemState |= ODS_DISABLED; - - dis.CtlType = ODT_COMBOBOX; - dis.CtlID = ctlid; - dis.hwndItem = hwnd; - dis.itemAction = ODA_DRAWENTIRE; - dis.itemID = id; - dis.itemState = itemState; - dis.hDC = hdc; - dis.rcItem = rectEdit; - dis.itemData = SendMessageW(cbi->hwndList, LB_GETITEMDATA, id, 0); - - /* - * Clip the DC and have the parent draw the item. - */ - IntersectClipRect(hdc, - rectEdit.left, rectEdit.top, - rectEdit.right, rectEdit.bottom); - - SendMessageW(GetParent (hwnd), WM_DRAWITEM, ctlid, (LPARAM)&dis ); - - /* - * Reset the clipping region. - */ - SelectClipRgn(hdc, clipRegion); - } - else - { - static const WCHAR empty_stringW[] = { 0 }; - - if ( focused && !dropped ) { - - /* highlight */ - FillRect( hdc, &rectEdit, GetSysColorBrush(COLOR_HIGHLIGHT) ); - SetBkColor( hdc, GetSysColor( COLOR_HIGHLIGHT ) ); - SetTextColor( hdc, GetSysColor( COLOR_HIGHLIGHTTEXT ) ); - } - - ExtTextOutW( hdc, - rectEdit.left + 1, - rectEdit.top + 1, - ETO_OPAQUE | ETO_CLIPPED, - &rectEdit, - pText ? pText : empty_stringW , size, NULL ); - - if ( focused && !dropped ) - DrawFocusRect( hdc, &rectEdit ); - } - - if( hPrevFont ) - SelectObject(hdc, hPrevFont ); - - HeapFree( GetProcessHeap(), 0, pText ); -} - -/* paint the combobox */ -static LRESULT paint (HTHEME theme, HWND hwnd, HDC hParamDC, ULONG state) -{ - PAINTSTRUCT ps; - HDC hDC; - COMBOBOXINFO cbi; - DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); - - hDC = (hParamDC) ? hParamDC - : BeginPaint( hwnd, &ps); - - TRACE("hdc=%p\n", hDC); - - if( hDC && !(state & STATE_NOREDRAW) ) - { - RECT frameRect; - int buttonState; - - cbi.cbSize = sizeof (cbi); - SendMessageW (hwnd, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbi); - - /* paint border */ - if ((dwStyle & CBS_DROPDOWNLIST) != CBS_SIMPLE) - GetClientRect (hwnd, &frameRect); - else - { - frameRect = cbi.rcItem; - InflateRect(&frameRect, - EDIT_CONTROL_PADDING + COMBO_XBORDERSIZE, - EDIT_CONTROL_PADDING + COMBO_YBORDERSIZE); - } - - DrawThemeBackground (theme, hDC, 0, - IsWindowEnabled (hwnd) ? CBXS_NORMAL : CBXS_DISABLED, &frameRect, NULL); - - /* paint button */ - if (cbi.stateButton != STATE_SYSTEM_INVISIBLE) - { - if (!IsWindowEnabled (hwnd)) - buttonState = CBXS_DISABLED; - else if (cbi.stateButton == STATE_SYSTEM_PRESSED) - buttonState = CBXS_PRESSED; - else if (state & STATE_HOT) - buttonState = CBXS_HOT; - else - buttonState = CBXS_NORMAL; - DrawThemeBackground (theme, hDC, CP_DROPDOWNBUTTON, buttonState, - &cbi.rcButton, NULL); - } - - /* paint text, if we need to */ - if ((dwStyle & CBS_DROPDOWNLIST) == CBS_DROPDOWNLIST) - paint_text (hwnd, hDC, dwStyle, &cbi); - } - - if( !hParamDC ) - EndPaint(hwnd, &ps); - - return 0; -} - - -/********************************************************************** - * The combo control subclass window proc. - */ -LRESULT CALLBACK THEMING_ComboSubclassProc (HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, - ULONG_PTR dwRefData) -{ - const WCHAR* themeClass = WC_COMBOBOXW; - HTHEME theme; - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - OpenThemeData( hwnd, themeClass ); - return result; - - case WM_DESTROY: - theme = GetWindowTheme( hwnd ); - CloseThemeData ( theme ); - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - - case WM_THEMECHANGED: - theme = GetWindowTheme( hwnd ); - CloseThemeData ( theme ); - OpenThemeData( hwnd, themeClass ); - break; - - case WM_SYSCOLORCHANGE: - theme = GetWindowTheme( hwnd ); - if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, - * which will do the repaint. */ - break; - - case WM_PAINT: - theme = GetWindowTheme( hwnd ); - if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - return paint (theme, hwnd, (HDC)wParam, dwRefData); - - case WM_SETREDRAW: - /* Since there doesn't seem to be WM_GETREDRAW, do redraw tracking in - * the subclass as well. */ - if( wParam ) - dwRefData &= ~STATE_NOREDRAW; - else - dwRefData |= STATE_NOREDRAW; - THEMING_SetSubclassData (hwnd, dwRefData); - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - - case WM_MOUSEMOVE: - { - /* Dropdown button hot-tracking */ - COMBOBOXINFO cbi; - POINT pt; - - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - cbi.cbSize = sizeof (cbi); - SendMessageW (hwnd, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbi); - - if (cbi.stateButton != STATE_SYSTEM_INVISIBLE) - { - if (PtInRect (&cbi.rcButton, pt)) - { - if (!(dwRefData & STATE_HOT)) - { - dwRefData |= STATE_HOT; - THEMING_SetSubclassData (hwnd, dwRefData); - RedrawWindow (hwnd, &cbi.rcButton, 0, - RDW_INVALIDATE | RDW_UPDATENOW); - } - } - else - { - if (dwRefData & STATE_HOT) - { - dwRefData &= ~STATE_HOT; - THEMING_SetSubclassData (hwnd, dwRefData); - RedrawWindow (hwnd, &cbi.rcButton, 0, - RDW_INVALIDATE | RDW_UPDATENOW); - } - } - } - } - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - - default: - /* Call old proc */ - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - } - return 0; -} diff --git a/dll/win32/comctl32/theme_dialog.c b/dll/win32/comctl32/theme_dialog.c deleted file mode 100644 index 656e52dbf57..00000000000 --- a/dll/win32/comctl32/theme_dialog.c +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Theming - Dialogs - * - * Copyright (c) 2005 by Frank Richter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "comctl32.h" -#include "wine/debug.h" - -/********************************************************************** - * The dialog subclass window proc. - */ -LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, - WPARAM wParam, LPARAM lParam, - ULONG_PTR dwRefData) -{ - HTHEME theme = GetWindowTheme ( hWnd ); - static const WCHAR themeClass[] = { 'W','i','n','d','o','w',0 }; - BOOL themingActive = IsThemeDialogTextureEnabled (hWnd); - BOOL doTheming = themingActive && (theme != NULL); - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - theme = OpenThemeData( hWnd, themeClass ); - return result; - - case WM_DESTROY: - CloseThemeData ( theme ); - SetWindowTheme( hWnd, NULL, NULL ); - OpenThemeData( hWnd, NULL ); - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - - case WM_THEMECHANGED: - CloseThemeData ( theme ); - OpenThemeData( hWnd, themeClass ); - InvalidateRect( hWnd, NULL, TRUE ); - return 0; - - case WM_SYSCOLORCHANGE: - if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, - * which will do the repaint. */ - break; - - case WM_ERASEBKGND: - if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - { - RECT rc; - WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); - if (!CallWindowProcW(dlgp, hWnd, msg, wParam, lParam)) - { - /* Draw background*/ - GetClientRect (hWnd, &rc); - if (IsThemePartDefined (theme, WP_DIALOG, 0)) - /* Although there is a theme for the WINDOW class/DIALOG part, - * but I[res] haven't seen Windows using it yet... Even when - * dialog theming is activated, the good ol' BTNFACE - * background seems to be used. */ -#if 0 - DrawThemeBackground (theme, (HDC)wParam, WP_DIALOG, 0, &rc, - NULL); -#endif - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - else - /* We might have gotten a TAB theme class, so check if we can - * draw as a tab page. */ - if (IsThemePartDefined (theme, TABP_BODY, 0)) - DrawThemeBackground (theme, (HDC)wParam, TABP_BODY, 0, &rc, - NULL); - else - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - } - return 1; - } - - case WM_CTLCOLORSTATIC: - if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - { - WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); - LRESULT result = CallWindowProcW(dlgp, hWnd, msg, wParam, lParam); - if (!result) - { - /* Override defaults with more suitable values when themed */ - HDC controlDC = (HDC)wParam; - HWND controlWnd = (HWND)lParam; - WCHAR controlClass[32]; - RECT rc; - - GetClassNameW (controlWnd, controlClass, ARRAY_SIZE(controlClass)); - if (lstrcmpiW (controlClass, WC_STATICW) == 0) - { - /* Static control - draw parent background and set text to - * transparent, so it looks right on tab pages. */ - GetClientRect (controlWnd, &rc); - DrawThemeParentBackground (controlWnd, controlDC, &rc); - SetBkMode (controlDC, TRANSPARENT); - - /* Return NULL brush since we painted the BG already */ - return (LRESULT)GetStockObject (NULL_BRUSH); - } - else - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - - } - return result; - } - - default: - /* Call old proc */ - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - } - return 0; -} diff --git a/dll/win32/comctl32/theme_edit.c b/dll/win32/comctl32/theme_edit.c deleted file mode 100644 index a13cff4c8d3..00000000000 --- a/dll/win32/comctl32/theme_edit.c +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Theming - Edit control - * - * Copyright (c) 2005 by Frank Richter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "comctl32.h" - -/* Draw themed border */ -static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) -{ - HRGN cliprgn = region; - DWORD exStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); - if (exStyle & WS_EX_CLIENTEDGE) - { - HDC dc; - RECT r; - int cxEdge = GetSystemMetrics (SM_CXEDGE), - cyEdge = GetSystemMetrics (SM_CYEDGE); - int part = EP_EDITTEXT; - int state = ETS_NORMAL; - DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); - - if (!IsWindowEnabled (hwnd)) - state = ETS_DISABLED; - else if (dwStyle & ES_READONLY) - state = ETS_READONLY; - else if (GetFocus() == hwnd) - state = ETS_FOCUSED; - - GetWindowRect(hwnd, &r); - - /* New clipping region passed to default proc to exclude border */ - cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, - r.right - cxEdge, r.bottom - cyEdge); - if (region != (HRGN)1) - CombineRgn (cliprgn, cliprgn, region, RGN_AND); - OffsetRect(&r, -r.left, -r.top); - -#ifdef __REACTOS__ /* r73789 */ - dc = GetWindowDC(hwnd); - /* Exclude client part */ - ExcludeClipRect(dc, r.left + cxEdge, r.top + cyEdge, - r.right - cxEdge, r.bottom -cyEdge); -#else - dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); -#endif - - if (IsThemeBackgroundPartiallyTransparent (theme, part, state)) - DrawThemeParentBackground(hwnd, dc, &r); - DrawThemeBackground (theme, dc, part, state, &r, 0); - ReleaseDC(hwnd, dc); - } - - /* Call default proc to get the scrollbars etc. also painted */ - DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); -} - -/********************************************************************** - * The edit control subclass window proc. - */ -LRESULT CALLBACK THEMING_EditSubclassProc (HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, - ULONG_PTR dwRefData) -{ - const WCHAR* themeClass = WC_EDITW; - HTHEME theme; - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - OpenThemeData( hwnd, themeClass ); - return result; - - case WM_DESTROY: - theme = GetWindowTheme( hwnd ); - CloseThemeData ( theme ); - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - - case WM_THEMECHANGED: - theme = GetWindowTheme( hwnd ); - CloseThemeData ( theme ); - OpenThemeData( hwnd, themeClass ); - break; - - case WM_SYSCOLORCHANGE: - theme = GetWindowTheme( hwnd ); - if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, - * which will do the repaint. */ - break; - - case WM_NCPAINT: - theme = GetWindowTheme( hwnd ); - if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - nc_paint (theme, hwnd, (HRGN)wParam); - break; - - case WM_ENABLE: - case WM_KILLFOCUS: - case WM_SETFOCUS: - theme = GetWindowTheme( hwnd ); - if (theme) RedrawWindow (hwnd, NULL, NULL, - RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - - default: - /* Call old proc */ - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - } - return 0; -} diff --git a/dll/win32/comctl32/theme_listbox.c b/dll/win32/comctl32/theme_listbox.c deleted file mode 100644 index 773701663cf..00000000000 --- a/dll/win32/comctl32/theme_listbox.c +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Theming - List box control - * - * Copyright (c) 2005 by Frank Richter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "comctl32.h" - -/* Draw themed border */ -static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) -{ - HRGN cliprgn = region; - DWORD exStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); - if (exStyle & WS_EX_CLIENTEDGE) - { - HDC dc; - RECT r; - int cxEdge = GetSystemMetrics (SM_CXEDGE), - cyEdge = GetSystemMetrics (SM_CYEDGE); - - GetWindowRect(hwnd, &r); - - /* New clipping region passed to default proc to exclude border */ - cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, - r.right - cxEdge, r.bottom - cyEdge); - if (region != (HRGN)1) - CombineRgn (cliprgn, cliprgn, region, RGN_AND); - OffsetRect(&r, -r.left, -r.top); - -#ifdef __REACTOS__ /* r73789 */ - dc = GetWindowDC(hwnd); - /* Exclude client part */ - ExcludeClipRect(dc, r.left + cxEdge, r.top + cyEdge, - r.right - cxEdge, r.bottom -cyEdge); -#else - dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); -#endif - - if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) - DrawThemeParentBackground(hwnd, dc, &r); - DrawThemeBackground (theme, dc, 0, 0, &r, 0); - ReleaseDC(hwnd, dc); - } - - /* Call default proc to get the scrollbars etc. painted */ - DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); -} - -/********************************************************************** - * The list control subclass window proc. - */ -LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, - ULONG_PTR dwRefData) -{ - const WCHAR* themeClass = WC_LISTBOXW; - HTHEME theme; - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - OpenThemeData( hwnd, themeClass ); - return result; - - case WM_DESTROY: - theme = GetWindowTheme( hwnd ); - CloseThemeData ( theme ); - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - - case WM_THEMECHANGED: - theme = GetWindowTheme( hwnd ); - CloseThemeData ( theme ); - OpenThemeData( hwnd, themeClass ); - break; - - case WM_SYSCOLORCHANGE: - theme = GetWindowTheme( hwnd ); - if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, - * which will do the repaint. */ - break; - - case WM_NCPAINT: - theme = GetWindowTheme( hwnd ); - if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - nc_paint (theme, hwnd, (HRGN)wParam); - break; - - default: - /* Call old proc */ - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - } - return 0; -}

5 years, 2 months

[reactos] 01/01: [RSYM] When determining the current function, always prefer COFF symbols if they're closer.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e51f4db7d0726fdd1ebb2… commit e51f4db7d0726fdd1ebb29f31b246edd611e9cfb Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jul 20 22:20:33 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Aug 17 10:22:36 2019 +0200 [RSYM] When determining the current function, always prefer COFF symbols if they're closer. --- sdk/tools/rsym/rsym.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/sdk/tools/rsym/rsym.c b/sdk/tools/rsym/rsym.c index 58f5960ed38..9435c21a464 100644 --- a/sdk/tools/rsym/rsym.c +++ b/sdk/tools/rsym/rsym.c @@ -720,7 +720,8 @@ MergeStabsAndCoffs(ULONG *MergedSymbolCount, PROSSYM_ENTRY *MergedSymbols, ULONG StabIndex, j; ULONG CoffIndex; ULONG_PTR StabFunctionStartAddress; - ULONG StabFunctionStringOffset, NewStabFunctionStringOffset; + ULONG StabFunctionStringOffset, NewStabFunctionStringOffset, CoffFunctionStringOffset; + PROSSYM_ENTRY CoffFunctionSymbol; *MergedSymbolCount = 0; if (StabSymbolsCount == 0) @@ -737,6 +738,8 @@ MergeStabsAndCoffs(ULONG *MergedSymbolCount, PROSSYM_ENTRY *MergedSymbols, StabFunctionStartAddress = 0; StabFunctionStringOffset = 0; + CoffFunctionStringOffset = 0; + CoffFunctionSymbol = NULL; CoffIndex = 0; for (StabIndex = 0; StabIndex < StabSymbolsCount; StabIndex++) { @@ -761,18 +764,22 @@ MergeStabsAndCoffs(ULONG *MergedSymbolCount, PROSSYM_ENTRY *MergedSymbols, StabIndex = j - 1; while (CoffIndex < CoffSymbolsCount && - CoffSymbols[CoffIndex + 1].Address <= (*MergedSymbols)[*MergedSymbolCount].Address) + CoffSymbols[CoffIndex].Address <= (*MergedSymbols)[*MergedSymbolCount].Address) { + if (CoffSymbols[CoffIndex].FunctionOffset != 0) + { + CoffFunctionSymbol = &CoffSymbols[CoffIndex]; + CoffFunctionStringOffset = CoffFunctionSymbol->FunctionOffset; + } CoffIndex++; } NewStabFunctionStringOffset = (*MergedSymbols)[*MergedSymbolCount].FunctionOffset; - if (CoffSymbolsCount > 0 && - CoffSymbols[CoffIndex].Address < (*MergedSymbols)[*MergedSymbolCount].Address && - StabFunctionStartAddress < CoffSymbols[CoffIndex].Address && - CoffSymbols[CoffIndex].FunctionOffset != 0) + if (CoffFunctionSymbol && + CoffFunctionSymbol->Address <= (*MergedSymbols)[*MergedSymbolCount].Address && + StabFunctionStartAddress < CoffFunctionSymbol->Address) { - (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = CoffSymbols[CoffIndex].FunctionOffset; - CoffSymbols[CoffIndex].FileOffset = CoffSymbols[CoffIndex].FunctionOffset = 0; + (*MergedSymbols)[*MergedSymbolCount].FunctionOffset = CoffFunctionStringOffset; + CoffFunctionSymbol->FunctionOffset = 0; } if (StabFunctionStringOffset != NewStabFunctionStringOffset) {

5 years, 2 months

[reactos] 01/01: [FREELDR] Add missing VideoSetTextCursorPosition handler for Xbox

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87845a1cc25d07abcde1d… commit 87845a1cc25d07abcde1d25e62cfea78aeadd571 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Aug 17 02:36:17 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 01:47:34 2019 +0200 [FREELDR] Add missing VideoSetTextCursorPosition handler for Xbox This fixes null pointer call bug, which was revealed in 85d44fc. Spotted by Mark Jansen. CORE-16216 Co-authored-by: Mark Jansen <mark.jansen(a)reactos.org> --- boot/freeldr/freeldr/arch/i386/machxbox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/freeldr/freeldr/arch/i386/machxbox.c b/boot/freeldr/freeldr/arch/i386/machxbox.c index b3cd4f5616e..3fb951de1a6 100644 --- a/boot/freeldr/freeldr/arch/i386/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/machxbox.c @@ -272,6 +272,7 @@ XboxMachInit(const char *CmdLine) MachVtbl.VideoGetDisplaySize = XboxVideoGetDisplaySize; MachVtbl.VideoGetBufferSize = XboxVideoGetBufferSize; MachVtbl.VideoGetFontsFromFirmware = XboxVideoGetFontsFromFirmware; + MachVtbl.VideoSetTextCursorPosition = XboxVideoSetTextCursorPosition; MachVtbl.VideoHideShowTextCursor = XboxVideoHideShowTextCursor; MachVtbl.VideoPutChar = XboxVideoPutChar; MachVtbl.VideoCopyOffScreenBufferToVRAM = XboxVideoCopyOffScreenBufferToVRAM;

5 years, 2 months

[reactos] 01/01: [TRANSLATION][NEWDEV] Complete Hebrew Translations for New Device Prompt

by Shy Zedaka

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fca051a1d14eca42db035… commit fca051a1d14eca42db03593300fba5600dddf68e Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Fri Aug 16 16:16:41 2019 +0300 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Fri Aug 16 20:04:27 2019 +0200 [TRANSLATION][NEWDEV] Complete Hebrew Translations for New Device Prompt --- dll/win32/newdev/lang/he-IL.rc | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dll/win32/newdev/lang/he-IL.rc b/dll/win32/newdev/lang/he-IL.rc index aac47bef394..c57c893b782 100644 --- a/dll/win32/newdev/lang/he-IL.rc +++ b/dll/win32/newdev/lang/he-IL.rc @@ -6,12 +6,12 @@ CAPTION "הגדרת התקן" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ברוכים הבאים", IDC_WELCOMETITLE, 120, 8, 195, 16 - LTEXT "This wizard installs a new device driver for:", IDC_STATIC, 120, 21, 195, 16 - LTEXT "לחץ הבא כדי להמשיך.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 36, 147, 17 - LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!", IDC_STATIC, 120, 59, 195, 16 - CONTROL "התקן תוכנת מנהל התקן באופן אוטומטי", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 - CONTROL "התקן תוכנת מהל התקן ממיקום מסוים", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 + LTEXT "אשף זה יתקין מנהל התקן חדש עבור:", IDC_STATIC, 120, 21, 195, 16 + LTEXT "לחץ על הבא כדי להמשיך.", IDC_STATIC, 120, 169, 195, 16 + LTEXT "התקן לא מוכר", IDC_DEVICE, 148, 36, 147, 17 + LTEXT "אזהרה! התקנת התקן מותאם אישית עלולה לגרום למחשבך להפסיק להגיב או לגרום שלא יהיה ניתן להפעילו!", IDC_STATIC, 120, 59, 195, 16 + CONTROL "התקן מנהל התקן באופן אוטומטי", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 + CONTROL "התקן מנהל התקן ממיקום מסוים", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 END IDD_NODRIVER DIALOGEX 0, 0, 317, 193 @@ -19,10 +19,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "הגדרת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ההגדרה נכשלה", IDC_FINISHTITLE, 120, 8, 195, 16 - LTEXT "The device could not be installed because the driver could not be found.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "Click on Back if you have a driver disk or know the path to the driver.", IDC_STATIC, 120, 98, 195, 16 - CONTROL "Do not show this dialog anymore", IDC_DONOTSHOWDLG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 170, 195, 12 + LTEXT "ההגדרה כשלה", IDC_FINISHTITLE, 120, 8, 195, 16 + LTEXT "ההתקן לא הותקן מכיוון שלא היה אפשר למצוא את מנהל ההתקן.", IDC_STATIC, 120, 32, 195, 16 + LTEXT "לחץ על 'הקודם' אם יש ברשותך דיסק עם מנהל ההתקן או אם אתה יודע את המיקום של מנהל ההתקן על מחשבך או במקום אחר.", IDC_STATIC, 120, 98, 195, 25 + CONTROL "אל תציג שוב בקשה להתקנת מנהל התקן זה.", IDC_DONOTSHOWDLG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 170, 195, 12 END IDD_INSTALLFAILED DIALOGEX 0, 0, 317, 193 @@ -30,9 +30,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "הגדרת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ההגדרה נכשלה", IDC_FINISHTITLE, 120, 8, 195, 16 - LTEXT "The device could not be installed because an unexpected error happened.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 + LTEXT "ההגדרה כשלה", IDC_FINISHTITLE, 120, 8, 195, 16 + LTEXT "התקן זה כשל בהתקנה בגלל שגיאה לא צפויה.", IDC_STATIC, 120, 32, 195, 16 + LTEXT "התקן לא מוכר", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -53,7 +53,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "הגדרת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 51, 20, 169, 16 + LTEXT "התקן לא מוכר", IDC_DEVICE, 51, 20, 169, 16 END IDD_INSTALLDRV DIALOGEX 0, 0, 317, 143 @@ -61,7 +61,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "הגדרת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 51, 20, 169, 16 + LTEXT "התקן לא מוכר", IDC_DEVICE, 51, 20, 169, 16 END IDD_NEEDREBOOT DIALOGEX 0, 0, 317, 193 @@ -70,9 +70,9 @@ CAPTION "הגדרת התקן" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ההגדרה הושלמה", IDC_FINISHTITLE, 120, 8, 195, 12 - LTEXT "You need to reboot to finish the install of:", IDC_STATIC, 120, 32, 195, 16 + LTEXT "נא הפעל מחדש את המחשב בשביל לסיים להתקין את:", IDC_STATIC, 120, 32, 195, 16 LTEXT "לחץ סיום כדי לסגור את האשף.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 + LTEXT "התקן לא מוכר", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -81,16 +81,16 @@ CAPTION "הגדרת התקן" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ההגדרה הושלמה", IDC_FINISHTITLE, 120, 8, 195, 12 - LTEXT "The wizard has finished installing the driver for:", IDC_STATIC, 120, 32, 195, 16 + LTEXT "האשף סיים להתקין את מנהל ההתקן עבור:", IDC_STATIC, 120, 32, 195, 16 LTEXT "לחץ סיום כדי לסגור את האשף.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 + LTEXT "התקן לא מוכר", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New Hardware Wizard" - IDS_UPDATEWIZARDTITLE "Update Driver Wizard" - IDS_CHSOURCE_TITLE "Choose search and install options" - IDS_SEARCHDRV_TITLE "Searching..." - IDS_INSTALLDRV_TITLE "Installing..." + IDS_INSTALLWIZARDTITLE "אשף הוספת התקן" + IDS_UPDATEWIZARDTITLE "אשף עדכון מנהל התקן" + IDS_CHSOURCE_TITLE "בחר בין האפשרויות של חיפוש והתקנה" + IDS_SEARCHDRV_TITLE "מחפש..." + IDS_INSTALLDRV_TITLE "מתקין..." END

5 years, 2 months

[reactos] 01/01: [FREELDR] Add Serial ports detection in DetectIsaBios() (#1829)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7497b81e5bd8ca2725ed2… commit 7497b81e5bd8ca2725ed274b20422414e549f9ee Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Aug 16 21:00:25 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 16 20:00:25 2019 +0200 [FREELDR] Add Serial ports detection in DetectIsaBios() (#1829) CORE-16216 --- boot/freeldr/freeldr/arch/i386/machpc.c | 40 +++++++++++-------- boot/freeldr/freeldr/arch/i386/machxbox.c | 48 +++++++++++++++++++++++ boot/freeldr/freeldr/include/arch/i386/machxbox.h | 15 +++++++ boot/freeldr/freeldr/include/arch/pc/hardware.h | 4 ++ 4 files changed, 91 insertions(+), 16 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index ede5441dfae..1929be4a93e 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -636,17 +636,32 @@ DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, } } -static +ULONG +PcGetSerialPort(ULONG Index, PULONG Irq) +{ + static const ULONG PcIrq[MAX_COM_PORTS] = {4, 3, 4, 3}; + PUSHORT BasePtr; + + /* + * The BIOS data area 0x400 holds the address of the first valid COM port. + * Each COM port address is stored in a 2-byte field. + * Infos at: http://www.bioscentral.com/misc/bda.htm + */ + BasePtr = (PUSHORT)0x400; + *Irq = PcIrq[Index]; + + return (ULONG) *(BasePtr + Index); +} + VOID -DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey) +DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey, GET_SERIAL_PORT MachGetSerialPort, ULONG Count) { PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_SERIAL_DEVICE_DATA SerialDeviceData; - ULONG Irq[MAX_COM_PORTS] = {4, 3, 4, 3}; + ULONG Irq; ULONG Base; CHAR Buffer[80]; - PUSHORT BasePtr; ULONG ControllerNumber = 0; PCONFIGURATION_COMPONENT_DATA ControllerKey; ULONG i; @@ -654,16 +669,9 @@ DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey) TRACE("DetectSerialPorts()\n"); - /* - * The BIOS data area 0x400 holds the address of the first valid COM port. - * Each COM port address is stored in a 2-byte field. - * Infos at: http://www.bioscentral.com/misc/bda.htm - */ - BasePtr = (PUSHORT)0x400; - - for (i = 0; i < MAX_COM_PORTS; i++, BasePtr++) + for (i = 0; i < Count; i++) { - Base = (ULONG) * BasePtr; + Base = MachGetSerialPort(i, &Irq); if ((Base == 0) || !CpDoesPortExist(UlongToPtr(Base))) continue; @@ -703,8 +711,8 @@ DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey) PartialDescriptor->Type = CmResourceTypeInterrupt; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; - PartialDescriptor->u.Interrupt.Level = Irq[i]; - PartialDescriptor->u.Interrupt.Vector = Irq[i]; + PartialDescriptor->u.Interrupt.Level = Irq; + PartialDescriptor->u.Interrupt.Vector = Irq; PartialDescriptor->u.Interrupt.Affinity = 0xFFFFFFFF; /* Set serial data (device specific) */ @@ -1319,7 +1327,7 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) /* Detect ISA/BIOS devices */ DetectBiosDisks(SystemKey, BusKey); - DetectSerialPorts(BusKey); + DetectSerialPorts(BusKey, PcGetSerialPort, MAX_COM_PORTS); DetectParallelPorts(BusKey); DetectKeyboardController(BusKey); DetectPS2Mouse(BusKey); diff --git a/boot/freeldr/freeldr/arch/i386/machxbox.c b/boot/freeldr/freeldr/arch/i386/machxbox.c index 4b96228f1cf..b3cd4f5616e 100644 --- a/boot/freeldr/freeldr/arch/i386/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/machxbox.c @@ -35,6 +35,53 @@ XboxFindPciBios(PPCI_REGISTRY_INFO BusData) return TRUE; } +extern +VOID +DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, PUCHAR Base); + +static +ULONG +XboxGetSerialPort(ULONG Index, PULONG Irq) +{ + /* + * Xbox may have maximum two Serial COM ports + * if the Super I/O chip is connected via LPC + */ + static const UCHAR Device[MAX_XBOX_COM_PORTS] = {LPC_DEVICE_SERIAL_PORT_1, LPC_DEVICE_SERIAL_PORT_2}; + ULONG ComBase = 0; + + // Enter Configuration + WRITE_PORT_UCHAR(LPC_IO_BASE, LPC_ENTER_CONFIG_KEY); + + // Select serial device + WRITE_PORT_UCHAR(LPC_IO_BASE, LPC_CONFIG_DEVICE_NUMBER); + WRITE_PORT_UCHAR(LPC_IO_BASE + 1, Device[Index]); + + // Check if selected device is active + WRITE_PORT_UCHAR(LPC_IO_BASE, LPC_CONFIG_DEVICE_ACTIVATE); + if (READ_PORT_UCHAR(LPC_IO_BASE + 1) == 1) + { + // Read LSB + WRITE_PORT_UCHAR(LPC_IO_BASE, LPC_CONFIG_DEVICE_BASE_ADDRESS_LOW); + ComBase = READ_PORT_UCHAR(LPC_IO_BASE + 1); + // Read MSB + WRITE_PORT_UCHAR(LPC_IO_BASE, LPC_CONFIG_DEVICE_BASE_ADDRESS_HIGH); + ComBase |= (READ_PORT_UCHAR(LPC_IO_BASE + 1) << 8); + // Read IRQ + WRITE_PORT_UCHAR(LPC_IO_BASE, LPC_CONFIG_DEVICE_INTERRUPT); + *Irq = READ_PORT_UCHAR(LPC_IO_BASE + 1); + } + + // Exit Configuration + WRITE_PORT_UCHAR(LPC_IO_BASE, LPC_EXIT_CONFIG_KEY); + + return ComBase; +} + +extern +VOID +DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey, GET_SERIAL_PORT MachGetSerialPort, ULONG Count); + VOID XboxGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize) { @@ -155,6 +202,7 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) /* Detect ISA/BIOS devices */ DetectBiosDisks(SystemKey, BusKey); + DetectSerialPorts(BusKey, XboxGetSerialPort, MAX_XBOX_COM_PORTS); /* FIXME: Detect more ISA devices */ } diff --git a/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/boot/freeldr/freeldr/include/arch/i386/machxbox.h index d1c42a40bae..f481bbde8f9 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -22,6 +22,21 @@ #include "mm.h" #endif +#define MAX_XBOX_COM_PORTS 2 + +#define LPC_IO_BASE 0x2E +#define LPC_ENTER_CONFIG_KEY 0x55 +#define LPC_EXIT_CONFIG_KEY 0xAA + +#define LPC_DEVICE_SERIAL_PORT_1 0x4 +#define LPC_DEVICE_SERIAL_PORT_2 0x5 + +#define LPC_CONFIG_DEVICE_NUMBER 0x07 +#define LPC_CONFIG_DEVICE_ACTIVATE 0x30 +#define LPC_CONFIG_DEVICE_BASE_ADDRESS_HIGH 0x60 +#define LPC_CONFIG_DEVICE_BASE_ADDRESS_LOW 0x61 +#define LPC_CONFIG_DEVICE_INTERRUPT 0x70 + extern UCHAR XboxFont8x16[256 * 16]; VOID XboxMachInit(const char *CmdLine); diff --git a/boot/freeldr/freeldr/include/arch/pc/hardware.h b/boot/freeldr/freeldr/include/arch/pc/hardware.h index bc6aad11971..56e6028ed06 100644 --- a/boot/freeldr/freeldr/include/arch/pc/hardware.h +++ b/boot/freeldr/freeldr/include/arch/pc/hardware.h @@ -44,6 +44,10 @@ BOOLEAN extern FIND_PCI_BIOS FindPciBios; +typedef +ULONG +(*GET_SERIAL_PORT)(ULONG Index, PULONG Irq); + VOID DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, PCONFIGURATION_COMPONENT_DATA BusKey);

5 years, 2 months

[reactos] 01/01: [SDK] As sole author of the file, relicense it as LPGL

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2faee11672366e9b028a3… commit 2faee11672366e9b028a382e24cc55fa267b7356 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 16 19:54:44 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Aug 16 19:54:44 2019 +0200 [SDK] As sole author of the file, relicense it as LPGL It allows third party developers (such as Mark Harmstone :-)) to use it --- sdk/lib/drivers/ntoskrnl_vista/fsrtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c b/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c index 8b714af57aa..8072ee00135 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c +++ b/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - Vista+ APIs - * LICENSE: GPL v2 - See COPYING in the top level directory + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * FILE: lib/drivers/ntoskrnl_vista/fsrtl.c * PURPOSE: FsRtl functions of Vista+ * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org>

5 years, 2 months

[reactos] 01/01: [USBOHCI_NEW] Fix unused variable

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90b86467907e3f899abe5… commit 90b86467907e3f899abe595f5263158698b7b47c Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Fri Aug 16 20:37:11 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Fri Aug 16 20:37:11 2019 +0300 [USBOHCI_NEW] Fix unused variable --- drivers/usb/usbohci_new/usbohci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci_new/usbohci.c index 39986e47070..e7aa0bcb5d8 100644 --- a/drivers/usb/usbohci_new/usbohci.c +++ b/drivers/usb/usbohci_new/usbohci.c @@ -1666,7 +1666,7 @@ OHCI_ProcessDoneIsoTD(IN POHCI_EXTENSION OhciExtension, * @param[in] ohciExtension The ohci extension * @param[in] ohciEndpoint The ohci endpoint * @param[in] ohciTransfer The ohci transfer - * @param[out] CompletedLength + * @param[out] CompletedLength */ VOID NTAPI @@ -1679,7 +1679,6 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, POHCI_ENDPOINT OhciEndpoint = ohciEndpoint; POHCI_TRANSFER OhciTransfer = ohciTransfer; POHCI_HCD_ED ED = OhciEndpoint->HcdED; - ULONG_PTR NextTdPA; POHCI_HCD_TD TD, NextTD, LastTD; ULONG ix; BOOLEAN IsIsoEndpoint;

5 years, 2 months

[reactos] 04/05: [DESKMON] Update Portuguese Translation

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23cac567400aa54d39019… commit 23cac567400aa54d39019bc0a17b45e35bcd1859 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue Aug 6 00:20:18 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 19:32:23 2019 +0200 [DESKMON] Update Portuguese Translation --- dll/shellext/deskmon/lang/pt-PT.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/deskmon/lang/pt-PT.rc b/dll/shellext/deskmon/lang/pt-PT.rc index 6e046a926df..9386f13bdd8 100644 --- a/dll/shellext/deskmon/lang/pt-PT.rc +++ b/dll/shellext/deskmon/lang/pt-PT.rc @@ -10,8 +10,8 @@ BEGIN LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Propriedades", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED - GROUPBOX "Definições do monitor", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 - LTEXT "&Frequencia de actualização do ecrã:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + GROUPBOX "Definições do monitor", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 70 + LTEXT "&Frequência de actualização do ecrã:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT AUTOCHECKBOX "&Ocultar modos que este monitor não possa apresentar", IDC_PRUNINGCHECK, 13, 106, 225, 10 END

5 years, 2 months

[reactos] 03/05: [DESK] New Portuguese translation

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c12b06fb8e5c81bb2fded… commit c12b06fb8e5c81bb2fded8edbed63c9aabf18e6a Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue Aug 6 00:14:11 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 19:32:23 2019 +0200 [DESK] New Portuguese translation --- dll/cpl/desk/desk.rc | 6 +- dll/cpl/desk/lang/pt-BR.rc | 2 +- dll/cpl/desk/lang/{pt-BR.rc => pt-PT.rc} | 156 ++++++++++++++++--------------- 3 files changed, 87 insertions(+), 77 deletions(-) diff --git a/dll/cpl/desk/desk.rc b/dll/cpl/desk/desk.rc index b202b6b4d18..08301b0fee7 100644 --- a/dll/cpl/desk/desk.rc +++ b/dll/cpl/desk/desk.rc @@ -80,6 +80,9 @@ IDB_SPECTRUM_16 BITMAP "resources/spectrum_16.bmp" #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif @@ -106,4 +109,5 @@ IDB_SPECTRUM_16 BITMAP "resources/spectrum_16.bmp" #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif \ No newline at end of file +#endif + diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-BR.rc index 4aa6d50a9fe..c8f72aa8653 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-BR.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-PT.rc similarity index 60% copy from dll/cpl/desk/lang/pt-BR.rc copy to dll/cpl/desk/lang/pt-PT.rc index 4aa6d50a9fe..954e306fe68 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-PT.rc @@ -1,8 +1,13 @@ +/* Portuguese Language resource file + * + * Traduzido por: Jose Carlos Jesus 05-08-2019 zecarlos1957(a)hotmail.com + */ + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Área de trabalho" +CAPTION "Ambiente de trabalho" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 @@ -17,29 +22,29 @@ END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Proteção de tela" +CAPTION "Protecção de ecrã" FONT 8, "MS Shell Dlg", 0, 0 BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "Proteção de &tela", IDC_SCREENS_DUMMY, 8, 92, 230, 52 + GROUPBOX "Protecção de &ecrã", IDC_SCREENS_DUMMY, 8, 92, 230, 75 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Configurações", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP - PUSHBUTTON "&Visualizar", IDC_SCREENS_TESTSC, 175, 102, 50, 15 + PUSHBUTTON "&Definições", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP + PUSHBUTTON "&Pré-visualizar", IDC_SCREENS_TESTSC, 175, 102, 50, 15 LTEXT "Ag&uardar:", IDC_WAITTEXT, 14, 125, 30, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 46, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 LTEXT "minutos", IDC_MINTEXT, 80, 125, 26, 9 - CONTROL "Ao continuar, &proteger com senha", IDC_SCREENS_USEPASSCHK, "button", - BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 122, 19 - GROUPBOX "Energia do monitor", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 - LTEXT "Para ajustar a energia do monitor e poupar energia, clique em 'Energia'.", IDC_STATIC, 16, 161, 146, 27 - PUSHBUTTON "&Energia...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15 + CONTROL "Ao reiniciar, &proteger por palavra-passe", IDC_SCREENS_USEPASSCHK, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 30, 145, 200, 19 + GROUPBOX "Energia do monitor", IDC_SCREENS_DUMMY2, 8, 175, 230, 41 + LTEXT "Para ajustar as definições de energia do monitor e poupar energia, clique em 'Energia'.", IDC_STATIC, 16, 185, 146, 27 + PUSHBUTTON "&Energia...", IDC_SCREENS_POWER_BUTTON, 167, 190, 61, 15 END IDD_APPEARANCE DIALOGEX 0, 0, 246, 212 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Aparência" +CAPTION "Aspecto" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 @@ -49,17 +54,17 @@ BEGIN LTEXT "Esquema de &cores:", IDC_STATIC, 7, 157, 104, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 167, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Tamanho da fonte:", IDC_STATIC, 7, 184, 104, 9 + LTEXT "&Tamanho do tipo de letra:", IDC_STATIC, 7, 184, 104, 9 COMBOBOX IDC_APPEARANCE_SIZE, 7, 194, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Efeitos...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 - PUSHBUTTON "Ava&nçada...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 + PUSHBUTTON "Ava&nçadas...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Aparência avançada" +CAPTION "Aspecto avançado" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 @@ -74,7 +79,7 @@ BEGIN CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Cor &2:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "&Fonte:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 + LTEXT "&Tipo de letra:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Tamanho:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 @@ -87,29 +92,29 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END -IDD_EFFAPPEARANCE DIALOGEX 0, 0, 285, 185 +IDD_EFFAPPEARANCE DIALOGEX 0, 0, 300, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE CAPTION "Efeitos" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Usar este efeito de transição para menus e dicas de ferramenta:", + CONTROL "&Utilizar o seguinte efeito de transição para menus e descrições de ferramentas:", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&sar este método para suavizar as bordas das fontes de tela:", IDC_EFFAPPEARANCE_SMOOTHING, + CONTROL "Utilizar o seguinte método para suavizar as arestas dos tipos de letra do ecrã:", IDC_EFFAPPEARANCE_SMOOTHING, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "Usar íco&nes grandes", IDC_EFFAPPEARANCE_LARGEICONS, "button", + CONTROL "Utilizar íco&nes grandes", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 - CONTROL "Mostr&ar sombras sob menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, + CONTROL "Mostr&ar sombras sob os menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 - CONTROL "&Mostrar conteúdo da janela ao arrastar", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, + CONTROL "&Mostrar o conteúdo das janelas ao arrastar", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 - CONTROL "&Ocultar sublinhados para navegação do teclado até eu pressionar a tecla Alt", + CONTROL "&Ocultar letras sublinhadas para navegação por teclado até que a tecla Alt seja premida", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 - CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + CONTROL "Utilizar menus planos", IDC_EFFAPPEARANCE_FLATMENUS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Cancelar", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 @@ -117,23 +122,23 @@ END IDD_SETTINGS DIALOGEX 0, 0, 246, 202 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Configurações" +CAPTION "Definições" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Arraste os ícones de monitor para que corresponda à disposição física de seus monitores.", -1, 3, 3, 240, 20 + LTEXT "Arraste os ícones dos monitores, para que correspondam à disposição física dos seus monitores.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | - WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "Vídeo:", 1820, 3, 107, 70, 9 - LTEXT "<nenhum>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 - GROUPBOX "&Resolução da tela", 1818, 3, 127, 115, 43 - CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 - LTEXT "Menos", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "Mais", 1816, 93, 137, 20, 9, NOT WS_GROUP - LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER - GROUPBOX "Qualidade da &cor", 1817, 125, 127, 115, 43 - COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_SETTINGS_SPECTRUM, "Static", SS_OWNERDRAW | SS_SUNKEN, 131, 155, 103, 9 - PUSHBUTTON "Ava&nçadas...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 + WS_TABSTOP, 3, 23, 250, 82, WS_EX_CLIENTEDGE + LTEXT "Monitor:", 1820, 3, 107, 70, 9 + LTEXT "<Desconhecido>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 + GROUPBOX "&Resolução do ecrã", 1818, 3, 142, 115, 43 + CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 152, 58, 17 + LTEXT "Menos", 1815, 9, 152, 25, 9, NOT WS_GROUP + LTEXT "Mais", 1816, 93, 152, 20, 9, NOT WS_GROUP + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 172, 100, 10, NOT WS_GROUP | SS_CENTER + GROUPBOX "Qualidade da &cor", 1817, 125, 142, 115, 43 + COMBOBOX IDC_SETTINGS_BPP, 131, 152, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_SETTINGS_SPECTRUM, "Static", SS_OWNERDRAW | SS_SUNKEN, 131, 170, 103, 9 + PUSHBUTTON "&Avançadas...", IDC_SETTINGS_ADVANCED, 170, 199, 70, 15 END IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 @@ -141,40 +146,41 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Geral" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Vídeo", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Configuração de &ppp:", -1, 14, 20, 222, 9 - COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 - GROUPBOX "Compatibilidade", -1, 7, 67, 237, 97 - LTEXT "Alguns programas podem não funcionar corretamente se você não reiniciar o computador após alterar as configurações de vídeo.\n\nApós alterar as configurações de vídeo:", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "&Reiniciar computador antes de aplicar novas configurações de vídeo", IDC_RESTART_RB, 14, 116, 228, 10 - AUTORADIOBUTTON "&Aplicar as novas configurações de vídeo sem reiniciar o computador", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 - AUTORADIOBUTTON "Perg&untar antes de aplicar novas configurações de vídeo", IDC_ASKME_RB, 14, 146, 228, 10 + GROUPBOX "Visualização", -1, 7, 6, 237, 105, WS_GROUP + LTEXT "Se a resolução do ecrã tornar os items demasiado pequenos para ver confortavelmente, pode aumentar o valor ppp para compensar. Para alterar apenas o tamanho do tipo de letra, clique em ""Cancelar"" e vá até ao separador ""Aspecto"".", -1, 14, 20, 220, 45 + LTEXT "Definição do valor ppp:", -1, 14, 65, 222, 9 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 75, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 91, 223, 12 + GROUPBOX "Compatibilidade", -1, 7, 115, 237, 100 + LTEXT "Alguns programas podem não funcionar correctamente se não reiniciar o computador após alterar as definições de visualização.\n\nApós alterar as definições de visualização:", -1, 12, 130, 228, 34 + AUTORADIOBUTTON "&Reiniciar o computador antes de aplicar as novas definições", IDC_RESTART_RB, 14, 165, 228, 10 + AUTORADIOBUTTON "&Aplicar as novas definições sem reiniciar", IDC_WITHOUTREBOOT_RB, 14, 180, 228, 10 + AUTORADIOBUTTON "&Perguntar antes de aplicar as novas definições de visualização", IDC_ASKME_RB, 14, 195, 228, 10 END IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Display Settings" +CAPTION "Definições de visualização" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "O ambiente de trabalho foi reconfigurado.\nPretende manter estas definições?", IDC_STATIC, 7, 7, 219, 8 LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 - PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 - DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 + PUSHBUTTON "&Sim", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&Não", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU BEGIN MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Desabilitado", ID_MENU_DISABLED - MENUITEM "Selecionado", ID_MENU_SELECTED + MENUITEM "Seleccionado", ID_MENU_SELECTED END IDM_MONITOR_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "&Conectado", ID_MENU_ATTACHED + MENUITEM "&Ligado", ID_MENU_ATTACHED MENUITEM "&Primário", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identificar", ID_MENU_IDENTIFY @@ -184,8 +190,8 @@ END STRINGTABLE BEGIN - IDS_SLIDEEFFECT "Rolagem" - IDS_FADEEFFECT "Esmaecimento" + IDS_SLIDEEFFECT "Deslocamento" + IDS_FADEEFFECT "Desvanecimento" END STRINGTABLE @@ -203,14 +209,14 @@ END STRINGTABLE BEGIN - IDS_CPLNAME "Vídeo" - IDS_CPLDESCRIPTION "Altera a aparência da área de trabalho, como plano de fundo, proteção de tela, cores, tamanhos de fonte e resolução de tela." + IDS_CPLNAME "Monitor" + IDS_CPLDESCRIPTION "Altera o aspecto do ambiente de trabalho, como plano de fundo, protecção de ecrã, cores, tamanhos de tipos de letra e resolução de ecrã." IDS_NONE "(Nenhum)" - IDS_CENTER "Centralizar" - IDS_STRETCH "Estender" - IDS_TILE "Lado a lado" - IDS_FIT "Fit" - IDS_FILL "Fill" + IDS_CENTER "Centrar" + IDS_STRETCH "Esticar" + IDS_TILE "Mosaico" + IDS_FIT "Encaixar" + IDS_FILL "Ajustar" END STRINGTABLE @@ -230,8 +236,8 @@ END STRINGTABLE BEGIN - IDS_INACTWIN "Janela inativa" - IDS_ACTWIN "Janela ativa" + IDS_INACTWIN "Janela inactiva" + IDS_ACTWIN "Janela activa" IDS_WINTEXT "Texto da janela" IDS_MESSBOX "Caixa de mensagem" IDS_MESSTEXT "Texto da mensagem" @@ -241,15 +247,15 @@ END STRINGTABLE BEGIN - IDS_ELEMENT_0 "Área de trabalho" - IDS_ELEMENT_1 "Barra de título inativa" - IDS_ELEMENT_2 "Borda de janela inativa" - IDS_ELEMENT_3 "Barra de título ativa" - IDS_ELEMENT_4 "Borda de janela ativa" + IDS_ELEMENT_0 "Ambiente de trabalho" + IDS_ELEMENT_1 "Barra de título inactiva" + IDS_ELEMENT_2 "Borda de janela inactiva" + IDS_ELEMENT_3 "Barra de título activa" + IDS_ELEMENT_4 "Borda de janela activa" IDS_ELEMENT_5 "Menu" - IDS_ELEMENT_6 "Itens selecionados" + IDS_ELEMENT_6 "Itens seleccionados" IDS_ELEMENT_7 "Janela" - IDS_ELEMENT_8 "Barra de rolagem" + IDS_ELEMENT_8 "Barra de deslocamento" IDS_ELEMENT_9 "Objetos 3D" IDS_ELEMENT_10 "Título da paleta" IDS_ELEMENT_11 "Barra de título" @@ -257,15 +263,15 @@ BEGIN IDS_ELEMENT_13 "Fundo da aplicação" IDS_ELEMENT_14 "Espaçamento de ícone (horizontal)" IDS_ELEMENT_15 "Espaçamento de ícone (vertical)" - IDS_ELEMENT_16 "Dica de ferramenta" + IDS_ELEMENT_16 "Descrição de ferramenta" IDS_ELEMENT_17 "Ícone" // IDS_ELEMENT_18 "Item de menu desativado" END STRINGTABLE BEGIN - IDS_DISPLAY_SETTINGS "Configurações de vídeo" - IDS_APPLY_FAILED "Falha ao aplicar as novas configurações..." - IDS_APPLY_NEEDS_RESTART "É necessário reiniciar o computador para aplicar as mudanças." - IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." + IDS_DISPLAY_SETTINGS "Definições de visualização" + IDS_APPLY_FAILED "Falha ao aplicar as novas definições..." + IDS_APPLY_NEEDS_RESTART "É necessário reiniciar o computador para aplicar as alterações." + IDS_TIMEOUTTEXT "Reversão dentro de %d seconds." END

5 years, 2 months

← Newer
1
...
10
11
12
13
14
15
16
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019