Ros-diffs January 2022

ros-diffs@reactos.org

28 participants
173 discussions

[reactos] 09/09: [PSDK] commctrl.h: Add missing 'U' unsigned indicators.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4fe4a5788928fb408500d… commit 4fe4a5788928fb408500d54d0caacd6d0d7a6924 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 29 00:14:17 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 30 01:02:12 2022 +0100 [PSDK] commctrl.h: Add missing 'U' unsigned indicators. --- sdk/include/psdk/commctrl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/commctrl.h b/sdk/include/psdk/commctrl.h index 845fd3061cb..8647947ab04 100644 --- a/sdk/include/psdk/commctrl.h +++ b/sdk/include/psdk/commctrl.h @@ -222,8 +222,8 @@ extern "C" { #define TBN_FIRST (0U-700U) #define TBN_LAST (0U-720U) -#define UDN_FIRST (0U-721) -#define UDN_LAST (0U-740) +#define UDN_FIRST (0U-721U) +#define UDN_LAST (0U-740U) #define MCN_FIRST (0U-750U) #define MCN_LAST (0U-759U)

2 years, 7 months

[reactos] 08/09: [CONSOLE.CPL] Fix problems detected by code analysis.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38f6fd9df7f8d1f37d765… commit 38f6fd9df7f8d1f37d7651683da7cf5af85d9f42 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 28 23:46:41 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 30 01:02:10 2022 +0100 [CONSOLE.CPL] Fix problems detected by code analysis. colors.c(129): warning C6287: Redundant code: the left and right sub-expressions are identical. colors.c(159): warning C6001: Using uninitialized memory 'colorIndex'. colors.c(180): warning C6385: Reading invalid data from 'ConInfo->ColorTable': the readable size is '64' bytes, but '259696' bytes may be read. (I thank ThFabba for the suggestion fix.) console.c(313): warning C6387: 'ConInfo->hWnd' could be '0': this does not adhere to the specification for the function 'SendMessageW'. font.c(60): warning C6387: 'Preview->hFont' could be '0': this does not adhere to the specification for the function 'GetFontCellSize'. font.c(230): warning C6001: Using uninitialized memory 'szFontSize'. font.c(230): warning C6054: String 'szFontSize' might not be zero-terminated. font.c(671): warning C6387: 'hFont' could be '0': this does not adhere to the specification for the function 'GetFontCellSize'. layout.c(502): warning C6387: 'FontPreview.hFont' could be '0': this does not adhere to the specification for the function 'SelectObject'. --- dll/cpl/console/colors.c | 28 ++++++++++++++++------------ dll/cpl/console/console.c | 18 ++++++++++++------ dll/cpl/console/font.c | 30 ++++++++++++++++++++++++------ dll/cpl/console/layout.c | 3 +++ 4 files changed, 55 insertions(+), 24 deletions(-) diff --git a/dll/cpl/console/colors.c b/dll/cpl/console/colors.c index f6a8c40e947..fee811d89bc 100644 --- a/dll/cpl/console/colors.c +++ b/dll/cpl/console/colors.c @@ -126,14 +126,16 @@ ColorsProc(HWND hDlg, case WM_COMMAND: { /* NOTE: both BN_CLICKED and STN_CLICKED == 0 */ - if (HIWORD(wParam) == BN_CLICKED || HIWORD(wParam) == STN_CLICKED) + if (HIWORD(wParam) == BN_CLICKED /* || HIWORD(wParam) == STN_CLICKED */) { - 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) + WORD ctrlIndex = LOWORD(wParam); + + if (ctrlIndex == IDC_RADIO_SCREEN_TEXT || + ctrlIndex == IDC_RADIO_SCREEN_BACKGROUND || + ctrlIndex == IDC_RADIO_POPUP_TEXT || + ctrlIndex == IDC_RADIO_POPUP_BACKGROUND) { - switch (LOWORD(wParam)) + switch (ctrlIndex) { case IDC_RADIO_SCREEN_TEXT: /* Get the colour of the screen foreground */ @@ -169,9 +171,9 @@ ColorsProc(HWND hDlg, break; } else - if (IDC_STATIC_COLOR1 <= LOWORD(wParam) && LOWORD(wParam) <= IDC_STATIC_COLOR16) + if (IDC_STATIC_COLOR1 <= ctrlIndex && ctrlIndex <= IDC_STATIC_COLOR16) { - colorIndex = LOWORD(wParam) - IDC_STATIC_COLOR1; + colorIndex = ctrlIndex - IDC_STATIC_COLOR1; /* If the same static control was re-clicked, don't take it into account */ if (colorIndex == ActiveStaticControl) @@ -213,9 +215,11 @@ ColorsProc(HWND hDlg, } else if (HIWORD(wParam) == EN_KILLFOCUS) { - if (LOWORD(wParam) == IDC_EDIT_COLOR_RED || - LOWORD(wParam) == IDC_EDIT_COLOR_GREEN || - LOWORD(wParam) == IDC_EDIT_COLOR_BLUE) + WORD ctrlIndex = LOWORD(wParam); + + if (ctrlIndex == IDC_EDIT_COLOR_RED || + ctrlIndex == IDC_EDIT_COLOR_GREEN || + ctrlIndex == IDC_EDIT_COLOR_BLUE) { DWORD value; @@ -224,7 +228,7 @@ ColorsProc(HWND hDlg, color = ConInfo->ColorTable[colorIndex]; /* Modify the colour component */ - switch (LOWORD(wParam)) + switch (ctrlIndex) { case IDC_EDIT_COLOR_RED: value = GetDlgItemInt(hDlg, IDC_EDIT_COLOR_RED, NULL, FALSE); diff --git a/dll/cpl/console/console.c b/dll/cpl/console/console.c index 09c204c630c..65640bc9282 100644 --- a/dll/cpl/console/console.c +++ b/dll/cpl/console/console.c @@ -112,7 +112,7 @@ ApplyConsoleInfo(HWND hwndDlg) SetConsoleInfo = (res != IDCANCEL); SaveConsoleInfo = (res == IDC_RADIO_APPLY_ALL); - if (SetConsoleInfo == FALSE) + if (!SetConsoleInfo) { /* Don't destroy when the user presses cancel */ SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); @@ -275,7 +275,7 @@ InitApplet(HANDLE hSectionOrWnd) ResetFontPreview(&FontPreview); ClearTTFontCache(); - /* Save the console settings */ + /* Apply the console settings if necessary */ if (SetConsoleInfo) { HANDLE hSection; @@ -303,19 +303,25 @@ InitApplet(HANDLE hSectionOrWnd) goto Quit; } - /* Copy the console information into the section */ + /* Copy the console information into the section and unmap it */ RtlCopyMemory(pSharedInfo, ConInfo, ConInfo->cbSize); - - /* Unmap it */ UnmapViewOfFile(pSharedInfo); - /* Signal to CONSRV that it can apply the new configuration */ + /* + * Signal to CONSRV that it can apply the new settings. + * + * NOTE: SetConsoleInfo set to TRUE by ApplyConsoleInfo() + * *only* when ConInfo->hWnd != NULL and the user did not + * press IDCANCEL in the confirmation dialog. + */ + ASSERT(ConInfo->hWnd); SendMessageW(ConInfo->hWnd, WM_SETCONSOLEINFO, (WPARAM)hSection, 0); /* Close the section and return */ CloseHandle(hSection); } + /* Save the console settings */ if (SaveConsoleInfo) { /* Default settings saved when ConInfo->hWnd == NULL */ diff --git a/dll/cpl/console/font.c b/dll/cpl/console/font.c index 0909417dfee..4cb5f4c61d3 100644 --- a/dll/cpl/console/font.c +++ b/dll/cpl/console/font.c @@ -53,11 +53,16 @@ RefreshFontPreview( IN FONT_PREVIEW* Preview, IN PCONSOLE_STATE_INFO pConInfo) { - if (Preview->hFont) DeleteObject(Preview->hFont); - Preview->hFont = CreateConsoleFont(pConInfo); - if (Preview->hFont == NULL) + HFONT hFont = CreateConsoleFont(pConInfo); + if (!hFont) + { DPRINT1("RefreshFontPreview: CreateConsoleFont() failed\n"); - GetFontCellSize(NULL, Preview->hFont, &Preview->CharHeight, &Preview->CharWidth); + return; + } + + if (Preview->hFont) DeleteObject(Preview->hFont); + Preview->hFont = hFont; + GetFontCellSize(NULL, hFont, &Preview->CharHeight, &Preview->CharWidth); } VOID @@ -223,8 +228,17 @@ FontSizeList_GetSelectedFontSize( * See: https://support.microsoft.com/en-us/help/66365/how-to-process-a-cbn-selchan… * for more details. */ + INT Length; + nSel = (INT)SendMessageW(SizeList->hWndTTSizeList, CB_GETCURSEL, 0, 0); - SendMessageW(SizeList->hWndTTSizeList, CB_GETLBTEXT, nSel, (LPARAM)szFontSize); + if (nSel == CB_ERR) return 0; + + Length = (INT)SendMessageW(SizeList->hWndTTSizeList, CB_GETLBTEXTLEN, nSel, 0); + ASSERT((Length != LB_ERR) && (Length < ARRAYSIZE(szFontSize))); + + Length = (INT)SendMessageW(SizeList->hWndTTSizeList, CB_GETLBTEXT, nSel, (LPARAM)szFontSize); + ASSERT((Length != LB_ERR) && (Length < ARRAYSIZE(szFontSize))); + szFontSize[Length] = L'\0'; /* Validate the font size */ FontSize = wcstoul(szFontSize, &pszNext, 10); @@ -558,6 +572,7 @@ FontTypeChange( if (FaceName == NULL) return FALSE; Length = (INT)SendMessageW(hFontList, LB_GETTEXT, nSel, (LPARAM)FaceName); + ASSERT(Length != LB_ERR); FaceName[Length] = L'\0'; StringCchCopyW(pConInfo->FaceName, ARRAYSIZE(pConInfo->FaceName), FaceName); @@ -664,8 +679,11 @@ FontSizeChange( CharWidth = (UINT)(SizeList->UseRasterOrTTList ? LOWORD(FontSize) : 0); hFont = CreateConsoleFont2((LONG)CharHeight, (LONG)CharWidth, pConInfo); - if (hFont == NULL) + if (!hFont) + { DPRINT1("FontSizeChange: CreateConsoleFont2() failed\n"); + return FALSE; + } /* Retrieve the real character size in pixels */ GetFontCellSize(NULL, hFont, &CharHeight, &CharWidth); diff --git a/dll/cpl/console/layout.c b/dll/cpl/console/layout.c index 8430b3de218..e275b518b9f 100644 --- a/dll/cpl/console/layout.c +++ b/dll/cpl/console/layout.c @@ -497,6 +497,9 @@ PaintText( /* Refresh the font preview, getting a new font if necessary */ if (FontPreview.hFont == NULL) RefreshFontPreview(&FontPreview, pConInfo); + /* Recheck hFont since RefreshFontPreview() may not have updated it */ + if (FontPreview.hFont == NULL) + return; /* Draw the preview text using the current font */ hOldFont = SelectObject(drawItem->hDC, FontPreview.hFont);

2 years, 7 months

[reactos] 07/09: [CONCFG] Rewrite the InitTTFontCache() registry enumeration loop.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b76aa5d192a53d821016… commit 3b76aa5d192a53d8210169cea526bd7312e54ec5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 29 19:28:54 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 30 01:02:09 2022 +0100 [CONCFG] Rewrite the InitTTFontCache() registry enumeration loop. --- win32ss/user/winsrv/concfg/font.c | 65 ++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/win32ss/user/winsrv/concfg/font.c b/win32ss/user/winsrv/concfg/font.c index 42ed5052036..2889d9dd5ef 100644 --- a/win32ss/user/winsrv/concfg/font.c +++ b/win32ss/user/winsrv/concfg/font.c @@ -399,51 +399,54 @@ IsValidConsoleFont( VOID InitTTFontCache(VOID) { - BOOLEAN Success; - HKEY hKeyTTFonts; // hKey; - DWORD dwNumValues = 0; - DWORD dwIndex; - DWORD dwType; + LRESULT lResult; + HKEY hKey; + DWORD dwIndex, dwType; WCHAR szValueName[MAX_PATH]; - DWORD dwValueName; + DWORD cchValueName; WCHAR szValue[LF_FACESIZE] = L""; - DWORD dwValue; - PTT_FONT_ENTRY FontEntry; - PWCHAR pszNext = NULL; + DWORD cbValue; UINT CodePage; + PTT_FONT_ENTRY FontEntry; + PWCHAR pszNext; if (!IsListEmpty(&TTFontCache)) return; // InitializeListHead(&TTFontCache); - /* Open the key */ + /* Open the Console\TrueTypeFont key */ // "\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Console\\TrueTypeFont" - Success = (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Console\\TrueTypeFont", - 0, - KEY_READ, - &hKeyTTFonts) == ERROR_SUCCESS); - if (!Success) - return; - - /* Enumerate each value */ - if (RegQueryInfoKeyW(hKeyTTFonts, NULL, NULL, NULL, NULL, NULL, NULL, - &dwNumValues, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Console\\TrueTypeFont", + 0, + KEY_QUERY_VALUE, + &hKey) != ERROR_SUCCESS) { - DPRINT("ConCfgReadUserSettings: RegQueryInfoKeyW failed\n"); - RegCloseKey(hKeyTTFonts); return; } - for (dwIndex = 0; dwIndex < dwNumValues; dwIndex++) + /* Enumerate all the available TrueType console fonts */ + for (dwIndex = 0, cchValueName = ARRAYSIZE(szValueName), + cbValue = sizeof(szValue); + (lResult = RegEnumValueW(hKey, dwIndex, + szValueName, &cchValueName, + NULL, &dwType, + (PBYTE)szValue, &cbValue)) != ERROR_NO_MORE_ITEMS; + ++dwIndex, cchValueName = ARRAYSIZE(szValueName), + cbValue = sizeof(szValue)) { - dwValue = sizeof(szValue); - dwValueName = ARRAYSIZE(szValueName); - if (RegEnumValueW(hKeyTTFonts, dwIndex, szValueName, &dwValueName, NULL, &dwType, (BYTE*)szValue, &dwValue) != ERROR_SUCCESS) - { - DPRINT1("InitTTFontCache: RegEnumValueW failed, continuing...\n"); + /* Ignore if we failed for another reason, e.g. because + * the value name is too long (and thus, invalid). */ + if (lResult != ERROR_SUCCESS) continue; - } + + /* Validate the value name (exclude the unnamed value) */ + if (!cchValueName || (*szValueName == UNICODE_NULL)) + continue; + /* Too large value names have already been handled with ERROR_MORE_DATA */ + ASSERT((cchValueName < ARRAYSIZE(szValueName)) && + (szValueName[cchValueName] == UNICODE_NULL)); + /* Only (multi-)string values are supported */ if ((dwType != REG_SZ) && (dwType != REG_MULTI_SZ)) continue; @@ -502,7 +505,7 @@ InitTTFontCache(VOID) } /* Close the key and quit */ - RegCloseKey(hKeyTTFonts); + RegCloseKey(hKey); } VOID

2 years, 7 months

[reactos] 06/09: [CONSOLE.CPL] Rewrite the BuildCodePageList() registry enumeration loop and use far less stack space.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a5536c540ce5d075bf4e… commit 2a5536c540ce5d075bf4ea12cc185140f8431953 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 29 18:42:23 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 30 01:02:08 2022 +0100 [CONSOLE.CPL] Rewrite the BuildCodePageList() registry enumeration loop and use far less stack space. Any valid code page value name in System\CurrentControlSet\Control\Nls\CodePage is a string representation of its corresponding decimal value, that cannot be larger than MAXUSHORT == 65535, i.e. longer than 5+1 characters. Noticed with the analyser warning dll\cpl\console\options.c(74): warning C6262: Function uses '32808' bytes of stack: exceeds /analyze:stacksize '16384'. Consider moving some data to heap. Make the enumeration loop actually stop when ERROR_NO_MORE_ITEMS is returned. If we got another error, e.g. because the value name was too long (and thus, an invalid code page), just ignore and continue looping. --- dll/cpl/console/options.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dll/cpl/console/options.c b/dll/cpl/console/options.c index 57e34d96f06..687b52c0f1d 100644 --- a/dll/cpl/console/options.c +++ b/dll/cpl/console/options.c @@ -76,17 +76,23 @@ BuildCodePageList( IN UINT CurrentCodePage) { LIST_CTL ListCtl; + LRESULT lResult; HKEY hKey; - DWORD dwIndex, dwSize, dwType; + DWORD dwIndex, dwType; + DWORD cchValueName; UINT CodePage; - WCHAR szValueName[MAX_VALUE_NAME]; - // #define REGSTR_PATH_CODEPAGE TEXT("System\\CurrentControlSet\\Control\\Nls\\CodePage") + /* Valid code page value names are string representations + * of their corresponding decimal values, that are not larger + * than MAXUSHORT == 65535. */ + WCHAR szValueName[sizeof("65535")]; + /* Open the Nls\CodePage key */ + // #define REGSTR_PATH_CODEPAGE TEXT("System\\CurrentControlSet\\Control\\Nls\\CodePage") if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Nls\\CodePage", 0, - KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, + KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) { return; @@ -97,16 +103,26 @@ BuildCodePageList( ListCtl.GetData = List_GetData; /* Enumerate all the available code pages on the system */ - dwSize = ARRAYSIZE(szValueName); - dwIndex = 0; - while (RegEnumValueW(hKey, dwIndex, szValueName, &dwSize, - NULL, &dwType, NULL, NULL) == ERROR_SUCCESS) // != ERROR_NO_MORE_ITEMS + for (dwIndex = 0, cchValueName = ARRAYSIZE(szValueName); + (lResult = RegEnumValueW(hKey, dwIndex, + szValueName, &cchValueName, + NULL, &dwType, + NULL, NULL)) != ERROR_NO_MORE_ITEMS; + ++dwIndex, cchValueName = ARRAYSIZE(szValueName)) { - /* Ignore these parameters, prepare for next iteration */ - dwSize = ARRAYSIZE(szValueName); - ++dwIndex; + /* Ignore if we failed for another reason, e.g. because + * the value name is too long (and thus, invalid). */ + if (lResult != ERROR_SUCCESS) + continue; + + /* Validate the value name (exclude the unnamed value) */ + if (!cchValueName || (*szValueName == UNICODE_NULL)) + continue; + /* Too large value names have already been handled with ERROR_MORE_DATA */ + ASSERT((cchValueName < ARRAYSIZE(szValueName)) && + (szValueName[cchValueName] == UNICODE_NULL)); - /* Check the value type validity */ + /* Validate the value type */ if (dwType != REG_SZ) continue;

2 years, 7 months

[reactos] 05/09: [CONSOLE.CPL] Use fallback brushes for text preview in case CreateSolidBrush() fails (e.g. low memory scenario).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13b34253694811739064d… commit 13b34253694811739064de9efa6be2881b138c19 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 29 02:20:26 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 30 01:02:07 2022 +0100 [CONSOLE.CPL] Use fallback brushes for text preview in case CreateSolidBrush() fails (e.g. low memory scenario). --- dll/cpl/console/colors.c | 6 ++---- dll/cpl/console/layout.c | 19 ++++++++----------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dll/cpl/console/colors.c b/dll/cpl/console/colors.c index b4d1c337e01..f6a8c40e947 100644 --- a/dll/cpl/console/colors.c +++ b/dll/cpl/console/colors.c @@ -26,10 +26,8 @@ PaintStaticControls( ARRAYSIZE(pConInfo->ColorTable) - 1); hBrush = CreateSolidBrush(pConInfo->ColorTable[index]); - if (!hBrush) return; - - FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); - DeleteObject(hBrush); + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush ? hBrush : GetStockObject(BLACK_BRUSH)); + if (hBrush) DeleteObject(hBrush); if (ActiveStaticControl == index) DrawFocusRect(drawItem->hDC, &drawItem->rcItem); diff --git a/dll/cpl/console/layout.c b/dll/cpl/console/layout.c index a94bcb53241..8430b3de218 100644 --- a/dll/cpl/console/layout.c +++ b/dll/cpl/console/layout.c @@ -390,8 +390,8 @@ WinPrev_OnDraw( /* Draw the console background */ hBrush = CreateSolidBrush(pConInfo->ColorTable[BkgdAttribFromAttrib(pConInfo->ScreenAttributes)]); - FillRect(hDC, &rcWin, hBrush); - DeleteObject(hBrush); + FillRect(hDC, &rcWin, hBrush ? hBrush : GetStockObject(BLACK_BRUSH)); + if (hBrush) DeleteObject(hBrush); } static LRESULT CALLBACK @@ -489,20 +489,18 @@ PaintText( nbkColor = pConInfo->ColorTable[BkgdAttribFromAttrib(CurrentAttrib)]; ntColor = pConInfo->ColorTable[TextAttribFromAttrib(CurrentAttrib)]; + /* Draw the console background */ hBrush = CreateSolidBrush(nbkColor); - if (!hBrush) return; + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush ? hBrush : GetStockObject(BLACK_BRUSH)); + if (hBrush) DeleteObject(hBrush); + /* Refresh the font preview, getting a new font if necessary */ if (FontPreview.hFont == NULL) RefreshFontPreview(&FontPreview, pConInfo); + /* Draw the preview text using the current font */ hOldFont = SelectObject(drawItem->hDC, FontPreview.hFont); - //if (hOldFont == NULL) - //{ - // DeleteObject(hBrush); - // return; - //} - - FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + // if (!hOldFont) return; /* Add a few space between the preview window border and the text sample */ InflateRect(&drawItem->rcItem, -2, -2); @@ -514,7 +512,6 @@ PaintText( SetBkColor(drawItem->hDC, pbkColor); SelectObject(drawItem->hDC, hOldFont); - DeleteObject(hBrush); }

2 years, 7 months

[reactos] 04/09: [CONSOLE.CPL] Add missing/fix some SendMessageW result casts.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e5496d082198f37f8d8e… commit 0e5496d082198f37f8d8e37de9caf9609d8e78a1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 29 01:39:02 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 30 01:02:06 2022 +0100 [CONSOLE.CPL] Add missing/fix some SendMessageW result casts. --- dll/cpl/console/font.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/cpl/console/font.c b/dll/cpl/console/font.c index e6a998842dd..0909417dfee 100644 --- a/dll/cpl/console/font.c +++ b/dll/cpl/console/font.c @@ -165,7 +165,7 @@ FontSizeList_SelectFontSize( * We got an index beyond the end of the list (as per Bisect* functionality), * so instead, select the last element of the list. */ - nSel = idx-1; + nSel = idx - 1; } SendMessageW(SizeList->RasterSizeList.hWndList, LB_SETCURSEL, (WPARAM)nSel, 0); } @@ -178,10 +178,10 @@ FontSizeList_SelectFontSize( StringCchPrintfW(szFontSize, ARRAYSIZE(szFontSize), L"%d", FontSize); /* Find the font size in the list, or add it both in the ComboBox list, sorted by size value (string), and its edit box */ - nSel = SendMessageW(SizeList->hWndTTSizeList, CB_FINDSTRINGEXACT, 0, (LPARAM)szFontSize); + nSel = (INT)SendMessageW(SizeList->hWndTTSizeList, CB_FINDSTRINGEXACT, 0, (LPARAM)szFontSize); if (nSel == CB_ERR) { - nSel = (UINT)SendMessageW(SizeList->hWndTTSizeList, CB_ADDSTRING, -1, (LPARAM)szFontSize); + nSel = (INT)SendMessageW(SizeList->hWndTTSizeList, CB_ADDSTRING, -1, (LPARAM)szFontSize); // ComboBox_SetText(...) SetWindowTextW(SizeList->hWndTTSizeList, szFontSize); SizeList->bIsTTSizeDirty = TRUE; @@ -223,7 +223,7 @@ FontSizeList_GetSelectedFontSize( * See: https://support.microsoft.com/en-us/help/66365/how-to-process-a-cbn-selchan… * for more details. */ - nSel = SendMessageW(SizeList->hWndTTSizeList, CB_GETCURSEL, 0, 0); + nSel = (INT)SendMessageW(SizeList->hWndTTSizeList, CB_GETCURSEL, 0, 0); SendMessageW(SizeList->hWndTTSizeList, CB_GETLBTEXT, nSel, (LPARAM)szFontSize); /* Validate the font size */ @@ -243,10 +243,10 @@ FontSizeList_GetSelectedFontSize( return 0; /* Find if the font size already exists in the list; if not, add it */ - nSel = SendMessageW(SizeList->hWndTTSizeList, CB_FINDSTRINGEXACT, 0, (LPARAM)szFontSize); + nSel = (INT)SendMessageW(SizeList->hWndTTSizeList, CB_FINDSTRINGEXACT, 0, (LPARAM)szFontSize); if (nSel == CB_ERR) { - nSel = (UINT)SendMessageW(SizeList->hWndTTSizeList, CB_ADDSTRING, -1, (LPARAM)szFontSize); + nSel = (INT)SendMessageW(SizeList->hWndTTSizeList, CB_ADDSTRING, -1, (LPARAM)szFontSize); //// ComboBox_SetText(...) //SetWindowTextW(SizeList->hWndTTSizeList, szFontSize); //SizeList->bIsTTSizeDirty = TRUE;

2 years, 7 months

[reactos] 03/09: [CONSOLE.CPL] Update faces/fonts list on Fonts page activation, when the current code page has changed.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=446eb609378e8493de458… commit 446eb609378e8493de45834348080c3c155e9000 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 28 03:00:31 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 30 01:02:05 2022 +0100 [CONSOLE.CPL] Update faces/fonts list on Fonts page activation, when the current code page has changed. --- dll/cpl/console/font.c | 85 ++++++++++++++++++++++++++--------------------- dll/cpl/console/options.c | 5 ++- 2 files changed, 50 insertions(+), 40 deletions(-) diff --git a/dll/cpl/console/font.c b/dll/cpl/console/font.c index 522a6fbaaf4..e6a998842dd 100644 --- a/dll/cpl/console/font.c +++ b/dll/cpl/console/font.c @@ -44,6 +44,9 @@ typedef struct _FONTSIZE_LIST_CTL static INT CurrentSelFont = LB_ERR; static DWORD CurrentFontType = (DWORD)-1; // Invalid font type +/* Detect whether the current code page has changed */ +static UINT CurrentCodePage = INVALID_CP; + VOID RefreshFontPreview( @@ -311,11 +314,11 @@ EnumFaceNamesProc( if (IsValidConsoleFont2(lplf, lpntm, FontType, Param->CodePage)) { - /* Add the font to the list */ + /* Add the face name to the list */ AddFontToList(Param->hWndList, lplf->lfFaceName, FontType); } - /* Continue the font enumeration */ + /* Continue enumerating the faces */ return TRUE; } @@ -387,6 +390,9 @@ FaceNameList_Initialize( LOGFONTW lf; INT idx; + /* Reset the face names list */ + SendMessageW(hWndList, LB_RESETCONTENT, 0, 0); + Param.hWndList = hWndList; Param.CodePage = CodePage; @@ -401,7 +407,7 @@ FaceNameList_Initialize( idx = (INT)SendMessageW(hWndList, LB_GETCOUNT, 0, 0); if (idx != LB_ERR && idx != 0) { - /* We have found some fonts and filled the list, we are fine! */ + /* We have found some faces and filled the list, we are fine! */ return; } @@ -522,14 +528,14 @@ FontTypeChange( IN PFONTSIZE_LIST_CTL SizeList, IN OUT PCONSOLE_STATE_INFO pConInfo) { - HWND hListBox = GetDlgItem(hDlg, IDC_LBOX_FONTTYPE); + HWND hFontList = GetDlgItem(hDlg, IDC_LBOX_FONTTYPE); INT Length, nSel; LPWSTR FaceName; DWORD FontType; LPCWSTR FontGrpBoxLabelTpl = NULL; WCHAR FontGrpBoxLabel[260]; - nSel = (INT)SendMessageW(hListBox, LB_GETCURSEL, 0, 0); + nSel = (INT)SendMessageW(hFontList, LB_GETCURSEL, 0, 0); if (nSel == LB_ERR) return FALSE; /* @@ -543,7 +549,7 @@ FontTypeChange( return FALSE; #endif - Length = (INT)SendMessageW(hListBox, LB_GETTEXTLEN, nSel, 0); + Length = (INT)SendMessageW(hFontList, LB_GETTEXTLEN, nSel, 0); if (Length == LB_ERR) return FALSE; FaceName = HeapAlloc(GetProcessHeap(), @@ -551,7 +557,7 @@ FontTypeChange( (Length + 1) * sizeof(WCHAR)); if (FaceName == NULL) return FALSE; - Length = (INT)SendMessageW(hListBox, LB_GETTEXT, nSel, (LPARAM)FaceName); + Length = (INT)SendMessageW(hFontList, LB_GETTEXT, nSel, (LPARAM)FaceName); FaceName[Length] = L'\0'; StringCchCopyW(pConInfo->FaceName, ARRAYSIZE(pConInfo->FaceName), FaceName); @@ -579,7 +585,7 @@ FontTypeChange( * we always display the TrueType default sizes and we don't need to * recreate the list when we change between different TrueType fonts. */ - FontType = SendMessageW(hListBox, LB_GETITEMDATA, nSel, 0); + FontType = (DWORD)SendMessageW(hFontList, LB_GETITEMDATA, nSel, 0); if (FontType != LB_ERR) { SizeList->UseRasterOrTTList = (FontType == RASTER_FONTTYPE); @@ -709,8 +715,6 @@ FontProc(HWND hDlg, { case WM_INITDIALOG: { - HWND hFontList = GetDlgItem(hDlg, IDC_LBOX_FONTTYPE); - SizeList = (PFONTSIZE_LIST_CTL)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*SizeList)); if (!SizeList) { @@ -733,20 +737,10 @@ FontProc(HWND hDlg, UpdateFontSizeList(hDlg, SizeList); - /* Initialize the font list */ - FaceNameList_Initialize(hFontList, ConInfo->CodePage); - - /* Select the current font */ DPRINT1("ConInfo->FaceName = '%S'\n", ConInfo->FaceName); - FaceNameList_SelectFont(hDlg, hFontList, - SizeList, - ConInfo->FaceName, - ConInfo->FontFamily, - ConInfo->FontWeight, - ConInfo->FontSize); - /* Refresh everything */ - FontTypeChange(hDlg, SizeList, ConInfo); + /* Face names list and current font selection will be done during PSN_SETACTIVE notification */ + // CurrentCodePage = INVALID_CP; return TRUE; } @@ -776,21 +770,6 @@ FontProc(HWND hDlg, break; } -#if 0 - case PSM_QUERYSIBLINGS: - { - /* - * If this is a notification from the "Options" dialog because we - * changed the code page, treat it using the WM_FONTCHANGE case, - * otherwise ignore it. - */ - if (wParam != IDL_CODEPAGE) - return FALSE; - - /* Fall through */ - } -#endif - case WM_FONTCHANGE: { /* The pool of font resources has changed, re-enumerate the fonts */ @@ -821,6 +800,38 @@ FontProc(HWND hDlg, ApplyConsoleInfo(hDlg); return TRUE; } + + case PSN_SETACTIVE: + { + /* Check whether the current code page has changed. + * If so, re-enumerate the fonts. */ + if (CurrentCodePage != ConInfo->CodePage) + { + HWND hFontList; + + /* Save the new code page */ + CurrentCodePage = ConInfo->CodePage; + + hFontList = GetDlgItem(hDlg, IDC_LBOX_FONTTYPE); + + /* Initialize the font list */ + FaceNameList_Initialize(hFontList, ConInfo->CodePage); + + /* Select the current font */ + FaceNameList_SelectFont(hDlg, hFontList, + SizeList, + ConInfo->FaceName, + ConInfo->FontFamily, + ConInfo->FontWeight, + ConInfo->FontSize); + + /* Refresh everything */ + FontTypeChange(hDlg, SizeList, ConInfo); + } + + /* Fall back to default behaviour */ + break; + } } break; diff --git a/dll/cpl/console/options.c b/dll/cpl/console/options.c index e35a2479439..57e34d96f06 100644 --- a/dll/cpl/console/options.c +++ b/dll/cpl/console/options.c @@ -349,12 +349,11 @@ OptionsProc(HWND hDlg, if (CodePage == CB_ERR) break; - /* If the user validated a different code page... */ + /* If the user has selected a different code page... */ if ((HIWORD(wParam) == CBN_SELENDOK) && (CodePage != ConInfo->CodePage)) { - /* ... update the code page, notify the siblings and change the property sheet state */ + /* ... update the code page and change the property sheet state */ ConInfo->CodePage = CodePage; - // PropSheet_QuerySiblings(GetParent(hDlg), IDL_CODEPAGE, 0); ResetFontPreview(&FontPreview); PropSheet_Changed(GetParent(hDlg), hDlg); }

2 years, 7 months

[reactos] 02/09: [CONCFG] IsValidConsoleFont(): Validate font against charset corresponding to selected code page.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f650cbdb680a07bf5bd19… commit f650cbdb680a07bf5bd198e7771304e72f71525e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 28 02:28:36 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 30 01:02:04 2022 +0100 [CONCFG] IsValidConsoleFont(): Validate font against charset corresponding to selected code page. --- win32ss/user/winsrv/concfg/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/winsrv/concfg/font.c b/win32ss/user/winsrv/concfg/font.c index 2c5e9abc83a..42ed5052036 100644 --- a/win32ss/user/winsrv/concfg/font.c +++ b/win32ss/user/winsrv/concfg/font.c @@ -376,7 +376,7 @@ IsValidConsoleFont( Param.CodePage = CodePage; RtlZeroMemory(&lf, sizeof(lf)); - lf.lfCharSet = DEFAULT_CHARSET; // CodePageToCharSet(CodePage); + lf.lfCharSet = CodePageToCharSet(CodePage); // lf.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; StringCchCopyW(lf.lfFaceName, ARRAYSIZE(lf.lfFaceName), FaceName);

2 years, 7 months

[reactos] 01/09: [CONCFG:FONT] Add SAL annotations.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1530a678a8259114e6f62… commit 1530a678a8259114e6f625ba0a0b8dd7cc713c18 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 24 16:45:59 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 30 01:01:58 2022 +0100 [CONCFG:FONT] Add SAL annotations. --- win32ss/user/winsrv/concfg/font.c | 58 +++++++++++++++++++++------------------ win32ss/user/winsrv/concfg/font.h | 50 +++++++++++++++++---------------- 2 files changed, 58 insertions(+), 50 deletions(-) diff --git a/win32ss/user/winsrv/concfg/font.c b/win32ss/user/winsrv/concfg/font.c index 1c3cbb4f191..2c5e9abc83a 100644 --- a/win32ss/user/winsrv/concfg/font.c +++ b/win32ss/user/winsrv/concfg/font.c @@ -30,7 +30,7 @@ LIST_ENTRY TTFontCache = {&TTFontCache, &TTFontCache}; /* Retrieves the character set associated with a given code page */ BYTE CodePageToCharSet( - IN UINT CodePage) + _In_ UINT CodePage) { CHARSETINFO CharInfo; if (TranslateCharsetInfo(UlongToPtr(CodePage), &CharInfo, TCI_SRCCODEPAGE)) @@ -41,12 +41,13 @@ CodePageToCharSet( HFONT CreateConsoleFontEx( - IN LONG Height, - IN LONG Width OPTIONAL, - IN OUT LPWSTR FaceName, // Points to a WCHAR array of LF_FACESIZE elements - IN ULONG FontFamily, - IN ULONG FontWeight, - IN UINT CodePage) + _In_ LONG Height, + _In_opt_ LONG Width, + _Inout_updates_z_(LF_FACESIZE) + PWSTR FaceName, + _In_ ULONG FontFamily, + _In_ ULONG FontWeight, + _In_ UINT CodePage) { LOGFONTW lf; @@ -85,9 +86,9 @@ CreateConsoleFontEx( HFONT CreateConsoleFont2( - IN LONG Height, - IN LONG Width OPTIONAL, - IN OUT PCONSOLE_STATE_INFO ConsoleInfo) + _In_ LONG Height, + _In_opt_ LONG Width, + _Inout_ PCONSOLE_STATE_INFO ConsoleInfo) { return CreateConsoleFontEx(Height, Width, @@ -99,7 +100,7 @@ CreateConsoleFont2( HFONT CreateConsoleFont( - IN OUT PCONSOLE_STATE_INFO ConsoleInfo) + _Inout_ PCONSOLE_STATE_INFO ConsoleInfo) { /* * Format: @@ -115,12 +116,13 @@ CreateConsoleFont( ConsoleInfo->CodePage); } +_Success_(return) BOOL GetFontCellSize( - IN HDC hDC OPTIONAL, - IN HFONT hFont, - OUT PUINT Height, - OUT PUINT Width) + _In_opt_ HDC hDC, + _In_ HFONT hFont, + _Out_ PUINT Height, + _Out_ PUINT Width) { BOOL Success = FALSE; HDC hOrgDC = hDC; @@ -186,10 +188,10 @@ Quit: BOOL IsValidConsoleFont2( - IN PLOGFONTW lplf, - IN PNEWTEXTMETRICW lpntm, - IN DWORD FontType, - IN UINT CodePage) + _In_ PLOGFONTW lplf, + _In_ PNEWTEXTMETRICW lpntm, + _In_ DWORD FontType, + _In_ UINT CodePage) { LPCWSTR FaceName = lplf->lfFaceName; @@ -348,10 +350,10 @@ typedef struct _IS_VALID_CONSOLE_FONT_PARAM static BOOL CALLBACK IsValidConsoleFontProc( - IN PLOGFONTW lplf, - IN PNEWTEXTMETRICW lpntm, - IN DWORD FontType, - IN LPARAM lParam) + _In_ PLOGFONTW lplf, + _In_ PNEWTEXTMETRICW lpntm, + _In_ DWORD FontType, + _In_ LPARAM lParam) { PIS_VALID_CONSOLE_FONT_PARAM Param = (PIS_VALID_CONSOLE_FONT_PARAM)lParam; Param->IsValidFont = IsValidConsoleFont2(lplf, lpntm, FontType, Param->CodePage); @@ -362,8 +364,9 @@ IsValidConsoleFontProc( BOOL IsValidConsoleFont( - IN LPCWSTR FaceName, - IN UINT CodePage) + // _In_reads_or_z_(LF_FACESIZE) + _In_ PCWSTR FaceName, + _In_ UINT CodePage) { IS_VALID_CONSOLE_FONT_PARAM Param; HDC hDC; @@ -526,8 +529,9 @@ RefreshTTFontCache(VOID) PTT_FONT_ENTRY FindCachedTTFont( - IN LPCWSTR FaceName, - IN UINT CodePage) + // _In_reads_or_z_(LF_FACESIZE) + _In_ PCWSTR FaceName, + _In_ UINT CodePage) { PLIST_ENTRY Entry; PTT_FONT_ENTRY FontEntry; diff --git a/win32ss/user/winsrv/concfg/font.h b/win32ss/user/winsrv/concfg/font.h index ee1aa92736c..15224b3f9d6 100644 --- a/win32ss/user/winsrv/concfg/font.h +++ b/win32ss/user/winsrv/concfg/font.h @@ -59,45 +59,48 @@ typedef struct _TT_FONT_ENTRY BYTE CodePageToCharSet( - IN UINT CodePage); + _In_ UINT CodePage); HFONT CreateConsoleFontEx( - IN LONG Height, - IN LONG Width OPTIONAL, - IN OUT LPWSTR FaceName, // Points to a WCHAR array of LF_FACESIZE elements - IN ULONG FontFamily, - IN ULONG FontWeight, - IN UINT CodePage); + _In_ LONG Height, + _In_opt_ LONG Width, + _Inout_updates_z_(LF_FACESIZE) + PWSTR FaceName, + _In_ ULONG FontFamily, + _In_ ULONG FontWeight, + _In_ UINT CodePage); HFONT CreateConsoleFont2( - IN LONG Height, - IN LONG Width OPTIONAL, - IN OUT PCONSOLE_STATE_INFO ConsoleInfo); + _In_ LONG Height, + _In_opt_ LONG Width, + _Inout_ PCONSOLE_STATE_INFO ConsoleInfo); HFONT CreateConsoleFont( - IN OUT PCONSOLE_STATE_INFO ConsoleInfo); + _Inout_ PCONSOLE_STATE_INFO ConsoleInfo); +_Success_(return) BOOL GetFontCellSize( - IN HDC hDC OPTIONAL, - IN HFONT hFont, - OUT PUINT Height, - OUT PUINT Width); + _In_opt_ HDC hDC, + _In_ HFONT hFont, + _Out_ PUINT Height, + _Out_ PUINT Width); BOOL IsValidConsoleFont2( - IN PLOGFONTW lplf, - IN PNEWTEXTMETRICW lpntm, - IN DWORD FontType, - IN UINT CodePage); + _In_ PLOGFONTW lplf, + _In_ PNEWTEXTMETRICW lpntm, + _In_ DWORD FontType, + _In_ UINT CodePage); BOOL IsValidConsoleFont( - IN LPCWSTR FaceName, - IN UINT CodePage); + // _In_reads_or_z_(LF_FACESIZE) + _In_ PCWSTR FaceName, + _In_ UINT CodePage); /* * To install additional TrueType fonts to be available for the console, @@ -119,8 +122,9 @@ RefreshTTFontCache(VOID); PTT_FONT_ENTRY FindCachedTTFont( - IN LPCWSTR FaceName, - IN UINT CodePage); + // _In_reads_or_z_(LF_FACESIZE) + _In_ PCWSTR FaceName, + _In_ UINT CodePage); #define IsAdditionalTTFont(FaceName) \ (FindCachedTTFont((FaceName), INVALID_CP) != NULL)

2 years, 7 months

[reactos] 01/01: [WDMAUD.DRV] Enable the module for amd64 architecture

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1cda2fb9e855468a2c10… commit e1cda2fb9e855468a2c1069ac464e1987ed1d301 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Jan 29 12:28:55 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Jan 29 12:28:55 2022 +0300 [WDMAUD.DRV] Enable the module for amd64 architecture --- dll/win32/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index d596b912ab0..fad02b4cc03 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -228,9 +228,7 @@ add_subdirectory(version) add_subdirectory(vssapi) add_subdirectory(wbemdisp) add_subdirectory(wbemprox) -if(ARCH STREQUAL "i386") - add_subdirectory(wdmaud.drv) -endif() +add_subdirectory(wdmaud.drv) add_subdirectory(windowscodecs) add_subdirectory(windowscodecsext) add_subdirectory(winemp3.acm)

2 years, 7 months

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 January 2022