Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 74503: [CONSOLE.CPL]: Minor modifications: - Use "hDlg" (as done in the rest of the code) instead of "hwndDlg"; - Refresh the console window preview whenever a dimension or a position wa...
by hbelusca＠svn.reactos.org 08 May '17

08 May '17

Author: hbelusca Date: Mon May 8 17:24:57 2017 New Revision: 74503 URL: http://svn.reactos.org/svn/reactos?rev=74503&view=rev Log: [CONSOLE.CPL]: Minor modifications: - Use "hDlg" (as done in the rest of the code) instead of "hwndDlg"; - Refresh the console window preview whenever a dimension or a position was changed. Modified: trunk/reactos/dll/cpl/console/layout.c Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Mon May 8 17:24:57 2017 @@ -144,7 +144,7 @@ INT_PTR CALLBACK -LayoutProc(HWND hwndDlg, +LayoutProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -158,7 +158,6 @@ LONG cxVirtScr, cyVirtScr; // Width and Height of the virtual screen LONG cxFrame , cyFrame ; // Thickness of the window frame - /* Multi-monitor support */ xVirtScr = GetSystemMetrics(SM_XVIRTUALSCREEN); yVirtScr = GetSystemMetrics(SM_YVIRTUALSCREEN); cxVirtScr = GetSystemMetrics(SM_CXVIRTUALSCREEN); @@ -166,32 +165,32 @@ cxFrame = GetSystemMetrics(SM_CXFRAME); cyFrame = GetSystemMetrics(SM_CYFRAME); - SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); - SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_WIDTH , UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); - SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); - SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_WIDTH , UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); - - SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, ConInfo->ScreenBufferSize.Y, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH , ConInfo->ScreenBufferSize.X, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, ConInfo->WindowSize.Y, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH , ConInfo->WindowSize.X, FALSE); - - SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT, UDM_SETRANGE, 0, + SendDlgItemMessageW(hDlg, IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + SendDlgItemMessageW(hDlg, IDC_UPDOWN_SCREEN_BUFFER_WIDTH , UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + SendDlgItemMessageW(hDlg, IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + SendDlgItemMessageW(hDlg, IDC_UPDOWN_WINDOW_SIZE_WIDTH , UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + + SetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, ConInfo->ScreenBufferSize.Y, FALSE); + SetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH , ConInfo->ScreenBufferSize.X, FALSE); + SetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, ConInfo->WindowSize.Y, FALSE); + SetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_WIDTH , ConInfo->WindowSize.X, FALSE); + + SendDlgItemMessageW(hDlg, IDC_UPDOWN_WINDOW_POS_LEFT, UDM_SETRANGE, 0, (LPARAM)MAKELONG(xVirtScr + cxVirtScr - cxFrame, xVirtScr - cxFrame)); - SendDlgItemMessageW(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP , UDM_SETRANGE, 0, + SendDlgItemMessageW(hDlg, IDC_UPDOWN_WINDOW_POS_TOP , UDM_SETRANGE, 0, (LPARAM)MAKELONG(yVirtScr + cyVirtScr - cyFrame, yVirtScr - cyFrame)); - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, ConInfo->WindowPosition.x, TRUE); - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , ConInfo->WindowPosition.y, TRUE); + SetDlgItemInt(hDlg, IDC_EDIT_WINDOW_POS_LEFT, ConInfo->WindowPosition.x, TRUE); + SetDlgItemInt(hDlg, IDC_EDIT_WINDOW_POS_TOP , ConInfo->WindowPosition.y, TRUE); if (ConInfo->AutoPosition) { - EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, FALSE); - EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , FALSE); - EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT, FALSE); - EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP , FALSE); + EnableDlgItem(hDlg, IDC_EDIT_WINDOW_POS_LEFT, FALSE); + EnableDlgItem(hDlg, IDC_EDIT_WINDOW_POS_TOP , FALSE); + EnableDlgItem(hDlg, IDC_UPDOWN_WINDOW_POS_LEFT, FALSE); + EnableDlgItem(hDlg, IDC_UPDOWN_WINDOW_POS_TOP , FALSE); } - CheckDlgButton(hwndDlg, IDC_CHECK_SYSTEM_POS_WINDOW, + CheckDlgButton(hDlg, IDC_CHECK_SYSTEM_POS_WINDOW, ConInfo->AutoPosition ? BST_CHECKED : BST_UNCHECKED); return TRUE; @@ -220,7 +219,7 @@ } else { - wwidth = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, NULL, FALSE); + wwidth = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, NULL, FALSE); } if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_HEIGHT) @@ -229,7 +228,7 @@ } else { - wheight = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, NULL, FALSE); + wheight = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, NULL, FALSE); } if (lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_WIDTH) @@ -238,7 +237,7 @@ } else { - swidth = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); + swidth = GetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); } if (lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_HEIGHT) @@ -247,7 +246,7 @@ } else { - sheight = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); + sheight = GetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); } if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_POS_LEFT) @@ -256,7 +255,7 @@ } else { - left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, TRUE); + left = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, TRUE); } if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_POS_TOP) @@ -265,7 +264,7 @@ } else { - top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, TRUE); + top = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, TRUE); } if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_HEIGHT) @@ -273,12 +272,12 @@ /* Automatically adjust screen buffer size when window size enlarges */ if (wwidth >= swidth) { - SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, wwidth, TRUE); + SetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, wwidth, TRUE); swidth = wwidth; } if (wheight >= sheight) { - SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, wheight, TRUE); + SetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, wheight, TRUE); sheight = wheight; } } @@ -292,12 +291,12 @@ /* Automatically adjust window size when screen buffer decreases */ if (wwidth > swidth) { - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE); + SetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE); wwidth = swidth; } if (wheight > sheight) { - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, sheight, TRUE); + SetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, sheight, TRUE); wheight = sheight; } } @@ -308,7 +307,9 @@ ConInfo->WindowSize.Y = (SHORT)wheight; ConInfo->WindowPosition.x = left; ConInfo->WindowPosition.y = top; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_LAYOUT_WINDOW_PREVIEW), NULL, TRUE); + PropSheet_Changed(GetParent(hDlg), hDlg); } break; } @@ -323,8 +324,8 @@ { DWORD swidth, wwidth; - swidth = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); - wwidth = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH , NULL, FALSE); + swidth = GetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); + wwidth = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_WIDTH , NULL, FALSE); /* Be sure that the (new) screen buffer width is in the correct range */ swidth = min(max(swidth, 1), 0xFFFF); @@ -333,12 +334,14 @@ if (wwidth > swidth) { wwidth = swidth; - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, wwidth, TRUE); + SetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, wwidth, TRUE); } ConInfo->ScreenBufferSize.X = (SHORT)swidth; ConInfo->WindowSize.X = (SHORT)wwidth; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_LAYOUT_WINDOW_PREVIEW), NULL, TRUE); + PropSheet_Changed(GetParent(hDlg), hDlg); break; } @@ -346,8 +349,8 @@ { DWORD swidth, wwidth; - swidth = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); - wwidth = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH , NULL, FALSE); + swidth = GetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); + wwidth = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_WIDTH , NULL, FALSE); /* Automatically adjust screen buffer size when window size enlarges */ if (wwidth >= swidth) @@ -357,12 +360,14 @@ /* Be sure that the (new) screen buffer width is in the correct range */ swidth = min(max(swidth, 1), 0xFFFF); - SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, swidth, TRUE); + SetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, swidth, TRUE); } ConInfo->ScreenBufferSize.X = (SHORT)swidth; ConInfo->WindowSize.X = (SHORT)wwidth; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_LAYOUT_WINDOW_PREVIEW), NULL, TRUE); + PropSheet_Changed(GetParent(hDlg), hDlg); break; } @@ -370,8 +375,8 @@ { DWORD sheight, wheight; - sheight = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); - wheight = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT , NULL, FALSE); + sheight = GetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); + wheight = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT , NULL, FALSE); /* Be sure that the (new) screen buffer width is in the correct range */ sheight = min(max(sheight, 1), 0xFFFF); @@ -380,12 +385,14 @@ if (wheight > sheight) { wheight = sheight; - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, wheight, TRUE); + SetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, wheight, TRUE); } ConInfo->ScreenBufferSize.Y = (SHORT)sheight; ConInfo->WindowSize.Y = (SHORT)wheight; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_LAYOUT_WINDOW_PREVIEW), NULL, TRUE); + PropSheet_Changed(GetParent(hDlg), hDlg); break; } @@ -393,8 +400,8 @@ { DWORD sheight, wheight; - sheight = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); - wheight = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT , NULL, FALSE); + sheight = GetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); + wheight = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT , NULL, FALSE); /* Automatically adjust screen buffer size when window size enlarges */ if (wheight >= sheight) @@ -404,21 +411,25 @@ /* Be sure that the (new) screen buffer width is in the correct range */ sheight = min(max(sheight, 1), 0xFFFF); - SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, sheight, TRUE); + SetDlgItemInt(hDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, sheight, TRUE); } ConInfo->ScreenBufferSize.Y = (SHORT)sheight; ConInfo->WindowSize.Y = (SHORT)wheight; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_LAYOUT_WINDOW_PREVIEW), NULL, TRUE); + PropSheet_Changed(GetParent(hDlg), hDlg); break; } case IDC_EDIT_WINDOW_POS_LEFT: case IDC_EDIT_WINDOW_POS_TOP: { - ConInfo->WindowPosition.x = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, TRUE); - ConInfo->WindowPosition.y = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , NULL, TRUE); - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + ConInfo->WindowPosition.x = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, TRUE); + ConInfo->WindowPosition.y = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_POS_TOP , NULL, TRUE); + + InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_LAYOUT_WINDOW_PREVIEW), NULL, TRUE); + PropSheet_Changed(GetParent(hDlg), hDlg); break; } } @@ -427,33 +438,37 @@ if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDC_CHECK_SYSTEM_POS_WINDOW) { - if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_SYSTEM_POS_WINDOW) == BST_CHECKED) - { - EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, FALSE); - EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , FALSE); - EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT, FALSE); - EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP , FALSE); + if (IsDlgButtonChecked(hDlg, IDC_CHECK_SYSTEM_POS_WINDOW) == BST_CHECKED) + { + EnableDlgItem(hDlg, IDC_EDIT_WINDOW_POS_LEFT, FALSE); + EnableDlgItem(hDlg, IDC_EDIT_WINDOW_POS_TOP , FALSE); + EnableDlgItem(hDlg, IDC_UPDOWN_WINDOW_POS_LEFT, FALSE); + EnableDlgItem(hDlg, IDC_UPDOWN_WINDOW_POS_TOP , FALSE); ConInfo->AutoPosition = TRUE; // Do not touch ConInfo->WindowPosition !! - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_LAYOUT_WINDOW_PREVIEW), NULL, TRUE); + PropSheet_Changed(GetParent(hDlg), hDlg); } else { ULONG left, top; - left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, TRUE); - top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , NULL, TRUE); - - EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, TRUE); - EnableDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP , TRUE); - EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT, TRUE); - EnableDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP , TRUE); + left = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, TRUE); + top = GetDlgItemInt(hDlg, IDC_EDIT_WINDOW_POS_TOP , NULL, TRUE); + + EnableDlgItem(hDlg, IDC_EDIT_WINDOW_POS_LEFT, TRUE); + EnableDlgItem(hDlg, IDC_EDIT_WINDOW_POS_TOP , TRUE); + EnableDlgItem(hDlg, IDC_UPDOWN_WINDOW_POS_LEFT, TRUE); + EnableDlgItem(hDlg, IDC_UPDOWN_WINDOW_POS_TOP , TRUE); ConInfo->AutoPosition = FALSE; ConInfo->WindowPosition.x = left; ConInfo->WindowPosition.y = top; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_LAYOUT_WINDOW_PREVIEW), NULL, TRUE); + PropSheet_Changed(GetParent(hDlg), hDlg); } }

1 0

[hbelusca] 74502: [CONSOLE.CPL]: Simplify the color selection code by factorizing common parts.
by hbelusca＠svn.reactos.org 08 May '17

08 May '17

Author: hbelusca Date: Mon May 8 17:19:07 2017 New Revision: 74502 URL: http://svn.reactos.org/svn/reactos?rev=74502&view=rev Log: [CONSOLE.CPL]: Simplify the color selection code by factorizing common parts. Modified: trunk/reactos/dll/cpl/console/colors.c Modified: trunk/reactos/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] Mon May 8 17:19:07 2017 @@ -133,12 +133,34 @@ /* NOTE: both BN_CLICKED and STN_CLICKED == 0 */ if (HIWORD(wParam) == BN_CLICKED || HIWORD(wParam) == STN_CLICKED) { - switch (LOWORD(wParam)) - { - case IDC_RADIO_SCREEN_TEXT: - { - /* Get the color of the screen foreground */ - colorIndex = TextAttribFromAttrib(ConInfo->ScreenAttributes); + if (LOWORD(wParam) == IDC_RADIO_SCREEN_TEXT || + LOWORD(wParam) == IDC_RADIO_SCREEN_BACKGROUND || + LOWORD(wParam) == IDC_RADIO_POPUP_TEXT || + LOWORD(wParam) == IDC_RADIO_POPUP_BACKGROUND) + { + switch (LOWORD(wParam)) + { + case IDC_RADIO_SCREEN_TEXT: + /* Get the colour of the screen foreground */ + colorIndex = TextAttribFromAttrib(ConInfo->ScreenAttributes); + break; + + case IDC_RADIO_SCREEN_BACKGROUND: + /* Get the colour of the screen background */ + colorIndex = BkgdAttribFromAttrib(ConInfo->ScreenAttributes); + break; + + case IDC_RADIO_POPUP_TEXT: + /* Get the colour of the popup foreground */ + colorIndex = TextAttribFromAttrib(ConInfo->PopupAttributes); + break; + + case IDC_RADIO_POPUP_BACKGROUND: + /* Get the colour of the popup background */ + colorIndex = BkgdAttribFromAttrib(ConInfo->PopupAttributes); + break; + } + color = ConInfo->ColorTable[colorIndex]; /* Set the values of the colour indicators */ @@ -149,15 +171,17 @@ InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_COLOR1 + ActiveStaticControl), NULL, TRUE); ActiveStaticControl = colorIndex; InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_COLOR1 + ActiveStaticControl), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); - break; - } - - case IDC_RADIO_SCREEN_BACKGROUND: - { - /* Get the color of the screen background */ - colorIndex = BkgdAttribFromAttrib(ConInfo->ScreenAttributes); + break; + } + else + if (IDC_STATIC_COLOR1 <= LOWORD(wParam) && LOWORD(wParam) <= IDC_STATIC_COLOR16) + { + colorIndex = LOWORD(wParam) - IDC_STATIC_COLOR1; + + /* If the same static control was re-clicked, don't take it into account */ + if (colorIndex == ActiveStaticControl) + break; + color = ConInfo->ColorTable[colorIndex]; /* Set the values of the colour indicators */ @@ -165,67 +189,6 @@ SetDlgItemInt(hDlg, IDC_EDIT_COLOR_GREEN, GetGValue(color), FALSE); SetDlgItemInt(hDlg, IDC_EDIT_COLOR_BLUE , GetBValue(color), FALSE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_COLOR1 + ActiveStaticControl), NULL, TRUE); - ActiveStaticControl = colorIndex; - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_COLOR1 + ActiveStaticControl), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); - break; - } - - case IDC_RADIO_POPUP_TEXT: - { - /* Get the color of the popup foreground */ - colorIndex = TextAttribFromAttrib(ConInfo->PopupAttributes); - color = ConInfo->ColorTable[colorIndex]; - - /* Set the values of the colour indicators */ - SetDlgItemInt(hDlg, IDC_EDIT_COLOR_RED , GetRValue(color), FALSE); - SetDlgItemInt(hDlg, IDC_EDIT_COLOR_GREEN, GetGValue(color), FALSE); - SetDlgItemInt(hDlg, IDC_EDIT_COLOR_BLUE , GetBValue(color), FALSE); - - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_COLOR1 + ActiveStaticControl), NULL, TRUE); - ActiveStaticControl = colorIndex; - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_COLOR1 + ActiveStaticControl), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); - break; - } - - case IDC_RADIO_POPUP_BACKGROUND: - { - /* Get the color of the popup background */ - colorIndex = BkgdAttribFromAttrib(ConInfo->PopupAttributes); - color = ConInfo->ColorTable[colorIndex]; - - /* Set the values of the colour indicators */ - SetDlgItemInt(hDlg, IDC_EDIT_COLOR_RED , GetRValue(color), FALSE); - SetDlgItemInt(hDlg, IDC_EDIT_COLOR_GREEN, GetGValue(color), FALSE); - SetDlgItemInt(hDlg, IDC_EDIT_COLOR_BLUE , GetBValue(color), FALSE); - - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_COLOR1 + ActiveStaticControl), NULL, TRUE); - ActiveStaticControl = colorIndex; - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_COLOR1 + ActiveStaticControl), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); - break; - } - } - - if (IDC_STATIC_COLOR1 <= LOWORD(wParam) && LOWORD(wParam) <= IDC_STATIC_COLOR16) - { - colorIndex = LOWORD(wParam) - IDC_STATIC_COLOR1; - - /* If the same static control was re-clicked, don't take it into account */ - if (colorIndex == ActiveStaticControl) - break; - - color = ConInfo->ColorTable[colorIndex]; - - SetDlgItemInt(hDlg, IDC_EDIT_COLOR_RED , GetRValue(color), FALSE); - SetDlgItemInt(hDlg, IDC_EDIT_COLOR_GREEN, GetGValue(color), FALSE); - SetDlgItemInt(hDlg, IDC_EDIT_COLOR_BLUE , GetBValue(color), FALSE); - if (IsDlgButtonChecked(hDlg, IDC_RADIO_SCREEN_TEXT)) { ConInfo->ScreenAttributes = MakeAttrib(colorIndex, BkgdAttribFromAttrib(ConInfo->ScreenAttributes)); @@ -255,20 +218,37 @@ } else if (HIWORD(wParam) == EN_KILLFOCUS) { - switch (LOWORD(wParam)) - { - case IDC_EDIT_COLOR_RED: - { - DWORD red; - - /* Get the current color */ + if (LOWORD(wParam) == IDC_EDIT_COLOR_RED || + LOWORD(wParam) == IDC_EDIT_COLOR_GREEN || + LOWORD(wParam) == IDC_EDIT_COLOR_BLUE) + { + DWORD value; + + /* Get the current colour */ colorIndex = ActiveStaticControl; color = ConInfo->ColorTable[colorIndex]; - red = GetDlgItemInt(hDlg, IDC_EDIT_COLOR_RED, NULL, FALSE); - red = min(max(red, 0), 255); - - color = RGB(red, GetGValue(color), GetBValue(color)); + /* Modify the colour component */ + switch (LOWORD(wParam)) + { + case IDC_EDIT_COLOR_RED: + value = GetDlgItemInt(hDlg, IDC_EDIT_COLOR_RED, NULL, FALSE); + value = min(max(value, 0), 255); + color = RGB(value, GetGValue(color), GetBValue(color)); + break; + + case IDC_EDIT_COLOR_GREEN: + value = GetDlgItemInt(hDlg, IDC_EDIT_COLOR_GREEN, NULL, FALSE); + value = min(max(value, 0), 255); + color = RGB(GetRValue(color), value, GetBValue(color)); + break; + + case IDC_EDIT_COLOR_BLUE: + value = GetDlgItemInt(hDlg, IDC_EDIT_COLOR_BLUE, NULL, FALSE); + value = min(max(value, 0), 255); + color = RGB(GetRValue(color), GetGValue(color), value); + break; + } ConInfo->ColorTable[colorIndex] = color; InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_COLOR1 + colorIndex), NULL, TRUE); @@ -278,51 +258,6 @@ PropSheet_Changed(GetParent(hDlg), hDlg); break; } - - case IDC_EDIT_COLOR_GREEN: - { - DWORD green; - - /* Get the current color */ - colorIndex = ActiveStaticControl; - color = ConInfo->ColorTable[colorIndex]; - - green = GetDlgItemInt(hDlg, IDC_EDIT_COLOR_GREEN, NULL, FALSE); - green = min(max(green, 0), 255); - - color = RGB(GetRValue(color), green, GetBValue(color)); - - ConInfo->ColorTable[colorIndex] = color; - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_COLOR1 + colorIndex), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); - - PropSheet_Changed(GetParent(hDlg), hDlg); - break; - } - - case IDC_EDIT_COLOR_BLUE: - { - DWORD blue; - - /* Get the current color */ - colorIndex = ActiveStaticControl; - color = ConInfo->ColorTable[colorIndex]; - - blue = GetDlgItemInt(hDlg, IDC_EDIT_COLOR_BLUE, NULL, FALSE); - blue = min(max(blue, 0), 255); - - color = RGB(GetRValue(color), GetGValue(color), blue); - - ConInfo->ColorTable[colorIndex] = color; - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_COLOR1 + colorIndex), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_POPUP_COLOR) , NULL, TRUE); - - PropSheet_Changed(GetParent(hDlg), hDlg); - break; - } - } } break;

1 0

[rnaumann] 74501: [EXPLORER] Addendum to r74500. Those 2 commits belong to CORE-11498
by rnaumann＠svn.reactos.org 08 May '17

08 May '17

Author: rnaumann Date: Mon May 8 15:50:07 2017 New Revision: 74501 URL: http://svn.reactos.org/svn/reactos?rev=74501&view=rev Log: [EXPLORER] Addendum to r74500. Those 2 commits belong to CORE-11498 Modified: trunk/reactos/base/shell/explorer/settings.cpp Modified: trunk/reactos/base/shell/explorer/settings.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/settin… ============================================================================== --- trunk/reactos/base/shell/explorer/settings.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/settings.cpp [iso-8859-1] Mon May 8 15:50:07 2017 @@ -30,13 +30,13 @@ DWORD dwValue = NULL; LoadSettingDword(szAdvancedSettingsKey, TEXT("TaskbarSizeMove"), dwValue); - TaskBarSettings.bLock = (dwValue != 0) ? TRUE : FALSE; + TaskBarSettings.bLock = (dwValue != 0) ? FALSE : TRUE; LoadSettingDword(szAdvancedSettingsKey, TEXT("ShowSeconds"), dwValue); TaskBarSettings.bShowSeconds = (dwValue != 0) ? TRUE : FALSE; LoadSettingDword(szSettingsKey, TEXT("EnableAutotray"), dwValue); - TaskBarSettings.bHideInactiveIcons = TRUE; + TaskBarSettings.bHideInactiveIcons = (dwValue != 0) ? TRUE : FALSE; LoadSettingDword(szAdvancedSettingsKey, TEXT("TaskbarGlomming"), dwValue); TaskBarSettings.bGroupButtons = (dwValue != 0) ? TRUE : FALSE;

1 0

[rnaumann] 74500: [EXPLORER] - Load and save "Lock Taskbar", "Hide inactive icons", and "Group similar taskbar buttons". Verified on Win2k3 via "Nirsoft RegFromApp". - use a loader function for reg...
by rnaumann＠svn.reactos.org 08 May '17

08 May '17

Author: rnaumann Date: Mon May 8 15:27:33 2017 New Revision: 74500 URL: http://svn.reactos.org/svn/reactos?rev=74500&view=rev Log: [EXPLORER] - Load and save "Lock Taskbar", "Hide inactive icons", and "Group similar taskbar buttons". Verified on Win2k3 via "Nirsoft RegFromApp". - use a loader function for registry values. - save the "show seconds" setting together with the other explorer settings instead of a ROS specific key. - Add some documentation comments. Modified: trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/settings.cpp trunk/reactos/base/shell/explorer/trayprop.cpp Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Mon May 8 15:27:33 2017 @@ -200,6 +200,10 @@ SaveTaskBarSettings(VOID); BOOL +LoadSettingDword(IN LPCWSTR pszKeyName, + IN LPCWSTR pszValueName, + OUT DWORD &dwValue); +BOOL SaveSettingDword(IN LPCWSTR pszKeyName, IN LPCWSTR pszValueName, IN DWORD dwValue); Modified: trunk/reactos/base/shell/explorer/settings.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/settin… ============================================================================== --- trunk/reactos/base/shell/explorer/settings.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/settings.cpp [iso-8859-1] Mon May 8 15:27:33 2017 @@ -21,40 +21,66 @@ #include "precomp.h" TASKBAR_SETTINGS TaskBarSettings; -const WCHAR szAdvancedSettingsKey[] = L"Software\\ReactOS\\Features\\Explorer"; +const WCHAR szSettingsKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"; +const WCHAR szAdvancedSettingsKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced"; VOID LoadTaskBarSettings(VOID) { - HKEY hKey; - - /* Set defaults */ - TaskBarSettings.bLock = TRUE; + DWORD dwValue = NULL; + + LoadSettingDword(szAdvancedSettingsKey, TEXT("TaskbarSizeMove"), dwValue); + TaskBarSettings.bLock = (dwValue != 0) ? TRUE : FALSE; + + LoadSettingDword(szAdvancedSettingsKey, TEXT("ShowSeconds"), dwValue); + TaskBarSettings.bShowSeconds = (dwValue != 0) ? TRUE : FALSE; + + LoadSettingDword(szSettingsKey, TEXT("EnableAutotray"), dwValue); + TaskBarSettings.bHideInactiveIcons = TRUE; + + LoadSettingDword(szAdvancedSettingsKey, TEXT("TaskbarGlomming"), dwValue); + TaskBarSettings.bGroupButtons = (dwValue != 0) ? TRUE : FALSE; + + TaskBarSettings.bShowQuickLaunch = TRUE; //FIXME: Where is this stored, and how? + + /* FIXME: The following settings are stored in stuckrects2, do they have to be load here too? */ + TaskBarSettings.bShowClock = TRUE; TaskBarSettings.bAutoHide = FALSE; TaskBarSettings.bAlwaysOnTop = FALSE; - TaskBarSettings.bGroupButtons = TRUE; - TaskBarSettings.bShowQuickLaunch = TRUE; - TaskBarSettings.bShowClock = TRUE; - TaskBarSettings.bShowSeconds = FALSE; - TaskBarSettings.bHideInactiveIcons = TRUE; - /* Check registry */ - if (RegOpenKeyW(HKEY_CURRENT_USER, szAdvancedSettingsKey, &hKey) == ERROR_SUCCESS) - { - DWORD dwValue, dwValueLength, dwType; - - dwValueLength = sizeof(dwValue); - if (RegQueryValueExW(hKey, L"ShowSeconds", NULL, &dwType, (PBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD) - TaskBarSettings.bShowSeconds = dwValue != 0; - - RegCloseKey(hKey); - } } VOID SaveTaskBarSettings(VOID) { + SaveSettingDword(szAdvancedSettingsKey, TEXT("TaskbarSizeMove"), TaskBarSettings.bLock); SaveSettingDword(szAdvancedSettingsKey, TEXT("ShowSeconds"), TaskBarSettings.bShowSeconds); + SaveSettingDword(szSettingsKey, TEXT("EnableAutotray"), TaskBarSettings.bHideInactiveIcons); + SaveSettingDword(szAdvancedSettingsKey, TEXT("TaskbarGlomming"), TaskBarSettings.bGroupButtons); + + /* FIXME: Show Clock, AutoHide and Always on top are stored in the stuckrects2 key but are not written to it with a click on apply. How is this done instead? + AutoHide writes something to HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Desktop\Components\0 figure out what and why */ +} + +BOOL +LoadSettingDword(IN LPCWSTR pszKeyName, + IN LPCWSTR pszValueName, + OUT DWORD &dwValue) +{ + BOOL ret = FALSE; + HKEY hKey; + + if (RegOpenKeyW(HKEY_CURRENT_USER, pszKeyName, &hKey) == ERROR_SUCCESS) + { + DWORD dwValueLength, dwType; + + dwValueLength = sizeof(dwValue); + ret = RegQueryValueExW(hKey, pszValueName, NULL, &dwType, (PBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD; + + RegCloseKey(hKey); + } + + return ret; } BOOL Modified: trunk/reactos/base/shell/explorer/trayprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traypr… ============================================================================== --- trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] Mon May 8 15:27:33 2017 @@ -319,7 +319,14 @@ break; case PSN_APPLY: + TaskBarSettings.bLock = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_LOCK); + TaskBarSettings.bAutoHide = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_HIDE); + TaskBarSettings.bAlwaysOnTop = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_ONTOP); + TaskBarSettings.bGroupButtons = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_GROUP); + TaskBarSettings.bShowQuickLaunch = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SHOWQL); + TaskBarSettings.bShowClock = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_CLOCK); TaskBarSettings.bShowSeconds = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SECONDS); + TaskBarSettings.bHideInactiveIcons = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_HIDEICONS); SaveTaskBarSettings(); break; }

1 0

[mjansen] 74499: [WIN32SS] Fix font names not including style info (Bold etc). Patch by Katayama Hirofumi MZ. CORE-12179 #comment Thanks!
by mjansen＠svn.reactos.org 08 May '17

08 May '17

Author: mjansen Date: Mon May 8 14:53:30 2017 New Revision: 74499 URL: http://svn.reactos.org/svn/reactos?rev=74499&view=rev Log: [WIN32SS] Fix font names not including style info (Bold etc). Patch by Katayama Hirofumi MZ. CORE-12179 #comment Thanks! Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Mon May 8 14:53:30 2017 @@ -1738,6 +1738,10 @@ FillTMEx(TM, FontGDI, pOS2, pHori, pFNT, FALSE); } +static NTSTATUS +IntGetFontLocalizedName(PUNICODE_STRING pNameW, FT_Face Face, + FT_UShort NameID, FT_UShort LangID); + /************************************************************* * IntGetOutlineTextMetrics * @@ -1752,57 +1756,40 @@ TT_HoriHeader *pHori; TT_Postscript *pPost; FT_Fixed XScale, YScale; - ANSI_STRING FamilyNameA, StyleNameA; - UNICODE_STRING FamilyNameW, StyleNameW, Regular; FT_WinFNT_HeaderRec Win; FT_Error Error; char *Cp; - NTSTATUS status; FT_Face Face = FontGDI->SharedFace->Face; + UNICODE_STRING FamilyNameW, FaceNameW, StyleNameW, FullNameW; + + /* family name */ + RtlInitUnicodeString(&FamilyNameW, NULL); + IntGetFontLocalizedName(&FamilyNameW, Face, TT_NAME_ID_FONT_FAMILY, gusLanguageID); + + /* face name */ + RtlInitUnicodeString(&FaceNameW, NULL); + IntGetFontLocalizedName(&FaceNameW, Face, TT_NAME_ID_FULL_NAME, gusLanguageID); + + /* style name */ + RtlInitUnicodeString(&StyleNameW, NULL); + IntGetFontLocalizedName(&StyleNameW, Face, TT_NAME_ID_FONT_SUBFAMILY, gusLanguageID); + + /* unique name (full name) */ + RtlInitUnicodeString(&FullNameW, NULL); + IntGetFontLocalizedName(&FullNameW, Face, TT_NAME_ID_UNIQUE_ID, gusLanguageID); Needed = sizeof(OUTLINETEXTMETRICW); - - RtlInitAnsiString(&FamilyNameA, Face->family_name); - status = RtlAnsiStringToUnicodeString(&FamilyNameW, &FamilyNameA, TRUE); - if (!NT_SUCCESS(status)) - { - return 0; - } - - RtlInitAnsiString(&StyleNameA, Face->style_name); - status = RtlAnsiStringToUnicodeString(&StyleNameW, &StyleNameA, TRUE); - if (!NT_SUCCESS(status)) + Needed += FamilyNameW.Length + sizeof(WCHAR); + Needed += FaceNameW.Length + sizeof(WCHAR); + Needed += StyleNameW.Length + sizeof(WCHAR); + Needed += FullNameW.Length + sizeof(WCHAR); + + if (Size < Needed) { RtlFreeUnicodeString(&FamilyNameW); - return 0; - } - - /* These names should be read from the TT name table */ - - /* Length of otmpFamilyName */ - Needed += FamilyNameW.Length + sizeof(WCHAR); - - RtlInitUnicodeString(&Regular, L"Regular"); - /* Length of otmpFaceName */ - if (RtlEqualUnicodeString(&StyleNameW, &Regular, TRUE)) - { - Needed += FamilyNameW.Length + sizeof(WCHAR); /* Just the family name */ - } - else - { - Needed += FamilyNameW.Length + StyleNameW.Length + (sizeof(WCHAR) << 1); /* family + " " + style */ - } - - /* Length of otmpStyleName */ - Needed += StyleNameW.Length + sizeof(WCHAR); - - /* Length of otmpFullName */ - Needed += FamilyNameW.Length + StyleNameW.Length + (sizeof(WCHAR) << 1); - - if (Size < Needed) - { - RtlFreeUnicodeString(&FamilyNameW); + RtlFreeUnicodeString(&FaceNameW); RtlFreeUnicodeString(&StyleNameW); + RtlFreeUnicodeString(&FullNameW); return Needed; } @@ -1815,8 +1802,10 @@ { IntUnLockFreeType; DPRINT1("Can't find OS/2 table - not TT font?\n"); + RtlFreeUnicodeString(&FamilyNameW); + RtlFreeUnicodeString(&FaceNameW); RtlFreeUnicodeString(&StyleNameW); - RtlFreeUnicodeString(&FamilyNameW); + RtlFreeUnicodeString(&FullNameW); return 0; } @@ -1825,8 +1814,10 @@ { IntUnLockFreeType; DPRINT1("Can't find HHEA table - not TT font?\n"); + RtlFreeUnicodeString(&FamilyNameW); + RtlFreeUnicodeString(&FaceNameW); RtlFreeUnicodeString(&StyleNameW); - RtlFreeUnicodeString(&FamilyNameW); + RtlFreeUnicodeString(&FullNameW); return 0; } @@ -1882,33 +1873,34 @@ IntUnLockFreeType; - /* otmp* members should clearly have type ptrdiff_t, but M$ knows best */ Cp = (char*) Otm + sizeof(OUTLINETEXTMETRICW); + + /* family name */ Otm->otmpFamilyName = (LPSTR)(Cp - (char*) Otm); wcscpy((WCHAR*) Cp, FamilyNameW.Buffer); Cp += FamilyNameW.Length + sizeof(WCHAR); + + /* face name */ + Otm->otmpFaceName = (LPSTR)(Cp - (char*) Otm); + wcscpy((WCHAR*) Cp, FaceNameW.Buffer); + Cp += FaceNameW.Length + sizeof(WCHAR); + + /* style name */ Otm->otmpStyleName = (LPSTR)(Cp - (char*) Otm); wcscpy((WCHAR*) Cp, StyleNameW.Buffer); Cp += StyleNameW.Length + sizeof(WCHAR); - Otm->otmpFaceName = (LPSTR)(Cp - (char*) Otm); - wcscpy((WCHAR*) Cp, FamilyNameW.Buffer); - if (!RtlEqualUnicodeString(&StyleNameW, &Regular, TRUE)) - { - wcscat((WCHAR*) Cp, L" "); - wcscat((WCHAR*) Cp, StyleNameW.Buffer); - Cp += FamilyNameW.Length + StyleNameW.Length + (sizeof(WCHAR) << 1); - } - else - { - Cp += FamilyNameW.Length + sizeof(WCHAR); - } + + /* unique name (full name) */ Otm->otmpFullName = (LPSTR)(Cp - (char*) Otm); - wcscpy((WCHAR*) Cp, FamilyNameW.Buffer); - wcscat((WCHAR*) Cp, L" "); - wcscat((WCHAR*) Cp, StyleNameW.Buffer); - + wcscpy((WCHAR*) Cp, FullNameW.Buffer); + Cp += FullNameW.Length + sizeof(WCHAR); + + ASSERT(Cp - (char*)Otm == Needed); + + RtlFreeUnicodeString(&FamilyNameW); + RtlFreeUnicodeString(&FaceNameW); RtlFreeUnicodeString(&StyleNameW); - RtlFreeUnicodeString(&FamilyNameW); + RtlFreeUnicodeString(&FullNameW); return Needed; } @@ -2099,13 +2091,19 @@ { if (LangID != gusEnglishUS) { + /* Retry with English US */ Status = IntGetFontLocalizedName(pNameW, Face, NameID, gusEnglishUS); } - } - if (Status == STATUS_NOT_FOUND) - { - RtlInitAnsiString(&AnsiName, Face->family_name); - Status = RtlAnsiStringToUnicodeString(pNameW, &AnsiName, TRUE); + else if (NameID == TT_NAME_ID_FONT_SUBFAMILY) + { + RtlInitAnsiString(&AnsiName, Face->style_name); + Status = RtlAnsiStringToUnicodeString(pNameW, &AnsiName, TRUE); + } + else + { + RtlInitAnsiString(&AnsiName, Face->family_name); + Status = RtlAnsiStringToUnicodeString(pNameW, &AnsiName, TRUE); + } } return Status;

1 0

[tfaber] 74498: [SHELL32] - Avoid leaking the list items on destruction of CEnumIDListBase CORE-13194
by tfaber＠svn.reactos.org 08 May '17

08 May '17

Author: tfaber Date: Mon May 8 10:59:27 2017 New Revision: 74498 URL: http://svn.reactos.org/svn/reactos?rev=74498&view=rev Log: [SHELL32] - Avoid leaking the list items on destruction of CEnumIDListBase CORE-13194 Modified: trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp trunk/reactos/dll/win32/shell32/CEnumIDListBase.h Modified: trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CEnumIDL… ============================================================================== --- trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp [iso-8859-1] Mon May 8 10:59:27 2017 @@ -22,15 +22,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -CEnumIDListBase::CEnumIDListBase() -{ - mpFirst = NULL; - mpLast = NULL; - mpCurrent = NULL; +CEnumIDListBase::CEnumIDListBase() : + mpFirst(NULL), + mpLast(NULL), + mpCurrent(NULL) +{ } CEnumIDListBase::~CEnumIDListBase() { + DeleteList(); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/CEnumIDListBase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CEnumIDL… ============================================================================== --- trunk/reactos/dll/win32/shell32/CEnumIDListBase.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CEnumIDListBase.h [iso-8859-1] Mon May 8 10:59:27 2017 @@ -33,7 +33,7 @@ ENUMLIST *mpCurrent; public: CEnumIDListBase(); - ~CEnumIDListBase(); + virtual ~CEnumIDListBase(); BOOL AddToEnumList(LPITEMIDLIST pidl); BOOL DeleteList(); BOOL HasItemWithCLSID(LPITEMIDLIST pidl);

1 0

[tfaber] 74497: [USER32] - Avoid a memory leak in User32EnumWindows in case the window count is zero. CORE-13194
by tfaber＠svn.reactos.org 08 May '17

08 May '17

Author: tfaber Date: Mon May 8 08:29:17 2017 New Revision: 74497 URL: http://svn.reactos.org/svn/reactos?rev=74497&view=rev Log: [USER32] - Avoid a memory leak in User32EnumWindows in case the window count is zero. CORE-13194 Modified: trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Mon May 8 08:29:17 2017 @@ -674,6 +674,14 @@ if (!NT_SUCCESS(Status)) return FALSE; + if (!dwCount) + { + if (!dwThreadId) + return FALSE; + else + return TRUE; + } + /* allocate buffer to receive HWND handles */ hHeap = GetProcessHeap(); pHwnd = HeapAlloc(hHeap, 0, sizeof(HWND)*(dwCount+1)); @@ -696,14 +704,6 @@ if (pHwnd) HeapFree(hHeap, 0, pHwnd); return FALSE; - } - - if (!dwCount) - { - if (!dwThreadId) - return FALSE; - else - return TRUE; } /* call the user's callback function until we're done or

1 0

[tfaber] 74496: [NTOS:IO] - Use pool tagging
by tfaber＠svn.reactos.org 08 May '17

08 May '17

Author: tfaber Date: Mon May 8 06:54:35 2017 New Revision: 74496 URL: http://svn.reactos.org/svn/reactos?rev=74496&view=rev Log: [NTOS:IO] - Use pool tagging Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Mon May 8 06:54:35 2017 @@ -898,7 +898,9 @@ IopDisplayLoadingMessage(ModuleName); InbvIndicateProgress(); - Buffer = ExAllocatePool(PagedPool, ModuleName->Length + sizeof(UNICODE_NULL)); + Buffer = ExAllocatePoolWithTag(PagedPool, + ModuleName->Length + sizeof(UNICODE_NULL), + TAG_IO); if (Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -924,7 +926,7 @@ * Strip the file extension from ServiceName */ Success = RtlCreateUnicodeString(&ServiceName, FileNameWithoutPath); - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_IO); if (!Success) { return STATUS_INSUFFICIENT_RESOURCES; @@ -1284,7 +1286,9 @@ */ ObjectName.Length = ((USHORT)wcslen(Start) + 8) * sizeof(WCHAR); ObjectName.MaximumLength = ObjectName.Length + sizeof(WCHAR); - ObjectName.Buffer = ExAllocatePool(PagedPool, ObjectName.MaximumLength); + ObjectName.Buffer = ExAllocatePoolWithTag(PagedPool, + ObjectName.MaximumLength, + TAG_IO); if (!ObjectName.Buffer) return STATUS_INSUFFICIENT_RESOURCES; wcscpy(ObjectName.Buffer, DRIVER_ROOT_NAME); memcpy(ObjectName.Buffer + 8, Start, ObjectName.Length - 8 * sizeof(WCHAR)); @@ -1305,12 +1309,12 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Can't locate driver object for %wZ\n", &ObjectName); - ExFreePool(ObjectName.Buffer); + ExFreePoolWithTag(ObjectName.Buffer, TAG_IO); return Status; } /* Free the buffer for driver object name */ - ExFreePool(ObjectName.Buffer); + ExFreePoolWithTag(ObjectName.Buffer, TAG_IO); /* Check that driver is not already unloading */ if (DriverObject->Flags & DRVO_UNLOAD_INVOKED)

1 0

[hbelusca] 74495: [NTOS]: Addendums to r74491 and r74493: - Free the FullServiceName buffer if PnpRootCreateDevice failed (erroneously committed in r74494, see pnpmgr.c line 1080); - No need to clo...
by hbelusca＠svn.reactos.org 08 May '17

08 May '17

Author: hbelusca Date: Mon May 8 00:58:45 2017 New Revision: 74495 URL: http://svn.reactos.org/svn/reactos?rev=74495&view=rev Log: [NTOS]: Addendums to r74491 and r74493: - Free the FullServiceName buffer if PnpRootCreateDevice failed (erroneously committed in r74494, see pnpmgr.c line 1080); - No need to close InstanceHandle if the IopCreateDeviceKeyPath call failed, since in this case the registry handle wasn't opened. CORE-13207 - Don't assert on Buffer allocation but return a proper failure code in case of failure. CORE-13208 These are suggestions from Serge Gautherie + Lesan Ilie. - Add a forgotten ZwClose call in the success code path of IopCreateDeviceKeyPath in IopQueryDeviceCapabilities (by me). Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Mon May 8 00:58:45 2017 @@ -899,7 +899,10 @@ InbvIndicateProgress(); Buffer = ExAllocatePool(PagedPool, ModuleName->Length + sizeof(UNICODE_NULL)); - ASSERT(Buffer); + if (Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } RtlCopyMemory(Buffer, ModuleName->Buffer, ModuleName->Length); Buffer[ModuleName->Length / sizeof(WCHAR)] = UNICODE_NULL; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon May 8 00:58:45 2017 @@ -892,6 +892,8 @@ &DeviceCaps->UINumber, sizeof(ULONG)); } + + ZwClose(InstanceKey); } return Status; @@ -1086,7 +1088,6 @@ Status = IopCreateDeviceKeyPath(&Node->InstancePath, REG_OPTION_VOLATILE, &InstanceHandle); if (!NT_SUCCESS(Status)) { - ZwClose(InstanceHandle); ExFreePool(FullServiceName.Buffer); ExFreePoolWithTag(Node, TAG_IO_DEVNODE); return Status;

1 0

[hbelusca] 74494: [NTOS]: Code formatting + free the memory in the reverse order from how it was allocated.
by hbelusca＠svn.reactos.org 08 May '17

08 May '17

Author: hbelusca Date: Mon May 8 00:51:44 2017 New Revision: 74494 URL: http://svn.reactos.org/svn/reactos?rev=74494&view=rev Log: [NTOS]: Code formatting + free the memory in the reverse order from how it was allocated. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon May 8 00:51:44 2017 @@ -878,7 +878,7 @@ &ValueName, 0, REG_DWORD, - (PVOID)&DeviceNode->CapabilityFlags, + &DeviceNode->CapabilityFlags, sizeof(ULONG)); /* Set 'UINumber' value */ @@ -1077,6 +1077,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("PnpRootCreateDevice() failed with status 0x%08X\n", Status); + ExFreePool(FullServiceName.Buffer); ExFreePoolWithTag(Node, TAG_IO_DEVNODE); return Status; } @@ -1086,8 +1087,8 @@ if (!NT_SUCCESS(Status)) { ZwClose(InstanceHandle); + ExFreePool(FullServiceName.Buffer); ExFreePoolWithTag(Node, TAG_IO_DEVNODE); - ExFreePool(FullServiceName.Buffer); return Status; } @@ -1095,8 +1096,8 @@ if (!Node->ServiceName.Buffer) { ZwClose(InstanceHandle); + ExFreePool(FullServiceName.Buffer); ExFreePoolWithTag(Node, TAG_IO_DEVNODE); - ExFreePool(FullServiceName.Buffer); return Status; } @@ -1738,7 +1739,7 @@ &ValueName, 0, REG_SZ, - (PVOID)KeyValue.Buffer, + KeyValue.Buffer, ((ULONG)wcslen(KeyValue.Buffer) + 1) * sizeof(WCHAR)); cleanup: @@ -1859,11 +1860,11 @@ RtlInitUnicodeString(&ValueName, L"CompatibleIDs"); Status = ZwSetValueKey(InstanceKey, - &ValueName, - 0, - REG_MULTI_SZ, - (PVOID)IoStatusBlock.Information, - (TotalLength + 1) * sizeof(WCHAR)); + &ValueName, + 0, + REG_MULTI_SZ, + (PVOID)IoStatusBlock.Information, + (TotalLength + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("ZwSetValueKey() failed (Status %lx) or no Compatible ID returned\n", Status);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs