Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [AMSTREAM_WINETEST] Add missing dependency
by Jérôme Gardou 05 Sep '22

05 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98e8827a59326ce6bbfac… commit 98e8827a59326ce6bbfacf9cfbd1fd34f45bcd74 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Sep 5 18:25:14 2022 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Sep 5 18:27:25 2022 +0200 [AMSTREAM_WINETEST] Add missing dependency --- modules/rostests/winetests/amstream/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rostests/winetests/amstream/CMakeLists.txt b/modules/rostests/winetests/amstream/CMakeLists.txt index f7808e7a204..5e7433c27a6 100644 --- a/modules/rostests/winetests/amstream/CMakeLists.txt +++ b/modules/rostests/winetests/amstream/CMakeLists.txt @@ -4,3 +4,4 @@ target_link_libraries(amstream_winetest uuid) set_module_type(amstream_winetest win32cui) add_importlibs(amstream_winetest ole32 user32 ddraw msvcrt kernel32) add_rostests_file(TARGET amstream_winetest) +add_dependencies(amstream_winetest dxsdk)

1 0

[reactos] 01/01: [NOTEPAD] Improve UTF-8 encoding support and improve status bar (#4649)
by Thamatip Chitpong 05 Sep '22

05 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d73b6cedf2482b68afc62… commit d73b6cedf2482b68afc625aad2fae6451d47763d Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Mon Sep 5 23:21:27 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 5 18:21:27 2022 +0200 [NOTEPAD] Improve UTF-8 encoding support and improve status bar (#4649) - Add write support for UTF-8 without BOM. - Add "UTF-8 with BOM" encoding to the "Save As" dialog. - Show line endings and encoding on the status bar (like Notepad in Windows 10). - Remove ignored WS_EX_STATICEDGE - Add grip to the status window. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/applications/notepad/dialog.c | 87 +++++++++++++++++++++++++++++++-- base/applications/notepad/dialog.h | 1 + base/applications/notepad/lang/bg-BG.rc | 1 + base/applications/notepad/lang/cs-CZ.rc | 1 + base/applications/notepad/lang/da-DK.rc | 1 + base/applications/notepad/lang/de-DE.rc | 1 + base/applications/notepad/lang/el-GR.rc | 1 + base/applications/notepad/lang/en-US.rc | 1 + base/applications/notepad/lang/es-ES.rc | 1 + base/applications/notepad/lang/et-EE.rc | 1 + base/applications/notepad/lang/eu-ES.rc | 1 + base/applications/notepad/lang/fi-FI.rc | 1 + base/applications/notepad/lang/fr-FR.rc | 1 + base/applications/notepad/lang/he-IL.rc | 1 + base/applications/notepad/lang/hi-IN.rc | 1 + base/applications/notepad/lang/hr-HR.rc | 1 + base/applications/notepad/lang/hu-HU.rc | 1 + base/applications/notepad/lang/hy-AM.rc | 1 + base/applications/notepad/lang/id-ID.rc | 1 + base/applications/notepad/lang/it-IT.rc | 1 + base/applications/notepad/lang/ja-JP.rc | 1 + base/applications/notepad/lang/lt-LT.rc | 1 + base/applications/notepad/lang/ms-MY.rc | 1 + base/applications/notepad/lang/nl-NL.rc | 1 + base/applications/notepad/lang/no-NO.rc | 1 + base/applications/notepad/lang/pl-PL.rc | 1 + base/applications/notepad/lang/pt-BR.rc | 1 + base/applications/notepad/lang/pt-PT.rc | 1 + base/applications/notepad/lang/ro-RO.rc | 1 + base/applications/notepad/lang/ru-RU.rc | 1 + base/applications/notepad/lang/sk-SK.rc | 1 + base/applications/notepad/lang/sl-SI.rc | 1 + base/applications/notepad/lang/sq-AL.rc | 1 + base/applications/notepad/lang/sv-SE.rc | 1 + base/applications/notepad/lang/th-TH.rc | 1 + base/applications/notepad/lang/tr-TR.rc | 1 + base/applications/notepad/lang/uk-UA.rc | 1 + base/applications/notepad/lang/uz-UZ.rc | 1 + base/applications/notepad/lang/zh-CN.rc | 1 + base/applications/notepad/lang/zh-HK.rc | 1 + base/applications/notepad/lang/zh-TW.rc | 1 + base/applications/notepad/main.c | 9 +++- base/applications/notepad/main.h | 3 +- base/applications/notepad/notepad_res.h | 23 ++++----- base/applications/notepad/text.c | 20 ++++---- 45 files changed, 154 insertions(+), 28 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 1b10084e99b..6e45d05798e 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -33,6 +33,27 @@ static const TCHAR empty_str[] = _T(""); static const TCHAR szDefaultExt[] = _T("txt"); static const TCHAR txt_files[] = _T("*.txt"); +/* Status bar parts index */ +#define SBPART_CURPOS 0 +#define SBPART_EOLN 1 +#define SBPART_ENCODING 2 + +/* Line endings - string resource ID mapping table */ +static UINT EolnToStrId[] = { + STRING_CRLF, + STRING_LF, + STRING_CR +}; + +/* Encoding - string resource ID mapping table */ +static UINT EncToStrId[] = { + STRING_ANSI, + STRING_UNICODE, + STRING_UNICODE_BE, + STRING_UTF8, + STRING_UTF8_BOM +}; + static UINT_PTR CALLBACK DIALOG_PAGESETUP_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); VOID ShowLastError(VOID) @@ -104,6 +125,45 @@ void UpdateWindowCaption(BOOL clearModifyAlert) SetWindowText(Globals.hMainWnd, szCaption); } +VOID DIALOG_StatusBarAlignParts(VOID) +{ + static const int defaultWidths[] = {120, 120, 120}; + RECT rcStatusBar; + int parts[3]; + + GetClientRect(Globals.hStatusBar, &rcStatusBar); + + parts[0] = rcStatusBar.right - (defaultWidths[1] + defaultWidths[2]); + parts[1] = rcStatusBar.right - defaultWidths[2]; + parts[2] = -1; // the right edge of the status bar + + parts[0] = max(parts[0], defaultWidths[0]); + parts[1] = max(parts[1], defaultWidths[0] + defaultWidths[1]); + + SendMessageW(Globals.hStatusBar, SB_SETPARTS, (WPARAM)ARRAY_SIZE(parts), (LPARAM)parts); +} + +static VOID DIALOG_StatusBarUpdateLineEndings(VOID) +{ + WCHAR szText[128]; + + LoadStringW(Globals.hInstance, EolnToStrId[Globals.iEoln], szText, ARRAY_SIZE(szText)); + + SendMessageW(Globals.hStatusBar, SB_SETTEXTW, SBPART_EOLN, (LPARAM)szText); +} + +static VOID DIALOG_StatusBarUpdateEncoding(VOID) +{ + WCHAR szText[128] = L""; + + if (Globals.encFile != ENCODING_AUTO) + { + LoadStringW(Globals.hInstance, EncToStrId[Globals.encFile], szText, ARRAY_SIZE(szText)); + } + + SendMessageW(Globals.hStatusBar, SB_SETTEXTW, SBPART_ENCODING, (LPARAM)szText); +} + int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCTSTR szString, DWORD dwFlags) { TCHAR szMessage[MAX_STRING_LEN]; @@ -403,6 +463,11 @@ VOID DoOpenFile(LPCTSTR szFileName) SetFileName(szFileName); UpdateWindowCaption(TRUE); NOTEPAD_EnableSearchMenu(); + + /* Update line endings and encoding on the status bar */ + DIALOG_StatusBarUpdateLineEndings(); + DIALOG_StatusBarUpdateEncoding(); + done: if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); @@ -497,6 +562,9 @@ DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) LoadString(Globals.hInstance, STRING_UTF8, szText, ARRAY_SIZE(szText)); SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); + LoadString(Globals.hInstance, STRING_UTF8_BOM, szText, ARRAY_SIZE(szText)); + SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); + SendMessage(hCombo, CB_SETCURSEL, Globals.encFile, 0); hCombo = GetDlgItem(hDlg, ID_EOLN); @@ -562,6 +630,11 @@ BOOL DIALOG_FileSaveAs(VOID) if (DoSaveFile()) { UpdateWindowCaption(TRUE); + + /* Update line endings and encoding on the status bar */ + DIALOG_StatusBarUpdateLineEndings(); + DIALOG_StatusBarUpdateEncoding(); + return TRUE; } else @@ -852,7 +925,7 @@ VOID DoCreateStatusBar(VOID) if (Globals.hStatusBar == NULL) { /* Try to create the status bar */ - Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, + Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, NULL, Globals.hMainWnd, CMD_STATUSBAR_WND_ID); @@ -865,9 +938,6 @@ VOID DoCreateStatusBar(VOID) /* Load the string for formatting column/row text output */ LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH - 1); - - /* Set the status bar for single-text output */ - SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); } /* Set status bar visiblity according to the settings. */ @@ -916,8 +986,15 @@ VOID DoCreateStatusBar(VOID) TRUE); } + /* Set the status bar for multiple-text output */ + DIALOG_StatusBarAlignParts(); + /* Update content with current row/column text */ DIALOG_StatusBarUpdateCaretPos(); + + /* Update line endings and encoding on the status bar */ + DIALOG_StatusBarUpdateLineEndings(); + DIALOG_StatusBarUpdateEncoding(); } VOID DoCreateEditWindow(VOID) @@ -1195,7 +1272,7 @@ VOID DIALOG_StatusBarUpdateCaretPos(VOID) col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0); _stprintf(buff, Globals.szStatusBarLineCol, line + 1, col + 1); - SendMessage(Globals.hStatusBar, SB_SETTEXT, SB_SIMPLEID, (LPARAM)buff); + SendMessage(Globals.hStatusBar, SB_SETTEXT, SBPART_CURPOS, (LPARAM)buff); } VOID DIALOG_ViewStatusBar(VOID) diff --git a/base/applications/notepad/dialog.h b/base/applications/notepad/dialog.h index 98104dcc6e5..3d5572cfad7 100644 --- a/base/applications/notepad/dialog.h +++ b/base/applications/notepad/dialog.h @@ -46,6 +46,7 @@ VOID DIALOG_GoTo(VOID); VOID DIALOG_SelectFont(VOID); VOID DIALOG_ViewStatusBar(VOID); +VOID DIALOG_StatusBarAlignParts(VOID); VOID DIALOG_StatusBarUpdateCaretPos(VOID); VOID DIALOG_HelpContents(VOID); diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index d17e24ab300..5b900b511f3 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -160,6 +160,7 @@ BEGIN STRING_UNICODE "Уникод" STRING_UNICODE_BE "Уникод (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Уьиндоуьс (CR + LF)" STRING_LF "Юникс (LF)" STRING_CR "Мак (CR)" diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index 1338063e8e9..36fd1d28b52 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -161,6 +161,7 @@ paměti." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index f24b93562cb..8ab2d8f4c07 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -161,6 +161,7 @@ hukommelse, og prøv så igen." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index 12304456c6f..c1c491f3e03 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -162,6 +162,7 @@ um diese Funktion\nabzuschließen. Beenden Sie eine oder mehrere \ STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (Big-Endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index c27cb97636a..32e23f3f00a 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -161,6 +161,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index 6f284bdbf21..242fb18c426 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -160,6 +160,7 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index a22083ca956..3700fe740cd 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -163,6 +163,7 @@ aumentar la cantidad\nde memoria libre." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index 3df808c417e..f5b3afa982b 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -168,6 +168,7 @@ käsu lõpetamiseks.\nSulge üks või enam rakendust, et suurendada\nvaba mälu STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/eu-ES.rc b/base/applications/notepad/lang/eu-ES.rc index 0923ac47c4d..bb082e9fbb6 100644 --- a/base/applications/notepad/lang/eu-ES.rc +++ b/base/applications/notepad/lang/eu-ES.rc @@ -161,6 +161,7 @@ memoria librearen\nkopurua handitzeko." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index a12be32822e..d13c7ce9337 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -161,6 +161,7 @@ muistia." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/fr-FR.rc b/base/applications/notepad/lang/fr-FR.rc index 29bac1aa9c9..6fba3e8d9c0 100644 --- a/base/applications/notepad/lang/fr-FR.rc +++ b/base/applications/notepad/lang/fr-FR.rc @@ -161,6 +161,7 @@ de la mémoire." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index 63c3a2c2f46..f4929cf8d5f 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -163,6 +163,7 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_UNICODE "יוניקוד" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "חלונות (CR + LF)" STRING_LF "יוניקס (LF)" STRING_CR "מקינטוש (CR)" diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index abb0c2810fd..24ecb4b0094 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -167,6 +167,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/hr-HR.rc b/base/applications/notepad/lang/hr-HR.rc index fa683dd091d..92eeafd4af5 100644 --- a/base/applications/notepad/lang/hr-HR.rc +++ b/base/applications/notepad/lang/hr-HR.rc @@ -167,6 +167,7 @@ zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index 48d1086851f..e23208079ff 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -161,6 +161,7 @@ Szeretné menteni a változásokat?" STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index 7c82d538f26..d14af947fd7 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -160,6 +160,7 @@ Would you like to save the changes ?" STRING_UNICODE "Յունիկոդ" STRING_UNICODE_BE "Յունիկոդ (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Պատւոհաններ (CR + LF)" STRING_LF "Յունիքս (LF)" STRING_CR "Մակինտոշ (CR)" diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index 32f002e078a..594ddac068d 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -161,6 +161,7 @@ bebas." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index b239f11b7e8..d06b07dceb9 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -161,6 +161,7 @@ di memoria libera." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index ad1359f9aca..5b43cd0352e 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -161,6 +161,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index 494161c1eb3..040a66a6755 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -160,6 +160,7 @@ Ar norite išsaugoti pakeitimus?" STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index 26787eeb4ef..9674fdef67d 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -162,6 +162,7 @@ tugas ini.\nTutup satu atau lebih aplikasi untuk menambah jumlah\ningatan kosong STRING_UNICODE "Unikod" STRING_UNICODE_BE "Unikod (endian besar)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index d6c30f26403..a0ffe227096 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -160,6 +160,7 @@ Wilt u de wijzigingen opslaan?" STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index ae83e8a270c..b58fdf6b475 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -161,6 +161,7 @@ minne." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index 70c29377898..708ead6edfb 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -155,6 +155,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index 1ba2f1788b5..08f8714b570 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -160,6 +160,7 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index 5e597417040..857c587bcb2 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -160,6 +160,7 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index a032dc0d67e..cfe4487fe18 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -165,6 +165,7 @@ Păstrați modificările aduse?" STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index 4ebb9037727..c6c729b5fc9 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -160,6 +160,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (Big Endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Macintosh (CR)" diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index 730ac82e4b9..7a272f3fb41 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -168,6 +168,7 @@ alebo viac aplikácií, aby sa uvoľnila pamäť a skúste to znova." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (veľký indián)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index a694e53c068..5dacaf8b8a9 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -160,6 +160,7 @@ operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in posk STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index 542b5b93936..82c55454577 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -164,6 +164,7 @@ detyrë.\nMbyll nje ose me shume programe te rrisesh shumën e\nmemories." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index 6536306b1e7..49160f0fc62 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -160,6 +160,7 @@ den här åtgärden.\nAvsluta ett eller flera program för att frigöra mer minn STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index ed6277314a8..ac24b8d2d5e 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -155,6 +155,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 (มี BOM)" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 391b0e70d83..5a862b887c0 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -158,6 +158,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (Büyük Sonlu)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index 8c39417b9ec..a46758205ab 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -160,6 +160,7 @@ BEGIN STRING_UNICODE "Юнікод" STRING_UNICODE_BE "Юнікод (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/uz-UZ.rc b/base/applications/notepad/lang/uz-UZ.rc index e6857a5f546..abc5f6088ce 100644 --- a/base/applications/notepad/lang/uz-UZ.rc +++ b/base/applications/notepad/lang/uz-UZ.rc @@ -160,6 +160,7 @@ O‘zgarishlarni saqlashni istaysizmi?" STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Macintosh (CR)" diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index de8877d9f17..5b02a2fd733 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -168,6 +168,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode（大端）" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows（CR + LF）" STRING_LF "Unix（LF）" STRING_CR "Mac（CR）" diff --git a/base/applications/notepad/lang/zh-HK.rc b/base/applications/notepad/lang/zh-HK.rc index 6a47644ff58..c5e455fa877 100644 --- a/base/applications/notepad/lang/zh-HK.rc +++ b/base/applications/notepad/lang/zh-HK.rc @@ -168,6 +168,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode（大端序）" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index db550b17012..2cae1d75fd9 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -168,6 +168,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index 3fed529fb3e..42bf2493911 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -427,8 +427,13 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) LOWORD(wParam), SWP_NOZORDER); - if (hdwp != NULL) - EndDeferWindowPos(hdwp); + if (hdwp == NULL) + break; + + EndDeferWindowPos(hdwp); + + /* Align status bar parts, only if the status bar resize operation succeeds */ + DIALOG_StatusBarAlignParts(); } else SetWindowPos(Globals.hEdit, diff --git a/base/applications/notepad/main.h b/base/applications/notepad/main.h index 349be218118..ce7fc850877 100644 --- a/base/applications/notepad/main.h +++ b/base/applications/notepad/main.h @@ -40,7 +40,8 @@ typedef enum ENCODING_ANSI = 0, ENCODING_UTF16LE = 1, ENCODING_UTF16BE = 2, - ENCODING_UTF8 = 3 + ENCODING_UTF8 = 3, + ENCODING_UTF8BOM = 4 } ENCODING; // #define MIN_ENCODING 0 diff --git a/base/applications/notepad/notepad_res.h b/base/applications/notepad/notepad_res.h index b53ff22cb57..7b463383dc8 100644 --- a/base/applications/notepad/notepad_res.h +++ b/base/applications/notepad/notepad_res.h @@ -88,17 +88,18 @@ #define STRING_OUT_OF_MEMORY 0x17C #define STRING_CANNOTFIND 0x17D -#define STRING_ANSI 0x17E -#define STRING_UNICODE 0x17F -#define STRING_UNICODE_BE 0x180 -#define STRING_UTF8 0x181 - -#define STRING_CRLF 0x182 -#define STRING_LF 0x183 -#define STRING_CR 0x184 - -#define STRING_LINE_COLUMN 0x186 -#define STRING_PRINTERROR 0x187 +#define STRING_ANSI 0x180 +#define STRING_UNICODE 0x181 +#define STRING_UNICODE_BE 0x182 +#define STRING_UTF8 0x183 +#define STRING_UTF8_BOM 0x184 + +#define STRING_CRLF 0x185 +#define STRING_LF 0x186 +#define STRING_CR 0x187 + +#define STRING_LINE_COLUMN 0x188 +#define STRING_PRINTERROR 0x189 #define STRING_TEXT_DOCUMENT 0x200 diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index 0afdde89b6c..6a83a89d64f 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -140,7 +140,7 @@ ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, } else if ((dwSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) { - encFile = ENCODING_UTF8; + encFile = ENCODING_UTF8BOM; dwPos += 3; } else @@ -166,10 +166,11 @@ ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, case ENCODING_ANSI: case ENCODING_UTF8: - if (encFile == ENCODING_ANSI) - iCodePage = CP_ACP; - else if (encFile == ENCODING_UTF8) + case ENCODING_UTF8BOM: + if (encFile == ENCODING_UTF8 || encFile == ENCODING_UTF8BOM) iCodePage = CP_UTF8; + else + iCodePage = CP_ACP; if ((dwSize - dwPos) > 0) { @@ -312,10 +313,11 @@ static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENC case ENCODING_ANSI: case ENCODING_UTF8: - if (encFile == ENCODING_ANSI) - iCodePage = CP_ACP; - else if (encFile == ENCODING_UTF8) + case ENCODING_UTF8BOM: + if (encFile == ENCODING_UTF8 || encFile == ENCODING_UTF8BOM) iCodePage = CP_UTF8; + else + iCodePage = CP_ACP; iRequiredBytes = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, NULL, 0, NULL, NULL); if (iRequiredBytes <= 0) @@ -371,8 +373,8 @@ BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENCODING encFile, LPCWSTR pszLF = L"\n"; DWORD dwPos, dwNext; - /* Write the proper byte order marks if not ANSI */ - if (encFile != ENCODING_ANSI) + /* Write the proper byte order marks if not ANSI or UTF-8 without BOM */ + if (encFile != ENCODING_ANSI && encFile != ENCODING_UTF8) { wcBom = 0xFEFF; if (!WriteEncodedText(hFile, &wcBom, 1, encFile))

1 0

[reactos] 01/01: [DESKADP] Add Russian (ru-RU) translation. Addendum to cb6b07ee.
by Stanislav Motylkov 05 Sep '22

05 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b70fff80879d2b568efe… commit 6b70fff80879d2b568efec57877c80275aca9325 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Sep 5 16:24:16 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Sep 5 16:24:16 2022 +0300 [DESKADP] Add Russian (ru-RU) translation. Addendum to cb6b07ee. --- dll/shellext/deskadp/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/deskadp/lang/ru-RU.rc b/dll/shellext/deskadp/lang/ru-RU.rc index c2b193bb9e6..fb064c19416 100644 --- a/dll/shellext/deskadp/lang/ru-RU.rc +++ b/dll/shellext/deskadp/lang/ru-RU.rc @@ -45,5 +45,5 @@ BEGIN IDS_16BPP "Высокое (16 бит)" IDS_24BPP "Самое высокое (24 бита)" IDS_32BPP "Самое высокое (32 бита)" - IDS_NOTAVAIL "Not Available" + IDS_NOTAVAIL "Нет данных" END

1 0

[reactos] 01/01: [DESKADP] Improve default display of advanced adapter properties (#4665)
by Kyle Katarn 05 Sep '22

05 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb6b07eec8ad1ac323d52… commit cb6b07eec8ad1ac323d52586469b00644e2202be Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Mon Sep 5 15:01:41 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 5 15:01:41 2022 +0200 [DESKADP] Improve default display of advanced adapter properties (#4665) + fix caption width in french resources. --- dll/shellext/deskadp/deskadp.c | 25 +++++++++++++++++++------ dll/shellext/deskadp/lang/bg-BG.rc | 1 + dll/shellext/deskadp/lang/cs-CZ.rc | 1 + dll/shellext/deskadp/lang/de-DE.rc | 1 + dll/shellext/deskadp/lang/el-GR.rc | 1 + dll/shellext/deskadp/lang/en-US.rc | 1 + dll/shellext/deskadp/lang/es-ES.rc | 1 + dll/shellext/deskadp/lang/eu-ES.rc | 1 + dll/shellext/deskadp/lang/fr-FR.rc | 23 ++++++++++++----------- dll/shellext/deskadp/lang/he-IL.rc | 1 + dll/shellext/deskadp/lang/hi-IN.rc | 1 + dll/shellext/deskadp/lang/it-IT.rc | 1 + dll/shellext/deskadp/lang/no-NO.rc | 1 + dll/shellext/deskadp/lang/pl-PL.rc | 1 + dll/shellext/deskadp/lang/pt-PT.rc | 1 + dll/shellext/deskadp/lang/ro-RO.rc | 1 + dll/shellext/deskadp/lang/ru-RU.rc | 1 + dll/shellext/deskadp/lang/sk-SK.rc | 1 + dll/shellext/deskadp/lang/sq-AL.rc | 1 + dll/shellext/deskadp/lang/tr-TR.rc | 1 + dll/shellext/deskadp/lang/uk-UA.rc | 1 + dll/shellext/deskadp/lang/zh-CN.rc | 1 + dll/shellext/deskadp/lang/zh-HK.rc | 1 + dll/shellext/deskadp/lang/zh-TW.rc | 1 + dll/shellext/deskadp/resource.h | 1 + 25 files changed, 54 insertions(+), 17 deletions(-) diff --git a/dll/shellext/deskadp/deskadp.c b/dll/shellext/deskadp/deskadp.c index a247f5e79a7..ba55d444103 100644 --- a/dll/shellext/deskadp/deskadp.c +++ b/dll/shellext/deskadp/deskadp.c @@ -291,7 +291,8 @@ static VOID InitDisplayAdapterDialog(PDESKDISPLAYADAPTER This) { LPTSTR lpAdapterName; - + TCHAR lpNA[64]; + This->lpDeviceId = QueryDeskCplString(This->pdtobj, RegisterClipboardFormat(DESK_EXT_DISPLAYID)); EnableWindow(GetDlgItem(This->hwndDlg, @@ -308,28 +309,40 @@ InitDisplayAdapterDialog(PDESKDISPLAYADAPTER This) LocalFree((HLOCAL)lpAdapterName); } + LoadString(hInstance, + IDS_NOTAVAIL, + lpNA, + _countof(lpNA)); + if (This->DeskExtInterface != NULL) { SetDlgItemTextW(This->hwndDlg, IDC_CHIPTYPE, - This->DeskExtInterface->ChipType); + *(This->DeskExtInterface->ChipType) ? This->DeskExtInterface->ChipType : lpNA); SetDlgItemTextW(This->hwndDlg, IDC_DACTYPE, - This->DeskExtInterface->DacType); + *(This->DeskExtInterface->DacType) ? This->DeskExtInterface->DacType : lpNA); SetDlgItemTextW(This->hwndDlg, IDC_MEMORYSIZE, - This->DeskExtInterface->MemorySize); + *(This->DeskExtInterface->MemorySize) ? This->DeskExtInterface->MemorySize : lpNA); SetDlgItemTextW(This->hwndDlg, IDC_ADAPTERSTRING, - This->DeskExtInterface->AdapterString); + *(This->DeskExtInterface->AdapterString) ? This->DeskExtInterface->AdapterString : lpNA); SetDlgItemTextW(This->hwndDlg, IDC_BIOSINFORMATION, - This->DeskExtInterface->BiosString); + *(This->DeskExtInterface->BiosString) ? This->DeskExtInterface->BiosString : lpNA); This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); } else + { This->lpDevModeOnInit = NULL; + SetDlgItemTextW(This->hwndDlg, IDC_CHIPTYPE, lpNA); + SetDlgItemTextW(This->hwndDlg, IDC_DACTYPE, lpNA); + SetDlgItemTextW(This->hwndDlg, IDC_MEMORYSIZE, lpNA); + SetDlgItemTextW(This->hwndDlg, IDC_ADAPTERSTRING, lpNA); + SetDlgItemTextW(This->hwndDlg, IDC_BIOSINFORMATION, lpNA); + } This->lpSelDevMode = This->lpDevModeOnInit; } diff --git a/dll/shellext/deskadp/lang/bg-BG.rc b/dll/shellext/deskadp/lang/bg-BG.rc index 54a38b67eaa..226c92a30fe 100644 --- a/dll/shellext/deskadp/lang/bg-BG.rc +++ b/dll/shellext/deskadp/lang/bg-BG.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Висока цветност (16 разряда)" IDS_24BPP "Истинска цветност (24 разряда)" IDS_32BPP "Истинска цветност (32 разряда)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/cs-CZ.rc b/dll/shellext/deskadp/lang/cs-CZ.rc index 79bd343a8b0..ce635d65fb3 100644 --- a/dll/shellext/deskadp/lang/cs-CZ.rc +++ b/dll/shellext/deskadp/lang/cs-CZ.rc @@ -50,4 +50,5 @@ BEGIN IDS_16BPP "High Color (16 bitů)" IDS_24BPP "True Color (24 bitů)" IDS_32BPP "True Color (32 bitů)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/de-DE.rc b/dll/shellext/deskadp/lang/de-DE.rc index db59fff9e2f..268f2267ce4 100644 --- a/dll/shellext/deskadp/lang/de-DE.rc +++ b/dll/shellext/deskadp/lang/de-DE.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "High Color (16 Bit)" IDS_24BPP "True Color (24 Bit)" IDS_32BPP "True Color (32 Bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/el-GR.rc b/dll/shellext/deskadp/lang/el-GR.rc index 315ddc88d98..23336e3fbe5 100644 --- a/dll/shellext/deskadp/lang/el-GR.rc +++ b/dll/shellext/deskadp/lang/el-GR.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Πολλά χρώματα (16 bit)" IDS_24BPP "Φυσικά χρώματα (24 bit)" IDS_32BPP "Φυσικά χρώματα (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/en-US.rc b/dll/shellext/deskadp/lang/en-US.rc index 3e9b7227607..71d5237f7a9 100644 --- a/dll/shellext/deskadp/lang/en-US.rc +++ b/dll/shellext/deskadp/lang/en-US.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "High Color (16 bit)" IDS_24BPP "True Color (24 bit)" IDS_32BPP "True Color (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/es-ES.rc b/dll/shellext/deskadp/lang/es-ES.rc index 704da2f0ace..3293fc82519 100644 --- a/dll/shellext/deskadp/lang/es-ES.rc +++ b/dll/shellext/deskadp/lang/es-ES.rc @@ -47,4 +47,5 @@ BEGIN IDS_16BPP "Color de alto contraste (16 bit)" IDS_24BPP "Color verdadero (24 bit)" IDS_32BPP "Color verdadero (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/eu-ES.rc b/dll/shellext/deskadp/lang/eu-ES.rc index 0e926b955e9..178c95a0744 100644 --- a/dll/shellext/deskadp/lang/eu-ES.rc +++ b/dll/shellext/deskadp/lang/eu-ES.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Kontraste handiko kolorea (16 bit)" IDS_24BPP "Benetako kolorea (24 bit)" IDS_32BPP "Benetako kolorea (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/fr-FR.rc b/dll/shellext/deskadp/lang/fr-FR.rc index 812d55ffcea..f2edf43b85b 100644 --- a/dll/shellext/deskadp/lang/fr-FR.rc +++ b/dll/shellext/deskadp/lang/fr-FR.rc @@ -10,17 +10,17 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Propriétés", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Informations sur l'adaptateur", -1, 7, 56, 237, 75 - LTEXT "Type de puce:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "Type de CNA:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Taille de la mémoire:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Texte de l'adaptateur:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "Informations du BIOS:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX - PUSHBUTTON "&Lister tous les modes...", IDC_LISTALLMODES, 7, 139, 75, 14 + LTEXT "Type de puce :", -1, 13, 68, 85, 8 + LTEXT "", IDC_CHIPTYPE, 87, 68, 148, 8, SS_NOPREFIX + LTEXT "Type de CNA :", -1, 13, 80, 85, 8 + LTEXT "", IDC_DACTYPE, 87, 80, 148, 8, SS_NOPREFIX + LTEXT "Taille de la mémoire :", -1, 13, 92, 85, 8 + LTEXT "", IDC_MEMORYSIZE, 87, 92, 148, 8, SS_NOPREFIX + LTEXT "Adaptateur :", -1, 13, 104, 85, 8 + LTEXT "", IDC_ADAPTERSTRING, 87, 104, 148, 8, SS_NOPREFIX + LTEXT "Informations du BIOS :", -1, 13, 116, 85, 8 + LTEXT "", IDC_BIOSINFORMATION, 87, 116, 148, 8, SS_NOPREFIX + PUSHBUTTON "&Lister tous les modes...", IDC_LISTALLMODES, 7, 139, 80, 14 END IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Couleurs élevées (16 bit)" IDS_24BPP "Vraies couleurs (24 bit)" IDS_32BPP "Vraies couleurs (32 bit)" + IDS_NOTAVAIL "Non disponible" END diff --git a/dll/shellext/deskadp/lang/he-IL.rc b/dll/shellext/deskadp/lang/he-IL.rc index cd9d89f7bb9..d9fda3723b0 100644 --- a/dll/shellext/deskadp/lang/he-IL.rc +++ b/dll/shellext/deskadp/lang/he-IL.rc @@ -47,4 +47,5 @@ BEGIN IDS_16BPP "צבעים גבוהים (16 סיביות)" IDS_24BPP "צבעים מלאים (24 סיביות)" IDS_32BPP "צבעים מלאים (32 סיביות)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/hi-IN.rc b/dll/shellext/deskadp/lang/hi-IN.rc index 921a1008b39..44717d95ab8 100644 --- a/dll/shellext/deskadp/lang/hi-IN.rc +++ b/dll/shellext/deskadp/lang/hi-IN.rc @@ -52,4 +52,5 @@ BEGIN IDS_16BPP "उच्च कलर (16 बिट)" IDS_24BPP "ट्रू कलर (24 बिट)" IDS_32BPP "ट्रू कलर (32 बिट)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/it-IT.rc b/dll/shellext/deskadp/lang/it-IT.rc index 7290cdde97f..79f6ce9b2d6 100644 --- a/dll/shellext/deskadp/lang/it-IT.rc +++ b/dll/shellext/deskadp/lang/it-IT.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "High Color (16 bit)" IDS_24BPP "True Color (24 bit)" IDS_32BPP "True Color (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/no-NO.rc b/dll/shellext/deskadp/lang/no-NO.rc index 4177b6b2687..3cb248bc027 100644 --- a/dll/shellext/deskadp/lang/no-NO.rc +++ b/dll/shellext/deskadp/lang/no-NO.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Middels farger (16 bit)" IDS_24BPP "Høyest farger (24 bit)" IDS_32BPP "Høyest farger (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/pl-PL.rc b/dll/shellext/deskadp/lang/pl-PL.rc index 4d7fb520861..2b28c09cd49 100644 --- a/dll/shellext/deskadp/lang/pl-PL.rc +++ b/dll/shellext/deskadp/lang/pl-PL.rc @@ -54,4 +54,5 @@ BEGIN IDS_16BPP "64k kolorów (16 bitów)" IDS_24BPP "16m kolorów (24 bity)" IDS_32BPP "16m +kanał alfa (32 bity)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/pt-PT.rc b/dll/shellext/deskadp/lang/pt-PT.rc index bec057f42f1..a765064da21 100644 --- a/dll/shellext/deskadp/lang/pt-PT.rc +++ b/dll/shellext/deskadp/lang/pt-PT.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "High Color (16 bit)" IDS_24BPP "True Color (24 bit)" IDS_32BPP "True Color (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/ro-RO.rc b/dll/shellext/deskadp/lang/ro-RO.rc index 7b85d35c40a..e0358c515af 100644 --- a/dll/shellext/deskadp/lang/ro-RO.rc +++ b/dll/shellext/deskadp/lang/ro-RO.rc @@ -53,4 +53,5 @@ BEGIN IDS_16BPP "Culoare de înaltă calitate (16 biți)" IDS_24BPP "Calitate fotografică (24 biți)" IDS_32BPP "Calitate fotografică (32 biți)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/ru-RU.rc b/dll/shellext/deskadp/lang/ru-RU.rc index 0ea1e2ec1a3..c2b193bb9e6 100644 --- a/dll/shellext/deskadp/lang/ru-RU.rc +++ b/dll/shellext/deskadp/lang/ru-RU.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Высокое (16 бит)" IDS_24BPP "Самое высокое (24 бита)" IDS_32BPP "Самое высокое (32 бита)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/sk-SK.rc b/dll/shellext/deskadp/lang/sk-SK.rc index d13982add2d..7a1e19d045f 100644 --- a/dll/shellext/deskadp/lang/sk-SK.rc +++ b/dll/shellext/deskadp/lang/sk-SK.rc @@ -52,4 +52,5 @@ BEGIN IDS_16BPP "Veľa farieb (16 bit)" IDS_24BPP "Pravé farby (24 bit)" IDS_32BPP "Pravé farby (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/sq-AL.rc b/dll/shellext/deskadp/lang/sq-AL.rc index 7c4bb085907..e4901706abb 100644 --- a/dll/shellext/deskadp/lang/sq-AL.rc +++ b/dll/shellext/deskadp/lang/sq-AL.rc @@ -49,4 +49,5 @@ BEGIN IDS_16BPP "High Color (16 bit)" IDS_24BPP "True Color (24 bit)" IDS_32BPP "True Color (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/tr-TR.rc b/dll/shellext/deskadp/lang/tr-TR.rc index 611ee9eab75..7d0ed9eef5c 100644 --- a/dll/shellext/deskadp/lang/tr-TR.rc +++ b/dll/shellext/deskadp/lang/tr-TR.rc @@ -47,4 +47,5 @@ BEGIN IDS_16BPP "Yüksek Renk (16 Bit)" IDS_24BPP "Gerçek Renk (24 Bit)" IDS_32BPP "Gerçek Renk (32 Bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/uk-UA.rc b/dll/shellext/deskadp/lang/uk-UA.rc index e83a84dc281..f98d60ae05d 100644 --- a/dll/shellext/deskadp/lang/uk-UA.rc +++ b/dll/shellext/deskadp/lang/uk-UA.rc @@ -53,4 +53,5 @@ BEGIN IDS_16BPP "High Color (16 біт)" IDS_24BPP "True Color (24 біти)" IDS_32BPP "True Color (32 біти)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/zh-CN.rc b/dll/shellext/deskadp/lang/zh-CN.rc index 8395369b33c..eb08d41cc12 100644 --- a/dll/shellext/deskadp/lang/zh-CN.rc +++ b/dll/shellext/deskadp/lang/zh-CN.rc @@ -47,4 +47,5 @@ BEGIN IDS_16BPP "增强色（16 位）" IDS_24BPP "真彩色（24 位）" IDS_32BPP "真彩色（32 位）" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/zh-HK.rc b/dll/shellext/deskadp/lang/zh-HK.rc index 5272e476bf9..bbb370f85c0 100644 --- a/dll/shellext/deskadp/lang/zh-HK.rc +++ b/dll/shellext/deskadp/lang/zh-HK.rc @@ -53,4 +53,5 @@ BEGIN IDS_16BPP "增強色（16 位）" IDS_24BPP "真彩色（24 位）" IDS_32BPP "真彩色（32 位）" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/zh-TW.rc b/dll/shellext/deskadp/lang/zh-TW.rc index 34365353f71..aefd9ed2fc6 100644 --- a/dll/shellext/deskadp/lang/zh-TW.rc +++ b/dll/shellext/deskadp/lang/zh-TW.rc @@ -53,4 +53,5 @@ BEGIN IDS_16BPP "增強色（16 位）" IDS_24BPP "真彩色（24 位）" IDS_32BPP "真彩色（32 位）" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/resource.h b/dll/shellext/deskadp/resource.h index 7e3b06b83ff..13eadf83651 100644 --- a/dll/shellext/deskadp/resource.h +++ b/dll/shellext/deskadp/resource.h @@ -24,3 +24,4 @@ #define IDS_16BPP 107 #define IDS_24BPP 108 #define IDS_32BPP 109 +#define IDS_NOTAVAIL 110

1 0

[reactos] 01/01: [TRANSLATION] Croatian translation of games (Solitare and Spider) (#4664)
by Andrej Bartulin 05 Sep '22

05 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b0417d48eee02bfb9a2c… commit 3b0417d48eee02bfb9a2cf844306d7bedf2aa5b9 Author: Andrej Bartulin <andrej.bartulinvr(a)gmail.com> AuthorDate: Mon Sep 5 14:58:00 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 5 14:58:00 2022 +0200 [TRANSLATION] Croatian translation of games (Solitare and Spider) (#4664) --- base/applications/games/solitaire/lang/hr-HR.rc | 92 +++++++++++++++++++++++++ base/applications/games/solitaire/rsrc.rc | 3 + base/applications/games/spider/lang/hr-HR.rc | 80 +++++++++++++++++++++ base/applications/games/spider/rsrc.rc | 3 + 4 files changed, 178 insertions(+) diff --git a/base/applications/games/solitaire/lang/hr-HR.rc b/base/applications/games/solitaire/lang/hr-HR.rc new file mode 100644 index 00000000000..0f38cca40d2 --- /dev/null +++ b/base/applications/games/solitaire/lang/hr-HR.rc @@ -0,0 +1,92 @@ +/* + * PROJECT: ReactOS Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * PURPOSE: Croatian resource file + * TRANSLATOR: Copyright 2022 Andrej Bartulin <andrej.bartulinvr(a)gmail.com> + */ + +LANGUAGE LANG_CROATIAN, SUBLANG_CROATIAN_CROATIA + +/* Dialogs */ + +IDD_OPTIONS DIALOGEX 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Opcije" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Kartice", -1, 7, 7, 90, 40 + AUTORADIOBUTTON "Nacrtaj &jednu", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Nacrtaj &tri", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 + GROUPBOX "Rezultat", -1, 100, 7, 75, 53 + AUTORADIOBUTTON "&Standardno", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10 + AUTORADIOBUTTON "&Ništa", IDC_OPT_NOSCORE, 107, 45, 60, 10 + AUTOCHECKBOX "&Pokaži vrijeme", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP + AUTOCHECKBOX "Sta&tusna traka", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Zadrži rezultat", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP + DEFPUSHBUTTON "U redu", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Odustani", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 345, 185 +CAPTION "Odaberite stražnju stranu kartice" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71 + DEFPUSHBUTTON "U redu", IDOK, 114, 165, 54, 14 + PUSHBUTTON "Odustani", IDCANCEL, 176, 165, 54, 14 +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SOL_NAME "Solitaire" + IDS_SOL_ABOUT "Solitaire od J Brown\n\nCardLib verzija 1.0." + IDS_SOL_QUIT "Napusti trenutnu igru?" + IDS_SOL_WIN "Čestitke, pobijedili ste!" + IDS_SOL_DEAL "Ponovi?" + IDS_SOL_SCORE "Rezultat: %d" + IDS_SOL_TIME "Vrijeme: %d" +END + +/* Menus */ + +IDR_MENU1 MENU +BEGIN + POPUP "&Igra" + BEGIN + MENUITEM "Po&kreni\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Poništi", IDM_GAME_UNDO, GRAYED + MENUITEM "Špi&l...", IDM_GAME_DECK + MENUITEM "&Opcije...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Izađi", IDM_GAME_EXIT + END + POPUP "&Pomoć" + BEGIN + MENUITEM "&Sadržaj\tF1", IDM_HELP_CONTENTS + MENUITEM "&O Solitaire", IDM_HELP_ABOUT + END +END + +/* Accelerators */ + +IDR_ACCELERATOR1 ACCELERATORS +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END diff --git a/base/applications/games/solitaire/rsrc.rc b/base/applications/games/solitaire/rsrc.rc index 2cbb326ccd9..3e4c6af2684 100644 --- a/base/applications/games/solitaire/rsrc.rc +++ b/base/applications/games/solitaire/rsrc.rc @@ -42,6 +42,9 @@ IDI_SOLITAIRE ICON "solitaire.ico" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HR_HR + #include "lang/hr-HR.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/base/applications/games/spider/lang/hr-HR.rc b/base/applications/games/spider/lang/hr-HR.rc new file mode 100644 index 00000000000..1812d575de4 --- /dev/null +++ b/base/applications/games/spider/lang/hr-HR.rc @@ -0,0 +1,80 @@ +/* + * PROJECT: Spider Solitaire + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Croatian resource file + * TRANSLATOR: Copyright 2022 Andrej Bartulin <andrej.bartulinvr(a)gmail.com> + */ + +LANGUAGE LANG_CROATIAN, SUBLANG_CROATIAN_CROATIA + +/* Dialogs */ + +IDD_CARDBACK DIALOGEX 6, 6, 345, 185 +CAPTION "Odaberite zadnju stranu kartice" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71 + DEFPUSHBUTTON "U redu", IDOK, 114, 165, 54, 14 + PUSHBUTTON "Odustani", IDCANCEL, 176, 165, 54, 14 +END + +IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Težina" +FONT 8, "MS Shell Dlg" +BEGIN + AUTORADIOBUTTON "Lagano: &Jedna boja", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Srednje: &Dvije boje", IDC_DIF_TWOCOLORS, 8, 23, 80, 10 + AUTORADIOBUTTON "Teško: Č&etiri boje", IDC_DIF_FOURCOLORS, 8, 36, 80, 10 + DEFPUSHBUTTON "U redu", IDOK, 8, 58, 40, 14 + PUSHBUTTON "Odustani", IDCANCEL, 58, 58, 40, 14 +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SPI_NAME "Spider" + IDS_SPI_ABOUT "Spider Solitaire od Gregor Schneider\n\nCardLib verzija 1.0" + IDS_SPI_QUIT "Napusti trenutnu igru?" + IDS_SPI_WIN "Čestitke, pobijedili ste!" + IDS_SPI_DEAL "Ponovno?" +END + +/* Menus */ + +IDR_MENU1 MENU +BEGIN + POPUP "&Igra" + BEGIN + MENUITEM "&Nova igra\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "Š&pil...", IDM_GAME_DECK + MENUITEM SEPARATOR + MENUITEM "&Izađi", IDM_GAME_EXIT + END + POPUP "&Pomoć" + BEGIN + MENUITEM "&Sadržaj\tF1", IDM_HELP_CONTENTS + MENUITEM "&O Spider-u", IDM_HELP_ABOUT + END +END + +/* Accelerator */ +IDR_ACCELERATOR1 ACCELERATORS +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END diff --git a/base/applications/games/spider/rsrc.rc b/base/applications/games/spider/rsrc.rc index d268d89069e..40e5b53ae82 100644 --- a/base/applications/games/spider/rsrc.rc +++ b/base/applications/games/spider/rsrc.rc @@ -33,6 +33,9 @@ IDI_SPIDER ICON "spider.ico" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HR_HR + #include "lang/hr-HR.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif

1 0

[reactos] 01/01: [NEWDEV] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 05 Sep '22

05 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b03ca35fb50dfa171e5ff… commit b03ca35fb50dfa171e5ff75d4c5ffdec84fd85e7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 5 11:41:25 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 5 11:41:25 2022 +0900 [NEWDEV] Improve Japanese translation (ja-JP) --- dll/win32/newdev/lang/ja-JP.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/newdev/lang/ja-JP.rc b/dll/win32/newdev/lang/ja-JP.rc index c165295844d..92a86f5aaec 100644 --- a/dll/win32/newdev/lang/ja-JP.rc +++ b/dll/win32/newdev/lang/ja-JP.rc @@ -88,10 +88,10 @@ 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_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." + IDS_INSTALLWIZARDTITLE "新しいハードウェアのウィザード" + IDS_UPDATEWIZARDTITLE "ドライバ更新のウィザード" + IDS_CHSOURCE_TITLE "検索対象とインストールオプションを選んで下さい。" + IDS_SEARCHDRV_TITLE "検索中..." + IDS_INSTALLDRV_TITLE "インストール中..." + IDS_BROWSE_FOR_FOLDER_TITLE "このハードウェアに対する適切なドライバを含むフォルダを選択して下さい。" END

1 0

[reactos] 01/01: [SYSSETUP] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 05 Sep '22

05 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1ddb6c15fd3d03e2c616… commit f1ddb6c15fd3d03e2c616fb3f628fcc7e0c2914c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 5 11:28:04 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 5 11:28:04 2022 +0900 [SYSSETUP] Improve Japanese translation (ja-JP) --- dll/win32/syssetup/lang/ja-JP.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index f0515778dd5..15deb1f8384 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -178,12 +178,12 @@ BEGIN IDS_COMPUTERSUBTITLE "コンピュータ名と Administrator パスワードを入力する必要があります。" IDS_LOCALETITLE "地域の設定" IDS_LOCALESUBTITLE "ReactOS を様々な地域と言語にあわせてカスタマイズすることができます。" - IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." - IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" + IDS_LOCALETEXT "標準と形式は %s に、場所は %s に設定されています。" + IDS_LAYOUTTEXT "デフォルトのテキスト入力言語と方法は次のとおりです: %s キーボードレイアウト" IDS_DATETIMETITLE "日付と時刻" IDS_DATETIMESUBTITLE "コンピュータの日付と時刻を正しく設定して下さい。" - IDS_PROCESSTITLE "Finishing the Installation" - IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." + IDS_PROCESSTITLE "インストールを完了中" + IDS_PROCESSSUBTITLE "セットアップの最終ステップが完了するまでお待ちください。" IDS_THEMESELECTIONTITLE "外観" IDS_THEMESELECTIONSUBTITLE "好きなテーマをお選び下さい" END

1 0

[reactos] 01/01: [NTUSER][USER32][IMM32] Initialize pKL->piiex by using ImmLoadLayout (#4645)
by Katayama Hirofumi MZ 04 Sep '22

04 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85e292d58f952f7941eed… commit 85e292d58f952f7941eed0b3056c94f08a7b53a3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 5 08:34:00 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 5 08:34:00 2022 +0900 [NTUSER][USER32][IMM32] Initialize pKL->piiex by using ImmLoadLayout (#4645) To recognize IME, we have to initialize pKL->piiex. - Add co_ClientImmLoadLayout and User32CallImmLoadLayoutFromKernel functions to call imm32!ImmLoadLayout on user mode from kernel. - Use co_ClientImmLoadLayout in NtUserLoadKeyboardLayoutEx. - Improve Imm32LoadIME to sanitize the IME table. CORE-11700 --- dll/win32/imm32/ime.c | 26 ++++++++++++++------- dll/win32/imm32/imm.c | 38 ++++++++++++------------------ dll/win32/imm32/utils.c | 1 + win32ss/include/callback.h | 17 +++++++++++++- win32ss/user/ntuser/callback.c | 46 +++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/callback.h | 6 +++++ win32ss/user/ntuser/kbdlayout.c | 30 +++++++++++++++++++++++- win32ss/user/ntuser/ntuser.h | 1 + win32ss/user/user32/misc/dllmain.c | 10 ++++++++ win32ss/user/user32/windows/input.c | 24 +++++++++++++++---- 10 files changed, 161 insertions(+), 38 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 79c40435188..dd3519087a4 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -149,6 +149,15 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) return GetClassInfoW(pImeDpi->hInst, pImeDpi->szUIClass, &wcW); } +/* Define stub IME functions */ +#define DEFINE_IME_ENTRY(type, name, params, optional) \ + type APIENTRY Stub##name params { \ + FIXME("%s: Why stub called?\n", #name); \ + return (type)0; \ + } +#include "imetable.h" +#undef DEFINE_IME_ENTRY + // Win: LoadIME BOOL APIENTRY Imm32LoadIME(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) { @@ -160,18 +169,19 @@ BOOL APIENTRY Imm32LoadIME(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) if (!Imm32GetSystemLibraryPath(szPath, _countof(szPath), pImeInfoEx->wszImeFile)) return FALSE; - hIME = GetModuleHandleW(szPath); + pImeDpi->hInst = hIME = LoadLibraryW(szPath); if (hIME == NULL) { - hIME = LoadLibraryW(szPath); - if (hIME == NULL) - { - ERR("Imm32LoadIME: LoadLibraryW(%S) failed\n", szPath); - return FALSE; - } + ERR("Imm32LoadIME: LoadLibraryW(%s) failed\n", debugstr_w(szPath)); + return FALSE; } - pImeDpi->hInst = hIME; + /* Populate the table by stub IME functions */ +#define DEFINE_IME_ENTRY(type, name, params, optional) pImeDpi->name = Stub##name; +#include "imetable.h" +#undef DEFINE_IME_ENTRY + + /* Populate the table by real IME functions */ #define DEFINE_IME_ENTRY(type, name, params, optional) \ do { \ fn = GetProcAddress(hIME, #name); \ diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 94a1afcd488..13512cadb11 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -53,57 +53,49 @@ BOOL WINAPI ImmRegisterClient(PSHAREDINFO ptr, HINSTANCE hMod) */ BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) { - DWORD cbData; - HKEY hLayoutKey = NULL, hLayoutsKey = NULL; + DWORD cbData, dwType; + HKEY hLayoutKey; LONG error; WCHAR szLayout[MAX_PATH]; TRACE("(%p, %p)\n", hKL, pImeInfoEx); + ZeroMemory(pImeInfoEx, sizeof(IMEINFOEX)); + if (IS_IME_HKL(hKL) || !Imm32IsCiceroMode() || Imm32Is16BitMode()) { - Imm32UIntToStr((DWORD)(DWORD_PTR)hKL, 16, szLayout, _countof(szLayout)); - - error = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_KEYBOARD_LAYOUTS, &hLayoutsKey); - if (error) - { - ERR("RegOpenKeyW: 0x%08lX\n", error); - return FALSE; - } + StringCchPrintfW(szLayout, _countof(szLayout), L"%s\\%08lX", + REGKEY_KEYBOARD_LAYOUTS, HandleToUlong(hKL)); - error = RegOpenKeyW(hLayoutsKey, szLayout, &hLayoutKey); + error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szLayout, 0, KEY_READ, &hLayoutKey); if (error) { - ERR("RegOpenKeyW: 0x%08lX\n", error); - RegCloseKey(hLayoutsKey); + ERR("RegOpenKeyExW: 0x%08lX\n", error); return FALSE; } } else { - error = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_IMM, &hLayoutKey); + error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, REGKEY_IMM, 0, KEY_READ, &hLayoutKey); if (error) { - ERR("RegOpenKeyW: 0x%08lX\n", error); + ERR("RegOpenKeyExW: 0x%08lX\n", error); return FALSE; } } cbData = sizeof(pImeInfoEx->wszImeFile); - error = RegQueryValueExW(hLayoutKey, L"Ime File", 0, 0, + error = RegQueryValueExW(hLayoutKey, L"Ime File", NULL, &dwType, (LPBYTE)pImeInfoEx->wszImeFile, &cbData); - pImeInfoEx->wszImeFile[_countof(pImeInfoEx->wszImeFile) - 1] = 0; + pImeInfoEx->wszImeFile[_countof(pImeInfoEx->wszImeFile) - 1] = UNICODE_NULL; RegCloseKey(hLayoutKey); - if (hLayoutsKey) - RegCloseKey(hLayoutsKey); pImeInfoEx->fLoadFlag = 0; - if (error) + if (error != ERROR_SUCCESS || dwType != REG_SZ) { - ERR("RegQueryValueExW: 0x%08lX\n", error); - pImeInfoEx->hkl = NULL; + ERR("RegQueryValueExW: 0x%lX, 0x%lX\n", error, dwType); return FALSE; } @@ -116,7 +108,7 @@ BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) */ BOOL WINAPI ImmFreeLayout(DWORD dwUnknown) { - WCHAR szKBD[9]; + WCHAR szKBD[KL_NAMELENGTH]; UINT iKL, cKLs; HKL hOldKL, hNewKL, *pList; PIMEDPI pImeDpi; diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index ca9385aed14..9e0c07195dd 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -776,6 +776,7 @@ BOOL APIENTRY Imm32LoadImeVerInfo(PIMEINFOEX pImeInfoEx) hinstVersion = LoadLibraryW(szPath); if (!hinstVersion) return FALSE; + bLoaded = TRUE; } diff --git a/win32ss/include/callback.h b/win32ss/include/callback.h index a75a6de3803..4c4d56323f0 100644 --- a/win32ss/include/callback.h +++ b/win32ss/include/callback.h @@ -20,7 +20,8 @@ #define USER32_CALLBACK_LPK (16) #define USER32_CALLBACK_UMPD (17) #define USER32_CALLBACK_IMMPROCESSKEY (18) -#define USER32_CALLBACK_MAXIMUM (18) +#define USER32_CALLBACK_IMMLOADLAYOUT (19) +#define USER32_CALLBACK_MAXIMUM USER32_CALLBACK_IMMLOADLAYOUT typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -178,6 +179,17 @@ typedef struct _IMMPROCESSKEY_CALLBACK_ARGUMENTS DWORD dwHotKeyID; } IMMPROCESSKEY_CALLBACK_ARGUMENTS, *PIMMPROCESSKEY_CALLBACK_ARGUMENTS; +typedef struct _IMMLOADLAYOUT_CALLBACK_ARGUMENTS +{ + HKL hKL; +} IMMLOADLAYOUT_CALLBACK_ARGUMENTS, *PIMMLOADLAYOUT_CALLBACK_ARGUMENTS; + +typedef struct _IMMLOADLAYOUT_CALLBACK_OUTPUT +{ + BOOL ret; + IMEINFOEX iiex; +} IMMLOADLAYOUT_CALLBACK_OUTPUT, *PIMMLOADLAYOUT_CALLBACK_OUTPUT; + NTSTATUS WINAPI User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI @@ -216,4 +228,7 @@ NTSTATUS WINAPI User32CallUMPDFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallImmProcessKeyFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallImmLoadLayoutFromKernel(PVOID Arguments, ULONG ArgumentLength); + #endif /* __INCLUDE_USER32_CALLBACK_H */ diff --git a/win32ss/user/ntuser/callback.c b/win32ss/user/ntuser/callback.c index 4e1c053e4bf..801e8e971db 100644 --- a/win32ss/user/ntuser/callback.c +++ b/win32ss/user/ntuser/callback.c @@ -1272,4 +1272,50 @@ co_IntImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKey return ret; } +/* Win: ClientImmLoadLayout */ +BOOL +APIENTRY +co_ClientImmLoadLayout( + _In_ HKL hKL, + _Inout_ PIMEINFOEX pImeInfoEx) +{ + BOOL ret; + NTSTATUS Status; + IMMLOADLAYOUT_CALLBACK_ARGUMENTS Common = { hKL }; + ULONG ResultLength = sizeof(IMMLOADLAYOUT_CALLBACK_OUTPUT); + PIMMLOADLAYOUT_CALLBACK_OUTPUT ResultPointer = NULL; + + RtlZeroMemory(pImeInfoEx, sizeof(IMEINFOEX)); + + UserLeaveCo(); + Status = KeUserModeCallback(USER32_CALLBACK_IMMLOADLAYOUT, + &Common, + sizeof(Common), + (PVOID*)&ResultPointer, + &ResultLength); + UserEnterCo(); + + if (!NT_SUCCESS(Status) || !ResultPointer || + ResultLength != sizeof(IMMLOADLAYOUT_CALLBACK_OUTPUT)) + { + ERR("0x%lX, %p, %lu\n", Status, ResultPointer, ResultLength); + return FALSE; + } + + _SEH2_TRY + { + ProbeForRead(ResultPointer, ResultLength, 1); + ret = ResultPointer->ret; + if (ret) + RtlCopyMemory(pImeInfoEx, &ResultPointer->iiex, sizeof(IMEINFOEX)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = FALSE; + } + _SEH2_END; + + return ret; +} + /* EOF */ diff --git a/win32ss/user/ntuser/callback.h b/win32ss/user/ntuser/callback.h index 79217f86425..dde7152a952 100644 --- a/win32ss/user/ntuser/callback.h +++ b/win32ss/user/ntuser/callback.h @@ -80,3 +80,9 @@ BOOL FASTCALL IntMsgCreateStructW(PWND,CREATESTRUCTW*,CREATESTRUCTW*,PVOID*,PVOI DWORD APIENTRY co_IntImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID); + +BOOL +APIENTRY +co_ClientImmLoadLayout( + _In_ HKL hKL, + _Inout_ PIMEINFOEX pImeInfoEx); diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index 83d89d9632a..d41f53d3472 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -497,6 +497,10 @@ UserUnloadKbl(PKL pKl) pKl->pklPrev->pklNext = pKl->pklNext; pKl->pklNext->pklPrev = pKl->pklPrev; UnloadKbdFile(pKl->spkf); + if (pKl->piiex) + { + ExFreePoolWithTag(pKl->piiex, USERTAG_IME); + } UserDeleteObject(pKl->head.h, TYPE_KBDLAYOUT); return TRUE; } @@ -995,12 +999,34 @@ cleanup: return bRet; } +/* Win: xxxImmLoadLayout */ +PIMEINFOEX FASTCALL co_UserImmLoadLayout(_In_ HKL hKL) +{ + PIMEINFOEX piiex; + + if (!IS_IME_HKL(hKL) && !IS_CICERO_MODE()) + return NULL; + + piiex = ExAllocatePoolWithTag(PagedPool, sizeof(IMEINFOEX), USERTAG_IME); + if (!piiex) + return NULL; + + if (!co_ClientImmLoadLayout(hKL, piiex)) + { + ExFreePoolWithTag(piiex, USERTAG_IME); + return NULL; + } + + return piiex; +} + /* * NtUserLoadKeyboardLayoutEx * * Loads keyboard layout with given locale id * * NOTE: We adopt a different design from Microsoft's one for security reason. + * We don't use the 1st and 3rd parameters of NtUserLoadKeyboardLayoutEx. */ HKL APIENTRY @@ -1015,7 +1041,7 @@ NtUserLoadKeyboardLayoutEx( { HKL hklRet = NULL; PKL pKl = NULL, pklLast; - WCHAR Buffer[9]; + WCHAR Buffer[KL_NAMELENGTH]; UNICODE_STRING ustrSafeKLID; if (Flags & ~(KLF_ACTIVATE|KLF_NOTELLSHELL|KLF_REORDER|KLF_REPLACELANG| @@ -1082,6 +1108,8 @@ NtUserLoadKeyboardLayoutEx( pKl->pklPrev = pKl; gspklBaseLayout = pKl; } + + pKl->piiex = co_UserImmLoadLayout(UlongToHandle(hkl)); } /* If this layout was prepared to unload, undo it */ diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h index a72571dc26f..5060a661305 100644 --- a/win32ss/user/ntuser/ntuser.h +++ b/win32ss/user/ntuser/ntuser.h @@ -11,6 +11,7 @@ typedef VOID (*TL_FN_FREE)(PVOID); +/* Thread Lock structure */ typedef struct _TL { struct _TL* next; diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c index 77fc525d913..18dd9ec0710 100644 --- a/win32ss/user/user32/misc/dllmain.c +++ b/win32ss/user/user32/misc/dllmain.c @@ -224,6 +224,7 @@ PVOID apfnDispatch[USER32_CALLBACK_MAXIMUM + 1] = User32CallLPKFromKernel, User32CallUMPDFromKernel, User32CallImmProcessKeyFromKernel, + User32CallImmLoadLayoutFromKernel, }; @@ -725,3 +726,12 @@ User32CallImmProcessKeyFromKernel(PVOID Arguments, ULONG ArgumentLength) return ZwCallbackReturn(&Result, sizeof(DWORD), STATUS_SUCCESS); } + +NTSTATUS WINAPI +User32CallImmLoadLayoutFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + PIMMLOADLAYOUT_CALLBACK_ARGUMENTS Common = Arguments; + IMMLOADLAYOUT_CALLBACK_OUTPUT Result; + Result.ret = IMM_FN(ImmLoadLayout)(Common->hKL, &Result.iiex); + return ZwCallbackReturn(&Result, sizeof(Result), STATUS_SUCCESS); +} diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 1dfa587602e..a018d3aeca2 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -638,6 +638,13 @@ LoadKeyboardLayoutA(LPCSTR pszKLID, return LoadKeyboardLayoutW(wszKLID, Flags); } +inline BOOL IsValidKLID(_In_ LPCWSTR pwszKLID) +{ + return (pwszKLID != NULL) && (wcsspn(pwszKLID, L"0123456789ABCDEFabcdef") == (KL_NAMELENGTH - 1)); +} + +#define ENGLISH_US MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US) + /* * @unimplemented * @@ -656,12 +663,20 @@ IntLoadKeyboardLayout( UNICODE_STRING ustrKbdName; UNICODE_STRING ustrKLID; WCHAR wszRegKey[256] = L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\"; - WCHAR wszLayoutId[10], wszNewKLID[10], szImeFileName[80]; + WCHAR wszLayoutId[10], wszNewKLID[KL_NAMELENGTH], szImeFileName[80]; + PWCHAR endptr; HKL hNewKL; HKEY hKey; BOOL bIsIME; - dwhkl = wcstoul(pwszKLID, NULL, 16); + if (!IsValidKLID(pwszKLID)) + { + ERR("pwszKLID: %s\n", debugstr_w(pwszKLID)); + return UlongToHandle(MAKELONG(ENGLISH_US, ENGLISH_US)); + } + + dwhkl = wcstoul(pwszKLID, &endptr, 16); + bIsIME = IS_IME_HKL(UlongToHandle(dwhkl)); if (!bIsIME) /* Not IME? */ { @@ -690,8 +705,7 @@ IntLoadKeyboardLayout( StringCbCatW(wszRegKey, sizeof(wszRegKey), pwszKLID); /* Open layout registry key for read */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegKey, 0, - KEY_READ, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { dwSize = sizeof(wszLayoutId); if (RegQueryValueExW(hKey, L"Layout Id", NULL, &dwType, (LPBYTE)wszLayoutId, &dwSize) == ERROR_SUCCESS) @@ -744,7 +758,7 @@ HKL WINAPI LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags) { - TRACE("(%s, 0x%X)", debugstr_w(pwszKLID), Flags); + TRACE("(%s, 0x%X)\n", debugstr_w(pwszKLID), Flags); return IntLoadKeyboardLayout(NULL, pwszKLID, 0, Flags, FALSE); }

1 0

[reactos] 01/01: [TASKMGR] Fix number formatting to respect NLS Number format settings (#4657)
by Kyle Katarn 04 Sep '22

04 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15a0f7adb0694107b981b… commit 15a0f7adb0694107b981bbf6c5292036f1e55d79 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Sep 4 19:10:11 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 4 19:10:11 2022 +0200 [TASKMGR] Fix number formatting to respect NLS Number format settings (#4657) TaskMgr currently does not respect local NLS settings and forces 3 digits + comma (US convention) formatting. Fix this with a direct reuse of SH_FormatInteger() as already implemented in other places (dll/win32/shell32/dialogs/filedefext.cpp ...) - Removal of CommaSeparateNumberString() and replace with SH_FormatInteger(). - PerfDataGetText(): Use a switch structure. Return TRUE iftext could be retrieved; FALSE if not. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> Co-authored-by: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> --- base/applications/taskmgr/precomp.h | 1 + base/applications/taskmgr/procpage.c | 331 ++++++++++++++++++++--------------- 2 files changed, 187 insertions(+), 145 deletions(-) diff --git a/base/applications/taskmgr/precomp.h b/base/applications/taskmgr/precomp.h index d54dcb3c7f4..5593f401fcd 100644 --- a/base/applications/taskmgr/precomp.h +++ b/base/applications/taskmgr/precomp.h @@ -14,6 +14,7 @@ #include <windef.h> #include <winbase.h> #include <wingdi.h> +#include <winnls.h> #include <winuser.h> #include <winreg.h> #include <commctrl.h> diff --git a/base/applications/taskmgr/procpage.c b/base/applications/taskmgr/procpage.c index 6145a28dcfe..e916cae8ee0 100644 --- a/base/applications/taskmgr/procpage.c +++ b/base/applications/taskmgr/procpage.c @@ -58,7 +58,6 @@ void AddProcess(ULONG Index); void UpdateProcesses(); void gethmsfromlargeint(LARGE_INTEGER largeint, DWORD *dwHours, DWORD *dwMinutes, DWORD *dwSeconds); void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam); -void CommaSeparateNumberString(LPWSTR strNumber, ULONG nMaxCount); void ProcessPageShowContextMenu(DWORD dwProcessId); BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, ULONG nMaxCount); DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); @@ -324,20 +323,68 @@ void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam) } } -void CommaSeparateNumberString(LPWSTR strNumber, ULONG nMaxCount) +/* + * Adapted from SH_FormatInteger in dll/win32/shell32/dialogs/filedefext.cpp. + */ +UINT +SH_FormatInteger( + _In_ LONGLONG Num, + _Out_writes_z_(cchResultMax) LPWSTR pwszResult, + _In_ UINT cchResultMax) { - WCHAR temp[260]; - UINT i, j, k; - - for (i=0,j=0; i<(wcslen(strNumber) % 3); i++, j++) - temp[j] = strNumber[i]; - for (k=0; i<wcslen(strNumber); i++,j++,k++) { - if ((k % 3 == 0) && (j > 0)) - temp[j++] = L','; - temp[j] = strNumber[i]; + NUMBERFMTW nf; + INT i; + INT cchGrouping, cchResult; + WCHAR wszNumber[24]; + WCHAR wszDecimalSep[8], wszThousandSep[8]; + WCHAR wszGrouping[12]; + + /* Print the number in uniform mode */ + StringCchPrintfW(wszNumber, _countof(wszNumber), L"%I64u", Num); + + /* Get system strings for decimal and thousand separators */ + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, wszDecimalSep, _countof(wszDecimalSep)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, wszThousandSep, _countof(wszThousandSep)); + + /* Initialize format for printing the number in bytes */ + ZeroMemory(&nf, sizeof(nf)); + nf.lpDecimalSep = wszDecimalSep; + nf.lpThousandSep = wszThousandSep; + + /* Get system string for groups separator */ + cchGrouping = GetLocaleInfoW(LOCALE_USER_DEFAULT, + LOCALE_SGROUPING, + wszGrouping, + _countof(wszGrouping)); + + /* Convert grouping specs from string to integer */ + for (i = 0; i < cchGrouping; i++) + { + WCHAR wch = wszGrouping[i]; + + if (wch >= L'0' && wch <= L'9') + nf.Grouping = nf.Grouping * 10 + (wch - L'0'); + else if (wch != L';') + break; } - temp[j] = L'\0'; - wcsncpy(strNumber, temp, nMaxCount); + + if ((nf.Grouping % 10) == 0) + nf.Grouping /= 10; + else + nf.Grouping *= 10; + + /* Format the number */ + cchResult = GetNumberFormatW(LOCALE_USER_DEFAULT, + 0, + wszNumber, + &nf, + pwszResult, + cchResultMax); + if (!cchResult) + return 0; + + /* GetNumberFormatW returns number of characters including UNICODE_NULL */ + return cchResult - 1; } void ProcessPageShowContextMenu(DWORD dwProcessId) @@ -561,140 +608,134 @@ void AddProcess(ULONG Index) BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, ULONG nMaxCount) { - IO_COUNTERS iocounters; - LARGE_INTEGER time; - - if (ColumnDataHints[ColumnIndex] == COLUMN_IMAGENAME) - PerfDataGetImageName(Index, lpText, nMaxCount); - if (ColumnDataHints[ColumnIndex] == COLUMN_PID) - wsprintfW(lpText, L"%lu", PerfDataGetProcessId(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_USERNAME) - PerfDataGetUserName(Index, lpText, nMaxCount); - if (ColumnDataHints[ColumnIndex] == COLUMN_COMMANDLINE) - PerfDataGetCommandLine(Index, lpText, nMaxCount); - if (ColumnDataHints[ColumnIndex] == COLUMN_SESSIONID) - wsprintfW(lpText, L"%lu", PerfDataGetSessionId(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_CPUUSAGE) - wsprintfW(lpText, L"%02lu", PerfDataGetCPUUsage(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_CPUTIME) - { - DWORD dwHours; - DWORD dwMinutes; - DWORD dwSeconds; + IO_COUNTERS iocounters; - time = PerfDataGetCPUTime(Index); - gethmsfromlargeint(time, &dwHours, &dwMinutes, &dwSeconds); - wsprintfW(lpText, L"%lu:%02lu:%02lu", dwHours, dwMinutes, dwSeconds); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGE) - { - wsprintfW(lpText, L"%lu", PerfDataGetWorkingSetSizeBytes(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PEAKMEMORYUSAGE) - { - wsprintfW(lpText, L"%lu", PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGEDELTA) - { - wsprintfW(lpText, L"%lu", PerfDataGetWorkingSetSizeDelta(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTS) - { - wsprintfW(lpText, L"%lu", PerfDataGetPageFaultCount(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTSDELTA) - { - wsprintfW(lpText, L"%lu", PerfDataGetPageFaultCountDelta(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_VIRTUALMEMORYSIZE) - { - wsprintfW(lpText, L"%lu", PerfDataGetVirtualMemorySizeBytes(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEDPOOL) - { - wsprintfW(lpText, L"%lu", PerfDataGetPagedPoolUsagePages(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_NONPAGEDPOOL) - { - wsprintfW(lpText, L"%lu", PerfDataGetNonPagedPoolUsagePages(Index) / 1024); - CommaSeparateNumberString(lpText, nMaxCount); - wcscat(lpText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_BASEPRIORITY) - wsprintfW(lpText, L"%lu", PerfDataGetBasePriority(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_HANDLECOUNT) - { - wsprintfW(lpText, L"%lu", PerfDataGetHandleCount(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_THREADCOUNT) - { - wsprintfW(lpText, L"%lu", PerfDataGetThreadCount(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_USEROBJECTS) - { - wsprintfW(lpText, L"%lu", PerfDataGetUSERObjectCount(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_GDIOBJECTS) - { - wsprintfW(lpText, L"%lu", PerfDataGetGDIObjectCount(Index)); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADS) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.ReadOperationCount); */ - _ui64tow(iocounters.ReadOperationCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITES) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.WriteOperationCount); */ - _ui64tow(iocounters.WriteOperationCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHER) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.OtherOperationCount); */ - _ui64tow(iocounters.OtherOperationCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADBYTES) + switch (ColumnDataHints[ColumnIndex]) { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.ReadTransferCount); */ - _ui64tow(iocounters.ReadTransferCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITEBYTES) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.WriteTransferCount); */ - _ui64tow(iocounters.WriteTransferCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHERBYTES) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.OtherTransferCount); */ - _ui64tow(iocounters.OtherTransferCount, lpText, 10); - CommaSeparateNumberString(lpText, nMaxCount); + case COLUMN_IMAGENAME: + PerfDataGetImageName(Index, lpText, nMaxCount); + return TRUE; + + case COLUMN_PID: + StringCchPrintfW(lpText, nMaxCount, L"%lu", PerfDataGetProcessId(Index)); + return TRUE; + + case COLUMN_USERNAME: + PerfDataGetUserName(Index, lpText, nMaxCount); + return TRUE; + + case COLUMN_COMMANDLINE: + PerfDataGetCommandLine(Index, lpText, nMaxCount); + return TRUE; + + case COLUMN_SESSIONID: + StringCchPrintfW(lpText, nMaxCount, L"%lu", PerfDataGetSessionId(Index)); + return TRUE; + + case COLUMN_CPUUSAGE: + StringCchPrintfW(lpText, nMaxCount, L"%02lu", PerfDataGetCPUUsage(Index)); + return TRUE; + + case COLUMN_CPUTIME: + { + LARGE_INTEGER time; + DWORD dwHours; + DWORD dwMinutes; + DWORD dwSeconds; + + time = PerfDataGetCPUTime(Index); + gethmsfromlargeint(time, &dwHours, &dwMinutes, &dwSeconds); + StringCchPrintfW(lpText, nMaxCount, L"%lu:%02lu:%02lu", dwHours, dwMinutes, dwSeconds); + return TRUE; + } + + case COLUMN_MEMORYUSAGE: + SH_FormatInteger(PerfDataGetWorkingSetSizeBytes(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_PEAKMEMORYUSAGE: + SH_FormatInteger(PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_MEMORYUSAGEDELTA: + SH_FormatInteger(PerfDataGetWorkingSetSizeDelta(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_PAGEFAULTS: + SH_FormatInteger(PerfDataGetPageFaultCount(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_PAGEFAULTSDELTA: + SH_FormatInteger(PerfDataGetPageFaultCountDelta(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_VIRTUALMEMORYSIZE: + SH_FormatInteger(PerfDataGetVirtualMemorySizeBytes(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_PAGEDPOOL: + SH_FormatInteger(PerfDataGetPagedPoolUsagePages(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_NONPAGEDPOOL: + SH_FormatInteger(PerfDataGetNonPagedPoolUsagePages(Index) / 1024, lpText, nMaxCount); + StringCchCatW(lpText, nMaxCount, L" K"); + return TRUE; + + case COLUMN_BASEPRIORITY: + StringCchPrintfW(lpText, nMaxCount, L"%lu", PerfDataGetBasePriority(Index)); + return TRUE; + + case COLUMN_HANDLECOUNT: + SH_FormatInteger(PerfDataGetHandleCount(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_THREADCOUNT: + SH_FormatInteger(PerfDataGetThreadCount(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_USEROBJECTS: + SH_FormatInteger(PerfDataGetUSERObjectCount(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_GDIOBJECTS: + SH_FormatInteger(PerfDataGetGDIObjectCount(Index), lpText, nMaxCount); + return TRUE; + + case COLUMN_IOREADS: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.ReadOperationCount, lpText, nMaxCount); + return TRUE; + + case COLUMN_IOWRITES: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.WriteOperationCount, lpText, nMaxCount); + return TRUE; + + case COLUMN_IOOTHER: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.OtherOperationCount, lpText, nMaxCount); + return TRUE; + + case COLUMN_IOREADBYTES: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.ReadTransferCount, lpText, nMaxCount); + return TRUE; + + case COLUMN_IOWRITEBYTES: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.WriteTransferCount, lpText, nMaxCount); + return TRUE; + + case COLUMN_IOOTHERBYTES: + PerfDataGetIOCounters(Index, &iocounters); + SH_FormatInteger(iocounters.OtherTransferCount, lpText, nMaxCount); + return TRUE; } return FALSE;

1 0

[reactos] 01/01: [CODEOWNERS] Remove automatic assignment from cmake/apitests
by Mark Jansen 04 Sep '22

04 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15b54c4123c578fa84b50… commit 15b54c4123c578fa84b5018e1b6ee5c8c8545f69 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 4 15:28:43 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 4 15:28:43 2022 +0200 [CODEOWNERS] Remove automatic assignment from cmake/apitests --- CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 87496bb25be..18b6d1aa1ae 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -121,8 +121,8 @@ # R: learn-more, learn_more, Mark Jansen # R: ThFabba, Thomas Faber # S: Maintained -/sdk/cmake/ @learn-more -*.cmake @learn-more +/sdk/cmake/ +*.cmake # File Patch API # M: learn-more, learn_more, Mark Jansen @@ -225,7 +225,7 @@ # R: learn-more, learn_more, Mark Jansen # R: ThFabba, Thomas Faber # S: Maintained -/modules/rostests/apitests/ @learn-more +/modules/rostests/apitests/ # ReactOS Kernel-Mode Tests # M: ThFabba, Thomas Faber

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